Authored by 陈轩

fix

... ... @@ -146,6 +146,8 @@ const order = {
// API- 订单-物流
getOrderLogisticdate: (req, res) => {
(req.query.type === 'exchange') && (req.query.type = 'change');
orderModel.getOrderLogisticdate({
uid: req.user.uid || '',
type: req.query.type || '',
... ...
... ... @@ -16,10 +16,6 @@ const refund = {
}).then(global.yoho.camelCase);
},
submitRefundData(uid, params) {
console.log(Object.assign({
method: 'app.refund.submit',
uid: uid,
}, params));
return api.post('', Object.assign({
method: 'app.refund.submit',
uid: uid,
... ... @@ -78,9 +74,7 @@ const refund = {
method: 'app.refund.getList'
}, param);
return api.get('', param, {
code: 200
}).then(global.yoho.camelCase);
return api.get('', param).then(global.yoho.camelCase);
},
/**
... ...
... ... @@ -52,14 +52,14 @@ class Overlay {
}
});
if (this.settings.disableScrolling) {
// 覆盖层出现时阻止滚动
$(window).on('touchmove', (e)=> {
if (this.isVisible) {
e.preventDefault();
}
});
}
// if (this.settings.disableScrolling) {
// // 覆盖层出现时阻止滚动
// $(window).on('touchmove', (e)=> {
// if (this.isVisible) {
// e.preventDefault();
// }
// });
// }
this.elem[0].addEventListener('webkitTransitionEnd', this._cleanup.bind(this));
}
... ...
... ... @@ -134,7 +134,6 @@
const self = this;
this.overlay = new Overlay({
disableScrolling: false,
onClose: function() {
self.isVisible = false;
}
... ... @@ -156,7 +155,7 @@
top: 0;
right: 0;
bottom: 0;
left: 150px;
width: 530px;
background-color: #fff;
transform: translate3d(100%, 0, 0);
transition: all 0.3s 0.2s;
... ... @@ -208,7 +207,7 @@
.filter-cate-val {
float: right;
font-size: 28px;
max-width: 45%;
max-width: 33%%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
... ...
... ... @@ -39,7 +39,6 @@
}
res[groupName].push(brand);
});
console.log(res);
return res;
}
}
... ...
... ... @@ -30,7 +30,6 @@
return true;
},
hide() {
console.log('hide');
this.isVisible = false;
}
}
... ...
... ... @@ -10,8 +10,6 @@
<script>
var s = 1; // 测试代码检查
console.log(1);
module.exports = {
data() {
return {
... ...
... ... @@ -151,7 +151,6 @@
goodsId: selection.size.goodsId,
sku: selection.size.value
};
console.log(goods.goodsId);
this.showFeatureSelector = false;
},
... ...
... ... @@ -174,6 +174,7 @@ $border_color_light: #eee;
let data = {
orderCode: qs.order_code || '',
type: qs.type || '',
id: qs.id || ''
};
$.ajax({
... ...
... ... @@ -16,7 +16,7 @@
<div v-if="detail.status == 20"
class="logistics-detail">
<template v-if="detail.notice">
<a href="/me/logistic?order_code={{sourceOrderCode}}&type=refund">
<a href="/me/logistic?order_code={{sourceOrderCode}}&id={{applyid}}&type={{type}}">
<h2>{{detail.notice.title}}</h2>
<p>物流公司: {{detail.notice.expressCompany}}<br>快递单号: {{detail.notice.expressNumber}}</p>
<span class="right"><span class="icon icon-right"></span></span>
... ... @@ -147,8 +147,8 @@
this.id = this.detail.id;
this.sourceOrderCode = this.detail.sourceOrderCode;
} else if (result.code !== 500) {
tip(result.message);
} else if (res.code !== 500) {
tip(res.message);
} else {
tip('数据获取失败');
}
... ...
... ... @@ -160,7 +160,7 @@
</show-box>
<div class="control-box" v-if="isApp">
<div class="control-box" v-if="isApp && isReady">
<button class="button control-button">
<span @click="yoho.goShopingCart()" style="position: relative;">
<i class="icon icon-bag"></i>
... ... @@ -435,7 +435,8 @@
//state
isApp: yoho.isApp,
isSoldOut: true
isSoldOut: false,
isReady: false
};
},
computed: {
... ... @@ -490,8 +491,6 @@
const self = this;
const pid = app.data('pid');
this.isSoldOut = true;
// 显示商品特征选择组件
this.$on('feature.close', function() {
self.showFeatureSelector = false;
... ... @@ -502,8 +501,8 @@
// TODO: 异常处理
this.entity = result;
if (this.entity.storage !== 0 && this.entity.status !== 0) {
this.isSoldOut = false;
if (this.entity.storage === 0 || this.entity.status === 0) {
this.isSoldOut = true;
}
this.entity.goodsList.forEach((goods)=> {
... ... @@ -533,7 +532,8 @@
$.get(`/product/product/intro_${pid}.json`, {skn: result.productPriceBo.productSkn}).then(intro => {
this.intro = intro;
});
});
})
.always(()=>{this.isReady = true});
// 读取购物车数量
if (this.isApp) {
... ...
... ... @@ -131,7 +131,6 @@
});
bus.$on('order.change', function({val}) {
console.log(val);
self.order = val;
});
... ...
... ... @@ -60,7 +60,6 @@
const self = this;
const nextPage = this.page + 1;
console.log(nextPage);
if (this.inSearching) {
return;
}
... ... @@ -130,7 +129,6 @@
* 2. 关闭 drawer 组件
*/
bus.$on('filter.change', function({val}) {
console.log(val);
let filter = {};
$.each(val, (type, item) => {
... ...