优化问题

pages/group_order/components/groupPrompt.vue

@@ -27,7 +27,7 @@
 			查看更多<u-icon name="arrow-down" color="#575B66" size="28"></u-icon>
 		</view>
 		<view class="More" v-else>
-			{{info.notice.usageRules}}
+			<u-parse :content="info.notice.usageRules"></u-parse>
 		</view>
 
 

pages/index/components/diamond.vue

@@ -52,7 +52,7 @@
 						uni.scanCode({
 							success: (res) => {
 								let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
-								uni.cache.set('tableCode', this.tableCode)
+								uni.cache.set('tableCode', tableCode)
 								if (tableCode) {
 									uni.pro.navigateTo('order_food/order_food', {
 										tableCode: tableCode,

pages/order/successful.vue

@@ -38,7 +38,7 @@
 					支付方式：
 				</view>
 				<view class="towcontentow_T">
-					微信支付
+					{{paytype==1?'微信支付':'余额支付'}}
 				</view>
 			</view>
 			<view class="towcontenthere flex-colum" v-if="orderinfo">
@@ -91,12 +91,15 @@
 				const hour = date.getHours(); // 获取小时
 				const minute = date.getMinutes(); // 获取分钟
 				const second = date.getSeconds(); // 获取秒数
-				const formattedDate = `${year}-${month}-${day} ${hour<10? '0'+hour:hour}:${minute<10? '0'+minute:minute}:${second<10? '0'+second:second}`; // 拼接成格式化后的日期字符串
+				const formattedDate =
+					`${year}-${month}-${day} ${hour<10? '0'+hour:hour}:${minute<10? '0'+minute:minute}:${second<10? '0'+second:second}`; // 拼接成格式化后的日期字符串
 				return formattedDate
 			}
 		},
+
 		data() {
 			return {
+				paytype: 1,
 				titlename: '支付详情',
 				orderId: "",
 				opacitys: false,
@@ -142,6 +145,8 @@
 			}
 		},
 		onLoad(e) {
+			console.log(e,'调试1')
+			this.paytype = e.radiovalue1
 			this.orderId = e.orderId
 			setTimeout(() => {
 				this.GetTop()

pages/order_detail/order_detail.vue

@@ -343,6 +343,7 @@
 		 
 			// 去结算
 			showpopupclick() {
+				console.log(1212121)
 				if (this.numValue == 0) {
 					let data = { //定义socket数据传参
 						"skuId": '',
@@ -400,7 +401,7 @@
 									uni.redirectTo({
 										url: '/pages/order/successful?orderId=' + this
 											.listinfoid + '&orderInfo=' + JSON.stringify(
-												this.orderInfo)
+												this.orderInfo) + '&payType' + this.radiovalue1
 									});
 								}, 1000)
 								// uni.redirectTo({
@@ -457,7 +458,7 @@
 								uni.redirectTo({
 									url: '/pages/order/successful?orderId=' + this
 										.listinfoid + '&orderInfo=' + JSON.stringify(
-											this.orderInfo)
+											this.orderInfo)+ '&radiovalue1=' + this.radiovalue1
 								});
 							}, 1000)
 

pages/product/placeOrder.vue

@@ -160,8 +160,7 @@
 							setTimeout(res => {
 								uni.redirectTo({
 									url: '/pages/order/successful?orderId=' + this
-										.listinfoid.id + '&orderInfo=' + JSON.stringify(
-											orderInfo)
+										.listinfoid.id + '&orderInfo=' + JSON.stringify(orderInfo)+'&radiovalue1=' + this.radiovalue1
 								});
 							}, 1000)
 						}