gsb

bpo-admin/app/base/system.js

@@ -264,7 +264,7 @@ class System {
 			var domain = "http://39.107.234.14";
 			return {
 				// 渠道服务
-				channel: domain2 + ":3003" + path,
+				channel: domain + ":3003" + path,
 			}
 		} else {
 			// var odomain = "http://123.57.217.203"

bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.html

@@ -130,9 +130,9 @@
               :disabled="dkcompany.id && dkcompany.origin_merchant_id"
             ></el-autocomplete>
           </el-form-item> -->
-          <el-form-item label="关联商户：" prop="merchant_name" v-if="is_api == 1" >
+          <el-form-item label="关联商户：" prop="origin_merchant_name" v-if="is_api == 1" >
             <el-select
-                v-model="dkcompany.merchant_name"
+                v-model="dkcompany.origin_merchant_name"
                 filterable
                 remote
                 clearable
@@ -156,9 +156,9 @@
           </el-form-item>
 
 
-          <el-form-item label="关联商户：" prop="merchant_name" v-if="is_api == 0">
+          <el-form-item label="关联商户：" prop="origin_merchant_name" v-if="is_api == 0">
             <el-select
-                    v-model="dkcompany.merchant_name"
+                    v-model="dkcompany.origin_merchant_name"
                     filterable
                     remote
                     clearable
@@ -183,8 +183,8 @@
           </el-form-item>
 
 
-          <el-form-item label="商户名称：" prop="origin_merchant_name">
-            <el-input v-model="dkcompany.origin_merchant_name" placeholder="请输入商户名称" maxlength="200" style="width:468px;" clearable ></el-input>
+          <el-form-item label="商户名称：" prop="merchant_name">
+            <el-input v-model="dkcompany.merchant_name" placeholder="请输入商户名称" maxlength="200" style="width:468px;" clearable ></el-input>
           </el-form-item>
 
 

bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.js

@@ -343,7 +343,7 @@
             let mn = self.merchantNameMap[val] || {};
             console.log(val, "-------------", mn);
             this.dkcompany.origin_merchant_id = mn.id;
-            this.dkcompany.merchant_name = mn.name;
+            this.dkcompany.origin_merchant_name = mn.name;
             console.log(this.dkcompany);
         },
         merchantNameChangeoffline(val) {
@@ -352,7 +352,7 @@
             let mn = self.merchantNameMapoffline[val] || {};
             console.log(val, "-------------", mn);
             this.dkcompany.origin_merchant_id = mn.id;
-            this.dkcompany.merchant_name = mn.name;
+            this.dkcompany.origin_merchant_name = mn.name;
             console.log(this.dkcompany);
         },
     },