From 7f19067be9051fa4b9c4084fdad509268fe75830 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 29 Oct 2024 00:13:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?v6.3.1-dev=20=E5=AE=A2=E6=9C=8D=EF=BC=8C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E5=88=A4=E6=96=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 5 +++++ pages/goods-detail/goods-detail.vue | 25 ++----------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/App.vue b/App.vue index af53fd1a..6d08058c 100644 --- a/App.vue +++ b/App.vue @@ -952,6 +952,11 @@ * 当前地址是否存在系统tabbar中 */ is_system_tabbar_pages(url = null) { + // 系统页面不能带参数 + if((url || null) != null) { + var temp = url.split('?'); + url = temp[0]; + } return this.is_tabbar_pages_handle(this.data.system_tabbar, url); }, diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index a405d7a3..97f2636c 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -436,16 +436,15 @@ - + @@ -703,15 +702,12 @@ // 基础配置 currency_symbol: app.globalData.currency_symbol(), plugins_is_goods_detail_poster: 0, - common_app_is_online_service: 0, common_app_is_use_mobile_detail: 0, common_is_goods_detail_show_photo: 0, common_is_show_goods_comments: 1, common_app_customer_service_tel: null, // 是否单页预览 is_single_page: app.globalData.is_current_single_page() || 0, - // 底部导航业务操作按钮数量 - bottom_nav_bus_number: 4, // 是否底部导航展示返回按钮 is_opt_back: 0, // 是否开启购物车 @@ -897,16 +893,12 @@ if ((status || false) == true) { this.setData({ currency_symbol: app.globalData.get_config('currency_symbol'), - common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service', 0), common_app_is_use_mobile_detail: app.globalData.get_config('config.common_app_is_use_mobile_detail'), common_is_goods_detail_show_photo: app.globalData.get_config('config.common_is_goods_detail_show_photo'), common_is_show_goods_comments: app.globalData.get_config('config.common_is_show_goods_comments', 1), common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'), plugins_is_goods_detail_poster: app.globalData.get_config('plugins_base.distribution.data.is_goods_detail_poster'), }); - - // 底部业务导航按钮数量处理 - this.bottom_nav_bus_number_handle(); } else { app.globalData.is_config(this, 'init_config'); } @@ -990,7 +982,6 @@ // 是否需要隐藏购物车 if(parseInt(this.plugins_realstore_data.is_hide_cart || 0) == 1) { this.setData({is_opt_cart: 0}); - this.bottom_nav_bus_number_handle(); } } @@ -1060,18 +1051,6 @@ }); }, - // 底部业务导航数量处理 - bottom_nav_bus_number_handle() { - var value = 4; - if (this.is_opt_cart != 1) { - value--; - } - if (this.common_app_is_online_service != 1) { - value--; - } - this.setData({ bottom_nav_bus_number: value }); - }, - // 返回事件 top_nav_left_back_event(e) { app.globalData.page_back_prev_event(); From 417138c7aa1740fbecfaec47bcd4c439f76b7b1f Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 29 Oct 2024 22:18:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BA=95=E9=83=A8=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/App.vue b/App.vue index 6d08058c..f2bd86b5 100644 --- a/App.vue +++ b/App.vue @@ -952,11 +952,6 @@ * 当前地址是否存在系统tabbar中 */ is_system_tabbar_pages(url = null) { - // 系统页面不能带参数 - if((url || null) != null) { - var temp = url.split('?'); - url = temp[0]; - } return this.is_tabbar_pages_handle(this.data.system_tabbar, url); }, @@ -972,6 +967,14 @@ } if(pages.indexOf(value) != -1) { return true; + } else { + // 存在参数，去掉参数再检索是否存在页面的tabbar + if(value.indexOf('?') != -1) { + var temp = value.split('?'); + if(pages.indexOf(temp[0]) != -1) { + return true; + } + } } return false; }, From f9cbe2fada56f52a3ac5889b63848b0c277d7539 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 30 Oct 2024 22:26:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App.vue b/App.vue index f2bd86b5..582b38ce 100644 --- a/App.vue +++ b/App.vue @@ -2757,7 +2757,7 @@ } // 是否为扫码登录 - var thirdpartylogin_arr = ['/thirdpartylogin-scan-index-', 'plugins/index/pluginsname/thirdpartylogin/pluginscontrol/scan/pluginsaction/index']; + var thirdpartylogin_arr = ['/thirdpartylogin-scan-index-', 'plugins/index/pluginsname/thirdpartylogin/pluginscontrol/scan/pluginsaction/index/id/']; var thirdpartylogin_ret = self.web_url_value_mate(value, thirdpartylogin_arr); if (thirdpartylogin_ret.status == 1 && thirdpartylogin_ret.value != null) { uni.navigateTo({ From bb12531dd42a1bea310c7e5f3feafd6ef33a7b26 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Thu, 31 Oct 2024 21:51:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B5=84=E6=BA=90=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 +- locale/en.json | 15 +- locale/zh.json | 11 +- pages.json | 12 ++ pages/plugins/blog/form/form.vue | 2 +- pages/plugins/givegift/code/code.vue | 8 +- .../orderresources/orderannex/orderannex.css | 18 ++ .../orderresources/orderannex/orderannex.vue | 169 ++++++++++++++++++ pages/user-order/user-order.vue | 6 +- 9 files changed, 232 insertions(+), 17 deletions(-) create mode 100644 pages/plugins/orderresources/orderannex/orderannex.css create mode 100644 pages/plugins/orderresources/orderannex/orderannex.vue diff --git a/App.vue b/App.vue index 582b38ce..813b8cc5 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'https://d1.shopxo.vip/', + request_url:'http://shopxo.com/', // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/） - static_url:'https://d1.shopxo.vip/', + static_url:'http://shopxo.com/', // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立） system_type: 'default', @@ -1797,12 +1797,12 @@ }, // 图片预览 - image_show_event(e) { + image_show_event(e, urls = null) { var value = e.currentTarget.dataset.value || null; if (value != null) { uni.previewImage({ current: value, - urls: [value], + urls: urls || [value], }); } else { this.showToast(i18n.t('shopxo-uniapp.app.qm8548')); diff --git a/locale/en.json b/locale/en.json index 5e4f977c..d80714bc 100644 --- a/locale/en.json +++ b/locale/en.json @@ -20,6 +20,9 @@ "edit": "Edit", "link": "Link", "gift": "Gift", + "image": "Image", + "video": "Video", + "file": "File", "more": "More", "more_null": "", "view_more": "View more", @@ -67,7 +70,8 @@ "apply_time": "Application time", "verification_text": "Verification code", "verification_message": "Please enter the verification code", - "not_supported_scan_tips": "H5 webpage does not support scanning codes" + "not_supported_scan_tips": "H5 webpage does not support scanning codes", + "copy_link": "Copy link" }, "pages": { "goods-category": "Product classification", @@ -233,7 +237,12 @@ "plugins-coin-recharge-list": "Recharge details", "plugins-antifakecode-index": "Authentic inquiry", "plugins-giftcard-index": "My gift card", - "plugins-giftcard-form": "Gift card redemption" + "plugins-giftcard-form": "Gift card redemption", + "plugins-givegift-goods": "Buying Gifts", + "plugins-givegift-receive": "Gift collection", + "plugins-givegift-gift": "My gift", + "plugins-givegift-code": "Gift Link", + "plugins-orderresources-orderannex": "Order Resources" }, "login": { "login": { @@ -729,7 +738,6 @@ "4h814w": "Pack up more", "lfwj0g": "Expand more", "2e5rv3": "Uploading, please wait a moment", - "3h58hv": "picture", "v19gg8": "Please enter a title", "gu3x97": "Please select a category", "adiq70": "Please enter the content" @@ -1463,6 +1471,7 @@ "lp1v28": "Urge and urge", "ht65c9": "Suborder", "9l47b6": "form", + "fyuikn": "resources", "3l2jr5": "buy-back", "7571p2": "Merge payments", "hp123x": "To be picked up", diff --git a/locale/zh.json b/locale/zh.json index a9a99952..4a580848 100644 --- a/locale/zh.json +++ b/locale/zh.json @@ -20,6 +20,9 @@ "edit": "编辑", "link": "链接", "gift": "礼物", + "image": "图片", + "video": "视频", + "file": "文件", "more": "更多", "more_null": "更 多", "view_more": "查看更多", @@ -67,7 +70,8 @@ "apply_time": "申请时间", "verification_text": "核销码", "verification_message": "请输入核销码", - "not_supported_scan_tips": "H5网页不支持扫码" + "not_supported_scan_tips": "H5网页不支持扫码", + "copy_link": "复制链接" }, "pages": { "goods-category": "商品分类", @@ -235,7 +239,8 @@ "plugins-givegift-goods": "购买礼品", "plugins-givegift-receive": "礼品领取", "plugins-givegift-gift": "我的送礼", - "plugins-givegift-code": "礼品链接" + "plugins-givegift-code": "礼品链接", + "plugins-orderresources-orderannex": "订单资源" }, "login": { "login": { @@ -723,7 +728,6 @@ "4h814w": "收起更多", "lfwj0g": "展开更多", "2e5rv3": "上传中请稍后", - "3h58hv": "图片", "v19gg8": "请输入标题", "gu3x97": "请选择分类", "adiq70": "请输入内容" @@ -1455,6 +1459,7 @@ "lp1v28": "催催", "ht65c9": "子单", "9l47b6": "表单", + "fyuikn": "资源", "3l2jr5": "回购", "7571p2": "合并支付", "hp123x": "待取货", diff --git a/pages.json b/pages.json index 4fe20027..19414868 100644 --- a/pages.json +++ b/pages.json @@ -1653,6 +1653,18 @@ } } ] + }, + { + "root": "pages/plugins/orderresources", + "pages": [ + { + "path": "orderannex/orderannex", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "" + } + } + ] } ], "preloadRule": { diff --git a/pages/plugins/blog/form/form.vue b/pages/plugins/blog/form/form.vue index 3d6992a7..8a9b766f 100644 --- a/pages/plugins/blog/form/form.vue +++ b/pages/plugins/blog/form/form.vue @@ -362,7 +362,7 @@ editorCtx.insertImage({ src: data.data.url, // 此处需要将图片地址切换成服务器返回的真实图片地址 // width: '50%', - alt: self.$t('form.form.3h58hv'), + alt: self.$t('common.video'), success: function (e) {}, }); uni.hideLoading(); diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue index a493d0f6..482adda5 100644 --- a/pages/plugins/givegift/code/code.vue +++ b/pages/plugins/givegift/code/code.vue @@ -27,7 +27,7 @@ - + @@ -51,7 +51,8 @@ data_total: 0, data_page_total: 0, data_page: 1, - data_list_loding_status: 1, + data_list_loding_status: 1, + data_list_loding_msg: '', data_bottom_line_status: false, data_is_loading: 0, params: null, @@ -144,7 +145,7 @@ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_base')) { + if (app.globalData.is_login_check(res.data, this, 'get_data')) { app.globalData.showToast(res.data.msg); } } @@ -154,7 +155,6 @@ this.setData({ data_bottom_line_status: false, data_list_loding_status: 2, - data_list_loding_msg: this.$t('common.internet_error_tips'), }); app.globalData.showToast(this.$t('common.internet_error_tips')); }, diff --git a/pages/plugins/orderresources/orderannex/orderannex.css b/pages/plugins/orderresources/orderannex/orderannex.css new file mode 100644 index 00000000..3bcc6eb3 --- /dev/null +++ b/pages/plugins/orderresources/orderannex/orderannex.css @@ -0,0 +1,18 @@ +.images-data-list .item { + gap: 40rpx 20rpx; +} +.images-data-list .item-content { + width: calc(25% - 21rpx); + height: 200rpx; +} +.images-data-list .item .image, +.video-data-list .item .video { + height: calc(100% - 40rpx); +} +.video-data-list .item { + gap: 50rpx 20rpx; +} +.video-data-list .item-content { + width: 100%; + height: 440rpx; +} \ No newline at end of file diff --git a/pages/plugins/orderresources/orderannex/orderannex.vue b/pages/plugins/orderresources/orderannex/orderannex.vue new file mode 100644 index 00000000..9a19e3be --- /dev/null +++ b/pages/plugins/orderresources/orderannex/orderannex.vue @@ -0,0 +1,169 @@ + + + \ No newline at end of file diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue index 0d4b993d..cb8c2e09 100644 --- a/pages/user-order/user-order.vue +++ b/pages/user-order/user-order.vue @@ -46,7 +46,7 @@ - + {{$t('user-order-detail.user-order-detail.423rmr')}}{{ item.buy_number_count }}{{$t('user-order-detail.user-order-detail.41ty94')}}{{ item.currency_data.currency_symbol }}{{ item.total_price }} 0 ) || (item.status == 2 && item.order_model != 2) || ((item.plugins_express_data || 0) == 1 && (item.express_data || null) != null) || @@ -80,6 +81,7 @@ +