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

# Conflicts:
#	pages/jiuzhai/jz_Reserve.vue

pages/jiuzhai/jz_SureOrder.vue

@@ -549,8 +549,7 @@
 					style="background: #fff; color: #111; border: 1px solid #111"
 					:disabled="submitCancel"
 					:loading="submitCancel">
-						<text v-if="!submitCancel">取消</text>
-						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
+						取消
 					</button>
 					<button class="jz_OrderReNow" 
 					style="margin-left: 20rpx;" 
@@ -563,8 +562,9 @@
 					style="background: #fff; color: #111; border: 1px solid #111"
 					:disabled="submitCancel"
 					:loading="submitCancel">
-						<text v-if="!submitCancel">取消</text>
-						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
+						取消
+						<!-- <text v-if="!submitCancel">取消</text>
+						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading> -->
 					</button>
 				<!-- #endif -->
 				<!-- 返回上一页 -->

pages/visa/visa_SureOrder.vue

@@ -517,8 +517,7 @@
 					style="background: #fff; color: #111; border: 1px solid #111"
 					:disabled="submitCancel"
 					:loading="submitCancel">
-						<text v-if="!submitCancel">取消</text>
-						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
+						取消
 					</button>
 					<button class="jz_OrderReNow" 
 					style="margin-left: 20rpx;" 
@@ -531,8 +530,9 @@
 					style="background: #fff; color: #111; border: 1px solid #111"
 					:disabled="submitCancel"
 					:loading="submitCancel">
-						<text v-if="!submitCancel">取消</text>
-						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
+						取消
+						<!-- <text v-if="!submitCancel"></text>
+						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading> -->
 					</button>
 				<!-- #endif -->
 				<!-- 返回上一页 -->
@@ -655,6 +655,10 @@
 			getOrderInfoHandler(OrderNo){
 				this.apipost("GetDetailsByOrderNo_post",{OrderNo},res=>{
 					if(res.resultCode==1){
+						this.orderData = {
+							...res.data
+						}
+						console.log(this.orderData,'---111111')
 						this.initOrderInfo(res.data.ErpOrderId);
 						this.formatStatus(
 							res.data.OrderStatus,
@@ -721,7 +725,8 @@
 			goCancelZK() {
 				if (this.submit || this.submitCancel) return;
 				this.submitCancel = true;
-				if (this.orderData.model.OrderState == 2) {
+				if (this.orderData.OrderStatus == 1) {
+					
 					this.apipost(
 						"GetCancelOrder_post", {
 							OrderNo: this.OrderNo
@@ -764,7 +769,15 @@
 					msg,
 					(res) => {
 						if (res.resultCode == 1) {
-							this.orderData = res.data;
+							this.orderData = {
+								...this.orderData,
+								OrderModel:{ 
+									...res.data.OrderModel
+								},
+								ProductModel:{ 
+									...res.data.ProductModel
+								}
+							}
 							// #ifdef MP-AG
 								this.formatStatus(
 									this.orderData.OrderModel.VisaOrderStatus,