diff --git a/pages/user/express/express.js b/pages/user/express/express.js
index 9b057a8..8a04054 100644
--- a/pages/user/express/express.js
+++ b/pages/user/express/express.js
@@ -6,6 +6,7 @@ Page({
resourceUrl: e.globalData.setting.imghost,
delivery: null,
express: null,
+ re_arr:null,//反转后的数组
error: "快递信息异常"
},
onLoad: function(e) {
@@ -27,9 +28,9 @@ Page({
wx.request({
url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no, success: function(e) {
- console.log("success", e.data.data);
+ var re_arr = e.data.data.Traces.reverse();
s.setData({
- express: e.data.data,
+ express: e.data.data, re_arr: re_arr,
});
},
fail: function(s) {
diff --git a/pages/user/express/express.wxml b/pages/user/express/express.wxml
index cfca05c..8015e35 100644
--- a/pages/user/express/express.wxml
+++ b/pages/user/express/express.wxml
@@ -4,22 +4,28 @@
{{delivery.invoice_no}}
- 国内承运人 :
+ 承运公司 :
{{delivery.shipping_name}}
+
+
+ 物流状态 :
+ 在途中
+ 已签收
+ 问题件
+
+
-
-
-
+
-
+
{{item.AcceptStation}}
{{item.AcceptTime}}
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 36ef8b2..f1e49eb 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -42,9 +42,9 @@
}
.xc-uesr-name{
color: #fff;
- font-size: 35rpx;
+ font-size: 32rpx;
margin-top:17rpx;
- margin-left:20rpx;
+ margin-left:20rpx;
}
.xc-user-grade{
@@ -525,6 +525,8 @@ border-radius:20rpx;
background:#ffbdce;
padding-left: 16rpx;
padding-right: 16rpx;padding-bottom: 3rpx;
+margin-right: 5rpx;
+
}
.hvip{display: inline-block; font-size: 20rpx; height: 40rpx;line-height: 40rpx; color:#e7bf77; background: #383838; padding: 0 15rpx; border-radius:20rpx; vertical-align: middle }
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 30f0417..d840150 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -137,7 +137,7 @@ Page({
var t = this, o = this.data.order.order_id,order=this.data.order;
var is_zsorder=order.is_zsorder;
wx.showModal({
- title: "是否确定收货",
+ title: "是否确认收货?",
success: function(e) {
e.confirm && r.put("/api/weshop/order/updatebyId", {
data: {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index e2763f6..88f202a 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -234,7 +234,7 @@ Page({
console.log(is_zsorder);
wx.showModal({
- title: "是否确定收货",
+ title: "是否确认收货?",
success: function(t) {
t.confirm && rq.put("/api/weshop/order/updatebyId", {
data: {
diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml
index 8419f4e..78ca589 100644
--- a/pages/user/userqy/userqy.wxml
+++ b/pages/user/userqy/userqy.wxml
@@ -40,7 +40,7 @@
[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级
- 会员将在{{filter.replace_time(gradeEndDate)}}到期,365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}][{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级
+ 会员将在{{filter.replace_time2(gradeEndDate)}}到期,365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}][{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级
[{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
diff --git a/pages/user/userqy/userqy.wxss b/pages/user/userqy/userqy.wxss
index 22763a1..ac250b8 100644
--- a/pages/user/userqy/userqy.wxss
+++ b/pages/user/userqy/userqy.wxss
@@ -177,7 +177,7 @@ margin-top:60rpx;
.li .discounts{
top:115rpx;
left: 36rpx;
- width: 435rpx;
+ width: 440rpx;
}
.li .money{
left: 41rpx;