Merge branch 'master' of http://git.9026.com/YanaDH/seafood

wechat/pages/express-company/express-company.js

@@ -12,7 +12,7 @@ Page({
     //处理:accept:接受点击返回的文字
     wxSortPickerViewItemTap: function (e) {
         var that = this;
-        wx.navigateTo({
+        wx.redirectTo({
             url: '/pages/express-orderid/express-orderid?express_name=' + e.target.dataset.text + '&order_id=' + that.data.order_id,
         })
     },

wechat/pages/express-orderid/express-orderid.js

@@ -10,6 +10,12 @@ Page({
     
     },
 
+    goto: function (e) {
+      wx.redirectTo({
+        url: "/pages/express-company/express-company?order_id=" + this.data.order_id
+      });
+
+    },
     getExpress: function(e){
         this.setData({
             express_num: e.detail.value
@@ -40,8 +46,11 @@ Page({
                 express_num: that.data.express_num
             },
             success: function(res){
-                if(res.code == 0){
-                    wx.navigateTo({
+              if (res.code == 0) {
+                // wx.navigateBack({
+                //   delta: 2,
+                // });
+                    wx.redirectTo({
                         url: '/pages/order-refund-detail/order-refund-detail?id=' + that.data.order_id,
                     })
                 }

wechat/pages/express-orderid/express-orderid.wxml

@@ -1,7 +1,7 @@
 <!--pages/express-orderid/express-orderid.wxml-->
 <view class='wrapper'>
     <view class='reason-item'>
-        <navigator url='/pages/express-company/express-company?order_id={{order_id}}' class="flex-grow-1 flex-row">
+        <view bindtap="goto" class="flex-grow-1 flex-row">
             物流公司
             <view class="flex-grow-1 flex-x-center flex-y-center" style='color: #979A9B;'>
                 <text wx:if='{{express_name}}'>{{express_name}}</text>
@@ -9,7 +9,7 @@
                 
                 <image style='width:12rpx; margin-left: 20rpx;' mode='widthFix' src='/images/icon-jiantou-r.png'></image>
             </view>
-        </navigator> 
+        </view> 
     </view>
     <view class='reason-item' style='border: none;'>
         <view class="flex-grow-1 flex-row">

wechat/pages/order-refund-detail/order-refund-detail.js

@@ -15,7 +15,6 @@ Page({
      */
     onLoad: function (options) {
         app.pageOnLoad(this);
-
         var page = this;
         page.setData({
             order_id: options.id
@@ -41,12 +40,18 @@ Page({
         });
     },
     viewImage: function (e) {
-        var page = this;
-        var index = e.currentTarget.dataset.index;
-        wx.previewImage({
-            current: page.data.order_refund.refund_pic_list[index],
-            urls: page.data.order_refund.refund_pic_list,
-        });
+      var page = this;
+      var index = e.currentTarget.dataset.index;
+      wx.previewImage({
+        current: page.data.order_refund.refund_pic_list[index],
+        urls: page.data.order_refund.refund_pic_list,
+      });
+    },
+    goto: function (e) {
+      wx.redirectTo({
+        url: "/pages/express-orderid/express-orderid?order_id=" + this.data.order_id
+      });
+      
     },
     /**
      * 生命周期函数--监听页面初次渲染完成

wechat/pages/order-refund-detail/order-refund-detail.wxml

@@ -99,7 +99,9 @@
 </view>
 <view wx:if="{{order_refund.express_name=='' && order_refund.refund_type==1}}" style='text-align: center;'>
     <view wx:if='{{order_refund.refund_status==0}}' class='button'>填写运单号</view>
-    <navigator wx:elif='{{order_refund.refund_status < 3}}' url='/pages/express-orderid/express-orderid?order_id={{order_id}}' class='button' style='background: #EB4851;'>填写运单号</navigator>
+    <!-- <navigator url='/pages/express-orderid/express-orderid?order_id={{order_id}}'>填写运单号</navigator> -->
+
+    <view wx:elif='{{order_refund.refund_status < 3}}' class='button' style='background: #EB4851;' bindtap="goto">填写运单号</view>
 </view>
 <view class='wrapper bg-white' wx:if="{{order_refund.express_name!==''}}">
     <view class='reason-item'>