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

buyer/src/App.vue

@@ -5,17 +5,10 @@
 </template>
 
 <script>
-import {v4 as uuidv4} from 'uuid';
-import storage from '@/plugins/storage';
+
 export default {
   name: 'App',
-  mounted () {
-    let uuid = storage.getItem('uuid');
-    if (!uuid) {
-      uuid = uuidv4();
-      storage.setItem('uuid', uuid);
-    }
-  }
+
 };
 </script>
 <style lang="scss">

buyer/src/plugins/request.js

@@ -5,6 +5,8 @@ import Storage from './storage';
 import router from '../router/index.js';
 import store from '../vuex/store';
 import { handleRefreshToken } from '@/api/index';
+import {v4 as uuidv4} from 'uuid';
+
 const qs = require('qs');
 // api地址
 export const buyerUrl =
@@ -59,7 +61,11 @@ service.interceptors.request.use(
       config.loading = Spin.show();
     }
 
-    const uuid = Storage.getItem('uuid');
+    let uuid = Storage.getItem('uuid');
+    if (!uuid) {
+      uuid = uuidv4();
+      Storage.setItem('uuid', uuid);
+    }
     config.headers['uuid'] = uuid;
 
     // 获取访问Token

manager/src/App.vue

@@ -5,7 +5,6 @@
 </template>
 
 <script>
-import {v4 as uuidv4} from 'uuid';
 import {getCategoryTree} from '@/api/goods.js'
 export default {
   updated() {
@@ -17,13 +16,7 @@ export default {
       })
     }
   },
-  mounted() {
-    let uuid = this.getStore('uuid');
-    if (!uuid) {
-      uuid = uuidv4();
-      this.setStore('uuid', uuid);
-    }
-  },
+
 };
 </script>
 

manager/src/libs/axios.js

@@ -4,6 +4,7 @@ import { router } from "../router/index";
 import { Message } from "view-design";
 import Cookies from "js-cookie";
 import { handleRefreshToken } from "../api/index";
+import {v4 as uuidv4} from 'uuid';
 
 // 统一请求路径前缀
 export const commonUrl =
@@ -29,7 +30,11 @@ service.interceptors.request.use(
         ...config.params
       };
     }
-    const uuid = getStore("uuid");
+    let uuid = getStore("uuid");
+    if (!uuid) {
+      uuid = uuidv4();
+      setStore('uuid', uuid);
+    }
     config.headers["uuid"] = uuid;
     return config;
   },

seller/src/App.vue

@@ -5,15 +5,8 @@
 </template>
 
 <script>
-import {v4 as uuidv4} from 'uuid';
 export default {
-  mounted() {
-    let uuid = this.getStore('uuid');
-    if (!uuid) {
-      uuid = uuidv4();
-      this.setStore('uuid', uuid);
-    }
-  },
+
 };
 </script>
 

seller/src/libs/axios.js

@@ -4,6 +4,7 @@ import { router } from "../router/index";
 import { Message } from "view-design";
 import Cookies from "js-cookie";
 import { handleRefreshToken } from "@/api/index";
+import {v4 as uuidv4} from 'uuid';
 
 // 统一请求路径前缀
 export const baseUrl =
@@ -30,7 +31,12 @@ service.interceptors.request.use(
         ...config.params
       };
     }
-    const uuid = getStore("uuid");
+    let uuid = getStore("uuid");
+    if (!uuid) {
+      uuid = uuidv4();
+      setStore('uuid', uuid);
+    }
+
     config.headers["uuid"] = uuid;
     return config;
   },

seller/src/views/promotion/pintuan/pintuan-goods.vue

@@ -47,7 +47,7 @@
       </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page
-          :current="searchForm.pageNumber + 1"
+          :current="searchForm.pageNumber"
           :total="total"
           :page-size="searchForm.pageSize"
           @on-change="changePage"
@@ -91,7 +91,7 @@ export default {
       loading: false, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
       },
 
@@ -219,7 +219,7 @@ export default {
 
     changePage(v) {
       // 分页 改变页数
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
       this.getDataList();
       this.clearSelectAll();
     },
@@ -232,14 +232,14 @@ export default {
 
     handleSearch() {
       // 搜索
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
 
     handleReset() {
       // 重置
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.promotionName = "";
       this.selectDate = null;
       this.getDataList();

seller/src/views/promotion/pintuan/pintuan.vue

@@ -62,31 +62,31 @@
               v-if="row.promotionStatus == 'NEW'"
               @click="edit(row)"
               >编辑</Button
-            >&nbsp;
+            >
             <Button
               type="info"
               v-if="row.promotionStatus == 'NEW'"
               size="small"
               @click="manage(row, 'manager')"
               >管理</Button
-            >&nbsp;
+            >
             <Button
               type="info"
-              v-if="row.promotionStatus !== 'NEW'"
+              v-if="row.promotionStatus !== 'NEW' && row.promotionStatus !== 'CLOSE'"
               size="small"
               @click="manage(row, 'view')"
               >查看</Button
-            >&nbsp;
+            >
             <Button
               type="error"
               size="small"
               v-if="row.promotionStatus != 'START'"
               @click="remove(row)"
               >删除</Button
-            >&nbsp;
+            >
             <Button
               type="success"
-              v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'"
+              v-if="row.promotionStatus == 'CLOSE'"
               size="small"
               @click="open(row)"
               >开启</Button
@@ -345,4 +345,8 @@ export default {
 </script>
 <style lang="scss">
 @import "@/styles/table-common.scss";
+.row Button {
+  margin-right: 4px;
+
+}
 </style>