From 8b34fb293407c35135acd9f4de06861db4a85c13 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 12 Dec 2025 11:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 +- common/css/business.css | 4 +- locale/en.json | 4 + locale/zh.json | 4 + pages/user-order-detail/user-order-detail.css | 20 ++- pages/user-order-detail/user-order-detail.vue | 136 +++++++++++++++++- 6 files changed, 159 insertions(+), 13 deletions(-) diff --git a/App.vue b/App.vue index 0fa76a70..04ed5309 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', diff --git a/common/css/business.css b/common/css/business.css index 820f53d1..ed8b6bd3 100644 --- a/common/css/business.css +++ b/common/css/business.css @@ -10,13 +10,13 @@ } .panel-item .panel-content .item .content { width: calc(75% - 52rpx); - min-height: 46rpx; + min-height: 36rpx; word-wrap: break-word; word-break: normal; } .panel-item .panel-content .item .title, .panel-item .panel-content .item .content { - line-height: 46rpx; + line-height: 36rpx; } .panel-item-only .panel-content .item .content { width: 100%; diff --git a/locale/en.json b/locale/en.json index 1cd62867..13c7af79 100644 --- a/locale/en.json +++ b/locale/en.json @@ -39,6 +39,10 @@ "num": "quantity", "order": "order form", "service": "service", + "base": "Base", + "params": "Params", + "web_client": "WebClient", + "app_client": "AppClient", "please_input": "Please enter", "settlement": "balance", "confirm_sub": "Confirm submission", diff --git a/locale/zh.json b/locale/zh.json index 5b0334cf..74427691 100644 --- a/locale/zh.json +++ b/locale/zh.json @@ -39,6 +39,10 @@ "num": "数量", "order": "订单", "service": "服务", + "base": "基础", + "params": "参数", + "web_client": "web端", + "app_client": "手机端", "please_input": "请输入", "settlement": "结算", "confirm_sub": "确认提交", diff --git a/pages/user-order-detail/user-order-detail.css b/pages/user-order-detail/user-order-detail.css index 8be2e516..fa33b230 100644 --- a/pages/user-order-detail/user-order-detail.css +++ b/pages/user-order-detail/user-order-detail.css @@ -34,11 +34,6 @@ .goods-image { width: 160rpx; height: 160rpx; -} -.orderaftersale-btn-text { - right: 0; - bottom: 0; - z-index: 1; } /* @@ -63,4 +58,19 @@ .site-extraction .panel-content .qrcode { width: 340rpx; height: 340rpx; +} + +/* +* 订单商品信息弹层 +*/ +.order-item-goods-info-container .nav-base .item:nth-child(1), +.order-item-goods-info-container .nav-base .item:nth-child(2) { + width: 18%; +} +.order-item-goods-info-container .nav-base .item:nth-child(3), +.order-item-goods-info-container .nav-base .item:nth-child(4) { + width: 32%; +} +.order-item-goods-info-container .scroll-content { + height: 70vh; } \ No newline at end of file diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue index 581f6b61..c564c45a 100644 --- a/pages/user-order-detail/user-order-detail.vue +++ b/pages/user-order-detail/user-order-detail.vue @@ -41,7 +41,7 @@ {{$t('user-order-detail.user-order-detail.7f8p26')}} - + @@ -55,8 +55,14 @@ {{ detail.currency_data.currency_symbol }}{{ item.price }} x{{ item.buy_number }} + + + {{ item.orderaftersale_btn_text }} + + 商品信息 + + - {{ item.orderaftersale_btn_text }} @@ -174,7 +180,84 @@ - + + + + + + + + + + + + + + + {{ item }} + {{ item }} + + + + + + + + + {{ item.name }} + {{ item.value }} + + + + + + + + + + + + + {{ item.name }} + {{ item.value }} + + + + + + + + + + + + + + + + + + + + + + + {{ items }} + + + + + + + + + + + + + + + @@ -185,6 +268,7 @@ import componentCommon from '@/components/common/common'; import componentNoData from '@/components/no-data/no-data'; import componentBottomLine from '@/components/bottom-line/bottom-line'; + import componentPopup from '@/components/popup/popup'; import componentHospitalOrderDetail from '@/pages/plugins/hospital/components/order-detail/order-detail'; var common_static_url = app.globalData.get_static_url('common'); export default { @@ -199,7 +283,17 @@ detail: null, detail_list: [], extension_data: [], - site_fictitious: null, + site_fictitious: null, + // 商品服务插件 + order_item_goods_info_data: null, + popup_order_item_goods_info_status: false, + order_item_goods_info_nav_index: 'base', + order_item_goods_info_nav_list: { + 'base': this.$t('common.base'), + 'params': this.$t('common.params'), + 'detail-web': this.$t('common.detail_text')+'('+this.$t('common.web_client')+')', + 'detail-app': this.$t('common.detail_text')+'('+this.$t('common.app_client')+')' + }, }; }, @@ -207,6 +301,7 @@ componentCommon, componentNoData, componentBottomLine, + componentPopup, componentHospitalOrderDetail, }, @@ -333,6 +428,39 @@ var name = data.alias || data.name || ''; var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); app.globalData.open_location(data.lng, data.lat, name, address); + }, + + // 订单商品信息弹层开启弹层 + popup_order_item_goods_info_event(e) { + this.setData({ + order_item_goods_info_data: this.detail.items[e.currentTarget.dataset.index] || null, + popup_order_item_goods_info_status: true, + }); + }, + + // 订单商品信息弹层弹层关闭 + popup_order_item_goods_info_close_event(e) { + this.setData({ + popup_order_item_goods_info_status: false, + }); + }, + + // 订单商品信息弹层弹层导航事件 + order_item_goods_info_nav_event(e) { + this.setData({ + order_item_goods_info_nav_index: e.currentTarget.dataset.index || 'base' + }); + }, + + // 图片查看 + images_view_event(e) { + var value = e.currentTarget.dataset.value || null; + if (value != null) { + uni.previewImage({ + current: value, + urls: [value], + }); + } }, // url事件