up

src/views/finance/component/rechargeFine.vue

@@ -1,7 +1,7 @@
-<!--充值、罚款-->
+<!--充值、扣款-->
 <template>
   <div>
-    <xy-dialog :form="form" :rules="rules" ref="dialog" type="form" :is-show.sync="isShow" :title="type === 'recharge' ? '充值' : '罚款'" @submit="submit">
+    <xy-dialog :form="form" :rules="rules" ref="dialog" type="form" :is-show.sync="isShow" :title="type === 'recharge' ? '充值' : '扣款'" @submit="submit">
       <template v-slot:merchantId>
         <div class="xy-table-item">
           <div class="xy-table-item-label">

src/views/order/orderList.vue

@@ -14,8 +14,8 @@
                     <div class="select-content-item">
                       <div class="select-content-item-label">所属商户</div>
                       <div>
-                        <el-autocomplete @select="handleSelect" v-model="select.merchant.name" :fetch-suggestions="querySearchAsync" clearable
-                          placeholder="请输入选择商家"></el-autocomplete>
+                        <el-autocomplete @select="handleSelect" v-model="select.merchant.name"
+                          :fetch-suggestions="querySearchAsync" clearable placeholder="请输入选择商家"></el-autocomplete>
 
                         <el-checkbox style="margin-left: 10px;" v-model="select.is_merchant">包含历史服务商家</el-checkbox>
                       </div>
@@ -172,7 +172,10 @@
         select: {
           page: 1,
           pageSize: 10,
-          merchant: '',
+          merchant: {
+            name: "",
+            id: ""
+          },
           keyword: '',
           productType: '',
           orderStates: '',

src/views/productService/productServiceManage.vue

@@ -166,7 +166,7 @@ export default {
           width: 180
         },
         {
-          prop:'merchant.name',
+          prop:'merchant.username',
           label:"所属商家",
           width: 280
         },