fix: 修改冲突

dist/css/chunk-4dde9399.054c0021.css

-.auth-step-body[data-v-c9703e40]{width:400px;margin:0 auto}.el-alert__title[data-v-6246f46e]{line-height:23px}.color-f5222d[data-v-6246f46e]{color:#f5222d}.auth-commit-success[data-v-68854cb4]{margin-top:154px}.auth-commit-success .color-49c958[data-v-68854cb4]{color:#49c958}.auth-commit-success .font-60[data-v-68854cb4]{font-size:60px}.auth-commit-success .m-t-12[data-v-68854cb4]{margin-top:12px}.auth-commit-success .m-t-28[data-v-68854cb4]{margin-top:28px}.input-line-cell[data-v-8106e482]{position:relative;display:inline-block}.w-340[data-v-8106e482]{width:340px}.w-340[data-v-8106e482] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.el-textarea[data-v-8106e482] .el-textarea__inner{font-size:14px;color:#606266;background-color:hsla(0,0%,100%,.1);resize:none;font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,"\5FAE\8F6F\96C5\9ED1",Arial,sans-serif}.el-textarea.is-disabled[data-v-8106e482]{opacity:.5}.el-input .is-disabled[data-v-8106e482] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.tip[data-v-8106e482]{position:absolute;bottom:-5px;right:10px;display:inline-block;line-height:32px;text-align:right;font-size:12px;color:#909399}.auth-commit-admin[data-v-1b25395e]{width:400px;margin:0 auto}.auth-commit-admin .color-49c958[data-v-1b25395e]{color:#49c958}.auth-commit-admin .font-60[data-v-1b25395e]{font-size:60px}.auth-commit-admin .m-t-12[data-v-1b25395e]{margin-top:12px}.auth-commit-admin .m-t-28[data-v-1b25395e]{margin-top:28px}.auth-commit-admin .m-b-32[data-v-1b25395e]{margin-bottom:32px}.auth-commit-admin .w-198[data-v-1b25395e]{width:198px}.auth-commit-admin .audit-admin-body[data-v-1b25395e]{min-width:500px}.auth-commit-admin .audit-admin-body .audit-admin[data-v-1b25395e]{position:relative;color:#606266;font-size:14px;padding:0 8px;margin-bottom:10px}.auth-commit-admin .audit-admin-body .audit-admin[data-v-1b25395e]:nth-child(2n):after{content:"";position:absolute;left:0;top:10px;width:0;height:14px;border-left:1px solid #dcdfe6}.select-tree-wrap[data-v-b0c9cce6]{height:445px;overflow-y:auto;border:1px solid #e4e7ed}.m-b-20[data-v-a960be2a]{margin-bottom:20px}.w-173[data-v-a960be2a]{width:173px}.w-267[data-v-60369b26]{width:267px}.m-t-35[data-v-60369b26]{margin-top:35px}.common-bottom-border[data-v-60369b26]{cursor:pointer;padding-bottom:2px;border-bottom:1px dashed #2f54eb}.el-input-group__prepend[data-v-60369b26]{display:inline-block;width:86px;height:32px;line-height:32px;vertical-align:top;border-color:#c4c6cf}.select-search-input[data-v-60369b26]{display:inline-block;margin-left:-2px}.company-select[data-v-60369b26]{position:relative}.company-select .el-select-dropdown__item[data-v-60369b26]{height:52px;line-height:52px}.company-select .text-ellipsis[data-v-60369b26]{max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.my-customer-wrap[data-v-60369b26]{height:100%}.my-customer-wrap .w-227[data-v-60369b26]{width:227px}.my-customer-wrap .auth-tip-body[data-v-60369b26]{width:645px;margin:0 auto}.my-customer-wrap .enterprise-version[data-v-60369b26]{display:inline-block;vertical-align:top;width:76px;height:32px;margin-right:-1px;background:#f5f7fa;border-radius:2px 0 0 2px;border:1px solid #c4c6cf;border-right:0;font-size:14px;color:#c0c4cc;text-align:center}.my-customer-wrap .store-item-content[data-v-60369b26]{position:relative;width:350px;height:32px;overflow:hidden;white-space:nowrap;border-radius:2px;border:1px solid #c4c6cf;cursor:pointer;-webkit-box-sizing:border-box;box-sizing:border-box}.my-customer-wrap .store-item-content .el-select__tags[data-v-60369b26]{max-width:348px;white-space:nowrap;overflow:hidden}.right-content[data-v-60369b26]{padding:0 20px 20px 20px;min-height:calc(100% - 160px)}.right-content .right-box[data-v-60369b26]{background:#fff;min-height:500px;padding:0}.right-content .right-box .apps-content .apps-content-right[data-v-60369b26]{width:100%;padding:20px;background:#fff}.right-content .right-box .apps-content .apps-content-right .common-set-wrap[data-v-60369b26]{height:100%;background:#fff}
\ No newline at end of file

dist/js/chunk-1c891ef5.46d753c7.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1c891ef5"],{"25ee":function(t,e,o){"use strict";var a=o("bc27"),n=o.n(a);n.a},"53b1":function(t,e,o){"use strict";o.r(e);var a=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",{staticClass:"app-market-body"},[o("div",{staticClass:"app-market-account"},[o("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:"绑定服务市场账号后可购买应用。购买信息在服务市场可查看。",placement:"top-start"}},[o("span",{staticClass:"font-16 color-303133 font-w-600 common-bottom-border"},[t._v("服务市场账号")])]),o("el-button",{class:["m-l-20 bind-btn-add",t.marketAccount.accountId?"bind-btn-hide":"bind-btn-show"],attrs:{type:"primary"},on:{click:t.addAcount}},[t._v("添加")])],1),t.marketAccount.accountId?o("div",{staticClass:"app-market-list"},[o("el-form",{ref:"form",attrs:{"label-width":"85px"}},[o("el-form-item",{staticClass:"color-303133",attrs:{label:"账号"}},[t._v("\n          "+t._s(t._f("formatPhoneNum")(t.marketAccount.phoneNumber))+t._s(t.marketAccount.phoneNumber?"":"--")+"\n      ")]),o("el-form-item",{staticClass:"color-303133",attrs:{label:"绑定时间"}},[t._v("\n          "+t._s(t._f("formatTimeStamp")(t.marketAccount.bindTime))+" "+t._s(t.marketAccount.bindTime?"":"--")+"\n      ")]),o("el-form-item",{staticClass:"color-303133",attrs:{label:"绑定人"}},[t._v("\n          "+t._s(t.marketAccount.bindName||"--")+"\n      ")])],1)],1):t._e(),t.showDialog?o("add-market-dialog",{on:{closeMarket:t.closeMarket}}):t._e()],1)},n=[],r=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("el-dialog",{attrs:{title:"绑定服务市场账号",visible:t.dialogVisible,width:"600px","before-close":t.handleClose},on:{"update:visible":function(e){t.dialogVisible=e}}},[o("div",{},[o("el-form",{ref:"ruleForm",attrs:{model:t.marketForm,rules:t.rules,"label-width":"80px"}},[o("el-form-item",{attrs:{label:"手机号",prop:"phoneNumber"}},[o("country-mobile",{attrs:{"nation-code":t.marketForm.nationCode,"input-width":400,"limit-class":"limit-color",holder:"请输入手机号"},on:{"update:nationCode":function(e){return t.$set(t.marketForm,"nationCode",e)},"update:nation-code":function(e){return t.$set(t.marketForm,"nationCode",e)},checkPhoneNum:t.checkPhoneNum},model:{value:t.marketForm.phoneNumber,callback:function(e){t.$set(t.marketForm,"phoneNumber",e)},expression:"marketForm.phoneNumber"}})],1),o("el-form-item",{attrs:{label:"密码",prop:"password"}},[o("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:"请输入密码",maxlength:"16"},model:{value:t.marketForm.password,callback:function(e){t.$set(t.marketForm,"password",e)},expression:"marketForm.password"}})],1)],1)],1),o("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[o("el-button",{on:{click:t.handleClose}},[t._v("取消")]),o("el-button",{attrs:{type:"primary",loading:t.loadBtn},on:{click:function(e){return t.submitForm("ruleForm")}}},[t._v("确认")])],1)])},i=[],s=function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",{class:["input-line-cell",t.limitClass],style:{width:t.inputWidth+"px"}},[o("el-input",{style:{width:t.inputWidth+"px"},attrs:{maxlength:"20",disabled:t.disflag,placeholder:t.holder},on:{blur:function(e){return t.inputBlur()}},nativeOn:{keyup:function(e){return function(e){return t.toInput(e)}(e)}},model:{value:t.itemValue,callback:function(e){t.itemValue=e},expression:"itemValue"}},[o("el-select",{staticClass:"w-92",attrs:{slot:"prepend",disabled:t.disflag},on:{change:t.changeCode},slot:"prepend",model:{value:t.selCode,callback:function(e){t.selCode=e},expression:"selCode"}},t._l(t.nationCodeList,(function(e,a){return o("el-option",{key:a+"option",attrs:{label:"+"+e.nationCode,value:e.nationCode}},[t._v(t._s(e.name+"  +"+e.nationCode))])})),1)],1)],1)},l=[],c=(o("a481"),o("c5f6"),o("e230")),u=c["a"].getNationCode,d={name:"CountryMobile",props:{value:{type:[String,Number],default:""},nationCode:{type:[String,Number],default:"86"},inputWidth:{type:Number,default:167},holder:{type:String,default:"请输入"},disflag:{type:Boolean,default:!1},limitClass:{type:String,default:""}},data:function(){return{itemValue:this.value,selCode:this.nationCode||"86",nationCodeList:[]}},mounted:function(){var t=this;t.getNationalData(),t.itemValue=t.value||"",t.selCode=t.nationCode||"86"},methods:{changeCode:function(){var t=this;t.$emit("update:nationCode",t.selCode),t.$emit("input",t.itemValue),t.$emit("checkPhoneNum")},toInput:function(t){var e=this;e.itemValue=t.target.value.replace(/[^0-9]/gi,""),e.$emit("input",e.itemValue)},inputBlur:function(){var t=this;t.$emit("input",t.itemValue)},getNationalData:function(){var t=this;u({}).then((function(e){t.nationCodeList=e.result||[]})).catch((function(t){}))}},watch:{value:function(t,e){var o=this;o.itemValue=t||""},nationCode:function(t,e){var o=this;o.selCode=t||"86"}}},m=d,p=(o("25ee"),o("2877")),f=Object(p["a"])(m,s,l,!1,null,"90795b64",null),h=f.exports,b=o("d157"),k=o("8e83"),v=o("5b4e6"),g=o("a689"),C=o.n(g),w=k["a"].addMarketAccount,_={name:"AddMarketDialog",components:{countryMobile:h},data:function(){var t=this,e=function(e,o,a){if(""===o)a(new Error("请输入手机号"));else{var n=new C.a("+"+t.marketForm.nationCode+o);n.isValid()&&n.isMobile()?a():a(new Error("手机号格式不正确"))}};return{dialogVisible:!0,loadBtn:!1,marketForm:{nationCode:"86",phoneNumber:"",password:""},rules:{phoneNumber:[{required:!0,validator:e,trigger:"blur"}],password:[{required:!0,message:"请输入密码",trigger:"blur"}]}}},methods:{checkPhoneNum:function(){var t=this;t.$refs["ruleForm"].validate((function(t){if(t)return!1}))},submitForm:Object(b["a"])((function(t){var e=this;e.$refs[t].validate((function(t){t&&e.postSave()}))}),300),postSave:function(){var t=this;t.loadBtn=!0;var e=t.marketForm,o=e.phoneNumber,a=e.nationCode,n=e.password,r={phoneNumber:o,nationCode:a,password:n};w(r).then((function(e){t.loadBtn=!1,"0000"==e.code?(v["a"].showmsg("绑定成功","success"),t.$refs["ruleForm"].resetFields(),t.$emit("closeMarket",!0)):v["a"].showmsg(e.message||"未知错误","warning")})).catch((function(e){t.loadBtn=!1}))},handleClose:function(){var t=this;t.$emit("closeMarket")}},watch:{}},N=_,F=(o("cbb7"),Object(p["a"])(N,r,i,!1,null,"0c5fdece",null)),y=F.exports,A=k["a"].getMarketAccount,M={name:"",components:{AddMarketDialog:y},data:function(){return{wxEnterpriseId:localStorage.getItem("haoBanUser")?JSON.parse(localStorage.getItem("haoBanUser")).wxEnterpriseId:"",marketAccount:{accountId:"",bindTime:"",bindName:""},showDialog:!1}},mounted:function(){var t=this;t.getMarket(),t.$emit("showTab","/app-market")},methods:{addAcount:function(){var t=this;t.showDialog=!0},closeMarket:function(t){var e=this;e.showDialog=!1,t&&e.getMarket()},getMarket:function(){var t=this,e={};A(e).then((function(e){t.marketAccount=e.result||{}})).catch((function(t){}))}},watch:{}},$=M,x=(o("e90d"),Object(p["a"])($,a,n,!1,null,"267e9cfc",null));e["default"]=x.exports},"6d53":function(t,e,o){},"8e83":function(t,e,o){"use strict";var a=o("71f6"),n={getAppList:"/app-category-list",getAppDetail:"/application-detail",getMarketAccount:"/get-account-info",refreshMarketAccount:"/refesh-account-info",addMarketAccount:{url:"/bind-service-account",method:"post",useFormData:!0,useIntercept:!1},postPhoneCode:{url:"/send-code",method:"post",useFormData:!0,useIntercept:!1},checkCode:{url:"/validate-code",method:"post",useFormData:!0,useIntercept:!1}};e["a"]=Object(a["a"])(n,"/hb-manage-web")},bc27:function(t,e,o){},cbb7:function(t,e,o){"use strict";var a=o("def2"),n=o.n(a);n.a},def2:function(t,e,o){},e90d:function(t,e,o){"use strict";var a=o("6d53"),n=o.n(a);n.a}}]);
\ No newline at end of file

src/views/business/new-auth-merchant.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: 无尘
- * @LastEditTime: 2020-10-20 13:33:36
+ * @LastEditTime: 2020-11-03 17:08:32
  -->
 <template>
   <div class="my-customer-wrap common-set-wrap">
@@ -19,7 +19,7 @@
               </div>
               <div v-if="activeStep == 0" class="auth-tip-body">
                 <auth-tip class="m-t-30"></auth-tip>
-                <el-form :model="authForm" :rules="rules" ref="authForm" label-width="110px" class="dialog-form m-t-20">
+                <el-form :model="authForm" :rules="rules" ref="authForm" label-width="110px" class="dialog-form m-t-20" @submit.native.prevent>
                   <el-form-item prop="enterpriseId">
                     <span slot="label">
                       <el-tooltip class="item" effect="dark" placement="top-start">