From e6588af7905bb8353863cbe9434cedeedcdd67e0 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 13 Aug 2021 10:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=89=A3=E5=87=8F=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8Cpc=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=9B=BE=E7=89=87=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8Cpc=E6=A5=BC=E5=B1=82=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/goodsDetail/ShowGoods.vue  |  7 +++++-
 buyer/src/pages/GoodsDetail.vue               |  6 ++---
 buyer/src/pages/home/memberCenter/Point.vue   |  2 +-
 .../views/change-password/change-password.vue | 23 -------------------
 .../modelList/carousel.vue                    |  2 +-
 .../modelList/carousel1.vue                   |  2 +-
 .../modelList/carousel2.vue                   |  2 +-
 .../src/views/member/list/memberDetail.vue    |  2 +-
 manager/src/views/member/point/point.vue      |  2 +-
 9 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index 8f23da65..57d20b77 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -155,7 +155,7 @@ export default {
       count: 1, // 商品数量
       imgIndex: 0, // 展示图片下标
       currentSelceted: [], // 当前商品sku
-      imgList: this.detail.data.specList[0].specImage || [{}], // 商品图片列表
+      imgList: [{}], // 商品图片列表
       skuDetail: this.detail.data, // sku详情
       goodsSpecList: this.detail.specs, // 商品spec
       promotionMap: { // 活动状态
@@ -329,6 +329,11 @@ export default {
         }
       })
     }
+    this.detail.data.specList.forEach(e => {
+      if (e.specName === 'images') {
+        this.imgList = e.specImage
+      }
+    })
     this.formatSku(this.goodsSpecList);
     this.promotion()
     document.title = this.skuDetail.goodsName
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 80028cc0..33b72bff 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -16,9 +16,9 @@
           <span class="mr_10" v-if="goodsMsg.data"><router-link
             :to="'Merchant?id=' + goodsMsg.data.storeId">{{ goodsMsg.data.storeName }}</router-link></span>
           <span @click="collect"><Icon type="ios-heart"
-                                       :color="storeCollected ? '#ed3f14' : '#666'"/>{{
-              storeCollected ? '已收藏店铺' : '收藏店铺'
-            }}</span>
+              :color="storeCollected ? '#ed3f14' : '#666'"/>
+              {{storeCollected ? '已收藏店铺' : '收藏店铺'}}
+            </span>
           <span @click="connectCs(storeMsg.yzfSign)" class="ml_10"><Icon
             custom="icomoon icon-customer-service"/>联系客服</span>
         </div>
diff --git a/buyer/src/pages/home/memberCenter/Point.vue b/buyer/src/pages/home/memberCenter/Point.vue
index 188afcbd..47b8a3fc 100644
--- a/buyer/src/pages/home/memberCenter/Point.vue
+++ b/buyer/src/pages/home/memberCenter/Point.vue
@@ -8,7 +8,7 @@
     <h3>积分日志</h3>
     <Table :columns="logColumns" :data="logData.records">
       <template slot-scope="{ row }" slot="point">
-        <div :style="{color:row.pointType === 'INCREASE' ? 'green' : 'red'}"><span>{{row.pointType === "INCREASE" ? '+' : ''}}</span>{{ row.variablePoint }}</div>
+        <div :style="{color:row.pointType === 'INCREASE' ? 'green' : 'red'}"><span>{{row.pointType === "INCREASE" ? '+' : '-'}}</span>{{ row.variablePoint }}</div>
       </template>
     </Table>
     <!-- 分页 -->
diff --git a/manager/src/views/change-password/change-password.vue b/manager/src/views/change-password/change-password.vue
index 66f7a097..85708f12 100644
--- a/manager/src/views/change-password/change-password.vue
+++ b/manager/src/views/change-password/change-password.vue
@@ -1,5 +1,3 @@
-
-
 <template>
   <div>
     <Card class="change-pass">
@@ -143,24 +141,3 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
-.change-pass {
-  &-btn-box {
-    margin-bottom: 10px;
-
-    button {
-      padding-left: 0;
-
-      span {
-        color: #2d8cf0;
-        transition: all 0.2s;
-      }
-
-      span:hover {
-        color: #0c25f1;
-        transition: all 0.2s;
-      }
-    }
-  }
-}
-</style>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
index d4553555..e7c22a80 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -2,7 +2,7 @@
   <div class="model-carousel">
     <div class="nav-body clearfix">
       <!-- 侧边导航 -->
-      <div class="nav-side">导航栏占位区</div>
+      <div class="nav-side">分类占位区</div>
       <div class="nav-content setup-content">
         <!-- 轮播图 -->
         <Carousel autoplay>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
index 28238a42..6c7396e0 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
@@ -2,7 +2,7 @@
   <div class="model-carousel1" :style="{background: bgColor}">
     <div class="nav-body clearfix">
       <!-- 侧边导航 -->
-      <div class="nav-side">导航栏占位区</div>
+      <div class="nav-side">分类占位区</div>
       <div class="nav-content setup-content">
         <!-- 轮播图 -->
         <Carousel autoplay @on-change="autoChange">
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
index 7947437b..ebeefc15 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
@@ -2,7 +2,7 @@
   <div class="model-carousel2">
     <div class="nav-body clearfix">
       <!-- 侧边导航 -->
-      <div class="nav-side">导航栏占位区</div>
+      <div class="nav-side">分类占位区</div>
       <div class="nav-content setup-content">
         <!-- 轮播图 -->
         <Carousel autoplay>
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index 7953f22c..13b43c2a 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -433,7 +433,7 @@
                     style: {
                       color: 'red'
                     }
-                  }, params.row.variablePoint),
+                  }, '-' + params.row.variablePoint),
                 ]);
               }
             }
diff --git a/manager/src/views/member/point/point.vue b/manager/src/views/member/point/point.vue
index b29e2273..2ff8f59b 100644
--- a/manager/src/views/member/point/point.vue
+++ b/manager/src/views/member/point/point.vue
@@ -106,7 +106,7 @@
                     style: {
                       color: 'red'
                     }
-                  }, params.row.variablePoint),
+                  }, '-' + params.row.variablePoint),
                 ]);
               }