Skip to content

I
integral-mall
Commit 6677d4a1 by crushh
Options

udpate: dist

parents fc13ce8d ad130096
Showing with 14 additions and 8 deletions
dist/css/main.70787b26575cf0f512d2.css → dist/css/main.fdc43c3259634f5f4ff9.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.f4e5097dcfe68b6375b8.js"></script><link href="/integral-mall/css/main.70787b26575cf0f512d2.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() { <!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.4baf96fb8009c74fd816.js"></script><link href="/integral-mall/css/main.fdc43c3259634f5f4ff9.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime(); var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host; var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host; host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
......
dist/js/main.f4e5097dcfe68b6375b8.js → dist/js/main.4baf96fb8009c74fd816.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/relatePop.vue
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column label="可见条件" show-overflow-tooltip min-width="180"> <el-table-column label="可见条件" show-overflow-tooltip min-width="180">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ row.memberType==1?'全部顾客':row.showBack }} {{ row.memberType==1?'全部客户':row.showBack }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/components/ruleDetail.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-form-item label="适用人群" prop="memberType"> <el-form-item label="适用人群" prop="memberType">
<span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span> <span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span>
<div> <div>
<el-radio v-model="ruleForm.memberType" :label="1"> <el-radio v-model="ruleForm.memberType" :label="1" v-if="$store.state.product.ruleMemberFilterClose==0">
全部客户 全部客户
</el-radio> </el-radio>
<el-radio v-model="ruleForm.memberType" :label="4"> <el-radio v-model="ruleForm.memberType" :label="4">
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
人群筛选器 人群筛选器
</el-radio> </el-radio>
</div> </div>
<span class="tips">{{ tipsContent[ruleForm.memberType] }}</span>
</el-form-item> </el-form-item>
<el-form-item v-show="ruleForm.memberType === 4"> <el-form-item v-show="ruleForm.memberType === 4">
<vue-gic-store-new <vue-gic-store-new
...@@ -96,7 +97,7 @@ export default { ...@@ -96,7 +97,7 @@ export default {
return { return {
fixedWidth: document.documentElement.clientWidth - 200, fixedWidth: document.documentElement.clientWidth - 200,
ruleForm: { ruleForm: {
memberType: 1, // 1：全部顾客 3 人群筛选 4 门店筛选 memberType: this.$store.state.product.ruleMemberFilterClose == 0 ? 1 : 4, // 1：全部客户 3 人群筛选 4 门店筛选
}, },
rules: { rules: {
ruleTitle: [ ruleTitle: [
...@@ -118,6 +119,11 @@ export default { ...@@ -118,6 +119,11 @@ export default {
btnLoading: false, btnLoading: false,
uuid: '', uuid: '',
memberTypeTotal: 0, memberTypeTotal: 0,
tipsContent: {
1: '商户下的所有客户都可见，请谨慎选择',
4: '按照客户的门店归属来控制是否可见',
3: '从商户所有客户中按照条件筛选来控制是否可见',
},
}; };
}, },
computed: { computed: {
......
src/views/activities/flashSale/detail.vue
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
:disabled="isEdit" :disabled="isEdit"
:label="1" :label="1"
> >
全部顾客 全部客户
</el-radio> </el-radio>
<el-radio <el-radio
style="margin-right:0px" style="margin-right:0px"
......
src/views/goods/ruleList/ruleList.vue
...@@ -351,7 +351,7 @@ export default { ...@@ -351,7 +351,7 @@ export default {
let str = ''; let str = '';
switch (val) { switch (val) {
case 1: case 1:
str = '全部顾客'; str = '全部客户';
break; break;
case 3: case 3:
str = '人群筛选'; str = '人群筛选';
...@@ -400,12 +400,12 @@ export default { ...@@ -400,12 +400,12 @@ export default {
computed: { computed: {
selectOption () { selectOption () {
let option = [ let option = [
{ label: '全部顾客', value: 1 }, { label: '全部客户', value: 1 },
{ label: '人群筛选', value: 3 }, { label: '人群筛选', value: 3 },
{ label: '门店筛选', value: 4 }, { label: '门店筛选', value: 4 },
]; ];
if (this.$store.state.product.ruleMemberFilterClose == 1) { if (this.$store.state.product.ruleMemberFilterClose == 1) {
option = option.filter(item => item.label != '人群筛选'); option = option.filter(item => item.label != '人群筛选' && item.label != '全部客户');
} }
return option; return option;
}, },
......
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