Skip to content

H
haoban-3
Commit ee132f23 by 陈羽
Options

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

# Conflicts:
#	src/views/salesleads/storeDetail.vue
parents 8c841a91 68aa2bc0
Showing with 84 additions and 22 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.60459933b0e0d6df2ef6815234188336.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.76cad501062aeff14191.js></script><script type=text/javascript src=./static/js/vendor.ee6b165f5156b48c4dca.js></script><script type=text/javascript src=./static/js/app.827d6023336ca6bf5bb0.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.f13d7366f3717a81a6973c4ab39612b4.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.a84eb7f47ce075bd82de.js></script><script type=text/javascript src=./static/js/vendor.ee6b165f5156b48c4dca.js></script><script type=text/javascript src=./static/js/app.eb77498e45a671525ee5.js></script></body></html>
\ No newline at end of file
dist/static/css/app.60459933b0e0d6df2ef6815234188336.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f13d7366f3717a81a6973c4ab39612b4.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/40.e75c01a42586236c756b.js 0 → 100644
webpackJsonp([40],{q4sc:function(t,e){},xWf4:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),o=a("P9l9"),r=a("Ch4/"),i={props:{},data:function(){return{form:{},openFlag:0}},filters:{},methods:{changeRoute:function(){this.$router.push("/salutatorySet")},getData:function(){var t=this;Object(o.a)("/haoban-manage3-web/get-welcome",{}).then(function(e){var a=e.data;1==a.errorCode&&a.result&&(t.form=n()({},a.result),t.openFlag=a.result.openFlag),r.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})},setWelcome:function(t){var e=this,a=this;a.$refs.form.validate(function(s){s&&e.$confirm("是否确定修改欢迎语启用状态？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(o.a)("/haoban-manage3-web/set-welcome",{openFlag:t}).then(function(t){var e=t.data;1==e.errorCode&&(a.$message.success({duration:1e3,message:"设置成功"}),window.location.reload()),r.a.errorMsg(e)}).catch(function(t){a.$message.error({duration:1e3,message:t.message})})}).catch(function(){a.openFlag=1===a.openFlag?0:1})})}},watch:{},mounted:function(){this.$emit("showTab",4),document.documentElement.style.backgroundColor="#f0f2f5",this.getData()},destroyed:function(){document.documentElement.style.backgroundColor="#fff"},components:{}},l={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"daily-set-wrap "},[a("div",{staticClass:"daily-set-content border-box"},[t._m(0),t._v(" "),a("div",{staticClass:"salutatory-wrap m-t-20"},[a("div",{staticClass:"top"},[a("p",{staticClass:"left"},[t._v("欢迎语标题 "+t._s(t.form.title||"系统默认"))]),t._v(" "),a("p",{staticClass:"right"},[a("span",{staticClass:"date"},[t._v("最近编辑时间："+t._s(t._f("formatTimeStamp")(t.form.updateTime)))]),a("el-button",{staticStyle:{"margin-right":"43px"},attrs:{type:"text"},on:{click:t.changeRoute}},[t._v("编辑")]),a("el-switch",{attrs:{"active-value":1,"inactive-value":0},on:{change:t.setWelcome},model:{value:t.openFlag,callback:function(e){t.openFlag=e},expression:"openFlag"}})],1)]),t._v(" "),a("p",{staticClass:"line"}),t._v(" "),a("div",{staticClass:"bottom"},[a("el-form",{ref:"form",attrs:{"label-width":"70px",model:t.form}},[a("el-form-item",{attrs:{label:"文本内容"}},[a("p",{staticClass:"welcome-text"},[t._v(t._s(t.form.welcomeContent||"你好，< 微信昵称 >"))])])],1)],1)])])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"admin-tip-body"},[e("div",{staticClass:"el-alert el-alert--info",attrs:{role:"alert"}},[e("i",{staticClass:"el-alert__icon el-icon-info"}),this._v(" "),e("div",{staticClass:"el-alert__content"},[e("p",{staticClass:"el-alert__title"},[this._v("\n 1. 因企业微信接口限制，若在企微管理端为相关人员配置欢迎语，好办设置欢迎语不会生效；"),e("br"),this._v("\n 2. 若使用好办欢迎语，请关闭其他企业自建应用/第三方应用的欢迎语配置； "),e("br"),this._v("\n 3. 欢迎语的业务场景是为了支持在代理商主体下的外部联系人与总部的会员能互联，暂不支持其他需求场景\n ")])])])])}]};var c=a("VU/8")(i,l,!1,function(t){a("q4sc")},"data-v-ec2eefbc",null);e.default=c.exports}});
\ No newline at end of file
dist/static/js/41.00a5e75b0696a4f8f81d.js deleted 100644 → 0
webpackJsonp([41],{"8Uv2":function(t,e){},xWf4:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),o=a.n(s),r=a("P9l9"),n=a("Ch4/"),i={props:{},data:function(){return{form:{}}},filters:{},methods:{changeRoute:function(){this.$router.push("/salutatorySet")},getData:function(){var t=this;Object(r.a)("/haoban-manage3-web/get-welcome",{}).then(function(e){var a=e.data;1==a.errorCode&&a.result&&(t.form=o()({},a.result)),n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},watch:{},mounted:function(){this.$emit("showTab",4),document.documentElement.style.backgroundColor="#f0f2f5",this.getData()},destroyed:function(){document.documentElement.style.backgroundColor="#fff"},components:{}},l={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"daily-set-wrap "},[a("div",{staticClass:"daily-set-content border-box"},[t._m(0),t._v(" "),a("div",{staticClass:"salutatory-wrap m-t-20"},[a("div",{staticClass:"top"},[a("p",{staticClass:"left"},[t._v("欢迎语标题 "+t._s(t.form.title||"系统默认"))]),t._v(" "),a("p",{staticClass:"right"},[a("span",{staticClass:"date"},[t._v("最近编辑时间："+t._s(t._f("formatTimeStamp")(t.form.updateTime)))]),a("el-button",{attrs:{type:"text"},on:{click:t.changeRoute}},[t._v("编辑")])],1)]),t._v(" "),a("p",{staticClass:"line"}),t._v(" "),a("div",{staticClass:"bottom"},[a("el-form",{ref:"form",attrs:{"label-width":"70px",model:t.form}},[a("el-form-item",{attrs:{label:"文本内容"}},[t._v(" "+t._s(t.form.welcomeContent||"你好，< 微信昵称 >"))])],1)],1)])])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"admin-tip-body"},[e("div",{staticClass:"el-alert el-alert--info",attrs:{role:"alert"}},[e("i",{staticClass:"el-alert__icon el-icon-info"}),this._v(" "),e("div",{staticClass:"el-alert__content"},[e("p",{staticClass:"el-alert__title"},[this._v("\n 1. 因企业微信接口限制，若在企微管理端为相关人员配置欢迎语，好办设置欢迎语不会生效；"),e("br"),this._v("\n 2. 若使用好办欢迎语，请关闭其他企业自建应用/第三方应用的欢迎语配置； "),e("br"),this._v("\n 3. 欢迎语的业务场景是为了支持在代理商主体下的外部联系人与总部的会员能互联，暂不支持其他需求场景\n ")])])])])}]};var c=a("VU/8")(i,l,!1,function(t){a("8Uv2")},"data-v-e7da5280",null);e.default=c.exports}});
\ No newline at end of file
dist/static/js/40.f0af54d2bd4734f497c2.js → dist/static/js/41.e0a6690a7da361021db8.js
webpackJsonp([40],{"+lem":function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("NKg7"),i=a("Qie6"),c={name:"reviewed",components:{vueOfficeHeader:n.a,commonDetailLeft:i.a},data:function(){return{projectName:"haoban-manage-web",collapseFlag:!1,contentHeight:"0px",activeSelTab:"1",activeTab:"1",tabListData:[{tabId:"1",tabName:"待审核",icon:"icondaishenhe_orange"},{tabId:"2",tabName:"已审核",icon:"iconrenwu1"},{tabId:"3",tabName:"审核设置",icon:"iconshenhe"}]}},computed:{},methods:{changeRoute:function(t){this.$router.push(t)},setSelectTab:function(t){switch(this.activeTab=t.tabId,t.tabId){case"1":this.changeRoute("unreview");break;case"2":this.changeRoute("reviewed");break;case"3":this.changeRoute("reviewSet")}},showTab:function(t){this.activeTab=t,this.activeSelTab=t,this.tabListData.forEach(function(e){e.tabId==t&&(e.onlyIconActive=!1),e.children&&e.children.forEach(function(a){a.tabId==t&&(e.onlyIconActive=!0),a.children&&a.children.forEach(function(a){a.tabId==t&&(e.onlyIconActive=!0)})})})},toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},watch:{$route:{handler:function(t,e){},deep:!0}},mounted:function(){this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"review-wrap"},[a("vue-office-header",{attrs:{projectName:t.projectName},on:{collapseTag:t.collapseTag,toRouterView:t.toRouterView}}),t._v(" "),a("div",{staticClass:"setting-wrap__body"},[a("div",{staticClass:"content",attrs:{id:"content"}},[a("div",{staticClass:"content-body"},[a("div",{staticClass:"content-body-inner flex border-box"},[a("div",{staticClass:"apps-content-left w-157",staticStyle:{"min-height":"calc(100vh - 86px)"}},[a("common-detail-left",{attrs:{tabListData:t.tabListData,activeSelTab:t.activeSelTab},on:{setSelectTab:t.setSelectTab}})],1),t._v(" "),a("div",{staticClass:"apps-content-right border-box"},[a("transition",{attrs:{name:"fade",mode:"out-in"}},[a("router-view",{attrs:{brandId:t.activeBrand,activeGroupId:t.activeGroup,tabType:t.activeTab},on:{showTab:t.showTab}})],1)],1)])])])])],1)},staticRenderFns:[]};var s=a("VU/8")(c,o,!1,function(t){a("YQka")},null,null);e.default=s.exports},YQka:function(t,e){}});
\ No newline at end of file
webpackJsonp([41],{"+lem":function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("NKg7"),i=a("Qie6"),c={name:"reviewed",components:{vueOfficeHeader:n.a,commonDetailLeft:i.a},data:function(){return{projectName:"haoban-manage-web",collapseFlag:!1,contentHeight:"0px",activeSelTab:"1",activeTab:"1",tabListData:[{tabId:"1",tabName:"待审核",icon:"icondaishenhe_orange"},{tabId:"2",tabName:"已审核",icon:"iconrenwu1"},{tabId:"3",tabName:"审核设置",icon:"iconshenhe"}]}},computed:{},methods:{changeRoute:function(t){this.$router.push(t)},setSelectTab:function(t){switch(this.activeTab=t.tabId,t.tabId){case"1":this.changeRoute("unreview");break;case"2":this.changeRoute("reviewed");break;case"3":this.changeRoute("reviewSet")}},showTab:function(t){this.activeTab=t,this.activeSelTab=t,this.tabListData.forEach(function(e){e.tabId==t&&(e.onlyIconActive=!1),e.children&&e.children.forEach(function(a){a.tabId==t&&(e.onlyIconActive=!0),a.children&&a.children.forEach(function(a){a.tabId==t&&(e.onlyIconActive=!0)})})})},toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},watch:{$route:{handler:function(t,e){},deep:!0}},mounted:function(){this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"review-wrap"},[a("vue-office-header",{attrs:{projectName:t.projectName},on:{collapseTag:t.collapseTag,toRouterView:t.toRouterView}}),t._v(" "),a("div",{staticClass:"setting-wrap__body"},[a("div",{staticClass:"content",attrs:{id:"content"}},[a("div",{staticClass:"content-body"},[a("div",{staticClass:"content-body-inner flex border-box"},[a("div",{staticClass:"apps-content-left w-157",staticStyle:{"min-height":"calc(100vh - 86px)"}},[a("common-detail-left",{attrs:{tabListData:t.tabListData,activeSelTab:t.activeSelTab},on:{setSelectTab:t.setSelectTab}})],1),t._v(" "),a("div",{staticClass:"apps-content-right border-box"},[a("transition",{attrs:{name:"fade",mode:"out-in"}},[a("router-view",{attrs:{brandId:t.activeBrand,activeGroupId:t.activeGroup,tabType:t.activeTab},on:{showTab:t.showTab}})],1)],1)])])])])],1)},staticRenderFns:[]};var s=a("VU/8")(c,o,!1,function(t){a("YQka")},null,null);e.default=s.exports},YQka:function(t,e){}});
\ No newline at end of file
dist/static/js/manifest.76cad501062aeff14191.js → dist/static/js/manifest.a84eb7f47ce075bd82de.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[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(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={102:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;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:"f4a600c1698b4db27837",1:"80ec7107adf684998411",2:"6afd37c53f738e9fc7f1",3:"71289dfc436f4e6b0672",4:"b8702b2c9b9d57e756ab",5:"1ddf59e2f4b25bb7a88e",6:"649d63c7e2d6bf6e55fb",7:"6363571072274ae79c6c",8:"3b97965f53e62a71176e",9:"08fbefb20e8c1260a1c0",10:"9c1787439657c4317d06",11:"dee0d46f4db350ec2bb7",12:"55c2d219a783d05ec76e",13:"44f89ebe5ffed1d60ca5",14:"f83f27e744f45ce79261",15:"f6ea00918b55848f0650",16:"e1f4c3104355b9d9b7a6",17:"a4ca74aef34e27c5cef8",18:"63080d8ad84dd075f58a",19:"7e9c036c00f085735ce4",20:"4bf088d10b41f7fa3468",21:"a2e3d05b0875576203b0",22:"373f09ad2411fac82d01",23:"2fdd52618d1df5eaaf82",24:"97081c29457ab8c9f848",25:"53270642e9a6c0439812",26:"9851a72754973adc65cb",27:"545947e11a00565ce9cc",28:"5588faf7dd1a48d53c9f",29:"cae77e6ee839398a01ad",30:"f040b2abfc4803f10e38",31:"5b5031fb2f22a3d34e35",32:"624b265b03a402e1710f",33:"19432b5a56e1286e2918",34:"5ec202078d1a2d356535",35:"5c1b9708baa993686c46",36:"deb49e9f768aed9d6da8",37:"803f53b66c4fb091e086",38:"47244e611bf46cbde220",39:"a75c35fa38cb53a3bc58",40:"f0af54d2bd4734f497c2",41:"00a5e75b0696a4f8f81d",42:"16f1c4be72ca23c622d9",43:"2f86da0212a04f75f854",44:"e8786a1eb11ec166b38d",45:"4447bf6d10133500c823",46:"d954eb2bd3287c8231e2",47:"4577e3cf710358feba79",48:"8c0d3e6439cc4e0be7b5",49:"2818ec6b8d57a8d52852",50:"96467e2799e64fc170fd",51:"678dca42e7e790a2818a",52:"440bcd159aba35e4d0aa",53:"fcbe59ea1b10a30dd005",54:"3c73d581edceeed07d85",55:"1e7a182c35b1498fab20",56:"c3d0e60f1b32e4b17442",57:"ebe7791c87e83f0b2cee",58:"e4a406d1869812024f11",59:"e5b286b38e1cbd45c810",60:"e4885006e7d0f25ce259",61:"80c9b99a09975d3b709a",62:"82463de56b27b3931ad1",63:"049efae24a1ce59a4aae",64:"9296449a6ebb17339ca9",65:"23b46c863b8292a0f21a",66:"964a14bbbd11979a9f10",67:"b033e6863d32e9c62e57",68:"6ad21413a503f58882dd",69:"85a538c578a97c490811",70:"eda7a2dffc900d51d864",71:"b9dda9056e82e4187e86",72:"6ecaafb4bcdf06ac310d",73:"995c35b64d50c823cfbb",74:"fe2e6061141a5314f0e6",75:"dc41dfc28339540f7617",76:"7542cedc5c106bd8047b",77:"632fc7ad4e783c2e830c",78:"9441f4ef8e997e867c44",79:"d3d476ebbc06278aabe6",80:"cf95a6c2ed13b24f37c2",81:"baead8c4685626f030bc",82:"7daf1da09932336ff51f",83:"d8d930b0866e47066d3c",84:"002db9f2cd4834518be9",85:"a4e40f0e236b61209077",86:"26924b4a675763780a27",87:"f05750f4be735d794fa5",88:"b55653625727f9fd195c",89:"c1206bde14ea53da5650",90:"76d83151e4c5325cd71d",91:"64ad30b4854f335b1896",92:"d906979e27a448b1d67a",93:"0c4dedfa20a5cbc8531f",94:"a84fdd63f0377c559814",95:"ab013459fd554d5bac03",96:"6c6eb5ef6172208c1d1b",97:"5363440da82f7efcf921",98:"7ae077b5b4240759662e",99:"9160821acc625f48bcaa"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[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(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},d={102:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});a[2]=c;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:"f4a600c1698b4db27837",1:"80ec7107adf684998411",2:"6afd37c53f738e9fc7f1",3:"71289dfc436f4e6b0672",4:"b8702b2c9b9d57e756ab",5:"1ddf59e2f4b25bb7a88e",6:"649d63c7e2d6bf6e55fb",7:"6363571072274ae79c6c",8:"50451230dba3ad2810f6",9:"60d71881d9a4ae819f6e",10:"9c1787439657c4317d06",11:"dee0d46f4db350ec2bb7",12:"55c2d219a783d05ec76e",13:"44f89ebe5ffed1d60ca5",14:"f83f27e744f45ce79261",15:"f6ea00918b55848f0650",16:"e1f4c3104355b9d9b7a6",17:"a4ca74aef34e27c5cef8",18:"63080d8ad84dd075f58a",19:"7e9c036c00f085735ce4",20:"4bf088d10b41f7fa3468",21:"a2e3d05b0875576203b0",22:"373f09ad2411fac82d01",23:"2fdd52618d1df5eaaf82",24:"97081c29457ab8c9f848",25:"53270642e9a6c0439812",26:"9851a72754973adc65cb",27:"545947e11a00565ce9cc",28:"5588faf7dd1a48d53c9f",29:"cae77e6ee839398a01ad",30:"f040b2abfc4803f10e38",31:"5b5031fb2f22a3d34e35",32:"624b265b03a402e1710f",33:"19432b5a56e1286e2918",34:"5ec202078d1a2d356535",35:"5c1b9708baa993686c46",36:"deb49e9f768aed9d6da8",37:"803f53b66c4fb091e086",38:"47244e611bf46cbde220",39:"f153416f540b7da73c73",40:"e75c01a42586236c756b",41:"e0a6690a7da361021db8",42:"16f1c4be72ca23c622d9",43:"2f86da0212a04f75f854",44:"e8786a1eb11ec166b38d",45:"4447bf6d10133500c823",46:"d954eb2bd3287c8231e2",47:"4577e3cf710358feba79",48:"8c0d3e6439cc4e0be7b5",49:"2818ec6b8d57a8d52852",50:"96467e2799e64fc170fd",51:"678dca42e7e790a2818a",52:"440bcd159aba35e4d0aa",53:"fcbe59ea1b10a30dd005",54:"3c73d581edceeed07d85",55:"1e7a182c35b1498fab20",56:"c3d0e60f1b32e4b17442",57:"ebe7791c87e83f0b2cee",58:"e4a406d1869812024f11",59:"e5b286b38e1cbd45c810",60:"e4885006e7d0f25ce259",61:"80c9b99a09975d3b709a",62:"82463de56b27b3931ad1",63:"049efae24a1ce59a4aae",64:"9296449a6ebb17339ca9",65:"23b46c863b8292a0f21a",66:"964a14bbbd11979a9f10",67:"b033e6863d32e9c62e57",68:"6ad21413a503f58882dd",69:"85a538c578a97c490811",70:"eda7a2dffc900d51d864",71:"b9dda9056e82e4187e86",72:"6ecaafb4bcdf06ac310d",73:"995c35b64d50c823cfbb",74:"fe2e6061141a5314f0e6",75:"dc41dfc28339540f7617",76:"7542cedc5c106bd8047b",77:"632fc7ad4e783c2e830c",78:"9441f4ef8e997e867c44",79:"d3d476ebbc06278aabe6",80:"cf95a6c2ed13b24f37c2",81:"baead8c4685626f030bc",82:"7daf1da09932336ff51f",83:"d8d930b0866e47066d3c",84:"002db9f2cd4834518be9",85:"a4e40f0e236b61209077",86:"26924b4a675763780a27",87:"f05750f4be735d794fa5",88:"b55653625727f9fd195c",89:"c1206bde14ea53da5650",90:"76d83151e4c5325cd71d",91:"64ad30b4854f335b1896",92:"d906979e27a448b1d67a",93:"0c4dedfa20a5cbc8531f",94:"a84fdd63f0377c559814",95:"ab013459fd554d5bac03",96:"6c6eb5ef6172208c1d1b",97:"5363440da82f7efcf921",98:"7ae077b5b4240759662e",99:"9160821acc625f48bcaa"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/common/gic-select-group-auth.vue
......@@ -146,7 +146,7 @@ export default {
delDepart(index, arr) {
const that = this;
arr.splice(index, 1);
const keys = arr.map(ele => ele.storeGroupId);
const keys = arr.map(ele => ele.relationId);
that.setCheckedKeys(keys);
},
......@@ -272,6 +272,7 @@ export default {
this.groupIds.push(node.data);
if (node.isLeaf) {
this.$refs.groupTree.setChecked(node, true);
this.$emit('checkGroupIds', this.$refs.groupTree.getCheckedNodes());
}
});
});
......
src/views/business/authMerchant-form.vue
......@@ -47,7 +47,9 @@
</div>
<div class="select-search-input cursor-pointer" slot="reference">
<div>
<el-input placeholder="请搜索选择商户" maxlength="50" :disabled="type === 'edit'" v-model="partForm.searchSelect" @keyup.native="value => querySearchAsync(value, searchSelect)"> </el-input>
<el-form-item prop="searchSelect">
<el-input placeholder="请搜索选择商户" maxlength="50" :disabled="type === 'edit'" v-model="partForm.searchSelect" @keyup.native="querySearchAsync('search')"> </el-input>
</el-form-item>
</div>
</div>
</el-popover>
......@@ -71,7 +73,7 @@
</p>
</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)">授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button>
<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>
</div>
......@@ -92,6 +94,15 @@ import errMsg from '@/common/js/error';
export default {
name: 'authMerchantAdd',
data() {
const checkEnterpriseId = (rule, value, callback) => {
if (!value) {
callback(new Error('请先搜索商户！'));
} else if (!this.enterpriseId) {
callback(new Error('请选择商户！'));
} else {
callback();
}
};
return {
bgHeight: window.screen.availHeight - 104 + 'px',
// 面包屑参数
......@@ -119,6 +130,9 @@ export default {
searchSelect: '',
storeGroup: []
},
rules: {
searchSelect: [{ required: true, validator: checkEnterpriseId, trigger: 'blur' }]
},
checkedList: [],
dailogForm: {},
searchArray: [],
......@@ -139,6 +153,7 @@ export default {
handleSelect(item) {
this.enterpriseId = item.enterpriseId;
this.dailogForm = { ...item };
this.$refs.form.validateField('searchSelect');
},
async querySearchAsync(type) {
const that = this;
......@@ -146,6 +161,9 @@ export default {
that.searchArray = [];
return false;
}
if (type === 'search') {
that.enterpriseId = '';
}
const res = await that.getSearchList(that.partForm.searchSelect);
that.searchArray = res;
if (type === 'edit' && res[0]) {
......
src/views/enterprise/salutatory.vue
......@@ -18,13 +18,15 @@
<p class="left">欢迎语标题 {{ form.title || '系统默认' }}</p>
<p class="right">
<span class="date">最近编辑时间：{{ form.updateTime | formatTimeStamp }}</span
><el-button type="text" @click="changeRoute">编辑</el-button>
><el-button type="text" style="margin-right:43px;" @click="changeRoute">编辑</el-button><el-switch v-model="openFlag" :active-value="1" :inactive-value="0" @change="setWelcome"> </el-switch>
</p>
</div>
<p class="line"></p>
<div class="bottom">
<el-form label-width="70px" ref="form" :model="form">
<el-form-item label="文本内容"> {{ form.welcomeContent || '你好，&lt; 微信昵称 &gt;' }}</el-form-item>
<el-form-item label="文本内容"
><p class="welcome-text">{{ form.welcomeContent || '你好，&lt; 微信昵称 &gt;' }}</p></el-form-item
>
<!-- <el-form-item label="附件"></el-form-item> -->
</el-form>
</div>
......@@ -41,7 +43,8 @@ export default {
props: {},
data() {
return {
form: {}
form: {},
openFlag: 0
};
},
filters: {},
......@@ -58,12 +61,12 @@ export default {
*/
getData() {
const that = this;
getRequest('/haoban-manage3-web/get-welcome', {})
.then(res => {
let resData = res.data;
if (resData.errorCode == 1 && resData.result) {
that.form = { ...resData.result };
that.openFlag = resData.result.openFlag;
}
errMsg.errorMsg(resData);
})
......@@ -73,6 +76,41 @@ export default {
message: error.message
});
});
},
setWelcome(val) {
const that = this;
that.$refs.form.validate(value => {
if (value) {
this.$confirm('是否确定修改欢迎语启用状态？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
getRequest('/haoban-manage3-web/set-welcome', { openFlag: val })
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.$message.success({
duration: 1000,
message: '设置成功'
});
window.location.reload();
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
})
.catch(() => {
that.openFlag = that.openFlag === 1 ? 0 : 1;
});
}
});
}
},
watch: {},
......@@ -157,7 +195,7 @@ export default {
}
}
.salutatory-wrap {
height: 160px;
// height: 160px;
background: #f5f7fa;
.top {
display: flex;
......@@ -187,9 +225,8 @@ export default {
border-style: none none solid none;
}
.bottom {
padding: 16px 20px 0 29px;
padding: 16px 20px 21px 29px;
.el-form-item {
margin-bottom: 13px;
>>> .el-form-item__label {
padding: 0;
}
......@@ -203,4 +240,12 @@ export default {
}
}
}
.welcome-text {
text-align: left;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
</style>
src/views/enterprise/salutatorySet.vue
......@@ -13,7 +13,7 @@
<img :src="item.gifUrl" alt="" @click="selectEmoji(item)" />
</li>
</ul>
<p slot="reference" style="cursor:pointer;">
<p slot="reference" style="cursor:pointer;height:24px;">
<svg-icon iconname="iconbiaoqing" size="20"> </svg-icon>
</p>
</el-popover>
......@@ -89,9 +89,7 @@ export default {
type: 'warning'
})
.then(() => {
const para = {
...that.form
};
const para = { ...that.form };
getRequest('/haoban-manage3-web/save-welcome', para)
.then(res => {
let resData = res.data;
......
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