diff --git a/common/css/page.css b/common/css/page.css index 1e479350..4f91f9d9 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -1591,4 +1591,13 @@ button[disabled].bg-grey { */ .top-search-width { width: calc(100% - 250rpx) !important; +} + +/** + * 小程序端距离顶部位置的控制 + */ +.weixin-nav-padding-top { + /* #ifdef MP-WEIXIN */ + padding-top: calc(var(--status-bar-height) + 5px); + /* #endif */ } \ No newline at end of file diff --git a/components/nav-more/nav-more.vue b/components/nav-more/nav-more.vue index 68efcb38..c14ee324 100644 --- a/components/nav-more/nav-more.vue +++ b/components/nav-more/nav-more.vue @@ -34,6 +34,7 @@ return []; }, }, + // 顶部定位的距离 propTop: { type: String, default: '', diff --git a/components/payment/payment.vue b/components/payment/payment.vue index e75d0e74..e191b925 100644 --- a/components/payment/payment.vue +++ b/components/payment/payment.vue @@ -124,7 +124,7 @@ }, }, // 支付失败跳转页面 - propTofailPage: { + propToFailPage: { type: String, default: '', }, @@ -282,6 +282,7 @@ // 现金支付 uni.showModal({ content: res.data.msg, + showCancel: false, success(res) { if (res.confirm) { // 跳转订单列表页 @@ -309,13 +310,13 @@ popup_view_pay_html_is_show: true, }); } else { - app.globalData.showToast(res.data.msg); + this.order_item_pay_fail_handle(res.data.data, order_id, res.data.msg); } } }, - fail: () => { + fail: (res) => { uni.hideLoading(); - app.globalData.showToast('服务器请求出错'); + this.order_item_pay_fail_handle(res.data.data, order_id, '服务器请求出错'); }, }); } else { @@ -332,8 +333,7 @@ self.order_item_pay_success_handle(data, order_id); }, fail: (res) => { - app.globalData.showToast('支付失败'); - self.order_item_pay_fail_handle(data, order_id); + self.order_item_pay_fail_handle(data, order_id, '支付失败'); }, }); }, @@ -359,13 +359,13 @@ success: (res) => { // #ifdef MP-ALIPAY if (res.resultCode != 9000) { - app.globalData.showToast(res.memo || '支付失败'); + self.order_item_pay_fail_handle(data, order_id, res.memo || '支付失败'); return false; } // #endif // #ifdef MP-TOUTIAO if (res.code != 0) { - app.globalData.showToast('支付失败'); + self.order_item_pay_fail_handle(data, order_id, '支付失败'); return false; } // #endif @@ -373,8 +373,7 @@ self.order_item_pay_success_handle(data, order_id); }, fail: (res) => { - app.globalData.showToast('支付失败'); - self.order_item_pay_fail_handle(data, order_id); + self.order_item_pay_fail_handle(data, order_id, '支付失败'); }, }); }, @@ -394,7 +393,7 @@ this.$emit('reset-event'); }, fail: function (res) { - app.globalData.showToast('支付失败'); + self.order_item_pay_fail_handle(data, order_id, '支付失败'); }, }); } else { @@ -428,7 +427,7 @@ // 数据设置 self.order_item_pay_success_handle(data, order_id); } else { - self.order_item_pay_fail_handle(data, order_id); + self.order_item_pay_fail_handle(data, order_id, res.err_msg); } } ); @@ -483,8 +482,7 @@ }, fail: () => { clearInterval(self.popup_view_pay_timer); - app.globalData.showToast('服务器请求出错'); - self.order_item_pay_fail_handle(data, order_id); + self.order_item_pay_fail_handle(data, order_id, '服务器请求出错'); }, }); }, 3000); @@ -511,7 +509,7 @@ } } }, - // 支付成功数据设置 bool:成功是否需要跳转页面 + // 支付成功数据设置 data:后台返回的参数, order_id: 订单id,is_to_page,是否需要跳转页面的参数控制 order_item_pay_success_handle(data, order_id, is_to_page = true) { let newData = { data: data, @@ -523,18 +521,18 @@ this.to_success_page_event(); } }, - // 支付失败数据设置 bool:失败是否需要跳转页面 - order_item_pay_fail_handle(data, order_id) { + // 支付失败数据设置 data:后台返回的参数, order_id: 订单id, msg: 错误提示信息 + order_item_pay_fail_handle(data, order_id, msg) { let newData = { data: data, order_id: order_id, - is_to_page: is_to_page, temp_pay_index: this.propTempPayIndex, payment_id: this.propPaymentId, }; this.$emit('pay-fail', newData); - this.to_fail_page_event(); + this.to_fail_page_event(msg); }, + // 成功跳转 to_success_page_event() { let url_data = { code: '9000', @@ -552,12 +550,34 @@ }); } }, - to_fail_page_event() { - if (this.propTofailPage) { - // 跳转支付页面 - uni.navigateTo({ - url: this.propTofailPage + '?data=' + data.order_id, - }); + // 失败跳转 + to_fail_page_event(msg) { + let to_fail_page = this.propToFailPage; + if (to_fail_page) { + if (msg) { + // 现金支付 + uni.showModal({ + content: msg, + showCancel: false, + success(res) { + if (res.confirm) { + // 跳转支付页面 + uni.redirectTo({ + url: to_fail_page, + }); + } + }, + }); + } else { + // 跳转支付页面 + uni.redirectTo({ + url: to_fail_page, + }); + } + } else { + if (msg) { + app.globalData.showToast(msg); + } } }, // 页面卸载 @@ -569,6 +589,7 @@ this.setData({ popup_view_pay_html_is_show: false, }); + this.to_fail_page_event(); }, }, }; diff --git a/components/popup/popup.vue b/components/popup/popup.vue index bdbf2a7c..6db37842 100644 --- a/components/popup/popup.vue +++ b/components/popup/popup.vue @@ -1,6 +1,6 @@ diff --git a/pages.json b/pages.json index 1975f05a..70b4d09a 100644 --- a/pages.json +++ b/pages.json @@ -701,20 +701,6 @@ "navigationBarTitleText": "签到" } }, - // { - // "path": "user-signin/user-signin", - // "style": { - // "enablePullDownRefresh": true, - // "navigationBarTitleText": "我的签到" - // } - // }, - // { - // "path": "user-qrcode/user-qrcode", - // "style": { - // "enablePullDownRefresh": true, - // "navigationBarTitleText": "签到码管理" - // } - // }, { "path": "user-qrcode-detail/user-qrcode-detail", "style": { diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 207ca5b2..fead5f6b 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -326,7 +326,7 @@ page: 'user-order/user-order', }, // 支付失败跳转的页面 - to_fail_page: 'page/user-order/user-order', + to_fail_page: '/pages/user-order/user-order', }; }, @@ -647,10 +647,10 @@ this.buy_submit_response_handle(res.data.data); } else { app.globalData.showToast(res.data.msg); - this.setData({ - buy_submit_disabled_status: false, - }); } + this.setData({ + buy_submit_disabled_status: false, + }); }, fail: () => { uni.hideLoading(); diff --git a/pages/index/index.css b/pages/index/index.css index edafc78c..90c62c40 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -83,6 +83,13 @@ /* #endif */ } +.search-content-animation { + transition: all 0.2s ease; + /* #ifdef MP-WEIXIN */ + transition: all 1s linear; + /* #endif */ +} + /* #ifdef H5 || MP-TOUTIAO || APP */ .search-content-fixed .nav-top-right-icon { top: 9px !important; diff --git a/pages/index/index.vue b/pages/index/index.vue index 9be453c1..a12cf559 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -17,14 +17,13 @@ - + - + - @@ -541,8 +540,8 @@ // 页面滚动监听 onPageScroll(e) { if (this.common_app_is_header_nav_fixed == 1 && this.common_app_is_enable_search == 1) { - var top = e.scrollTop > 35 ? 35 : e.scrollTop; - var num = top * 7; + var top = e.scrollTop > 42 ? 42 : e.scrollTop; + var num = top; var base = 230; // #ifdef MP-ALIPAY base = 235; @@ -553,14 +552,21 @@ // #endif // 开启哀悼插件的时候不需要浮动导航并且搜索框也不需要缩短、开启站点灰度会导致浮动失效 if (!this.plugins_mourning_data_is_app) { - var top_val = 35; - var val = num > base ? base : num; + var top_val = 42; + var val = num * 6 > base ? base : num * 6; // #ifdef MP-TOUTIAO top_val = 0; val = base; // #endif + console.log('num', num); + // console.log('base', base); this.setData({ + // #ifdef H5 || MP-TOUTIAO || APP search_style: 'width: calc(100% - ' + (val < 0 ? 0 : val) + 'rpx);', + // #endif + // #ifdef MP-WEIXIN + search_style: 'width: calc(100% - ' + (e.scrollTop > 200 ? 200 : e.scrollTop) + 'px);', + // #endif search_is_fixed: top >= top_val ? 1 : 0, }); } diff --git a/pages/plugins/answers/detail/detail.vue b/pages/plugins/answers/detail/detail.vue index 277052aa..4bc02d5e 100644 --- a/pages/plugins/answers/detail/detail.vue +++ b/pages/plugins/answers/detail/detail.vue @@ -1,69 +1,63 @@ diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue index 9a3d8d22..082ac351 100644 --- a/pages/plugins/coupon/index/index.vue +++ b/pages/plugins/coupon/index/index.vue @@ -1,24 +1,22 @@