diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index d10aeb5..f9aea17 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -118,7 +118,7 @@
- 销量 {{item.tailWarn}}
+ 销量 {{item.tailWarn != null ? item.tailWarn : 0}}
@@ -601,9 +601,13 @@
onlineWorkerInterval:2500,
onlineWorkerDuration:500,
menuList: [{
- categoryName: '猜你喜欢',
- id: '1',
+ categoryName: '推荐',
+ id: 'tuijian',
checked: true
+ },{
+ categoryName: '必点',
+ id: 'bidian',
+ checked: false
}],
shopRecommend:[],
availableCoupons: [],
@@ -797,6 +801,8 @@
} else {
that.productItem = [...that.productItem, ...res.result.records];
}
+ let hasTuijian = false
+ let bidian = false
for(let i = 0;i
+
+
+
@@ -151,6 +154,7 @@
return {
dataList: {},
modalType:0,
+ maxSelect:1,
categoryData:[],
categoryIndex: 0,
modalclassType:'',
@@ -637,7 +641,7 @@
if(this.attrValueArr.length>0){
let index1 = false
for (var m = 0; m < this.attrValueArr.length; m++) {
- if(this.attrValueArr[m].title == this.categorySonData[i].title){
+ if(this.attrValueArr[m].title == this.categorySonData[i].title && this.attrValueArr[m].parentName == this.typeToAttrName){
index1 = true
this.categorySonData[i].checked = true
}
diff --git a/package1/myCenter/goodsList.vue b/package1/myCenter/goodsList.vue
index 6e95a81..7728bd3 100644
--- a/package1/myCenter/goodsList.vue
+++ b/package1/myCenter/goodsList.vue
@@ -37,6 +37,10 @@
+
+ {{item.attributeListPrice | sliceMsg}}
+ 价格
+
{{item.lunchBox}}
餐盒费
@@ -151,7 +155,16 @@
}
},
filters: {
-
+ sliceMsg(val) {
+ var name = ''
+ if (typeof(val) == 'string') {
+ let newObj = JSON.parse(val)
+ for (let as in newObj) {
+ name = newObj[as].specPrice
+ }
+ }
+ return name;
+ },
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 976305f..8905581 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -135,7 +135,7 @@
取消订单
-
+
申请售后
@@ -441,6 +441,16 @@
查看评价 >
+
+
+ 申请平台介入
+
+
+ 
+
+
@@ -504,20 +514,20 @@
-
+
选择退款原因
-
-
+
+
全额退款（商家原因）
-
+
全额退款（配送员原因）
-
+
全额退款（商家+配送员原因）
@@ -612,6 +622,7 @@
refundType:3,
refundTypeStatus:4,
shopTime:'',
+ hasRefund:false,
peisongTime:'',
shopItem:{},
orderId:'',
@@ -770,7 +781,7 @@
},
checkEvaluate(){
console.log(this.orderDetail)
- if(this.orderDetail.comments.length>0){
+ if(this.orderDetail.comments != null && this.orderDetail.comments.length>0){
this.$refs.evaluatePopup.open()
}else{
this.tui.toast("暂无评价");
@@ -964,6 +975,13 @@
that.tui.request("/mall/order/detail/"+id, "GET", {}, false, true).then((res) => {
if (res.code == 200) {
that.orderDetail = res.result;
+ if(that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length > 0){
+ for(let i = 0; i < that.orderDetail.mallRefundRecord.length;i++){
+ if(that.orderDetail.mallRefundRecord[i].status >= 3){
+ that.hasRefund = true
+ }
+ }
+ }
if(that.orderDetail.groupInfo){
//还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开)
if(that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2){
diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue
index 9c81303..0a67d52 100644
--- a/package1/order/returnOrder.vue
+++ b/package1/order/returnOrder.vue
@@ -223,30 +223,25 @@
选择退款原因
-
+
- 只退商品
-
+ 商品退款
-
+
退配送费
-
-
+
全额退款（商家原因）
-
-
+
全额退款（配送员原因）
-
-
+
全额退款（商家+配送员原因）
-
确认