Skip to content

H
haoban-3
Commit 4ab83bb9 by shaojiawen
Options

Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

parents 11265599 d484fff3
Showing with 243 additions and 91 deletions
src/assets/font/demo_index.html
...@@ -55,6 +55,24 @@ ...@@ -55,6 +55,24 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont-hb3">&#xee14;</span>
<div class="name">操作日志</div>
<div class="code-name">&amp;#xee14;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xec64;</span>
<div class="name">no-data</div>
<div class="code-name">&amp;#xec64;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xebcc;</span>
<div class="name">user-default</div>
<div class="code-name">&amp;#xebcc;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xebeb;</span> <span class="icon iconfont-hb3">&#xebeb;</span>
<div class="name">电话</div> <div class="name">电话</div>
<div class="code-name">&amp;#xebeb;</div> <div class="code-name">&amp;#xebeb;</div>
...@@ -73,6 +91,12 @@ ...@@ -73,6 +91,12 @@
</li> </li>
<li class="dib"> <li class="dib">
<span class="icon iconfont-hb3">&#xec98;</span>
<div class="name">更多</div>
<div class="code-name">&amp;#xec98;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xe62c;</span> <span class="icon iconfont-hb3">&#xe62c;</span>
<div class="name">close</div> <div class="name">close</div>
<div class="code-name">&amp;#xe62c;</div> <div class="code-name">&amp;#xe62c;</div>
...@@ -810,9 +834,9 @@ ...@@ -810,9 +834,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont-hb3'; font-family: 'iconfont-hb3';
src: url('iconfont.woff2?t=1657521279508') format('woff2'), src: url('iconfont.woff2?t=1658209429777') format('woff2'),
url('iconfont.woff?t=1657521279508') format('woff'), url('iconfont.woff?t=1658209429777') format('woff'),
url('iconfont.ttf?t=1657521279508') format('truetype'); url('iconfont.ttf?t=1658209429777') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
...@@ -839,6 +863,33 @@ ...@@ -839,6 +863,33 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont-hb3 iconcaozuorizhi"></span>
<div class="name">
操作日志
</div>
<div class="code-name">.iconcaozuorizhi
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconno-data"></span>
<div class="name">
no-data
</div>
<div class="code-name">.iconno-data
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconuser-default"></span>
<div class="name">
user-default
</div>
<div class="code-name">.iconuser-default
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 icondianhua"></span> <span class="icon iconfont-hb3 icondianhua"></span>
<div class="name"> <div class="name">
电话 电话
...@@ -866,6 +917,15 @@ ...@@ -866,6 +917,15 @@
</li> </li>
<li class="dib"> <li class="dib">
<span class="icon iconfont-hb3 icongengduo3"></span>
<div class="name">
更多
</div>
<div class="code-name">.icongengduo3
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconclose1"></span> <span class="icon iconfont-hb3 iconclose1"></span>
<div class="name"> <div class="name">
close close
...@@ -1974,6 +2034,30 @@ ...@@ -1974,6 +2034,30 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconcaozuorizhi"></use>
</svg>
<div class="name">操作日志</div>
<div class="code-name">#iconcaozuorizhi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconno-data"></use>
</svg>
<div class="name">no-data</div>
<div class="code-name">#iconno-data</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconuser-default"></use>
</svg>
<div class="name">user-default</div>
<div class="code-name">#iconuser-default</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icondianhua"></use> <use xlink:href="#icondianhua"></use>
</svg> </svg>
<div class="name">电话</div> <div class="name">电话</div>
...@@ -1998,6 +2082,14 @@ ...@@ -1998,6 +2082,14 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icongengduo3"></use>
</svg>
<div class="name">更多</div>
<div class="code-name">#icongengduo3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconclose1"></use> <use xlink:href="#iconclose1"></use>
</svg> </svg>
<div class="name">close</div> <div class="name">close</div>
......
src/assets/font/iconfont.css
@font-face { @font-face {
font-family: "iconfont-hb3"; /* Project id 1628375 */ font-family: "iconfont-hb3"; /* Project id 1628375 */
src: url('iconfont.woff2?t=1657521279508') format('woff2'), src: url('iconfont.woff2?t=1658209429777') format('woff2'),
url('iconfont.woff?t=1657521279508') format('woff'), url('iconfont.woff?t=1658209429777') format('woff'),
url('iconfont.ttf?t=1657521279508') format('truetype'); url('iconfont.ttf?t=1658209429777') format('truetype');
} }
.iconfont-hb3 { .iconfont-hb3 {
...@@ -13,6 +13,18 @@ ...@@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.iconcaozuorizhi:before {
content: "\ee14";
}
.iconno-data:before {
content: "\ec64";
}
.iconuser-default:before {
content: "\ebcc";
}
.icondianhua:before { .icondianhua:before {
content: "\ebeb"; content: "\ebeb";
} }
...@@ -25,6 +37,10 @@ ...@@ -25,6 +37,10 @@
content: "\ec97"; content: "\ec97";
} }
.icongengduo3:before {
content: "\ec98";
}
.iconclose1:before { .iconclose1:before {
content: "\e62c"; content: "\e62c";
} }
......
src/assets/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.json
...@@ -6,6 +6,27 @@ ...@@ -6,6 +6,27 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "27402276",
"name": "操作日志",
"font_class": "caozuorizhi",
"unicode": "ee14",
"unicode_decimal": 60948
},
{
"icon_id": "27977097",
"name": "no-data",
"font_class": "no-data",
"unicode": "ec64",
"unicode_decimal": 60516
},
{
"icon_id": "24838426",
"name": "user-default",
"font_class": "user-default",
"unicode": "ebcc",
"unicode_decimal": 60364
},
{
"icon_id": "25538381", "icon_id": "25538381",
"name": "电话", "name": "电话",
"font_class": "dianhua", "font_class": "dianhua",
...@@ -27,6 +48,13 @@ ...@@ -27,6 +48,13 @@
"unicode_decimal": 60567 "unicode_decimal": 60567
}, },
{ {
"icon_id": "28687124",
"name": "更多",
"font_class": "gengduo3",
"unicode": "ec98",
"unicode_decimal": 60568
},
{
"icon_id": "1457645", "icon_id": "1457645",
"name": "close", "name": "close",
"font_class": "close1", "font_class": "close1",
......
src/router/actCodeManageRouter/attractFlowLinkRouter.js
...@@ -10,9 +10,7 @@ const attractFlowLinkRouter = [ ...@@ -10,9 +10,7 @@ const attractFlowLinkRouter = [
path: '/attractFlowLinkAdd', path: '/attractFlowLinkAdd',
name: '新增引流链接', name: '新增引流链接',
meta: { meta: {
type: 'add', type: 'add'
keepAlive: true,
fromPath: ['/salutatorySet']
}, },
component: _import('salesleads/actCodeManage/attractFlowLink', 'detail') component: _import('salesleads/actCodeManage/attractFlowLink', 'detail')
}, },
...@@ -20,9 +18,7 @@ const attractFlowLinkRouter = [ ...@@ -20,9 +18,7 @@ const attractFlowLinkRouter = [
path: '/attractFlowLinkEdit/:id', path: '/attractFlowLinkEdit/:id',
name: '编辑引流链接', name: '编辑引流链接',
meta: { meta: {
type: 'edit', type: 'edit'
keepAlive: true,
fromPath: ['/salutatorySet']
}, },
component: _import('salesleads/actCodeManage/attractFlowLink', 'detail') component: _import('salesleads/actCodeManage/attractFlowLink', 'detail')
}, },
......
src/views/login/login-more.vue
...@@ -77,7 +77,11 @@ export default { ...@@ -77,7 +77,11 @@ export default {
*/ */
toLogin() { toLogin() {
const that = this; const that = this;
const href = `${window.location.origin}/haoban-manage3-web/gic-login?wxEnterpriseId=${that.enterpriseList[that.active].wxEnterpriseId}&random=${that.$route.query.random}`; const { random, hbPage } = this.$route.query;
let href = `${window.location.origin}/haoban-manage3-web/gic-login?wxEnterpriseId=${that.enterpriseList[that.active].wxEnterpriseId}&random=${random}`;
if (hbPage) {
href = `${window.location.origin}/haoban-manage3-web/gic-login?wxEnterpriseId=${that.enterpriseList[that.active].wxEnterpriseId}&random=${random}&hbPage=${hbPage}`;
}
window.location.href = href; window.location.href = href;
}, },
changeEnterprise(val) { changeEnterprise(val) {
......
src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
...@@ -34,66 +34,66 @@ ...@@ -34,66 +34,66 @@
<div class="level"> <div class="level">
<div class="title m-b-20"> <div class="title m-b-20">
<span>层级一：服务门店</span> <span>层级一：服务门店</span>
<el-switch v-model="form.customRuleJson.fw_store.open" :active-value="1" :inactive-value="0" :disabled="true"></el-switch> <el-switch v-model="form.storeRuleJson.fw_store.open" :active-value="1" :inactive-value="0" :disabled="true"></el-switch>
</div> </div>
<div class="content"> <div class="content">
<el-checkbox v-model="form.customRuleJson.fw_store.zs" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.fw_store.zs, form.customRuleJson.fw_store.dz, form.customRuleJson.fw_store.dy) && form.customRuleJson.fw_store.zs">专属导购</el-checkbox> <el-checkbox v-model="form.storeRuleJson.fw_store.zs" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.fw_store.zs, form.storeRuleJson.fw_store.dz, form.storeRuleJson.fw_store.dy) && form.storeRuleJson.fw_store.zs">专属导购</el-checkbox>
<el-checkbox v-model="form.customRuleJson.fw_store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.fw_store.zs, form.customRuleJson.fw_store.dz, form.customRuleJson.fw_store.dy) && form.customRuleJson.fw_store.dz">店长</el-checkbox> <el-checkbox v-model="form.storeRuleJson.fw_store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.fw_store.zs, form.storeRuleJson.fw_store.dz, form.storeRuleJson.fw_store.dy) && form.storeRuleJson.fw_store.dz">店长</el-checkbox>
<el-checkbox v-model="form.customRuleJson.fw_store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.fw_store.zs, form.customRuleJson.fw_store.dz, form.customRuleJson.fw_store.dy) && form.customRuleJson.fw_store.dy">其他导购</el-checkbox> <el-checkbox v-model="form.storeRuleJson.fw_store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.fw_store.zs, form.storeRuleJson.fw_store.dz, form.storeRuleJson.fw_store.dy) && form.storeRuleJson.fw_store.dy">其他导购</el-checkbox>
</div> </div>
</div> </div>
<div class="level"> <div class="level">
<div class="title"> <div class="title">
<span>层级二：协管门店</span> <span>层级二：协管门店</span>
<el-switch v-model="form.customRuleJson.xg_store.open" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="form.storeRuleJson.xg_store.open" :active-value="1" :inactive-value="0"></el-switch>
</div> </div>
<p class="tips margin-num">当客户在多个协管门店下都有协管导购时，随机取一个协管门店导购</p> <p class="tips margin-num">当客户在多个协管门店下都有协管导购时，随机取一个协管门店导购</p>
<div class="content" v-if="form.customRuleJson.xg_store.open"> <div class="content" v-if="form.storeRuleJson.xg_store.open">
<el-checkbox v-model="form.customRuleJson.xg_store.zs" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.xg_store.zs, form.customRuleJson.xg_store.dz, form.customRuleJson.xg_store.dy) && form.customRuleJson.xg_store.zs">协管门店导购</el-checkbox> <el-checkbox v-model="form.storeRuleJson.xg_store.zs" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.xg_store.zs, form.storeRuleJson.xg_store.dz, form.storeRuleJson.xg_store.dy) && form.storeRuleJson.xg_store.zs">协管门店导购</el-checkbox>
<el-checkbox v-model="form.customRuleJson.xg_store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.xg_store.zs, form.customRuleJson.xg_store.dz, form.customRuleJson.xg_store.dy) && form.customRuleJson.xg_store.dz">店长</el-checkbox> <el-checkbox v-model="form.storeRuleJson.xg_store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.xg_store.zs, form.storeRuleJson.xg_store.dz, form.storeRuleJson.xg_store.dy) && form.storeRuleJson.xg_store.dz">店长</el-checkbox>
<el-checkbox v-model="form.customRuleJson.xg_store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.xg_store.zs, form.customRuleJson.xg_store.dz, form.customRuleJson.xg_store.dy) && form.customRuleJson.xg_store.dy">其他导购</el-checkbox> <el-checkbox v-model="form.storeRuleJson.xg_store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.xg_store.zs, form.storeRuleJson.xg_store.dz, form.storeRuleJson.xg_store.dy) && form.storeRuleJson.xg_store.dy">其他导购</el-checkbox>
</div> </div>
</div> </div>
<div class="level"> <div class="level">
<div class="title"> <div class="title">
<span>层级三：其他门店</span> <span>层级三：其他门店</span>
<el-switch v-model="form.storeRuleJson.open" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="form.customRuleJson.open" :active-value="1" :inactive-value="0"></el-switch>
</div> </div>
<div class="level3-1" v-if="form.storeRuleJson.open"> <div class="level3-1" v-if="form.customRuleJson.open">
<el-radio-group v-model="form.storeRuleJson.store_type"> <el-radio-group v-model="form.customRuleJson.store_type">
<el-radio :label="1">推荐门店</el-radio> <el-radio :label="1">推荐门店</el-radio>
<el-radio :label="2">附近门店</el-radio> <el-radio :label="2">附近门店</el-radio>
</el-radio-group> </el-radio-group>
<p class="tips m-t-6" v-if="form.storeRuleJson.store_type == 1">可配置最多20个门店作为推荐门店让客户自主选择要添加的门店好友</p> <p class="tips m-t-6" v-if="form.customRuleJson.store_type == 1">可配置最多20个门店作为推荐门店让客户自主选择要添加的门店好友</p>
<p class="tips m-t-6" v-else>需客户同意授权当前定位信息，才可展示客户附近最多20家门店供客户选择，否则只能在指定门店下选择</p> <p class="tips m-t-6" v-else>需客户同意授权当前定位信息，才可展示客户附近最多20家门店供客户选择，否则只能在指定门店下选择</p>
</div> </div>
<div class="level3-2" v-if="form.storeRuleJson.open"> <div class="level3-2" v-if="form.customRuleJson.open">
<div class="level3-2-content" v-if="form.storeRuleJson.store_type == 1"> <div class="level3-2-content" v-if="form.customRuleJson.store_type == 1">
<el-form-item label="选择门店" label-width="92px" prop="storeList"> <el-form-item label="选择门店" label-width="92px" prop="storeList">
<selectShop @change="handleTransferChange" :data="storeData" :selected="form.storeList" /> <selectShop @change="handleTransferChange" :data="storeData" :selected="form.storeList" />
</el-form-item> </el-form-item>
<el-checkbox v-model="form.storeRuleJson.store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.store.dz, form.storeRuleJson.store.dy) && form.storeRuleJson.store.dz">店长</el-checkbox> <el-checkbox v-model="form.customRuleJson.store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.dz, form.customRuleJson.store.dy) && form.customRuleJson.store.dz">店长</el-checkbox>
<el-checkbox v-model="form.storeRuleJson.store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.store.dz, form.storeRuleJson.store.dy) && form.storeRuleJson.store.dy">导购</el-checkbox> <el-checkbox v-model="form.customRuleJson.store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.dz, form.customRuleJson.store.dy) && form.customRuleJson.store.dy">导购</el-checkbox>
</div> </div>
<div class="level3-2-content" v-else> <div class="level3-2-content" v-else>
<p class="content-tips">客户同意授权当前定位信息，可在“附近门店”中自主选择要添加的门店好友</p> <p class="content-tips">客户同意授权当前定位信息，可在“附近门店”中自主选择要添加的门店好友</p>
<div class="level3-2-content-check"> <div class="level3-2-content-check">
<el-checkbox v-model="form.storeRuleJson.store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.store.dz, form.storeRuleJson.store.dy) && form.storeRuleJson.store.dz">店长</el-checkbox> <el-checkbox v-model="form.customRuleJson.store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.dz, form.customRuleJson.store.dy) && form.customRuleJson.store.dz">店长</el-checkbox>
<el-checkbox v-model="form.storeRuleJson.store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.store.dz, form.storeRuleJson.store.dy) && form.storeRuleJson.store.dy">导购</el-checkbox> <el-checkbox v-model="form.customRuleJson.store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.dz, form.customRuleJson.store.dy) && form.customRuleJson.store.dy">导购</el-checkbox>
</div> </div>
<p class="content-tips m-b-10">客户拒绝授权当前定位信息，可在下方指定的门店范围中（最多20家）自主选择要添加的门店好友</p> <p class="content-tips m-b-10">客户拒绝授权当前定位信息，可在下方指定的门店范围中（最多20家）自主选择要添加的门店好友</p>
<el-form-item label="选择门店" label-width="92px" prop="storeList"> <el-form-item label="选择门店" label-width="92px" prop="storeList">
<selectShop @change="handleTransferChange" :data="storeData" :selected="form.storeList" /> <selectShop @change="handleTransferChange" :data="storeData" :selected="form.storeList" />
</el-form-item> </el-form-item>
<el-checkbox v-model="form.storeRuleJson.store.ndz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.store.ndz, form.storeRuleJson.store.ndy) && form.storeRuleJson.store.ndz">店长</el-checkbox> <el-checkbox v-model="form.customRuleJson.store.ndz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.ndz, form.customRuleJson.store.ndy) && form.customRuleJson.store.ndz">店长</el-checkbox>
<el-checkbox v-model="form.storeRuleJson.store.ndy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.store.ndz, form.storeRuleJson.store.ndy) && form.storeRuleJson.store.ndy">导购</el-checkbox> <el-checkbox v-model="form.customRuleJson.store.ndy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.ndz, form.customRuleJson.store.ndy) && form.customRuleJson.store.ndy">导购</el-checkbox>
</div> </div>
</div> </div>
<div class="level3-3" v-if="form.storeRuleJson.open"> <div class="level3-3" v-if="form.customRuleJson.open">
<el-checkbox v-model="form.storeRuleJson.city_store.open" :true-label="1" :false-label="0">除附近门店/指定门店之外，允许客户按照省市区自由筛选商户所有门店进行添加</el-checkbox> <el-checkbox v-model="form.customRuleJson.city_store.open" :true-label="1" :false-label="0">除附近门店/指定门店之外，允许客户按照省市区自由筛选商户所有门店进行添加</el-checkbox>
<div class="level3-3-content" v-if="form.storeRuleJson.city_store.open"> <div class="level3-3-content" v-if="form.customRuleJson.city_store.open">
<el-checkbox v-model="form.storeRuleJson.city_store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.city_store.dz, form.storeRuleJson.city_store.dy) && form.storeRuleJson.city_store.dz">店长</el-checkbox> <el-checkbox v-model="form.customRuleJson.city_store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.city_store.dz, form.customRuleJson.city_store.dy) && form.customRuleJson.city_store.dz">店长</el-checkbox>
<el-checkbox v-model="form.storeRuleJson.city_store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.storeRuleJson.city_store.dz, form.storeRuleJson.city_store.dy) && form.storeRuleJson.city_store.dy">导购</el-checkbox> <el-checkbox v-model="form.customRuleJson.city_store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.city_store.dz, form.customRuleJson.city_store.dy) && form.customRuleJson.city_store.dy">导购</el-checkbox>
</div> </div>
</div> </div>
</div> </div>
...@@ -147,10 +147,10 @@ import { scrollToError } from '@/utils/validate'; ...@@ -147,10 +147,10 @@ import { scrollToError } from '@/utils/validate';
export default { export default {
data() { data() {
const validateStoreList = (rule, value, cb) => { const validateStoreList = (rule, value, cb) => {
if (this.form.storeRuleJson.open == 1 && !this.form.storeList.length) { if (this.form.customRuleJson.open == 1 && !this.form.storeList.length) {
return cb(new Error('请选择门店')); return cb(new Error('请选择门店'));
} }
if (this.form.storeRuleJson.open == 1 && !this.form.storeList.length) { if (this.form.customRuleJson.open == 1 && !this.form.storeList.length) {
return cb(new Error('请选择门店')); return cb(new Error('请选择门店'));
} }
cb(); cb();
...@@ -178,14 +178,14 @@ export default { ...@@ -178,14 +178,14 @@ export default {
storeData: [], storeData: [],
form: { form: {
linkType: 1, linkType: 1,
memberLabelName: '测试121212-木瑾0630测试标签值50', memberLabelName: '',
memberLabelId: 'fd6b44967aa647bcadfad10706244c56', memberLabelId: '',
storeList: [], storeList: [],
name: '', name: '',
pageId: '', pageId: '',
welcomeId: '', welcomeId: '',
remark: '', remark: '',
customRuleJson: { storeRuleJson: {
fw_store: { fw_store: {
open: 1, //是否开启 1是0否 open: 1, //是否开启 1是0否
zs: 1, //专属导购 zs: 1, //专属导购
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
dy: 0 dy: 0
} }
}, },
storeRuleJson: { customRuleJson: {
//其他门店 //其他门店
open: 1, //是否开启1是0否 open: 1, //是否开启1是0否
store_type: 1, // 1推荐门店 2附近门店, store_type: 1, // 1推荐门店 2附近门店,
...@@ -228,7 +228,8 @@ export default { ...@@ -228,7 +228,8 @@ export default {
}, },
mounted() { mounted() {
this.getList(); this.getList();
console.log('mounted');
console.log(this.form);
document.addEventListener('visibilitychange', () => { document.addEventListener('visibilitychange', () => {
if (document.visibilityState == 'visible') { if (document.visibilityState == 'visible') {
this.getList(); this.getList();
...@@ -240,12 +241,12 @@ export default { ...@@ -240,12 +241,12 @@ export default {
this.getStoreList(); this.getStoreList();
} }
}, },
methods: { methods: {
toInput: _debounce(function(e, value) { toInput: _debounce(function(e, value) {
this.getList(); this.getList();
}, 500), }, 500),
getStoreList() { getStoreList() {
console.log(storeListApi);
storeListApi({}).then(res => { storeListApi({}).then(res => {
console.log(res); console.log(res);
const { result } = res.data.result; const { result } = res.data.result;
...@@ -263,8 +264,8 @@ export default { ...@@ -263,8 +264,8 @@ export default {
const { result } = res.data; const { result } = res.data;
if (result) { if (result) {
const { link, page } = result; const { link, page } = result;
link.storeRuleJson = JSON.parse(link.storeRuleJson);
link.customRuleJson = JSON.parse(link.customRuleJson); link.customRuleJson = JSON.parse(link.customRuleJson);
link.storeRuleJson = JSON.parse(link.storeRuleJson);
link.storeList = link.storeList ? link.storeList : []; link.storeList = link.storeList ? link.storeList : [];
this.form = link; this.form = link;
this.landingForm = page; this.landingForm = page;
...@@ -324,8 +325,8 @@ export default { ...@@ -324,8 +325,8 @@ export default {
return; return;
} }
const data = JSON.parse(JSON.stringify(this.form)); const data = JSON.parse(JSON.stringify(this.form));
data.customRuleJson = JSON.stringify(data.customRuleJson);
data.storeRuleJson = JSON.stringify(data.storeRuleJson); data.storeRuleJson = JSON.stringify(data.storeRuleJson);
data.customRuleJson = JSON.stringify(data.customRuleJson);
data.wxEnterpriseId = this.wxEnterpriseId; data.wxEnterpriseId = this.wxEnterpriseId;
this.$refs.form.validate(val => { this.$refs.form.validate(val => {
if (!val) { if (!val) {
......
src/views/salesleads/actCodeManage/attractFlowLink/index.vue
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
</div> </div>
</div> </div>
<el-table :data="tableData" style="width:100%" v-loading="loading" @sort-change="handleSortChange"> <el-table :data="tableData" style="width:100%" v-loading="loading" @sort-change="handleSortChange">
<el-table-column width="120" prop="linkId" label="链接ID" /> <el-table-column width="120" prop="linkCode" label="链接ID" />
<el-table-column minWidth="180" prop="memberId" label="链接信息"> <el-table-column minWidth="180" prop="memberId" label="链接信息">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<p class="overFlow">{{ row.name }}</p> <p class="overFlow">{{ row.name }}</p>
<p class="tips">{{ row.linkCode }}</p> <p class="tips">{{ row.shortCode }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" prop="linkType" label="链接类型"> <el-table-column width="110" prop="linkType" label="链接类型">
......
src/views/salesleads/actCodeManage/attractFlowLink/newAddChart.vue
...@@ -49,17 +49,17 @@ export default { ...@@ -49,17 +49,17 @@ export default {
width: this.width, width: this.width,
padding: [20, 40, 80, 80] padding: [20, 40, 80, 80]
}); });
this.charData = [ // this.charData = [
{ addNum: 1, bizDate: '2022-07-11', clickNum: 11, clickTimes: 12 }, // { addNum: 1, bizDate: '2022-07-11', clickNum: 11, clickTimes: 12 },
{ addNum: 2, bizDate: '2022-07-12', clickNum: 22, clickTimes: 13 }, // { addNum: 2, bizDate: '2022-07-12', clickNum: 22, clickTimes: 13 },
{ addNum: 3, bizDate: '2022-07-13', clickNum: 33, clickTimes: 14 }, // { addNum: 3, bizDate: '2022-07-13', clickNum: 33, clickTimes: 14 },
{ addNum: 4, bizDate: '2022-07-14', clickNum: 44, clickTimes: 15 }, // { addNum: 4, bizDate: '2022-07-14', clickNum: 44, clickTimes: 15 },
{ addNum: 5, bizDate: '2022-07-15', clickNum: 55, clickTimes: 15 }, // { addNum: 5, bizDate: '2022-07-15', clickNum: 55, clickTimes: 15 },
{ addNum: 6, bizDate: '2022-07-16', clickNum: 66, clickTimes: 14 }, // { addNum: 6, bizDate: '2022-07-16', clickNum: 66, clickTimes: 14 },
{ addNum: 7, bizDate: '2022-07-17', clickNum: 77, clickTimes: 14 }, // { addNum: 7, bizDate: '2022-07-17', clickNum: 77, clickTimes: 14 },
{ addNum: 8, bizDate: '2022-07-18', clickNum: 88, clickTimes: 10 }, // { addNum: 8, bizDate: '2022-07-18', clickNum: 88, clickTimes: 10 },
{ addNum: 9, bizDate: '2022-07-19', clickNum: 99, clickTimes: 120 } // { addNum: 9, bizDate: '2022-07-19', clickNum: 99, clickTimes: 120 }
]; // ];
this.chart.data(this.charData, { this.chart.data(this.charData, {
bizDate: { bizDate: {
// type: 'cat', //分类 // type: 'cat', //分类
......
src/views/salesleads/actCodeManage/operateLog.vue
...@@ -35,7 +35,10 @@ ...@@ -35,7 +35,10 @@
</el-table-column> </el-table-column>
<el-table-column label="操作内容" prop="content" :formatter="(row, col, val) => val || '--'" show-overflow-tooltip></el-table-column> <el-table-column label="操作内容" prop="content" :formatter="(row, col, val) => val || '--'" show-overflow-tooltip></el-table-column>
<el-table-column label="操作时间" prop="createTime"> <el-table-column label="操作时间" prop="createTime">
<template slot-scope="{ row }" v-if="row.createTime"> {{ row.createTime }} {{ row.createTime }} </template> <template slot-scope="{ row }" v-if="row.createTime">
{{ filters.timeStampToYmd(Number(row.createTime)) }}<br />
{{ filters.timeStampToHms(Number(row.createTime)) }}
</template>
<template v-else>--</template> <template v-else>--</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -46,10 +49,12 @@ ...@@ -46,10 +49,12 @@
<script> <script>
import { logList, businessType, optTypes, listUserBySearchName } from '@/api/actCode'; import { logList, businessType, optTypes, listUserBySearchName } from '@/api/actCode';
import filters from '@/filters/index';
export default { export default {
name: 'operateLog', name: 'operateLog',
data() { data() {
return { return {
filters,
requestProject: 'gic-web', requestProject: 'gic-web',
loading: false, loading: false,
search: { search: {
...@@ -94,14 +99,14 @@ export default { ...@@ -94,14 +99,14 @@ export default {
const params = {}; const params = {};
params.requestProject = this.requestProject; params.requestProject = this.requestProject;
businessType(params).then(res => { businessType(params).then(res => {
const { errorCode, result } = res.data || {}; const { code, result } = res.data || {};
if (errorCode == 0) { if (code == 0) {
this.moduleList = (result || []).filter(el => el.key != 1001); this.moduleList = (result || []).filter(el => el.key != 1001);
} }
}); });
optTypes({ params }).then(res => { optTypes({ params }).then(res => {
const { errorCode, result } = res.data || {}; const { code, result } = res.data || {};
if (errorCode == 0) { if (code == 0) {
this.businessList = (result || []).filter(el => el.key != 1001); this.businessList = (result || []).filter(el => el.key != 1001);
} }
}); });
...@@ -124,11 +129,11 @@ export default { ...@@ -124,11 +129,11 @@ export default {
const params = { searchName, pageNum, pageSize }; const params = { searchName, pageNum, pageSize };
params.requestProject = this.requestProject; params.requestProject = this.requestProject;
listUserBySearchName(params).then(res => { listUserBySearchName(params).then(res => {
const { errorCode, result } = res.data || {}; const { code, result } = res.data || {};
if (pageNum == 1) { if (pageNum == 1) {
this.userList = []; this.userList = [];
} }
if (errorCode == 0) { if (code == 0) {
this.userList = this.userList.concat(result.result || []); this.userList = this.userList.concat(result.result || []);
this.clerkListPager.totalPage = result.totalPage; this.clerkListPager.totalPage = result.totalPage;
} }
...@@ -152,7 +157,7 @@ export default { ...@@ -152,7 +157,7 @@ export default {
para.requestProject = this.requestProject; para.requestProject = this.requestProject;
logList(para).then(res => { logList(para).then(res => {
let data = res.data; let data = res.data;
if (data.errorCode == 0) { if (data.code == 0) {
this.tableData = data.result.result; this.tableData = data.result.result;
this.pager.total = data.result.totalCount; this.pager.total = data.result.totalCount;
} }
......
src/views/salesleads/actCodeManage/staffActCode/index.vue
...@@ -41,9 +41,9 @@ export default { ...@@ -41,9 +41,9 @@ export default {
currentGroupId: { currentGroupId: {
handler: function(val) { handler: function(val) {
console.log(val, 111); console.log(val, 111);
if (val != null) { // if (val != null) {
this.currentGroupId = val; this.currentGroupId = val;
} // }
}, },
immediate: true immediate: true
} }
......
src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select v-model="inFields.hmTypeInt" placeholder="全部类型" clearable class="w160" @change="searchList"> <el-select v-model="inFields.hmTypeInt" placeholder="全部类型" clearable class="w160" @change="searchList">
<el-option :key="0" label="单人活码" :value="0"> </el-option> <el-option :key="1" label="单人活码" :value="1"> </el-option>
<el-option :key="1" label="多人活码" :value="1"> </el-option> <el-option :key="2" label="多人活码" :value="2"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<el-table-column type="selection" width="60" fixed> </el-table-column> <el-table-column type="selection" width="60" fixed> </el-table-column>
<el-table-column width="60" class-name="table-select-cell" fixed> <el-table-column width="60" class-name="table-select-cell" fixed>
<template #header> <template #header>
<dm-table-select-page class="table-select" :type="selectPage.type" :data-ready="selectPage.dataReady" :table-vm="$refs.actCodeTableRef" :table-data="actCodeList" :total="totalCount" @change="t => (selectPage.type = t)" @selection-change="handleSelectionChange"></dm-table-select-page> <dm-table-select-page class="table-select" :type="selectPage.type" :data-ready="selectPage.dataReady" :table-vm="$refs.actCodeTableRef" :table-data="tableData" :total="totalCount" @change="t => (selectPage.type = t)" @selection-change="handleSelectionChange"></dm-table-select-page>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="活码ID" fixed width="110"> <el-table-column label="活码ID" fixed width="110">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<p>{{ row.hmId }}</p> <p>{{ row.hmCode }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="活码信息" width="100"> <el-table-column label="活码信息" width="100">
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</el-table-column> </el-table-column>
<el-table-column label="所属分组" width="100" show-overflow-tooltip> <el-table-column label="所属分组" width="100" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<p>{{ row.hmGroupId == null ? row.hmGroupId : '--' }}</p> <p>{{ row.hmGroupId ? row.hmGroupId : '--' }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" width="100"> <el-table-column label="创建人" width="100">
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
startTime: '', startTime: '',
endTime: '', endTime: '',
orderByField: 'createTime desc', orderByField: 'createTime desc',
hmGroupId: 0 hmGroupId: ''
}, },
storeSelect: 1, storeSelect: 1,
dateTime: [], dateTime: [],
...@@ -454,9 +454,7 @@ export default { ...@@ -454,9 +454,7 @@ export default {
this.inFields.startTime = this.dateTime ? Date.parse(new Date(this.dateTime[0]).toString()) : ''; this.inFields.startTime = this.dateTime ? Date.parse(new Date(this.dateTime[0]).toString()) : '';
this.inFields.endTime = this.dateTime ? Date.parse(new Date(this.dateTime[1]).toString()) : ''; this.inFields.endTime = this.dateTime ? Date.parse(new Date(this.dateTime[1]).toString()) : '';
} }
if (this.currentGroupId != null) { this.inFields.hmGroupId = this.currentGroupId;
this.inFields.hmGroupId = Number(this.currentGroupId);
}
if (this.inFields.hmSelect == '') { if (this.inFields.hmSelect == '') {
delete this.inFields.hmSelect; delete this.inFields.hmSelect;
} }
...@@ -483,21 +481,22 @@ export default { ...@@ -483,21 +481,22 @@ export default {
this.tableData = res.data.result.data || []; this.tableData = res.data.result.data || [];
this.totalCount = res.data.result.page.totalCount; this.totalCount = res.data.result.page.totalCount;
} }
this.selectPage.dataReady = true;
}) })
.finally(_ => { .finally(_ => {
this.loadingStatus = false; this.loadingStatus = false;
this.selectPage.dataReady = true;
}); });
} }
}, },
watch: { watch: {
currentGroupId: { currentGroupId: {
handler: function(val) { handler: function(val) {
if (val != null) { console.log('val', val, 'val');
this.currentGroupId = val; // if (val != null) {
this.pageParam.pageNum = 1; this.currentGroupId = val;
this.getTableList(); this.pageParam.pageNum = 1;
} this.getTableList();
// }
}, },
immediate: true immediate: true
} }
......
src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue
...@@ -115,7 +115,9 @@ export default { ...@@ -115,7 +115,9 @@ export default {
} }
}, },
clickGroupListItem(listItem) { clickGroupListItem(listItem) {
console.log(listItem, 'uuuuu');
this.currentListItemUuid = listItem.groupId; this.currentListItemUuid = listItem.groupId;
console.log(this.currentListItemUuid, 'this.currentListItemUuid');
this.$emit('updateList', this.currentListItemUuid); this.$emit('updateList', this.currentListItemUuid);
}, },
isShowGroupListItemMore(listItem) { isShowGroupListItemMore(listItem) {
...@@ -222,7 +224,7 @@ export default { ...@@ -222,7 +224,7 @@ export default {
{ {
groupName: '全部分组', groupName: '全部分组',
referNum: '', referNum: '',
groupId: null groupId: ''
} }
]; ];
this.groupList[0].referNum = countNum.data.result; this.groupList[0].referNum = countNum.data.result;
......
src/views/salesleads/components/act-code-set.vue
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
hmGroupId: '', //活码分组id hmGroupId: '', //活码分组id
passFlag: true, // 1自动通过 0否 passFlag: true, // 1自动通过 0否
memberLabelId: 'fd6b44967aa647bcadfad10706244c56', //会员活动标签id memberLabelId: 'fd6b44967aa647bcadfad10706244c56', //会员活动标签id
memberLabelName: '', memberLabelName: '测试121212-木瑾0630测试标签值50',
welcomeId: '' // 欢迎语id welcomeId: '' // 欢迎语id
// clerkIdList: '', // 选择导购id // clerkIdList: '', // 选择导购id
// storeId: '' //门店id // storeId: '' //门店id
......
src/views/salesleads/components/dataDetail.vue
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParam.pageNo" :page-sizes="[20, 40, 60, 80]" :page-size="pageParam.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalCount"> </dm-pagination> <dm-pagination v-if="tableData && tableData.length > 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParam.pageNo" :page-sizes="[20, 40, 60, 80]" :page-size="pageParam.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalCount"> </dm-pagination>
</div> </div>
</template> </template>
......
src/views/salesleads/components/welcomesItem.vue
...@@ -105,6 +105,15 @@ export default { ...@@ -105,6 +105,15 @@ export default {
activated() { activated() {
this.onSearch(); this.onSearch();
}, },
// mounted() {
// this.getWelcomeTable();
// document.addEventListener('visibilitychange', () => {
// console.log(document.visibilityState, 99999);
// if (document.visibilityState == 'visible') {
// this.getWelcomeTable();
// }
// });
// },
methods: { methods: {
onSearch() { onSearch() {
this.welcomePage.pageNum = 1; this.welcomePage.pageNum = 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