Skip to content

I
integral-mall
Commit 39bed121 by 萱草
Options

Merge branch 'master' into dev 

# Conflicts:
#	dist/index.html
parents 72579276 411ec595
Showing with 31 additions and 37 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.d0d081a579b1b923669a7ea9dd483616.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.37bd151fd70482c6aa2c.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.4b2628a0607e02bb3695e4be2ada387e.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.13.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.451aecb7500fefa94ef3.js></script><script type=text/javascript src=./static/js/app.16a983c2e75c1fa4706b.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.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>
\ No newline at end of file
dist/static/css/app.4b2628a0607e02bb3695e4be2ada387e.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.16a983c2e75c1fa4706b.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.37bd151fd70482c6aa2c.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.e71869436db0c30adebd.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/addSku.vue
......@@ -140,8 +140,9 @@ export default {
barCode: '',
spuStock: 0,
searchStandard: '',
searchStandardValue: ''
searchStandardValue: '',
// isStdImg: false
warnStatus: false
};
},
created() {
......@@ -174,6 +175,14 @@ export default {
},
//添加规格
addSku() {
const fn = () => {
this.skuJson.push({
standardId: '',
standardName: '',
valueList: [{ valueName: '', valueId: '', propImg: '' }]
});
};
if (this.warnStatus) return fn();
let code = 'add-standard';
request.get(`/api-integral-mall/check-function-version?code=${code}`).then(res => {
if (res.data.errorCode === 0) {
......@@ -185,15 +194,12 @@ export default {
cancelButtonText: '取消',
type: 'warning'
});
this.warnStatus = true;
} else {
this.$message.error('该商户未开通小程序功能');
}
} else {
this.skuJson.push({
standardId: '',
standardName: '',
valueList: [{ valueName: '', valueId: '', propImg: '' }]
});
fn();
}
}
});
......
src/views/goods/gift/info.vue
......@@ -288,7 +288,7 @@
<el-tooltip class="tip-content" effect="dark" content="若商品不支持买家退款，则在下单时系统会提醒买家此商品不支持退款或退货。" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
</el-tooltip>
<el-radio-group v-model="giftForm.refundType" :disabled="refundTypeStatus">
<el-radio-group v-model="giftForm.refundType" :disabled="!giftType || refundTypeStatus">
<el-radio :label="1" @change="afterSale">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
......@@ -502,7 +502,12 @@ export default {
pickUpPointType: 0,
selectedStoreData: [],
pickUpPointStr: '',
isAddPick: true
isAddPick: true,
warnStatus: {
way: false, // 配送方式提示
refund: false, // 退款提示
textCode: false // 文本券码
}
};
},
// watch: {
......@@ -1299,19 +1304,19 @@ export default {
} else {
this.giftForm.pickUpPointType = 1;
}
if (val) {
if (val && !this.warnStatus.way) {
let code = 'pick-up-point';
request.get(`/api-integral-mall/check-function-version?code=${code}`).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if (res.data.result.now !== '') {
this.giftForm.changeTypeList = [];
// this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
this.$confirm('您当前小程序版本低于功能适用版本，设置在小程序无法正常生效，请进行版本升级', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
});
this.warnStatus.way = true;
} else {
this.$message.error('该商户未开通小程序功能');
}
......@@ -1319,39 +1324,21 @@ export default {
}
});
}
// if (this.giftForm.changeTypeList.length) {
// if (this.giftForm.changeTypeList[0] === '4') {
// request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
// if (res.data.errorCode === 0) {
// if (res.data.result.status === 0) {
// //0关闭1开启
// this.dialogVisibleLink = true;
// for (let i = 0; i < this.giftForm.changeTypeList.length; i++) {
// if (this.giftForm.changeTypeList[i] === '4') {
// this.giftForm.changeTypeList.splice(i, 1);
// }
// }
// }
// } else {
// this.$message.error(res.data.message);
// }
// });
// }
// }
},
textCode() {
if (this.warnStatus.textCode) return;
let code = 'text-code';
request.get(`/api-integral-mall/check-function-version?code=${code}`).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if (res.data.result.now !== '') {
this.giftForm.changeType = 0;
// this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
this.$confirm('您当前小程序版本低于功能适用版本，设置在小程序无法正常生效，请进行版本升级', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
});
this.warnStatus.textCode = true;
} else {
this.$message.error('该商户未开通小程序功能');
}
......@@ -1360,18 +1347,19 @@ export default {
});
},
afterSale() {
if (this.warnStatus.refund) return;
let code = 'integral-refund';
request.get(`/api-integral-mall/check-function-version?code=${code}`).then(res => {
if (res.data.errorCode === 0) {
if (!res.data.result.ok) {
if (res.data.result.now !== '') {
this.giftForm.refundType = 0;
// this.$message.error('公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本');
this.$confirm('您当前小程序版本低于功能适用版本，设置在小程序无法正常生效，请进行版本升级', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
});
this.warnStatus.refund = true;
} else {
this.$message.error('该商户未开通小程序功能');
}
......@@ -1708,7 +1696,10 @@ export default {
}
}
}
if (!this.giftForm.changeType) {
let hasWay = this.giftType
? this.giftForm.changeTypeList.length
: this.giftForm.changeType
if (!hasWay) {
this.$message.error('请选择配送方式');
return false;
}
......
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