From 9df8a753d46dc02e576a72d88046d963308630d9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 17 May 2021 10:34:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/vuex/store.js                              |  2 +-
 seller/src/libs/routerJson.js                        |  2 +-
 seller/src/router/router.js                          | 12 ++++++------
 .../promotion/fullCut/{full-cut.vue => fullCut.vue}  |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename seller/src/views/promotion/fullCut/{full-cut.vue => fullCut.vue} (99%)

diff --git a/buyer/src/vuex/store.js b/buyer/src/vuex/store.js
index 105eded6..61a5b9f0 100644
--- a/buyer/src/vuex/store.js
+++ b/buyer/src/vuex/store.js
@@ -11,7 +11,7 @@ export default new Vuex.Store({
   state: {
     category: [], // 全部分类
     navList: [],
-    cartNum: storage.getItem('cartNum') || 0
+    cartNum: storage.getItem('userInfo') ? storage.getItem('cartNum') : 0
   },
   getters,
   actions,
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index 41937a01..29ec21bc 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -405,7 +405,7 @@ export const result = [
             type: 0,
             title: "满额活动",
             path: "full-cut",
-            component: "promotion/fullCut/full-cut",
+            component: "promotion/fullCut/fullCut",
             icon: "md-person",
             isMenu: true,
             url: "",
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index eaf49412..133081b5 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -115,12 +115,12 @@ export const otherRouter = {
       component: () =>
         import("@/views/order/after-order/reurnGoodsOrderDetail.vue")
     },
-    {
-      path: "full-cut-detail",
-      title: "添加满额活动",
-      name: "full-cut-detail",
-      component: () => import("@/views/promotion/fullCut/newFullCut.vue")
-    },
+    // {
+    //   path: "full-cut-detail",
+    //   title: "添加满额活动",
+    //   name: "full-cut-detail",
+    //   component: () => import("@/views/promotion/fullCut/newFullCut.vue")
+    // },
     {
       path: "order-detail",
       title: "订单详情",
diff --git a/seller/src/views/promotion/fullCut/full-cut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
similarity index 99%
rename from seller/src/views/promotion/fullCut/full-cut.vue
rename to seller/src/views/promotion/fullCut/fullCut.vue
index 8f3d1cac..3a18d8f7 100644
--- a/seller/src/views/promotion/fullCut/full-cut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -111,6 +111,7 @@
 <script>
 import { getFullDiscountList, delFullDiscount } from "@/api/promotion.js";
 export default {
+  name: 'full-cut',
   data() {
     return {
       loading: false, // 表单加载状态
@@ -256,7 +257,7 @@ export default {
       });
     },
   },
-  activated() {
+  activated () {
     this.init();
   }
 };

From 182a77f0cbeb651122a0cfaa523f23a81914ae40 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 17 May 2021 11:00:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=EF=BC=8C=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/header/Header.vue | 4 +++-
 buyer/src/plugins/request.js           | 5 ++++-
 buyer/src/vuex/store.js                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index af0b69f7..e5a616a0 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -45,7 +45,7 @@
                 </div>
                 <div class="sign-out" @click="signOutFun">
                   <Icon type="md-exit"></Icon>
-                  <p>退出登陆</p>
+                  <p>退出登录</p>
                 </div>
               </div>
             </DropdownMenu>
@@ -173,6 +173,8 @@ export default {
       storage.removeItem('accessToken');
       storage.removeItem('refreshToken');
       storage.removeItem('userInfo');
+      storage.removeItem('cartNum');
+      this.$store.commit('SET_CARTNUM', 0)
       this.$router.push('/login');
     },
     goUserCenter (path) { // 跳转我的订单，我的足迹
diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
index 383b5098..1b3c8bc9 100644
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -9,6 +9,7 @@ import {
 import Storage from './storage';
 import config from '@/config';
 import router from '../router/index.js';
+import store from '../vuex/store';
 import {
   handleRefreshToken
 } from '@/api/index';
@@ -80,7 +81,6 @@ service.interceptors.response.use(
     const errorData = errorResponse.data || {};
 
     if (errorResponse.status === 403) {
-
       isRefreshToken++;
 
       if (isRefreshToken === 1) {
@@ -96,6 +96,9 @@ service.interceptors.response.use(
           Storage.removeItem('accessToken');
           Storage.removeItem('refreshToken');
           Storage.removeItem('userInfo');
+          Storage.setItem('cartNum', 0)
+          store.commit('SET_CARTNUM', 0)
+          console.log('1111');
           Modal.confirm({
             title: '请登录',
             content: '<p>请登录后执行此操作</p>',
diff --git a/buyer/src/vuex/store.js b/buyer/src/vuex/store.js
index 61a5b9f0..105eded6 100644
--- a/buyer/src/vuex/store.js
+++ b/buyer/src/vuex/store.js
@@ -11,7 +11,7 @@ export default new Vuex.Store({
   state: {
     category: [], // 全部分类
     navList: [],
-    cartNum: storage.getItem('userInfo') ? storage.getItem('cartNum') : 0
+    cartNum: storage.getItem('cartNum') || 0
   },
   getters,
   actions,

From 25690e86e75ecb0568d429372d66c0f99da6d9c9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 17 May 2021 11:34:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?header=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/header/Header.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index e5a616a0..182a7183 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -51,8 +51,8 @@
             </DropdownMenu>
           </Dropdown>
         </li>
-        <li class="hover-color" @click="goUserCenter('home/MyOrder')"><span class="nav-item">我的订单</span></li>
-        <li class="hover-color" @click="goUserCenter('home/MyTracks')"><span class="nav-item">我的足迹</span></li>
+        <li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
+        <li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
         <li v-if="$route.name !== 'Cart'" style="position:relative;" @mouseenter="getCartList">
           <i class="cart-badge" v-show="cartNum">{{cartNum < 100 ? cartNum : '99'}}</i>
           <Dropdown placement="bottom-start">
@@ -83,7 +83,7 @@
                   </div>
                   <div class="shopping-cart-info">
                     <div class="shopping-cart-title ">
-                      <p class="hover-pointer goods-title">{{ item.goodsSku.goodsName }}</p>
+                      <p class="hover-pointer goods-title ellipsis">{{ item.goodsSku.goodsName }}</p>
                     </div>
                     <div class="shopping-cart-detail">
                       <p>
@@ -303,7 +303,7 @@ export default {
 .shopping-cart-list {
   padding: 10px 15px;
   box-sizing: border-box;
-  height: 300px;
+  max-height: 300px;
   overflow: scroll;
 }
 .shopping-cart-box {

From a4f2fc1381a1f47677749b9adb4df77030b7a77d Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 17 May 2021 15:38:31 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BBbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/Login.vue                     |  1 +
 buyer/src/pages/shopEntry/first-apply.vue     | 16 +++++-----
 manager/vue.config.js                         |  6 ----
 seller/src/router/router.js                   | 12 ++++----
 .../views/promotion/fullCut/newFullCut.vue    |  5 +++-
 .../src/views/promotion/pintuan/pintuan.vue   | 13 +++++++--
 .../views/promotion/pintuan/pintuanGoods.vue  | 29 ++++++++++++-------
 seller/vue.config.js                          | 11 -------
 8 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
index 8b765272..ee137d0a 100644
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -245,6 +245,7 @@ export default {
             this.$Message.success('验证码发送成功');
             let that = this;
             this.interval = setInterval(() => {
+              console.log(that.time);
               that.time--;
               if (that.time === 0) {
                 that.time = 60;
diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue
index 87788ff1..715951b2 100644
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@@ -193,9 +193,7 @@ export default {
   components: { region },
   props: {
     content: {
-      default () {
-        return {};
-      },
+      default: {},
       type: Object
     }
   },
@@ -325,11 +323,13 @@ export default {
   },
   mounted () {
     this.accessToken.accessToken = storage.getItem('accessToken');
-    this.form = JSON.parse(JSON.stringify(this.content));
-    if (this.form.licencePhoto) {
-      this.form.legalPhoto = this.content.legalPhoto.split(',');
-      this.form.licencePhoto = this.content.licencePhoto.split(',');
-      this.address = this.form.addressIdPath;
+    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(',');
+        this.form.licencePhoto = this.content.licencePhoto.split(',');
+        this.address = this.form.addressIdPath;
+      }
     }
   }
 };
diff --git a/manager/vue.config.js b/manager/vue.config.js
index b5be380c..df94c1ff 100644
--- a/manager/vue.config.js
+++ b/manager/vue.config.js
@@ -18,12 +18,6 @@ module.exports = {
   },
   devServer: {
     port: 9999
-    // proxy: {
-    //     '/lili': {
-    //         target: 'http://127.0.0.1:8888',  // 请求本地 需要lili后台项目
-    //         ws: true
-    //     }
-    // }
   },
 
   chainWebpack: config => {
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index 133081b5..eaf49412 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -115,12 +115,12 @@ export const otherRouter = {
       component: () =>
         import("@/views/order/after-order/reurnGoodsOrderDetail.vue")
     },
-    // {
-    //   path: "full-cut-detail",
-    //   title: "添加满额活动",
-    //   name: "full-cut-detail",
-    //   component: () => import("@/views/promotion/fullCut/newFullCut.vue")
-    // },
+    {
+      path: "full-cut-detail",
+      title: "添加满额活动",
+      name: "full-cut-detail",
+      component: () => import("@/views/promotion/fullCut/newFullCut.vue")
+    },
     {
       path: "order-detail",
       title: "订单详情",
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
index b17138c7..d7fc23b6 100644
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -496,6 +496,7 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
+      console.log(item);
       // 回显已选商品
       let ids = [];
       let list = [];
@@ -509,11 +510,13 @@ export default {
             price: e.price,
             quantity: e.quantity,
             storeId: e.storeId,
-            sellerName: e.sellerName,
+            storeName: e.storeName,
+            thumbnail: e.thumbnail,
             skuId: e.id,
           });
         }
       });
+      console.log(list);
       this.form.promotionGoodsList.push(...list);
     },
     getCouponList(query) {
diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue
index ea86f7dd..be4159a3 100644
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@@ -68,9 +68,16 @@
               type="info"
               v-if="row.promotionStatus == 'NEW'"
               size="small"
-              @click="manage(row)"
+              @click="manage(row, 'manager')"
               >管理</Button
             >&nbsp;
+            <Button
+              type="info"
+              v-if="row.promotionStatus !== 'NEW'"
+              size="small"
+              @click="manage(row, 'view')"
+              >查看</Button
+            >&nbsp;
             <Button
               type="error"
               size="small"
@@ -252,8 +259,8 @@ export default {
     edit(v) {
       this.$router.push({ name: "new-pintuan", query: { id: v.id } });
     },
-    manage(v) {
-      this.$router.push({ name: "pintuan-goods", query: { id: v.id } });
+    manage(v, status) {
+      this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } });
     },
     open(v) {
       this.$Modal.confirm({
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index 55054274..b1d56c37 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -3,22 +3,19 @@
     <Card>
       <Table style="margin: 10px 0" border :columns="columns" :data="data"></Table>
 
-      <Row class="operation">
+      <Row class="operation" v-if="status == 'manager'">
         <Button type="primary" @click="openSkuList">选择商品</Button>
         <Button @click="delAll">批量删除</Button>
         <Button @click="getDataList" icon="md-refresh">刷新</Button>
-        <Button type="dashed" @click="
-            () => {
-              openTip = !openTip;
-            }
-          ">{{ openTip ? "关闭提示" : "开启提示" }}</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{ openTip ? "关闭提示" : "开启提示" }}</Button>
       </Row>
-      <Row v-show="openTip">
+      <Row v-show="openTip"  v-if="status == 'manager'">
         <Alert show-icon>
           已选择 <span class="select-count">{{ selectCount }}</span> 项
           <a class="select-clear" @click="clearSelectAll">清空</a>
         </Alert>
       </Row>
+      <h3 class="act-goods">活动商品</h3>
       <Row class="operation">
         <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
           <template slot-scope="{ row, index }" slot="price">
@@ -35,7 +32,7 @@
       </Row>
       <Row class="operation">
         <Button @click="closeCurrentPage">返回</Button>
-        <Button type="primary" :loading="submitLoading" @click="save">保存</Button>
+        <Button  v-if="status == 'manager'" type="primary" :loading="submitLoading" @click="save">保存</Button>
       </Row>
     </Card>
 
@@ -57,8 +54,7 @@ export default {
     return {
       openTip: true, // 显示提示
       loading: false, // 表单加载状态
-      searchForm: {
-        // 搜索框初始化对象
+      searchForm: { // 搜索框初始化对象
         pageNumber: 0, // 当前页数
         pageSize: 10, // 页面大小
       },
@@ -68,6 +64,7 @@ export default {
       selectCount: 0, // 多选计数
       data: [], // 表单数据
       total: 0, // 表单数据总数
+      status: this.$route.query.status, // 查看还是修改
       columns: [
         {
           title: "活动名称",
@@ -326,4 +323,16 @@ export default {
 .operation {
   margin-bottom: 10px;
 }
+.act-goods {
+  margin: 20px 0;
+  font-size: 15px;
+  &::before{
+    content: '';
+    border: 1px solid $theme_color;
+    height: 10px;
+    font-weight: bold;
+    font-size: 16px;
+    margin-right: 5px;
+  }
+}
 </style>
diff --git a/seller/vue.config.js b/seller/vue.config.js
index c287a6f8..6da99dae 100644
--- a/seller/vue.config.js
+++ b/seller/vue.config.js
@@ -16,14 +16,7 @@ module.exports = {
         }
       },
     devServer: {
-
         port: 9998,
-        // proxy: {
-        //     '/lili': {
-        //         target: 'http://127.0.0.1:8888',  // 请求本地 需要lili后台项目
-        //         ws: true
-        //     }
-        // }
     },
 
     chainWebpack: config => {
@@ -76,12 +69,9 @@ module.exports = {
               vendor: {
                 test: /[\\/]node_modules[\\/]/,
                 name(module) {
-                  // get the name. E.g. node_modules/packageName/not/this/part.js
-                  // or node_modules/packageName
                   const packageName = module.context.match(
                     /[\\/]node_modules[\\/](.*?)([\\/]|$)/
                   )[1];
-                  // npm package names are URL-safe, but some servers don't like @ symbols
                   return `npm.${packageName.replace("@", "")}`;
                 }
               }
@@ -89,7 +79,6 @@ module.exports = {
           }
         }
     },
-
     pluginOptions: {
       'style-resources-loader': {
         preProcessor: 'scss',