diff --git a/App.vue b/App.vue index bafa876..184d70e 100644 --- a/App.vue +++ b/App.vue @@ -61,8 +61,8 @@ openId: '', test: '', // baseUrl: "http://192.168.3.32:80", - baseUrl: "http://192.168.1.106:80", - // baseUrl: "http://47.104.224.41:80",//测试环境 + // baseUrl: "http://192.168.1.106:80", + baseUrl: "http://47.104.224.41:80",//测试环境 imgPrefix: "http://47.104.224.41:9000/etriphome/appresource/image/", //图片资源 }, methods: { diff --git a/pages/pages_zhentou/form/form.vue b/pages/pages_zhentou/form/form.vue index e11a67b..87acbff 100644 --- a/pages/pages_zhentou/form/form.vue +++ b/pages/pages_zhentou/form/form.vue @@ -915,24 +915,30 @@ border-color: rgb(255, 255, 255); border-width: 0rpx; box-shadow: rgba(0, 0, 0, 0.2) 0px 0px 1px; - margin-top: 64rpx; - margin-bottom: 64rpx; + margin: 40rpx auto; } .button_box{ - width: 100%; + width: 484rpx; height: 60rpx; display: flex; align-self: center; justify-content: space-between; - // padding: 0 60rpx; + padding: 0 100rpx; .button{ width: 100rpx; height: 60rpx; - background: red; + background: #fff; display: flex; align-items: center; justify-content: center; + line-height: 60rpx; + font-size: 26rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + border-radius: 20rpx; + border: 1rpx solid #A5A5A5; // margin: 0 60rpx; } } diff --git a/pages/pages_zhentou/order/checkOrder.vue b/pages/pages_zhentou/order/checkOrder.vue index 023ca00..de31e69 100644 --- a/pages/pages_zhentou/order/checkOrder.vue +++ b/pages/pages_zhentou/order/checkOrder.vue @@ -243,7 +243,11 @@ }); }, // 点击再次定制按钮,跳转到提交订单页面 - clickCustom(){}, + clickCustom(){ + uni.navigateTo({ + url: '/pages/pages_zhentou/order/confirmOrder' + }) + }, // 完善定制信息,跳转表单页面 handleInfo(){ uni.navigateTo({ diff --git a/pages/pages_zhentou/order/confirmOrder.vue b/pages/pages_zhentou/order/confirmOrder.vue index bcb182e..1d278b5 100644 --- a/pages/pages_zhentou/order/confirmOrder.vue +++ b/pages/pages_zhentou/order/confirmOrder.vue @@ -220,7 +220,7 @@ }) setTimeout(() => { uni.redirectTo({ - url: '/pages/pages_zhentou/form/form?id=' + orderInfo.id + '&num=' + this.orderInfo.goodsNum + url: '/pages/pages_zhentou/form/form?orderNo=' + orderInfo.orderNo + '&orderNum=' + this.orderInfo.goodsNum }) }, 2000) } else { diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue index e161313..ae9e44f 100644 --- a/pages/pages_zhentou/order/order.vue +++ b/pages/pages_zhentou/order/order.vue @@ -54,7 +54,7 @@
立即支付
完善定制信息
删除订单
-再次定制
+再次定制
@@ -90,6 +90,12 @@ } }, methods: { + // 点击再次定制按钮,跳转到提交订单页面 + clickCustom(){ + uni.navigateTo({ + url: '/pages/pages_zhentou/order/confirmOrder' + }) + }, //支付成功回调 doPaySuccess(orderNo) { uni.request({