Skip to content

H
haoban-3
Commit ecee37d3 by 陈羽
Options

Merge branch 'featrue/销售线索' of http://git.gicdev.com/office/haoban-3 into dev

parents 2eb3f8ec 2fb8b315
Showing with 51 additions and 16 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.3.css><link href=./static/css/app.eedb74e5c56eab7f6702dc7d09d51871.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.ed906c9c7dbfba5817b7.js></script><script type=text/javascript src=./static/js/vendor.cbb689f17e30dfe9e774.js></script><script type=text/javascript src=./static/js/app.d015bba403d8a988ad1d.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.3.css><link href=./static/css/app.0f292723a75cf63f864533eb42bc5c1b.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.5dd0bcdc6a68be4c90f7.js></script><script type=text/javascript src=./static/js/vendor.cbb689f17e30dfe9e774.js></script><script type=text/javascript src=./static/js/app.d015bba403d8a988ad1d.js></script></body></html>
\ No newline at end of file
dist/static/css/app.0f292723a75cf63f864533eb42bc5c1b.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.eedb74e5c56eab7f6702dc7d09d51871.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.ed906c9c7dbfba5817b7.js → dist/static/js/manifest.5dd0bcdc6a68be4c90f7.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={101:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"0d91b2a540cc74c85f20",1:"80ec7107adf684998411",2:"bc98f7457e262624acdb",3:"71289dfc436f4e6b0672",4:"b8702b2c9b9d57e756ab",5:"d8fe280cacc35d1431c3",6:"649d63c7e2d6bf6e55fb",7:"6363571072274ae79c6c",8:"a88c21bd5fe8c2b5d1a0",9:"091c0d9efffd20440220",10:"9c1787439657c4317d06",11:"dee0d46f4db350ec2bb7",12:"991898aabe93f6616b69",13:"49086d57174ef20d5bfc",14:"fe6d93f877adae3d42f0",15:"f7b8b867c1ca117585af",16:"c0b43a0cd4f3c52556c1",17:"e3d5b9c678aadd22d08e",18:"d71b848f78013e7c6635",19:"1a1791d44b00938e0f09",20:"63234464baa425bb995e",21:"d0d07b348a58560cb8e0",22:"91d57db343aeed8d02a5",23:"5bd084681d476ed3c22d",24:"3ae952368657f9e5fbbf",25:"53270642e9a6c0439812",26:"8b69decb8270d6002aa6",27:"8312a82db1df5bcef43b",28:"181d022f60aba1321085",29:"cae77e6ee839398a01ad",30:"f040b2abfc4803f10e38",31:"5b5031fb2f22a3d34e35",32:"8bd21e28ef5fdc6ea496",33:"19432b5a56e1286e2918",34:"5ec202078d1a2d356535",35:"5c1b9708baa993686c46",36:"deb49e9f768aed9d6da8",37:"803f53b66c4fb091e086",38:"47244e611bf46cbde220",39:"f3ada4f4e04998fa7cea",40:"e75c01a42586236c756b",41:"e0a6690a7da361021db8",42:"16f1c4be72ca23c622d9",43:"2f86da0212a04f75f854",44:"6735568b83cc45c16117",45:"ff2159fa68f3bc7f537b",46:"046091a81c65f31cca07",47:"fd1a33a0a70a4cd06db1",48:"4760ddceb57af73e0a91",49:"4c2735d786976cdc34e1",50:"14f45c9d88e1c733d539",51:"51bad676a11cc6df4d7e",52:"7e2460e6eb686c63f790",53:"8993da6d7ff709439761",54:"9a0211ec43cd2892b0c2",55:"090f82f55f87df498994",56:"c3d0e60f1b32e4b17442",57:"ebe7791c87e83f0b2cee",58:"584983b6273c34a1fd1d",59:"82ced062becfdc5b9091",60:"1c7701ef6f5b18b8d533",61:"14a359600fd740f5d245",62:"58dcdfc5267c3d0d3a09",63:"049efae24a1ce59a4aae",64:"9296449a6ebb17339ca9",65:"c3fa89ddee50cc4ada7f",66:"fa0c7830f2197c20c47d",67:"8fea86b65971c6f691ca",68:"393579b3a668eb478428",69:"563ea7852d54e9f100b2",70:"ed4fc3ae5f90d7e6d76e",71:"0953e49534b7f580e9bd",72:"bd0f836eb592cf9da15c",73:"486d4c4d8fc91bed81ce",74:"a4ae759437fe9a1aadce",75:"eee2e6a9470fd40f396d",76:"c4668d1e6cb453fcfa3a",77:"632fc7ad4e783c2e830c",78:"9441f4ef8e997e867c44",79:"d3d476ebbc06278aabe6",80:"3b514341d231501adfed",81:"baead8c4685626f030bc",82:"7daf1da09932336ff51f",83:"d8d930b0866e47066d3c",84:"002db9f2cd4834518be9",85:"21c5a01ba6d0a776ae5e",86:"b8025338ffaeba03f591",87:"86916a4c0476a3e0a6d1",88:"7283961738bbffc68200",89:"191c546f3945558e3105",90:"8328de831fe7a4d46b88",91:"644a46976a99d5868e71",92:"b3f8acc4de02b5c666b9",93:"f8ccef1d640cc1bd5a75",94:"90591526e1b797658fa0",95:"ab013459fd554d5bac03",96:"6c6eb5ef6172208c1d1b",97:"5363440da82f7efcf921",98:"8fe75f8bede44bc4968c"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={101:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"0d91b2a540cc74c85f20",1:"80ec7107adf684998411",2:"bc98f7457e262624acdb",3:"71289dfc436f4e6b0672",4:"b8702b2c9b9d57e756ab",5:"d8fe280cacc35d1431c3",6:"649d63c7e2d6bf6e55fb",7:"6363571072274ae79c6c",8:"f6c4007456385433a9fa",9:"091c0d9efffd20440220",10:"9c1787439657c4317d06",11:"dee0d46f4db350ec2bb7",12:"991898aabe93f6616b69",13:"49086d57174ef20d5bfc",14:"fe6d93f877adae3d42f0",15:"f7b8b867c1ca117585af",16:"c0b43a0cd4f3c52556c1",17:"e3d5b9c678aadd22d08e",18:"d71b848f78013e7c6635",19:"1a1791d44b00938e0f09",20:"63234464baa425bb995e",21:"d0d07b348a58560cb8e0",22:"91d57db343aeed8d02a5",23:"5bd084681d476ed3c22d",24:"3ae952368657f9e5fbbf",25:"53270642e9a6c0439812",26:"8b69decb8270d6002aa6",27:"8312a82db1df5bcef43b",28:"181d022f60aba1321085",29:"cae77e6ee839398a01ad",30:"f040b2abfc4803f10e38",31:"5b5031fb2f22a3d34e35",32:"8bd21e28ef5fdc6ea496",33:"19432b5a56e1286e2918",34:"5ec202078d1a2d356535",35:"5c1b9708baa993686c46",36:"deb49e9f768aed9d6da8",37:"803f53b66c4fb091e086",38:"47244e611bf46cbde220",39:"f3ada4f4e04998fa7cea",40:"e75c01a42586236c756b",41:"e0a6690a7da361021db8",42:"16f1c4be72ca23c622d9",43:"2f86da0212a04f75f854",44:"6735568b83cc45c16117",45:"ff2159fa68f3bc7f537b",46:"046091a81c65f31cca07",47:"fd1a33a0a70a4cd06db1",48:"4760ddceb57af73e0a91",49:"4c2735d786976cdc34e1",50:"14f45c9d88e1c733d539",51:"51bad676a11cc6df4d7e",52:"7e2460e6eb686c63f790",53:"8993da6d7ff709439761",54:"9a0211ec43cd2892b0c2",55:"090f82f55f87df498994",56:"c3d0e60f1b32e4b17442",57:"ebe7791c87e83f0b2cee",58:"584983b6273c34a1fd1d",59:"82ced062becfdc5b9091",60:"1c7701ef6f5b18b8d533",61:"14a359600fd740f5d245",62:"58dcdfc5267c3d0d3a09",63:"049efae24a1ce59a4aae",64:"9296449a6ebb17339ca9",65:"c3fa89ddee50cc4ada7f",66:"fa0c7830f2197c20c47d",67:"8fea86b65971c6f691ca",68:"393579b3a668eb478428",69:"563ea7852d54e9f100b2",70:"ed4fc3ae5f90d7e6d76e",71:"0953e49534b7f580e9bd",72:"bd0f836eb592cf9da15c",73:"486d4c4d8fc91bed81ce",74:"a4ae759437fe9a1aadce",75:"eee2e6a9470fd40f396d",76:"c4668d1e6cb453fcfa3a",77:"632fc7ad4e783c2e830c",78:"9441f4ef8e997e867c44",79:"d3d476ebbc06278aabe6",80:"3b514341d231501adfed",81:"baead8c4685626f030bc",82:"7daf1da09932336ff51f",83:"d8d930b0866e47066d3c",84:"002db9f2cd4834518be9",85:"21c5a01ba6d0a776ae5e",86:"b8025338ffaeba03f591",87:"86916a4c0476a3e0a6d1",88:"7283961738bbffc68200",89:"191c546f3945558e3105",90:"8328de831fe7a4d46b88",91:"644a46976a99d5868e71",92:"b3f8acc4de02b5c666b9",93:"f8ccef1d640cc1bd5a75",94:"90591526e1b797658fa0",95:"ab013459fd554d5bac03",96:"6c6eb5ef6172208c1d1b",97:"5363440da82f7efcf921",98:"8fe75f8bede44bc4968c"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/business/authMerchant-form.vue
......@@ -18,7 +18,7 @@
</div>
</div>
<div class="m-t-24">
<el-form :model="partForm" :rules="rules" ref="form" label-width="128px" class="dialog-form" style="width:414px;">
<el-form :model="partForm" :rules="rules" ref="form" label-width="128px" class="dialog-form">
<el-form-item label="企业名称">
{{ corpName }}
</el-form-item>
......@@ -48,7 +48,7 @@
<div class="select-search-input cursor-pointer" slot="reference">
<div>
<el-form-item prop="searchSelect">
<el-input placeholder="请搜索选择商户" maxlength="50" :disabled="type === 'edit'" v-model="partForm.searchSelect" @keyup.native="querySearchAsync('search')"> </el-input>
<el-input class="w-287" placeholder="请搜索选择商户" maxlength="50" :disabled="type === 'edit'" v-model="partForm.searchSelect" @keyup.native="querySearchAsync('search')"> </el-input>
</el-form-item>
</div>
</div>
......@@ -60,19 +60,37 @@
</el-tooltip>
<gic-select-group-auth :brandId="enterpriseId" width="287px" :authMerchant="true" :selectData="partForm.storeGroup" @checkGroupIds="checkGroupIds"> </gic-select-group-auth>
</el-form-item>
<el-form-item>
<el-form-item style="margin-top:-10px;margin-bottom:12px;">
<el-tooltip slot="label" class="item" effect="dark" :open-delay="200" placement="top-start">
<div slot="content" style="line-height:18px;">企微扫码添加好友时，是否创建会员。<br />非总部开放平台的代理商请选择不开卡，否则创建的会员与总部会员无法打通。</div>
<span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">企微开卡设置</span>
<div slot="content" style="line-height:18px;">
①选择同一开平，通过企业微信添加客户，可以直接更新会员信息（一码两用）。<br />
原因：因为获取的用户unionid相同，可以将客户身份（企微客户）和会员（微信会员）身份直接关联；<br />
②选择不同开平，通过企业微信添加客户，无法直接更新会员信息（一码两用）。<br />
原因：因为获取的用户unionid不同，无法将客户身份（企微客户）和会员（微信会员）身份直接关联
</div>
<span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">开放平台类型</span>
</el-tooltip>
<p>
<el-radio v-model="partForm.memberOpenCardFlag" :label="0" :disabled="type === 'edit'"><span class="color-303133">加好友自动开卡</span><span class="color-606266">（同一开放平台选择此项）</span></el-radio>
</p>
<p>
<el-radio v-model="partForm.memberOpenCardFlag" :label="1" :disabled="type === 'edit'"><span class="color-303133">加好友不开卡</span><span class="color-606266">（不同开放平台选择此项）</span></el-radio>
</p>
<div style="padding-top: 10px;">
<el-radio v-model="partForm.memberOpenCardFlag" :label="0" :disabled="type === 'edit'">
<div class="m-b-20" style="display:inline-block;vertical-align:top;">
<p class="l-h-1 m-b-5 color-303133">同一开平</p>
<p class="tip">(授权商户的小程序/公众号，和当前企业【客户联系】微信开发者ID绑在同一开放平台 。例：绑定同一开平的集团企业）</p>
</div>
</el-radio>
</div>
<div>
<el-radio v-model="partForm.memberOpenCardFlag" :label="1" :disabled="type === 'edit'">
<div style="display:inline-block;vertical-align:top;">
<p class="l-h-1 m-b-5 color-303133">不同开平</p>
<p class="tip">(授权商户的小程序/公众号，和当前企业【客户联系】微信开发者ID绑在不同开放平台。例：没绑定同一开平的代理商企业）</p>
</div>
</el-radio>
</div>
</el-form-item>
<el-form-item label="企业类型">
<el-radio v-model="partForm.wxEnterpriseType" :label="0" :disabled="type === 'edit'">总部</el-radio>
<el-radio v-model="partForm.wxEnterpriseType" :label="1" :disabled="type === 'edit'">代理</el-radio>
</el-form-item>
<el-form-item label="企业类型"> <el-radio v-model="partForm.wxEnterpriseType" :label="0" :disabled="type === 'edit'">总部</el-radio> <el-radio v-model="partForm.wxEnterpriseType" :label="1" :disabled="type === 'edit'">代理</el-radio> </el-form-item>
<el-button type="primary" style="display:block;margin:38px 0 0 128px;" @click="addShow = true" :disabled="!(enterpriseId && partForm.storeGroup.length && partForm.searchSelect)">授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button>
</el-form>
</div>
......@@ -335,6 +353,23 @@ export default {
};
</script>
<style type="text/scss" lang="scss" scoped>
.w-287 {
width: 287px;
}
.m-b-20 {
margin-bottom: 20px;
}
.m-b-5 {
margin-bottom: 5px;
}
.l-h {
line-height: 1;
}
.tip {
font-size: 12px;
color: #909399;
line-height: 22px;
}
.span-dot {
display: inline-block;
vertical-align: middle;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment