优化移包

前端开发-罗建龙
1 parent a335d73c
Showing 10 changed files with 16 additions and 157 deletions
app.json
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
packageC/pages/presell/cart/cart.wxml
packageF/pages/user/add_address/add_address.wxml
pages/user/express/express.js
pages/user/express/express.json
pages/user/express/express.wxml
pages/user/express/express.wxss
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.wxml
@@ -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"
+          ]
       }
-        
     ],
@@ -187,7 +187,7 @@
         <navigator bindtap="go_wuliu"  class="tips-btn" hidden="{{!order.shipping_btn}}"
                    data-order_id="{{order.order_id}}"
-                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+                   data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
           <!---has_rt部分退---->
          <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -410,7 +410,7 @@
         <view class="tips-btn2" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
         <navigator bindtap="go_wuliu" class="tips-btn2" hidden="{{!order.shipping_btn}}"
                    data-order_id="{{order.order_id}}"
-                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+                   data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
         <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1}}">
-<import src="../../../utils/regions/regions.wxml"></import>
+<import src="../../../../utils/regions/regions.wxml"></import>
 <view class="container">
-var e = getApp(), s = e.request,oo=e.globalData,os=oo.setting;
-
-Page({
-    data: {
-        url: e.globalData.setting.url,
-        resourceUrl: e.globalData.setting.imghost,
-        delivery: null,
-        express: null,
-        re_arr:null,//反转后的数组
-        error: "快递信息异常"
-    },
-    onLoad: function(e) {
-        this.requestDelivery(e.order_id);
-    },
-    requestDelivery: function(e) {
-        var r = this;
-        s.get("/api/order/deliverydoc/page", {
-            data: { order_id: e,store_id:os.stoid },
-            success: function(e) {
-                r.setData({
-                    delivery: e.data.data.pageData[0],
-                }), r.requestExpress();
-            }
-        });
-    },
-    requestExpress: function() {
-        var s = this;
-        wx.request({
-             url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no + "/" + this.data.delivery.mobile,                 success: function(e) {
-                
-               var re_arr = e.data.data.Traces.reverse();
-                s.setData({
-                  express: e.data.data, re_arr: re_arr,
-                });
-            },
-            fail: function(s) {
-                e.showWarning("请求失败");
-            }
-        });
-    }
-});
 \ No newline at end of file
-{
-    "navigationBarTitleText": "查看物流信息"
-}
 \ No newline at end of file
-<view class="logistics-mes">
-    <view class="logistics-num">
-        <view class="logistics-title">快递单号 : </view>
-        <view class="logistics-cont">{{delivery.invoice_no}}</view>
-    </view>
-    <view class="logistics-num">
-        <view class="logistics-title">承运公司 : </view>
-        <view class="logistics-cont">{{delivery.shipping_name}}</view>
-    </view>
-   
-     <view class="logistics-num">
-        <view  class="logistics-title">物流状态 : </view>
-        <view  wx:if="{{express.State==0}}" class="logistics-cont">无轨迹</view>
-        <view  wx:if="{{express.State==2}}" class="logistics-cont">已揽收</view>
-        <view  wx:if="{{express.State==2}}" class="logistics-cont">在途中</view>
-        <view  wx:if="{{express.State==3}}" class="logistics-cont">签收</view>
-        <view  wx:if="{{express.State==4}}" class="logistics-cont">问题件</view>
-    </view>
-
-</view>
-<view class="apply-state">
-    <view class="state-item">
-        <!-- <view class="item-wrap">
-            <view wx:if="{{express.State==2}}" class="state-title">在途中</view>
-            <view wx:if="{{express.State==3}}" class="state-title">已签收</view>
-            <view wx:if="{{express.State==4}}" class="state-title">问题件</view>
-            <view class="state-time">{{'    '}}</view>
-        </view> -->
-
-        <view class="item-wrap" wx:for="{{re_arr}}" wx:key="{{index}}">
-            <view class="state-title">{{item.AcceptStation}}</view>
-            <view class="state-time">{{item.AcceptTime}}</view>
-        </view>
-    </view>
-</view>
-
-<view class="no_msg" wx:if="{{(!re_arr || re_arr.length==0) && express}}">
-      {{express.Reason}}
-</view>
-.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
@@ -179,7 +179,7 @@
         <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
                    data-order_id="{{order.order_id}}"
-                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+                   data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
           <!---has_rt部分退---->
          <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -262,9 +262,9 @@
 	          </block>
 	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
-					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
+					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}}">查看物流</view>
 	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
-					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
+					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}}">查看物流</view>
 				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
 			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>