init

src/views/xq/activityOrder/index.vue

@@ -69,13 +69,12 @@
           <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="生成时间" align="center" prop="creatTime" width="160"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160"/>
       <el-table-column label="支付时间" align="center" prop="payTime" width="160"/>
-
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <pagination

src/views/xq/activityShop/index.vue

@@ -84,29 +84,30 @@
           <image-preview :src="scope.row.activityBanner" :height="75" :width="120"/>
         </template>
       </el-table-column>
-      <el-table-column label="时间" align="center" prop="startTime" >
+      <el-table-column label="时间" align="center" prop="startTime" width="170" >
         <template v-slot="scope">
-          <span style="font-weight: bold">开始时间:</span><span>{{scope.row.startTime}}</span> <br>
+          <span>{{scope.row.startTime}}</span><br>
-          <span style="font-weight: bold">结束时间:</span><span>{{scope.row.endTime}}</span><br>
+          <span>{{scope.row.endTime}}</span>
         </template>
       </el-table-column>
       <el-table-column label="城市名称" align="center" prop="cityName" />
       <el-table-column label="详细地址" align="center" prop="address" show-overflow-tooltip/>
-      <el-table-column label="人数" align="center" prop="womenMaxNum" >
+      <el-table-column label="人数" align="center" prop="womenMaxNum" width="300">
         <template v-slot="scope">
-          <span style="font-weight: bold">男生上限:</span><span>{{scope.row.manMaxNum}}</span> <span style="font-weight: bold">女生上限:</span><span>{{scope.row.womenMaxNum}}</span><br>
+          <span style="font-weight: bold">男生上限:</span><span class="font-red">{{scope.row.manMaxNum}}</span> <span style="font-weight: bold">女生上限:</span><span class="font-red">{{scope.row.womenMaxNum}}</span><br>
-          <span style="font-weight: bold">已报名(男):</span><span>{{scope.row.joinManNum}}</span> <span style="font-weight: bold">已报名(女):</span><span>{{scope.row.joinWomenNum}}</span><br>
+          <span style="font-weight: bold">已报名(男):</span><span class="font-blue">{{scope.row.joinManNum}}</span> <span style="font-weight: bold">已报名(女):</span><span class="font-blue">{{scope.row.joinWomenNum}}</span><br>
           <span style="font-weight: bold">人工调整(男):</span><span>{{scope.row.handManNum}}</span> <span style="font-weight: bold">人工调整(女):</span><span>{{scope.row.handWomenNum}}</span><br>
           <span style="font-weight: bold">显示人数(男):</span><span>{{scope.row.joinManNum+scope.row.handManNum}}</span> <span style="font-weight: bold">显示人数(女):</span><span>{{scope.row.joinWomenNum+scope.row.handWomenNum}}</span><br>
         </template>
       </el-table-column>
-      <el-table-column label="价格" align="center" prop="joinWomenPrice" >
+      <el-table-column label="价格" align="center" prop="joinWomenPrice" width="120">
         <template v-slot="scope">
-          <span style="font-weight: bold">男生价格:</span><span>{{scope.row.joinManPrice}}</span> <span style="font-weight: bold">女生价格:</span><span>{{scope.row.joinWomenPrice}}</span><br>
+          <span style="font-weight: bold">男:</span><span>{{scope.row.joinManPrice}}</span><br>
-          <span style="font-weight: bold">费用说明:</span><span>{{scope.row.priceText}}</span>
+          <span style="font-weight: bold">女:</span><span>{{scope.row.joinWomenPrice}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="权限" align="center" prop="joinWomenPrice" >
+      <el-table-column label="费用说明" align="center" prop="priceText" show-overflow-tooltip/>
+      <el-table-column label="权限" align="center" prop="joinWomenPrice" width="120">
         <template v-slot="scope">
           <span style="font-weight: bold">强制会员:</span><span>{{scope.row.mustVip===1?'强制':'不强制'}}</span> <br>
           <span style="font-weight: bold">强制实名:</span><span>{{scope.row.mustAuth===1?'强制':'不强制'}}</span>

src/views/xq/authOrder/index.vue

@@ -61,7 +61,7 @@
           <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="生成时间" align="center" prop="creatTime" width="160"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip />
       <el-table-column label="支付时间" align="center" prop="payTime" width="160"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">

src/views/xq/cardAuthRecord/index.vue

@@ -33,6 +33,17 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="tokenStatus">
+        <el-select v-model="queryParams.tokenStatus" clearable size="small">
+          <el-option
+            v-for="dict in tokenStatusList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -41,6 +52,11 @@
 
     <el-table v-loading="loading" :data="cardAuthRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="状态" align="center" prop="tokenStatus" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="tokenStatusList" :value="scope.row.tokenStatus" />
+        </template>
+      </el-table-column>
       <el-table-column label="订单号" align="center" prop="orderNo" show-overflow-tooltip/>
       <el-table-column label="用户编号" align="center" prop="usercode" />
       <el-table-column label="昵称" align="center" prop="nickname" show-overflow-tooltip/>
@@ -50,18 +66,26 @@
           <image-avatar :src="scope.row.avatar"/>
         </template>
       </el-table-column>
-      <el-table-column label="token" align="center" prop="bizToken" />
+      <el-table-column label="token" align="center" prop="bizToken" show-overflow-tooltip />
-      <el-table-column label="身份证号码" align="center" prop="idCard" />
+      <el-table-column label="身份证号码" align="center" prop="idCard" show-overflow-tooltip />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="民族" align="center" prop="nation" />
-      <el-table-column label="认证照片" align="center" prop="livenessVideo" />
+      <el-table-column label="认证照片" align="center" prop="bestFrame" >
-      <el-table-column label="身份证正面" align="center" prop="cardFront" />
-      <el-table-column label="身份证背面" align="center" prop="cardBack" />
-      <el-table-column label="状态" align="center" prop="tokenStatus" >
         <template v-slot="scope">
-          <cai-dict-tag :options="tokenStatusList" :value="scope.row.tokenStatus" />
+          <image-preview v-if="scope.row.bestFrame" :src="scope.row.bestFrame" :height="40" :width="60"/>
         </template>
       </el-table-column>
+      <el-table-column label="身份证正面" align="center" prop="cardFront" >
+        <template v-slot="scope">
+          <image-preview v-if="scope.row.cardFront" :src="scope.row.cardFront" :height="40" :width="60"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="身份证背面" align="center" prop="cardBack" >
+        <template v-slot="scope">
+          <image-preview v-if="scope.row.cardBack" :src="scope.row.cardBack" :height="40" :width="60"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button
@@ -70,7 +94,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['xq:cardAuthRecord:edit']"
-          >修改</el-button>
+          >重载数据</el-button>
 <!--          <el-button
             size="mini"
             type="text"
@@ -160,7 +184,19 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 删除按钮操作 */
+    handleUpdate(row) {
+      this.$modal.confirm('是否确认刷新实名认证管理的数据项？').then(() => {
+        this.loading = true;
+        return updateCardAuthRecord({id: row.id});
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("刷新成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除实名认证管理编号为"' + ids + '"的数据项？').then(() => {

src/views/xq/dynamicManager/index.vue

@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="城市" prop="cityName">
+        <el-input
+          v-model="queryParams.cityName"
+          placeholder="请输入手机号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -66,6 +74,7 @@
           <image-avatar :src="scope.row.avatar"/>
         </template>
       </el-table-column>
+      <el-table-column label="城市" align="center" prop="cityName" />
       <el-table-column label="内容" align="center" prop="content" />
       <el-table-column label="图片" align="center" prop="imageList" >
         <template v-slot="scope">
@@ -133,7 +142,8 @@ export default {
         usercode: undefined,
         nickname: undefined,
         auditStatus: 2,
-        mobile: undefined
+        mobile: undefined,
+        cityName: undefined
       },
     };
   },

src/views/xq/feedback/index.vue

@@ -44,6 +44,7 @@
           <cai-dict-tag :options="feedbackStatusList" :value="scope.row.reportStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="留言时间" align="center" prop="createTime" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button

src/views/xq/report/index.vue

@@ -77,6 +77,7 @@
           <cai-dict-tag :options="reportStatusList" :value="scope.row.reportStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="举报时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button

src/views/xq/user/index.vue

@@ -33,6 +33,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="标签" prop="tag">
+        <el-select v-model="queryParams.tag" placeholder="请选择标签" clearable size="small">
+          <el-option
+            v-for="dict in userTagList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -210,6 +221,7 @@ export default {
         id: undefined,
         mobile: undefined,
         residenceCityName: undefined,
+        tag: undefined,
       }
     };
   },

src/views/xq/userExtend/index.vue

@@ -58,7 +58,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="userExtendList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="用户编号" align="center" prop="usercode"/>
       <el-table-column label="昵称" align="center" prop="nickname" show-overflow-tooltip/>
       <el-table-column label="手机号" align="center" prop="mobile" width="100"/>

src/views/xq/wxTransData/index.vue

@@ -98,6 +98,7 @@
           <cai-dict-tag :options="yesOrNoList" :value="scope.row.isAdmin"/>
         </template>
       </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button

src/views/xq/wxTransOrder/index.vue

@@ -63,7 +63,7 @@
           <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="生成时间" align="center" prop="creatTime" width="160"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160"/>
       <el-table-column label="支付时间" align="center" prop="payTime" width="160"/>
       <el-table-column label="来源" align="center" prop="source">
         <template v-slot="scope">