Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/hotel/list.vue

@@ -669,7 +669,7 @@ export default {
 }
 
 .hotel-list .search-box .date {
-  width: 80rpx;
+  width: 82rpx;
   height: 50rpx;
   font-size: 22rpx;
   font-weight: 500;

pages/jiuzhai/jz_LineDetail.vue

@@ -870,6 +870,7 @@
               >
             </view>
             <view style="display: flex; align-items: center">
+              <!-- #ifdef MP-WEIXIN -->
               <button open-type="contact" class="jz_ConButton">
                 <img
                   style="width: 36rpx; height: 38rpx"
@@ -878,6 +879,7 @@
                 />
                 <view style="color: #111111; font-size: 22rpx">客服</view>
               </button>
+              <!-- #endif -->
               <view class="jz_OrderNow" @click="goReserce()">立即预定</view>
             </view>
           </view>
@@ -896,6 +898,7 @@
           <text style="font-size: 22rpx">/起</text>
         </view>
         <view style="display: flex; align-items: center">
+          <!-- #ifdef MP-WEIXIN -->
           <button open-type="contact" class="jz_ConButton">
             <img
               style="width: 36rpx; height: 38rpx"
@@ -904,6 +907,7 @@
             />
             <view style="color: #111111; font-size: 22rpx">客服</view>
           </button>
+          <!-- #endif -->
           <view
             class="jz_OrderNow"
             @click="openOrderPreview"

pages/jiuzhai/jz_MyOrder.vue

@@ -174,7 +174,7 @@
                 v-if="item.orderState == 2"
                 class="jz_Zailai"
                 style="width: 110rpx; margin-right: 10rpx"
-                @click="goZhifu.stop(item)"
+                @click.stop="goZhifu(item)"
                 >付款</view
               >
               <!-- #endif -->
@@ -191,7 +191,7 @@
                 v-if="item.isApplyForCancel != 1"
                 class="jz_Zailai"
                 style="width: 110rpx"
-                @click="goCancel.stop(item)"
+                @click.stop="goCancel(item)"
                 >取消</view
               >
             </view>
@@ -472,7 +472,15 @@ export default {
         success: function (res) {
           console.log("success", res);
           if (res.resultCode == "9000") {
-            that.getOrderInfo();
+            uni.showToast({
+              title: "支付成功",
+            });
+            uni.redirectTo({
+              url:
+                "/pages/jiuzhai/paysuccess?PreferPrice=" +
+                that.price +
+                "&isFrom=1",
+            });
           } else if (res.resultCode == "6001") {
             uni.showToast({
               title: "支付取消",

pages/jiuzhai/jz_Reserve.vue

@@ -867,7 +867,16 @@ export default {
         (res) => {
           this.orderInfo = JSON.parse(res.data);
           if (res.data) {
-            that.PayAli(res.data, data);
+            // that.PayAli(res.data, data);
+            let cbObj = {
+              TradeNo: res.data,
+              OrderNo: data.OrderNo,
+              OrderId: data.OrderId,
+              preferPrice: data.PreferPrice,
+            };
+            console.log(883, cbObj);
+            this.payAliCallback(cbObj);
+            console.log(884);
           } else {
             uni.showToast({
               title: "获取交易号失败",
@@ -907,7 +916,7 @@ export default {
       });
     },
     payAliCallback(obj) {
-      console.log(893, Obj);
+      console.log(893, obj);
       this.request2(
         {
           url: "/api/AliPay/ALiPayCallBackDmcNotify",
@@ -925,11 +934,6 @@ export default {
           uni.redirectTo({
             url: "/pages/jiuzhai/paysuccess?PreferPrice=" + obj.PreferPrice,
           });
-          // setTimeout(() => {
-          //   uni.redirectTo({
-          //     url: "/pages/jiuzhai/jz_MyOrder",
-          //   });
-          // }, 1000);
         },
         (err) => {
           console.log("cb2", err);