文字修改

components/buyKnow.vue

@@ -39,8 +39,8 @@
 					<!-- <view class="middle-list" style="border-bottom: none;" v-if="buyKnowData.merchantId!='z0015605022691a5945bbe463141668c'"> -->
 					<view class="middle-list" style="border-bottom: none;">
 						<view class="middle-title">
-							<text v-if="buyKnowData.backChangeRule == 0">不可退换</text>
-							<text v-if="buyKnowData.backChangeRule == 1">条件退</text>
+							<text v-if="buyKnowData.backChangeRule == 0">不可退</text>
+							<text v-if="buyKnowData.backChangeRule == 1">有条件退</text>
 							<text v-if="buyKnowData.backChangeRule == 2">随时可退</text>
 						</view>
 						<view v-if="buyKnowData.productRefundRuleVo&&buyKnowData.productRefundRuleVo.refundType== 1">

manifest.json

@@ -74,7 +74,8 @@
         "uniStatistics" : {
             "enable" : false
         },
-        "requiredPrivateInfos" : [ "getLocation" ]
+        "requiredPrivateInfos" : [ "getLocation" ],
+        "embeddedAppIdList" : [ "wx882fabc8844b5363", "wx888e5ed62eb274db" ] //第一个途比达，第二个长江索道
     },
     "mp-alipay" : {
         "usingComponents" : true,

pages/combination/combiChoose/combiChoose.vue

@@ -57,15 +57,15 @@
 													<text class="product-rule" v-if="items.productRefundRuleVo">
 														<!-- 索道写死 -->
 														<!-- <text v-if="item.id== 'z0015605022691a5945bbe463141668c'">
-															条件退
+															有条件退
 														</text>
 														<template v-else>
 															<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
-															<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
+															<text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text>
 															<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 														</template> -->
 														<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
-														<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text>
 														<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 													</text>
 													<text class="product-rule"> 无需取票 </text>

pages/indexs/center/center.vue

@@ -184,6 +184,23 @@ export default {
         }
       })
     },
+    aaa(){
+      uni.openEmbeddedMiniProgram({
+			  appId: 'wx882fabc8844b5363', // 目标小程序的appid
+			  path: 'pages/orders/orders', // 打开的页面路径，可选
+			  extraData: { // 需要传递给目标小程序的数据，可选
+			    orderId: 'z001715240555636905c358cf6758baa'
+			  },
+			  success: (res) => {
+			    // 打开成功的回调
+			    console.log('打开嵌入的小程序成功', res)
+			  },
+			  fail: (err) => {
+			    // 打开失败的回调
+			    console.error('打开嵌入的小程序失败', err)
+			  }
+      })
+    },
     //---跳转到订单列表
     goOrderlist(orderStatus){
       uni.navigateTo({

pages/scenic/combinationProduct/combinationProduct.vue

@@ -55,7 +55,7 @@
 												<view style="font-size: 24rpx;display: flex;">
 													<text class="product-rule" v-if="items.productRefundRuleVo">
 														<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
-														<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text>
 														<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 													</text>
 

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -19,15 +19,15 @@
 							<view>
 								<!-- 索道写死 -->
 								<!-- <text v-if="item.merchantId=='z0015605022691a5945bbe463141668c'">
-									条件退
+									有条件退
 								</text>
 								<template v-else>
-									<text v-if="item.backChangeRule == 0">不可退换</text>
-									<text v-if="item.backChangeRule == 1">条件退</text>
+									<text v-if="item.backChangeRule == 0">不可退</text>
+									<text v-if="item.backChangeRule == 1">有条件退</text>
 									<text v-if="item.backChangeRule == 2">随时可退</text>
 								</template> -->
-								<text v-if="item.backChangeRule == 0">不可退换</text>
-								<text v-if="item.backChangeRule == 1">条件退</text>
+								<text v-if="item.backChangeRule == 0">不可退</text>
+								<text v-if="item.backChangeRule == 1">有条件退</text>
 								<text v-if="item.backChangeRule == 2">随时可退</text>
 								<text v-if="item.isFetch == 1" style="margin-left: 10rpx;">无需取号</text>
 							</view>

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -18,15 +18,15 @@
 						<view>
 							<!-- 索道写死 -->
 							<!-- <text v-if="merchantId=='z0015605022691a5945bbe463141668c'">
-								条件退
+								有条件退
 							</text>
 							<template v-else>
-								<text v-if="productIfo.backChangeRule == 0">不可退换</text>
-								<text v-if="productIfo.backChangeRule == 1">条件退</text>
+								<text v-if="productIfo.backChangeRule == 0">不可退</text>
+								<text v-if="productIfo.backChangeRule == 1">有条件退</text>
 								<text v-if="productIfo.backChangeRule == 2">随时可退</text>
 							</template> -->
-							<text v-if="productIfo.backChangeRule == 0">不可退换</text>
-							<text v-if="productIfo.backChangeRule == 1">条件退</text>
+							<text v-if="productIfo.backChangeRule == 0">不可退</text>
+							<text v-if="productIfo.backChangeRule == 1">有条件退</text>
 							<text v-if="productIfo.backChangeRule == 2">随时可退</text>
 							<text v-if="productIfo.isFetch == 1" style="margin-left: 10rpx;">无需取号</text>
 						</view>