im对接，修改bug

buyer/src/components/coupon/Coupon.vue

@@ -104,7 +104,7 @@ export default {
 
 <style scoped lang="scss">
 @import '../../assets/styles/coupon.scss';
-.pageration{
-    text-align: right;
+.pageration {
+  text-align: right;
 }
 </style>

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -20,7 +20,7 @@
 
         <div class="goodsConfig mt_10">
           <span @click="collect" ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{isCollected?'已收藏':'收藏'}}</span>
-          <!-- <span>举报</span> -->
+          
         </div>
       </div>
       <!-- 右侧商品信息、活动信息、操作展示 -->
@@ -60,7 +60,7 @@
                   :key="index"
                   @click="receiveCoupon(item.id)"
                   >
-                  <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price | unitPrice}}</span>
+                  <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price}}</span>
                   <span v-if="item.couponType == 'DISCOUNT'">满{{ item.consumeThreshold }}打{{item.couponDiscount}}折</span>
                   </span>
               </p>
@@ -126,32 +126,6 @@
           </div>
         </div>
       </div>
-
-      <!-- <div class="item-detail-see">
-        <Divider>更多推荐</Divider>
-        <Row>
-          <Col :span="24" class="see-Item">
-            <img class="see-Img" src="https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489099128797.jpg" alt="" />
-            <p>
-              名龙堂i7 6700升7700 GTX1060 6G台式电脑主机DIY游戏组装整机
-              升6GB独显 送正版WIN10 一年上门
-            </p>
-            <p class="global_color">￥2500.00</p>
-          </Col>
-          <Col :span="24" class="see-Item">
-            <img
-              class="see-Img"
-              src="https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489099128797.jpg"
-              alt=""
-            />
-            <p>
-              名龙堂i7 6700升7700 GTX1060 6G台式电脑主机DIY游戏组装整机
-              升6GB独显 送正版WIN10 一年上门
-            </p>
-            <p class="global_color">￥2500.00</p>
-          </Col>
-        </Row>
-      </div> -->
     </div>
   </div>
 </template>

buyer/src/components/header/ShopHeader.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="shop-box">
     <div class="shop-container">
-      <div class="shop-title">
-        <div class="shop-title-content">
-          <p><router-link :to="`/merchant?id=${skuDetail.storeId}`">{{ skuDetail.storeName }}</router-link></p>
-        </div>
+      <div class="shop-title-content">
+        <img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
+        <p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
+        <div class="ml_20" v-html="storeDetail.storeDesc"></div>
       </div>
     </div>
   </div>
@@ -20,7 +20,7 @@ export default {
     }
   },
   computed: {
-    skuDetail () {
+    storeDetail () {
       return this.detail;
     }
   }
@@ -46,57 +46,17 @@ export default {
   color: #fff;
 }
 
-.shop-title {
-  display: flex;
-  flex-direction: row;
-}
-
-.shop-title-icon {
-  font-size: 46px;
-}
-
 .shop-title-content {
-  padding-top: 8px;
-  margin-left: 15px;
   display: flex;
+  align-items: center;
 }
 
 .shop-title-content p {
-  line-height: 26px;
   font-size: 20px;
-
-}
-.shop-title-content p:nth-child(2) {
-  font-size: 16px;
   margin-left: 20px;
 }
 .shop-title-content a {
   color: #fff;
 }
 
-.shop-another-item {
-  display: flex;
-  flex-direction: row;
-}
-
-.shop-another-item-detail {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin-left: 15px;
-}
-
-.shop-another-item-img {
-  height: 80px;
-  border-radius: 40px;
-  overflow: hidden;
-}
-
-.shop-another-item-img img {
-  width: 80px;
-}
-
-.shop-anoter-item-intro {
-  margin-left: 15px;
-}
 </style>

buyer/src/components/nav/cateNav.vue

@@ -13,11 +13,12 @@
         </li>
       </ul>
     </div>
-    <!-- 侧边导航 -->
+    <!-- 全部商品分类 -->
     <div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">
-      <div class="nav-side">
+      <!-- 第一级分类 -->
+      <div class="nav-side" @mouseleave="panel = false">
         <ul>
-          <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" @mouseleave="panel = false">
+          <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" >
             <span class="nav-side-item" @click="goGoodsList(item.id)">{{item.name}}</span>
             <span v-for="(second, secIndex) in item.children" :key="secIndex">
               <span v-if="secIndex < 2" > / </span>
@@ -26,38 +27,35 @@
           </li>
         </ul>
       </div>
-      <transition name="fade">
-        <div
-          class="detail-item-panel"
-          :duration="{ enter: 100, leave: 100 }"
-          v-show="panel"
-          @mouseenter="panel = true"
-          ref="itemPanel1"
-          @mouseleave="panel = false"
-        >
-          <div class="nav-detail-item">
-            <template v-for="(item, index) in panelData">
-              <span @click="goGoodsList(item.id, item.parentId)" v-if="index < 8" :key="index">{{ item.name }}<Icon type="ios-arrow-forward" /></span>
-            </template>
-          </div>
-          <ul>
-            <li
-              v-for="(items, index) in panelData"
-              :key="index"
-              class="detail-item-row"
-            >
-              <span class="detail-item-title" @click="goGoodsList(items.id,items.parentId)">
-                {{ items.name }} <Icon type="ios-arrow-forward" />
-                <span class="glyphicon glyphicon-menu-right"></span>
-              </span>
-              <div>
-                <span v-for="(item, subIndex) in items.children" @click="goGoodsList(item.id,items.id,items.parentId)"
-                :key="subIndex" class="detail-item">{{ item.name }}</span>
-              </div>
-            </li>
-          </ul>
+      <!-- 展开分类 -->
+      <div
+        class="detail-item-panel"
+        v-show="panel"
+        @mouseenter="panel = true"
+        @mouseleave="panel = false"
+      >
+        <div class="nav-detail-item">
+          <template v-for="(item, index) in panelData">
+            <span @click="goGoodsList(item.id, item.parentId)" v-if="index < 8" :key="index">{{ item.name }}<Icon type="ios-arrow-forward" /></span>
+          </template>
         </div>
-      </transition>
+        <ul>
+          <li
+            v-for="(items, index) in panelData"
+            :key="index"
+            class="detail-item-row"
+          >
+            <span class="detail-item-title" @click="goGoodsList(items.id,items.parentId)">
+              {{ items.name }} <Icon type="ios-arrow-forward" />
+              <span class="glyphicon glyphicon-menu-right"></span>
+            </span>
+            <div>
+              <span v-for="(item, subIndex) in items.children" @click="goGoodsList(item.id,items.id,items.parentId)"
+              :key="subIndex" class="detail-item">{{ item.name }}</span>
+            </div>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </template>
@@ -86,12 +84,12 @@ export default {
     }
   },
   computed: {
-    navList () {
+    navList () { // 导航列表
       return JSON.parse(storage.getItem('navList')) || []
     }
   },
   methods: {
-    getCate () {
+    getCate () { // 获取分类数据
       getCategory(0).then(res => {
         if (res.success) {
           this.cateList = res.result;
@@ -99,7 +97,7 @@ export default {
         }
       });
     },
-    showDetail (index) {
+    showDetail (index) { // 展示全部分类
       this.panel = true
       this.panelData = this.cateList[index].children
     },
@@ -245,9 +243,6 @@ export default {
 .nav-detail-item span:hover {
   background-color: $theme_color;
 }
-.detail-item-panel ul {
-  list-style: none;
-}
 .detail-item-panel li {
   line-height: 30px;
   // margin-left: 40px;