From ff92fd8d7649b64052a298589aaa48964b05fbcf Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 30 Jul 2021 18:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pc=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/Search.vue               |  1 -
 buyer/src/pages/Cart.vue                      |  1 -
 buyer/src/pages/Feedback.vue                  | 89 ------------------
 buyer/src/pages/PointMall.vue                 |  2 +-
 buyer/src/pages/couponCenter.vue              | 14 +--
 buyer/src/pages/home/Main.vue                 | 86 +++---------------
 buyer/src/pages/home/MyShoppingCart.vue       | 90 -------------------
 .../pages/home/memberCenter/CommentList.vue   |  2 +-
 .../pages/home/memberCenter/ComplainList.vue  |  2 +-
 buyer/src/pages/home/userCenter/Coupons.vue   |  6 +-
 .../pages/home/userCenter/MoneyManagement.vue | 56 ++++++------
 buyer/src/pages/home/userCenter/MyTracks.vue  |  2 +-
 buyer/src/pages/payment/Pay.vue               | 22 +----
 buyer/src/pages/payment/PayMent.vue           |  1 -
 buyer/src/pages/shopEntry/first-apply.vue     | 23 +++--
 buyer/src/pages/shopEntry/second-apply.vue    |  1 +
 buyer/src/pages/shopEntry/shop-entry.vue      |  2 +-
 buyer/src/pages/shopEntry/third-apply.vue     | 19 ++--
 buyer/src/router/index.js                     | 15 ----
 19 files changed, 85 insertions(+), 349 deletions(-)
 delete mode 100644 buyer/src/pages/Feedback.vue
 delete mode 100644 buyer/src/pages/home/MyShoppingCart.vue

diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue
index f519e160..3ddcd784 100644
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -93,7 +93,6 @@ export default {
       const time = new Date().getTime() - 60*60*1000
       if (!reloadTime) {
         hotWords({count: 5}).then(res => {
-          console.log(res);
           if (res.success) storage.setItem('hotWordsList', res.result)
         })
         storage.setItem('hotWordsReloadTime',new Date().getTime())
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index 6284f370..73e655b4 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -158,7 +158,6 @@ export default {
       skuList: [] // sku列表
     };
   },
-  computed: {},
   methods: {
     // 跳转商品详情
     goGoodsDetail (skuId, goodsId) {
diff --git a/buyer/src/pages/Feedback.vue b/buyer/src/pages/Feedback.vue
deleted file mode 100644
index f85b37ed..00000000
--- a/buyer/src/pages/Feedback.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-    <div>
-        <div class="feedback-container">
-            <div class="feedback-img-box">
-                <img src="../assets/images/feedback.png" />
-            </div>
-            <div class="feedback-box-border">
-                <div class="feedback-box">
-                    <div class="feedback-title">
-                        <h1>意见反馈</h1>
-                        <h2>感谢你的反馈，我们会积极改善，做出更好的服务的</h2>
-                    </div>
-                    <div class="feedback-content">
-                        <div class="feedback-form">
-                            <Form :model="formItem" :label-width="80">
-                                <FormItem label="标题">
-                                    <i-input v-model="formItem.title" placeholder="请输入标题"></i-input>
-                                </FormItem>
-                                <FormItem label="反馈信息">
-                                    <i-input
-                                        v-model="formItem.content"
-                                        type="textarea"
-                                        :autosize="{minRows: 8,maxRows: 10}"
-                                        placeholder="请输入反馈信息"
-                                    ></i-input>
-                                </FormItem>
-                                <FormItem>
-                                    <Button type="primary">提交</Button>
-                                    <Button type="ghost">清空信息</Button>
-                                </FormItem>
-                            </Form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-name: 'Feedback',
-data () {
-    return {
-        formItem: { // 表单数据
-            title: '',
-            content: ''
-        }
-    };
-}
-};
-</script>
-
-<style scoped>
-.feedback-container {
-    margin: 15px auto;
-    width: 80%;
-    height: 600px;
-    display: flex;
-    align-items: center;
-    /* background-color: #ccc; */
-}
-.feedback-img-box {
-    width: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-.feedback-img-box img {
-    width: 80%;
-}
-.feedback-box-border {
-    width: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-.feedback-box {
-    width: 480px;
-}
-.feedback-content {
-    margin: 15px auto;
-    border: 1px #ccc dotted;
-}
-.feedback-form {
-    margin: 30px auto;
-    width: 90%;
-}
-</style>
diff --git a/buyer/src/pages/PointMall.vue b/buyer/src/pages/PointMall.vue
index 708bdbe4..1ad89ad0 100644
--- a/buyer/src/pages/PointMall.vue
+++ b/buyer/src/pages/PointMall.vue
@@ -105,7 +105,7 @@ export default {
       this.getList()
     },
     changePageSize (val) { // 修改页数
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     }
diff --git a/buyer/src/pages/couponCenter.vue b/buyer/src/pages/couponCenter.vue
index 3c71aa07..e6220a07 100644
--- a/buyer/src/pages/couponCenter.vue
+++ b/buyer/src/pages/couponCenter.vue
@@ -32,10 +32,10 @@
           </li>
         </ul>
         <Page :total="total" @on-change="changePageNum"
-          v-if="list.length && total > params.pageNumber"
           class="pageration"
           @on-page-size-change="changePageSize"
           :page-size="params.pageSize"
+          show-total
           show-sizer>
         </Page>
       </div>
@@ -57,11 +57,13 @@ export default {
     }
   },
   methods: {
+    // 搜索优惠券
     search (item) {
       this.params.couponName = item
       this.params.pageNumber = 1
       this.getList()
     },
+    // 获取优惠券列表
     getList () {
       this.$Spin.show()
       couponList(this.params).then(res => {
@@ -73,18 +75,18 @@ export default {
         }
       }).catch(() => { this.$Spin.hide() })
     },
-
+    // 分页 改变页码
     changePageNum (val) {
       this.params.pageNumber = val;
       this.getList()
     },
-
+    // 分页 改变每页数
     changePageSize (val) {
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     },
-
+    // 领取优惠券
     receive (item) {
       receiveCoupon(item.id).then(res => {
         if (res.success) {
@@ -111,7 +113,7 @@ export default {
         }
       })
     },
-
+    // 优惠券可用范围
     useScope (type, storeName) {
       let shop = '平台';
       let goods = '全部商品'
diff --git a/buyer/src/pages/home/Main.vue b/buyer/src/pages/home/Main.vue
index dd3b18a2..24dd1a51 100644
--- a/buyer/src/pages/home/Main.vue
+++ b/buyer/src/pages/home/Main.vue
@@ -1,43 +1,15 @@
 <template>
-  <div class="wrapper">
-    <div class="orderBox">
-      <!-- <ul class="orderUl">
-        <li>
-          <div class="circle">
-            <Icon size="50" type="ios-card" />
-          </div>
-          <div class="info">
-            <Badge :count="0"> 代付款 </Badge>
-          </div>
-        </li>
-        <li>
-          <div class="circle">
-            <Icon size="50" type="ios-card" />
-          </div>
-          <div class="info">
-            <Badge :count="0"> 待收货 </Badge>
-          </div>
-        </li>
-        <li>
-          <div class="circle">
-            <Icon size="50" type="ios-card" />
-          </div>
-          <div class="info">
-            <Badge :count="0"> 待评价 </Badge>
-          </div>
-        </li>
-      </ul> -->
-      <div class="userBox">
-        <div class="box">
-          <!-- 我的订单组件 -->
-          <myOrderPage :homePage="true" />
-        </div>
-        <div class="box">
-          <!-- 近期收藏 -->
-          <myFavorites :homePage="true" />
-        </div>
-        <div class="box">
-        </div>
+  <div>
+    <div class="userBox">
+      <div class="box">
+        <!-- 我的订单组件 -->
+        <myOrderPage :homePage="true" />
+      </div>
+      <div class="box">
+        <!-- 近期收藏 -->
+        <myFavorites :homePage="true" />
+      </div>
+      <div class="box">
       </div>
     </div>
   </div>
@@ -57,42 +29,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.circle {
-  width: 70px;
-  height: 70px;
-  border-radius: 50%;
-  overflow: hidden;
-  background: $success_color;
-  margin: 0 auto;
-  text-align: center;
-  color: #fff;
-
-  > i {
-    line-height: 70px;
-  }
-}
-
-.info {
-  text-align: center;
-  font-size: 18px;
-  margin: 10px 0;
-}
-
-.orderUl {
-  overflow: hidden;
-
-  > li {
-    cursor: pointer;
-    border-radius: 0.4em;
-    float: left;
-    padding: 10px 0;
-    margin: 0 11px;
-    width: 200px;
-    text-align: center;
-
-    @include background_color($light_background_color);
-  }
-}
 .userBox {
   padding: 0 0 20px 0;
 }
diff --git a/buyer/src/pages/home/MyShoppingCart.vue b/buyer/src/pages/home/MyShoppingCart.vue
deleted file mode 100644
index f768dec1..00000000
--- a/buyer/src/pages/home/MyShoppingCart.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <div>
-    <Table border ref="selection" :columns="columns" :data="shoppingCart" size="large" no-data-text="您的购物车没有商品，请先添加商品到购物车再点击购买">
-      <template slot-scope="{row}" slot="price">
-        <span>{{row.price | unitPrice('￥')}}</span>
-      </template>
-    </Table>
-    <div class="go-to">
-      <Button @click="goTo" type="primary">去付款</Button>
-    </div>
-  </div>
-</template>
-
-<script>
-import store from '@/vuex/store';
-import { mapState, mapActions } from 'vuex';
-export default {
-  name: 'MyShoppingCart',
-  data () {
-    return {
-      columns: [ // 表格表头
-        {
-          type: 'selection',
-          width: 58,
-          align: 'center'
-        },
-        {
-          title: '图片',
-          key: 'img',
-          width: 86,
-          render: (h, params) => {
-            return h('div', [
-              h('img', {
-                attrs: {
-                  src: params.row.img
-                }
-              })
-            ]);
-          },
-          align: 'center'
-        },
-        {
-          title: '标题',
-          key: 'title',
-          align: 'center'
-        },
-        {
-          title: '套餐',
-          width: 198,
-          key: 'package',
-          align: 'center'
-        },
-        {
-          title: '数量',
-          key: 'count',
-          width: 68,
-          align: 'center'
-        },
-        {
-          title: '价格',
-          width: 68,
-          slot: 'price',
-          align: 'center'
-        }
-      ]
-    };
-  },
-  created () {
-    this.loadShoppingCart();
-  },
-  computed: {
-    ...mapState(['shoppingCart'])
-  },
-  methods: {
-    ...mapActions(['loadShoppingCart']),
-    goTo () {
-      this.$router.push('/cart');
-    }
-  },
-  store
-};
-</script>
-
-<style scoped>
-.go-to {
-  margin: 15px;
-  display: flex;
-  justify-content: flex-end;
-}
-</style>
diff --git a/buyer/src/pages/home/memberCenter/CommentList.vue b/buyer/src/pages/home/memberCenter/CommentList.vue
index a627d9e1..a9e2612f 100644
--- a/buyer/src/pages/home/memberCenter/CommentList.vue
+++ b/buyer/src/pages/home/memberCenter/CommentList.vue
@@ -95,7 +95,7 @@ export default {
       this.getList()
     },
     changePageSize (val) { // 修改页数
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     },
diff --git a/buyer/src/pages/home/memberCenter/ComplainList.vue b/buyer/src/pages/home/memberCenter/ComplainList.vue
index 97197b50..ad65726d 100644
--- a/buyer/src/pages/home/memberCenter/ComplainList.vue
+++ b/buyer/src/pages/home/memberCenter/ComplainList.vue
@@ -100,7 +100,7 @@ export default {
       this.getList()
     },
     changePageSize (val) { // 改变页数
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     },
diff --git a/buyer/src/pages/home/userCenter/Coupons.vue b/buyer/src/pages/home/userCenter/Coupons.vue
index 297effc3..7a1284ee 100644
--- a/buyer/src/pages/home/userCenter/Coupons.vue
+++ b/buyer/src/pages/home/userCenter/Coupons.vue
@@ -20,10 +20,10 @@
       </li>
     </ul>
     <Page :total="total" @on-change="changePageNum"
-      v-if="list.length && total > params.pageNumber"
       class="pageration"
       @on-page-size-change="changePageSize"
       :page-size="params.pageSize"
+      show-total
       show-sizer>
     </Page>
     <Spin v-if="loading" fix></Spin>
@@ -41,7 +41,7 @@ export default {
         '已使用',
         '已过期'
       ],
-      statusList: ['NEW', 'USED', 'EXPIRE'],
+      statusList: ['NEW', 'USED', 'EXPIRE'], // 优惠券状态
       loading: false, // 列表加载状态
       params: { // 请求参数
         pageNumber: 1,
@@ -86,7 +86,7 @@ export default {
     },
 
     changePageSize (val) { // 分页改变页数
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     },
diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue
index 3b424286..d3a29094 100644
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -72,15 +72,16 @@
         <!-- 分页 -->
         <div class="page-size">
           <Page
-            :current="searchForm.pageNumber"
+            :current="walletForm.pageNumber"
             :total="logColumnsData.total"
-            :page-size="searchForm.pageSize"
+            :page-size="walletForm.pageSize"
             @on-change="changePage"
             @on-page-size-change="changePageSize"
             :page-size-opts="[10, 20, 50]"
             size="small"
             show-total
-            show-elevator
+            show-sizer
+            transfer
           ></Page>
         </div>
       </TabPane>
@@ -93,15 +94,16 @@
         <!-- 分页 -->
         <div class="page-size">
           <Page
-            :current="rechargeSearchForm.pageNumber"
+            :current="rechargeForm.pageNumber"
             :total="rechargeListData.total"
-            :page-size="rechargeSearchForm.pageSize"
+            :page-size="rechargeForm.pageSize"
             @on-change="rechargeChangePage"
             @on-page-size-change="rechargeChangePageSize"
             :page-size-opts="[10, 20, 50]"
             size="small"
             show-total
-            show-elevator
+            show-sizer
+            transfer
           ></Page>
         </div>
       </TabPane>
@@ -114,15 +116,16 @@
         <!-- 分页 -->
         <div class="page-size">
           <Page
-            :current="withdrawApplySearchForm.pageNumber"
+            :current="withdrawApplyForm.pageNumber"
             :total="withdrawApplyColumnsListData.total"
-            :page-size="withdrawApplySearchForm.pageSize"
+            :page-size="withdrawApplyForm.pageSize"
             @on-change="withdrawChangePage"
             @on-page-size-change="withdrawChangePageSize"
             :page-size-opts="[10, 20, 50]"
             size="small"
             show-total
-            show-elevator
+            show-sizer
+            transfer
           ></Page>
         </div>
       </TabPane>
@@ -131,7 +134,6 @@
 </template>
 
 <script>
-import card from '@/components/card';
 import {
   getMembersWallet,
   getDepositLog,
@@ -158,19 +160,19 @@ export default {
         price: 1
       },
       // 余额日志
-      searchForm: {
+      walletForm: {
         // 搜索框初始化对象
         pageNumber: 1,
         pageSize: 10
       },
       // 充值记录
-      rechargeSearchForm: {
+      rechargeForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10 // 页面大小
       },
       // 提现记录
-      withdrawApplySearchForm: {
+      withdrawApplyForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10 // 页面大小
@@ -358,17 +360,17 @@ export default {
       withdrawApplyColumnsListData: {} // 提现记录
     };
   },
-  components: { card },
   mounted () {
     this.init();
   },
   methods: {
+    // 初始化数据
     init () {
       getMembersWallet().then((res) => {
         this.frozenDeposit = res.result.memberFrozenWallet;
         this.memberDeposit = res.result.memberWallet;
       });
-      getDepositLog(this.searchForm).then((res) => {
+      getDepositLog(this.walletForm).then((res) => {
         if (res.message === 'success') {
           this.logColumnsData = res.result;
         }
@@ -390,7 +392,7 @@ export default {
     },
     // 充值记录
     getRechargeData () {
-      getRecharge(this.rechargeSearchForm).then((res) => {
+      getRecharge(this.rechargeForm).then((res) => {
         if (res.message === 'success') {
           this.rechargeListData = res.result;
         }
@@ -398,7 +400,7 @@ export default {
     },
     // 提现记录
     getWithdrawApplyData () {
-      getWithdrawApply(this.withdrawApplySearchForm).then((res) => {
+      getWithdrawApply(this.withdrawApplyForm).then((res) => {
         if (res.message === 'success') {
           this.withdrawApplyColumnsListData = res.result;
         }
@@ -406,29 +408,32 @@ export default {
     },
     // 余额日志
     changePage (v) {
-      this.searchForm.pageNumber = v;
+      this.walletForm.pageNumber = v;
       this.init();
     },
     changePageSize (v) {
-      this.searchForm.pageSize = v;
+      this.walletForm.pageNumber = 1;
+      this.walletForm.pageSize = v;
       this.init();
     },
     // 充值记录
     rechargeChangePage (v) {
-      this.rechargeSearchForm.pageNumber = v;
+      this.rechargeForm.pageNumber = v;
       this.getRechargeData();
     },
     rechargeChangePageSize (v) {
-      this.rechargeSearchForm.pageSize = v;
+      this.rechargeForm.pageNumber = 1;
+      this.rechargeForm.pageSize = v;
       this.getRechargeData();
     },
     // 提现记录
     withdrawChangePage (v) {
-      this.withdrawApplySearchForm.pageNumber = v;
+      this.withdrawApplyForm.pageNumber = v;
       this.getWithdrawApplyData();
     },
     withdrawChangePageSize (v) {
-      this.withdrawApplySearchForm.pageSize = v;
+      this.withdrawApplyForm.pageNumber = 1;
+      this.withdrawApplyForm.pageSize = v;
       this.getWithdrawApplyData();
     },
     // 弹出在线充值框
@@ -456,6 +461,7 @@ export default {
       this.withdrawApplyFormData.price = 1;
       this.withdrawApplyModal = true;
     },
+    // 提现
     withdrawal () {
       this.$refs['withdrawApplyFormData'].validate((valid) => {
         if (valid) {
@@ -496,7 +502,5 @@ export default {
 .ivu-btn {
   margin: 0 4px;
 }
-.fontsize_48 {
-  font-size: 48px;
-}
+
 </style>
diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index 4c87b002..aa699290 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -91,7 +91,7 @@ export default {
       this.getList()
     },
     changePageSize (val) { // 修改页数
-      this.pageNumber = 1;
+      this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getList()
     },
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index bd6ef7e1..b57af149 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -101,12 +101,6 @@
               }}</span
               >&nbsp;&nbsp;
             </span>
-            <!-- <span>
-                            <p style="width:120px">配送方式：</p>
-                            <Select v-model="shop.deliveryMethod" size="small">
-                                <Option v-for="item in deliveryList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-                            </Select>
-                        </span> -->
           </div>
           <div class="goods-list">
             <div
@@ -310,7 +304,6 @@ import {
   couponNum
 } from '@/api/cart';
 import { canUseCouponList } from '@/api/member.js';
-import { getLogo } from '@/api/common.js';
 export default {
   name: 'Pay',
   components: { invoiceModal, addressManage },
@@ -332,12 +325,6 @@ export default {
         totalPoint: 100,
         noGoods: 0
       },
-      deliveryList: [
-        // 物流
-        // {value: 'SELF_PICK_UP', label: '自提'},
-        { value: 'LOGISTICS', label: '物流' }
-        // {value: 'LOCAL_TOWN_DELIVERY', label: '同城配送'}
-      ],
       addressList: [], // 地址列表
       selectedAddress: {}, // 所选地址
       goodsList: [], // 商品列表
@@ -355,6 +342,7 @@ export default {
     this.init();
   },
   methods: {
+    // 初始化数据
     init () {
       this.getGoodsDetail();
     },
@@ -515,14 +503,6 @@ export default {
       });
       window.open(routeUrl.href, '_blank');
     },
-    selectDelivery (delivery) {
-      // 选择配送方式
-      let params = {
-        way: this.$route.query.way,
-        shippingMethod: delivery.value
-      };
-      shippingMethod(params).then((res) => {});
-    },
     useCoupon (id, used) {
       // 使用优惠券
       let params = {
diff --git a/buyer/src/pages/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue
index 2e2cd35e..47e6474a 100644
--- a/buyer/src/pages/payment/PayMent.vue
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -127,7 +127,6 @@ export default {
   font-size: 21px;
 
 }
-
 .-box-item {
   display: flex;
   font-size: 18px;
diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue
index 7b82e101..915ba592 100644
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@@ -254,6 +254,7 @@ export default {
     };
   },
   methods: {
+    // 下一步
     next () {
       this.$refs.firstForm.validate((valid) => {
         if (valid) {
@@ -274,9 +275,8 @@ export default {
         }
       });
     },
+    // 地址选择回显
     selectedRegion (item) {
-      console.log(item);
-      // 地址选择回显
       this.$set(this.form, 'storeAddressIdPath', item[0].toString());
       this.$set(
         this.form,
@@ -284,6 +284,7 @@ export default {
         item[1].toString().replace(/\s/g, '')
       );
     },
+    // 上传之前
     beforeUpload () {
       this.uploadLoading = true;
       if (this.form.licencePhoto.length >= 3) {
@@ -291,6 +292,7 @@ export default {
         return false;
       }
     },
+    // 上传之前
     beforeUpload1 () {
       this.uploadLoading1 = true;
       if (this.form.legalPhoto.length >= 3) {
@@ -298,16 +300,24 @@ export default {
         return false;
       }
     },
+    // 上传成功回调
     handleSuccess (res, file) {
       this.uploadLoading = false;
       this.form.licencePhoto.push(res.result);
     },
+    // 上传成功回调
     handleSuccess1 (res, file) {
       this.uploadLoading1 = false;
       this.form.legalPhoto.push(res.result);
       console.log(res);
       console.log(file);
     },
+    // 上传失败
+    uploadErr () {
+      this.uploadLoading = false;
+      this.uploadLoading1 = false;
+    },
+    // 上传失败回调
     handleFormatError (file) {
       this.uploadLoading = false;
       this.uploadLoading1 = false;
@@ -316,6 +326,7 @@ export default {
         desc: '上传文件格式不正确'
       });
     },
+    // 上传大小限制
     handleMaxSize (file) {
       this.uploadLoading = false;
       this.uploadLoading1 = false;
@@ -324,21 +335,19 @@ export default {
         desc: '文件大小不能超过2M'
       });
     },
-    uploadErr () {
-      this.uploadLoading = false;
-      this.uploadLoading1 = false;
-    },
+    // 图片查看
     handleView (item) {
       this.previewPicture = item;
       this.visible = true;
     },
+    // 删除图片
     handleRemove (index, listName) {
       this.form[listName].splice(index, 1);
     }
   },
   mounted () {
     this.accessToken.accessToken = storage.getItem('accessToken');
-    if (Object.keys(this.content).length) {
+    if (Object.keys(this.content).length) { // 处理回显数据
       this.form = JSON.parse(JSON.stringify(this.content));
       if (this.form.licencePhoto) {
         this.form.legalPhoto = this.content.legalPhoto.split(',');
diff --git a/buyer/src/pages/shopEntry/second-apply.vue b/buyer/src/pages/shopEntry/second-apply.vue
index 45e1a7e9..7c87a824 100644
--- a/buyer/src/pages/shopEntry/second-apply.vue
+++ b/buyer/src/pages/shopEntry/second-apply.vue
@@ -70,6 +70,7 @@ export default {
     };
   },
   methods: {
+    // 下一步
     next () {
       this.$refs.secondForm.validate((valid) => {
         if (valid) {
diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/shop-entry.vue
index e5a288fc..c56e4011 100644
--- a/buyer/src/pages/shopEntry/shop-entry.vue
+++ b/buyer/src/pages/shopEntry/shop-entry.vue
@@ -129,10 +129,10 @@ export default {
               this.$forceUpdate();
             })
           }
-          console.log(33333333333333);
         }
       });
     },
+    // 下一步
     nextPage (step) {
       this.currentIndex = step;
     }
diff --git a/buyer/src/pages/shopEntry/third-apply.vue b/buyer/src/pages/shopEntry/third-apply.vue
index 83abbd79..9604be00 100644
--- a/buyer/src/pages/shopEntry/third-apply.vue
+++ b/buyer/src/pages/shopEntry/third-apply.vue
@@ -61,12 +61,6 @@
         </Select>
       </FormItem>
       <FormItem prop="storeCenter" label="店铺定位">
-        <!-- <Input
-          type="text"
-          v-model="form.storeCenter"
-          readonly
-          placeholder="点击右侧按钮选择店铺位置"
-        /> -->
         <Button
           type="info"
           v-if="!form.storeCenter"
@@ -140,6 +134,7 @@ export default {
     };
   },
   methods: {
+    // 下一步
     next () {
       this.$refs.thirdForm.validate((valid) => {
         if (valid) {
@@ -161,6 +156,7 @@ export default {
         }
       });
     },
+    // 上传之前
     beforeUpload () {
       this.uploadLoading = true;
       if (this.form.storeLogo.length >= 3) {
@@ -168,12 +164,12 @@ export default {
         return false;
       }
     },
-
+    // 上传成功回调
     handleSuccess (res, file) {
       this.uploadLoading = false;
       this.form.storeLogo.push(res.result);
     },
-
+    // 上传格式错误
     handleFormatError (file) {
       this.uploadLoading = false;
       this.$Notice.warning({
@@ -181,6 +177,7 @@ export default {
         desc: '上传文件格式不正确'
       });
     },
+    // 上传大小限制
     handleMaxSize (file) {
       this.uploadLoading = false;
       this.$Notice.warning({
@@ -188,24 +185,28 @@ export default {
         desc: '文件大小不能超过2M'
       })
     },
+    // 上传失败
     uploadErr () {
       this.uploadLoading = false;
     },
+    // 查看图片
     handleView (item) {
       this.previewPicture = item;
       this.visible = true;
     },
+    // 删除图片
     handleRemove (index, listName) {
       this.form[listName].splice(index, 1);
     },
+    // 选择坐标回调
     getAddress (item) {
-      console.log(item);
       this.$set(
         this.form,
         'storeCenter',
         item.position.lng + ',' + item.position.lat
       );
     },
+    // 获取商品分类
     getCategoryList () {
       getCategory(0).then((res) => {
         if (res.success) this.categoryList = res.result;
diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js
index 74d01e0f..e9a85509 100644
--- a/buyer/src/router/index.js
+++ b/buyer/src/router/index.js
@@ -12,7 +12,6 @@ const Pay = resolve => require(['@/pages/payment/Pay'], resolve);
 const PayDone = resolve => require(['@/pages/payment/PayDone'], resolve);
 const PayMent = resolve => require(['@/pages/payment/PayMent'], resolve);
 const ThirdPay = resolve => require(['@/pages/payment/thirdPay'], resolve);
-const Feedback = resolve => require(['@/pages/Feedback'], resolve);
 const Coupon = resolve => require(['@/pages/couponCenter'], resolve);
 const seckill = resolve => require(['@/pages/promotion/seckill'], resolve);
 const article = resolve => require(['@/pages/article/index'], resolve);
@@ -58,7 +57,6 @@ const MoneyManagement = resolve => require(['@/pages/home/userCenter/MoneyManage
 
 const Home = resolve => require(['@/pages/user/Home'], resolve);
 
-const MyShoppingCart = resolve => require(['@/pages/home/MyShoppingCart'], resolve);
 const Merchant = resolve => require(['@/pages/Merchant'], resolve);
 const UserMain = resolve => require(['@/pages/home/Main'], resolve);
 
@@ -149,14 +147,6 @@ export default new Router({
     name: 'PayDone',
     component: PayDone
   },
-  {
-    path: '/feedback', // 反馈页面
-    name: 'Feedback',
-    component: Feedback,
-    meta: {
-      title: 'LiLi 登录'
-    }
-  },
   {
     path: '/article', // 文章页面
     name: 'article',
@@ -333,11 +323,6 @@ export default new Router({
       name: 'AfterSaleDetail',
       component: AfterSaleDetail,
       meta: {title: '售后详情'}
-    },
-    {
-      path: 'MyShoppingCart',
-      name: 'MyShoppingCart',
-      component: MyShoppingCart
     }
     ]
   },