Skip to content

C
clique-web
Commit bf1ace03 by zhu_yu_dan
Options

fix:结算归属配置优化头部的商户样式

parent 36fd8afb
Showing with 68 additions and 100 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/main.58f0a90d0098eaaf25b1a08782b62cb8.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.c198b9958e3110ff387d.js></script><script type=text/javascript src=./static/js/vendor.4d58b3015cdc1aa33f08.js></script><script type=text/javascript src=./static/js/main.bf2e1950c67e8c9c19d9.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>GIC-集团后台</title><link href=./static/css/main.bcfe8fe2a8209a764b155270ab1ded2a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3af91d4374d4cef2e36f.js></script><script type=text/javascript src=./static/js/vendor.4d58b3015cdc1aa33f08.js></script><script type=text/javascript src=./static/js/main.bf2e1950c67e8c9c19d9.js></script></body></html>
\ No newline at end of file
dist/static/css/main.58f0a90d0098eaaf25b1a08782b62cb8.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/css/main.bcfe8fe2a8209a764b155270ab1ded2a.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/10.9038a4e41429fb5c4930.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/10.a18b60a758017ebf7df7.js.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/11.eedc6a657f9ef4732d0d.js → dist/static/js/11.2a1bf8a64828a32883b6.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.4a8f728956ddba7c1f2c.js → dist/static/js/12.4c22b15f12385cdc9bf9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/13.0d2bbc6b7ebbb4ebe6d4.js.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/13.90b03efab26b225a5fc1.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/14.62798791cc0fde824239.js.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/14.6d1f60d98ccf952e1dbc.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.c338bc245ef3bc0778bd.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.c599eedc650ae5cd62f0.js.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/17.a3deedb0c47a9667af8a.js.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/17.a61cc1d332eb19723744.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/18.3a099077e5cbda847eae.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/18.4c19992b12c95c722a3f.js.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/19.0a8caf0d2927860781a6.js.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/19.160e15fb09ce94077af4.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/20.4c0155c38f8ab6282077.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/20.a2c73cf02c1ae068f605.js.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/22.3643cecb3194fd32be11.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/22.d381b38bb8d9151b6761.js.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/4.9e7ef90c13a32196615a.js.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/4.9e7ef90c13a32196615a.js → dist/static/js/4.f6b57ca40c6fce9257a0.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.f6b57ca40c6fce9257a0.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.043d5be7e8ae7af315a9.js → dist/static/js/6.a190fce20d190f0f7d10.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.64efdae52ec787eeaadd.js → dist/static/js/7.d36d23e66753e021de8f.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.94867d8e5d5e51ec19ce.js → dist/static/js/8.1a117f799ece8a7ce6c8.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/9.4dc79dcdb1a8f85a45f0.js.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/9.fed35d95ed1cc0ec46a6.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.3af91d4374d4cef2e36f.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,f,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(c&&c(a,f,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var a={},n={36:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var f=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"6a7b63b6a9447c78e969",1:"73ceba26c1aaf431359d",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"f6b57ca40c6fce9257a0",5:"ae32efa6a124e74a06b9",6:"a190fce20d190f0f7d10",7:"d36d23e66753e021de8f",8:"1a117f799ece8a7ce6c8",9:"fed35d95ed1cc0ec46a6",10:"9038a4e41429fb5c4930",11:"2a1bf8a64828a32883b6",12:"4c22b15f12385cdc9bf9",13:"90b03efab26b225a5fc1",14:"6d1f60d98ccf952e1dbc",15:"c338bc245ef3bc0778bd",16:"40d7fbe4f0bf5f70a028",17:"a61cc1d332eb19723744",18:"3a099077e5cbda847eae",19:"160e15fb09ce94077af4",20:"4c0155c38f8ab6282077",21:"9708d888066b25801231",22:"3643cecb3194fd32be11",23:"a22230160f3c91f545a3",24:"ecf7f5843497abed9784",25:"2474fdfddf038ce06b3c",26:"2287c68846145a8c5604",27:"a05cabc5df423117a9b3",28:"ed9b1a19530f6910ad40",29:"8c6ed3dc5f7e3bc522fc",30:"29fc655ef81ad3f4b9fe",31:"c07206648adb3cb7c265",32:"bdd2934b6978a2c2e6ca",33:"375ce23a24c8c2797719"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,f.appendChild(t),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.3af91d4374d4cef2e36f.js.map
\ No newline at end of file
dist/static/js/manifest.c198b9958e3110ff387d.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={36:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;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:"6a7b63b6a9447c78e969",1:"73ceba26c1aaf431359d",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"9e7ef90c13a32196615a",5:"ae32efa6a124e74a06b9",6:"043d5be7e8ae7af315a9",7:"64efdae52ec787eeaadd",8:"94867d8e5d5e51ec19ce",9:"4dc79dcdb1a8f85a45f0",10:"a18b60a758017ebf7df7",11:"eedc6a657f9ef4732d0d",12:"4a8f728956ddba7c1f2c",13:"0d2bbc6b7ebbb4ebe6d4",14:"62798791cc0fde824239",15:"c599eedc650ae5cd62f0",16:"cf182235fc1722d0511a",17:"a3deedb0c47a9667af8a",18:"4c19992b12c95c722a3f",19:"0a8caf0d2927860781a6",20:"a2c73cf02c1ae068f605",21:"9478fd3dea2b7426acd8",22:"d381b38bb8d9151b6761",23:"a22230160f3c91f545a3",24:"c8cc8aa49bbcbba1b2ec",25:"2474fdfddf038ce06b3c",26:"2287c68846145a8c5604",27:"a05cabc5df423117a9b3",28:"6d6a15d813b2e0cffbaf",29:"8c6ed3dc5f7e3bc522fc",30:"29fc655ef81ad3f4b9fe",31:"c07206648adb3cb7c265",32:"bdd2934b6978a2c2e6ca",33:"375ce23a24c8c2797719"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.c198b9958e3110ff387d.js.map
\ No newline at end of file
src/components/nav/nav.vue
......@@ -68,7 +68,6 @@ export default {
project: that.projectName,
path: that.$route.path.split('/')[1]
};
postRequest('/api-auth/get-current-memu-data', para)
.then(res => {
// log(res,res.data,res.data.errorCode)
......@@ -78,7 +77,6 @@ export default {
log('resData.result: ', resData.result);
return;
}
that.navpath = [];
if (!!resData.result.list && !!resData.result.list.length) {
resData.result.list.forEach(function(ele, index) {
......
src/view/companyGroup/integral/cliqueList.vue
......@@ -227,6 +227,7 @@ export default {
this.dialogVisible = false;
this.getCliquePage();
this.$message.success('变更成功');
this.$emit('resetEnterpriseList', true);
} else {
this.$message.error(data.message);
}
......
src/view/companyGroup/integral/settlementConfig.vue
......@@ -3,31 +3,27 @@
<topNav></topNav>
<div class="right-content">
<div class="right-box">
<div class="nav-list-wrap">
<div class="nav-list">
<el-carousel trigger="click" height="60px" arrow="always" :autoplay="false" indicator-position="none" :loop="false" :interval="5000">
<el-carousel-item v-for="(newItem, idx) in newApplyList" :key="idx">
<ul class="clearfix">
<li @click="selectEnterprise(item, index)" class="fl nav-item" v-for="(item, index) in newItem" :key="index">
<i :class="{ on: curIndex == index }"
>{{ item.enterpriseName }}<el-popover placement="top" width="160" trigger="hover" content="此商户下有未归属的门店"> <i v-show="!item.isEdit" slot="reference" class="iconfont tooltip-icon icon-xinxixianshi"></i> </el-popover></i
><span v-show="index < newItem.length - 1">|</span>
</li>
</ul>
</el-carousel-item>
</el-carousel>
</div>
<div class="change-style-icon fr">
<el-tooltip class="item" effect="dark" content="结算归属概览" placement="bottom">
<div class="nav-list-wrap clearfix">
<div class="nav-list-content">
<el-tooltip effect="dark" content="结算归属概览" placement="bottom">
<i @click="changeStyle('card')" class="iconfont icon-caidan my-icon " :class="{ on: showStyle == 'card' }"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="结算归属列表" placement="bottom">
<el-tooltip effect="dark" content="结算归属列表" placement="bottom">
<i @click="changeStyle('list')" class="iconfont icon-xiangqing my-icon" :class="{ on: showStyle == 'list' }"></i>
</el-tooltip>
<el-select v-model="enterpriseId" placeholder="请选择商户" style="margin-left:5px;">
<el-option v-for="item in applyList" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
<div class="fl enterprise-name" :title="item.enterpriseName">{{ item.enterpriseName }}</div>
<div class="fr">
<el-popover placement="top" width="160" trigger="hover" content="此商户下有未归属的门店"> <i v-show="!item.isEdit" slot="reference" class="iconfont tooltip-icon icon-xinxixianshi"></i> </el-popover>
</div>
</el-option>
</el-select>
<span class="enterprise-tip">有{{ enterpriseNum }}个商户下有门店未配置</span>
</div>
</div>
<cliqueCard v-show="showStyle == 'card'" :enterpriseId="enterpriseId"></cliqueCard>
<cliqueList v-show="showStyle == 'list'" :enterpriseId="enterpriseId"></cliqueList>
<cliqueList v-show="showStyle == 'list'" :enterpriseId="enterpriseId" @resetEnterpriseList="resetEnterpriseList"></cliqueList>
</div>
</div>
<vue-gic-footer></vue-gic-footer>
......@@ -45,30 +41,8 @@ export default {
repProjectName: 'gic-clique',
showStyle: 'card',
applyList: [],
newApplyList: [],
searchValue: '',
enterpriseId: '',
curIndex: 0,
cardList: [],
currentPage: 1,
pageSize: 20,
totalCount: 0,
dialogVisible: false,
cliqueGroupName: '',
cliqueGroupCode: '',
integralSettlementGroupId: '',
cliqueGroupIndex: 0,
// 编辑
dialogEditVisible: false,
ruleForm: {
cliqueGroupName: '',
cliqueGroupCode: ''
},
editTitle: '新增结算归属',
rules: {
cliqueGroupName: [{ required: true, message: '请输入结算归属名称', trigger: 'blur' }],
cliqueGroupCode: [{ required: true, message: '请输入结算归属code', trigger: 'blur' }]
},
enterpriseNum: 0,
loading: false
};
},
......@@ -83,26 +57,39 @@ export default {
let data = res.data;
if (data.errorCode == 0) {
this.applyList = data.result ? data.result : [];
for (let i = 0, len = this.applyList.length; i < len; i += 10) {
// 每4个一组
this.newApplyList.push(this.applyList.slice(i, i + 10));
}
this.enterpriseId = this.applyList[0].enterpriseId;
// this.getCliquePage();
this.enterpriseNum = 0;
this.applyList.forEach(el => {
if (!el.isEdit) {
this.enterpriseNum++;
}
});
} else {
this.$message.error(data.message);
}
});
},
// 选择商户
selectEnterprise(item, index) {
this.enterpriseId = item.enterpriseId;
this.curIndex = index;
this.currentPage = 1;
},
// 选择展现方式
changeStyle(type) {
this.showStyle = type;
},
// 重新获取商户的状态
resetEnterpriseList(val) {
let para = {};
postRequest('/api-admin/clique-integral-enterprise', para).then(res => {
let data = res.data;
if (data.errorCode == 0) {
this.applyList = data.result ? data.result : [];
this.enterpriseNum = 0;
this.applyList.forEach(el => {
if (!el.isEdit) {
this.enterpriseNum++;
}
});
} else {
this.$message.error(data.message);
}
});
}
},
components: {
......@@ -117,46 +104,17 @@ export default {
background: #fff;
}
.nav-list-wrap {
height: 60px;
line-height: 60px;
padding: 14px 24px;
border-bottom: 1px solid rgba(235, 238, 245, 1);
.nav-list {
max-width: 1050px;
position: relative;
}
}
.nav-item {
font-size: 14px;
color: #606266;
cursor: pointer;
.on {
color: #1890ff;
}
i {
font-style: normal;
padding: 0 15px;
color: #909399;
}
.tooltip-icon {
padding: 0 5px;
font-size: 13px;
}
span {
font-size: 13px;
color: #909399;
}
.item-edit {
vertical-align: -webkit-baseline-middle;
padding-left: 10px;
font-size: 16px;
}
}
.change-style-icon {
// position: absolute;
// top: 0;
// right: -75px;
margin: -60px 24px 0 0;
width: 73px;
.enterprise-name {
display: inline-block;
max-width: 150px;
height: 60px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
padding-right: 10px;
}
.my-icon {
font-size: 16px;
......@@ -168,4 +126,15 @@ export default {
background: #ebeef5;
}
}
.enterprise-tip {
font-size: 13px;
color: #909399;
padding-left: 10px;
}
.el-carousel__arrow-left {
left: 0px;
}
.el-carousel__arrow-right {
right: 0px;
}
</style>
src/view/companyGroup/membershipSystem/memberCardSet.vue
......@@ -201,11 +201,11 @@
<div class="cell-body">
<el-form :model="cliqueForm" ref="cliqueForm" label-width="120px" class="demo-ruleForm">
<el-form-item label="升级模式" prop="">
<el-radio v-model="cliqueForm.gradeUpModel" label="0" @change="changeCliqueUp($event)">单商户独立计算</el-radio>
<el-radio v-model="cliqueForm.gradeUpModel" label="1" @change="changeCliqueUp($event)">跨商户联合计算</el-radio>
<el-radio disabled v-model="cliqueForm.gradeUpModel" label="0" @change="changeCliqueUp($event)">单商户独立计算</el-radio>
<el-radio disabled v-model="cliqueForm.gradeUpModel" label="1" @change="changeCliqueUp($event)">跨商户联合计算</el-radio>
</el-form-item>
<el-form-item label="关联升级" prop="" v-if="cliqueForm.gradeUpModel == 0">
<el-switch v-model="cliqueForm.gradeUpModelSyncchange" @change="changeSwitch($event, 10)"> </el-switch>
<el-switch disabled v-model="cliqueForm.gradeUpModelSyncchange" @change="changeSwitch($event, 10)"> </el-switch>
</el-form-item>
</el-form>
<div class="add-level"><el-button type="primary" @click="changeRoute('/addGroupGrade')">新增等级</el-button></div>
......
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