diff --git a/app.json b/app.json
index 09c5994..0644cd7 100644
--- a/app.json
+++ b/app.json
@@ -15,7 +15,7 @@
"pages/user/userinfo/userinfo",
"pages/user/coupon/coupon",
"pages/user/checkcoupon/checkcoupon",
- "pages/user/express/express",
+
"pages/activity/seckill_list/seckill_list",
"pages/activity/pind_list/pind_list",
"pages/team/team_success/team_success",
@@ -45,8 +45,7 @@
"pages/user/assistance/task_assistance",
"pages/user/assistance/friend_assistance",
"pages/user/assistance/assistance_success",
- "pages/user/assistance/assistance",
- "pages/store/index",
+ "pages/user/assistance/assistance",
"pages/giftpack/festival/festival",
@@ -235,8 +234,15 @@
"pages/user/add_address/add_address"
]
+ },
+ {
+ "root": "packageG/",
+ "name": "pack7",
+ "pages": [
+ "pages/store/index",
+ "pages/user/express/express"
+ ]
}
-
],
diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
index bf35f8b..857ca09 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
@@ -187,7 +187,7 @@
查看物流
+ data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流
-
-
- {{item.AcceptStation}}
- {{item.AcceptTime}}
-
-
-
-
-
- {{express.Reason}}
-
diff --git a/pages/user/express/express.wxss b/pages/user/express/express.wxss
deleted file mode 100644
index 112d0a9..0000000
--- a/pages/user/express/express.wxss
+++ /dev/null
@@ -1,64 +0,0 @@
-.logistics-mes {
- padding: 20rpx 30rpx;
- background-color: #fff;
-}
-
-.logistics-num {
- display: flex;
- line-height: 48rpx;
- font-size: 28rpx;
-}
-
-.logistics-title {
- color: #777;
- margin-right: 20rpx;
-}
-
-.logistics-cont {
- color: #444;
-}
-
-.apply-state {
- margin-top: 20rpx;
- background-color: #fff;
- padding-left: 50rpx;
- padding-top: 60rpx;
-}
-
-.state-item {
- border-left: 1px solid #ccc;
- padding:0 40rpx;
-}
-
-.item-wrap {
- position: relative;
- margin-bottom: 20rpx;
- padding-bottom: 20rpx;
- border-bottom: 1px solid #eee;
- font-size: 24rpx;
- color: #aaa;
- line-height: 1;
-}
-
-.item-wrap::before {
- content: '';
- position: absolute;
- left: -61rpx;
- top: 0;
- width: 26rpx;
- height: 26rpx;
- border-radius: 50%;
- background-color: #e23435;
- border: 4px solid #ed8182;
-}
-
-.state-title {
- font-size: 28rpx;
- font-weight: bold;
- color: #666;
- padding-bottom: 20rpx;
- line-height: 40rpx
-}
-.no_msg{
- text-align: center;color: #999; font-size: 32rpx
-}
\ No newline at end of file
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index ce95d16..32763bb 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -179,7 +179,7 @@
查看物流
+ data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index f9ecaef..bb0a89d 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -262,9 +262,9 @@
查看物流
+ hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流
查看物流
+ hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流
订单详情
订单详情