diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 0654cc7..4907376 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -32,7 +32,7 @@
-
+
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 6d15a40..e4414ad 100644
--- a/pages/tabBar/user/user.vue
+++ b/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);
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 9155efb..30ae517 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -100,7 +100,9 @@
// #ifdef H5
this.headerTop = '44px';
// #endif
- this.getDictionaryByCodeType();
+ },
+ onShow() {
+ this.getDictionaryByCodeType();
},
methods: {
//查询类型
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index 1f19247..a8c5b46 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -7,7 +7,7 @@
{{countdownm}}:{{countdowns}}
若超时未支付,订单将自动取消
- 立即支付
+ 立即支付
@@ -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
+ // })
+ uni.redirectTo({
+ url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.id + '&amount=' + this.recinfo
+ .payPrice + '&productType=' + this.recinfo.productType
})
},
}
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index b3eb45a..4051a2b 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/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 = {
diff --git a/uni.scss b/uni.scss
index 3ea7c4d..f36e81f 100644
--- a/uni.scss
+++ b/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;
@@ -602,6 +607,9 @@ $uni-font-size-paragraph:30upx;
}
.mart90 {
margin-top: 90px;
+}
+.mart110 {
+ margin-top: 110px;
}
.mart80{