Skip to content

I
integral-mall
Commit 21f5a4a4 by crushh
Options

update: 文案

parent 26314a29
Showing with 45 additions and 21 deletions
src/components/exchange.vue
......@@ -31,7 +31,6 @@
:value="item.gradeId"
/>
</el-select>
<span class="tips">不符合此处会员等级卡的客户在小程序积分商城中不可见该礼品</span>
</el-form-item>
<el-form-item prop="ladder" v-if="specialOrder">
<el-checkbox-group v-model="giftForm.ladder" @change="changeladder" style="display:inline-block">
......
src/components/visible.vue
......@@ -35,11 +35,10 @@
<div>
<div class="title">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff" />
<span>展现门店升级说明</span>
<span>商品展示规则升级说明</span>
</div>
<div class="content">
1.为了提供更好的服务，积分商城商品系统升级。不升级【展现门店】则配置继续生效；升级后通过【上架规则-人群筛选器】控制可见。<br>
2.升级后，原有的【非会员可见】失效，【非会员可见】可通过【上架规则-会员筛选-开卡状态：未开卡】实现；
为了实现更多的积分商城商品“千人千面”的场景，您可点击右侧“升级到新规则”按钮，按照新的更丰富的模式，重新配置此商品在小程序的可见规则！（“升级到新规则”后，您需选择一种“上架规则”才可成功保存此商品，才会生效）<br>
</div>
</div>
<div class="button" @click="update">
......@@ -189,7 +188,7 @@ export default {
},
methods: {
update () {
this.$confirm('升级后，通过【上架规则-人群筛选器】控制可见', '确认升级【展现门店数据】？', {
this.$confirm('升级后，通过【上架规则】控制可见', '确认升级【展现门店数据】？', {
confirmButtonText: '确认并升级',
type: 'warning',
}).then(() => {
......
src/views/goods/coupon/detail.vue
......@@ -299,7 +299,6 @@
:value="item.gradeId"
/>
</el-select>
<span class="tips">不符合此处会员等级卡的客户在小程序积分商城中不可见该礼品</span>
</el-form-item>
<el-form-item prop="ladder" v-if="specialOrder">
<el-checkbox-group v-model="couponForm.ladder" @change="changeladder" style="display:inline-block">
......
src/views/goods/gift/detail.vue
......@@ -296,7 +296,6 @@
:value="item.gradeId"
/>
</el-select>
<span class="tips">不符合此处会员等级卡的客户在小程序积分商城中不可见该礼品</span>
</el-form-item>
<el-form-item prop="ladder" v-if="specialOrder">
<el-checkbox-group v-model="giftForm.ladder" @change="changeladder" style="display:inline-block">
......
src/views/goods/ruleList/info.vue
......@@ -47,16 +47,16 @@
/>
</el-form-item>
<el-form-item label="适用人群" prop="memberType">
<span class="tips">【会员筛选】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span>
<span class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span> 条</span>
<div>
<el-radio v-model="ruleForm.memberType" :label="1">
全部会员
全部客户
</el-radio>
<el-radio v-model="ruleForm.memberType" :label="4">
门店筛选
</el-radio>
<el-radio v-model="ruleForm.memberType" :label="3" :disabled="memberTypeTotal>=20&&isAdd">
会员筛选
人群筛选器
</el-radio>
</div>
</el-form-item>
......
src/views/goods/ruleList/ruleList.vue
......@@ -103,7 +103,7 @@
@click="relatingDetail(row.integralMallProRuleId,'查看')"
v-show="row.relationCount&&row.relationCount!=0"
>
查看
查看/移除
</el-button>
</template>
</el-table-column>
......@@ -116,6 +116,8 @@
<el-table-column prop="creatorName" label="创建人" />
<el-table-column
label="操作"
fixed="right"
width="220px"
>
<template slot-scope="{row}">
<el-button
......@@ -142,14 +144,31 @@
>
复制
</el-button>
<el-button
<el-dropdown
v-if="$getButtonLimit($buttonCode.ruleListDel)"
style="margin-left:20px;"
placement="bottom-start"
@command="command => handleCommand(command, row)"
>
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
<el-dropdown-item
command="1"
v-if="$getButtonLimit($buttonCode.ruleListDel)"
:limit-code="$buttonCode.ruleListDel"
>
删除
</el-dropdown-item>
</el-dropdown-menu>
<!-- <el-button
type="text"
@click="delRelating(row.integralMallProRuleId)"
@click="delRelating(row)"
v-if="$getButtonLimit($buttonCode.ruleListDel)"
:limit-code="$buttonCode.ruleListDel"
>
删除
</el-button>
</el-button> -->
</el-dropdown>
</template>
</el-table-column>
</el-table>
......@@ -173,7 +192,7 @@
<div :class="['infoTips',type=='查看'?'infoTips_waring':'']">
<i :class="['el-icon-info','infoTipsIcon',type=='查看'?'infoTips_waring':'']" />
<div class="infoTipsContent">
{{ type=='查看'?'从规则中移除商品后，上架规则不再作用于商品，商品将不能在会员小程序-积分商城上展示，请谨慎操作！':'选中已关联上架规则的商品，则规则被更新' }}
{{ type=='查看'?'可将关联商品从此规则中移除。移除后，商品默认下架，将无法在小程序-积分商城中对客户展示，请谨慎操作！':'在关联商品时，如果这款商品已经关联了其他上架规则，那么保存后，该商品的上架规则将被替换为现有规则；' }}
<br>
</div>
</div>
......@@ -380,6 +399,11 @@ export default {
this.getList();
},
methods: {
handleCommand (command, row) {
if (command == 1) {
this.delRelating(row);
}
},
getList () {
this.loading = true;
request.get('/api-integral-mall/page-rule', { params: this.form }).then(res => {
......@@ -402,15 +426,19 @@ export default {
this.integralMallProRuleId = integralMallProRuleId;
this.getRelatingGoodsTable();
},
delRelating (integralMallProRuleId) {
this.$confirm('上架规则删除后，无法被商品关联使用，是否确认删除？', '提示', {
delRelating (row) {
if (row.relationCount && row.relationCount != 0) {
this.$message.error(`当前规则关联了${row.relationCount}款商品，无法删除`);
return;
}
this.$confirm('删除后，该上架规则将无法被引用，是否确认删除？', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
this.loading = true;
request.post('/api-integral-mall/del-rule', { integralMallProRuleId }).then(res => {
request.post('/api-integral-mall/del-rule', { integralMallProRuleId: row.integralMallProRuleId }).then(res => {
this.$message.success('删除成功');
this.getList();
}).finally(_ => {
......
src/views/setting/editDeliver.vue
......@@ -212,9 +212,9 @@
</el-form-item>
<el-form-item label="买家自提时段" required>
<div class="timeRangeList">
<div class="tips" style="margin-left: 0;">
<!-- <div class="tips" style="margin-left: 0;">
当自提时间段的开始时间小于当前时间时，用户可选，因为商家需要在此开始时间之前备好货品
</div>
</div> -->
<el-form-item
v-for="(v, i) in form.timeRangeList"
:key="i"
......@@ -889,7 +889,7 @@ export default {
display: none !important;
} */
.timeRangeList {
margin-top: -10px;
margin-top: 5px;
/deep/ .el-form-item{
margin-bottom:22px;
margin-left: 0;
......
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