wxd / MShopWeApp

Commit 4f038a1c904a93eac259d56a4dc02945c27c0975

Authored by season
2 parents edba7a72 3b6dbe42

Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

Inline Side-by-side
Showing 16 changed files with 14 additions and 25 deletions
app.json
  View file @4f038a1
... ... @@ -26,18 +26,11 @@
26 26 "pages/activity/pind_list/pind_list",
27 27 "pages/team/team_success/team_success",
28 28 "pages/team/team_show/team_show",
29   - "pages/team/team_ping/team_ping",
30   - "pages/cart/cart_wk/cart_wk",
31   -
32   -
33   -
  29 + "pages/team/team_ping/team_ping",
34 30 "pages/user/userqy/userqy",
35   - "pages/user/user_spsy/user_spsy",
36   -
37   -
  31 + "pages/user/user_spsy/user_spsy",
38 32 "pages/payment/pay_success/pay_success",
39 33 "pages/user/plus/plus",
40   -
41 34 "pages/user/my_service/appment_main",
42 35 "pages/user/my_service/i_service",
43 36 "pages/user/my_service/cosmetology_list",
... ... @@ -227,7 +220,8 @@
227 220 "pages/user/monthgiftbag/giftpackinfo/giftpackinfo",
228 221 "pages/user/monthgiftbag/giftpackbuy/giftpackbuy",
229 222 "pages/cart/cart2_inte/cart2_inte",
230   - "pages/cart/cart2_pt/cart2_pt"
  223 + "pages/cart/cart2_pt/cart2_pt",
  224 + "pages/cart/cart_wk/cart_wk"
231 225  
232 226 ]
233 227 },
... ...
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
  View file @4f038a1
... ... @@ -965,7 +965,7 @@ Page({
965 965 },
966 966  
967 967 go_pay_wk:function(){
968   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
  968 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
969 969 getApp().goto(url);
970 970 },
971 971  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @4f038a1
... ... @@ -5952,11 +5952,6 @@ Page({
5952 5952 getApp().goto(url);
5953 5953 },
5954 5954  
5955   - //--跳转到支付尾款界面--
5956   - // go_pay_wk: function () {
5957   - // var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
5958   - // getApp().goto(url);
5959   - // },
5960 5955  
5961 5956 pop_err_img: function (e) {
5962 5957 var txt = e.currentTarget.dataset.errorimg;
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
  View file @4f038a1
... ... @@ -369,7 +369,7 @@ Page({
369 369 },
370 370  
371 371 zfwk:function(){
372   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
  372 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
373 373 wx.redirectTo({
374 374 url:url,
375 375 })
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @4f038a1
... ... @@ -3780,7 +3780,7 @@ Page({
3780 3780  
3781 3781 //--跳转到支付尾款界面--
3782 3782 go_pay_wk: function () {
3783   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
  3783 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
3784 3784 getApp().goto(url);
3785 3785 },
3786 3786  
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.js
  View file @4f038a1
... ... @@ -3331,7 +3331,7 @@ Page({
3331 3331  
3332 3332 //--跳转到支付尾款界面--
3333 3333 go_pay_wk: function () {
3334   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
  3334 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
3335 3335 getApp().goto(url);
3336 3336 },
3337 3337  
... ...
packageD/pages/shop/order_detail/order_detail.js
  View file @4f038a1
... ... @@ -803,7 +803,7 @@ Page({
803 803 },
804 804  
805 805 zfwk:function(){
806   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
  806 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
807 807 wx.redirectTo({
808 808 url:url,
809 809 })
... ...
pages/cart/cart_wk/cart_wk.js renamed to packageE/pages/cart/cart_wk/cart_wk.js
  View file @4f038a1
pages/cart/cart_wk/cart_wk.json renamed to packageE/pages/cart/cart_wk/cart_wk.json
  View file @4f038a1
pages/cart/cart_wk/cart_wk.wxml renamed to packageE/pages/cart/cart_wk/cart_wk.wxml
  View file @4f038a1
pages/cart/cart_wk/cart_wk.wxss renamed to packageE/pages/cart/cart_wk/cart_wk.wxss
  View file @4f038a1
pages/goods/goodsInfo/goodsInfo.js
  View file @4f038a1
... ... @@ -6971,7 +6971,7 @@ Page({
6971 6971  
6972 6972 //--跳转到支付尾款界面--
6973 6973 go_pay_wk: function () {
6974   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
  6974 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
6975 6975 getApp().goto(url);
6976 6976 },
6977 6977  
... ...
pages/team/team_success/team_success.js
  View file @4f038a1
... ... @@ -815,7 +815,7 @@ Page({
815 815 },
816 816  
817 817 go_pay_wk:function(){
818   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
  818 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
819 819 getApp().goto(url);
820 820 },
821 821  
... ...
pages/user/order_detail/order_detail.js
  View file @4f038a1
... ... @@ -1221,7 +1221,7 @@ Page({
1221 1221 },
1222 1222  
1223 1223 zfwk:function(){
1224   - var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
  1224 + var url = "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
1225 1225 wx.redirectTo({
1226 1226 url:url,
1227 1227 })
... ...
pages/user/order_list/order_list.js
  View file @4f038a1
... ... @@ -1661,7 +1661,7 @@ Page({
1661 1661 console.log("pay_wk");
1662 1662 var order_id = ee.currentTarget.dataset.order_id;
1663 1663 wx.navigateTo({
1664   - url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id,
  1664 + url: "/packageE/pages/cart/cart_wk/cart_wk?order_id=" + order_id,
1665 1665 });
1666 1666  
1667 1667 },
... ...
pages/user/order_list/order_list.wxml
  View file @4f038a1
... ... @@ -289,7 +289,7 @@
289 289 </block>
290 290  
291 291  
292   - <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
  292 + <navigator class="commodity_To_evaluate flex-level comment_go" url="/packageE/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
293 293 <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
294 294 <text wx:if="{{paying && paying[index]}}">支付中</text>
295 295 <text wx:else>立即支付</text>
... ...