合并master

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

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>

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>
     <!-- 分页 -->

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>

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>

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">

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>

manager/src/views/member/list/memberDetail.vue

@@ -433,7 +433,7 @@
                     style: {
                       color: 'red'
                     }
-                  }, params.row.variablePoint),
+                  }, '-' + params.row.variablePoint),
                 ]);
               }
             }

manager/src/views/member/point/point.vue

@@ -106,7 +106,7 @@
                     style: {
                       color: 'red'
                     }
-                  }, params.row.variablePoint),
+                  }, '-' + params.row.variablePoint),
                 ]);
               }