Commit 59633554 by wangyusheng

build

parent 53ec3101
<!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.b12cff848a899ff2b6d60d23af0a1e86.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.3e73018e924e49c48bae.js></script></body></html>
\ No newline at end of file
<!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.2f8970a033b585b8bc93047ee1c0f486.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.141f7d097730f807df83.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -174,6 +174,14 @@ export default {
},
//添加规格
addSku() {
const fn = () => {
this.skuJson.push({
standardId: '',
standardName: '',
valueList: [{ valueName: '', valueId: '', propImg: '' }]
});
};
if (this.$parent.warnStatus.standard) 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 +193,12 @@ export default {
cancelButtonText: '取消',
type: 'warning'
});
this.$parent.warnStatus.standard = true;
} else {
this.$message.error('该商户未开通小程序功能');
}
} else {
this.skuJson.push({
standardId: '',
standardName: '',
valueList: [{ valueName: '', valueId: '', propImg: '' }]
});
fn();
}
}
});
......
......@@ -504,7 +504,13 @@ export default {
pickUpPointType: 0,
selectedStoreData: [],
pickUpPointStr: '',
isAddPick: true
isAddPick: true,
warnStatus: {
way: false, // 配送方式提示
refund: false, // 退款提示
standard: false, // 规格提示
textCode: false // 文本券码
}
};
},
// watch: {
......@@ -1301,19 +1307,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('该商户未开通小程序功能');
}
......@@ -1321,39 +1327,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('该商户未开通小程序功能');
}
......@@ -1362,18 +1350,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('该商户未开通小程序功能');
}
......
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