Skip to content

C
clique-web
Commit 071e7689 by zhu_yu_dan
Options

bug:商户信息关联商户的名称改为品牌名

parent 345b0599
Showing with 23 additions and 21 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/app.ef73549404083c726787225fa7529362.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.bf4eff109b8e37c66388.js></script><script type=text/javascript src=./static/js/vendor.f83a9f6b94c222475884.js></script><script type=text/javascript src=./static/js/app.6d78edf8b552948f5120.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/app.b89e3e27b5c7eb15ba9fa1dbef725d79.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.07440126a7c795de1a1e.js></script><script type=text/javascript src=./static/js/vendor.f83a9f6b94c222475884.js></script><script type=text/javascript src=./static/js/app.1c21306b7ca5732391ae.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.b89e3e27b5c7eb15ba9fa1dbef725d79.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.ef73549404083c726787225fa7529362.css.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.f07c48e2ee14bb44303c.js → dist/static/js/14.bbaa18d1caf5e3b1e9bd.js
webpackJsonp([15],{"Z9/t":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("3Xzz"),o=a("P9l9"),s={name:"nearStoreSet",data:function(){return{projectName:"gic-clique",navpath:[{name:"首页",path:"/"},{name:"附近门店",path:""}],nearStoreSwithFlag:!0}},created:function(){},methods:{changeRoute:function(e){console.log("route-change"),this.$router.push(e)},nearStoreSwitch:function(){console.log(this.nearStoreSwithFlag),this.setNearStore()},setNearStore:function(){var e=this,t={requestProject:e.projectName,isShowCliqueStore:1==e.nearStoreSwithFlag?1:0};Object(o.e)("/api-admin/save-clique-show-store",t).then(function(t){var a=t.data;0!=a.errorCode?(e.nearStoreSwithFlag=!1,e.$message.error({duration:1e3,message:a.message})):e.$message({message:"修改附近门店显示配置成功",type:"success"})}).catch(function(t){console.log(t),e.nearStoreSwithFlag=!1,e.$message.error({duration:1e3,message:t.message})})},getNearStore:function(){var e=this,t={requestProject:e.projectName};Object(o.e)("/api-admin/clique-show-store",t).then(function(t){var a=t.data;0!=a.errorCode?e.$message.error({duration:1e3,message:error.message}):e.nearStoreSwithFlag=1==a.result.isShowCliqueStore}).catch(function(t){console.log(t),e.$message.error({duration:1e3,message:t.message})})}},mounted:function(){this.getNearStore()},components:{topNav:r.a}},n={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"right-wrap near-store-contain"},[a("topNav",{attrs:{navpath:e.navpath}}),e._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("div",{staticClass:"attention-wrap"},[a("label",{staticClass:"near-store-tip"},[e._v("单商户小程序中附近门店是否展示集团其他商户门店")]),e._v(" "),a("div",{staticClass:"item-label"},[a("span",[e._v("展示")]),e._v(" "),a("el-switch",{on:{change:e.nearStoreSwitch},model:{value:e.nearStoreSwithFlag,callback:function(t){e.nearStoreSwithFlag=t},expression:"nearStoreSwithFlag"}})],1)])])]),e._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var i=a("VU/8")(s,n,!1,function(e){a("sfJC")},"data-v-8589e67a",null);t.default=i.exports},sfJC:function(e,t){}}); webpackJsonp([14],{"Z9/t":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("3Xzz"),o=a("P9l9"),s={name:"nearStoreSet",data:function(){return{projectName:"gic-clique",navpath:[{name:"首页",path:"/"},{name:"附近门店",path:""}],nearStoreSwithFlag:!0}},created:function(){},methods:{changeRoute:function(e){console.log("route-change"),this.$router.push(e)},nearStoreSwitch:function(){console.log(this.nearStoreSwithFlag),this.setNearStore()},setNearStore:function(){var e=this,t={requestProject:e.projectName,isShowCliqueStore:1==e.nearStoreSwithFlag?1:0};Object(o.e)("/api-admin/save-clique-show-store",t).then(function(t){var a=t.data;0!=a.errorCode?(e.nearStoreSwithFlag=!1,e.$message.error({duration:1e3,message:a.message})):e.$message({message:"修改附近门店显示配置成功",type:"success"})}).catch(function(t){console.log(t),e.nearStoreSwithFlag=!1,e.$message.error({duration:1e3,message:t.message})})},getNearStore:function(){var e=this,t={requestProject:e.projectName};Object(o.e)("/api-admin/clique-show-store",t).then(function(t){var a=t.data;0!=a.errorCode?e.$message.error({duration:1e3,message:error.message}):e.nearStoreSwithFlag=1==a.result.isShowCliqueStore}).catch(function(t){console.log(t),e.$message.error({duration:1e3,message:t.message})})}},mounted:function(){this.getNearStore()},components:{topNav:r.a}},n={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"right-wrap near-store-contain"},[a("topNav",{attrs:{navpath:e.navpath}}),e._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("div",{staticClass:"attention-wrap"},[a("label",{staticClass:"near-store-tip"},[e._v("单商户小程序中附近门店是否展示集团其他商户门店")]),e._v(" "),a("div",{staticClass:"item-label"},[a("span",[e._v("展示")]),e._v(" "),a("el-switch",{on:{change:e.nearStoreSwitch},model:{value:e.nearStoreSwithFlag,callback:function(t){e.nearStoreSwithFlag=t},expression:"nearStoreSwithFlag"}})],1)])])]),e._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var i=a("VU/8")(s,n,!1,function(e){a("sfJC")},"data-v-8589e67a",null);t.default=i.exports},sfJC:function(e,t){}});
//# sourceMappingURL=15.f07c48e2ee14bb44303c.js.map //# sourceMappingURL=14.bbaa18d1caf5e3b1e9bd.js.map
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.07440126a7c795de1a1e.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={33:0};function n(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,n),f.l=!0,f.exports}n.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,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"86b294fc697c5b670f9b",1:"c1017b8a513cbf71ebbe",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"a4b8ca5df028eb5acd94",6:"554e3a01523a89c7e2fd",7:"c7547fa1be98dd41eb9a",8:"3e0c00453b494e2121be",9:"bd6886217341a2ac6364",10:"ff23765a9bab3e23f432",11:"e85b90356083e5b3e250",12:"efe5e750726bc1eaf8fb",13:"6ac364b51b51b8f43538",14:"bbaa18d1caf5e3b1e9bd",15:"73c5fa643d6740b44c20",16:"aada60a7d2912a3bfee1",17:"36281b0ae7a8198ddbd0",18:"5531ca4a188bfd11a9d0",19:"860839e657f3f1eef115",20:"f657ecfbc8d0e721ef27",21:"dc5fcb1380f90108bd28",22:"9469f46d69dfc40ad2ce",23:"77de8637efcb2fe369e0",24:"84c8d7030c4d5bcc16c2",25:"8b953bd9ff7d58cc8055",26:"13a4d8da6af3da86fbdb",27:"487f98f445d8df7da894",28:"f0a7ede18d8e78a91d56",29:"a800d557f08c1a4a18d9",30:"1f0bf615b8c2e302464e"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.07440126a7c795de1a1e.js.map
\ No newline at end of file
dist/static/js/manifest.bf4eff109b8e37c66388.js deleted 100644 → 0
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"86b294fc697c5b670f9b",1:"c1017b8a513cbf71ebbe",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"a4b8ca5df028eb5acd94",6:"554e3a01523a89c7e2fd",7:"c7547fa1be98dd41eb9a",8:"3e0c00453b494e2121be",9:"bd6886217341a2ac6364",10:"ff23765a9bab3e23f432",11:"e85b90356083e5b3e250",12:"8d47db957a0c2a5c2a54",13:"e29aa5893a93a16c34bc",14:"d40e2b7d311ce81fb665",15:"f07c48e2ee14bb44303c",16:"aada60a7d2912a3bfee1",17:"36281b0ae7a8198ddbd0",18:"5531ca4a188bfd11a9d0",19:"860839e657f3f1eef115",20:"f657ecfbc8d0e721ef27",21:"dc5fcb1380f90108bd28",22:"9469f46d69dfc40ad2ce",23:"77de8637efcb2fe369e0",24:"84c8d7030c4d5bcc16c2",25:"8b953bd9ff7d58cc8055",26:"13a4d8da6af3da86fbdb",27:"487f98f445d8df7da894",28:"f0a7ede18d8e78a91d56",29:"a800d557f08c1a4a18d9",30:"1f0bf615b8c2e302464e"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.bf4eff109b8e37c66388.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/companyGroupInfo.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<template v-for="(item,index) in ruleForm.enterpriseList"> <template v-for="(item,index) in ruleForm.enterpriseList">
<router-link tag="a" target="_blank" :to="{path:'/login',query:{enterpriseId: item.enterpriseId}}" > <router-link tag="a" target="_blank" :to="{path:'/login',query:{enterpriseId: item.enterpriseId}}" >
<img :src="item.qcloudImageUrl" alt=""/> <img :src="item.qcloudImageUrl" alt=""/>
<span>{{item.enterpriseName}}</span> <span>{{item.brandName}}</span>
</router-link> </router-link>
</template> </template>
......
theme/index.css
...@@ -31813,8 +31813,8 @@ ...@@ -31813,8 +31813,8 @@
padding-left: 35px; padding-left: 35px;
padding-right: 35px; } padding-right: 35px; }
.el-input-number.is-without-controls .el-input__inner { .el-input-number.is-without-controls .el-input__inner {
padding-left: 15px; padding-left: 12px;
padding-right: 15px; } padding-right: 12px; }
.el-input-number.is-controls-right .el-input__inner { .el-input-number.is-controls-right .el-input__inner {
padding-left: 15px; padding-left: 15px;
padding-right: 42px; } padding-right: 42px; }
...@@ -42411,22 +42411,24 @@ ...@@ -42411,22 +42411,24 @@
color: #fcce72; color: #fcce72;
background-color: #fff7e8; background-color: #fff7e8;
border-color: #feefd0; } border-color: #feefd0; }
.el-button--danger { .el-button--danger {
color: #fff; color: #F5222D;
background-color: #f5222d; background-color: #F5F7FA;
border-color: #f5222d; } border-color: #DCDFE6;
}
.el-button--danger:hover, .el-button--danger:focus { .el-button--danger:hover, .el-button--danger:focus {
background: #f74e57; background: #F5222D;
border-color: #f74e57; border-color: #F5222D;
color: #fff; } color: #fff; }
.el-button--danger:active { .el-button--danger:active {
background: #dd1f29; background: #CF1322;
border-color: #dd1f29; border-color: #CF1322;
color: #fff; color: #fff;
outline: none; } outline: none; }
.el-button--danger.is-active { .el-button--danger.is-active {
background: #dd1f29; background: #CF1322;
border-color: #dd1f29; border-color: #CF1322;
color: #fff; } color: #fff; }
/* .el-button--danger.is-disabled, .el-button--danger.is-disabled:hover, .el-button--danger.is-disabled:focus, .el-button--danger.is-disabled:active { /* .el-button--danger.is-disabled, .el-button--danger.is-disabled:hover, .el-button--danger.is-disabled:focus, .el-button--danger.is-disabled:active {
color: #fff; color: #fff;
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