diff --git a/pages/user-order-detail/user-order-detail.css b/pages/user-order-detail/user-order-detail.css
index 866bd004..6b1a21d9 100644
--- a/pages/user-order-detail/user-order-detail.css
+++ b/pages/user-order-detail/user-order-detail.css
@@ -65,13 +65,19 @@
*/
.order-item-goods-info-container .nav-base .item:nth-child(1),
.order-item-goods-info-container .nav-base .item:nth-child(2) {
- width: 12.5%;
+ width: 18%;
}
.order-item-goods-info-container .nav-base .item:nth-child(3),
-.order-item-goods-info-container .nav-base .item:nth-child(4),
-.order-item-goods-info-container .nav-base .item:nth-child(5) {
- width: 25%;
+.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
+}
+
+/**
+ * 订单商品使用指南弹层
+ */
+.order-item-goods-use-guide-container .scroll-content {
+ max-height: 70vh;
+}
diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue
index 25ecd7cd..14f38c63 100644
--- a/pages/user-order-detail/user-order-detail.vue
+++ b/pages/user-order-detail/user-order-detail.vue
@@ -58,12 +58,17 @@
{{ item.orderaftersale_btn_text }}
-
- 商品信息
+
+ {{$t('user-order-detail.user-order-detail.7f8p26')}}
+
+
+ {{use_guide_config.title}}:
+ {{use_guide_config.desc}}
+ {{use_guide_config.tap}}
@@ -250,15 +255,6 @@
-
-
-
-
-
-
-
-
-
@@ -266,6 +262,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -293,6 +310,8 @@
detail_list: [],
extension_data: [],
site_fictitious: null,
+ use_guide_config: null,
+ popup_order_item_goods_use_guide_status: false,
// 商品服务插件
order_item_goods_info_data: null,
popup_order_item_goods_info_status: false,
@@ -302,7 +321,6 @@
'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')+')',
- 'use-guide': this.$t('common.use_guide'),
},
};
},
@@ -385,7 +403,8 @@
{ name: this.$t('user-order-detail.user-order-detail.8o2of3'), value: data.data.close_time || '' },
],
extension_data: data.data.extension_data || [],
- site_fictitious: data.site_fictitious || null,
+ site_fictitious: data.site_fictitious || null,
+ use_guide_config: data.use_guide_config || null,
data_list_loding_status: 3,
data_bottom_line_status: true,
data_list_loding_msg: '',
@@ -454,6 +473,21 @@
popup_order_item_goods_info_status: false,
});
},
+
+ // 订单商品使用指南弹层开启弹层
+ goods_use_guide_event(e) {
+ this.setData({
+ order_item_goods_info_data: this.detail.items[e.currentTarget.dataset.index] || null,
+ popup_order_item_goods_use_guide_status: true,
+ });
+ },
+
+ // 订单商品使用指南弹层弹层关闭
+ popup_order_item_goods_use_guide_close_event(e) {
+ this.setData({
+ popup_order_item_goods_use_guide_status: false,
+ });
+ },
// 订单商品信息弹层弹层导航事件
order_item_goods_info_nav_event(e) {