1

src/views/merchant/application/index.vue

@@ -60,6 +60,19 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="所属城市：" prop="city_code">
+          <el-cascader
+          ref="cascader"
+          v-model="tableFrom.city_code"
+          :options="cityOptions"
+          :show-all-levels="false"
+          :props="{ emitPath: false }"
+          class="selWidth"
+          @change="handleCascader"
+          clearable
+          >
+        </el-cascader>
+        </el-form-item>
         <el-form-item label="商户关键字：" prop="keyword">
           <el-input
             v-model="tableFrom.keyword"
@@ -85,14 +98,14 @@
       >
         <el-table-column prop="mer_intention_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="店铺名称" min-width="150" />
-        <el-table-column prop="mer_name" label="企业名称" min-width="150" />
+        <el-table-column prop="ext.com.contact" label="企业名称" min-width="150" />
         <!-- <el-table-column prop="category_name" label="商户分类" min-width="150" /> -->
         <el-table-column prop="type_name" label="店铺类型" min-width="150" />
         <el-table-column prop="com.contact" label="对接人姓名" min-width="100" />
         <el-table-column prop="com.mobile" label="对接人电话" min-width="100" />
         <el-table-column prop="com.number" label="对接人编号" min-width="100" />
         <el-table-column prop="com.initiator" label="发起人姓名" min-width="100" />
-        <el-table-column prop="com.inti_numbe" label="发起人编号" min-width="100" />
+        <el-table-column prop="com.inti_number" label="发起人编号" min-width="100" />
         <el-table-column prop="com.inti_mobile" label="发起人电话" min-width="100" />
         <el-table-column prop="biz.city" label="所属城市" min-width="100" />
         <el-table-column prop="create_time" label="申请时间" min-width="150" />
@@ -186,6 +199,7 @@ import merDetail from './merApplicationDetail.vue';
 import { fromList, statusList } from "@/libs/constants.js";
 import { roterPre } from "@/settings";
 import timeOptions from '@/utils/timeOptions';
+import cityOptions from '@/utils/city';
 export default {
   name: "MerchantApplication",
   components: { merDetail },
@@ -194,6 +208,7 @@ export default {
       props: {
         emitPath: false
       },
+      cityOptions:cityOptions,
       pickerOptions: timeOptions,
       fromList: fromList,
       statusList: statusList, //筛选状态列表
@@ -233,6 +248,10 @@ export default {
     this.getList("");
   },
   methods: {
+    handleCascader(){
+      this.tableFrom.city = this.$refs["cascader"]?.getCheckedNodes()[0]?.label
+      this.getList(1)
+    },
     /**重置 */
     searchReset(){
       this.timeVal = []

src/views/merchant/application/merInfo.vue

@@ -187,6 +187,16 @@
               <div>身份证结束时间：</div>
               <div class="value">{{merData.idcard.end}}</div>
             </li>
+            <li class="item">
+              <div>手持身份证：</div>
+              <div class="value">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="merData.idcard.image3" 
+                  :preview-src-list="[merData.idcard.image3]">
+                </el-image>
+              </div>
+            </li>
           </ul>
         </div>
       </el-tab-pane>

src/views/merchant/list/handle/merDetails.vue

@@ -158,6 +158,7 @@ export default {
             name:'',
             bank:'',
             bank_code:'',
+            inter_bank:''
           }
           if(!res.data.financial_bank){
             this.merData.financial_bank = financial_bank;
@@ -175,6 +176,7 @@ export default {
           name:'',
           bank:'',
           bank_code:'',
+          inter_bank:''
         },
         ext:{
           com:{}

src/views/merchant/list/handle/merEditForm.vue

@@ -188,6 +188,17 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="联行号：" prop="financial_bank.inter_bank">
+                <el-input
+                  size="small"
+                  oninput ="value=value.replace(/[^\d]/g,'')"
+                  v-model="merData.financial_bank.inter_bank"
+                  placeholder="请输入联行号"
+                  class="selWidth"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
       </el-tab-pane>
@@ -282,34 +293,34 @@
             <el-row :gutter="24" class="mt20">
               <el-col v-if="!isAdd":span="8">
                 <el-form-item label="保证金支付状态：">
-                  <span>{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}</span>
+                  <span>{{merData.ot_margin-merData.margin>=0 ? '已缴' : '待缴' }}</span>
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
                 <el-form-item label="技术服务费支付状态：" label-width="142px">
-                  <span>{{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }}</span>
+                  <span>{{merData.ot_service_cost-merData.service_cost>=0 ? '已缴' : '待缴'}}</span>
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
                 <el-form-item label="上架费支付状态：">
-                  <span>{{merData.is_goods == 1 ? '待缴' : merData.is_goods == 0 ? '无' : '已缴' }}</span>
+                  <span>{{merData.ot_goods_cost-merData.goods_cost>=0 ? '已缴' : '待缴'}}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="24" class="mt20">
               <el-col v-if="!isAdd" :span="8">
                 <el-form-item label="保证金余额：">
-                  <span>{{merData.margin}}</span>
+                  <span>{{merData.ot_margin-merData.margin}}</span>
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
                 <el-form-item label="技术服务费余额：">
-                  <span>{{merData.service_cost}}</span>
+                  <span>{{merData.ot_service_cost-merData.service_cost}}</span>
                 </el-form-item>
               </el-col>
               <el-col v-if="!isAdd" :span="8">
                 <el-form-item label="上架费余额：">
-                  <span>{{merData.goods_cost}}</span>
+                  <span>{{merData.ot_goods_cost-merData.goods_cost}}</span>
                 </el-form-item>
               </el-col>
           </el-row>

src/views/merchant/list/index.vue

@@ -55,6 +55,19 @@
             <el-option label="否" value="0" />
           </el-select>
         </el-form-item>
+        <el-form-item label="所属城市：" prop="city_code">
+          <el-cascader
+          ref="cascader"
+          v-model="tableFrom.city_code"
+          :options="cityOptions"
+          :show-all-levels="false"
+          :props="{ emitPath: false,label:'label' }"
+          class="selWidth"
+          @change="handleCascader"
+          clearable
+          >
+        </el-cascader>
+        </el-form-item>
         <el-form-item label="店铺类型：" prop="type_id">
           <el-select
             v-model="tableFrom.type_id"
@@ -161,7 +174,7 @@
         <el-table-column prop="ext.com.mobile" label="对接人电话" min-width="100" />
         <el-table-column prop="ext.com.number" label="对接人编号" min-width="100" />
         <el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" />
-        <el-table-column prop="ext.com.inti_numbe" label="发起人编号" min-width="100" />
+        <el-table-column prop="ext.com.inti_number" label="发起人编号" min-width="100" />
         <el-table-column prop="ext.com.inti_mobile" label="发起人电话" min-width="100" />
         <el-table-column prop="ext.biz.city" label="所属城市" min-width="100" />
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
@@ -240,6 +253,7 @@ import { roterPre } from "@/settings";
 import SettingMer from "@/libs/settingMer";
 import Cookies from "js-cookie";
 import timeOptions from '@/utils/timeOptions';
+import cityOptions from '@/utils/city';
 export default {
   name: "MerchantList",
   components: { merDetail },
@@ -251,6 +265,7 @@ export default {
       isChecked: false,
       listLoading: true,
       merCateList: [],
+      cityOptions:cityOptions,
       storeType: [],
       headeNum: [
         {
@@ -277,7 +292,9 @@ export default {
         is_trader: "",
         is_best: "",
         category_id: '',
-        type_id: ""
+        type_id: "",
+        city_code:'',
+        city:'',
       },
       autoUpdate: true,
       merId: "",
@@ -292,6 +309,10 @@ export default {
     this.getList("");
   },
   methods: {
+  handleCascader(){
+    this.tableFrom.city = this.$refs["cascader"]?.getCheckedNodes()[0]?.label
+    this.getList(1)
+  },
     /**重置 */
     searchReset(){
       this.timeVal = []

src/views/order/list/index.vue

@@ -169,7 +169,7 @@
             clearable
           /> 
         </el-form-item>
-        <!-- <el-form-item label="商品ID：" prop="product_id">
+        <el-form-item label="商品ID：" prop="product_id">
           <el-input
             v-model="tableFrom.product_id"
             @keyup.enter.native="getList(1),getCardList()"
@@ -178,7 +178,7 @@
             clearable
           /> 
         </el-form-item>
-        <el-form-item label="商品编号：" prop="bar_code">
+        <!-- <el-form-item label="商品编号：" prop="bar_code">
           <el-input
             v-model="tableFrom.bar_code"
             @keyup.enter.native="getList(1),getCardList()"

src/views/setting/devise/index.vue

@@ -370,6 +370,7 @@ export default {
         }  
         this.$nextTick(()=>{
             this.lConfig = this.is_store ? this.objToArr(tempPage) : this.objToArr(mPage);
+            console.log(this.lConfig)
             this.getUrlList();
         })
     },
@@ -738,6 +739,7 @@ export default {
                 }
             });
             tempArr.push(basis, marketing, tool);
+            console.log(tempArr)
             this.leftMenu = tempArr;
         },
         diySaveDate(val){
@@ -902,6 +904,8 @@ export default {
                 // objs.bgOpacity = {name: "bgOpacity",status: false,title: "背景模糊"}
                 this.$store.commit('mobildConfig/footPageUpdata', objs);
             }
+            console.log(newArr)
+            console.log(this.lConfig)
             this.showTitle();
         },
         categoryList() {