Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

# Conflicts:
#	manager/vue.config.js
#	seller/vue.config.js

buyer/src/components/header/Header.vue

@@ -45,14 +45,14 @@
                 </div>
                 <div class="sign-out" @click="signOutFun">
                   <Icon type="md-exit"></Icon>
-                  <p>退出登陆</p>
+                  <p>退出登录</p>
                 </div>
               </div>
             </DropdownMenu>
           </Dropdown>
         </li>
-        <li class="hover-color" @click="goUserCenter('home/MyOrder')"><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 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>
@@ -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) { // 跳转我的订单，我的足迹
@@ -301,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 {

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;

buyer/src/pages/shopEntry/first-apply.vue

@@ -193,9 +193,7 @@ export default {
   components: { region },
   props: {
     content: {
-      default () {
+      default: {},
-        return {};
-      },
       type: Object
     }
   },
@@ -325,6 +323,7 @@ export default {
   },
   mounted () {
     this.accessToken.accessToken = storage.getItem('accessToken');
+    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(',');
@@ -332,6 +331,7 @@ export default {
         this.address = this.form.addressIdPath;
       }
     }
+  }
 };
 </script>
 <style lang="scss" scoped>

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>',

manager/vue.config.js

@@ -18,12 +18,6 @@ module.exports = {
   },
   devServer: {
     port: 10003
-    // proxy: {
-    //     '/lili': {
-    //         target: 'http://127.0.0.1:8888',  // 请求本地 需要lili后台项目
-    //         ws: true
-    //     }
-    // }
   },
 
   chainWebpack: config => {

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: "",

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();
   }
 };

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) {

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) {
+    manage(v, status) {
-      this.$router.push({ name: "pintuan-goods", query: { id: v.id } });
+      this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } });
     },
     open(v) {
       this.$Modal.confirm({

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="
+        <Button type="dashed" @click="openTip = !openTip">{{ openTip ? "关闭提示" : "开启提示" }}</Button>
-            () => {
-              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>

seller/vue.config.js

@@ -16,14 +16,7 @@ module.exports = {
         }
       },
     devServer: {
-
         port: 10002,
-        // 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',