From 2792d24e98e3a7fd18399b7459fb1158ac15c688 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Sat, 31 Jul 2021 09:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/main.js                    |  2 -
 buyer/src/pages/Cart.vue             | 11 +++---
 buyer/src/pages/GoodsDetail.vue      |  7 +---
 buyer/src/pages/GoodsList.vue        |  6 ++-
 buyer/src/pages/Index.vue            | 36 ------------------
 buyer/src/pages/Login.vue            |  7 ++--
 buyer/src/pages/Merchant.vue         |  4 +-
 buyer/src/pages/PointMall.vue        |  1 +
 buyer/src/pages/ShoppingCart.vue     |  3 --
 buyer/src/pages/SignUp.vue           |  9 +++--
 buyer/src/pages/forgetPassword.vue   |  3 +-
 buyer/src/pages/payment/PayMent.vue  |  1 +
 buyer/src/pages/payment/thirdPay.vue |  2 +-
 buyer/src/pages/user/Home.vue        |  2 +-
 buyer/src/plugins/filters.js         | 55 ----------------------------
 buyer/src/plugins/md5.js             |  8 ++--
 buyer/src/plugins/mock.js            |  0
 buyer/src/plugins/request.js         |  7 +---
 buyer/src/plugins/storage.js         | 12 +++---
 buyer/src/router/index.js            |  2 +-
 20 files changed, 39 insertions(+), 139 deletions(-)
 delete mode 100644 buyer/src/plugins/mock.js

diff --git a/buyer/src/main.js b/buyer/src/main.js
index a94b89ea..9b737c99 100644
--- a/buyer/src/main.js
+++ b/buyer/src/main.js
@@ -1,5 +1,3 @@
-// The Vue build version to load with the `import` command
-// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue';
 import App from './App';
 import router from './router';
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index 73e655b4..4c452885 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -219,8 +219,8 @@ export default {
         }
       });
     },
+    // 清空购物车
     clearCart () {
-      // 清空购物车
       this.$Modal.confirm({
         title: '提示',
         content: '<p>确定要清空购物车吗？清空后不可恢复</p>',
@@ -248,8 +248,8 @@ export default {
     showCoupon (storeId, index) {
       this.couponAvailable = index;
     },
+    // 设置购买数量
     changeNum (val, id) {
-      // 设置购买数量
       console.log(val, id);
       APICart.setCartGoodsNum({ skuId: id, num: val }).then((res) => {
         console.log(res);
@@ -258,8 +258,8 @@ export default {
         }
       });
     },
+    // 设置商品选中状态
     async changeChecked (status, type, id) {
-      // 设置商品选中状态
       const check = status ? 1 : 0;
       if (type === 'all') {
         // 全选
@@ -274,9 +274,8 @@ export default {
 
       this.getCartList();
     },
-
+    // 领取优惠券
     async receiveShopCoupon (item) {
-      // 领取优惠券
       let res = await APIMember.receiveCoupon(item.id);
       if (res.success) {
         this.$set(item, 'disabled', true);
@@ -285,8 +284,8 @@ export default {
         this.$Message.error(res.message);
       }
     },
+    // 购物车列表
     async getCartList () {
-      // 购物车列表
       this.loading = true;
       try {
         let res = await APICart.cartGoodsAll();
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 4613c017..f4e664b7 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -54,6 +54,7 @@ export default {
     };
   },
   methods: {
+    // 获取商品详情
     getGoodsDetail () {
       this.isLoading = true;
       const params = this.$route.query
@@ -142,12 +143,6 @@ export default {
   color: #2c2c2c;
 }
 
-.like {
-  width: 100%;
-  padding: 20px 0;
-  @include white_background_color();
-}
-
 .shop-nav-container {
   width: 1200px;
   margin: 0 auto;
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index fc0d3ae2..31f2b9c3 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -77,6 +77,7 @@
       </div>
       <div class="goods-page">
         <Page
+          show-total
           show-sizer
           @on-change="changePageNum"
           @on-page-size-change="changePageSize"
@@ -126,6 +127,7 @@ export default {
     }
   },
   methods: {
+    // 搜索
     handleSearch (key) {
       this.params.keyword = key
       this.params.pageNumber = 0
@@ -156,15 +158,18 @@ export default {
       });
       window.open(routeUrl.href, '_blank');
     },
+    // 分页 修改页码
     changePageNum (val) {
       this.params.pageNumber = val;
       this.getGoodsList();
     },
+    // 分页 修改页数
     changePageSize (val) {
       this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getGoodsList();
     },
+    // 获取商品列表
     getGoodsList () {
       this.loading = true;
       apiGoods.goodsList(this.params)
@@ -194,7 +199,6 @@ export default {
     }
     this.getGoodsList()
   },
-  mounted () {},
   components: {
     GoodsClassNav
   }
diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue
index a1de498d..ab8beb24 100644
--- a/buyer/src/pages/Index.vue
+++ b/buyer/src/pages/Index.vue
@@ -73,42 +73,6 @@ export default {
 .container {
   @include sub_background_color($light_background_color);
 }
-/** 商品分类 */
-.nav-con {
-  width: 1200px;
-  height: 40px;
-  background: #eee;
-  margin: 0 auto;
-  display: flex;
-  .all-categories {
-    width: 200px;
-    line-height: 40px;
-    color: #fff;
-    background-color: $theme_color;
-    text-align: center;
-    font-size: 16px;
-  }
-  .nav-item {
-    width: 1000px;
-    height: 40px;
-    line-height: 40px;
-    overflow: hidden;
-    list-style: none;
-    background-color: #eee;
-    display: flex;
-    li {
-      width: 50px;
-      font-size: 16px;
-      font-weight: bold;
-      margin-left: 15px;
-      color: rgb(89, 88, 88);
-      font-size: 15px;
-      &:hover {
-        color: $theme_color;
-      }
-    }
-  }
-}
 </style>
 <style>
 .hover-search {
diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
index 8b397739..66330501 100644
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -133,7 +133,7 @@
         <router-link to="/article?id=1371992704333905920" class="item" target="_blank">条款</router-link>
       </Row>
       <Row type="flex" justify="center" class="copyright">
-        Copyright © 2021 - Present
+        Copyright © {{year}} - Present
         <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">lili-shop</a>
         版权所有
       </Row>
@@ -186,7 +186,8 @@ export default {
       },
       codeMsg: '发送验证码', // 验证码文字
       interval: null, // 定时器
-      time: 60 // 倒计时
+      time: 60, // 倒计时
+      year: new Date().getFullYear()
     };
   },
   methods: {
@@ -220,8 +221,6 @@ export default {
               }
             });
           }
-        } else {
-          // this.$Message.error('请填写正确的用户名或密码');
         }
       });
     },
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index f6ccb8b5..14db72cc 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -102,8 +102,6 @@ export default {
     this.getCateList()
     this.getGoodsList()
   },
-  mounted () {
-  },
   methods: {
     getStoreMsg () { // 店铺信息
       getDetailById(this.$route.query.id).then(res => {
@@ -154,10 +152,12 @@ export default {
       this.cateName = cate.labelName
       this.getGoodsList()
     },
+    // 分页 修改页码
     changePageNum (val) {
       this.params.pageNumber = val;
       this.getGoodsList();
     },
+    // 分页 修改页数
     changePageSize (val) {
       this.params.pageNumber = 1;
       this.params.pageSize = val;
diff --git a/buyer/src/pages/PointMall.vue b/buyer/src/pages/PointMall.vue
index 1ad89ad0..6be99afc 100644
--- a/buyer/src/pages/PointMall.vue
+++ b/buyer/src/pages/PointMall.vue
@@ -43,6 +43,7 @@
       <Page :total="total" @on-change="changePageNum"
         @on-page-size-change="changePageSize"
         :page-size="params.pageSize"
+        show-total
         show-sizer>
       </Page>
     </div>
diff --git a/buyer/src/pages/ShoppingCart.vue b/buyer/src/pages/ShoppingCart.vue
index 843fc981..cade624d 100644
--- a/buyer/src/pages/ShoppingCart.vue
+++ b/buyer/src/pages/ShoppingCart.vue
@@ -53,9 +53,6 @@ export default {
   mounted () {
     let detail = this.$route.query.detail;
     if (detail) this.detail = detail;
-  },
-  methods: {
-
   }
 };
 </script>
diff --git a/buyer/src/pages/SignUp.vue b/buyer/src/pages/SignUp.vue
index 6be8fd93..6a425f2a 100644
--- a/buyer/src/pages/SignUp.vue
+++ b/buyer/src/pages/SignUp.vue
@@ -88,7 +88,7 @@
         <router-link to="/article?id=1371992704333905920" class="item" target="_blank">条款</router-link>
       </Row>
       <Row type="flex" justify="center" class="copyright">
-        Copyright © 2021 - Present
+        Copyright © {{year}} - Present
         <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">lili-shop</a>
         版权所有
       </Row>
@@ -107,6 +107,7 @@ export default {
   components: { Verify },
   data () {
     return {
+      year: new Date().getFullYear(),
       formRegist: {
         // 注册表单
         mobilePhone: '',
@@ -156,6 +157,7 @@ export default {
         } else {}
       });
     },
+    // 发送短信验证码
     sendCode () {
       if (this.time === 60) {
         if (this.formRegist.mobilePhone === '') {
@@ -191,14 +193,13 @@ export default {
         });
       }
     },
-    handleCancel () {
-      this.$refs.formRegist.resetFields();
-    },
+    // 图片验证码成功回调
     verifyChange (con) {
       if (!con.status) return;
       this.$refs.verify.show = false;
       this.verifyStatus = true;
     },
+    // 打开图片验证码
     verifyBtnClick () {
       if (!this.verifyStatus) {
         this.$refs.verify.init();
diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue
index 6c447f90..8d9eda12 100644
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@@ -241,6 +241,7 @@ export default {
     }
   },
   mounted () {
+    document.querySelector('.forget-password').style.height = window.innerHeight + 'px'
     this.$refs.formFirst.resetFields();
   },
   watch: {
@@ -250,7 +251,7 @@ export default {
 
 <style scoped lang="scss">
 .forget-password{
-  height: 100%;
+  min-height: 700px;
 }
 .logo-box {
   width: 600px;
diff --git a/buyer/src/pages/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue
index 47e6474a..55976371 100644
--- a/buyer/src/pages/payment/PayMent.vue
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -66,6 +66,7 @@ export default {
     };
   },
   methods: {
+    // 获取订单详情
     getTradeDetail () {
       const params = this.$route.query;
       params.clientType = 'PC'
diff --git a/buyer/src/pages/payment/thirdPay.vue b/buyer/src/pages/payment/thirdPay.vue
index 3cda768f..651474ac 100644
--- a/buyer/src/pages/payment/thirdPay.vue
+++ b/buyer/src/pages/payment/thirdPay.vue
@@ -46,9 +46,9 @@ export default {
     };
   },
   methods: {
+    // 获取支付二维码
     handlePay () {
       const params = this.$route.query;
-
       pay(params).then(res => {
         if (res.success) {
           this.qrcode = res.result;
diff --git a/buyer/src/pages/user/Home.vue b/buyer/src/pages/user/Home.vue
index cf649d4f..86ee3f28 100644
--- a/buyer/src/pages/user/Home.vue
+++ b/buyer/src/pages/user/Home.vue
@@ -65,7 +65,7 @@ export default {
     };
   },
   computed: {
-    userInfo () {
+    userInfo () { // 用户信息
       return JSON.parse(Storage.getItem('userInfo'));
     }
   },
diff --git a/buyer/src/plugins/filters.js b/buyer/src/plugins/filters.js
index 1a516714..85f48595 100644
--- a/buyer/src/plugins/filters.js
+++ b/buyer/src/plugins/filters.js
@@ -53,51 +53,6 @@ export function unitAddress (val) {
   return val.replace(/,/g, ' ');
 }
 
-export function pointStatus (status) {
-  switch (status) {
-    case 'COMPLETE':
-      return '已成交';
-    case 'WITHDRAW':
-      return '已撤回';
-    case 'DEALING':
-      return '交易中';
-    case 'AUDITING':
-      return '待审核';
-    case 'NODEAL':
-      return '未成交';
-    case 'CANCEL':
-      return '已取消';
-  }
-};
-
-/**
- * 根据订单状态码返回订单状态
- * @param status_code
- * @returns {string}
- */
-export function unixOrderStatus (statusCode) {
-  switch (statusCode) {
-    case 'NEW':
-      return '新订单';
-    case 'INTODB_ERROR':
-      return '入库失败';
-    case 'CONFIRM':
-      return '已确认';
-    case 'PAID_OFF':
-      return '已付款';
-    case 'SHIPPED':
-      return '已发货';
-    case 'ROG':
-      return '已收货';
-    case 'COMPLETE':
-      return '已完成';
-    case 'CANCELLED':
-      return '已取消';
-    case 'AFTER_SERVICE':
-      return '售后中';
-  }
-}
-
 /**
  * 13888888888 -> 138****8888
  * @param mobile
@@ -110,13 +65,3 @@ export function secrecyMobile (mobile) {
   }
   return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3');
 }
-
-/**
- * 格式化货品的规格
- * @param sku
- * @returns {*}
- */
-export function formatterSkuSpec (sku) {
-  if (!sku.spec_list || !sku.spec_list.length) return '';
-  return sku.spec_list.map(spec => spec.spec_value).join(' - ');
-}
diff --git a/buyer/src/plugins/md5.js b/buyer/src/plugins/md5.js
index e5741303..158b5e76 100644
--- a/buyer/src/plugins/md5.js
+++ b/buyer/src/plugins/md5.js
@@ -10,7 +10,7 @@
  * Add integers, wrapping at 2^32. This uses 16-bit operations internally
  * to work around bugs in some JS interpreters.
  */
-function safe_add(x, y) {
+function safe_add (x, y) {
   var lsw = (x & 0xFFFF) + (y & 0xFFFF)
   var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
   return (msw << 16) | (lsw & 0xFFFF)
@@ -19,7 +19,7 @@ function safe_add(x, y) {
 /*
  * Bitwise rotate a 32-bit number to the left.
  */
-function rol(num, cnt) {
+function rol (num, cnt) {
   return (num << cnt) | (num >>> (32 - cnt))
 }
 
@@ -42,7 +42,7 @@ function hh(a, b, c, d, x, s, t) {
   return cmn(b ^ c ^ d, a, b, x, s, t)
 }
 
-function ii(a, b, c, d, x, s, t) {
+function ii (a, b, c, d, x, s, t) {
   return cmn(c ^ (b | (~d)), a, b, x, s, t)
 }
 
@@ -50,7 +50,7 @@ function ii(a, b, c, d, x, s, t) {
  * Calculate the MD5 of an array of little-endian words, producing an array
  * of little-endian words.
  */
-function coreMD5(x) {
+function coreMD5 (x) {
   var a = 1732584193
   var b = -271733879
   var c = -1732584194
diff --git a/buyer/src/plugins/mock.js b/buyer/src/plugins/mock.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
index 6da93290..426bffd3 100644
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -1,4 +1,3 @@
-// import Vue from 'vue';
 import axios from 'axios';
 import https from 'https';
 import { Message, Spin, Modal } from 'view-design';
@@ -8,6 +7,7 @@ import router from '../router/index.js';
 import store from '../vuex/store';
 import { handleRefreshToken } from '@/api/index';
 const qs = require('qs');
+// api地址
 export const buyerUrl =
   process.env.NODE_ENV === 'development'
     ? config.api_dev.buyer
@@ -180,13 +180,8 @@ export const Method = {
 };
 
 export default function request (options) {
-  // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。
-  //   if (process.server || options.url.indexOf('passport/token') !== -1) {
   return service(options);
-  //   }
-  // service(options).then(resolve).catch(reject)
 }
-
 // 防抖闭包来一波
 function getTokenDebounce () {
   let lock = false;
diff --git a/buyer/src/plugins/storage.js b/buyer/src/plugins/storage.js
index 2d01e9bc..0d11f460 100644
--- a/buyer/src/plugins/storage.js
+++ b/buyer/src/plugins/storage.js
@@ -8,9 +8,9 @@ const psl = require('psl');
 export default {
   setItem: (key, value, options = {}) => {
     if (process.client) {
-      const p_psl = psl.parse(document.domain);
-      let domain = p_psl.domain;
-      if (/\d+\.\d+\.\d+\.\d+/.test(p_psl.input)) domain = p_psl.input;
+      const pPsl = psl.parse(document.domain);
+      let domain = pPsl.domain;
+      if (/\d+\.\d+\.\d+\.\d+/.test(pPsl.input)) domain = pPsl.input;
       options = { domain, ...options };
     }
     Cookies.set(key, value, options);
@@ -20,9 +20,9 @@ export default {
   },
   removeItem: (key, options = {}) => {
     if (process.client) {
-      const p_psl = psl.parse(document.domain);
-      let domain = p_psl.domain;
-      if (/\d+\.\d+\.\d+\.\d+/.test(p_psl.input)) domain = p_psl.input;
+      const pPsl = psl.parse(document.domain);
+      let domain = pPsl.domain;
+      if (/\d+\.\d+\.\d+\.\d+/.test(pPsl.input)) domain = pPsl.input;
       options = { domain, ...options };
     }
     Cookies.remove(key, options);
diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js
index e9a85509..4b270edf 100644
--- a/buyer/src/router/index.js
+++ b/buyer/src/router/index.js
@@ -61,7 +61,7 @@ const Merchant = resolve => require(['@/pages/Merchant'], resolve);
 const UserMain = resolve => require(['@/pages/home/Main'], resolve);
 
 /**
- * 店铺入驻 
+ * 店铺入驻
  */
 const ShopEntry = resolve => require(['@/pages/shopEntry/shop-entry'], resolve);