Skip to content

M
memberTag-web
Commit 4894fcf0 by liuchenxi
Options

Merge branch 'feature/8月上迭代' into dev

parents d116c53a a3f927b7
Showing with 77 additions and 118 deletions
package-lock.json
......@@ -299,42 +299,6 @@
"integrity": "sha1-9PoX/F7hgxfsAadj01V4LHs5Xq8=",
"dev": true
},
"@gic-test/vue-gic-datepicker": {
"version": "1.3.8",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-datepicker/download/@gic-test/vue-gic-datepicker-1.3.8.tgz",
"integrity": "sha1-LabzRGc8Gk74VT5axW3wY9rXs18=",
"dev": true,
"requires": {
"@riophae/vue-treeselect": "0.0.35",
"axios": "^0.18.0",
"element-ui": "^2.4.8",
"localforage": "^1.7.2",
"vue": "^2.5.11"
},
"dependencies": {
"@riophae/vue-treeselect": {
"version": "0.0.35",
"resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.0.35.tgz",
"integrity": "sha512-MluY8JRx7yD3AE39g54HnYtcD9cxVTUsqXo6Tjs4+gq41XzlTJhyUJLsSSMtT49qonKbL6gOjK7F/wm+Y9LFQA==",
"dev": true,
"requires": {
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"easings-css": "^1.0.0",
"fuzzysearch": "^1.0.3",
"google-material-color": "^1.3.1",
"is-promise": "^2.1.0",
"lodash": "^4.0.0",
"watch-size": "^2.0.0"
}
},
"vue": {
"version": "2.6.10",
"resolved": "http://registry.npm.taobao.org/vue/download/vue-2.6.10.tgz",
"integrity": "sha1-pysaQqTYKnIepDjRtr9V5mGVxjc=",
"dev": true
}
}
},
"@riophae/vue-treeselect": {
"version": "0.0.29",
"resolved": "https://registry.npm.taobao.org/@riophae/vue-treeselect/download/@riophae/vue-treeselect-0.0.29.tgz",
......@@ -5774,23 +5738,6 @@
"delegate": "^3.1.2"
}
},
"google-material-color": {
"version": "1.3.1",
"resolved": "https://registry.npm.taobao.org/google-material-color/download/google-material-color-1.3.1.tgz",
"integrity": "sha1-mAgtTthq9DuzqxHEmoHrmcrKEFY=",
"dev": true,
"requires": {
"lodash": "^2.4.1"
},
"dependencies": {
"lodash": {
"version": "2.4.2",
"resolved": "https://registry.npm.taobao.org/lodash/download/lodash-2.4.2.tgz",
"integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
"dev": true
}
}
},
"graceful-fs": {
"version": "4.2.6",
"resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgraceful-fs%2Fdownload%2Fgraceful-fs-4.2.6.tgz",
......@@ -6304,12 +6251,6 @@
"dev": true,
"optional": true
},
"immediate": {
"version": "3.0.6",
"resolved": "https://registry.npm.taobao.org/immediate/download/immediate-3.0.6.tgz",
"integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
"dev": true
},
"import-cwd": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
......@@ -6721,12 +6662,6 @@
"isobject": "^3.0.1"
}
},
"is-promise": {
"version": "2.2.2",
"resolved": "https://registry.npm.taobao.org/is-promise/download/is-promise-2.2.2.tgz",
"integrity": "sha1-OauVnMv5p3TPB597QMeib3YxNfE=",
"dev": true
},
"is-regex": {
"version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
......@@ -7036,15 +6971,6 @@
"type-check": "~0.3.2"
}
},
"lie": {
"version": "3.1.1",
"resolved": "https://registry.npm.taobao.org/lie/download/lie-3.1.1.tgz",
"integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
"dev": true,
"requires": {
"immediate": "~3.0.5"
}
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
......@@ -7133,15 +7059,6 @@
"json5": "^1.0.1"
}
},
"localforage": {
"version": "1.9.0",
"resolved": "https://registry.npm.taobao.org/localforage/download/localforage-1.9.0.tgz",
"integrity": "sha1-8+TTKoMAs2K0Y0zE4GbZ0A0vCdE=",
"dev": true,
"requires": {
"lie": "3.1.1"
}
},
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz",
......@@ -13523,12 +13440,6 @@
"integrity": "sha1-I2vAhqhww655lG8QfxbeWdWJXnE=",
"dev": true
},
"watch-size": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/watch-size/download/watch-size-2.0.0.tgz",
"integrity": "sha1-CW7ijQNlvX6gPZyL8fL1CnO+FHQ=",
"dev": true
},
"watchpack": {
"version": "1.7.5",
"resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.5.tgz",
......
src/components/card/card.vue
......@@ -347,8 +347,8 @@ export default {
};
if (this.type) {
Object.assign(param, {
startTime: this.sdate,
endTime: this.edate,
// startTime: this.sdate,
// endTime: this.edate,
cardModule: this.type ? 'memberTag' : '' // 会员标签传
});
}
......
src/components/tag/tag-config-options.vue
......@@ -637,7 +637,13 @@
<!-- 会员标签嵌入卡券选择器 com023 -->
<!-- v-if="parent.templateCode == 'com023'" -->
<div v-if="parent.templateCode == 'com023'">
选择卡券：<el-radio-group v-model="cardRadioType">
<el-radio :label="0">全部卡券</el-radio>
<el-radio :label="1">部分卡券</el-radio>
</el-radio-group>
<vue-gic-card
v-show="cardRadioType"
style="margin-top:20px"
@reciver-card-list="reciverCardList"
:disabledList="disabledList"
:cardLimit="cardLimit"
......@@ -645,6 +651,7 @@
:tag-list="tagList"
:type="1">
</vue-gic-card>
<p v-show="!cardRadioType" class="grey" style="margin-top:15px">说明：选择全部卡券后，后续创建的卡券也会进行统计。</p>
</div>
<!-- 会员分层 tag021 -->
......@@ -750,19 +757,18 @@
<!-- v-if="parent.templateCode == 'com024'" -->
<div v-if="parent.templateCode == 'com024'">
<div style="margin-bottom:20px">
<el-select v-model="expiration" style="width:90px;">
<el-option label="1" value="1"></el-option>
<el-option label="2" value="2"></el-option>
<el-option label="3" value="3"></el-option>
<el-option label="4" value="4"></el-option>
<el-option label="5" value="5"></el-option>
<el-option label="6" value="6"></el-option>
<el-option label="7" value="7"></el-option>
</el-select>
<el-input type="text" v-model="expiration" style="width:90px;" @change="onChangeTime" />
天后过期
<span class="grey">（仅支持输入1-30之间的正整数）</span>
</div>
选择卡券：<el-radio-group v-model="cardRadioType">
<el-radio :label="0">全部卡券</el-radio>
<el-radio :label="1">部分卡券</el-radio>
</el-radio-group>
<vue-gic-card
v-show="cardRadioType"
ref="gicCard"
style="margin-top:20px"
@reciver-card-list="reciverCardList"
:disabledList="disabledList"
:cardLimit="cardLimit"
......@@ -770,6 +776,7 @@
:tag-list="tagList"
:type="1">
</vue-gic-card>
<p v-show="!cardRadioType" class="grey" style="margin-top:15px">说明：选择全部卡券后，后续创建的卡券也会进行统计。</p>
</div>
</div>
</div>
......@@ -1056,7 +1063,8 @@ export default {
cardParams: {
startTime: '',
endTime: ''
}
},
cardRadioType: 1
};
},
watch: {
......@@ -1925,6 +1933,14 @@ export default {
console.log('saddssdsd', `${v}`.replace(/\s/g, ''))
return `${v}`.replace(/\s/g, '');
},
onChangeTime(val) {
if(isNaN(val)) {
this.expiration = 1;
return;
}
if(val < 1) this.expiration = '1';
else if(val > 30) this.expiration = '30';
}
},
created() {
......@@ -2134,6 +2150,8 @@ export default {
padding: 20px 10px;
border-bottom: 1px solid rgba(220, 223, 230, 1);
}
.grey {
color: rgb(186,186,186);
}
</style>
src/view/memberGroup/edit-tag.vue
......@@ -78,7 +78,6 @@ export default {
},
handleSave() {
const ret = this.$refs.tagConfig.getTemplateData();
this.templateData = JSON.parse(JSON.stringify(ret));
this.tagId = this.tagDataAssgin.tagId;
......
src/view/memberGroup/memberGroupList.vue
......@@ -20,17 +20,22 @@
@clear="clearSearch"
@keyup.enter.native="searchEnterFun"
/>
<el-select v-model="statusSelect" @change="searchByStatus" placeholder="是否有效" class="w-220 m-r-8" clearable>
<el-select v-model="statusSelect" @change="searchByStatus" placeholder="是否有效" class="w-160 m-r-8" clearable>
<el-option :key="0" label="失效" :value="0"> </el-option>
<el-option :key="1" label="有效" :value="1"> </el-option>
</el-select>
<!-- 实时和非实时 -->
<el-select v-model="isRealTime" @change="realTimeStatus" placeholder="是否实时" class="w-220 m-l-0" clearable>
<el-select v-model="isRealTime" @change="realTimeStatus" placeholder="是否实时" class="w-160 m-l-0 m-r-8" clearable>
<el-option :key="0" label="非实时" :value="0"> </el-option>
<el-option :key="1" label="实时" :value="1"> </el-option>
</el-select>
<!--是否展示好办-->
<el-select v-model="isHaoban" @change="changeHaoBan" placeholder="是否好办展示" class="w-160" clearable>
<el-option :key="0" label="不展示" :value="0"> </el-option>
<el-option :key="1" label="展示" :value="1"> </el-option>
</el-select>
<el-button class="btn-foled-all" @click="onFoldAll">展开/收起分堆人群</el-button>
</div>
<div class="common-wrap__table m-t-20">
......@@ -101,6 +106,17 @@
{{ scope.row.effectiveStatus == 1 ? '有效' : '失效' }}
</template>
</el-table-column>
<el-table-column prop="appStatus" label="好办展示" >
<template slot="header">
好办展示
<el-tooltip effect="dark" content="开启后，默认次日更新至好办管理后台，如需立即更新，请至好办管理后台操作“同步”" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-switch :active-value="1" :inactive-value="0" v-model="scope.row.appStatus" active-color="#1890ff" @change="switchAppStatus(scope.row.appStatus, scope.row)"> </el-switch>
</template>
</el-table-column>
<el-table-column label="操作" width="240px">
<template slot-scope="scope">
<!-- <router-link
......@@ -147,16 +163,22 @@
@clear="clearSearch"
@keyup.enter.native="searchEnterFun"
/>
<el-select v-model="statusSelect" @change="searchByStatus" placeholder="是否有效" class="w-220 m-r-8" clearable>
<el-select v-model="statusSelect" @change="searchByStatus" placeholder="是否有效" class="w-160 m-r-8" clearable>
<el-option :key="0" label="失效" :value="0"> </el-option>
<el-option :key="1" label="有效" :value="1"> </el-option>
</el-select>
<!-- 实时和非实时 -->
<el-select v-model="isRealTime" @change="realTimeStatus" placeholder="是否实时" class="w-220 m-l-0" clearable>
<el-select v-model="isRealTime" @change="realTimeStatus" placeholder="是否实时" class="w-160 m-l-0 m-r-8" clearable>
<el-option :key="0" label="非实时" :value="0"> </el-option>
<el-option :key="1" label="实时" :value="1"> </el-option>
</el-select>
<!--是否展示好办-->
<el-select v-model="isHaoban" @change="changeHaoBan" placeholder="是否好办展示" class="w-160" clearable>
<el-option :key="0" label="不展示" :value="0"> </el-option>
<el-option :key="1" label="展示" :value="1"> </el-option>
</el-select>
<div class="batch-option">
<el-tooltip class="item" content="分组内的标签条件或者其他信息有过编辑的，均在此查看" placement="top">
<el-button class="fl" type="primary" @click="$router.push('/memberGroupLog')">分组操作日志</el-button>
......@@ -594,7 +616,8 @@ export default {
],
proportions: ['1:1', '2:3'],
pileNames: ['分堆a', '分堆b', '分堆c', '分堆d', '分堆e'],
custom: [1, 1]
custom: [1, 1],
isHaoban: ''
},
};
},
......@@ -1181,11 +1204,17 @@ export default {
this.params.isRealTime = val;
this.getGroupList();
},
// 切换好办展示
changeHaoBan(val) {
this.params.pageNum = 1;
this.params.appStatus = val;
this.getGroupList();
},
/**
* 获取列表数据
*/
getGroupList() {
this.params.fixedType = this.showFixedList ? 1 : 0
this.params.fixedType = this.showFixedList ? 1 : 0;
memberTagGroupList(this.params).then(res => {
this.loading = false;
if (res.errorCode == 1) {
......
static/css/public.css
......@@ -18,8 +18,8 @@ h5,
h6,
p,
blockquote,
pre,
a,
pre,
a,
abbr,
acronym,
address,
......@@ -206,7 +206,7 @@ scrollbar[orient="vertical"] {
}
scrollbar {
/* clear useragent default style*/
-moz-appearance: none !important;
}
......@@ -403,6 +403,9 @@ input:focus {
.w-98 {
width: 98px;
}
.w-160 {
width: 160px;
}
.w-180 {
width: 180px;
}
......@@ -587,7 +590,7 @@ i {
input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
background-color: rgb(250, 255, 189);
/* #FAFFBD; */
background-image: none;
color: rgb(0, 0, 0);
}
......@@ -721,7 +724,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
.leftBar-wrap .cardmenu-item li.el-submenu:hover span {
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label {
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label {
color: #fff;
cursor: pointer;
}
......@@ -737,7 +740,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
.percent-item .el-input-group__append {
padding: 0 12px;
}
}
.table-label .el-form-item__label {
line-height: 48px;
......@@ -753,7 +756,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
}
.common-wrap__fix__table .el-table__empty-text {
margin-bottom: 40px;
}
}
/* 会员标签 */
.common-lib__cell__fieldName::before {
......@@ -1203,4 +1206,4 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
/* 暂存架 */
.name-hover:hover {
color: #1890ff;
}
\ No newline at end of file
}
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