gsb

bpo-admin/app/base/controller/impl/channelCtl.js

@@ -94,6 +94,7 @@ class ChannelCtl extends CtlBase {
           obj.origin_merchant_id = offlinecompany.id;
         }
       }
+      obj.channel_id = Number(obj.channel_id || 0);
       return await this.service.merchantSave(obj);
     } catch (e) {
       console.log(e);

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

@@ -72,7 +72,7 @@
         <div style="width: 862px; height: 1px;background-color: #E3E3E3;margin: 17px 20px 0px -20px"></div>
       </div>
         <el-form :model="dkcompany" :rules="rules" ref="dkcompany" label-width="150px" label="right" style="padding:0px 100px;" >
-          <div style="0px 10px; line-height: 15px;padding-bottom:40px;">
+          <div style="line-height: 15px;padding-bottom:40px;">
             <div style="width:2px;height:15px;float: left;background-color: #54C4A7">
             </div>
             <span style="font-size:15px;color: #333333;float: left;font-weight:bold;margin-left: 7px;">渠道信息</span>

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

@@ -32,10 +32,6 @@
                 merchant_name: ''
             },
             rules: {
-                channel_id : [
-                    { required: true, message: '请选择渠道名称', trigger: 'blur' },
-                    { validator: validMethod, trigger: 'blur' }
-                ],
                 origin_id : [
                     { required: true, message: '请选择商户来源', trigger: 'blur' },
                     { validator: validMethod, trigger: 'blur' }