Skip to content

I
integral-mall
Commit f17b1cb6 by damodmg
Options

更新

parent 157e9fb5
Showing with 15 additions and 14 deletions
dist/index.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.07927327e249b5f433ff18271fbb1e3d.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.2db8a9f3466589667eb9.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.17c1961f4180f8c282b249b4b8ffd001.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.ce02a71419255790fa15.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2db8a9f3466589667eb9.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.ce02a71419255790fa15.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/info.vue
......@@ -359,10 +359,6 @@ export default {
this.getInfo();
this.editChangeTypeStatus = true;
}
if (this.giftForm.changeType === 1) {
//微信兑换券
this.getCardInfo();
}
},
mounted: function() {
this.$nextTick(function() {
......@@ -479,6 +475,7 @@ export default {
} else {
this.refundTypeStatus = false;
}
// 兑换日期
this.giftForm.exchangeDateType = res.data.result.exchangeDateType;
......@@ -520,6 +517,10 @@ export default {
//配送方式
this.giftForm.changeType = res.data.result.changeType;
this.giftForm.refundType = res.data.result.refundType;
if (this.giftForm.changeType === 1) {
//微信兑换券
this.getCardInfo();
}
// 规格列表
if (res.data.result.giftProStandardJson) {
this.giftProStandardJson = JSON.parse(res.data.result.giftProStandardJson);
......@@ -539,7 +540,7 @@ export default {
this.skuHeaderList = [];
if (res.data.result.skuJsonList) {
for (let item of JSON.parse(res.data.result.skuJsonList)[0].giftPropValues) {
for (let item of JSON.parse(res.data.result.skuJsonList[0].giftPropValues)) {
this.skuHeaderList.push({
propName: item.standardName,
propId: item.standardId
......@@ -549,22 +550,22 @@ export default {
// sku列表skuList
if (res.data.result.skuJsonList) {
for (let i in JSON.parse(res.data.result.skuJsonList)) {
let tem = JSON.parse(JSON.parse(res.data.result.skuJsonList)[i].giftPropValues);
for (let i in res.data.result.skuJsonList) {
let tem = JSON.parse(res.data.result.skuJsonList[i].giftPropValues);
tem.push({
valueName: JSON.parse(res.data.result.skuJsonList)[i].giftProSkuIntegral //积分
valueName: res.data.result.skuJsonList[i].giftProSkuIntegral //积分
});
tem.push({
valueName: JSON.parse(res.data.result.skuJsonList)[i].giftProSkuCash //现金
valueName: res.data.result.skuJsonList[i].giftProSkuCash //现金
});
tem.push({
valueName: JSON.parse(res.data.result.skuJsonList)[i].stock //库存
valueName: res.data.result.skuJsonList[i].stock //库存
});
tem.push({
valueName: JSON.parse(res.data.result.skuJsonList)[i].giftProSkuStandCode //规格编码
valueName: res.data.result.skuJsonList[i].giftProSkuStandCode //规格编码
});
tem.push({
valueName: JSON.parse(res.data.result.skuJsonList)[i].giftProGiftCode //条形码
valueName: res.data.result.skuJsonList[i].giftProGiftCode //条形码
});
this.skuList.push(tem);
}
......
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