Skip to content

I
integral-mall
Commit cd4a37cd by wangyusheng
Options

Merge branch 'feature/20200922' into 'master' 

Feature/20200922

See merge request !61
parents 9f38cdf2 f3c45154
Showing with 41 additions and 14 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.d353ec5244eea5186c6af13a1266a31b.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.e71869436db0c30adebd.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.486c5bb09435721488d99cbc7cca45c4.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.4809b2320b3f3d3aa326.js></script><script type=text/javascript src=./static/js/app.00d95c6b64fdfce715c4.js></script></body></html>
>>>>>>> master
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.036b00ea7020624dc8166b9b5b852e08.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c675686ec8a78233a281.js></script><script type=text/javascript src=./static/js/app.7e24650842d78a0d4385.js></script></body></html>
\ No newline at end of file
dist/static/css/app.036b00ea7020624dc8166b9b5b852e08.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.486c5bb09435721488d99cbc7cca45c4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.d353ec5244eea5186c6af13a1266a31b.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.00d95c6b64fdfce715c4.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.7e24650842d78a0d4385.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.e71869436db0c30adebd.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.be8aabf13848b6ca3aa7.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.c675686ec8a78233a281.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/info.vue
......@@ -227,10 +227,14 @@
<p><el-button type="text" style="margin:8px 0 10px 130px" @click="addTimeRange">添加时间段</el-button></p>
</div>
<el-form-item label="显示设置" required>
<template>
<el-radio v-model="couponForm.proShowStatus" :label="1">上架状态就显示</el-radio>
<el-radio v-model="couponForm.proShowStatus" :label="2">可兑换时显示</el-radio>
</template>
<el-radio-group v-model="couponForm.proShowStatus">
<el-radio :label="1">上架状态就显示</el-radio>
<el-radio :label="2">兑换状态下显示</el-radio>
</el-radio-group>
<div v-if="couponForm.proShowStatus == 1" style="margin-left:20px;">
<el-checkbox v-model="couponForm.isNewGuestVisible" :true-label="1" :false-label="0">新客可见</el-checkbox>
<span class="tips">开启新客可见，则无门店所属的游客满足会员等级均可见</span>
</div>
</el-form-item>
<el-form-item label="上架时间" required>
<template>
......@@ -320,7 +324,8 @@ export default {
exchangeDateWeekArr: [],
timeRangeList: [{ timeRange: '' }], //部分时段数组
limitTimeBegin: '',
timeZones: ['', '']
timeZones: ['', ''],
isNewGuestVisible: 0 // 0：新客不可见、1：新客可见
},
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
......@@ -472,6 +477,7 @@ export default {
}
this.couponForm.proName = res.data.result.proName;
this.proNameLen = getInputVal.getZhLen(this.couponForm.proName);
this.couponForm.isNewGuestVisible = res.data.result.isNewGuestVisible || 0; //新客是否可见
// 积分费用包
if (res.data.result.cardCostList) {
this.cardCouponList = res.data.result.cardCostList;
......@@ -986,7 +992,8 @@ export default {
exchangeTimeType: this.couponForm.exchangeTimeType, //兑换时段
proShowStatus: this.couponForm.proShowStatus, //显示状态
releaseType: this.couponForm.releaseType, //上架状态
limitTimeBegin: this.couponForm.releaseType === 2 ? this.getTimeAll(this.couponForm.limitTimeBegin) : '' //定时上架时间
limitTimeBegin: this.couponForm.releaseType === 2 ? this.getTimeAll(this.couponForm.limitTimeBegin) : '', //定时上架时间
isNewGuestVisible: this.couponForm.proShowStatus == 1 ? this.couponForm.isNewGuestVisible : 0 // 新客是否可见 0：新客不可见、1：新客可见'
};
// 门店分类
if (this.useNewStoreWidget === 0) {
......@@ -1265,6 +1272,14 @@ export default {
left: 430px;
top: 0px;
}
.tips {
font-size: 12px;
color: rgb(144, 147, 153);
margin-left: 10px;
display: inline-block;
vertical-align: middle;
line-height: 32px;
}
/* 人群筛选器
.gic-people--button {
background: #f2f3f4;
......
src/views/goods/gift/info.vue
......@@ -203,6 +203,10 @@
<el-radio :label="1">上架状态就显示</el-radio>
<el-radio :label="2">兑换状态下显示</el-radio>
</el-radio-group>
<div v-if="giftForm.proShowStatus == 1" style="margin-left:20px;">
<el-checkbox v-model="giftForm.isNewGuestVisible" :true-label="1" :false-label="0">新客可见</el-checkbox>
<span class="tips">开启新客可见，则无门店所属的游客满足会员等级均可见</span>
</div>
</el-form-item>
<el-form-item label="上架时间" prop="releaseType">
<el-radio-group v-model="giftForm.releaseType">
......@@ -220,7 +224,7 @@
<el-checkbox label="2">快递发货</el-checkbox>
<el-checkbox v-if="giftForm.changeType === 1" label="1">微信兑换券</el-checkbox>
<el-checkbox v-if="giftForm.changeType !== 1" label="4" @change="handleStatus" @click="selfRaising">门店自提</el-checkbox>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;display: inline-block;vertical-align: middle;">公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本</span>
<span class="tips">公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本</span>
</el-checkbox-group>
</el-form-item>
<el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
......@@ -399,7 +403,8 @@ export default {
integralCost: '', //积分
cashCost: '', //现金
virtualStock: '', //库存
proCodeQuery: '' //条形码
proCodeQuery: '', //条形码
isNewGuestVisible: 0 // 0：新客不可见、1：新客可见
},
limitTimes: 0,
limitTimesNum: 0,
......@@ -730,6 +735,7 @@ export default {
this.giftForm.costValue = res.data.result.costValue; //礼品成本
this.giftForm.marketPrice = res.data.result.marketPrice; //市场价
this.giftForm.detailDescription = res.data.result.detailDescription; //图文详情
this.giftForm.isNewGuestVisible = res.data.result.isNewGuestVisible || 0; //新客是否可见
// if (res.data.result.searchParams) {
// this.searchParams = res.data.result.searchParams; //会员筛选
// } else {
......@@ -1746,7 +1752,8 @@ export default {
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
skuJson: this.submitSkuJson.length ? JSON.stringify(this.submitSkuJson) : '', //sku数据
pickUpPointType: this.giftForm.changeTypeList.indexOf('4') != -1 ? this.pickUpPointType : '', //门店自提数据
pickUpPointExtra: this.giftForm.changeTypeList.indexOf('4') != -1 ? JSON.stringify(this.selectedStoreData) : '' //门店自提数据
pickUpPointExtra: this.giftForm.changeTypeList.indexOf('4') != -1 ? JSON.stringify(this.selectedStoreData) : '', //门店自提数据
isNewGuestVisible: this.giftForm.proShowStatus == 1 ? this.giftForm.isNewGuestVisible : 0 // 新客是否可见 0：新客不可见、1：新客可见'
};
if (this.pickUpPointType === 4) {
params.pickUpPoint = this.pickUpPointStr;
......@@ -2098,6 +2105,14 @@ export default {
left: 430px;
top: 0px;
}
.tips {
font-size: 12px;
color: rgb(144, 147, 153);
margin-left:10px;
display: inline-block;
vertical-align: middle;
line-height: 32px;
}
/* 人群筛选器 */
/* .gic-people--button {
background: #f2f3f4;
......
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