wxd / MShopWeApp

Commit d5bc6359e8374007a205a82de067720ebe6e3ba3

Authored by 前端开发-罗建龙
1 parent a335d73c

优化移包

Inline Side-by-side
Showing 10 changed files with 16 additions and 157 deletions
app.json
  View file @d5bc635
... ... @@ -15,7 +15,7 @@
15 15 "pages/user/userinfo/userinfo",
16 16 "pages/user/coupon/coupon",
17 17 "pages/user/checkcoupon/checkcoupon",
18   - "pages/user/express/express",
  18 +
19 19 "pages/activity/seckill_list/seckill_list",
20 20 "pages/activity/pind_list/pind_list",
21 21 "pages/team/team_success/team_success",
... ... @@ -45,8 +45,7 @@
45 45 "pages/user/assistance/task_assistance",
46 46 "pages/user/assistance/friend_assistance",
47 47 "pages/user/assistance/assistance_success",
48   - "pages/user/assistance/assistance",
49   - "pages/store/index",
  48 + "pages/user/assistance/assistance",
50 49 "pages/giftpack/festival/festival",
51 50  
52 51  
... ... @@ -235,8 +234,15 @@
235 234 "pages/user/add_address/add_address"
236 235 ]
237 236  
  237 + },
  238 + {
  239 + "root": "packageG/",
  240 + "name": "pack7",
  241 + "pages": [
  242 + "pages/store/index",
  243 + "pages/user/express/express"
  244 + ]
238 245 }
239   -
240 246 ],
241 247  
242 248  
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
  View file @d5bc635
... ... @@ -187,7 +187,7 @@
187 187  
188 188 <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
189 189 data-order_id="{{order.order_id}}"
190   - data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  190 + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
191 191  
192 192 <!---has_rt部分退---->
193 193 <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
... ...
packageC/pages/presell/cart/cart.wxml
  View file @d5bc635
... ... @@ -410,7 +410,7 @@
410 410 <view class="tips-btn2" wx:if="{{order.order_status==3}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
411 411 <navigator bindtap="go_wuliu" class="tips-btn2" hidden="{{!order.shipping_btn}}"
412 412 data-order_id="{{order.order_id}}"
413   - data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  413 + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
414 414  
415 415  
416 416 <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1}}">
... ...
packageF/pages/user/add_address/add_address.wxml
  View file @d5bc635
1   -<import src="../../../utils/regions/regions.wxml"></import>
  1 +<import src="../../../../utils/regions/regions.wxml"></import>
2 2  
3 3  
4 4 <view class="container">
... ...
pages/user/express/express.js deleted
View file @a335d73
1   -var e = getApp(), s = e.request,oo=e.globalData,os=oo.setting;
2   -
3   -Page({
4   - data: {
5   - url: e.globalData.setting.url,
6   - resourceUrl: e.globalData.setting.imghost,
7   - delivery: null,
8   - express: null,
9   - re_arr:null,//反转后的数组
10   - error: "快递信息异常"
11   - },
12   - onLoad: function(e) {
13   - this.requestDelivery(e.order_id);
14   - },
15   - requestDelivery: function(e) {
16   - var r = this;
17   - s.get("/api/order/deliverydoc/page", {
18   - data: { order_id: e,store_id:os.stoid },
19   - success: function(e) {
20   - r.setData({
21   - delivery: e.data.data.pageData[0],
22   - }), r.requestExpress();
23   - }
24   - });
25   - },
26   - requestExpress: function() {
27   - var s = this;
28   - wx.request({
29   - 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) {
30   -
31   - var re_arr = e.data.data.Traces.reverse();
32   - s.setData({
33   - express: e.data.data, re_arr: re_arr,
34   - });
35   - },
36   - fail: function(s) {
37   - e.showWarning("请求失败");
38   - }
39   - });
40   - }
41   -});
42 0 \ No newline at end of file
pages/user/express/express.json deleted
View file @a335d73
1   -{
2   - "navigationBarTitleText": "查看物流信息"
3   -}
4 0 \ No newline at end of file
pages/user/express/express.wxml deleted
View file @a335d73
1   -<view class="logistics-mes">
2   - <view class="logistics-num">
3   - <view class="logistics-title">快递单号 : </view>
4   - <view class="logistics-cont">{{delivery.invoice_no}}</view>
5   - </view>
6   - <view class="logistics-num">
7   - <view class="logistics-title">承运公司 : </view>
8   - <view class="logistics-cont">{{delivery.shipping_name}}</view>
9   - </view>
10   -
11   - <view class="logistics-num">
12   - <view class="logistics-title">物流状态 : </view>
13   - <view wx:if="{{express.State==0}}" class="logistics-cont">无轨迹</view>
14   - <view wx:if="{{express.State==2}}" class="logistics-cont">已揽收</view>
15   - <view wx:if="{{express.State==2}}" class="logistics-cont">在途中</view>
16   - <view wx:if="{{express.State==3}}" class="logistics-cont">签收</view>
17   - <view wx:if="{{express.State==4}}" class="logistics-cont">问题件</view>
18   - </view>
19   -
20   -</view>
21   -<view class="apply-state">
22   - <view class="state-item">
23   - <!-- <view class="item-wrap">
24   - <view wx:if="{{express.State==2}}" class="state-title">在途中</view>
25   - <view wx:if="{{express.State==3}}" class="state-title">已签收</view>
26   - <view wx:if="{{express.State==4}}" class="state-title">问题件</view>
27   - <view class="state-time">{{' '}}</view>
28   - </view> -->
29   -
30   - <view class="item-wrap" wx:for="{{re_arr}}" wx:key="{{index}}">
31   - <view class="state-title">{{item.AcceptStation}}</view>
32   - <view class="state-time">{{item.AcceptTime}}</view>
33   - </view>
34   - </view>
35   -</view>
36   -
37   -<view class="no_msg" wx:if="{{(!re_arr || re_arr.length==0) && express}}">
38   - {{express.Reason}}
39   -</view>
pages/user/express/express.wxss deleted
View file @a335d73
1   -.logistics-mes {
2   - padding: 20rpx 30rpx;
3   - background-color: #fff;
4   -}
5   -
6   -.logistics-num {
7   - display: flex;
8   - line-height: 48rpx;
9   - font-size: 28rpx;
10   -}
11   -
12   -.logistics-title {
13   - color: #777;
14   - margin-right: 20rpx;
15   -}
16   -
17   -.logistics-cont {
18   - color: #444;
19   -}
20   -
21   -.apply-state {
22   - margin-top: 20rpx;
23   - background-color: #fff;
24   - padding-left: 50rpx;
25   - padding-top: 60rpx;
26   -}
27   -
28   -.state-item {
29   - border-left: 1px solid #ccc;
30   - padding:0 40rpx;
31   -}
32   -
33   -.item-wrap {
34   - position: relative;
35   - margin-bottom: 20rpx;
36   - padding-bottom: 20rpx;
37   - border-bottom: 1px solid #eee;
38   - font-size: 24rpx;
39   - color: #aaa;
40   - line-height: 1;
41   -}
42   -
43   -.item-wrap::before {
44   - content: '';
45   - position: absolute;
46   - left: -61rpx;
47   - top: 0;
48   - width: 26rpx;
49   - height: 26rpx;
50   - border-radius: 50%;
51   - background-color: #e23435;
52   - border: 4px solid #ed8182;
53   -}
54   -
55   -.state-title {
56   - font-size: 28rpx;
57   - font-weight: bold;
58   - color: #666;
59   - padding-bottom: 20rpx;
60   - line-height: 40rpx
61   -}
62   -.no_msg{
63   - text-align: center;color: #999; font-size: 32rpx
64   -}
65 0 \ No newline at end of file
pages/user/order_detail/order_detail.wxml
  View file @d5bc635
... ... @@ -179,7 +179,7 @@
179 179  
180 180 <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
181 181 data-order_id="{{order.order_id}}"
182   - data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  182 + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
183 183  
184 184 <!---has_rt部分退---->
185 185 <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
... ...
pages/user/order_list/order_list.wxml
  View file @d5bc635
... ... @@ -262,9 +262,9 @@
262 262 </block>
263 263  
264 264 <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
265   - 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>
  265 + 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>
266 266 <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
267   - 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>
  267 + 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>
268 268  
269 269 <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>
270 270 <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
... ...