From 5ab1254676391b2d3ca15d78898674428ebf0a75 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 12 Sep 2024 23:08:09 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E2=80=94=E3=80=90=E4=BA=A7=E5=93=81=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E3=80=91=E4=B8=8E=E3=80=90=E5=95=86=E5=93=81=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E3=80=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 10 ++++++++-
 pages/shop/GoodsCon/index.vue | 40 +++++++++++++++++++----------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 028ce20..fb497df 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -19,7 +19,7 @@
 
     <view class="list v12-ma-0" style="padding: 0rpx 0 30rpx;">
       <view class="item" v-for="(order,orderListIndex) in orderList" :key="orderListIndex">
-        <view class="shop-info flex jc-between ai-center" v-if="order.merName">
+        <view class="shop-info flex jc-between ai-center" v-if="order.merName" @click="goStore(order)">
           <view class="flex ai-center">
             <image :src="webUrl+'/orderIcon/shop.png'" style="width: 32rpx;height: 32rpx"/>
             <text class="name v12-font-weight-400 v12-dark-text v12-font-24">{{ order.merName }}</text>
@@ -304,6 +304,14 @@ export default {
     }
   },
   methods: {
+    goStore(order) {
+      // this.$yrouter.push({
+      //   path: "/pagesInn/inn/innHome",
+      //   query: {
+      //     id: order.merId
+      //   }
+      // });
+    },
     async toYuePay(payPwd) {
       const that = this;
       //网络请求
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index faddd30..267b44e 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -307,6 +307,28 @@
         </view>
         <!-- 门店信息结束 -->
 
+        <!-- 用户评价开始 -->
+         <!--  v-if="replyCount" -->
+         <view class="userEvaluation" v-if="replyCount" >
+          <view class="title acea-row row-between-wrapper">
+            <view>
+              <text  class="v12-font-weight-500 v12-dark-text">商品评价</text>
+              <text class="v12-ml-2 v12-dark1-text">({{ replyCount }})</text>
+            </view>
+            <text @click="goEvaluateList(id)" class="praise">
+              <!-- <text class="font-color-red">{{ replyChance }}%</text>
+              好评率 -->
+              <text class="iconfont icon-jiantou"></text>
+            </text>
+          </view>
+          <user-evaluation :reply="reply"></user-evaluation>
+        </view>
+        <!-- 用户评价结束 -->
+        <view class="v12-justify-center">
+          <view style="width: 50%;">
+            <u-divider text="商品详情" lineColor="#666" textColor="#666" :hairline="false"></u-divider>
+          </view>
+        </view>
         <!-- v6产品参数开始 -->
         <view
           class="param-section goods-section"
@@ -347,24 +369,6 @@
         </view>
         <!-- v6产品参数结束 -->
 
-        <!-- 用户评价开始 -->
-         <!--  v-if="replyCount" -->
-        <view class="userEvaluation" v-if="replyCount" >
-          <view class="title acea-row row-between-wrapper">
-            <view>
-              <text  class="v12-font-weight-500 v12-dark-text">商品评价</text>
-              <text class="v12-ml-2 v12-dark1-text">({{ replyCount }})</text>
-            </view>
-            <text @click="goEvaluateList(id)" class="praise">
-              <!-- <text class="font-color-red">{{ replyChance }}%</text>
-              好评率 -->
-              <text class="iconfont icon-jiantou"></text>
-            </text>
-          </view>
-          <user-evaluation :reply="reply"></user-evaluation>
-        </view>
-        <!-- 用户评价结束 -->
-
         <!-- 商品详情开始 -->
         <view class="product-intro" style="margin-top: 24rpx">
           <rich-text :nodes="storeInfo.description" v-if="source!='pre' && source!='day'"/>