修改商家端的内容展示

packages/customerService/chattingRecords/index.vue

@@ -35,10 +35,12 @@ export default {
       isLoading: false,
       page_num: 1,
       page_size: 10,
-      itemObj: {}
+      itemObj: {},
+      merchantId: ''
     }
   },
-  onLoad(){
+  onLoad(options){
+    this.merchantId = JSON.parse(options.merchant_id)
   },
   onShow(){
     // 页面显示时重新加载聊天记录
@@ -56,7 +58,7 @@ export default {
           page_num: this.page_num,
           page_size: this.page_size
         }).then((res) => {
-          this.recordsList = res.msg_list.filter(item => item.client_id_one !== item.client_id_two)
+          this.recordsList = res.msg_list.filter(item => item.client_id_one !== item.client_id_two && item.mch_id == this.merchantId)
         })
       } catch (error) {
         console.error('加载聊天记录失败', error)

packages/localLife/UserComment/index.vue

@@ -11,7 +11,7 @@
                 </view>
                 <view class="Msg_Tit_right">
                     <image v-for="(item, index) in 5" :key="index"
-                        :src="indez < info.satisfaction ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start1.png' : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start2.png'"
+                        :src="index < info.satisfaction ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start1.png' : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start2.png'"
                         mode="aspectFill"></image>
                 </view>
             </view>

packages/storeManagement/index/index.vue

@@ -112,15 +112,17 @@ export default {
 			shopList: [],
 			selectedShop: {},
 			baseList: [
+				// {
+				// 	image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1568.png",
+				// 	name: "订单",
+				// 	url: "/packages/storeManagement/order/index",
+				// },
 				{
-					image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1568.png",
-					name: "订单",
-					url: "/packages/storeManagement/order/index",
-				}, {
 					image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/gp_cancelAfterVerification.png",
 					name: "到店核销",
 					url: "/packages/storeManagement/orderVerification/index",
-				}, {
+				},
+				{
 					image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/kefu0.png",
 					name: "客服",
 					url: "/packages/customerService/chattingRecords/index",
@@ -183,7 +185,7 @@ export default {
 		click(item) {
 			// 根据item中的url进行跳转
 			if (item.url) {
-				NavgateTo(item.url)
+				NavgateTo(item.url + '?merchant_id=' + this.selectedShop.id)
 			} else {
 				console.warn('未配置跳转URL');
 				// 可添加默认跳转或提示

packages/user/wallet/index.vue

@@ -29,9 +29,10 @@
                 <view v-if="records.length > 0">
                     <view class="record-item" v-for="(record, index) in records" :key="index">
                         <view class="record-info">
-                            <view class="record-name">{{ record.change_reason }} - {{
+                            <view class="record-name" v-if="topVal == '积分'">{{ record.change_reason }} - {{
                                 record.community_order_pay ? record.community_order_pay.order_pay_no :
                                     record.quick_payment_record.order_no }}</view>
+                            <view class="record-name" v-else>{{ record.change_reason }} - {{ record.related_order }}</view>
                             <view class="record-time">{{ record.create_time }}</view>
                         </view>
                         <view class="record-amount">