From ff796ea2013e37c87f4e6e8d3ea8e917173b3627 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 7 Jul 2026 00:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=85=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BD=BF=E7=94=A8=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/about/about.vue | 3 + pages/article-category/article-category.vue | 571 +-- pages/article-detail/article-detail.vue | 324 +- pages/buy/buy.vue | 3 + pages/cart-page/cart-page.vue | 3 + pages/cart/cart.vue | 3 + pages/cashier/cashier.vue | 4 +- .../open-setting-location.vue | 283 +- pages/customview/customview.vue | 293 +- pages/design/design.vue | 357 +- pages/diy/diy.vue | 5 +- pages/error/error.vue | 3 + .../extraction-address/extraction-address.vue | 513 +-- .../form-input-data-detail.vue | 233 +- pages/form-input-data/form-input-data.vue | 3 + pages/form-input/form-input.vue | 8 +- pages/form-input/form-preview.vue | 7 +- pages/goods-category/goods-category.vue | 3 + pages/goods-comment/goods-comment.vue | 601 +-- pages/goods-detail/goods-detail.vue | 4 +- .../goods-search-start/goods-search-start.vue | 4 +- pages/goods-search/goods-search.vue | 1626 ++++---- pages/index/index.vue | 3 + pages/login/login.vue | 3 + pages/logout/logout.vue | 3 + pages/message/message.vue | 381 +- pages/password/password.vue | 3 + pages/paylog-detail/paylog-detail.vue | 221 +- pages/paylog-list/paylog-list.vue | 221 +- pages/paytips/paytips.vue | 243 +- pages/personal/personal.vue | 3 + pages/plugins/activity/detail/detail.vue | 387 +- pages/plugins/activity/index/index.vue | 575 +-- pages/plugins/antifakecode/index/index.vue | 5 +- pages/plugins/ask/comments/comments.vue | 261 +- pages/plugins/ask/detail/detail.vue | 6 +- pages/plugins/ask/form/form.vue | 3 + pages/plugins/ask/goods-list/goods-list.vue | 3 + pages/plugins/ask/index/index.vue | 6 +- pages/plugins/ask/user-detail/user-detail.vue | 3 + pages/plugins/ask/user-list/user-list.vue | 3 + pages/plugins/bargain/detail/detail.vue | 4 +- pages/plugins/bargain/index/index.vue | 3 + pages/plugins/bargain/order/order.vue | 6 +- pages/plugins/bargain/team/team.vue | 6 +- pages/plugins/binding/detail/detail.vue | 5 +- pages/plugins/binding/index/index.vue | 571 +-- pages/plugins/blog/comments/comments.vue | 261 +- pages/plugins/blog/detail/detail.vue | 484 +-- pages/plugins/blog/form/form.vue | 3 + pages/plugins/blog/index/index.vue | 3 + pages/plugins/blog/search/search.vue | 664 +-- pages/plugins/blog/user-list/user-list.vue | 3 + pages/plugins/brand/index/index.vue | 5 +- .../userauth-detail/userauth-detail.vue | 231 +- .../userauth-saveinfo/userauth-saveinfo.vue | 3 + .../plugins/certificate/userauth/userauth.vue | 3 + pages/plugins/coin/cash-list/cash-list.vue | 3 + pages/plugins/coin/cash/cash.vue | 3 + pages/plugins/coin/collection/collection.vue | 3 + .../coin/convert-list/convert-list.vue | 3 + pages/plugins/coin/convert/convert.vue | 3 + pages/plugins/coin/detail/detail.vue | 3 + .../coin/recharge-list/recharge-list.vue | 3 + .../coin/recharge-pay/recharge-pay.vue | 3 + pages/plugins/coin/recharge/recharge.vue | 3 + .../transaction-list/transaction-list.vue | 3 + .../coin/transfer-list/transfer-list.vue | 3 + pages/plugins/coin/transfer/transfer.vue | 3 + pages/plugins/coin/user/user.vue | 3 + pages/plugins/complaint/form/form.vue | 5 +- pages/plugins/complaint/user/user.vue | 578 +-- pages/plugins/coupon/detail/detail.vue | 391 +- pages/plugins/coupon/index/index.vue | 443 +- pages/plugins/coupon/shop/shop.vue | 423 +- pages/plugins/coupon/user/user.vue | 397 +- .../plugins/delivery/logistics/logistics.vue | 3 + .../delivery/order-detail/order-detail.vue | 3 + pages/plugins/delivery/order/order.vue | 3 + .../extraction-apply/extraction-apply.vue | 3 + .../extraction-order/extraction-order.vue | 813 ++-- .../extraction-switch/extraction-switch.vue | 601 +-- .../distribution/extraction/extraction.vue | 485 +-- .../distribution/introduce/introduce.vue | 357 +- pages/plugins/distribution/map/map.vue | 3 + .../order-detail/order-detail.vue | 3 + pages/plugins/distribution/order/order.vue | 553 +-- pages/plugins/distribution/poster/poster.vue | 453 +- .../profit-detail/profit-detail.vue | 283 +- pages/plugins/distribution/profit/profit.vue | 517 +-- .../promotion-order/promotion-order.vue | 545 +-- .../promotion-user/promotion-user.vue | 613 +-- .../recommend-detail/recommend-detail.vue | 3 + .../recommend-form/recommend-form.vue | 3 + .../recommend-list/recommend-list.vue | 3 + pages/plugins/distribution/team/team.vue | 745 ++-- pages/plugins/distribution/user/user.vue | 3 + .../distribution/visit-form/visit-form.vue | 3 + .../distribution/visit-list/visit-list.vue | 3 + .../profit-detail/profit-detail.vue | 287 +- .../profit/profit.vue | 629 +-- .../exchangerate/currency/currency.vue | 375 +- pages/plugins/express/detail/detail.vue | 333 +- pages/plugins/form/check/check.vue | 3 + pages/plugins/friendpay/pay/index.vue | 4 +- pages/plugins/friendpay/pay/success.vue | 4 +- pages/plugins/friendpay/share/detail.vue | 4 +- pages/plugins/friendpay/share/list.vue | 6 +- pages/plugins/friendpay/share/share.vue | 5 +- pages/plugins/giftcard/form/form.vue | 3 + pages/plugins/giftcard/index/index.vue | 545 +-- pages/plugins/givegift/code/code.vue | 594 +-- .../givegift/gift-detail/gift-detail.vue | 231 +- pages/plugins/givegift/gift/gift.vue | 6 +- pages/plugins/givegift/goods/goods.vue | 5 +- pages/plugins/givegift/receive/receive.vue | 5 +- pages/plugins/goodscompare/index/index.vue | 198 +- pages/plugins/groupbuy/detail/detail.vue | 4 +- pages/plugins/groupbuy/index/index.vue | 3 + pages/plugins/groupbuy/order/order.vue | 6 +- pages/plugins/groupbuy/team/team.vue | 4 +- .../hospital/patient-list/patient-list.vue | 3 + pages/plugins/hospital/patient/patient.vue | 3 + .../hospital/prescription/prescription.vue | 3 + .../goods-comments/goods-comments.vue | 3 + pages/plugins/invoice/business/business.vue | 3 + .../invoice/invoice-detail/invoice-detail.vue | 261 +- .../invoice-saveinfo/invoice-saveinfo.vue | 3 + pages/plugins/invoice/invoice/invoice.vue | 3 + pages/plugins/invoice/order/order.vue | 3 + pages/plugins/label/detail/detail.vue | 707 ++-- pages/plugins/live/index/index.vue | 3 + .../live/search-record/search-record.vue | 3 + pages/plugins/live/search/search.vue | 3 + pages/plugins/lottery/egg/egg.vue | 3 + pages/plugins/lottery/grid/grid.vue | 3 + pages/plugins/lottery/record/record.vue | 3 + pages/plugins/lottery/turn/turn.vue | 3 + pages/plugins/magic/detail/detail.vue | 5 +- pages/plugins/orderfeed/form/form.vue | 5 +- pages/plugins/orderfeed/user/user.vue | 578 +-- pages/plugins/ordergoodsform/order/order.vue | 311 +- .../orderresources/orderannex/orderannex.vue | 127 +- pages/plugins/points/index/index.vue | 721 ++-- pages/plugins/points/scan/scan.vue | 5 +- pages/plugins/points/search/search.vue | 5 +- pages/plugins/presale/buy/buy.vue | 3 + pages/plugins/presale/index/index.vue | 375 +- pages/plugins/presale/order/order.vue | 3 + .../batchorder-list/batchorder-list.vue | 3 + pages/plugins/realstore/check/check.vue | 3 + pages/plugins/realstore/detail/detail.vue | 4 +- pages/plugins/realstore/favor/favor.vue | 3 + .../frequencycard-list/frequencycard-list.vue | 3 + .../frequencycard-used/frequencycard-used.vue | 3 + pages/plugins/realstore/index/index.vue | 3 + .../orderallot-detail/orderallot-detail.vue | 631 +-- .../orderallot-list/orderallot-list.vue | 6 +- pages/plugins/realstore/search/search.vue | 6 +- .../realstore/staff-detail/staff-detail.vue | 6 +- .../realstore/staff-list/staff-list.vue | 6 +- pages/plugins/scanpay/index/index.vue | 5 +- pages/plugins/scanpay/tips/tips.vue | 3 + pages/plugins/seckill/index/index.vue | 621 +-- pages/plugins/shop/check/check.vue | 3 + pages/plugins/shop/design/design.vue | 19 +- pages/plugins/shop/detail/detail.vue | 4 +- pages/plugins/shop/diy/diy.vue | 5 +- pages/plugins/shop/favor/favor.vue | 3 + pages/plugins/shop/index/index.vue | 6 +- pages/plugins/shop/license/cert.vue | 257 +- pages/plugins/shop/license/license.vue | 259 +- pages/plugins/shop/search/search.vue | 1033 ++--- pages/plugins/signin/detail/detail.vue | 949 ++--- .../user-coming-list/user-coming-list.vue | 441 +- .../user-qrcode-detail/user-qrcode-detail.vue | 3 + .../user-qrcode-saveinfo.vue | 3 + pages/plugins/signin/user/user.vue | 347 +- pages/plugins/thirdpartylogin/index/index.vue | 3 + pages/plugins/video/detail/detail.nvue | 5 +- pages/plugins/video/detail/detail.vue | 3635 +++++++++-------- pages/plugins/video/index/index.vue | 3 + .../video/search-record/search-record.vue | 3 + pages/plugins/video/search/search.vue | 4 +- pages/plugins/vip/buy/buy.vue | 3 + pages/plugins/vip/index/index.vue | 3 + pages/plugins/vip/member-code/member-code.vue | 3 + .../plugins/vip/order-detail/order-detail.vue | 3 + pages/plugins/vip/order/order.vue | 3 + pages/plugins/vip/poster/poster.vue | 3 + .../vip/profit-detail/profit-detail.vue | 3 + pages/plugins/vip/profit/profit.vue | 3 + pages/plugins/vip/team/team.vue | 3 + pages/plugins/vip/user/user.vue | 3 + pages/plugins/wallet/cash-auth/cash-auth.vue | 3 + .../wallet/cash-create/cash-create.vue | 3 + .../integral-to-balance.vue | 3 + .../wallet/payment-code/payment-code.vue | 3 + pages/plugins/wallet/recharge/recharge.vue | 585 +-- pages/plugins/wallet/transfer/transfer.vue | 3 + .../user-cash-detail/user-cash-detail.vue | 285 +- .../user-recharge-detail.vue | 273 +- .../user-transfer-detail.vue | 271 +- pages/plugins/wallet/user/user.vue | 637 +-- .../wallet-log-detail/wallet-log-detail.vue | 275 +- .../weixinliveplayer/detail/detail.vue | 501 +-- .../plugins/weixinliveplayer/index/index.vue | 419 +- .../weixinliveplayer/search/search.vue | 3 + pages/setup/setup.vue | 3 + pages/user-address-save/user-address-save.vue | 3 + pages/user-address/user-address.vue | 3 + pages/user-favor/user-favor.vue | 673 +-- pages/user-goods-browse/user-goods-browse.vue | 743 ++-- .../user-goods-comments-form.vue | 3 + .../user-goods-comments.vue | 3 + pages/user-integral/user-integral.vue | 527 +-- .../user-order-comments.vue | 3 + pages/user-order-detail/user-order-detail.vue | 3 + pages/user-order/user-order.vue | 6 +- .../user-orderaftersale-detail.vue | 3 + .../user-orderaftersale.vue | 6 +- pages/user/user.vue | 3 + pages/web-view/web-view.vue | 117 +- 223 files changed, 19195 insertions(+), 18613 deletions(-) diff --git a/pages/about/about.vue b/pages/about/about.vue index 126e0c02..99c6995e 100644 --- a/pages/about/about.vue +++ b/pages/about/about.vue @@ -45,6 +45,9 @@ componentAppAdmin }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); }, diff --git a/pages/article-category/article-category.vue b/pages/article-category/article-category.vue index c4e49f0b..49bce95a 100644 --- a/pages/article-category/article-category.vue +++ b/pages/article-category/article-category.vue @@ -1,284 +1,287 @@ - - - + + + diff --git a/pages/article-detail/article-detail.vue b/pages/article-detail/article-detail.vue index cc7ab666..4dd0e3da 100644 --- a/pages/article-detail/article-detail.vue +++ b/pages/article-detail/article-detail.vue @@ -1,162 +1,164 @@ - - - + img: this.data.share_images || this.data.cover, + }, + }); + + // 标题 + uni.setNavigationBarTitle({ title: article.title }); + } else { + this.setData({ + data_list_loding_status: 0, + data_list_loding_msg: res.data.msg, + }); + app.globalData.showToast(res.data.msg); + } + + // 分享菜单处理 + app.globalData.page_share_handle(this.share_info); + }, + fail: () => { + uni.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2, + }); + app.globalData.showToast(this.$t('common.internet_error_tips')); + }, + }); + }, + + // url事件 + url_event(e) { + app.globalData.url_event(e); + } + }, + }; + + diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index b18bf76c..b74bb1fe 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -544,6 +544,9 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue index bbe1e515..63109244 100644 --- a/pages/cart-page/cart-page.vue +++ b/pages/cart-page/cart-page.vue @@ -453,6 +453,9 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); }, diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue index b3e23f48..1e1925d7 100644 --- a/pages/cart/cart.vue +++ b/pages/cart/cart.vue @@ -453,6 +453,9 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); }, diff --git a/pages/cashier/cashier.vue b/pages/cashier/cashier.vue index 7c3bfe31..76b898e8 100644 --- a/pages/cashier/cashier.vue +++ b/pages/cashier/cashier.vue @@ -69,11 +69,11 @@ componentNoData }, onLoad(params) { + // 设置参数 + params = app.globalData.launch_params_handle(params); // 调用公共事件方法 app.globalData.page_event_onload_handle(params); - // 设置参数 - params = app.globalData.launch_params_handle(params); var scene = app.globalData.get_scene_data(); this.setData({ params: params, diff --git a/pages/common/open-setting-location/open-setting-location.vue b/pages/common/open-setting-location/open-setting-location.vue index 1dc8caba..2bdea50e 100644 --- a/pages/common/open-setting-location/open-setting-location.vue +++ b/pages/common/open-setting-location/open-setting-location.vue @@ -1,149 +1,152 @@ - - - + + // 取消则自动返回、则显示错误 + // error=11 支付宝取消、msg包含cancel则其他平台 + var msg = res.errorMessage || res.chooseLocation || res.errMsg || this.$t('open-setting-location.open-setting-location.hwn386'); + if(res.error == 11 || msg.indexOf('cancel') != -1) { + // app则不执行返回操作、上面已经返回过了 + // #ifndef APP + uni.navigateBack(); + // #endif + } else { + this.setData({ error_msg: res.errMsg }); + app.globalData.showToast(res.errMsg); + } + } + }); + } + }, +}; + + diff --git a/pages/customview/customview.vue b/pages/customview/customview.vue index 6f1f5719..2b99161e 100644 --- a/pages/customview/customview.vue +++ b/pages/customview/customview.vue @@ -1,146 +1,149 @@ - - - \ No newline at end of file diff --git a/pages/design/design.vue b/pages/design/design.vue index 6d6ce0f2..bb3ae409 100644 --- a/pages/design/design.vue +++ b/pages/design/design.vue @@ -1,88 +1,91 @@ - - - \ No newline at end of file diff --git a/pages/diy/diy.vue b/pages/diy/diy.vue index ae2b86b8..265cacf8 100644 --- a/pages/diy/diy.vue +++ b/pages/diy/diy.vue @@ -49,12 +49,15 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 this.setData({ - params: app.globalData.launch_params_handle(params), + params: params, }); }, diff --git a/pages/error/error.vue b/pages/error/error.vue index 47e0c767..2190f860 100644 --- a/pages/error/error.vue +++ b/pages/error/error.vue @@ -29,6 +29,9 @@ // 页面加载初始化 onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue index dcec3029..7a372097 100644 --- a/pages/extraction-address/extraction-address.vue +++ b/pages/extraction-address/extraction-address.vue @@ -1,255 +1,258 @@ - - - - + + + + diff --git a/pages/form-input-data-detail/form-input-data-detail.vue b/pages/form-input-data-detail/form-input-data-detail.vue index ae1f714f..37a58350 100644 --- a/pages/form-input-data-detail/form-input-data-detail.vue +++ b/pages/form-input-data-detail/form-input-data-detail.vue @@ -1,126 +1,129 @@ -