Skip to content

I
integral-mall
Commit 5e9a6fbe by huaying
Options

Merge branch 'feature/奥莱商场迭代' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/main.4b01363216547a03ce67.js
#	dist/js/main.4b01363216547a03ce67.js.LICENSE.txt
#	dist/js/main.566ccbecad82e7617bcb.js
#	dist/js/main.566ccbecad82e7617bcb.js.LICENSE.txt
#	dist/js/main.bd2843772baae732071a.js
#	dist/js/main.bd2843772baae732071a.js.LICENSE.txt
parents cebc417e 09350082
Showing with 57 additions and 13 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" 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.4b01363216547a03ce67.js"></script><link href="/integral-mall/css/main.e9e72f087be7aedb8397.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></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.566ccbecad82e7617bcb.js"></script><link href="/integral-mall/css/main.80982f8932a34de8c7a8.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
>>>>>>> feature/奥莱商场迭代
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
......
dist/js/main.4b01363216547a03ce67.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.566ccbecad82e7617bcb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.566ccbecad82e7617bcb.js.LICENSE.txt 0 → 100644
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.6+9869a4bc
*/
/*!
* clipboard.js v2.0.1
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
/*!
* vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
* Released under the MIT License.
* https://vue-treeselect.js.org/
*/
/**!
* Sortable 1.10.2
* @author RubaXa <trash@rubaxa.org>
* @author owenm <owen23355@gmail.com>
* @license MIT
*/
src/views/goods/coupon/detail.vue
......@@ -479,16 +479,16 @@
</div>
<div class="section-content">
<h3>售后服务</h3>
<el-form-item label="支持退款" prop="refund">
<el-radio v-model="couponForm.refund" :label="1">
<el-form-item label="支持退款" prop="refundType">
<el-radio v-model="couponForm.refundType" :label="0">
否
</el-radio>
<el-radio v-model="couponForm.refund" :label="2">
<el-radio v-model="couponForm.refundType" :label="1">
是
</el-radio>
</el-form-item>
<el-form-item label="退款期限" prop="num">
<el-input-number v-model="couponForm.num"
<el-form-item label="退款期限" prop="refundPeriod">
<el-input-number v-model="couponForm.refundPeriod"
controls-position="right"
:min="1"
:max="10"
......@@ -496,10 +496,10 @@
:step="1"
step-strictly></el-input-number> 月
</el-form-item>
<el-form-item label="退款方式" prop="refundList">
<el-checkbox-group v-model="couponForm.refundList">
<el-checkbox label="主动退款"></el-checkbox>
<el-checkbox label="过期自动退款"></el-checkbox>
<el-form-item label="退款方式" prop="refundWay">
<el-checkbox-group v-model="couponForm.refundWay" @change="checkBoxChange">
<el-checkbox label="1">主动退款</el-checkbox>
<el-checkbox label="2">过期自动退款</el-checkbox>
</el-checkbox-group>
</el-form-item>
</div>
......@@ -637,9 +637,9 @@ export default {
timeRangeList: [{ timeRange: '' }], // 部分时段数组
timeZones: ['', ''],
ladder: [],
refund: 1,
num: 1,
refundList: [],
refundType: 0,
refundPeriod: 10,
refundWay: [],
},
uploadAction: getInputVal.uploadAction(),
headersUpload: {
......@@ -662,7 +662,7 @@ export default {
exchangeDateDayArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
exchangeDateWeekArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
proName: [{ required: true, message: '请输入券包名称', trigger: 'blur' }],
refundList: [{ required: true, message: '请选择退款方式', trigger: 'blur' }],
refundWay: [{ required: true, message: '请选择退款方式', trigger: 'blur' }],
},
validateTime,
mallProId: '',
......@@ -736,6 +736,9 @@ export default {
document.documentElement.scrollTop = 0;
},
methods: {
checkBoxChange (e) {
console.log(e);
},
clearHistoryData () {
this.$confirm('是否确认清除【展示门店数据】？清除后，可进入升级后的编辑页面。', '提示', {
confirmButtonText: '确定',
......@@ -915,6 +918,9 @@ export default {
this.proReferId = this.coupCardId;
this.getCardInfo();
}
this.couponForm.refundType = res.data.result.refundType ? res.data.result.refundType : 0;
this.couponForm.refundPeriod = res.data.result.refundPeriod ? res.data.result.refundPeriod : 10;
this.couponForm.refundWay = res.data.result.refundWay ? res.data.result.refundWay.split(',') : [];
this.echoVisibleData(res.data.result);
this.couponForm.proName = res.data.result.proName;
this.proNameLen = getInputVal.getZhLen(this.couponForm.proName);
......@@ -1086,6 +1092,10 @@ export default {
};
request.post('/api-integral-mall/get-card', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
// 退款方式
if (res.data.result.refundWay) {
this.couponForm.refundWay = res.data.result.refundWay.split(',');
}
this.cardList = [];
this.cardList = res.data.result;
if (this.cardList.length === 1) {
......@@ -1434,6 +1444,9 @@ export default {
exchangeTimeType: this.couponForm.exchangeTimeType, // 兑换时段
isDifferentialPricing: this.isDifferentialPricing,
differentialPricingJson: JSON.stringify(this.submitLadderList),
refundType: this.couponForm.refundType,
refundPeriod: this.couponForm.refundPeriod,
refundWay: this.couponForm.refundWay.toString(),
};
// 可见配置参数组装
params = { ...params, ...data };
......
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