搜索热词，pc端注释，管理端结算单订单号字段错误

buyer/src/components/Search.vue

@@ -81,16 +81,26 @@ export default {
   },
   mounted () {
     this.searchData = this.$route.query.keyword
-
     if (!this.hover) { // 首页顶部固定搜索栏不调用热词接口
-      hotWords({start: 1, end: 5}).then(res => {
-        if (res.success) this.promotionTags = res.result
-      })
+      // 搜索热词每一小时请求一次
+      const reloadTime = this.Cookies.getItem('hotWordsReloadTime')
+      const time = new Date().getTime() - 60*60*1000
+      if (!reloadTime) {
+        hotWords({count: 5}).then(res => {
+          if (res.success) this.promotionTags = res.result
+        })
+        this.Cookies.setItem('hotWordsReloadTime',new Date().getTime())
+      } else if (reloadTime && time > reloadTime) {
+        hotWords({count: 5}).then(res => {
+          if (res.success) this.promotionTags = res.result
+        })
+        this.Cookies.setItem('hotWordsReloadTime',new Date().getTime())
+      }
+      
     }
   }
 };
 </script>
-
 <style scoped lang="scss">
 .container {
   margin: 30px auto;

buyer/src/components/footer/Footer.vue

@@ -53,10 +53,10 @@ export default {
   data () {
     return {
       guideArr: [ // 导航链接
-        [ '购物指南', '购物流程', '会员介绍', '生活旅行', '常见问题', '大家电', '联系客服' ],
-        [ '配送方式', '上门自提', '211限时达', '配送服务查询', '收取标准', '海外配送' ],
-        [ '支付方式', '货到付款', '在线支付', '分期付款', '邮局汇款', '公司转账' ],
-        [ '售后服务', '售后政策', '价格保护', '退款说明', '返修/退换货', '取消订单' ]
+        [ '购物指南', '购物流程', '会员介绍', '生活旅行', '常见问题' ],
+        [ '配送方式', '上门自提', '配送服务查询', '收取标准', '物流规则' ],
+        [ '支付方式', '在线支付', '公司转账', '余额支付', '积分支付' ],
+        [ '售后服务', '售后政策', '退款说明', '返修/退货', '取消订单' ]
       ],
       moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'], // 更多链接
       year: new Date().getFullYear() // 当前年份
@@ -77,7 +77,7 @@ export default {
 /*****************************底 部 开 始*****************************/
 .footer {
   width: 100%;
-  height: 450px;
+  height: 380px;
   padding-top: 30px;
 
   @include background_color($light_background_color);
@@ -124,7 +124,6 @@ export default {
 }
 .servece-type {
   margin: 15px auto;
-  height: 200px;
   width: 800px;
   display: flex;
   flex-direction: row;

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -187,7 +187,6 @@ export default {
           return i;
         }
       });
-      console.log(selectedSkuId);
       this.$router.push({
         path: '/goodsDetail',
         query: { skuId: selectedSkuId.skuId, goodsId: this.skuDetail.goodsId }
@@ -235,22 +234,6 @@ export default {
         this.loading1 = false;
       });
     },
-    pointPay () { // 积分购买
-      const params = {
-        num: this.count,
-        skuId: this.skuDetail.id,
-        cartType: 'BUY_NOW'
-      };
-      this.loading1 = true;
-      addCartGoods(params).then(res => {
-        this.loading1 = false;
-        if (res.success) {
-          this.$router.push({path: '/pay', query: {way: 'POINT'}});
-        } else {
-          this.$Message.warning(res.message);
-        }
-      });
-    },
     async collect () { // 收藏商品
       if (this.isCollected) {
         let cancel = await cancelCollect('GOODS', this.skuDetail.id)
@@ -266,10 +249,9 @@ export default {
         }
       }
     },
+    // 格式化数据
     formatSku (list) {
-      // 格式化数据
       let arr = [{}];
-
       list.forEach((item, index) => {
         item.specValues.forEach((spec, specIndex) => {
           let name = spec.specName;
@@ -347,7 +329,6 @@ export default {
         }
       })
     }
-
     this.formatSku(this.goodsSpecList);
     this.promotion()
     document.title = this.skuDetail.goodsName
@@ -490,10 +471,8 @@ export default {
 .item-detail-price-row {
   padding: 10px;
   display: flex;
-  // width: 555px;
   flex-direction: row;
   justify-content: space-between;
-  // @include background_color($light_background_color);
   background: url("../../assets/images/goodsDetail/price-bg.png");
 }
 

buyer/src/components/header/Header.vue

@@ -39,15 +39,10 @@
           <Dropdown placement="bottom-start">
             <router-link to="/cart" target="_blank">
               <span @mouseenter="getCartList">
-                <Icon
-                  size="18"
-                  type="ios-cart-outline"
-                ></Icon>
+                <Icon size="18" type="ios-cart-outline"></Icon>
                 购物车
               </span>
-
             </router-link>
-
             <DropdownMenu slot="list">
               <div class="shopping-cart-null" style="width:200px" v-show="shoppingCart.length <= 0">
                 <Icon type="ios-cart-outline" class="cart-null-icon"></Icon>
@@ -83,9 +78,6 @@
         <li>
           <span class="nav-item" @click="shopEntry">店铺入驻</span>
         </li>
-        <!-- <li>
-          <router-link to="/feedback">意见反馈</router-link>
-        </li>-->
       </ul>
     </div>
   </div>
@@ -104,21 +96,17 @@ export default {
 
   data () {
     return {
-      // 主题颜色切换
-      themeType: 'light',
       userInfo: {}, // 用户信息
       shoppingCart: [] // 购物车
     };
   },
   computed: {
+    // 购物车商品数量
     cartNum () {
       return this.$store.state.cartNum;
     }
   },
   methods: {
-    changeCity (city) { // 选择所在城市
-      this.city = city;
-    },
     goToPay () { // 跳转购物车
       let url = this.$router.resolve({
         path: '/cart'
@@ -140,7 +128,7 @@ export default {
       this.$router.push('/login');
     },
     goUserCenter (path) {
-      // 跳转我的订单，我的足迹
+      // 跳转我的订单，我的足迹、收藏等
       if (this.userInfo.username) {
         this.$router.push({ path: path });
       } else {

buyer/src/components/header/hoverSearch.vue

@@ -18,7 +18,7 @@ export default {
     }
   },
   computed: {
-    cartNum () { // 购物车数量
+    cartNum () { // 购物车商品数量
       return this.$store.state.cartNum
     }
   },

buyer/src/components/invoiceModal/index.vue

@@ -70,6 +70,7 @@ export default {
   },
   props: ['invoiceData'],
   watch: {
+    // 回显的发票信息
     invoiceData: {
       handler (val) {
         this.invoiceForm = { ...val };
@@ -123,7 +124,7 @@ export default {
 
       return flage;
     },
-
+    // 保存发票信息
     async submit () {
       if (this.save()) {
         this.loading = true;

buyer/src/components/like/index.vue

@@ -1,65 +0,0 @@
-<template>
-  <div class="wrapper">
-    <card _Title="猜你喜欢" :_Size="16"> </card>
-
-    <Row :gutter="12" class="likeList">
-      <Col
-        :span="4"
-        class="likeItem"
-        v-for="(item, index) in goodsData"
-        :key="index"
-      >
-        <img :src="item.img" alt="" />
-        <div class="likeTitle">{{ item.title }}</div>
-        <div class="likePrice">{{ item.price | unitPrice }}</div>
-      </Col>
-    </Row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'like',
-  data () {
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.wrapper {
-  @include white_background_color();
-}
-.likeList {
-  padding: 0 12px;
-  display: flex;
-  flex-wrap: wrap;
-
-  > .likeItem {
-    /*width: 210px;*/
-    /*margin: 10px 5px;*/
-
-    > img {
-      display: block;
-      width: 100%;
-      height: auto;
-    }
-
-    > .likeTitle,
-    .likePrice {
-      margin: 6px 0;
-      text-align: center;
-      display: -webkit-box;
-
-      -webkit-box-orient: vertical;
-
-      -webkit-line-clamp: 2;
-
-      overflow: hidden;
-    }
-
-    > .likePrice {
-      color: $theme_color;
-    }
-  }
-}
-</style>

buyer/src/components/map/index.vue

@@ -53,6 +53,7 @@ export default {
     };
   },
   watch: {
+    // 监听搜索框搜索地图
     mapSearch: function (val) {
       this.searchOfMap(val);
     }

buyer/src/components/map/region.vue

@@ -167,7 +167,6 @@ export default {
   watch: {
     addressId: {
       handler: function (v) {
-        console.log(v);
         if (v) {
           this.reviewData();
         } else {
@@ -175,9 +174,6 @@ export default {
         }
       },
       immediate: true
-    },
-    addr (v) {
-      console.log(v);
     }
   }
 };