Skip to content

M
memberTag-web
Commit 7a2031a8 by chenyu
Options

update： 隐私协议

parent b1220de3
Showing with 201 additions and 5 deletions
package-lock.json
......@@ -299,6 +299,36 @@
"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"
}
}
}
},
"@riophae/vue-treeselect": {
"version": "0.0.29",
"resolved": "https://registry.npm.taobao.org/@riophae/vue-treeselect/download/@riophae/vue-treeselect-0.0.29.tgz",
......@@ -5738,6 +5768,23 @@
"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.nlark.com/lodash/download/lodash-2.4.2.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-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",
......@@ -6251,6 +6298,12 @@
"dev": true,
"optional": true
},
"immediate": {
"version": "3.0.6",
"resolved": "https://registry.nlark.com/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",
......@@ -6662,6 +6715,12 @@
"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",
......@@ -6971,6 +7030,15 @@
"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",
......@@ -7059,6 +7127,15 @@
"json5": "^1.0.1"
}
},
"localforage": {
"version": "1.10.0",
"resolved": "https://registry.nlark.com/localforage/download/localforage-1.10.0.tgz",
"integrity": "sha1-XEZdxfYrKAfDqEwMahsbMhJ4HdQ=",
"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",
......@@ -7404,6 +7481,11 @@
"minimist": "^1.2.5"
}
},
"moment": {
"version": "2.29.1",
"resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz",
"integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
},
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
......@@ -13440,6 +13522,12 @@
"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",
......
package.json
......@@ -13,6 +13,7 @@
"dependencies": {
"element-ui": "^2.8.2",
"file-saver": "^1.3.8",
"moment": "^2.29.1",
"tinymce": "^4.8.3",
"vue": "^2.5.2",
"vue-clipboard2": "^0.2.0",
......
src/components/tag/tag-config-options.vue
......@@ -754,6 +754,29 @@
</div>
</template>
<!-- 是否同意隐私协议 tag025 -->
<template v-if="parent.templateCode == 'tag025'">
<div class="m-b-20" :key="'tag25' + pindex">
<div>
<el-radio-group v-model="parent.isAgree" @change="parent.ids=[]">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</div>
<!-- 固定时段 -->
<div class="m-t-18 border-box" v-if="parent.isAgree===1">
<el-select v-model="parent.ids" multiple collapse-tags class="tag025-select" popper-class="tag025-scrollbar" style="width:260px;color:#2F54EB" placeholder="选择会员同意的协议版本">
<el-option
v-for="agreement in parent.options"
:key="agreement.agreementId"
:label="agreement.agreementName"
:value="agreement.agreementId">
</el-option>
</el-select>
</div>
</div>
</template>
<!-- 会员标签嵌入卡券选择器 com024 -->
<!-- v-if="parent.templateCode == 'com024'" -->
<div v-if="parent.templateCode == 'com024'" style="min-height: 100px">
......@@ -791,6 +814,7 @@ import tagDetails from '@/components/tagDetail/mixin/index';
import VueGicCard from '@/components/card/card';
import { aliasNames } from '@/config'
import { getTagType, findWidget, findOndJson } from '@/request/tagConfig';
import moment from 'moment'
// 两个数字区间 numRange [0, 1]
const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018', 'tag024'];
......@@ -1058,6 +1082,11 @@ export default {
return time.getTime() < new Date(new Date().toLocaleDateString()).getTime();
}
},
tag025: {
isAgree: 1, // 0否 1是
ids: [],
options: []
},
cardListData: [],
com024: {},
com025: {},
......@@ -1265,6 +1294,10 @@ export default {
if (data.templateCode === 'tag010') {
this.getcityData();
}
// 隐私协议
if (data.templateCode === 'tag025') {
this.getPrivacyGgreement();
}
// 如果是给了 计算属性值
if (!!this.postCompute) {
// this[data.templateCode] = Object.create(null);
......@@ -1398,6 +1431,26 @@ export default {
console.log(err);
});
},
/**
* 隐私协议列表
*/
getPrivacyGgreement() {
const para = { requestProject: 'member-tag',agreementType: 1 };
this.axios
.post(`${this.baseUrl}/api-admin/list-service-privacy-agreement`, qs.stringify(para))
.then(res => {
if (res.data.errorCode === 0) {
const data = res.data.result;
data.forEach((el, index) => {
el.agreementName = `${el.agreementName} （${moment(el.createTime).format('MM-DD hh:mm')}）`;
});
this.tag025.options = [{agreementName: '测试测试测试测试测试测试测试测 (09-17 01:37)',agreementId: '123'}].concat(data);
}
})
.catch(err => {
console.log(err);
});
},
/**
* 获取当前标签数据
......@@ -1831,6 +1884,17 @@ export default {
}
}
break;
case 'tag025':
for (let i = 0; i < tagParams.template.length; i++) {
if (tagParams.template[i].templateCode == 'tag025') {
this.templateData[i].isAgree=tagValue.val[0].data.value.length?1:0;
this.templateData[i].ids=tagValue.val[0].data.value.split(' ')
}
}
// this.confirmSelector();
// this.select.expends = false;
break;
case 'com022':
for (let i = 0; i < tagParams.template.length; i++) {
......@@ -2179,5 +2243,21 @@ export default {
.grey {
color: rgb(186,186,186);
}
/deep/.tag025-select.el-select {
.el-select__tags-text{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 120px;
display: inline-block;
}
.el-tag__close.el-icon-close{
top: -7px;
}
}
</style>
<style>
.tag025-scrollbar{
width: 370px;
}
</style>
\ No newline at end of file
src/components/tagDetail/mixin/index.js
......@@ -460,7 +460,12 @@ export default {
this.templateData[0].checkeditems = itemArr;
tagValue.val[0].data.value = itemArr.join(' ');
}
if (code === 'tag025' && that.templateData.length === 1) {
that.postTemplateData.selectedVal [0] = that.templateData[0].isAgree?'是':'否';
tagValue.val[0].data.key = 'consentPrivacyProtocol';
tagValue.val[0].data.compute = that.templateData[0].ids.length?'in':'=';
tagValue.val[0].data.value = that.templateData[0].ids.length?that.templateData[0].ids.join(' '):that.templateData[0].isAgree;
}
/**
* 商品选择必选
*/
......@@ -472,7 +477,6 @@ export default {
this.$message.warning('商品选择器未选择条件！')
return false;
}
console.log(this.com022.conditionsList);
tagValue.val[0].data.compute = this[code].postCompute;
tagValue.val[0].data.key = this.currentKey;
tagValue.val[0].data.dealKey = 'goodsSeletor';
......@@ -1066,7 +1070,7 @@ export default {
if (code === 'com023' || code === 'com024') {
tagValue.val[0].data.compute = code === 'com024' ? 'in' : this[code].postCompute;
tagValue.val[0].data.dealKey = "card";
tagValue.val[0].data.key = this.currentKey;
tagValue.val[0].data.key = this.currentKey;
tagValue.val[0].data.value = this.cardListData.map(el => el.coupCardId).join(' ');
this.postTemplateData.selectedVal = this.cardListData.map(el => el.cardName).join(' ');
}
......
src/view/memberGroup/edit-tag.vue
......@@ -10,7 +10,8 @@
</p>
<p class="tag-desc">{{ tagDataAssgin.tagDescribe }}</p>
</div>
<p v-if="tagId" class="m-t-20 m-b-20 tag-config">标签值设置</p>
<p v-if="tagId" class="m-t-20 m-b-20 tag-config">标签值设置<el-tooltip v-if="tagDataAssgin.columnKey==='haobanWechatRelatedTime'" popper-class="edit-tag-tooltip" placement="top" open-delay="100" effect="light"
><div slot="content"><span style="font-weight:600">固定时段：</span>在所选时间段内首次添加导购企微好友的；<br/><span style="font-weight:600">相对时段：</span>相对于“标签统计时间”（每天凌晨计算统计一次）的前X天/月/年内首次添加导购企微好友的，例：选择相对时段为“最近2天”，那么系统在5号凌晨进行统计时，统计的是在3号、4号首次添加导购企微好友的顾客；系统在6号凌晨统计时，统计的是4号、5号首次添加导购企微好友的顾客。</div><i class="iconfont icon-tishi"></i></el-tooltip></p>
<!-- 所有标签的配置项 -->
<div class="tag-config-options">
<tag-config-options v-if="isAddFlag" :creatorId="creatorId" :tagId="tagDataAssgin.tagId" ref="tagConfig" :templateDataList="templateObj" @returnTagData="returnTagData"></tag-config-options>
......@@ -130,6 +131,10 @@ export default {
.tag-config {
font-size: 14px;
color: #606266;
.iconfont.icon-tishi{
margin-left: 5px;
color: #909399;
}
}
.tag-config-options {
max-height: 50vh;
......@@ -143,3 +148,20 @@ export default {
}
}
</style>
<style>
/* tooltip */
.edit-tag-tooltip.el-tooltip__popper.is-light{
max-width: 400px;
padding: 16px;
font-size: 14px;
font-weight: 400;
color: #303133;
line-height: 20px;
border: none;
border-radius: 2px;
box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
}
.edit-tag-tooltip.el-tooltip__popper.is-light .popper__arrow{
border: none;
}
</style>
static/font/demo_index.html
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font/iconfont.ttf
No preview for this file type
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