From edd29b079519b50a1bb26f8076c1b779a0061869 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 20 Jan 2021 16:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A5=E5=9F=8E=E6=89=BE=E4=BA=BA+=E5=B7=B2?=
 =?UTF-8?q?=E6=88=AA=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/groupbuyinfo.vue     | 14 +++++++++++++-
 src/views/modules/user/selectPeopleByCity.vue |  5 +++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/custom/groupbuyinfo.vue b/src/views/modules/custom/groupbuyinfo.vue
index 09c719a..7276e26 100644
--- a/src/views/modules/custom/groupbuyinfo.vue
+++ b/src/views/modules/custom/groupbuyinfo.vue
@@ -49,6 +49,7 @@
         <el-table-column prop="groupBuyMobile" label="联系电话" header-align="center" align="center"  width="120px"></el-table-column>
         <el-table-column prop="groupBuyStatus" label="状态" header-align="center" align="center" width="100px" :formatter="statusFormat"></el-table-column>
         <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="160px"></el-table-column>
+        <el-table-column prop="groupBuyEndTime" label="截止时间" header-align="center" align="center" width="160px"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center">
           <template slot-scope="scope">
             <el-button  type="text" size="mini" @click="groupBuyDetailHandle(scope.row.id)">查看</el-button>
@@ -104,6 +105,9 @@ export default {
       stateOptions: [{
         id: '0',
         name: '团购中'
+      }, {
+        id: '4',
+        name: '已截团'
       }, {
         id: '5',
         name: '已结束'
@@ -170,8 +174,16 @@ export default {
     },
     statusFormat: function (row, column) {
       let groupBuyStatus = row.groupBuyStatus
+      let groupBuyEndTime = row.groupBuyEndTime
+      if (groupBuyEndTime !== '' && groupBuyEndTime !== null && groupBuyEndTime !== undefined) {
+        groupBuyEndTime = new Date(groupBuyEndTime).getTime()
+      }
       if (groupBuyStatus === 0) {
-        return '团购中'
+        if (groupBuyEndTime !== '' && groupBuyEndTime !== undefined && groupBuyEndTime !== null && (groupBuyEndTime < new Date().getTime())) {
+          return '已截团'
+        } else {
+          return '团购中'
+        }
       } else if (groupBuyStatus === 5) {
         return '已结束'
       } else if (groupBuyStatus === 10) {
diff --git a/src/views/modules/user/selectPeopleByCity.vue b/src/views/modules/user/selectPeopleByCity.vue
index ae188c5..0f5df92 100644
--- a/src/views/modules/user/selectPeopleByCity.vue
+++ b/src/views/modules/user/selectPeopleByCity.vue
@@ -7,6 +7,11 @@
                     placeholder="请输入城市名"
                     clearable></el-input>
         </el-form-item>
+        <el-form-item label="姓名">
+          <el-input v-model.trim="dataForm.residentName"
+                    placeholder="请输入姓名"
+                    clearable></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>