1、购物车的支付失败的跳转优化

2、订单列表的支付转圈的优化

1、购物车的支付失败的跳转优化
2、订单列表的支付转圈的优化
yvan.ni
1 parent 5b8cddaf
Showing 5 changed files with 168 additions and 169 deletions
packageA/pages/serviceCard_pd/cart/cart.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
pages/user/order_list/order_list.js
utils/util.js
@@ -472,12 +472,7 @@ Page({
                               //-- 支付失败,要返回 --
                               setTimeout(function () {
-                                  var cps = getCurrentPages();
-                                  if (cps.length > 1) {
-                                      wx.navigateBack({ delta: 1 })
-                                  } else {
-                                      getApp().goto("/pages/index/index/index");
-                                  }
+                                  getApp().re_to("/pages/user/order_list/order_list?index=2&tabindex=1");
                               }, 1000)
                           })
@@ -5243,17 +5243,10 @@ Page({
               }, function () {
-
                 // return false;
                 //支付失败
                 setTimeout(function () {
-                  var cps = getCurrentPages();
-                  if (cps.length > 1) {
-                    wx.navigateBack({ delta: 1 })
-                  } else {
-                    getApp().goto("/pages/index/index/index");
-                  }
-
+                    getApp().re_to("/pages/user/order_list/order_list");
                 }, 1000)
               }, oo.stoid);
@@ -1377,7 +1377,7 @@ Page({
               }, function () {
                 //支付失败
                 setTimeout(function () {
-                  wx.navigateBack({ delta: 1 })
+                  getApp().re_to("/pages/user/order_list/order_list");
                 }, 1000)
               }, oo.stoid);
@@ -244,182 +244,191 @@ Page({
       th.setData({ is_get: 1 });
       var data = e.data.orderList;
-      data.forEach(async function (item, ind) {
-        var tt = null;
-        await getApp().request.promiseGet('/api/weshop/ordergoods/list', {
-          data: { order_id: item.order_id, store_id: os.stoid, pageSize: 600 },
-        }).then(res => {
-          tt = res;
-        })
-        var glist = tt.data.data.pageData;
-        for (var i in glist) {
-          if (glist[i].is_gift) {
-            data[ind].is_prom = 1;
-          }
-        }
-        data[ind]['ord_url'] = '/pages/user/order_detail/order_detail';
-        //-- 如果是优惠活动 --
-        if (glist[0].prom_type == 8) {
-          await getApp().request.promiseGet('/api/weshop/order/orderPresell/get/' + os.stoid + '/' + item.order_id, {
+      //-- 如果有值的时候 --
+      if(data && data.length){
+         data.forEach(async function (item, ind) {
+          var tt = null;
+          await getApp().request.promiseGet('/api/weshop/ordergoods/list', {
+            data: { order_id: item.order_id, store_id: os.stoid, pageSize: 600 },
           }).then(res => {
-            if (res.data.code == 0) {
-              data[ind]['presell'] = res.data.data;
-              data[ind]['ord_url'] = '/packageC/pages/presell/cart/cart';
-            }
+            tt = res;
           })
-        }
-        // 如果是幸运购活动
-        if (glist[0].prom_type == 9) {
-          await getApp().request.promiseGet('/api/weshop/prom/luckyOrder/list', {
-            data: {
-              store_id: os.stoid,
-              user_id: oo.user_id,
-              order_id: item.order_id,
+          var glist = tt.data.data.pageData;
+          for (var i in glist) {
+            if (glist[i].is_gift) {
+              data[ind].is_prom = 1;
             }
-          }).then(res => {
-            if (res.data.code == 0) {
-              // console.log('luckyGo+++++++++>>>', res.data.data);
-              // data[ind]['team_status'] = res.data.data[0]['team_status'];
-              if (res.data.data[0] && res.data.data[0]['team_status']) {
-                data[ind]['team_status'] = res.data.data[0]['team_status'];
-              } else {
-                data[ind]['team_status'] = 0;
-              };
+          }
-              // data[ind]['ord_url']='/packageC/pages/presell/cart/cart';
+          data[ind]['ord_url'] = '/pages/user/order_detail/order_detail';
+          //-- 如果是优惠活动 --
+          if (glist[0].prom_type == 8) {
+            await getApp().request.promiseGet('/api/weshop/order/orderPresell/get/' + os.stoid + '/' + item.order_id, {
+            }).then(res => {
+              if (res.data.code == 0) {
+                data[ind]['presell'] = res.data.data;
+                data[ind]['ord_url'] = '/packageC/pages/presell/cart/cart';
+              }
+            })
+          }
+          // 如果是幸运购活动
+          if (glist[0].prom_type == 9) {
+            await getApp().request.promiseGet('/api/weshop/prom/luckyOrder/list', {
+              data: {
+                store_id: os.stoid,
+                user_id: oo.user_id,
+                order_id: item.order_id,
+              }
+            }).then(res => {
+              if (res.data.code == 0) {
+                // console.log('luckyGo+++++++++>>>', res.data.data);
+                // data[ind]['team_status'] = res.data.data[0]['team_status'];
+                if (res.data.data[0] && res.data.data[0]['team_status']) {
+                  data[ind]['team_status'] = res.data.data[0]['team_status'];
+                } else {
+                  data[ind]['team_status'] = 0;
+                };
+
+                // data[ind]['ord_url']='/packageC/pages/presell/cart/cart';
+              }
+            })
+          }
+          //------------对比一下有没有退款记录------------
+          await getApp().request.promiseGet("/api/weshop/order/returngoods/page", {
+            data: {
+              order_id: item.order_id, store_id: os.stoid,
+              user_id: oo.user_id, pageSize: 20
             }
-          })
-        }
-        //------------对比一下有没有退款记录------------
-        await getApp().request.promiseGet("/api/weshop/order/returngoods/page", {
-          data: {
-            order_id: item.order_id, store_id: os.stoid,
-            user_id: oo.user_id, pageSize: 20
-          }
-        }).then(rs => {
-          var ttd = rs;
-          //--看一下订单的总数量--
-          var gtype_num = tt.data.data.total;
-          if (ttd.data.data.pageData == undefined) return false;
-          var goodslist = tt.data.data.pageData;
-
-          //----没有相关的退款记录----
-          if (ttd.data.data.total == 0) {
-            data[ind]['is_all_return'] = 0;
-            goodslist.forEach(function (ee, ii) {
-              if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1 && gtype_num > 1) {
-                item.goodslist = goodslist;
-                if (th.check_for_return_btn(item)) {
-                  goodslist[ii]['return_btn'] = 1;
+          }).then(rs => {
+            var ttd = rs;
+            //--看一下订单的总数量--
+            var gtype_num = tt.data.data.total;
+            if (ttd.data.data.pageData == undefined) return false;
+            var goodslist = tt.data.data.pageData;
+
+            //----没有相关的退款记录----
+            if (ttd.data.data.total == 0) {
+              data[ind]['is_all_return'] = 0;
+              goodslist.forEach(function (ee, ii) {
+                if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1 && gtype_num > 1) {
+                  item.goodslist = goodslist;
+                  if (th.check_for_return_btn(item)) {
+                    goodslist[ii]['return_btn'] = 1;
+                  }
                 }
-              }
-            });
-          } else {
-            //--------整单退--------
-            if (ttd.data.data.pageData[0]['goods_id_list'] != null
-              && ttd.data.data.pageData[0]['goods_id_list'] != '') {
-              var eea = ttd.data.data.pageData[0];
-              //1.退款正在进行中，
-              //2.退款被拒绝就要显示可以退款
-              //3.退款已经完成
-              data[ind]['is_all_return'] = 1;
-              data[ind]['is_all_return_status'] = ttd.data.data.pageData[0].status;
-
-              if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
-                switch (eea.status) {
-                  case 0:
-                  case 1:
-                    data[ind]['return_btn'] = 2;
-                    break;
-                  case 2:
-                    data[ind]['return_btn'] = 4;
-                    break;
-                  case 3:
-                    data[ind]['return_btn'] = 3;
-                    break;
-                  default:
-                    data[ind]['return_btn'] = 0;
-                }
-              }
+              });
             } else {
-              //1.退款正在进行中，
-              //2.退款被拒绝就要显示可以退款
-              //3.退款已经完成
-              data[ind]['is_all_return'] = 0;
-              var rt_ok_num = 0;
-              //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
-              goodslist.forEach(function (eeb, iii) {
-                if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
-                  goodslist[iii]['return_btn'] = 1; //申请退款
-                ttd.data.data.pageData.forEach(function (eea, ii) {
-                  var st = eea.status;
-                  if (eea.goods_id == eeb.goods_id) {
-                    switch (eea.status) {
-                      case 0:
-                      case 1://退款处理中
-                        data[ind]['has_rt'] = 1; //有部分退
-                        goodslist[iii]['return_btn'] = 2;
-                        break;
-                      case 2://退款完成
-                        data[ind]['has_rt'] = 1; //有部分退
-                        goodslist[iii]['return_btn'] = 4;
-                        rt_ok_num++;
-                        break;
-                      case 3://已拒绝，重新退款
-                        goodslist[iii]['return_btn'] = 3;
-                        break;
-                      default:
-                        if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
-                          goodslist[iii]['return_btn'] = 1; //申请退款
-                    }
-                    return;
+              //--------整单退--------
+              if (ttd.data.data.pageData[0]['goods_id_list'] != null
+                  && ttd.data.data.pageData[0]['goods_id_list'] != '') {
+                var eea = ttd.data.data.pageData[0];
+                //1.退款正在进行中，
+                //2.退款被拒绝就要显示可以退款
+                //3.退款已经完成
+                data[ind]['is_all_return'] = 1;
+                data[ind]['is_all_return_status'] = ttd.data.data.pageData[0].status;
+
+                if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
+                  switch (eea.status) {
+                    case 0:
+                    case 1:
+                      data[ind]['return_btn'] = 2;
+                      break;
+                    case 2:
+                      data[ind]['return_btn'] = 4;
+                      break;
+                    case 3:
+                      data[ind]['return_btn'] = 3;
+                      break;
+                    default:
+                      data[ind]['return_btn'] = 0;
                   }
+                }
+              } else {
+                //1.退款正在进行中，
+                //2.退款被拒绝就要显示可以退款
+                //3.退款已经完成
+                data[ind]['is_all_return'] = 0;
+                var rt_ok_num = 0;
+                //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
+                goodslist.forEach(function (eeb, iii) {
+                  if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
+                    goodslist[iii]['return_btn'] = 1; //申请退款
+                  ttd.data.data.pageData.forEach(function (eea, ii) {
+                    var st = eea.status;
+                    if (eea.goods_id == eeb.goods_id) {
+                      switch (eea.status) {
+                        case 0:
+                        case 1://退款处理中
+                          data[ind]['has_rt'] = 1; //有部分退
+                          goodslist[iii]['return_btn'] = 2;
+                          break;
+                        case 2://退款完成
+                          data[ind]['has_rt'] = 1; //有部分退
+                          goodslist[iii]['return_btn'] = 4;
+                          rt_ok_num++;
+                          break;
+                        case 3://已拒绝，重新退款
+                          goodslist[iii]['return_btn'] = 3;
+                          break;
+                        default:
+                          if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
+                            goodslist[iii]['return_btn'] = 1; //申请退款
+                      }
+                      return;
+                    }
+                  });
                 });
-              });
-              //}
+                //}
+              }
             }
-          }
-          //--如果是全部退款，也就可以删除--
-          if (rt_ok_num == goodslist.length) {
-            data[ind]['is_all_return_status'] = 2;
-          }
+            //--如果是全部退款，也就可以删除--
+            if (rt_ok_num == goodslist.length) {
+              data[ind]['is_all_return_status'] = 2;
+            }
-          data[ind]['order_goods'] = goodslist;
-          var g_num = 0;
-          goodslist.forEach(function (ee, ii) {
-            if (ee.return_btn != 4)
-              g_num += ee.goods_num;
-          });
-          data[ind]['g_num'] = g_num;
-        })
+            data[ind]['order_goods'] = goodslist;
+            var g_num = 0;
+            goodslist.forEach(function (ee, ii) {
+              if (ee.return_btn != 4)
+                g_num += ee.goods_num;
+            });
+            data[ind]['g_num'] = g_num;
+          })
-        data[ind].use_commission = 0;
-        //-- 如果有数据的话 --
-        await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + item.order_sn, {
+          data[ind].use_commission = 0;
+          //-- 如果有数据的话 --
+          await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + item.order_sn, {
+
+          }).then(res => {
+            if (res.data.code == 0 && res.data.data) {
+              data[ind].use_commission = res.data.data.use_commission;
+              data[ind].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
+              data[ind].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
+            }
+          })
-        }).then(res => {
-          if (res.data.code == 0 && res.data.data) {
-            data[ind].use_commission = res.data.data.use_commission;
-            data[ind].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
-            data[ind].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
-          }
-        })
+          th.setData({ orderList: data, });
-        th.setData({ orderList: data, });
+          wx.hideLoading();
+        });
+         e.data.currentPage++, wx.stopPullDownRefresh();
+      }
+      else {
+        //直接关闭加载中的动画
         wx.hideLoading();
+      }
+
-      });
-      e.data.currentPage++,
-        wx.stopPullDownRefresh();
     }, null, { store_id: os.stoid, user_id: oo.user_id });
   },
@@ -898,8 +898,6 @@ module.exports = {
             err_url="/pages/index/index/index";
         }
-
-
         let options = wx.getEnterOptionsSync();
         if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') {
             let extraData = options.referrerInfo.extraData;
@@ -932,6 +930,10 @@ module.exports = {
                 // "支付已取消";
                 else if (extraData.code == 'cancel') {
                     this.m_toast("取消支付")
+
+                    console.log('err_url-11');
+                    console.log(err_url);
+
                     //支付失败
                     setTimeout(function () {
                         if(err_url=='back'){
@@ -944,7 +946,7 @@ module.exports = {
                             if(is_navigateTo){
                                 getApp.goto({ url: err_url, })  //跳到tabbar页
                             }else {
-                                wxd.redirectTo(err_url);
+                                wx.redirectTo({ url: err_url});
                             }
                         }