From 3b9b2e8ba265410e6f6289f6f1f77fee567256ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 27 Sep 2021 19:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=8B=89=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=84=E8=AE=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/myTracks.vue                  | 12 ++++++--
 pages/order/evaluate/myEvaluate.vue      |  9 +++---
 pages/order/evaluate/releaseEvaluate.vue | 37 ++++++++++++++----------
 pages/order/fillorder.vue                |  4 +--
 pages/product/shopPage.vue               |  9 +++---
 utils/filters.js                         |  1 +
 6 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index 842e187..fbbf6ce 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -2,12 +2,13 @@
   <view class="myTracks">
     <u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
     <div v-else>
-      <view  v-for="(item, index) in trackList" :key="index">
+      <view v-for="(item, index) in trackList" :key="index">
         <view class="myTracks-title" @click="navgaiteToStore(item)">{{item.storeName}}</view>
         <view class="myTracks-items">
           <view class="myTracks-item">
             <u-checkbox-group>
-              <u-checkbox v-model="item.___isDel" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx" @change="changeChecked(item)"></u-checkbox>
+              <u-checkbox v-model="item.___isDel" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx"
+                @change="changeChecked(item)"></u-checkbox>
             </u-checkbox-group>
             <view class="myTracks-item-img" @click.stop="navgaiteToDetail(item)">
               <image :src="item.thumbnail"></image>
@@ -33,7 +34,8 @@
       <view class="myTracks-action">
         <view class="myTracks-action-check">
           <u-checkbox-group>
-            <u-checkbox v-model="allChecked" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx" @change="checkedAllitem"></u-checkbox>
+            <u-checkbox v-model="allChecked" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx"
+              @change="checkedAllitem"></u-checkbox>
             全选
           </u-checkbox-group>
         </view>
@@ -79,6 +81,10 @@ export default {
   onLoad() {
     this.getList();
   },
+  onPullDownRefresh() {
+    this.trackList = [];
+    this.getList();
+  },
   methods: {
     /**
      * 导航到店铺
diff --git a/pages/order/evaluate/myEvaluate.vue b/pages/order/evaluate/myEvaluate.vue
index 74666fe..dcb6c85 100644
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -47,7 +47,7 @@
                 </view>
                 <view v-if="current == 0 && sku.commentStatus == 'UNFINISHED'">
                   <view class="evaluate">
-                    <view @click="talkCommont(order)">
+                    <view @click="talkCommont(sku)">
                       <u-tag text="发表评价" shape="circle" mode="plain" type="error" />
                     </view>
                   </view>
@@ -192,10 +192,11 @@ export default {
     /**
      * 发表评价
      */
-    talkCommont(order) {
+    talkCommont(sku) {
+      console.log(sku)
       uni.navigateTo({
-        url: `./releaseEvaluate?sn=${order.sn}&order=${encodeURIComponent(
-          JSON.stringify(order)
+        url: `./releaseEvaluate?sn=${sku.sn}&sku=${encodeURIComponent(
+          JSON.stringify(sku)
         )}`,
       });
     },
diff --git a/pages/order/evaluate/releaseEvaluate.vue b/pages/order/evaluate/releaseEvaluate.vue
index 4158929..72bb81a 100644
--- a/pages/order/evaluate/releaseEvaluate.vue
+++ b/pages/order/evaluate/releaseEvaluate.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
     <!-- 遍历出评价商品 -->
-    <view v-for="(sku, index) in order.orderItems" :key="index">
+    <view>
       <view class="after-sales-goods-detail-view">
         <view>
           <view class="goods-item-view">
@@ -23,23 +23,27 @@
           <view class="sub-title">满意请打好评哦</view>
         </view>
         <view class="rate-view">
-          <view class="rate-btn" @click="onGrade('GOOD', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'GOOD' ? 'red' : '#CCCCCC' }" class="alifont icon-haoping1"></view>
+          <view class="rate-btn" @click="onGrade('GOOD')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'GOOD' ? 'red' : '#CCCCCC' }"></u-icon>
             <text>好评</text>
           </view>
-          <view class="rate-btn" @click="onGrade('MODERATE', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'MODERATE' ? 'red' : '#CCCCCC' }" class="alifont icon-zhongping1"></view>
+          <view class="rate-btn" @click="onGrade('MODERATE')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'MODERATE' ? 'red' : '#CCCCCC' }"></u-icon>
             <text>中评</text>
           </view>
-          <view class="rate-btn" @click="onGrade('WORSE', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'WORSE' ? 'red' : '#CCCCCC' }" class="alifont icon-chaping"></view>
+          <view class="rate-btn" @click="onGrade('WORSE')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'WORSE' ? 'red' : '#CCCCCC' }"></u-icon>
             <text>差评</text>
           </view>
         </view>
       </view>
       <view class="info-evaluate-view">
         <view class="input-view">
-          <u-input v-model="form.content" height="200" placeholder-style="font-size:12px;color:#CCCCCC" :type="type" :border="border" :maxlength="maxlength" :placeholder="placeholder" />
+          <u-input v-model="form.content" height="200" placeholder-style="font-size:12px;color:#CCCCCC" :type="type"
+            :border="border" :maxlength="maxlength" :placeholder="placeholder" />
         </view>
         <view class="input-num">
           <text>{{ form.content.length }}/{{ maxlength }}</text>
@@ -47,7 +51,8 @@
       </view>
       <view class="info-evaluate-view">
         <view class="images-view">
-          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
+          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150"
+            @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
         </view>
       </view>
     </view>
@@ -57,7 +62,8 @@
         <view class="seller-rate-view">
           <view class="rate-title">描述相符</view>
           <view>
-            <u-rate count="count" gutter="20" active-color="#FFC71C" v-model="form.descriptionScore" :size="40"></u-rate>
+            <u-rate count="count" gutter="20" active-color="#FFC71C" v-model="form.descriptionScore" :size="40">
+            </u-rate>
           </view>
         </view>
         <view class="seller-rate-view">
@@ -94,7 +100,7 @@ export default {
       maxlength: 500, //评价最大字数为500字
       placeholder:
         "宝贝满足您的期待吗？说说它的优点和美中不足的地方吧。您的评价会帮助更多的人",
-      order: {}, //订单信息
+      sku: {}, //订单信息
       form: {
         content: "", //评价详情
         goodsId: "", //商品id
@@ -111,10 +117,9 @@ export default {
   onLoad(options) {
     // 获取上一级传过来的数据进行解析
     this.form.orderItemSn = options.sn;
-    this.order = JSON.parse(decodeURIComponent(options.order));
-    this.form.goodsId = this.order.orderItems[0].goodsId;
-    this.form.orderItemSn = this.order.orderItems[0].sn;
-    this.form.skuId = this.order.orderItems[0].skuId;
+    this.sku = JSON.parse(decodeURIComponent(options.sku));
+    this.form.goodsId = this.sku.goodsId;
+    this.form.skuId = this.sku.skuId;
   },
   methods: {
     /**
@@ -141,7 +146,7 @@ export default {
             success: () => {
               setTimeout(() => {
                 uni.navigateBack();
-              }, 2000);
+              }, 500);
             },
           });
         }
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index da6896a..63c73ca 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -830,9 +830,7 @@ page {
   margin-bottom: 20rpx;
   color: #666;
 }
-.address-list {
-  margin-left: 20rpx;
-}
+
 .address-item {
   font-weight: normal;
   letter-spacing: 1rpx;
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 70e0d96..22e9c99 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -135,22 +135,23 @@ export default {
    */
   async onLoad(options) {
     this.storeId = options.id;
+    this.goodsParams.storeId = options.id;
+    this.couponParams.storeId = options.id;
   },
   onPageScroll(e) {
     this.scrollTop = e.scrollTop;
   },
   onPullDownRefresh() {
-   
-     this.init();
+    this.init();
   },
   mounted() {
-     // #ifdef MP-WEIXIN
+    // #ifdef MP-WEIXIN
     // 小程序默认分享
     uni.showShareMenu({ withShareTicket: true });
     // #endif
     this.init();
   },
- 
+
   // 下拉加载
   onReachBottom() {
     this.goodsParams.pageNumber++;
diff --git a/utils/filters.js b/utils/filters.js
index ea0454c..46f0a9c 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -168,6 +168,7 @@ export function orderStatusList(val) {
     PAID: "已付款",
     DELIVERED: "已发货",
     CANCELLED: "已取消",
+    COMPLETED:"已完成",
     COMPLETE: "已完成",
     TAKE: "待核验",
   };