修改后台管理系统页面

src/views/system/equityMembersOrder/index.vue

@@ -114,7 +114,7 @@
     <el-table v-loading="loading" :data="equityMembersOrderList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
       <!--      <el-table-column align="center" label="ID" prop="id"/>-->
-      <el-table-column align="center" label="权益订单编号" prop="equityOrderNo"/>
+      <el-table-column align="center" label="权益订单编号" prop="equityOrderNo" width="190"/>
       <el-table-column align="center" label="会员昵称" prop="nickName"/>
       <el-table-column align="center" label="会员头像" prop="avatar" width="100">
         <template slot-scope="scope">
@@ -129,18 +129,22 @@
           <dict-tag :options="dict.type.store_pay_ways" :value="scope.row.payType"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="商户订单号" prop="outTradeNo"/>
-      <el-table-column align="center" label="终端流水号" prop="terminalTrace"/>
+      <!--      <el-table-column align="center" label="商户订单号" prop="outTradeNo"/>-->
+      <el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/>
       <el-table-column align="center" label="支付状态" prop="payStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>
         </template>
       </el-table-column>
       <el-table-column align="center" label="支付时间" prop="payTime" width="180">
+        <!--        <template slot-scope="scope">-->
+        <!--          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+        <!--        </template>-->
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+
       <el-table-column align="center" label="备注" prop="remark"/>
       <!--      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
       <!--        <template slot-scope="scope">-->

src/views/system/recharge/index.vue

@@ -41,6 +41,13 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
+      <el-form-item label="会员昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          clearable
+          placeholder="请输入会员昵称"
+        />
+      </el-form-item>
       <el-form-item label="用户手机号" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -146,20 +153,34 @@
     </el-row>
 
     <el-table v-loading="loading" :data="rechargeList" @selection-change="handleSelectionChange">
-      <el-table-column align="center" type="selection" width="55px"/>
+      <el-table-column align="center" type="selection"/>
       <!--      <el-table-column align="center" label="主键" prop="id"/>-->
-      <el-table-column align="center" label="商户平台唯一订单号" prop="outTradeNo"/>
-      <el-table-column align="center" label="终端流水号" prop="terminalTrace"/>
-      <el-table-column align="center" label="充值记录编号" prop="rechargeNo"/>
+      <!--      <el-table-column align="center" label="商户平台唯一订单号" prop="outTradeNo"/>-->
+      <el-table-column align="center" label="用户昵称" prop="nickName"/>
+      <el-table-column align="center" label="用户头像" prop="avatar" width="100">
+        <template slot-scope="scope">
+          <image-preview :height="50" :src="scope.row.avatar" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="用户手机号" prop="phone" width="160"/>
+      <el-table-column align="center" label="充值记录编号" prop="rechargeNo" width="180"/>
+      <el-table-column align="center" label="终端流水号" prop="terminalTrace" width="210"/>
       <el-table-column align="center" label="充值金额" prop="rechargeAmount"/>
-      <el-table-column align="center" label="支付方式" prop="payType"/>
-      <el-table-column align="center" label="充值满送金额" prop="giveAmount"/>
-      <el-table-column align="center" label="充值赠送方式" prop="giveType"/>
-      <el-table-column align="center" label="状态" prop="status"/>
-      <el-table-column align="center" label="充值赠送优惠券ID" prop="consumerCouponIds"/>
-      <el-table-column align="center" label="充值配置表id" prop="rechargeConfId"/>
-      <el-table-column align="center" label="充值用户ID" prop="consumerId"/>
-      <el-table-column align="center" label="充值用户手机号" prop="phone"/>
+      <el-table-column align="center" label="支付方式" prop="payType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_pay_type" :value="scope.row.payType"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="充值满送金额" prop="giveAmount" width="180"/>
+      <!--      <el-table-column align="center" label="充值赠送方式" prop="giveType" width="180"/>-->
+      <el-table-column align="center" label="状态" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_pay_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column align="center" label="充值赠送优惠券ID" prop="consumerCouponIds"/>-->
+      <!--      <el-table-column align="center" label="充值配置表id" prop="rechargeConfId"/>-->
       <el-table-column align="center" label="充值时间" prop="rechargeDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.rechargeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -268,6 +289,7 @@ import {listRecharge, getRecharge, delRecharge, addRecharge, updateRecharge} fro
 
 export default {
   name: "Recharge",
+  dicts: ['order_pay_type', 'order_pay_status'],
   data() {
     return {
       // 遮罩层
@@ -306,7 +328,8 @@ export default {
         isDelete: null,
         outTradeNo: null,
         terminalTrace: null,
-        payTime: null
+        payTime: null,
+        nickName: null,
       },
       // 表单参数
       form: {},

src/views/system/rechargeConf/index.vue

@@ -187,7 +187,7 @@
           <el-input-number v-model="form.giveAmount" :max="100" :min="0"/>
         </el-form-item>
         <el-form-item label="充值赠送时长" prop="giveDuration">
-          <el-input-number v-model="form.giveDuration" :max="100" :min="0.5" :step="0.5" value="1"/>
+          <el-input-number v-model="form.giveDuration" :max="100" :min="0.5" :step="0.5"/>
         </el-form-item>
         <el-form-item label="积分赠送比例" prop="giveRatio">
           <el-input-number v-model="form.giveRatio" :max="100" :min="0"/>