wxd / MShopWeApp

Commit 05b73c049eba72d029987b4f008b06fd5ef40ce3

Authored by WXD-SEASON\season
1 parent 5bddd309

移包

Inline Side-by-side
Showing 35 changed files with 51 additions and 49 deletions
app.json
  View file @05b73c0
... ... @@ -2,8 +2,7 @@
2 2 "pages": [
3 3 "pages/index/index/index",
4 4 "pages/goods/categoryList/categoryList",
5   - "pages/cart/cart/cart",
6   -
  5 + "pages/cart/cart/cart",
7 6 "pages/cart/cart4/cart4",
8 7 "pages/goods/goodsInfo/goodsInfo",
9 8 "pages/goods/goodsList/goodsList",
... ... @@ -14,19 +13,16 @@
14 13 "pages/user/order_list/order_list",
15 14 "pages/user/order_detail/order_detail",
16 15 "pages/user/address_list/address_list",
17   - "pages/user/userinfo/userinfo",
18   - "pages/user/return_goods_list/return_goods_list",
  16 + "pages/user/userinfo/userinfo",
19 17 "pages/user/coupon/coupon",
20 18 "pages/user/checkcoupon/checkcoupon",
21   - "pages/user/add_address/add_address",
22   - "pages/user/return_goods_info/return_goods_info",
23   - "pages/user/return_goods/return_goods",
  19 + "pages/user/add_address/add_address",
24 20 "pages/user/express/express",
25 21 "pages/activity/seckill_list/seckill_list",
26 22 "pages/activity/pind_list/pind_list",
27 23 "pages/team/team_success/team_success",
28 24 "pages/team/team_show/team_show",
29   - "pages/team/team_ping/team_ping",
  25 +
30 26 "pages/user/userqy/userqy",
31 27 "pages/user/user_spsy/user_spsy",
32 28 "pages/payment/pay_success/pay_success",
... ... @@ -54,7 +50,7 @@
54 50 "pages/user/assistance/assistance",
55 51 "pages/store/index",
56 52 "pages/giftpack/festival/festival",
57   - "pages/team/team_more/team_more",
  53 +
58 54  
59 55 "pages/distribution/distribution",
60 56 "pages/template/index"
... ... @@ -231,7 +227,12 @@
231 227 "pages": [
232 228 "pages/wuliu/wuliu",
233 229 "pages/free_delivery/free_delivery",
234   - "pages/xcxServiceChat/xcxServiceChat"
  230 + "pages/xcxServiceChat/xcxServiceChat",
  231 + "pages/team/team_ping/team_ping",
  232 + "pages/team/team_more/team_more",
  233 + "pages/user/return_goods_info/return_goods_info",
  234 + "pages/user/return_goods_list/return_goods_list",
  235 + "pages/user/return_goods/return_goods"
235 236 ]
236 237  
237 238 }
... ... @@ -252,6 +253,7 @@
252 253 "backgroundColor": "#ffffff",
253 254 "enablePullDownRefresh": true
254 255 },
  256 + "__usePrivacyCheck__": true,
255 257 "tabBar": {
256 258 "custom": true,
257 259 "color": "#6e6d6b",
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @05b73c0
... ... @@ -5127,7 +5127,7 @@ Page({
5127 5127 go_t_more: function () {
5128 5128 var team_id = this.data.prom_id;
5129 5129 wx.navigateTo({
5130   - url: "/pages/team/team_more/team_more?team_id=" + team_id,
  5130 + url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id,
5131 5131 });
5132 5132 },
5133 5133  
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
  View file @05b73c0
... ... @@ -384,7 +384,7 @@ Page({
384 384 wh = "&goods_id=" + e;
385 385 }
386 386 wx.navigateTo({
387   - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
  387 + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
388 388 });
389 389 },
390 390  
... ... @@ -402,17 +402,17 @@ Page({
402 402 if (t.data.code == 0) {
403 403 var r = t.data.data.total;
404 404 if (0 == r) return wx.navigateTo({
405   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  405 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
406 406 });
407 407 //--如果拒绝，就重新申请退款--
408 408 if (t.data.data.pageData[0].status == 3) {
409 409 return wx.navigateTo({
410   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  410 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
411 411 });
412 412 }
413 413  
414 414 wx.navigateTo({
415   - url: "/pages/user/return_goods_info/return_goods_info?id=" + r
  415 + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r
416 416 });
417 417 }
418 418 }
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
  View file @05b73c0
... ... @@ -198,7 +198,7 @@
198 198 <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
199 199 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
200 200 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
201   - url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
  201 + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
202 202  
203 203 </block>-->
204 204  
... ...
packageC/pages/presell/cart/cart.wxml
  View file @05b73c0
... ... @@ -421,7 +421,7 @@
421 421 <view class="tips-btn2" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
422 422 <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
423 423 <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
424   - url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
  424 + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
425 425 </block>
426 426  
427 427  
... ...
packageD/pages/shop/order_detail/order_detail.js
  View file @05b73c0
... ... @@ -818,7 +818,7 @@ Page({
818 818 wh = "&goods_id=" + e;
819 819 }
820 820 wx.navigateTo({
821   - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
  821 + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
822 822 });
823 823 },
824 824  
... ... @@ -836,17 +836,17 @@ Page({
836 836 if (t.data.code == 0) {
837 837 var r = t.data.data.total;
838 838 if (0 == r) return wx.navigateTo({
839   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  839 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
840 840 });
841 841 //--如果拒绝，就重新申请退款--
842 842 if (t.data.data.pageData[0].status == 3) {
843 843 return wx.navigateTo({
844   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  844 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
845 845 });
846 846 }
847 847  
848 848 wx.navigateTo({
849   - url: "/pages/user/return_goods_info/return_goods_info?id=" + r
  849 + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r
850 850 });
851 851 }
852 852 }
... ...
pages/team/team_more/team_more.js renamed to packageF/pages/team/team_more/team_more.js
  View file @05b73c0
1 1 var t = getApp(), a = t.request, o = t.globalData.setting, os = o,
2   - i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js");
3   -var regeneratorRuntime = require('../../../utils/runtime.js');
  2 + i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js");
  3 +var regeneratorRuntime = require('../../../../utils/runtime.js');
4 4  
5 5  
6 6 Page({
... ...
pages/team/team_more/team_more.json renamed to packageF/pages/team/team_more/team_more.json
  View file @05b73c0
pages/team/team_more/team_more.wxml renamed to packageF/pages/team/team_more/team_more.wxml
  View file @05b73c0
pages/team/team_more/team_more.wxss renamed to packageF/pages/team/team_more/team_more.wxss
  View file @05b73c0
pages/team/team_ping/team_ping.js renamed to packageF/pages/team/team_ping/team_ping.js
  View file @05b73c0
1   -var t = require("../../../utils/util.js"),
  1 +var t = require("../../../../utils/util.js"),
2 2 ut = t,
3   - e = require("../../../utils/common.js"),
4   - a = require("../../../utils/wxParse/wxParse.js"),
  3 + e = require("../../../../utils/common.js"),
  4 + a = require("../../../../utils/wxParse/wxParse.js"),
5 5 s = getApp(),
6 6 i = s.request,
7 7 rq = i,
8 8 oo = s.globalData,
9 9 o = s.globalData.setting,
10 10 os = o;
11   -var regeneratorRuntime = require('../../../utils/runtime.js');
  11 +var regeneratorRuntime = require('../../../../utils/runtime.js');
12 12 var e = getApp(),oo = e.globalData.setting;
13 13  
14 14 Page({
... ...
pages/team/team_ping/team_ping.json renamed to packageF/pages/team/team_ping/team_ping.json
  View file @05b73c0
pages/team/team_ping/team_ping.wxml renamed to packageF/pages/team/team_ping/team_ping.wxml
  View file @05b73c0
1   -<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
  1 +<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
2 2  
3 3 <!--选择款-->
4 4 <view class='top'>
... ...
pages/team/team_ping/team_ping.wxss renamed to packageF/pages/team/team_ping/team_ping.wxss
  View file @05b73c0
pages/user/return_goods/return_goods.js renamed to packageF/pages/user/return_goods/return_goods.js
  View file @05b73c0
1   -var t = getApp(), e = t.globalData.setting,os=e,oo=t.globalData, a = t.request, s = require("../../../utils/common.js"), i = require("../../../utils/selectFiles.js");
2   -var ut = require("../../../utils/util.js");
  1 +var t = getApp(), e = t.globalData.setting,os=e,oo=t.globalData, a = t.request, s = require("../../../../utils/common.js"), i = require("../../../../utils/selectFiles.js");
  2 +var ut = require("../../../../utils/util.js");
3 3  
4 4 Page({
5 5 data: {
... ...
pages/user/return_goods/return_goods.json renamed to packageF/pages/user/return_goods/return_goods.json
  View file @05b73c0
pages/user/return_goods/return_goods.wxml renamed to packageF/pages/user/return_goods/return_goods.wxml
  View file @05b73c0
pages/user/return_goods/return_goods.wxss renamed to packageF/pages/user/return_goods/return_goods.wxss
  View file @05b73c0
pages/user/return_goods_info/fil.wxs renamed to packageF/pages/user/return_goods_info/fil.wxs
  View file @05b73c0
pages/user/return_goods_info/return_goods_info.js renamed to packageF/pages/user/return_goods_info/return_goods_info.js
  View file @05b73c0
... ... @@ -3,7 +3,7 @@ var e = &quot;function&quot; == typeof Symbol &amp;&amp; &quot;symbol&quot; == typeof Symbol.iterator ? func
3 3 } : function(e) {
4 4 return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e;
5 5 }, t = getApp(), r = t.globalData.setting,oo=t.globalData,os=oo.setting,
6   - o = t.request,rq=o, s = require("../../../utils/util.js");
  6 + o = t.request,rq=o, s = require("../../../../utils/util.js");
7 7  
8 8 Page({
9 9 data: {
... ...
pages/user/return_goods_info/return_goods_info.json renamed to packageF/pages/user/return_goods_info/return_goods_info.json
  View file @05b73c0
pages/user/return_goods_info/return_goods_info.wxml renamed to packageF/pages/user/return_goods_info/return_goods_info.wxml
  View file @05b73c0
1   -<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
  1 +<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
2 2 <wxs module="fil" src="fil.wxs"></wxs>
3 3 <view class="order-mes">
4 4 <view class="order-name">
... ...
pages/user/return_goods_info/return_goods_info.wxss renamed to packageF/pages/user/return_goods_info/return_goods_info.wxss
  View file @05b73c0
pages/user/return_goods_list/fil.wxs renamed to packageF/pages/user/return_goods_list/fil.wxs
  View file @05b73c0
pages/user/return_goods_list/return_goods_list.js renamed to packageF/pages/user/return_goods_list/return_goods_list.js
  View file @05b73c0
... ... @@ -2,8 +2,8 @@ var t = function(t) {
2 2 return t && t.__esModule ? t : {
3 3 default: t
4 4 };
5   -}(require("../../../utils/LoadMore.js")), e = getApp(),oo=e.globalData,os=oo.setting,
6   - r = e.request,rq=r, s = new t.default(), o = require("../../../utils/util.js");
  5 +}(require("../../../../utils/LoadMore.js")), e = getApp(),oo=e.globalData,os=oo.setting,
  6 + r = e.request,rq=r, s = new t.default(), o = require("../../../../utils/util.js");
7 7  
8 8 Page({
9 9 data: {
... ...
pages/user/return_goods_list/return_goods_list.json renamed to packageF/pages/user/return_goods_list/return_goods_list.json
  View file @05b73c0
pages/user/return_goods_list/return_goods_list.wxml renamed to packageF/pages/user/return_goods_list/return_goods_list.wxml
  View file @05b73c0
... ... @@ -4,7 +4,7 @@
4 4 <view class="item">
5 5 订单号：{{item.order_sn}}
6 6 </view>
7   - <navigator class="item" url="/pages/user/return_goods_info/return_goods_info?id={{item.id}}">
  7 + <navigator class="item" url="/packageF/pages/user/return_goods_info/return_goods_info?id={{item.id}}">
8 8 <block wx:if="{{item.status==0}}">已申请成功，待售后审核中</block>
9 9 <block wx:elif="{{item.status==1}}">处理中</block>
10 10 <block wx:elif="{{item.status==2}}">退款完成</block>
... ... @@ -19,7 +19,7 @@
19 19 <view class="apply-time">申请时间：{{item.addTimeFommat}}</view>
20 20 </view>
21 21 </view>
22   - <navigator class="return-btn" url="/pages/user/return_goods_info/return_goods_info?id={{item.id}}">进度查询</navigator>
  22 + <navigator class="return-btn" url="/packageF/pages/user/return_goods_info/return_goods_info?id={{item.id}}">进度查询</navigator>
23 23 <!-- <view bindtap="receiveOrder" class="return-btn" data-id="{{item.id}}" hidden="{{!(item.status==2&&item.type==1)}}">确认收货</view> -->
24 24 <view bindtap="cancelReturn" class="return-btn" data-id="{{item.id}}" wx:if="{{item.status<=1}}">取消申请</view>
25 25 </view>
... ...
pages/user/return_goods_list/return_goods_list.wxss renamed to packageF/pages/user/return_goods_list/return_goods_list.wxss
  View file @05b73c0
pages/goods/goodsInfo/goodsInfo.js
  View file @05b73c0
... ... @@ -5750,7 +5750,7 @@ Page({
5750 5750 go_t_more: function () {
5751 5751 var team_id = this.data.prom_id;
5752 5752 wx.navigateTo({
5753   - url: "/pages/team/team_more/team_more?team_id=" + team_id,
  5753 + url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id,
5754 5754 });
5755 5755 },
5756 5756  
... ...
pages/payment/payment/payment.js
  View file @05b73c0
... ... @@ -15,7 +15,7 @@ Page({
15 15 lookOrder: function() {
16 16 this.data.order.is_group ? wx.redirectTo({
17 17 //url: "/pages/team/team_order/team_order?type=0"
18   - url: "/pages/team/team_ping/team_ping?type=0"
  18 + url: "/packageF/pages/team/team_ping/team_ping?type=0"
19 19 }) : wx.redirectTo({
20 20 url: "/pages/user/order_list/order_list?type=0"
21 21 });
... ...
pages/user/index/index.wxml
  View file @05b73c0
... ... @@ -145,7 +145,7 @@
145 145 <view class="xc-word-color four-level-word">待评论</view>
146 146 <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text>
147 147 </view>
148   - <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/pages/user/return_goods_list/return_goods_list">
  148 + <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/packageF/pages/user/return_goods_list/return_goods_list">
149 149 <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image>
150 150 <view style='height:36rpx;'> </view>
151 151 <view class="xc-word-color four-level-word abs">售后/退款</view>
... ...
pages/user/order_detail/order_detail.js
  View file @05b73c0
... ... @@ -1298,7 +1298,7 @@ Page({
1298 1298 wh = "&goods_id=" + e;
1299 1299 }
1300 1300 wx.navigateTo({
1301   - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
  1301 + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
1302 1302 });
1303 1303 },
1304 1304  
... ... @@ -1316,17 +1316,17 @@ Page({
1316 1316 if (t.data.code == 0) {
1317 1317 var r = t.data.data.total;
1318 1318 if (0 == r) return wx.navigateTo({
1319   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  1319 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
1320 1320 });
1321 1321 //--如果拒绝，就重新申请退款--
1322 1322 if (t.data.data.pageData[0].status == 3) {
1323 1323 return wx.navigateTo({
1324   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  1324 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
1325 1325 });
1326 1326 }
1327 1327  
1328 1328 wx.navigateTo({
1329   - url: "/pages/user/return_goods_info/return_goods_info?id=" + r
  1329 + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r
1330 1330 });
1331 1331 }
1332 1332 }
... ...
pages/user/order_detail/order_detail.wxml
  View file @05b73c0
... ... @@ -190,7 +190,7 @@
190 190 <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
191 191 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
192 192 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
193   - url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
  193 + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
194 194 </block>
195 195  
196 196  
... ...
pages/user/order_list/order_list.js
  View file @05b73c0
... ... @@ -647,17 +647,17 @@ Page({
647 647 if (t.data.code == 0) {
648 648 var r = t.data.data.total;
649 649 if (0 == r) return wx.navigateTo({
650   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  650 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
651 651 });
652 652 //--如果拒绝，就重新申请退款--
653 653 if (t.data.data.pageData[0].status == 3) {
654 654 return wx.navigateTo({
655   - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  655 + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
656 656 });
657 657 }
658 658  
659 659 wx.navigateTo({
660   - url: "/pages/user/return_goods_info/return_goods_info?id=" + r
  660 + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r
661 661 });
662 662 }
663 663 }
... ... @@ -1715,7 +1715,7 @@ Page({
1715 1715 wh = "&goods_id=" + e;
1716 1716 }
1717 1717 wx.navigateTo({
1718   - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
  1718 + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
1719 1719 });
1720 1720 },
1721 1721  
... ...
pages/user/order_list/order_list.wxml
  View file @05b73c0
... ... @@ -258,7 +258,7 @@
258 258 <block wx:else>
259 259 <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2 && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view>
260 260 <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
261   - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
  261 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
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}}"
... ...