Skip to content

I
integral-mall
Commit 68f88646 by damodmg
Options

Merge branch 'dev' into 'master' 

更新数据

See merge request !34
parents 7519cb99 33a72ec3
Showing with 7 additions and 5 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.454b15fc12eb568b7cc94da4104a36ba.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.03.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.eba3cd38ca09527a39e0.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.4a17988d23d4b77e142786a769878820.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.03.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.8be859c6e96b08abcceb.js></script></body></html>
\ No newline at end of file
dist/static/js/app.8be859c6e96b08abcceb.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.eba3cd38ca09527a39e0.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/info.vue
......@@ -940,18 +940,19 @@ export default {
let skuSta = [];
if (skuArr[0].length) {
for (let i in skuArr) {
// console.log(777, skuArr[0]);
//先获取sku价格条码这些
outArr = copy(skuArr[i]); //得到固定的数据
// console.log(333, outArr);
outArr1 = outArr.splice(outArr.length - 6, 6);
for (let k in outArr) {
outArr[k].proName = this.skuHeaderList[k].propName;
outArr[k].proId = this.skuHeaderList[k].propId;
outArr[k].proName = skuArr[0][k].proName;
outArr[k].proId = skuArr[0][k].proId;
}
skuSta.push(outArr);
skuPrice.push(outArr1);
}
}
// return false;
this.submitSkuJson = [];
if (skuArr[0].length) {
......
src/views/order/giftExchange.vue
......@@ -377,6 +377,7 @@ export default {
searchParams: this.searchValue,
beginTime: this.beginTime,
endTime: this.endTime,
integralMallProId: this.integralMallProId ? this.integralMallProId : '',
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
requestProject: 'integral-mall'
};
......
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