Skip to content

M
memberTag-web
Commit ff8e9a0e by wangyusheng
Options

Merge branch 'feature/200911' into 'master' 

Feature/200911

See merge request !4
parents 283fd572 ec2a466e
Showing with 19 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.fa16b1837ab7a32a2ac44bc3b4e3993f.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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/card.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3bc1f375b1aec93e04e0.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.691c8f8ed94a31b20cb3.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/app.c55420b4bb28564de7583f82886ea69f.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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/card.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.5a819349aa66f770148c.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.691c8f8ed94a31b20cb3.js></script></body></html>
\ No newline at end of file
dist/static/js/2.0fea043107c233dc7f1c.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.f3a5ee821cce782b232b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.3bc1f375b1aec93e04e0.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var a={},f={34:0};function n(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,n),f.l=!0,f.exports}n.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,n){c=f[e]=[a,n]});c[2]=a;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:"ccebe39882bf184f9601",1:"ff9a48317f8bf815760f",2:"0fea043107c233dc7f1c",3:"48f0e3fe10b5b8b84298",4:"d17b0665c4456542e03d",5:"2827843056ab0544225e",6:"d84e83105075dbb7bb54",7:"35c722d09a71c8b79c9d",8:"03aacefe02ac1da31eec",9:"32877e1ab63375369274",10:"f554e888c1709956bad4",11:"c827777ffded659cfe9f",12:"91cd77fb402bcc20c476",13:"5e9fa2db703b47354a58",14:"fdf29b8ca338cce9942a",15:"999f87f7cd93f3f0f882",16:"65adc5156891f1b57717",17:"d0b5334e5282b4a8d1ac",18:"3ee77aca5a8e38a7ca47",19:"34e7b6016ac35b3b3bfb",20:"df847e4be472ba46982c",21:"83a788ea16e7150c6503",22:"11cbc213457ffebe7ebf",23:"c24a9f56d0040598512c",24:"4ad2674933e6886df395",25:"7f79b0404f25fcd67f4f",26:"80e295efa02de6e5fb81",27:"ddb488688ceec6baa35c",28:"16762be5e95423ba5423",29:"1727f9e83db20ba57b45",30:"6a5ee2a1c27c5a16c485",31:"4581161a7b4779f896f3"}[e]+".js";var o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.5a819349aa66f770148c.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,f,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],n[b]&&u.push(n[b][0]),n[b]=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++)d=r(r.s=t[i]);return d};var a={},n={34: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:"ccebe39882bf184f9601",1:"ff9a48317f8bf815760f",2:"f3a5ee821cce782b232b",3:"70cfb7a061276404e791",4:"d17b0665c4456542e03d",5:"d070d65ae70e99a15587",6:"d84e83105075dbb7bb54",7:"3cbf24ca43614990146c",8:"03aacefe02ac1da31eec",9:"32877e1ab63375369274",10:"f554e888c1709956bad4",11:"c827777ffded659cfe9f",12:"91cd77fb402bcc20c476",13:"5e9fa2db703b47354a58",14:"fdf29b8ca338cce9942a",15:"999f87f7cd93f3f0f882",16:"65adc5156891f1b57717",17:"d0b5334e5282b4a8d1ac",18:"3ee77aca5a8e38a7ca47",19:"34e7b6016ac35b3b3bfb",20:"df847e4be472ba46982c",21:"83a788ea16e7150c6503",22:"11cbc213457ffebe7ebf",23:"c24a9f56d0040598512c",24:"4ad2674933e6886df395",25:"7f79b0404f25fcd67f4f",26:"80e295efa02de6e5fb81",27:"ddb488688ceec6baa35c",28:"16762be5e95423ba5423",29:"1727f9e83db20ba57b45",30:"6a5ee2a1c27c5a16c485",31:"4581161a7b4779f896f3"}[e]+".js";var o=setTimeout(b,12e4);function b(){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=b,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}}([]);
\ No newline at end of file
src/components/Trash.vue
......@@ -96,6 +96,7 @@ export default {
},
dialogClosed() {
if(this.interval) clearInterval(this.interval);
this.getProgress();
},
getDelTime() {
let s = parseInt(this.delTime % (1000 * 60) / 1000);
......
src/view/memberGroup/memberGroupList.vue
......@@ -64,22 +64,6 @@
{{ scope.row.effectiveStatus == 1 ? '有效' : '失效' }}
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="240px">
<template slot-scope="scope">
<router-link
:to="`/memberGroupDetail?memberTagGroupId=${scope.row.memberTagGroupId}`"
class="edit-btn el-button--text p-r-12"
>
详情
</router-link>
<router-link
:to="`/memberGroupEdit?memberTagGroupId=${scope.row.memberTagGroupId}`"
class="edit-btn el-button--text p-r-12"
>
编辑
</router-link>
</template>
</el-table-column> -->
</el-table>
</div>
<div class="block common-wrap__page text-right" v-if="groupTableData.length != 0">
......@@ -210,7 +194,7 @@
</template>
</el-table-column>
<el-table-column label="操作" width="240px">
<el-table-column label="操作" :width="`${canEdit ? '240px' : '80px'}`">
<template slot-scope="scope">
<router-link
:to="`/memberGroupDetail?memberTagGroupId=${scope.row.memberTagGroupId}`"
......@@ -219,16 +203,19 @@
详情
</router-link>
<router-link
v-if="isAllowEdit(scope.row)"
:to="`/memberGroupEdit?memberTagGroupId=${scope.row.memberTagGroupId}`"
class="edit-btn el-button--text p-r-12"
>
编辑
</router-link>
<el-button type="text" @click="effectiveGroup(scope.row.memberTagGroupId)"
v-if="scope.row.canEdit"
class="edit-btn el-button--text p-r-12">
失效
</el-button>
<el-button type="text" @click="deleteGroup(scope.row.memberTagGroupId)"
v-if="scope.row.canEdit"
class="edit-btn el-button--text p-r-12">
删除
</el-button>
......@@ -410,6 +397,7 @@ export default {
recommendItems: [],
recommendData: [], // 推荐分组的数据
activeName: '',
canEdit: false,
// 面包屑参数
navpath: [
{
......@@ -1027,6 +1015,7 @@ export default {
latestUpdateTime: !!el.latestUpdateTime ? el.latestUpdateTime : '--',
createTime: timeFormat.timeToDateTime(el.createTime)
}));
this.canEdit = this.groupTableData[0].canEdit || false;
}
this.loading = false;
}).catch(err => {
......@@ -1041,6 +1030,13 @@ export default {
this.countGroupText = `您的非实时分组数量已达${data.currCount}/${data.totalCount}，实时分组数量不受限制。`;
}
});
},
isAllowEdit(row) {
const { latestUpdateTime, canEdit } = row;
if(!canEdit) return false;
if(!latestUpdateTime || latestUpdateTime === '--') return true;
if(new Date().toLocaleDateString() > new Date(latestUpdateTime).toLocaleDateString()) return false;
return true;
}
},
created() {
......
src/view/platformTag/member-tag.vue
......@@ -160,6 +160,7 @@ import { parseTime } from '@/utils'
Vue.component(CollapseTransition.name, CollapseTransition);
const fixBeginTime = +new Date() + (1000 * 60 * 60 * 24);
export default {
name: 'member-tag',
......
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