Commit dd9a6767 by liuchenxi

update: bug修复

parent d999b9ae
...@@ -88,6 +88,6 @@ export function toTaskCenter(taskId) { ...@@ -88,6 +88,6 @@ export function toTaskCenter(taskId) {
customClass: 'import-link-confirm-content', customClass: 'import-link-confirm-content',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
window.open(`http://gicdev.demogic.com/gic-web/#/taskDetail/${taskId}`); window.open(`/gic-web/#/taskDetail/${taskId}`);
}).catch(() => true); }).catch(() => true);
} }
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
<!-- <el-collapseTransition> --> <!-- <el-collapseTransition> -->
<!--我的会员分组--> <!--我的会员分组-->
<ul class="lists" v-show="activeType == '1'"> <ul class="lists" v-show="activeType == '1'">
<li @click="addGroupDialog = true" :limit-code="$buttonCode.memberTagAddCateGory" v-if="$getButtonLimit($buttonCode.memberTagAddCateGory)" style="margin-bottom: 10px">
<el-button type="primary" class="ghost-btn add-group">新增分类</el-button>
</li>
<li v-for="(list, i) in lists" :key="i" :class="['member-list', { 'active-li': i == currentIndex }]" @click="handleChangeIndex(i, list)"> <li v-for="(list, i) in lists" :key="i" :class="['member-list', { 'active-li': i == currentIndex }]" @click="handleChangeIndex(i, list)">
<div> <div>
<i class="iconfont icon-kehufenzu icon"></i> <i class="iconfont icon-kehufenzu icon"></i>
...@@ -21,9 +24,6 @@ ...@@ -21,9 +24,6 @@
<i slot="reference" class="iconfont icon-gengduo icon"></i> <i slot="reference" class="iconfont icon-gengduo icon"></i>
</el-popover> </el-popover>
</li> </li>
<li @click="addGroupDialog = true" :limit-code="$buttonCode.memberTagAddCateGory" v-if="$getButtonLimit($buttonCode.memberTagAddCateGory)" style="margin-top:10px">
<el-button type="primary" class="ghost-btn add-group">新增分类</el-button>
</li>
</ul> </ul>
<!-- </el-collapseTransition> --> <!-- </el-collapseTransition> -->
......
...@@ -1479,6 +1479,7 @@ export default { ...@@ -1479,6 +1479,7 @@ export default {
align-items: stretch; align-items: stretch;
.left-box { .left-box {
flex-shrink: 0; flex-shrink: 0;
height: 100%;
width: 200px; width: 200px;
background-color: #fff; background-color: #fff;
border-right: 1px solid rgba(220,223,230,1); border-right: 1px solid rgba(220,223,230,1);
......
...@@ -781,8 +781,11 @@ export default { ...@@ -781,8 +781,11 @@ export default {
}, },
getShowSystem() { getShowSystem() {
return isShowSystemTag().then(res => { return isShowSystemTag().then(res => {
this.isShowSystem = res.result; this.isShowSystem = 0;
if(!res.result) this.activeTag='manual'; if(!res.result) {
this.activeTag='manual';
this.handTag = 1;
};
}) })
} }
}, },
......
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