合并分支

2025-12-18 17:05:54 +08:00 · 2021-06-26 11:15:23 +08:00
parent 4735dbd874 e1000d324e
commit 3c83cc9f50
108 changed files with 3506 additions and 3543 deletions
--- a/buyer/src/api/shopentry.js
+++ b/buyer/src/api/shopentry.js
@@ -61,7 +61,7 @@ export function getCateById (id) {
 //  店铺入驻协议
 export function agreement () {
  return request({
-    url: `/buyer/article/get/1349291301250293760`,
+    url: `/buyer/article/type/STORE_REGISTER`,
    needToken: true,
    method: Method.GET
  })
--- a/buyer/src/assets/iconfont/icomoon.eot
+++ b/buyer/src/assets/iconfont/icomoon.eot
--- a/buyer/src/assets/iconfont/icomoon.svg
+++ b/buyer/src/assets/iconfont/icomoon.svg
@@ -11,4 +11,6 @@
 <glyph unicode="&#xe901;" glyph-name="next" horiz-adv-x="1025" d="M1024.951 448c0 2.706-1.097 5.193-1.536 7.826-0.585 3.145-0.658 6.363-1.902 9.362l-0.146 0.366c-1.682 3.95-4.389 7.314-7.022 10.606-1.024 1.317-1.463 2.926-2.706 4.096 0 0-0.146 0-0.146 0.146l-241.591 240.274c-8.15 7.642-19.145 12.336-31.236 12.336-25.247 0-45.714-20.467-45.714-45.714 0-12.218 4.793-23.317 12.602-31.518l-0.018 0.019 162.889-162.085h-821.76c-25.247 0-45.714-20.467-45.714-45.714s20.467-45.714 45.714-45.714h821.76l-162.889-162.085c-8.921-8.364-14.479-20.222-14.479-33.379 0-25.247 20.467-45.714 45.714-45.714 13.029 0 24.785 5.451 33.112 14.196l0.018 0.019 241.737 240.421c1.17 1.243 1.682 2.779 2.706 4.096 2.633 3.291 5.339 6.583 7.022 10.606l0.146 0.366c1.243 2.926 1.317 6.217 1.902 9.362 0.439 2.633 1.463 5.12 1.463 7.753v0.073c0 0.073 0 0 0 0z" />
 <glyph unicode="&#xe902;" glyph-name="qq" d="M512 929.009c-265.653 0-480.989-215.345-480.989-481.012 0-265.662 215.335-481.006 480.989-481.006s480.989 215.345 480.989 481.006c-0.001 265.668-215.335 481.012-480.989 481.012v0zM776.822 298.086c-12.422-11.596-33.749 1.033-54.249 29.4-8.901-24.019-20.497-46.171-33.956-66.051 28.987-10.353 47.626-26.505 47.626-44.726 0-31.473-55.699-56.942-124.443-56.942-40.79 0-76.819 8.899-99.593 22.777-22.565-13.877-58.799-22.777-99.59-22.777-68.745 0-124.443 25.469-124.443 56.942 0 18.014 18.637 34.373 47.626 44.726-13.666 19.877-25.056 42.033-33.959 66.051-20.496-28.156-41.822-40.997-54.249-29.4-16.978 15.94-10.555 72.263 14.702 125.688 5.799 12.215 12.010 23.188 18.428 32.716 3.518 155.297 105.805 279.947 231.281 279.947h0.413c125.475 0 227.762-124.443 231.281-279.947 6.417-9.527 12.634-20.501 18.427-32.716 25.055-53.425 31.684-109.748 14.701-125.688v0z" />
 <glyph unicode="&#xe903;" glyph-name="wechat" d="M579.6 448.4c-11.7 0-23.4-10.8-23.4-24.2 0-10.8 11.7-21.7 23.4-21.7 17.5 0 30 10.8 30 21.7 0 13.4-12.5 24.2-30 24.2zM502.8 561c18.4 0 30 11.7 30 29.2 0 18.4-11.7 29.2-30 29.2-17.5 0-34.2-10.8-34.2-29.2 0-17.5 16.7-29.2 34.2-29.2zM512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM415.2 318.3c-30.9 0-53.4 5-82.6 13.3l-84.3-42.5 24.2 71.7c-59.2 41.7-94.3 94.3-94.3 158.5 0 113.5 106.8 200.2 236.9 200.2 115.1 0 217.7-68.4 237.7-165.2-8.3 1.7-15.9 2.5-22.5 2.5-113.5 0-201-85.1-201-187.7 0-17.5 2.5-33.4 6.7-50.1-6.6-0.7-14.1-0.7-20.8-0.7zM763.1 236.5l16.7-60.1-63.4 35.9c-24.2-5-47.5-12.5-71.7-12.5-111.8 0-200.2 76.7-200.2 171.8s88.4 171.8 200.2 171.8c105.9 0 201-76.7 201-171.8 0-53.3-35.9-100.9-82.6-135.1zM337.7 619.4c-17.5 0-35.9-10.8-35.9-29.2 0-17.5 18.4-29.2 35.9-29.2 16.7 0 30 11.7 30 29.2 0 18.4-13.4 29.2-30 29.2zM710.5 448.4c-12.5 0-23.4-10.8-23.4-24.2 0-10.8 10.8-21.7 23.4-21.7 16.7 0 29.2 10.8 29.2 21.7 0 13.4-12.5 24.2-29.2 24.2z" />
+<glyph unicode="&#xe904;" glyph-name="qrcode" d="M445.077 845.495h-290.715c-20.056 0-36.327-16.27-36.327-36.327v-290.715c0-20.056 16.27-36.327 36.327-36.327h290.715c20.056 0 36.327 16.27 36.327 36.327v290.613c0 20.056-16.27 36.429-36.327 36.429zM449.784 518.351c0-2.558-2.149-4.707-4.707-4.707h-290.715c-2.558 0-4.707 2.149-4.707 4.707v290.715c0 2.558 2.149 4.707 4.707 4.707h290.715c2.558 0 4.707-2.149 4.707-4.707v-290.715zM350.219 737.231h-101.1c-12.689 0-22.922-10.335-22.922-22.922v-101.1c0-12.689 10.335-22.922 22.922-22.922h101.1c12.689 0 22.922 10.335 22.922 22.922v101.1c0.102 12.586-10.233 22.922-22.922 22.922zM341.521 621.907h-83.705v83.705h83.705v-83.705zM350.219 306.122h-101.1c-12.689 0-22.922-10.335-22.922-22.922v-101.1c0-12.689 10.335-22.922 22.922-22.922h101.1c12.689 0 22.922 10.335 22.922 22.922v101.1c0.102 12.689-10.233 22.922-22.922 22.922zM341.521 190.798h-83.705v83.705h83.705v-83.705zM673.474 590.288h101.1c12.689 0 22.922 10.335 22.922 22.922v101.1c0 12.689-10.335 22.922-22.922 22.922h-101.1c-12.689 0-22.922-10.335-22.922-22.922v-101.1c0-12.689 10.233-22.922 22.922-22.922zM682.172 705.612h83.705v-83.705h-83.705v83.705zM445.077 417.148h-290.715c-20.056 0-36.327-16.27-36.327-36.327v-290.715c0-20.056 16.27-36.327 36.327-36.327h290.715c20.056 0 36.327 16.27 36.327 36.327v290.715c0 20.056-16.27 36.327-36.327 36.327zM449.784 90.107c0-2.558-2.149-4.707-4.707-4.707h-290.715c-2.558 0-4.707 2.149-4.707 4.707v290.715c0 2.558 2.149 4.707 4.707 4.707h290.715c2.558 0 4.707-2.149 4.707-4.707v-290.715zM580.458 416.022c-20.056 0-36.327-16.27-36.327-36.327v-167.205c0-8.698 7.061-15.861 15.861-15.861 8.698 0 15.861 7.061 15.861 15.861v167.102c0 2.558 2.149 4.707 4.707 4.707h176.005c8.698 0 15.861 7.061 15.861 15.861s-7.061 15.861-15.861 15.861h-176.107zM578.616 482.024h290.715c20.056 0 36.327 16.27 36.327 36.327v290.715c0 20.056-16.27 36.327-36.327 36.327h-290.715c-20.056 0-36.327-16.27-36.327-36.327v-290.715c0-19.954 16.373-36.327 36.327-36.327zM574.011 809.066c0 2.558 2.149 4.707 4.707 4.707h290.715c2.558 0 4.707-2.149 4.707-4.707v-290.715c0-2.558-2.149-4.707-4.707-4.707h-290.817c-2.558 0-4.707 2.149-4.707 4.707v290.715h0.102zM905.964 400.161c0 8.698-7.061 15.861-15.861 15.861h-58.020c-8.698 0-15.861-7.061-15.861-15.861s7.061-15.861 15.861-15.861h42.159v-60.988h-131.492c-8.698 0-15.861-7.061-15.861-15.861 0-8.698 7.061-15.861 15.861-15.861h147.353c8.698 0 15.861 7.061 15.861 15.861v92.71zM614.226 84.888h-38.475v44.104c0 8.698-7.061 15.861-15.861 15.861s-15.861-7.061-15.861-15.861v-59.862c0-8.698 7.061-15.861 15.861-15.861h54.336c8.698 0 15.861 7.061 15.861 15.861 0 8.698-7.061 15.759-15.861 15.759zM789.412 207.579c0 8.698-7.061 15.861-15.861 15.861h-99.975c-8.698 0-15.861-7.061-15.861-15.861v-140.088c0-8.698 7.061-15.861 15.861-15.861s15.861 7.061 15.861 15.861v124.227h84.114c8.8 0 15.861 7.061 15.861 15.861zM890.001 265.088c-8.698 0-15.861-7.061-15.861-15.861v-166.898h-143.26c-8.698 0-15.861-7.061-15.861-15.861 0-8.698 7.061-15.861 15.861-15.861h159.018c8.698 0 15.861 7.061 15.861 15.861v182.758c0 8.8-7.061 15.861-15.759 15.861zM636.431 350.839c-8.698 0-15.861-7.061-15.861-15.861v-51.471c0-8.698 7.061-15.861 15.861-15.861 8.698 0 15.861 7.061 15.861 15.861v51.471c0 8.8-7.163 15.861-15.861 15.861z" />
+<glyph unicode="&#xe905;" glyph-name="uniE905" horiz-adv-x="1055" d="M745.891 349.28c0-26.168 21.214-47.382 47.382-47.382s47.382 21.214 47.382 47.382c0 26.168-21.214 47.382-47.382 47.382v0c-26.168 0-47.382-21.214-47.382-47.382v0zM759.195 244.935c-44.978 0.149-81.399 36.571-81.548 81.534v52.143c0.149 44.978 36.571 81.399 81.534 81.548h296.231v168.518c-0.149 44.978-36.571 81.399-81.534 81.548h-892.329c-44.978-0.149-81.399-36.571-81.548-81.534v-611.144c0.149-44.978 36.571-81.399 81.534-81.548h892.329c44.978 0.149 81.399 36.571 81.548 81.534v227.4zM905.15 762.004l-86.061 155.918c-14.23 25.257-40.876 42.035-71.44 42.035-14.412 0-27.953-3.731-39.71-10.279l0.416 0.213-339.907-187.887z" />
 </font></defs></svg>
--- a/buyer/src/assets/iconfont/icomoon.ttf
+++ b/buyer/src/assets/iconfont/icomoon.ttf
--- a/buyer/src/assets/iconfont/icomoon.woff
+++ b/buyer/src/assets/iconfont/icomoon.woff
--- a/buyer/src/assets/iconfont/iconfont.css
+++ b/buyer/src/assets/iconfont/iconfont.css
@@ -1,10 +1,10 @@
@font-face {
  font-family: 'icomoon';
-  src:  url('icomoon.eot?4ejtdc');
-  src:  url('icomoon.eot?4ejtdc#iefix') format('embedded-opentype'),
-    url('icomoon.ttf?4ejtdc') format('truetype'),
-    url('icomoon.woff?4ejtdc') format('woff'),
-    url('icomoon.svg?4ejtdc#icomoon') format('svg');
+  src:  url('icomoon.eot?jvagvf');
+  src:  url('icomoon.eot?jvagvf#iefix') format('embedded-opentype'),
+    url('icomoon.ttf?jvagvf') format('truetype'),
+    url('icomoon.woff?jvagvf') format('woff'),
+    url('icomoon.svg?jvagvf#icomoon') format('svg');
  font-weight: normal;
  font-style: normal;
  font-display: block;
@@ -25,6 +25,14 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-wallet:before {
+  content: "\e905";
+  color: #3c56c6;
+}
+.icon-qrcode:before {
+  content: "\e904";
+  color: #999;
+}
 .icon-customer-service:before {
  content: "\e900";
 }
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -64,7 +64,7 @@
                  </span>
              </p>
            </div>
-             <!-- 满减展示 -->
+            <!-- 满减展示 -->
            <div class="item-price-row" v-if="promotionMap['FULL_DISCOUNT']">
              <p>
                <span class="item-price-title">促&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;销</span>
@@ -111,7 +111,7 @@
              <span class="inventory"> 库存{{skuDetail.quantity}}</span>
            </div>
          </div>
-          <div class="item-select">
+          <div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'">
            <div class="item-select-title">
              <p>重量</p>
            </div>
@@ -119,14 +119,14 @@
              <span class="inventory"> {{skuDetail.weight}}kg</span>
            </div>
          </div>
-          <div class="add-buy-car" v-if="$route.query.way === 'POINT'">
+          <div class="add-buy-car" v-if="$route.query.way === 'POINT' && skuDetail.isAuth === 'PASS'">
            <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="pointPay">积分购买</Button>
          </div>
-          <div class="add-buy-car" v-else>
-            <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="addShoppingCartBtn">加入购物车</Button>
+          <div class="add-buy-car" v-if="$route.query.way !== 'POINT' && skuDetail.isAuth === 'PASS'">
+            <Button type="error" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'" :loading="loading" :disabled="skuDetail.quantity === 0" @click="addShoppingCartBtn">加入购物车</Button>
            <Button type="warning" :loading="loading1" :disabled="skuDetail.quantity === 0" @click="buyNow">立即购买</Button>
          </div>
-          
+
        </div>
      </div>
    </div>
@@ -151,7 +151,7 @@ export default {
      count: 1, // 商品数量
      imgIndex: 0, // 展示图片下标
      currentSelceted: [], // 当前商品sku
-      imgList: this.detail.data.specList[0].specImage, // 商品图片列表
+      imgList: this.detail.data.specList[0].specImage || [], // 商品图片列表
      skuDetail: this.detail.data, // sku详情
      goodsSpecList: this.detail.specs, // 商品spec
      promotionMap: { // 活动状态
@@ -200,12 +200,16 @@ export default {
      };
      this.loading = true;
      addCartGoods(params).then(res => {
+        debugger;
        this.loading = false;
        if (res.success) {
          this.$router.push({path: '/shoppingCart', query: {detail: this.skuDetail, count: this.count}});
        } else {
          this.$Message.warning(res.message);
        }
+      }).catch(() => {
+        console.log('catch');
+        this.loading = false;
      });
    },
    buyNow () { // 立即购买
@@ -214,14 +218,20 @@ export default {
        skuId: this.skuDetail.id,
        cartType: 'BUY_NOW'
      };
+      // 虚拟商品购买
+      if (this.skuDetail.goodsType === 'VIRTUAL_GOODS') {
+        params.cartType = 'VIRTUAL'
+      }
      this.loading1 = true;
      addCartGoods(params).then(res => {
        this.loading1 = false;
        if (res.success) {
-          this.$router.push({path: '/pay', query: {way: 'BUY_NOW'}});
+          this.$router.push({path: '/pay', query: {way: params.cartType}});
        } else {
          this.$Message.warning(res.message);
        }
+      }).catch(() => {
+        this.loading1 = false;
      });
    },
    pointPay () { // 积分购买
@@ -317,6 +327,7 @@ export default {
      })
    },
    promotion () { // 格式化促销活动，返回当前促销的对象
+      if (!this.detail.promotionMap) return false;
      let keysArr = Object.keys(this.detail.promotionMap);
      if (keysArr.length === 0) return false;

@@ -339,7 +350,7 @@ export default {
        }
      })
    }
-    
+
    this.formatSku(this.goodsSpecList);
    this.promotion()
    document.title = this.skuDetail.goodsName
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -86,6 +86,14 @@
                </div>
              </div>
            </TabPane>
+            <TabPane label="商品参数">
+              <table class="mt_10" border="1" cellpadding='0' cellspacing="0" v-if="skuDetail.goodsParamsList && skuDetail.length">
+                <tr v-for="param in skuDetail.goodsParamsList" :key="param">
+                  <td>{{param.paramName}}</td><td>{{param.paramValue}}</td>
+                </tr>
+              </table>
+              <!-- <div v-else>暂无商品参数</div> -->
+            </TabPane>
          </Tabs>
        </div>
      </div>
@@ -475,4 +483,18 @@ export default {
 .ivu-rate-star-full:before, .ivu-rate-star-half .ivu-rate-star-content:before {
  color: $theme_color;
 }
+table{
+  border-color: #eee;
+  color: #999;
+  width: 70%;
+  margin-left: 10px;
+  tr{
+    td:nth-child(1){
+      width: 200px;
+    }
+  }
+  td{
+    padding: 5px;
+  }
+}
 </style>
--- a/buyer/src/components/indexDecorate/modelList/seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/seckill.vue
@@ -36,7 +36,7 @@
 </template>
 <script>
 import { Swiper, SwiperSlide, directive } from 'vue-awesome-swiper';
-import 'swiper/swiper-bundle.css';
+// import 'swiper/swiper-bundle.css';
 export default {
  components: {
    Swiper,
--- a/buyer/src/components/invoiceModal/index.vue
+++ b/buyer/src/components/invoiceModal/index.vue
@@ -11,42 +11,37 @@
            </div> -->
      <!-- 普通发票 -->
      <div class="nav-content">
-        <Form
-          :model="invoiceForm"
-          ref="form"
-          label-position="left"
-          :rules="ruleInline"
-          :label-width="110"
-        >
+        <Form :model="invoiceForm" ref="form" label-position="left" :rules="ruleInline" :label-width="110">
          <FormItem label="发票类型">
-            <RadioGroup v-model="invoiceForm.type" type="button" button-style="solid">
+            <RadioGroup v-model="invoice" type="button" button-style="solid">
+              <Radio @on-change="changeInvoice" :label="1">电子普通发票</Radio>
+              <Radio :label="2" :disabled="true">增值税专用发票</Radio>
+            </RadioGroup>
+          </FormItem>
+          <FormItem label="发票抬头">
+            <RadioGroup v-model="type" @on-change="changeInvoice" type="button" button-style="solid">
              <Radio :label="1">个人</Radio>
              <Radio :label="2">单位</Radio>
            </RadioGroup>
          </FormItem>
-          <FormItem
-            label="发票抬头"
-            v-if="invoiceForm.type == 2"
-            prop="receiptTitle"
-          >
+          <FormItem label="个人名称" v-if="type === 1" prop="receiptTitle">
            <i-input v-model="invoiceForm.receiptTitle"></i-input>
          </FormItem>
-          <FormItem
-            label="纳税人识别号"
-            v-if="invoiceForm.type == 2"
-            prop="taxpayerId"
-          >
+          <FormItem label="单位名称" v-if="type === 2" prop="receiptTitle">
+            <i-input v-model="invoiceForm.receiptTitle"></i-input>
+          </FormItem>
+          <FormItem label="纳税人识别号" v-if="type === 2" prop="taxpayerId">
            <i-input v-model="invoiceForm.taxpayerId"></i-input>
          </FormItem>
          <FormItem label="发票内容">
            <RadioGroup v-model="invoiceForm.receiptContent" type="button" button-style="solid">
-              <Radio label="不开发票">不开发票</Radio>
              <Radio label="商品明细">商品明细</Radio>
+              <Radio label="商品类别">商品类别</Radio>
            </RadioGroup>
          </FormItem>
        </Form>
        <div style="text-align: center">
-          <Button type="primary" :loading="loading" @click="save">保存发票信息</Button>
+          <Button type="primary" :loading="loading" @click="submit">保存发票信息</Button>
          <Button type="default" @click="invoiceAvailable = false">取消</Button>
        </div>
      </div>
@@ -54,23 +49,24 @@
  </div>
 </template>
 <script>
-import { saveReceipt } from '@/api/member.js';
+import { receiptSelect } from '@/api/cart.js';
 import { TINumber } from '@/plugins/RegExp.js';
 export default {
  name: 'invoiceModal',
  data () {
    return {
+      invoice: 1,
      invoiceAvailable: false, // 模态框显隐
      loading: false, // 提交状态
-      invoiceForm: { // 发票表单
+      invoiceForm: {
+        // 发票表单
        // 普票表单
        receiptTitle: '', // 发票抬头
        taxpayerId: '', // 纳税人识别号
-        receiptContent: '不开发票', // 发票内容
-        type: 1 // 1 个人 2 单位
+        receiptContent: '商品明细', // 发票内容
      },
-      ruleInline: { // 验证规则
-        receiptTitle: [{ required: true, message: '请填写公司名称' }],
+      type: 1, // 1 个人 2 单位
+      ruleInline: {
        taxpayerId: [
          { required: true, message: '请填写纳税人识别号' },
          { pattern: TINumber, message: '请填写正确的纳税人识别号' }
@@ -78,73 +74,76 @@ export default {
      }
    };
  },
-  methods: {
-    save () { // 保存发票
-      if (this.invoiceForm.type === 1) {
-        // 个人
-        let flag = true;
-        this.receiptItems.forEach((e) => {
-          if (
-            e.receiptTitle === '个人' &&
-            e.receiptContent === this.invoiceForm.receiptContent
-          ) {
-            this.$emit('change', e);
-            flag = false;
-            this.invoiceAvailable = false;
-          }
-        });
+  props: ['invoiceData'],
+  watch: {
+    invoiceData: {
+      handler (val) {
+        this.invoiceForm = { ...val };

-        if (flag) {
-          let params = {
-            receiptTitle: '个人',
-            receiptContent: this.invoiceForm.receiptContent
-          };
-          this.loading = true;
-          saveReceipt(params)
-            .then((res) => {
-              this.loading = false;
-              if (res.success) {
-                this.$emit('change', res.result);
-                this.invoiceAvailable = false;
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
+        if (val.taxpayerId) {
+          this.type = 2;
+        } else {
+          this.type = 1;
        }
-      } else {
-        // 单位
+      },
+      deep: true,
+      immeadite: true
+    }
+  },
+  methods: {
+    /**
+     *  选择发票抬头
+     */
+    changeInvoice (val) {
+      this.$nextTick(() => {
+        this.type = val;
+      });
+    },
+
+    /**
+     *  保存判断
+     */
+    save () {
+      let flage = true;
+
+      // 保存分为两种类型，个人以及企业
+      const { type, receiptTitle, receiptContent } = JSON.parse(
+        JSON.stringify(this.invoiceForm)
+      );
+
+      // 判断是否填写发票抬头
+      if (!receiptTitle) {
+        this.$Message.error('请填写发票抬头!');
+        flage = false;
+        return false;
+      }
+
+      if (type === 2) {
        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.loading = true;
-            let params = {
-              receiptTitle: this.invoiceForm.receiptTitle,
-              taxpayerId: this.invoiceForm.taxpayerId,
-              receiptContent: this.invoiceForm.receiptContent
-            };
-            let flag = true;
-            this.receiptItems.forEach((e) => {
-              if (e.taxpayerId === params.taxpayerId) {
-                flag = false;
-              }
-            });
-            if (!flag) {
-              this.$Message.error('已有当前税号的发票信息，请直接选择已有发票');
-            } else {
-              saveReceipt(params)
-                .then((res) => {
-                  this.loading = false;
-                  if (res.success) {
-                    this.$emit('change', res.result);
-                    this.invoiceAvailable = false;
-                  }
-                })
-                .catch(() => {
-                  this.loading = false;
-                });
-            }
+          if (!valid) {
+            flage = false;
          }
        });
+      } else {
+        delete this.invoiceForm.taxpayerId;
+      }
+
+      return flage;
+    },
+
+    async submit () {
+      if (this.save()) {
+        this.loading = true;
+        let submit = {
+          way: this.$route.query.way,
+          ...this.invoiceForm
+        };
+        let receipt = await receiptSelect(submit);
+        if (receipt.success) {
+          this.$emit('change', true);
+        }
+
+        this.loading = false;
      }
    }
  }
--- a/buyer/src/components/verify/index.vue
+++ b/buyer/src/components/verify/index.vue
@@ -98,14 +98,14 @@ export default {
    }
  },
  created () {
-    this.getImg();
+    // this.getImg();
  },
  watch: {
    verifyType: {
      immediate: true,
      handler: function (v) {
        this.type = v;
-        this.refresh();
+        // this.refresh();
      }
    },
    show (v) {
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -50,7 +50,6 @@ export default {
  },
  created () {
    this.getGoodsDetail();
-    
  },
  data () {
    return {
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -69,7 +69,7 @@
                >人评价
              </div>
              <div class="goods-show-seller">
-                <span>{{ item.storeName }}</span>
+                <Tag v-if="item.selfOperated" style="padding:0 4px;" size="small" color="error">自营</Tag><span>{{ item.storeName }}</span>
              </div>
            </div>
          </div>
--- a/buyer/src/pages/PointMall.vue
+++ b/buyer/src/pages/PointMall.vue
@@ -108,7 +108,7 @@ export default {
      this.pageNumber = 1;
      this.params.pageSize = val;
      this.getList()
-    },
+    }
  }
 }
 </script>
@@ -132,10 +132,10 @@ export default {
      color: $theme_color;
    }
  }
+
  .selected-cate{
    color: $theme_color;
  }
-  
 }
 .page-size {
  width: 1200px;
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@@ -93,13 +93,13 @@
    </div>
    <div class="foot">
      <Row type="flex" justify="space-around" class="help">
-        <a class="item" href="https://lilishop.com" target="_blank">帮助</a>
-        <a class="item" href="https://lilishop.com" target="_blank">隐私</a>
-        <a class="item" href="https://lilishop.com" target="_blank">条款</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
      </Row>
      <Row type="flex" justify="center" class="copyright">
        Copyright © 2020 - Present
-        <a href="http://lili.cn" target="_blank" style="margin: 0 5px"
+        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
          >lili-shop</a
        >
        版权所有
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -30,13 +30,13 @@
    </div>
    <empty v-else />
    <!-- 分页 -->
-    <div class="page-size mt_10" v-if="paging">
+    <!-- <div class="page-size mt_10" v-if="paging">
      <Page :total="total" @on-change="changePageNum"
        @on-page-size-change="changePageSize"
        :page-size="params.pageSize"
        show-sizer>
      </Page>
-    </div>
+    </div> -->
  </div>
 </template>

@@ -61,7 +61,7 @@ export default {
      total: 0, // 收藏总数
      params: { // 请求参数
        pageNumber: 1,
-        pageSize: 10,
+        pageSize: 100,
        type: 'GOODS'
      },
      spinShow: false // 加载状态
--- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -44,6 +44,12 @@
        </tr>
      </table>
    </div>
+    <div class="order-card" v-if="afterSale.afterSaleImage">
+      <h3 class="mb_10">图片信息</h3>
+      <div v-for="img in afterSale.afterSaleImage.split(',')" :key="img">
+        <img :src="img" width="200" height="200" @click="perviewImg(img)" class="hover-pointer" alt="">
+      </div>
+    </div>
  </div>
 </template>
 <script>
@@ -83,6 +89,9 @@ export default {
    filterOrderStatus (status) { // 获取订单状态中文
      const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
      return ob[0].name
+    },
+    perviewImg (img) {
+      window.open(img, '_blank')
    }
  },
  mounted () {
--- a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
@@ -16,11 +16,11 @@
    </template>
    </Table>
    <div>
-      <Form :model="form" ref="form" :rules="rules" :label-width="80">
+      <Form :model="form" ref="form" class="mt_10" :rules="rules" :label-width="80">
        <FormItem label="售后类别">
          <RadioGroup v-model="form.serviceType" @on-change="changeReason" type="button" button-style="solid">
-            <Radio label="RETURN_GOODS">退货</Radio>
-            <Radio label="RETURN_MONEY">退款</Radio>
+            <Radio v-if="info.returnGoods" label="RETURN_GOODS">退货</Radio>
+            <Radio v-if="info.returnMoney" label="RETURN_MONEY">退款</Radio>
          </RadioGroup>
        </FormItem>
        <FormItem label="提交数量" prop="num">
@@ -144,6 +144,10 @@ export default {
        if (res.success) {
          this.info = res.result
          this.goodsData.push(res.result)
+          if (!this.info.returnGoods && this.info.returnMoney) {
+            this.form.serviceType = 'RETURN_MONEY'
+          }
+          this.getReason(this.form.serviceType)
        }
      })
    },
@@ -195,7 +199,6 @@ export default {
  mounted () {
    this.accessToken.accessToken = storage.getItem('accessToken');
    this.getInfo()
-    this.getReason('RETURN_GOODS')
  }
 }
 </script>
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -29,7 +29,6 @@
            <div>{{ filterOrderStatus(order.orderStatus) }}</div>
            <div>
              订单号：{{ order.sn }} &nbsp; &nbsp; &nbsp;{{order.createTime}}
-              &nbsp; &nbsp;{{ order.memberName | secrecyMobile }}
            </div>
          </div>
          <div>
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -2,7 +2,7 @@
  <div class="order-detail" v-if="order.order">
    <card _Title="订单详情" :_Size="16"></card>
    <div class="order-card">
-      <p class="global_color fontsize_18">{{ order.orderStatusValue }}</p>
+      <p class="global_color fontsize_18">{{ order.orderStatusValue }} <span class="verificationCode" v-if="order.order.verificationCode">核验码：{{order.order.verificationCode}}</span></p>
      <p class="global_color">订单号：{{ order.order.sn }}</p>
      <div style="color:#999;" class="operation-time">操作时间：{{order.order.updateTime}}</div>
      <Steps class="progress" :current="progressList.length" direction="vertical">
@@ -22,8 +22,8 @@
    </div>
    <div class="order-card">
      <h3>付款信息</h3>
-      <p>支付方式：在线支付</p>
-      <p>付款状态：未付款</p>
+      <p>支付方式：{{order.paymentMethodValue}}</p>
+      <p>付款状态：{{order.payStatusValue}}</p>
    </div>
    <div class="order-card">
      <h3>配送信息</h3>
@@ -234,7 +234,12 @@ table {
    font-size: 20px;
  }
 }
-
+.verificationCode {
+  font-size: 16px;
+  margin-left: 240px;
+  color: rgb(65, 63, 63);
+  font-weight: bold;
+}
 /** 订单进度条 */
 .progress {
  margin: 15px 0;
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -215,7 +215,7 @@ export default {
                      color: 'green'
                    }
                  },
-                  params.row.money
+                  this.$options.filters.unitPrice(params.row.money, '+ ¥')
                )
              ]);
            } else if (params.row.money < 0) {
@@ -227,7 +227,7 @@ export default {
                      color: 'red'
                    }
                  },
-                  params.row.money
+                  this.$options.filters.unitPrice(0 - params.row.money, '- ¥')
                )
              ]);
            }
@@ -252,7 +252,10 @@ export default {
        },
        {
          title: '充值金额',
-          key: 'rechargeMoney'
+          key: 'rechargeMoney',
+          render: (h, params) => {
+            return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
+          }
        },
        {
          title: '支付状态',
@@ -281,7 +284,9 @@ export default {
        {
          title: '提现金额',
          key: 'applyMoney',
-          width: 120
+          render: (h, params) => {
+            return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]);
+          }
        },
        {
          title: '提现状态',
@@ -392,9 +397,10 @@ export default {
        if (valid) {
          recharge(this.formData).then((res) => {
            if (res.message === 'success') {
-              // TODO 根据返回的值跳转到收银台进行支付,一下是输出sn
-              console.warn(res.result.rechargeSn);
-              this.modal = false;
+              this.$router.push({
+                path: '/payment',
+                query: { orderType: 'RECHARGE', sn: res.result.rechargeSn }
+              });
            }
          });
        }
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -15,6 +15,14 @@
        </span>
      </li>
    </ul>
+    <!-- 分页 -->
+    <div class="page-size">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
  </div>
 </template>

@@ -25,7 +33,14 @@ export default {
  data () {
    return {
      list: [], // 我的足迹，商品列表
-      spinShow: false // 控制loading是否加载
+      spinShow: false, // 控制loading是否加载
+      params: {
+        pageNumber: 1,
+        pageSize: 30,
+        order: 'desc',
+        sort: 'createTime'
+      },
+      total: 0
    };
  },
  mounted () {
@@ -71,7 +86,16 @@ export default {
        }
      })
    },
-    getList () {
+    changePageNum (val) { // 修改页码
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) { // 修改页数
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    getList () { // 获取足迹列表
      this.spinShow = true;
      tracksList(this.params).then(res => {
        this.spinShow = false
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
--- a/buyer/src/pages/payment/PayDone.vue
+++ b/buyer/src/pages/payment/PayDone.vue
@@ -6,7 +6,8 @@
    </div>
    <div class="pay-btn">
      <Button type="primary" @click="$router.push('/')">继续逛逛</Button>
-      <Button type="info" @click="$router.push('home/myOrder')">查看订单</Button>
+      <Button type="info" v-if="$route.query.orderType ==='RECHARGE'" @click="$router.push('/home/MoneyManagement')">查看余额</Button>
+      <Button type="info" v-else @click="$router.push('/home/myOrder')">查看订单</Button>
    </div>
  </div>
 </template>
--- a/buyer/src/pages/payment/PayMent.vue
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -5,31 +5,64 @@
      <div class="head-left">
        <div class="left-tips">订单提交成功，请尽快付款！</div>
        <div class="left-tips-time">请您尽快完成支付，否则订单会被自动取消</div>
+        <div class="left-tips-count-down">
+          <mv-count-down :startTime="startTime" class="count-down"
+            :endTime="endTime"
+            :endText="endText"
+            :dayTxt="'天'"
+            :hourTxt="'小时'"
+            :minutesTxt="'分钟'"
+            :secondsTxt="'秒'"
+            :isStart="isStart"></mv-count-down>
+
+        </div>
      </div>
      <div class="head-right">
-        <div>应付金额 <span class="price">{{payDetail.price | unitPrice}}</span>元</div>
+        <div>应付金额 <span class="price">{{ payDetail.price | unitPrice }}</span>元</div>
      </div>
    </div>
    <div class="wrapper-box">
-      <div class="-box-item" @click="handlePay('ALIPAY')">
-        <img src="https://ss3.bdstatic.com/yrwDcj7w0QhBkMak8IuT_XF5ehU5bvGh7c50/logopic/a9936a369e82e0c6c42112674a5220e8_fullsize.jpg" alt="">
+      <div v-if="support.includes('ALIPAY')" class="-box-item" @click="handlePay('ALIPAY')">
+        <img
+          src="https://ss3.bdstatic.com/yrwDcj7w0QhBkMak8IuT_XF5ehU5bvGh7c50/logopic/a9936a369e82e0c6c42112674a5220e8_fullsize.jpg"
+          alt="">
        <span>支付宝</span>
      </div>
-      <div  class="-box-item" @click="handlePay('WECHAT')">
-        <img src="https://dss1.bdstatic.com/6OF1bjeh1BF3odCf/it/u=3774939867,2826752539&fm=74&app=80&f=JPEG&size=f121,121?sec=1880279984&t=796e842a5ef2d16d9edc872d6f1147ef" alt="">
+      <div v-if="support.includes('WECHAT')" class="-box-item" @click="handlePay('WECHAT')">
+        <img
+          src="https://dss1.bdstatic.com/6OF1bjeh1BF3odCf/it/u=3774939867,2826752539&fm=74&app=80&f=JPEG&size=f121,121?sec=1880279984&t=796e842a5ef2d16d9edc872d6f1147ef"
+          alt="">
        <span>微信</span>
      </div>
+      <div v-if="support.includes('WALLET') && $route.query.orderType !== 'RECHARGE'" class="-box-item" @click="handlePay('WALLET')">
+        <Icon custom="icomoon icon-wallet" size="60"/>
+        <span>余额支付</span>
+        <span>当前剩余({{ walletValue | unitPrice('￥') }})</span>
+      </div>
    </div>
    <BaseFooter></BaseFooter>
  </div>
 </template>
 <script>
-import { tradeDetail } from '@/api/pay.js';
+
+import {tradeDetail, pay} from '@/api/pay.js';
+import MvCountDown from 'mv-count-down'
+import {Message} from 'view-design';
+
 export default {
+  components: {
+    MvCountDown
+  },
  data () {
    return {
      payDetail: {}, // 支付详情
-      qrcode: '' // 支付二维码
+      support: [], // 支持配送方式
+      walletValue: 0, // 当前余额
+      qrcode: '', // 支付二维码
+      startTime: new Date().getTime(), // 开始时间（时间戳）
+      endTime: 0, // 完成的时间（时间戳）
+      endText: '订单已超时取消', // 倒计时完成的提示文本
+      isStart: false // 控制倒计时开始的时机（异步请求完成开启）
    };
  },
  methods: {
@@ -39,15 +72,45 @@ export default {
      tradeDetail(params).then(res => {
        if (res.success) {
          this.payDetail = res.result;
+          this.endTime = this.payDetail.autoCancel
+          this.isStart = true
+          this.support = this.payDetail.support
+          this.walletValue = this.payDetail.walletValue
        }
      });
    },
+    // 支付
    handlePay (way) {
+      // 余额支付则直接跳转
+      if (way === 'WALLET') {
+        // 如果待支付金额大于余额，则报错
+        if (this.payDetail.price > this.walletValue) {
+          Message.error('余额不足以支付当前订单，如需充值请前往会员中心');
+          return;
+        }
+      }
      const params = this.$route.query;
      params.paymentMethod = way;
      params.paymentClient = 'NATIVE';
      params.price = this.payDetail.price;
-      this.$router.push({path: '/qrpay', query: params});
+      if (way === 'WALLET') {
+        this.$Modal.confirm({
+          title: '支付确认',
+          content: '<p>确认使用余额支付吗？</p>',
+          onOk: () => {
+            pay(params).then(res => {
+              if (res.success) {
+                this.$Message.warning(res.message)
+                this.$router.push('/payDone');
+              } else {
+                this.$Message.warning(res.message)
+              }
+            })
+          }
+        });
+      } else {
+        this.$router.push({path: '/qrpay', query: params});
+      }
    }
  },
  mounted () {
@@ -56,64 +119,83 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.head-left{
-    font-weight: bold;
+.head-left {
+  font-weight: bold;
 }
-.left-tips{
-    font-size: 21px;
+
+.left-tips {
+  font-size: 21px;

 }
-.-box-item{
-    margin-right: 30px;
-    display: flex;
-    font-size: 21px;
-    font-weight: bold;
-    align-items: center;
-    margin: 20px 20px;
-    cursor: pointer;
-    @include content_color($light_content_color);

-    &:hover{color: $theme_color;}
+.-box-item {
+  display: flex;
+  font-size: 18px;
+  font-weight: bold;
+  align-items: center;
+  margin: 20px 20px;
+  cursor: pointer;
+  @include content_color($light_content_color);

-    >span{
-        margin-left: 10px;
-    }
-    >img{
-        border-radius: 10px;
-        width: 60px;
-        height: 60px;
-    }
+  &:hover {
+    color: $theme_color;
+  }
+
+  > span {
+    margin-left: 15px;
+  }
+
+  > img {
+    border-radius: 10px;
+    width: 60px;
+    height: 60px;
+  }
 }
-.left-tips-time{
-    font-size: 16px;
+
+.left-tips-time {
+  font-size: 16px;
 }
-.wrapper-head{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-   line-height: 1.75;
+
+.left-tips-count-down {
+  font-size: 10px;
+  color: red;
 }
+
+.wrapper-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  line-height: 1.75;
+}
+
 .wrapper-head,
 .wrapper-box {
  padding: 20px 40px;
  width: 1200px;
  margin: 20px auto;
 }
+
 .wrapper-box {
  @include white_background_color();
  height: auto;
-  display: flex;
 }
+
 .wrapper {
  width: 100%;
  height: 100%;
 }
-.price{
-    font-size: 18px;
-    font-weight: bold;
-    color: $theme_color;
+
+.price {
+  font-size: 18px;
+  font-weight: bold;
+  color: $theme_color;
 }
-.head-right{
-    font-weight: bold;
+
+.head-right {
+  font-weight: bold;
+  font-size: 18px;
+}
+.count-down{
+  font-size: 16px!important;
 }
 </style>
--- a/buyer/src/pages/payment/thirdPay.vue
+++ b/buyer/src/pages/payment/thirdPay.vue
@@ -70,7 +70,7 @@ export default {
      payCallback(params).then(res => {
        if (res.result) {
          clearInterval(this.interval);
-          this.$router.push('/payDone');
+          this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
        }
      });
    }
--- a/buyer/src/pages/shopEntry/shop-entry.vue
+++ b/buyer/src/pages/shopEntry/shop-entry.vue
@@ -9,23 +9,11 @@
        <Step title="其他信息"></Step>
        <Step title="提交审核"></Step>
      </Steps>
-      <first-apply
-        v-if="currentIndex == 0 && dataReview"
-        :content="firstData"
-        @change="nextPage"
-      ></first-apply>
+      <first-apply v-if="currentIndex == 0 && dataReview" :content="firstData" @change="nextPage"></first-apply>

-      <second-apply
-        v-if="currentIndex == 1 && dataReview"
-        :content="secondData"
-        @change="nextPage"
-      ></second-apply>
+      <second-apply v-if="currentIndex == 1 && dataReview" :content="secondData" @change="nextPage"></second-apply>

-      <third-apply
-        v-if="currentIndex == 2 && dataReview"
-        :content="thirdData"
-        @change="nextPage"
-      ></third-apply>
+      <third-apply v-if="currentIndex == 2 && dataReview" :content="thirdData" @change="nextPage"></third-apply>

      <div class="success-page" v-if="currentIndex == 3">
        <span v-if="storeDisable == '' || storeDisable == 'APPLYING'">入驻申请提交成功，等待平台审核</span>
@@ -37,62 +25,51 @@
      <Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
    </div>

-    <Modal
-      title="店铺入驻协议"
-      v-model="showAgreement"
-      width="1200"
-      :closable="false"
-      :mask-closable="false"
-    >
+    <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
      <div class="agreeent-con" v-html="agreementCon"></div>

      <div slot="footer" style="text-align: center">
-        <p><Checkbox v-model="checked">我已同意以上协议</Checkbox></p>
-        <Button
-          type="primary"
-          :disabled="!checked"
-          class="margin"
-          @click="showAgreement = false"
-          >同意协议填写资质信息</Button
-        >
+        <p>
+          <Checkbox v-model="checked">我已同意以上协议</Checkbox>
+        </p>
+        <Button type="primary" :disabled="!checked" class="margin" @click="showAgreement = false">同意协议填写资质信息</Button>
      </div>
    </Modal>
  </div>
 </template>
 <script>
-import { agreement, applyStatus } from '@/api/shopentry';
-import firstApply from './first-apply';
-import secondApply from './second-apply';
-import thirdApply from './third-apply';
+import { agreement, applyStatus } from "@/api/shopentry";
+import firstApply from "./first-apply";
+import secondApply from "./second-apply";
+import thirdApply from "./third-apply";
 export default {
  components: {
    firstApply,
    secondApply,
-    thirdApply
+    thirdApply,
  },
-  data () {
+  data() {
    return {
      currentIndex: 0, // 当前步骤
      showAgreement: false, // 协议显示
-      agreementCon: '', // 协议内容
+      agreementCon: "", // 协议内容
      checked: false, // 选中协议
      applyData: {}, // 申请数据
      firstData: {}, // 第一步数据
      secondData: {}, // 第二步数据
      thirdData: {}, // 第三步数据
-      storeDisable: '', // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
-      dataReview: true // 根据接口返回判断是否可展示数据
+      storeDisable: "", // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
+      dataReview: true, // 根据接口返回判断是否可展示数据
    };
  },
  methods: {
-    getArticle () {
+    getArticle() {
      // 入驻协议
      agreement().then((res) => {
-        console.log(res);
-        this.agreementCon = res.result;
+        this.agreementCon = res.result.content;
      });
    },
-    getData () {
+    getData() {
      applyStatus().then((res) => {
        if (res.success) {
          if (!res.result) {
@@ -101,34 +78,34 @@ export default {
            this.dataReview = false;
            let data = res.result;
            let first = [
-              'addressIdPath',
-              'addressPath',
-              'companyAddress',
-              'companyEmail',
-              'companyName',
-              'employeeNum',
-              'legalId',
-              'legalName',
-              'licencePhoto',
-              'legalPhoto',
-              'licenseNum',
-              'linkName',
-              'linkPhone',
-              'registeredCapital',
-              'scope'
+              "addressIdPath",
+              "addressPath",
+              "companyAddress",
+              "companyEmail",
+              "companyName",
+              "employeeNum",
+              "legalId",
+              "legalName",
+              "licencePhoto",
+              "legalPhoto",
+              "licenseNum",
+              "linkName",
+              "linkPhone",
+              "registeredCapital",
+              "scope",
            ];
            let second = [
-              'settlementBankAccountName',
-              'settlementBankAccountNum',
-              'settlementBankBranchName',
-              'settlementBankJointName'
+              "settlementBankAccountName",
+              "settlementBankAccountNum",
+              "settlementBankBranchName",
+              "settlementBankJointName",
            ];
            let third = [
-              'goodsManagementCategory',
-              'storeCenter',
-              'storeDesc',
-              'storeLogo',
-              'storeName'
+              "goodsManagementCategory",
+              "storeCenter",
+              "storeDesc",
+              "storeLogo",
+              "storeName",
            ];

            this.storeDisable = data.storeDisable;
@@ -143,7 +120,7 @@ export default {
              this.thirdData[e] = data[e];
            });

-            if (this.storeDisable === 'APPLY') {
+            if (this.storeDisable === "APPLY") {
              this.currentIndex = 0;
            } else {
              this.currentIndex = 3;
@@ -154,13 +131,14 @@ export default {
        }
      });
    },
-    nextPage (step) {
+    nextPage(step) {
      this.currentIndex = step;
-    }
+    },
  },
-  mounted () {
+  mounted() {
    this.getData();
-  }
+    this.getArticle();
+  },
 };
 </script>
 <style lang="scss" scoped>
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -1,27 +1,27 @@
 // import Vue from 'vue';
-import axios from "axios";
-import https from "https";
-import { Message, Spin, Modal } from "view-design";
-import Storage from "./storage";
-import config from "@/config";
-import router from "../router/index.js";
-import store from "../vuex/store";
-import { handleRefreshToken } from "@/api/index";
-const qs = require("qs");
+import axios from 'axios';
+import https from 'https';
+import { Message, Spin, Modal } from 'view-design';
+import Storage from './storage';
+import config from '@/config';
+import router from '../router/index.js';
+import store from '../vuex/store';
+import { handleRefreshToken } from '@/api/index';
+const qs = require('qs');
 export const buyerUrl =
-  process.env.NODE_ENV === "development"
+  process.env.NODE_ENV === 'development'
    ? config.api_dev.buyer
    : config.api_prod.buyer;
 export const commonUrl =
-  process.env.NODE_ENV === "development"
+  process.env.NODE_ENV === 'development'
    ? config.api_dev.common
    : config.api_prod.common;
 export const managerUrl =
-  process.env.NODE_ENV === "development"
+  process.env.NODE_ENV === 'development'
    ? config.api_dev.manager
    : config.api_prod.manager;
 export const sellerUrl =
-  process.env.NODE_ENV === "development"
+  process.env.NODE_ENV === 'development'
    ? config.api_dev.seller
    : config.api_prod.seller;
 // 创建axios实例
@@ -35,7 +35,7 @@ const service = axios.create({
  }),
  paramsSerializer: params =>
    qs.stringify(params, {
-      arrayFormat: "repeat"
+      arrayFormat: 'repeat'
    })
 });

@@ -44,15 +44,15 @@ service.interceptors.request.use(
  config => {
    const { loading } = config;
    // 如果是put/post请求，用qs.stringify序列化参数
-    const isPutPost = config.method === "put" || config.method === "post";
-    const isJson = config.headers["Content-Type"] === "application/json";
-    const isFile = config.headers["Content-Type"] === "multipart/form-data";
+    const isPutPost = config.method === 'put' || config.method === 'post';
+    const isJson = config.headers['Content-Type'] === 'application/json';
+    const isFile = config.headers['Content-Type'] === 'multipart/form-data';
    if (isPutPost && isJson) {
      config.data = JSON.stringify(config.data);
    }
    if (isPutPost && !isFile && !isJson) {
      config.data = qs.stringify(config.data, {
-        arrayFormat: "repeat"
+        arrayFormat: 'repeat'
      });
    }
    /** 配置全屏加载 */
@@ -60,19 +60,19 @@ service.interceptors.request.use(
      config.loading = Spin.show();
    }

-    const uuid = Storage.getItem("uuid");
-    config.headers["uuid"] = uuid;
+    const uuid = Storage.getItem('uuid');
+    config.headers['uuid'] = uuid;

    // 获取访问Token
-    let accessToken = Storage.getItem("accessToken");
+    let accessToken = Storage.getItem('accessToken');
    if (accessToken && config.needToken) {
-      config.headers["accessToken"] = accessToken;
+      config.headers['accessToken'] = accessToken;
      // 解析当前token时间
      let jwtData = JSON.parse(
-        decodeURIComponent(escape(window.atob(accessToken.split(".")[1])))
+        decodeURIComponent(escape(window.atob(accessToken.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
      );
      if (jwtData.exp < Math.round(new Date() / 1000)) {
-        refresh()
+        refresh(config)
      }
    }

@@ -83,33 +83,32 @@ service.interceptors.request.use(
  }
 );

-async function refresh() {
+async function refresh (error) {
  const getTokenRes = await refreshToken();
-  if (getTokenRes === "success") {
+  if (getTokenRes === 'success') {
    // 刷新token
    if (isRefreshToken === 1) {
      error.response.config.headers.accessToken = Storage.getItem(
-        "accessToken"
+        'accessToken'
      );
      return service(error.response.config);
    } else {
      router.go(0);
    }
  } else {
-    Storage.removeItem("accessToken");
-    Storage.removeItem("refreshToken");
-    Storage.removeItem("userInfo");
-    Storage.setItem("cartNum", 0);
-    store.commit("SET_CARTNUM", 0);
-    console.log("1111");
+    Storage.removeItem('accessToken');
+    Storage.removeItem('refreshToken');
+    Storage.removeItem('userInfo');
+    Storage.setItem('cartNum', 0);
+    store.commit('SET_CARTNUM', 0);
    Modal.confirm({
-      title: "请登录",
-      content: "<p>请登录后执行此操作</p>",
-      okText: "立即登录",
-      cancelText: "继续浏览",
+      title: '请登录',
+      content: '<p>请登录后执行此操作</p>',
+      okText: '立即登录',
+      cancelText: '继续浏览',
      onOk: () => {
        router.push({
-          path: "/login",
+          path: '/login',
          query: {
            rePath: router.history.current.path,
            query: JSON.stringify(router.history.current.query)
@@ -140,15 +139,17 @@ service.interceptors.response.use(
      isRefreshToken++;

      if (isRefreshToken === 1) {
-        refresh()
+        refresh(error)
        isRefreshToken = 0;
      }
+    } else if (errorResponse.status === 404) {
+      // 避免刷新token时也提示报错信息
    } else {
      if (error.message) {
        let _message =
-          error.code === "ECONNABORTED"
-            ? "连接超时，请稍候再试！"
-            : "网络错误，请稍后再试！";
+          error.code === 'ECONNABORTED'
+            ? '连接超时，请稍候再试！'
+            : '网络错误，请稍后再试！';
        Message.error(errorData.message || _message);
      }
    }
@@ -171,13 +172,13 @@ const closeLoading = target => {
 };

 export const Method = {
-  GET: "get",
-  POST: "post",
-  PUT: "put",
-  DELETE: "delete"
+  GET: 'get',
+  POST: 'post',
+  PUT: 'put',
+  DELETE: 'delete'
 };

-export default function request(options) {
+export default function request (options) {
  // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。
  //   if (process.server || options.url.indexOf('passport/token') !== -1) {
  return service(options);
@@ -186,19 +187,19 @@ export default function request(options) {
 }

 // 防抖闭包来一波
-function getTokenDebounce() {
+function getTokenDebounce () {
  let lock = false;
  let success = false;
-  return function() {
+  return function () {
    if (!lock) {
      lock = true;
-      let oldRefreshToken = Storage.getItem("refreshToken");
+      let oldRefreshToken = Storage.getItem('refreshToken');
      handleRefreshToken(oldRefreshToken)
        .then(res => {
          if (res.success) {
            let { accessToken, refreshToken } = res.result;
-            Storage.setItem("accessToken", accessToken);
-            Storage.setItem("refreshToken", refreshToken);
+            Storage.setItem('accessToken', accessToken);
+            Storage.setItem('refreshToken', refreshToken);

            success = true;
            lock = false;
@@ -220,9 +221,9 @@ function getTokenDebounce() {
        if (!lock) {
          clearInterval(timer);
          if (success) {
-            resolve("success");
+            resolve('success');
          } else {
-            resolve("fail");
+            resolve('fail');
          }
        }
      }, 500); // 轮询时间间隔