11

pages/jiuzhai/jz_Reserve.vue

@@ -443,7 +443,7 @@
 				</view>
 				<view style="display: flex; margin-top: -2px">
 					<button class="jz_OrderReNow" @click="goPay()" :disabled="submit" :loading="submit">
-						立即支付
+						立即预定
 					</button>
 				</view>
 			</view>

pages/jiuzhai/jz_SureOrder.vue

 <style>
-.jz_SureOrder {
+	.jz_SureOrder {
   position: relative;
 }
 .jz_SureTop {
@@ -332,78 +332,34 @@
 	<view class="jz_Reserve" v-if="orderData">
 		<view class="jz_ReserTop">
 			<view class="flex" style="margin-bottom: 30rpx">
-        <u-icon
-          customPrefix="iconfont"
-          name="icondaizhifu-"
-          size="52"
-          color="#DFBE6E"
-          v-if="orderStatus.code == 0"
-        ></u-icon>
-        <u-icon
-          customPrefix="iconfont"
-          name="iconquxiao"
-          size="52"
-          color="#f26c6c"
-          v-if="orderStatus.code == -1"
-        ></u-icon>
-        <u-icon
-          customPrefix="iconfont"
-          name="iconshenhezhong"
-          size="52"
-          color="#86d9a5"
-          v-if="orderStatus.code == -2"
-        ></u-icon>
-        <u-icon
-          customPrefix="iconfont"
-          name="iconzhengchang"
-          size="52"
-          color="#111"
-          v-if="orderStatus.code == 1"
-        ></u-icon>
-        <text
-          style="
+				<u-icon customPrefix="iconfont" name="icondaizhifu-" size="52" color="#DFBE6E" v-if="orderStatus.code == 0"></u-icon>
+				<u-icon customPrefix="iconfont" name="iconquxiao" size="52" color="#f26c6c" v-if="orderStatus.code == -1"></u-icon>
+				<u-icon customPrefix="iconfont" name="iconshenhezhong" size="52" color="#86d9a5" v-if="orderStatus.code == -2"></u-icon>
+				<u-icon customPrefix="iconfont" name="iconzhengchang" size="52" color="#111" v-if="orderStatus.code == 1"></u-icon>
+				<text style="
             margin-left: 26rpx;
             font-size: 40rpx;
             font-weight: 600;
             color: #111;
-          "
-        >
+          ">
 					{{ orderStatus.text }}
 				</text>
 			</view>
-      <view
-        style="margin-bottom: 30rpx"
-        v-if="
+			<view style="margin-bottom: 30rpx" v-if="
           orderData.model.RejectRemark && orderData.model.RejectRemark != ''
-        "
-      >
-        <u-alert-tips
-          type="error"
-          title="订单取消失败"
-          :description="orderData.model.RejectRemark"
-        ></u-alert-tips>
+        ">
+				<u-alert-tips type="error" title="订单取消失败" :description="orderData.model.RejectRemark"></u-alert-tips>
 			</view>
 			<view class="o-timer flex">
-        <view class="time-item"
-          >{{ getDate(orderData.model.StartDate) }}
-          {{ getWeek(orderData.model.StartDate) }}</view
-        >
+				<view class="time-item">{{ getDate(orderData.model.StartDate) }}
+					{{ getWeek(orderData.model.StartDate) }}</view>
 				<view class="time-split">
 					<view>{{ orderData.model.DayNum }}天</view>
 				</view>
-        <view
-          class="time-item"
-          style="font-size: 26rpx; font-weight: 500; flex: 1"
-        >
-          <text v-if="orderData.model.ManNum > 0"
-            >{{ orderData.model.ManNum }}成人</text
-          >
-          <text v-if="orderData.model.ChirdNum > 0"
-            >{{ orderData.model.ChirdNum }}儿童</text
-          >
-          <text v-if="orderData.model.BabyNum > 0"
-            >{{ orderData.model.BabyNum }}婴儿</text
-          >
+				<view class="time-item" style="font-size: 26rpx; font-weight: 500; flex: 1">
+					<text v-if="orderData.model.ManNum > 0">{{ orderData.model.ManNum }}成人</text>
+					<text v-if="orderData.model.ChirdNum > 0">{{ orderData.model.ChirdNum }}儿童</text>
+					<text v-if="orderData.model.BabyNum > 0">{{ orderData.model.BabyNum }}婴儿</text>
 				</view>
 				<view class="update">
 					<!-- <text style="margin-right: 8rpx;">修改</text>
@@ -421,9 +377,7 @@
 				<text>{{ orderData.model.StartCityName }}出发</text>
 			</view>
 			<view class="jz_ReseQue">
-        <img
-          src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zuanshi.png"
-        />即时确认：本产品付款后可快速确认，放心期待您的旅行
+				<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zuanshi.png" />即时确认：本产品付款后可快速确认，放心期待您的旅行
 			</view>
 		</view>
 
@@ -448,11 +402,7 @@
 			</view>
 		</view>
 		<view class="empty-block"></view>
-    <view
-      class="jz_form jz_MyGuestList"
-      v-for="(subItem, subIndex) in orderData.model.GuestList"
-      :key="subIndex"
-    >
+		<view class="jz_form jz_MyGuestList" v-for="(subItem, subIndex) in orderData.model.GuestList" :key="subIndex">
 			<view style="margin: 10rpx 0 20rpx 0"> 游客{{ subIndex + 1 }} </view>
 			<view class="form-items">
 				<view class="label">游客姓名</view>
@@ -489,9 +439,7 @@
 				<view class="form-items">
 					<view class="label"> 在线支付 </view>
 					<view class="val f14 regular" style="text-align: right">
-            <text style="margin-right: 30rpx"
-              >{{ orderData.model.GuestNum }}人</text
-            >
+						<text style="margin-right: 30rpx">{{ orderData.model.GuestNum }}人</text>
 						<text class="red">￥{{ orderData.model.PreferPrice }}</text>
 					</view>
 				</view>
@@ -502,55 +450,34 @@
 					<view style="flex: 1">
 						<text style="margin-right: 30rpx">成人</text>
 					</view>
-          <view style="text-align: right"
-            >{{ orderData.model.ManNum }}人 × ¥{{
+					<view style="text-align: right">{{ orderData.model.ManNum }}人 × ¥{{
               orderData.model.Unit_Price
-            }}</view
-          >
-        </view>
-        <view
-          class="flex f12 grey"
-          style="margin-bottom: 40rpx"
-          :key="index"
-          v-if="orderData.model.ChirdNeedBedNum > 0"
-        >
+            }}</view>
+				</view>
+				<view class="flex f12 grey" style="margin-bottom: 40rpx" :key="index" v-if="orderData.model.ChirdNeedBedNum > 0">
 					<view style="flex: 1">
 						<text style="margin-right: 30rpx">儿童(占床)</text>
 					</view>
-          <view style="text-align: right"
-            >{{ orderData.model.ChirdNeedBedNum }}人 × ¥{{
+					<view style="text-align: right">{{ orderData.model.ChirdNeedBedNum }}人 × ¥{{
               orderData.model.Unit_Price +
               (orderData.modelPrice.ChildNeedPrice
                 ? orderData.modelPrice.ChildNeedPrice
                 : 0)
-            }}</view
-          >
-        </view>
-        <view
-          class="flex f12 grey"
-          style="margin-bottom: 40rpx"
-          :key="index"
-          v-if="orderData.model.ChirdNum - orderData.model.ChirdNeedBedNum > 0"
-        >
+            }}</view>
+				</view>
+				<view class="flex f12 grey" style="margin-bottom: 40rpx" :key="index" v-if="orderData.model.ChirdNum - orderData.model.ChirdNeedBedNum > 0">
 					<view style="flex: 1">
 						<text style="margin-right: 30rpx">儿童(不占床)</text>
 					</view>
-          <view style="text-align: right"
-            >{{ orderData.model.ChirdNum - orderData.model.ChirdNeedBedNum }}人
+					<view style="text-align: right">{{ orderData.model.ChirdNum - orderData.model.ChirdNeedBedNum }}人
 						× ¥{{
               orderData.model.Unit_Price -
               (orderData.modelPrice.ChildNoNeedPrice
                 ? orderData.modelPrice.ChildNoNeedPrice
                 : 0)
-            }}</view
-          >
-        </view>
-        <view
-          class="flex f12 grey"
-          style="margin-bottom: 40rpx"
-          :key="index"
-          v-if="orderData.model.BabyNum > 0"
-        >
+            }}</view>
+				</view>
+				<view class="flex f12 grey" style="margin-bottom: 40rpx" :key="index" v-if="orderData.model.BabyNum > 0">
 					<view style="flex: 1">
 						<text style="margin-right: 30rpx">婴儿</text>
 					</view>
@@ -559,35 +486,25 @@
               orderData.modelPrice.BabyPrice
                 ? orderData.modelPrice.BabyPrice
                 : 0
-            }}</view
-          >
-        </view>
-        <view
-          class="flex f12 grey"
-          style="margin-bottom: 40rpx"
-          :key="index"
-          v-if="
+            }}</view>
+				</view>
+				<view class="flex f12 grey" style="margin-bottom: 40rpx" :key="index" v-if="
             orderData.model.ChirdNum > 0 &&
             orderData.modelPrice.BabyChargePrice &&
             orderData.modelPrice.BabyChargePrice > 0
-          "
-        >
+          ">
 					<view style="flex: 1">
 						<text style="margin-right: 30rpx">儿童(附加费)</text>
 					</view>
 					<view style="text-align: right">
 						{{ orderData.model.ChirdNum }}人 × ¥{{
               orderData.modelPrice.BabyChargePrice
-            }}</view
-          >
+            }}</view>
 				</view>
 			</view>
 		</view>
 		<view class="empty-block"></view>
-    <view
-      style="padding: 50rpx 40rpx"
-      v-if="Refund > 0 && orderStatus.code == -1"
-    >
+		<view style="padding: 50rpx 40rpx" v-if="Refund > 0 && orderStatus.code == -1">
 			<view class="big-title">
 				<text>取消订单</text>
 			</view>
@@ -595,9 +512,7 @@
 				<view class="form-items">
 					<view class="label"> 已退款总额 </view>
 					<view class="val f14 regular" style="text-align: right">
-            <text style="margin-right: 30rpx"
-              >{{ orderData.model.GuestNum }}人</text
-            >
+						<text style="margin-right: 30rpx">{{ orderData.model.GuestNum }}人</text>
 						<text class="red">￥{{ orderData.model.PreferPrice }}</text>
 					</view>
 				</view>
@@ -605,12 +520,7 @@
 		</view>
 		<view class="jz_orderbox flex">
 			<view style="display: flex" v-if="showPayBtn">
-        <view
-          class="jz_OrderReNow"
-          @click="goCancel"
-          style="background: #fff; color: #111; border: 1px solid #111"
-          
-        >
+				<view class="jz_OrderReNow" @click="goCancel" style="background: #fff; color: #111; border: 1px solid #111">
 					<text v-if="!submitCancel">取消</text>
 					<u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
 				</view>
@@ -625,24 +535,14 @@
 			</view>
 			<view style="display: flex; margin-left: 30rpx">
 				<!-- #ifdef MP-WEIXIN -->
-        <button
-          class="jz_OrderReNow"
-          @click="goFukuan"
-          v-if="showPayBtn"
-          :disabled="submit"
-        >
+				<!-- 	<button class="jz_OrderReNow" @click="goFukuan" v-if="showPayBtn" :disabled="submit">
 					立即支付
-        </button>
+				</button> -->
 				<!-- #endif -->
 				<!-- #ifdef MP-ALIPAY -->
-        <button
-          class="jz_OrderReNow"
-          @click="goZhifuAli"
-          v-if="showPayBtn"
-          :disabled="submit"
-        >
+				<!-- 		<button class="jz_OrderReNow" @click="goZhifuAli" v-if="showPayBtn" :disabled="submit">
 					立即支付
-        </button>
+				</button> -->
 				<!-- #endif -->
 			</view>
 		</view>
@@ -656,7 +556,7 @@
 </script>
 
 <script>
-export default {
+	export default {
 		components: {},
 		data() {
 			return {
@@ -692,8 +592,7 @@ export default {
 				//未付款-调用后台取消
 				if (this.orderData.model.OrderState == 2) {
 					this.apipost(
-          "sellorder_post_B2BRemoveOrder",
-          {
+						"sellorder_post_B2BRemoveOrder", {
 							ID: this.orderData.model.OrderId,
 						},
 						(res) => {
@@ -727,8 +626,7 @@ export default {
 								uni.navigateTo({
 									url: "/pages/jiuzhai/jz_MyOrder",
 								});
-            } else {
-            }
+							} else {}
 						},
 						null
 					);
@@ -796,7 +694,12 @@ export default {
 			goFukuan() {
 				if (this.submit || this.submitCancel) return;
 				var that = this;
-      var tempObj = uni.getStorageSync("basedata")?.mall?.wechatmessage ?? [];
+				var tempData = uni.getStorageSync("basedata");
+				var tempObj = [];
+				if (tempData && tempData.mall && tempData.mall.wechatmessage) {
+					tempObj = tempData.mall.wechatmessage;
+				}
+
 				var tmplIds = [];
 				if (tempObj && tempObj.length > 0) {
 					tempObj.forEach((x) => {
@@ -818,8 +721,7 @@ export default {
 				let url = "/api/WeChatPay/GetTravlePayInfo";
 				let GoodsName = this.orderData.model.Title;
 				GoodsName = GoodsName.slice(0, 10);
-      this.request2(
-        {
+				this.request2({
 						url: url,
 						data: {
 							OrderId: this.orderData.model.OrderId,
@@ -829,16 +731,16 @@ export default {
 						},
 					},
 					(res) => {
-			try{
+						try {
 							let orderInfo = JSON.parse(res.data);
 							console.log(orderInfo);
 							this.goPay(orderInfo);
-			}catch(e){
+						} catch (e) {
 							uni.showToast({
-					title:'无法正常拉取微信支付，你可以稍后重试或联系销售人员线下转款',
-					icon:'none'
+								title: '无法正常拉取微信支付，你可以稍后重试或联系销售人员线下转款',
+								icon: 'none'
 							})
-				setTimeout(()=>{
+							setTimeout(() => {
 								this.submit = false;
 							}, 2000);
 						}
@@ -855,7 +757,7 @@ export default {
 					package: orderInfo.package,
 					signType: orderInfo.signType,
 					paySign: orderInfo.sign,
-        success: function (res) {
+					success: function(res) {
 						console.log("success", res);
 						uni.showToast({
 							title: "支付成功",
@@ -864,7 +766,7 @@ export default {
 						//todo
 						that.initOrderInfo(that.orderData.model.OrderId);
 					},
-        fail: function (err) {
+					fail: function(err) {
 						console.log("fail:", err);
 						uni.showToast({
 							title: "支付失败",
@@ -886,8 +788,7 @@ export default {
 				});
 				let url = "/api/WeChatPay/GetTravlePayInfo";
 				let GoodsName = this.orderData.model.Title;
-      this.request2(
-        {
+				this.request2({
 						url: url,
 						data: {
 							OrderId: this.orderData.model.OrderId,
@@ -915,7 +816,7 @@ export default {
 				let that = this;
 				my.tradePay({
 					tradeNO: tradeNO,
-        success: function (res) {
+					success: function(res) {
 						console.log("success", res);
 						const list = ["9000"];
 						if (list.includes(res.resultCode)) {
@@ -934,7 +835,7 @@ export default {
 							});
 						}
 					},
-        fail: function (err) {
+					fail: function(err) {
 						console.log("fail:", err);
 						uni.hideLoading();
 						uni.showToast({
@@ -948,8 +849,7 @@ export default {
 			},
 			payAliCallback(obj) {
 				let that = this;
-      this.request2(
-        {
+				this.request2({
 						url: "/api/AliPay/ALiPayCallBackDmcNotify",
 						data: {
 							OrderNo: obj.OrderNo,
@@ -963,8 +863,7 @@ export default {
 					(res) => {
 						that.submit = false;
 						uni.redirectTo({
-            url:
-              "/pages/jiuzhai/paysuccess?PreferPrice=" +
+							url: "/pages/jiuzhai/paysuccess?PreferPrice=" +
 								obj.preferPrice +
 								"&isFrom=1",
 						});
@@ -984,5 +883,5 @@ export default {
 			},
 			// #endif
 		},
-};
+	};
 </script>