From 1f608dc7abdbefcbbec1c5cb96d735aa17be7a69 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Thu, 25 Apr 2024 10:08:23 +0800
Subject: [PATCH] add

---
 src/views/merchant/application/index.vue      |  2 +-
 src/views/merchant/list/handle/merDetails.vue |  3 ++
 .../merchant/list/handle/merEditForm.vue      | 34 ++++++++++---------
 src/views/merchant/list/handle/merInfo.vue    | 17 +++++++---
 src/views/merchant/list/index.vue             |  2 +-
 src/views/setting/devise/list.vue             |  2 +-
 6 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 39f7913..721862b 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -13,7 +13,7 @@
             <el-option label="全部" value=""/>
             <el-option label="待审核" value="0"/>
             <el-option label="审核通过" value="1"/>
-            <el-option label="审核未通过" value="-1"/>
+            <el-option label="审核未通过" value="2"/>
           </el-select>
         </el-form-item>
         <el-form-item label="选择时间：">
diff --git a/src/views/merchant/list/handle/merDetails.vue b/src/views/merchant/list/handle/merDetails.vue
index c55c1c3..b79c973 100644
--- a/src/views/merchant/list/handle/merDetails.vue
+++ b/src/views/merchant/list/handle/merDetails.vue
@@ -172,6 +172,9 @@ export default {
     initData(){
       this.merData = {
         is_trader:0,
+        is_margin:0,
+        is_service:0,
+        is_goods:0,
         financial_bank:{
           name:'',
           bank:'',
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 1a1ea08..db93dcf 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -240,16 +240,17 @@
               <el-form-item label="技术服务费：" label-width="146px">
                 <el-radio-group v-model="merData.is_service">
                   <el-radio :label="0" class="radio">无</el-radio>
-                  <el-radio :label="1">有</el-radio>
+                  <el-radio v-if="merData.is_service!=10" :label="1">有</el-radio>
+                  <el-radio v-else :label="10">有</el-radio>
                 </el-radio-group>
-                <span v-if="merData.is_service == 1">
+                <span v-if="merData.is_service != 0">
                   <el-input
                     v-model="merData.service_cost"
                     placeholder="请填写技术服务费"
                     style="width:120px;margin-left: 8px;"
                   /> 元,
                 </span>  
-                <span v-if="merData.is_service == 1">
+                <span v-if="merData.is_service != 0">
                   额度
                   <el-input
                     v-model="merData.ot_service_cost"
@@ -263,16 +264,17 @@
               <el-form-item label="上架费：" label-width="146px">
                 <el-radio-group v-model="merData.is_goods">
                   <el-radio :label="0" class="radio">无</el-radio>
-                  <el-radio :label="1">有</el-radio>
+                  <el-radio v-if="merData.is_goods!=10" :label="1">有</el-radio>
+                  <el-radio v-else :label="10">有</el-radio>
                 </el-radio-group>
-                <span v-if="merData.is_goods == 1">
+                <span v-if="merData.is_goods != 0">
                   <el-input
                     v-model="merData.goods_cost"
                     placeholder="请填写上架费"
                     style="width:120px;margin-left: 8px;"
                   /> 元,
                 </span>  
-                <span v-if="merData.is_goods == 1">
+                <span v-if="merData.is_goods != 0">
                   额度
                   <el-input
                     v-model="merData.ot_goods_cost"
@@ -300,35 +302,35 @@
             <el-row :gutter="24" class="mt20">
               <el-col v-if="!isAdd":span="8">
                 <el-form-item label="保证金支付状态：">
-                  <span>{{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}</span>
+                  <span>{{merData.is_margin != 0?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.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}</span>
+                  <span>{{merData.is_service != 0?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.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}}</span>
+                  <span>{{merData.is_goods != 0?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.is_margin == 1?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}}</span>
+                  <span>{{merData.is_margin != 0?(merData.ot_margin<+merData.margin)?merData.margin:(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="150px">
-                  <span>{{merData.is_service == 1?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}}</span>
+                  <span>{{merData.is_service != 0?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}}</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.is_goods == 1?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}</span>
+                  <span>{{merData.is_goods != 0?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}</span>
                   <!-- <span>{{merData.ot_goods_cost-merData.goods_cost}}</span> -->
                 </el-form-item>
               </el-col>
@@ -449,22 +451,22 @@
               </el-form-item>
             </el-col>
             <el-col v-if="!isAdd" :span="12">
-              <el-form-item label="联系人：" prop="ext.com.contact" v-if="merData.ext&&merData.ext.com">
+              <el-form-item label="联系人：" prop="real_name">
                 <el-input
                   type="text"
                   size="small"
                   placeholder="请填写联系人"
-                  v-model="merData.ext.com.contact"
+                  v-model="merData.real_name"
                   class="selWidth"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="联系电话：" prop="ext.com.mobile" v-if="merData.ext&&merData.ext.com">
+              <el-form-item label="联系电话：" prop="mer_phone">
                 <el-input
                   size="small"
                   placeholder="请填写联系电话"
-                  v-model="merData.ext.com.mobile"
+                  v-model="merData.mer_phone"
                   class="selWidth"
                 />
               </el-form-item>
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 072c6a4..a7561a1 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -175,9 +175,9 @@
             费用余额：保证金：{{merData.margin== 0 ? '无' : merData.margin}}，技术服务费：{{merData.service_cost == 0 ? '无' : merData.service_cost}}，上架费：{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
           </div>
           <div class="section item" style="border: none;">
-            支付状态：保证金：{{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}，
-            技术服务费：{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}，
-            上架费：{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}}
+            支付状态：保证金：{{ marginNumber }}，
+            技术服务费：{{ serviceNumber }}，
+            上架费：{{ goodsNumber }}
           </div>
         </div>
         <div class="section">
@@ -385,7 +385,16 @@ export default {
   computed: {
     companyImage(){
       return this.merData.ext?.company_image
-    }
+    },
+    marginNumber(){
+      return this.merData.is_margin == 0?'无':this.merData.ot_margin-this.merData.margin>0 ? '待缴' : '已缴'
+    },
+    serviceNumber(){
+      return this.merData.is_service == 0?'无':this.merData.ot_service_cost-this.merData.service_cost>0 ? '待缴' : '已缴'
+    },
+    goodsNumber(){
+      return this.merData.is_goods == 0?'无':this.merData.ot_goods_cost-this.merData.goods_cost>0 ? '待缴' : '已缴'
+    },
   },
   methods: {
     lookImg(item) {
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 2117511..a18cbf4 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -324,7 +324,7 @@ export default {
       merchantLoginApi(id)
         .then(res => {
           Cookies.set("merchantToken", res.data.token);
-          window.open(SettingMer.httpUrl + res.data.url);
+          window.open(`${location.origin}${res.data.url}`);
         })
         .catch(res => {
           this.$message.error(res.message);
diff --git a/src/views/setting/devise/list.vue b/src/views/setting/devise/list.vue
index 1127e82..d66d3e7 100644
--- a/src/views/setting/devise/list.vue
+++ b/src/views/setting/devise/list.vue
@@ -143,7 +143,7 @@ export default {
       imgUrl:'',
       tabPosition: "left",
       modal: false,
-      BaseURL: SettingMer.httpUrl || 'http://localhost:8080',
+      BaseURL: `${location.origin}` || 'http://localhost:8080',
       cardShow: 0,
       loadingExist: false,
       isDiy: 1,