From dcc4ee020118a7e41f8b7bd7375daf361ba4c4a5 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 4 Jan 2026 10:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=8F=92=E4=BB=B6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                        |  6 ++++++
 locale/zh.json                        |  6 ++++++
 pages/plugins/complaint/user/user.css |  2 +-
 pages/plugins/complaint/user/user.vue |  4 ++--
 pages/plugins/orderfeed/form/form.vue | 16 +++++++++-------
 pages/plugins/orderfeed/user/user.vue | 15 +++++++++------
 6 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/locale/en.json b/locale/en.json
index 8db199ec..d4c7e051 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -1997,5 +1997,11 @@
     		"56ys33": "Please upload complete and clear images, up to a maximum of 10",
     		"ssdff4": "My submission record"
     	}
+    },
+    "orderfeed-form": {
+    	"orderfeed-form": {
+    		"54rttr": "Choose other products",
+            "fsdft3": "Feedback on this product"
+    	}
     }
 }
\ No newline at end of file
diff --git a/locale/zh.json b/locale/zh.json
index 87f98404..e0660a32 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -1981,5 +1981,11 @@
             "56ys33": "请上传完整清晰的图片，最多10张",
             "ssdff4": "我的提交记录"
     	}
+    },
+    "orderfeed-form": {
+    	"orderfeed-form": {
+    		"54rttr": "选择其他商品",
+            "fsdft3": "反馈该商品"
+    	}
     }
 }
\ No newline at end of file
diff --git a/pages/plugins/complaint/user/user.css b/pages/plugins/complaint/user/user.css
index 77a43195..02d80172 100644
--- a/pages/plugins/complaint/user/user.css
+++ b/pages/plugins/complaint/user/user.css
@@ -3,5 +3,5 @@
     height: 86rpx;
 }
 .data-title {
-    width: calc(100% - 90rpx);
+    width: calc(100% - 110rpx);
 }
\ No newline at end of file
diff --git a/pages/plugins/complaint/user/user.vue b/pages/plugins/complaint/user/user.vue
index 31e9fc67..7f637f21 100644
--- a/pages/plugins/complaint/user/user.vue
+++ b/pages/plugins/complaint/user/user.vue
@@ -14,7 +14,7 @@
                         <text>{{item.add_time}}</text>
                         <text class="fr cr-main">{{ item.status_name }}</text>
                     </view>
-                    <view v-if="(item.data_title || null) != null" class="oh margin-top flex-row gap-5" :data-value="item.data_url" @tap="url_event">
+                    <view v-if="(item.data_title || null) != null" class="oh margin-top flex-row gap-10" :data-value="item.data_url" @tap="url_event">
                         <image v-if="(item.data_cover || null) != null" :src="item.data_cover" mode="aspectFill" class="br-f5 radius data-cover"></image>
                         <view :class="(item.data_cover || null) != null ? 'data-title' : ''">{{item.data_title}}</view>
                     </view>
@@ -336,7 +336,7 @@
                                     uni.hideLoading();
                                     if (res.data.code == 0) {
                                         var temp_data_list = this.data_list;
-                                        temp_data_list[index]['status'] = 2;
+                                        temp_data_list[index]['status'] = 3;
                                         temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
                                         this.setData({
                                             data_list: temp_data_list,
diff --git a/pages/plugins/orderfeed/form/form.vue b/pages/plugins/orderfeed/form/form.vue
index a8704c84..f80f6e49 100644
--- a/pages/plugins/orderfeed/form/form.vue
+++ b/pages/plugins/orderfeed/form/form.vue
@@ -7,8 +7,9 @@
                         <image :src="item.images" mode="aspectFit" class="cover br-f5 radius"></image>
                         <view class="base">
                             <view class="multi-text">{{item.title}}</view>
+                            <view class="cr-price fw-b margin-top-xs">{{order.currency_data.currency_symbol}}{{item.price}}</view>
                             <view v-if="(item.spec_text || null) != null" class="cr-grey margin-top-xs">{{item.spec_text}}</view>
-                            <text v-if="(order || null) != null && (order.items || null) != null && order.items.length > 1" class="cr-blue cp pa right-0 bottom-0 padding" @tap.stop="order_goods_back_event">选择其他商品 >></text>
+                            <button v-if="(order || null) != null && (order.items || null) != null && order.items.length > 1" type="default" size="mini" class="br-base bg-white cr-base pa right-xxxxl bottom-xxxxl" @tap.stop="order_goods_back_event">{{$t('orderfeed-form.orderfeed-form.54rttr')}}</button>
                         </view>
                     </view>
                     <view class="form-gorup border-radius-main spacing-mb">
@@ -38,13 +39,14 @@
             </form>
             <view v-else>
                 <view v-if="(order || null) != null && (order.items || null) != null && order.items.length > 0" class="business padding-main">
-                    <block v-for="(item, index) in order.items" :key="index">
-                        <view class="bg-white padding-main border-radius-main spacing-mb flex-row gap-10 pr" :data-value="item.goods_url" @tap="url_event">
-                            <image :src="item.images" mode="aspectFit" class="cover br-f5 radius"></image>
+                    <block v-for="(itemv, index) in order.items" :key="index">
+                        <view class="bg-white padding-main border-radius-main spacing-mb flex-row gap-10 pr" :data-value="itemv.goods_url" @tap="url_event">
+                            <image :src="itemv.images" mode="aspectFit" class="cover br-f5 radius"></image>
                             <view class="base">
-                                <view class="multi-text">{{item.title}}</view>
-                                <view v-if="(item.spec_text || null) != null" class="cr-grey margin-top-xs">{{item.spec_text}}</view>
-                                <text class="cr-blue cp pa right-0 bottom-0 padding" :data-index="index" @tap.stop="order_goods_use_event">反馈该商品 >></text>
+                                <view class="multi-text">{{itemv.title}}</view>
+                                <view class="cr-price fw-b margin-top-xs">{{order.currency_data.currency_symbol}}{{itemv.price}}</view>
+                                <view v-if="(itemv.spec_text || null) != null" class="cr-grey margin-top-xs">{{itemv.spec_text}}</view>
+                                <button type="default" size="mini" class="br-main bg-white cr-main pa right-xxxxl bottom-xxxxl" :data-index="index" @tap.stop="order_goods_use_event">{{$t('orderfeed-form.orderfeed-form.fsdft3')}}</button>
                             </view>
                         </view>
                     </block>
diff --git a/pages/plugins/orderfeed/user/user.vue b/pages/plugins/orderfeed/user/user.vue
index 34857adf..62c4b61f 100644
--- a/pages/plugins/orderfeed/user/user.vue
+++ b/pages/plugins/orderfeed/user/user.vue
@@ -14,17 +14,20 @@
                         <text>{{item.add_time}}</text>
                         <text class="fr cr-main">{{ item.status_name }}</text>
                     </view>
-                    <view v-if="(item.goods_title || null) != null" class="oh margin-top flex-row gap-5" :data-value="item.goods_url" @tap="url_event">
-                        <image v-if="(item.goods_images || null) != null" :src="item.goods_images" mode="aspectFill" class="br-f5 radius goods-cover"></image>
-                        <view :class="(item.goods_images || null) != null ? 'goods-base' : ''">
+                    <view class="oh margin-top flex-row gap-10" :data-value="item.goods_url" @tap="url_event">
+                        <image :src="item.goods_images" mode="aspectFill" class="br-f5 radius goods-cover"></image>
+                        <view class="goods-base">
                             <view class="multi-text">{{item.goods_title}}</view>
-                            <view v-if="(item.goods_spec || null) != null" class="cr-grey margin-top-xs">{{item.goods_spec}}</view>
+                            <view class="margin-top-xs">
+                                <text class="cr-price fw-b">{{item.currency_symbol}}{{item.goods_price}}</text>
+                                <text v-if="(item.goods_spec || null) != null" class="cr-grey fr">{{item.goods_spec}}</text>
+                            </view>
                         </view>
                     </view>
                     <view class="content margin-top-main">
                         <component-panel-content :propData="item" :propDataField="field_list" propExcludeField="add_time,status_name" propClass="" :propIsTerse="true"></component-panel-content>
                     </view>
-                    <view v-if="item.status == 0 || item.status != 1" class="item-operation tr br-t padding-top-main margin-top-main">
+                    <view v-if="item.status == 0 || item.status == 2 || item.status != 1" class="item-operation tr br-t padding-top-main margin-top-main">
                         <block v-if="item.status == 0 || item.status == 2">
                             <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/orderfeed/form/form?oid='+item.order_id+'&odid='+item.order_detail_id+'&is_list=0'" hover-class="none">{{$t('common.edit')}}</button>
                             <button class="round bg-white cr-yellow br-yellow" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
@@ -326,7 +329,7 @@
                                     uni.hideLoading();
                                     if (res.data.code == 0) {
                                         var temp_data_list = this.data_list;
-                                        temp_data_list[index]['status'] = 2;
+                                        temp_data_list[index]['status'] = 3;
                                         temp_data_list[index]['status_name'] = this.$t('order.order.1k98tk');
                                         this.setData({
                                             data_list: temp_data_list,