Pārlūkot izejas kodu

支付成功失败后的回调

zhashaonan 6 gadi atpakaļ
vecāks
revīzija
211dc9c6de

+ 3 - 2
pages/confirmOrder/confirmOrder.wxml

@@ -3,12 +3,13 @@
   <navigator url="/pages/address/address">
     <view class="address_wrap" wx:if="{{defaultAddress}}">
       <image class="adress-icon" src="../../image/address-icon.png"></image>
-      <view>
+      <view style="word-wrap:break-word;max-width: 80%;">
         <view>
           <text>{{defaultAddress.true_name}}</text>
           <text class="ml8">{{defaultAddress.mob_phone}}</text>
         </view>
-        <view class="mt10"><text>{{defaultAddress.area_info}}</text><text class="ml8">{{defaultAddress.address}}</text></view>
+        <view class="mt10">{{defaultAddress.area_info}}</view>
+        <view class="mt10">{{defaultAddress.address}}</view>
       </view>
       <image class="see_ensure_desc" src="../../image/back.png"></image>
     </view>

+ 2 - 1
pages/confirmOrder/confirmOrder.wxss

@@ -6,10 +6,11 @@
   display: -webkit-flex;
   display: flex;
   align-items: center;
-  height: 148rpx;
   font-size: 24rpx;
   color: #333;
   background: #fff;
+  flex-wrap: wrap;
+  padding: 16rpx 100rpx 16rpx 0;
 }
 .address_none {
   display: -webkit-flex;

+ 13 - 15
pages/orderPaySn/orderPaySn.js

@@ -17,7 +17,7 @@ Page({
   onLoad: function (options) {
     let pay_sn = options.pay_sn;
     this.getDatas(pay_sn);
-    console.log(111);
+    console.log('pay_sn:', pay_sn);
   },
   getDatas(pay_sn) {
     let self = this;
@@ -83,24 +83,22 @@ Page({
           signType: param.signType,         //微信签名方式:
           paySign: param.paySign, //微信签名
           success: function (res) {
-            // wx.showToast({
-            //   icon: 'none',
-            //   title: res,
-            //   duration: 2000
-            // })
-            wx.reLaunch({
-              url: "/pages/index/index"
+            wx.redirectTo({
+              url: "/pages/order_tabs/orderTabs?state_type=state_pay"
             })
-            console.log("成功:" + res);
+
+            console.log("成功:", res);
             console.log('支付成功')
           },
           fail: function (res) {
-            wx.showToast({
-              icon: 'none',
-              title: res,
-              duration: 2000
-            })
-            console.log("失败:" + res);
+            setTimeout(() => {
+              wx.showToast({
+                icon: 'none',
+                title: res.errMsg,
+                duration: 2000
+              })
+            }, 200);
+            console.log("失败:",  res);
           }
         });
       }

+ 3 - 3
pages/orderPaySn/orderPaySn.wxml

@@ -3,13 +3,13 @@
   <navigator url="/pages/address/address">
     <view class="address_wrap" wx:if="{{defaultAddress}}">
       <image class="adress-icon" src="../../image/address-icon.png"></image>
-      <view>
+      <view style="word-wrap:break-word;max-width: 80%;">
         <view>
           <text>{{defaultAddress.true_name}}</text>
           <text class="ml8">{{defaultAddress.mob_phone}}</text>
         </view>
-        <!-- <view class="mt10">{{defaultAddress.area_info}}{{defaultAddress.address}}</view> -->
-        <view class="mt10"><text>{{defaultAddress.area_info}}</text><text class="ml8">{{defaultAddress.address}}</text></view>
+        <view class="mt10">{{defaultAddress.area_info}}</view>
+        <view class="mt10">{{defaultAddress.address}}</view>
       </view>
       <image class="see_ensure_desc" src="../../image/back.png"></image>
     </view>

+ 1 - 1
pages/order_tabs/orderTabs.wxml

@@ -35,7 +35,7 @@
       </view>
       <view class='order_handle'>
         <block wx:key="{{index}}" wx:for="{{item.actions}}" wx:for-item="action">
-          <text data-action="{{action.action}}" data-orderid="{{item.order_info.order_id}}" data-ordersn="{{item.order_info.order_sn}}" data-index="{{idx}}" data-paysn="{{item.order_info.pay_sn}}" bindtap='order_action'>{{action.title}}</text>  
+          <text wx:if="{{(action.action != 'if_evaluation') && (action.action != 'if_refund_cancel')}}" data-action="{{action.action}}" data-orderid="{{item.order_info.order_id}}" data-ordersn="{{item.order_info.order_sn}}" data-index="{{idx}}" data-paysn="{{item.order_info.pay_sn}}" bindtap='order_action'>{{action.title}}</text>  
         </block> 
       </view>
     </view>

+ 5 - 1
pages/person/person.js

@@ -151,6 +151,11 @@ Page({
       url: `/pages/webView/webView?url=${url}`
     })
   },
+  payIndex() {
+    wx.reLaunch({
+      url: "/pages/index/index"
+    })
+  },
 
   /**
    * 生命周期函数--监听页面隐藏
@@ -179,7 +184,6 @@ Page({
   onReachBottom: function () {
 
   },
-
   bonus_list() {
     this.setData({
       bonus_list_show: !this.data.bonus_list_show

+ 4 - 0
pages/person/person.wxml

@@ -106,6 +106,10 @@
       <text>测试分享webview</text>
       <text class='look_all_order arrow_right' decode="{{true}}"></text>
     </view>
+    <view class='order_title' bindtap="payIndex">
+      <text>测试首页</text>
+      <text class='look_all_order arrow_right' decode="{{true}}"></text>
+    </view>
   </view>
 
   <!-- <view class='person_info_cell'>