1.优化合并2.0问题

pages/tabBar/home/home.vue

@@ -32,7 +32,7 @@
 			</view>
 		</view>
 		<view  v-if="isdisplay">
-			<image :src="imagewxUrl+imgadres5" class="width40w mart90" mode="widthFix"></image>
+			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
 		</view>
 
 		<!-- 顶部菜单 -->

pages/tabBar/user/user.vue

@@ -345,16 +345,16 @@
 			},
 			//查询订单列表
 			getUserOrderList() {
-				uni.showLoading({
-					title: '加载中...'
-				})
+				// uni.showLoading({
+				// 	title: '加载中...'
+				// })
 				let params = {
 					status: 1,
 					pageNum: 1,
 					pageSize: 5
 				}
 				getUserOrderList(params).then(res => {
-					uni.hideLoading();
+					// uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.list != '') {
 						this.nopaylist = res.return_data.list;
 						this.timesettime(res.return_data.list[0].createTime);

pages/user/news/news.vue

@@ -100,6 +100,8 @@
 			// #ifdef H5
 			this.headerTop = '44px';
 			// #endif
+		},
+		onShow() {
 			this.getDictionaryByCodeType();
 		},
 		methods: {

pages/user/order_details/order_details.vue

@@ -7,7 +7,7 @@
 				{{countdownm}}:{{countdowns}}
 			</view>
 			<view class="width100  font13 fcor666 mart10">若超时未支付,订单将自动取消</view>
-			<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="jumppay()">立即支付
+			<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="toPay()">立即支付
 			</view>
 		</view>
 		<view class="width100 headsbg paddbotm15" v-if="recinfo.orderStatus != 1">
@@ -718,11 +718,15 @@
 				} else {
 					payTypes = 2;
 				}
+				// uni.redirectTo({
+				// 	url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
+				// 		'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
+				// 		.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
+				// 		'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
+				// })
 				uni.redirectTo({
-					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
-						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
-						.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
-						'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
+					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.id + '&amount=' + this.recinfo
+						.payPrice + '&productType=' + this.recinfo.productType
 				})
 			},
 		}

qianzhu-KFC/confirmOrder/confirmOrder.vue

@@ -891,7 +891,6 @@
 							"memDiscountId": this.memDiscountId,
 							"payPwd": this.PaymentPassword
 						}
-						console.log('======'+JSON.stringify(datas));
 					}
 					if (this.typeid == 2) {
 						datas = {

uni.scss

@@ -413,6 +413,11 @@ $uni-font-size-paragraph:30upx;
   margin-left: 3%;
 }
 
+.widthw30 {
+  width: 30%;
+  margin-left: 35%;
+}
+
 .width31{
 	width: 31%;
 	margin-right: auto;
@@ -603,6 +608,9 @@ $uni-font-size-paragraph:30upx;
 .mart90 {
   margin-top: 90px;
 }
+.mart110 {
+  margin-top: 110px;
+}
 
 .mart80{
 	margin-top: 80px;