From 6d20a5648c7e882e105edb23b5d565d64e03a68e Mon Sep 17 00:00:00 2001
From: yezhenman <691226925@qq.com>
Date: Fri, 12 Aug 2022 18:26:27 +0800
Subject: [PATCH] =?UTF-8?q?2022-8-12-=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/frontend/src/App.vue                |   12 +-
 resources/frontend/src/UploadExcel/index.vue  |    9 +
 resources/frontend/src/api/goods.js           |   63 +-
 resources/frontend/src/api/record.js          |   11 +
 resources/frontend/src/api/role.js            |   35 +
 resources/frontend/src/api/shop.js            |   35 +-
 resources/frontend/src/api/user.js            |   45 +
 .../frontend/src/components/upload/index.vue  |  119 +-
 resources/frontend/src/css/img/编辑.png       |  Bin 0 -> 348 bytes
 resources/frontend/src/css/img/编辑@2x.png    |  Bin 0 -> 560 bytes
 resources/frontend/src/main.js                |   28 +-
 resources/frontend/src/router/index.js        |   16 +-
 resources/frontend/src/router/index1.js       |   87 +-
 resources/frontend/src/util/auth.js           |   14 +-
 resources/frontend/src/util/http.js           |   64 +-
 .../src/views/{logo.vue => Login.vue}         |   56 +-
 resources/frontend/src/views/brand/brand.vue  |   48 +-
 resources/frontend/src/views/home/home.vue    |   40 +-
 .../frontend/src/views/home/home/cesi.vue     |   33 +-
 .../frontend/src/views/home/home/index.vue    |  231 ++--
 resources/frontend/src/views/index.vue        |  155 ++-
 resources/frontend/src/views/shuju/record.vue |  273 +++--
 resources/frontend/src/views/shuju/shuju.vue  |   12 +-
 resources/frontend/src/views/store/store.vue  |   56 +-
 .../frontend/src/views/system/authority.vue   |   13 +-
 resources/frontend/src/views/system/role.vue  |  102 +-
 resources/frontend/src/views/users/users.vue  |  151 +--
 .../views/yingyeting/addgoods/addgoods.vue    |  254 ++++-
 .../src/views/yingyeting/yingyeting.vue       | 1002 ++++++++++++++---
 29 files changed, 1922 insertions(+), 1042 deletions(-)
 create mode 100644 resources/frontend/src/UploadExcel/index.vue
 create mode 100644 resources/frontend/src/api/record.js
 create mode 100644 resources/frontend/src/api/role.js
 create mode 100644 resources/frontend/src/api/user.js
 create mode 100644 resources/frontend/src/css/img/编辑.png
 create mode 100644 resources/frontend/src/css/img/编辑@2x.png
 rename resources/frontend/src/views/{logo.vue => Login.vue} (77%)

diff --git a/resources/frontend/src/App.vue b/resources/frontend/src/App.vue
index cea2c13..32c7597 100644
--- a/resources/frontend/src/App.vue
+++ b/resources/frontend/src/App.vue
@@ -4,13 +4,13 @@
   </div>
 </template>
 <script>
-import { getToken } from "@/util/auth";
+// import { getToken } from "@/util/auth";
 export default {
-  created() {
-    if (!getToken()) {
-      this.$router.push({ name: "logo" });
-    }
-  },
+  // created() {
+  //   if (!getToken()) {
+  //     this.$router.push({ name: "Login" });
+  //   }
+  // },
 };
 </script>
 
diff --git a/resources/frontend/src/UploadExcel/index.vue b/resources/frontend/src/UploadExcel/index.vue
new file mode 100644
index 0000000..6871671
--- /dev/null
+++ b/resources/frontend/src/UploadExcel/index.vue
@@ -0,0 +1,9 @@
+<template>
+    <div>
+        <UploadExcel :on-success="handleSuccess" :before-upload="beforeUpload" />
+    </div>
+</template>
+
+<script>
+
+</script>
\ No newline at end of file
diff --git a/resources/frontend/src/api/goods.js b/resources/frontend/src/api/goods.js
index fe04f9f..5418ce0 100644
--- a/resources/frontend/src/api/goods.js
+++ b/resources/frontend/src/api/goods.js
@@ -1,40 +1,59 @@
-import http from '@/util/http.js'
+import http from "@/util/http.js";
 
 // 商品管理列表
-export function goods (data) {
+export function goods(params) {
   return http({
-    url: '/api/goods_skus',
-    method: 'get',
-    data
-  })
+    url: "/api/goods_skus",
+    method: "get",
+    params,
+  });
 }
 // 新建商品
-export function addGoods (data) {
+export function addGoods(data) {
   return http({
-    url: '/api/goods',
-    method: 'post',
-    data
-  })
+    url: "/api/goods",
+    method: "post",
+    data,
+  });
 }
 // 查看商品
-export function checkGoods (id) {
+export function checkGoods(id) {
   return http({
     url: `/api/goods_skus/${id}`,
-    method: 'get'
-  })
+    method: "get",
+  });
 }
 // 商品列表
-export function goodsList () {
+export function goodsList(params) {
   return http({
-    url: '/api/goods',
-    method: 'get'
-  })
+    url: "/api/goods",
+    method: "get",
+    params,
+  });
 }
 // 更新商品
-export function updateGoods (id, data) {
+export function updateGoods(id, params) {
   return http({
     url: `/api/goods_skus/${id}`,
-    method: 'patch',
-    data
-  })
+    method: "patch",
+    params,
+  });
+}
+
+// 上新/库存盘点/库存
+export function update(data) {
+  return http({
+    url: "/api/batch/goods_skus",
+    method: "patch",
+    data,
+  });
+}
+
+// 单个字段更新
+export function singleUpdate(id, data) {
+  return http({
+    url: `/api/single/goods_skus/${id}`,
+    method: "patch",
+    data,
+  });
 }
diff --git a/resources/frontend/src/api/record.js b/resources/frontend/src/api/record.js
new file mode 100644
index 0000000..56a9069
--- /dev/null
+++ b/resources/frontend/src/api/record.js
@@ -0,0 +1,11 @@
+import http from "@/util/http.js";
+
+// 单品日志记录请求
+
+export function recordList(params) {
+  return http({
+    url: "/api/logs",
+    method: "get",
+    params,
+  });
+}
diff --git a/resources/frontend/src/api/role.js b/resources/frontend/src/api/role.js
new file mode 100644
index 0000000..b302181
--- /dev/null
+++ b/resources/frontend/src/api/role.js
@@ -0,0 +1,35 @@
+import http from "@/util/http.js";
+
+// 角色管理页面请求
+export function roleList() {
+  return http({
+    url: "/api/roles",
+    method: "get",
+  });
+}
+
+// 角色新增请求
+export function roleAdd(data) {
+  return http({
+    url: "/api/roles",
+    method: "post",
+    data,
+  });
+}
+
+// 角色权限列表请求
+export function jurisdiction() {
+  return http({
+    url: "/api/permissions",
+    method: "get",
+  });
+}
+
+// 角色权限编辑
+export function jurisdictionEdit(id, data) {
+  return http({
+    url: `/api/roles/${id}/permissions`,
+    method: "post",
+    data,
+  });
+}
diff --git a/resources/frontend/src/api/shop.js b/resources/frontend/src/api/shop.js
index 4faadf3..9056e8c 100644
--- a/resources/frontend/src/api/shop.js
+++ b/resources/frontend/src/api/shop.js
@@ -1,24 +1,27 @@
-import http from '@/util/http.js'
-// 店铺平台列表
-export function shopListId () {
+import http from "@/util/http.js";
+
+// 店铺管理页面请求
+
+// 店铺平台
+export function shopListId() {
   return http({
-    url: '/api/shop_platforms',
-    method: 'get'
-  })
+    url: "/api/shop_platforms",
+    method: "get",
+  });
 }
 // 店铺新增
-export function shopAdd (data) {
+export function shopAdd(data) {
   return http({
-    url: '/api/shops',
-    method: 'post',
-    data
-  })
+    url: "/api/shops",
+    method: "post",
+    data,
+  });
 }
 // 店铺列表
-export function storeList (data) {
+export function storeList(data) {
   return http({
-    url: '/api/shops',
-    method: 'get',
-    data
-  })
+    url: "/api/shops",
+    method: "get",
+    data,
+  });
 }
diff --git a/resources/frontend/src/api/user.js b/resources/frontend/src/api/user.js
new file mode 100644
index 0000000..1190d1a
--- /dev/null
+++ b/resources/frontend/src/api/user.js
@@ -0,0 +1,45 @@
+import http from "@/util/http.js";
+
+//用户管理列表请求
+
+// 角色列表请求
+export function roleList() {
+  return http({
+    url: "/api/roles",
+    method: "get",
+  });
+}
+
+//用户列表请求
+export function userList() {
+  return http({
+    url: "/api/users",
+    method: "get",
+  });
+}
+
+//用户新增请求
+export function userAdd(data) {
+  return http({
+    url: "/api/users",
+    method: "post",
+    data,
+  });
+}
+
+// 用户管理点击编辑请求
+export function userEdit(id) {
+  return http({
+    url: `/api/users/${id}`,
+    method: "get",
+  });
+}
+
+//编辑完确认请求
+export function userConfirm(id, data) {
+  return http({
+    url: `/api/users/${id}`,
+    method: "patch",
+    data,
+  });
+}
diff --git a/resources/frontend/src/components/upload/index.vue b/resources/frontend/src/components/upload/index.vue
index 4db0117..642e85a 100644
--- a/resources/frontend/src/components/upload/index.vue
+++ b/resources/frontend/src/components/upload/index.vue
@@ -8,40 +8,41 @@
 -->
 <template>
   <div>
-    <el-upload name="image"
-               :action="uploadAction"
-               :headers="uploadHeaders"
-               :on-preview="handleChange"
-               :on-remove="beforeRemove"
-               :on-success='good'
-               :file-list="img"
-               :limit="number"
-               :before-upload="handleBeforeUpload"
-               :on-change="handleEditChange"
-               accept=".png,.jpg"
-               list-type="picture-card"
-               :class="hideUploadEdit?'hide':''"
-               :show-file-list='true'>
+    <el-upload
+      name="image"
+      :action="uploadAction"
+      :headers="uploadHeaders"
+      :on-preview="handleChange"
+      :on-remove="beforeRemove"
+      :on-success="good"
+      :file-list="img"
+      :limit="number"
+      :before-upload="handleBeforeUpload"
+      :on-change="handleEditChange"
+      accept=".png,.jpg"
+      list-type="picture-card"
+      :class="hideUploadEdit ? 'hide' : ''"
+      :show-file-list="true"
+    >
       <i class="el-icon-plus"></i>
     </el-upload>
 
-    <div class="demo-image__preview"
-         v-if='imageUrl'>
-      <el-image class="hidden__el-image"
-                ref="elImage"
-                :src="imageUrl"
-                :preview-src-list="previewSrcList">
+    <div class="demo-image__preview" v-if="imageUrl">
+      <el-image
+        class="hidden__el-image"
+        ref="elImage"
+        :src="imageUrl"
+        :preview-src-list="previewSrcList"
+      >
       </el-image>
     </div>
-
   </div>
-
 </template>
 
 <script>
-import { getToken } from '@/util/auth'
+import { getToken } from "@/util/auth";
 export default {
-  name: '', // 页面名称
+  name: "", // 页面名称
   components: {}, // 挂载组件
   props: {
     // 上传图片数量
@@ -57,45 +58,45 @@ export default {
   data() {
     return {
       hideUploadEdit: false, // 判断显示图片上传限制隐藏
-      url: '/api/upload', // 请求接口
-      imageUrl: '', // 图片展示
+      url: "/api/upload", // 请求接口
+      imageUrl: "", // 图片展示
       previewSrcList: [], // 展示图片列表
       list: [], // 上传图片列表
       img: [], // 实际展示的图片
-    }
+    };
   },
   computed: {
     // 上传的地址
     uploadAction() {
-      return 'https://ct-upimg.yx090.com' + this.url
+      return "https://ct-upimg.yx090.com" + this.url;
     },
     // 设置上传的请求头部
     uploadHeaders() {
       return {
         // authorization: 'Bearer' + getToken(),
-        'Content-Type': 'multipart/form-data',
-      }
+        "Content-Type": "multipart/form-data",
+      };
     },
   }, // 计算机属性 类似与data概念
   watch: {
     file: {
       handler(val) {
         if (val) {
-          console.log(val, 'ppp')
-          var imges = []
+          // console.log(val, 'ppp')
+          var imges = [];
           val.forEach((element) => {
-            imges = element.url.split(',')
-            this.list = imges
-          })
+            imges = element.url.split(",");
+            this.list = imges;
+          });
           imges.forEach((element) => {
-            this.img.push({ url: this.computedGetPictureSrc(element) })
-          })
+            this.img.push({ url: this.computedGetPictureSrc(element) });
+          });
           const previewSrcList = imges.map((ele) => {
-            return this.computedGetPictureSrc(ele)
-          })
-          this.previewSrcList = previewSrcList
+            return this.computedGetPictureSrc(ele);
+          });
+          this.previewSrcList = previewSrcList;
           if (val.length === this.number) {
-            this.hideUploadEdit = true
+            this.hideUploadEdit = true;
           }
         }
       },
@@ -105,7 +106,7 @@ export default {
   }, // 监控data中数据变化
   methods: {
     computedGetPictureSrc(src) {
-      return 'https://ct-upimg.yx090.com/' + src
+      return "https://ct-upimg.yx090.com/" + src;
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -117,7 +118,7 @@ export default {
      */
     handleEditChange(file, fileList) {
       if (fileList.length === this.number) {
-        this.hideUploadEdit = true
+        this.hideUploadEdit = true;
       }
     },
     /**
@@ -128,13 +129,13 @@ export default {
      * @Date: 2022-03-03 19:59:45
      */
     good(file, fileList) {
-      this.previewSrcList.push(fileList.url)
-      console.log(this.previewSrcList, '------')
+      this.previewSrcList.push(fileList.url);
+      console.log(this.previewSrcList, "------");
       // file.data.forEach((element) => {
       //   this.list.push(element.url)
       // })
 
-      this.$emit('urlimg', fileList.url)
+      this.$emit("urlimg", fileList.url);
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -144,10 +145,10 @@ export default {
      * @Date: 2022-03-03 18:59:28
      */
     handleChange(file) {
-      this.imageUrl = file.url
+      this.imageUrl = file.url;
       this.$nextTick(() => {
-        this.$refs.elImage.clickHandler()
-      })
+        this.$refs.elImage.clickHandler();
+      });
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -158,23 +159,23 @@ export default {
      */
     beforeRemove(file, fileList) {
       if (fileList.length === this.number) {
-        this.hideUploadEdit = true
+        this.hideUploadEdit = true;
       } else {
-        this.hideUploadEdit = false
+        this.hideUploadEdit = false;
       }
       if (file.response) {
         file.response.data.forEach((element) => {
           for (var i = 0; i < this.list.length; i++) {
             if (element.url === this.list[i]) {
-              this.list.splice(i, 1)
+              this.list.splice(i, 1);
             }
           }
-        })
+        });
       } else {
-        console.log(file, 'iiii')
+        console.log(file, "iiii");
         for (var i = 0; i < this.list.length; i++) {
           if (file.url === this.computedGetPictureSrc(this.list[i])) {
-            this.list.splice(i, 1)
+            this.list.splice(i, 1);
           }
         }
       }
@@ -187,14 +188,14 @@ export default {
      * @Date: 2022-03-03 19:53:25
      */
     handleBeforeUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLt2M = file.size / 1024 / 1024 < 2;
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-        return false
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+        return false;
       }
     },
   }, // 挂载一些方法
-}
+};
 </script>
 
 <style lang="scss">
diff --git a/resources/frontend/src/css/img/编辑.png b/resources/frontend/src/css/img/编辑.png
new file mode 100644
index 0000000000000000000000000000000000000000..3578278eee9e7084d53255d27dcd8f04920d9b68
GIT binary patch
literal 348
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!3-pihitnGq!^2X+?^QKos)S9<kSWDgt!9f
zRjXE=IdcX`Zr;3k$BrG_wr$(8Wy{vBTY-%2U;tzQ0YnPO07^l`fefG^kPVgx5peZz
zL1Yo2;@!J<@7c3w@7}%p_U$`<{P=H!2VFoHD3=8J1v4<SvT;dTSOteiCTA9xmDklz
zU9@b)x=ovR?c0Cw(!=L(zy4$^f1(al9_#7i7{VdTda#x8kOKqD28TlJcXjufe(QTM
zF?{`fhqWPfvMj^xjgi$%1seBPdh$P*^~9K|z<UyRL-iyX##Qc<au`;nPuj$0;2#vm
puxC;kqr?B}Z`v7N@Bqzzz#m+}E_rm>JVhXf!PC{xWt~$(698FTrGWqd

literal 0
HcmV?d00001

diff --git a/resources/frontend/src/css/img/编辑@2x.png b/resources/frontend/src/css/img/编辑@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e695b702aaa71c5fc43cacef6482fd765ecd82
GIT binary patch
literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^vOp}u!3-o<3A)SxQjEnx?oJHr&dIz4a&83pgt!7}
zAo&0P|Eg81jvYI;dGqG|`}c3$xN-OH-CMS70dj%t4I4H9xj^>Tty{Nk+qP-brX4$W
z?A*C?I~V{3A#5N6C=OHr6b6z&?Lcv$2#^7kf&id6kO3qiDj{5mdN>JWK-2(bfovcE
zDuyuNA`n5K`MY-Q0=jL_o;`c_?%lU<AJFj!4jedm@L>F%%TYj&*_H(P1v4-*vT<_p
z@bU|ah|9{Us%dF!>*$%<**Um+2Ly%0$0z3I<yX`;G_|yLcJ)r4GJVF(`Ae2A+kf!f
zrB6S89a;Q;CeWb0o-U3d5|VolUUy<L6mh-S8~Y|U=Z5vSb?ThP2LJxcb4tYJJzAYT
zF*LgJe@*OD{^+=%t$uONwRN-h@P6Iu@m8KW`_)eM!WXy24@?TlO_Ht9oWpqfsM)oZ
z;r=_=vLe*|m>;%XSsEO2HaXVP^(j->Y0X!9NwyZQcO}<E^OmM<l-s*#Q{UGm3zN8B
z-_+(RU8B5wg>9qh&$TbI=N##~tnYrTdy!z!;-zeMCo)+)_Z7QeTgQDgy0~Z0&d;|0
aZu2kuZTNq`-p_xaxb}4Qb6Mw<&;$S_#38Q$

literal 0
HcmV?d00001

diff --git a/resources/frontend/src/main.js b/resources/frontend/src/main.js
index f82289f..ec245a2 100644
--- a/resources/frontend/src/main.js
+++ b/resources/frontend/src/main.js
@@ -1,13 +1,12 @@
-import Vue from 'vue'
-import App from './App.vue'
-import router from './router'
-import store from './store'
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import '@/css/style.css'
-import './router/index2'
-import axios from 'axios'
-
+import Vue from "vue";
+import App from "./App.vue";
+import router from "./router";
+import store from "./store";
+import ElementUI from "element-ui";
+import "element-ui/lib/theme-chalk/index.css";
+import "@/css/style.css";
+import "./router/index2";
+import axios from "axios";
 
 // import Router from 'vue-router'
 // const routerPush = Router.prototype.push
@@ -15,12 +14,11 @@ import axios from 'axios'
 // return routerPush.call(this, location).catch(error=> error)
 // }
 
-
-Vue.use(ElementUI)
-Vue.config.productionTip = false
+Vue.use(ElementUI);
+Vue.config.productionTip = false;
 
 new Vue({
   router,
   store,
-  render: h => h(App)
-}).$mount('#app')
+  render: (h) => h(App),
+}).$mount("#app");
diff --git a/resources/frontend/src/router/index.js b/resources/frontend/src/router/index.js
index b9d8ab4..ab2b6e3 100644
--- a/resources/frontend/src/router/index.js
+++ b/resources/frontend/src/router/index.js
@@ -1,5 +1,6 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
+import axios from "axios";
 
 Vue.use(VueRouter);
 
@@ -11,12 +12,17 @@ const createRouter = () =>
 const router = createRouter();
 
 router.beforeEach((to, from, next) => {
-  if (localStorage.getItem("token")) {
-    next();
-  } else if (to.fullPath === "/logo") {
-    next();
+  // console.log(to,next);
+  const token = localStorage.getItem("token");
+  // 目标路由不是登录页，并且还需要token验证，还没有token，那就直接给返回到登录页
+  if (to.name !== "Login" && !token) {
+    next({ name: "Login" });
   } else {
-    next("/logo");
+    // 目标路由是登录页-自然不需要token验证
+    // 或目标路由不需要身份验证
+    // 又或目标路由非登录页，需要token验证，但是有token
+    // next放行
+    next();
   }
 });
 
diff --git a/resources/frontend/src/router/index1.js b/resources/frontend/src/router/index1.js
index d68f74e..443cdbd 100644
--- a/resources/frontend/src/router/index1.js
+++ b/resources/frontend/src/router/index1.js
@@ -1,68 +1,73 @@
 const list = [
   {
-    path: '/logo',
-    name: 'logo',
-    component: () => import('../views/logo.vue')
+    path: "/Login",
+    name: "Login",
+    component: () => import("../views/Login.vue"),
   },
   {
-    path: '/',
-    component: () => import('../views/index.vue'),
+    path: "/",
+    component: () => import("../views/index.vue"),
     children: [
       {
-        path: 'GOODS_LIST',
-        name: '商品列表',
-        component: () => import('../views/yingyeting/yingyeting.vue')
+        path: "GOODS_LIST",
+        name: "商品列表",
+        component: () => import("../views/yingyeting/yingyeting.vue"),
       },
       {
-        path: 'GOODS_TYPE',
-        name: '商品种类',
-        component: () => import('../views/home/home.vue')
+        path: "GOODS_TYPE",
+        name: "商品种类",
+        component: () => import("../views/home/home.vue"),
       },
       {
-        path: 'GOODS_BRAND',
-        name: '商品品牌',
-        component: () => import('../views/brand/brand.vue')
+        path: "GOODS_BRAND",
+        name: "商品品牌",
+        component: () => import("../views/brand/brand.vue"),
       },
       {
-        path: 'SHOP_MANAGE',
-        name: '店铺管理',
-        component: () => import('../views/store/store.vue')
+        path: "SHOP_MANAGE",
+        name: "店铺管理",
+        component: () => import("../views/store/store.vue"),
       },
       {
-        path: 'USER_MANAGE',
-        name: '用户管理',
-        component: () => import('../views/users/users.vue')
+        path: "USER_MANAGE",
+        name: "用户管理",
+        component: () => import("../views/users/users.vue"),
       },
       {
-        path: 'ROLE_MANAGE',
-        name: '角色管理',
-        component: () => import('../views/system/role.vue')
+        path: "ROLE_MANAGE",
+        name: "角色管理",
+        component: () => import("../views/system/role.vue"),
       },
       {
-        path: 'PERMISSION_MANAGE',
-        name: '权限管理',
-        component: () => import('../views/system/authority.vue')
+        path: "PERMISSION_MANAGE",
+        name: "权限管理",
+        component: () => import("../views/system/authority.vue"),
       },
       {
-        path: 'SYSTEM_LOG',
-        name: '商品记录',
-        component: () => import('../views/shuju/shuju.vue')
+        path: "SYSTEM_LOG",
+        name: "系统日志",
+        component: () => import("../views/shuju/shuju.vue"),
       },
       {
-        path: '/index/yingyeting/addgoods',
-        name: '新建商品',
-        component: () => import('../views/yingyeting/addgoods/addgoods.vue')
+        path: "GOODS_LOG",
+        name: "商品记录",
+        component: () => import("../views/shuju/record.vue"),
       },
       {
-        path: '/',
-        redirect: 'GOODS_LIST'
-      }
-    ]
+        path: "/index/yingyeting/addgoods",
+        name: "新建商品",
+        component: () => import("../views/yingyeting/addgoods/addgoods.vue"),
+      },
+      {
+        path: "/",
+        redirect: "GOODS_LIST",
+      },
+    ],
   },
   {
-    path: '/',
-    redirect: '/index'
-  }
-]
+    path: "/",
+    redirect: "/index",
+  },
+];
 
-export default list
+export default list;
diff --git a/resources/frontend/src/util/auth.js b/resources/frontend/src/util/auth.js
index d19bef4..3636109 100644
--- a/resources/frontend/src/util/auth.js
+++ b/resources/frontend/src/util/auth.js
@@ -1,13 +1,13 @@
-const TokenKey = 'admin_token'
+const TokenKey = "admin_token";
 // 获取token
-export function getToken () {
-  return 'w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm'
+export function getToken() {
+  return localStorage.getItem("token");
 }
 // 设置token
-export function setToken (token) {
-  return localStorage.setItem(TokenKey, token)
+export function setToken(token) {
+  return localStorage.setItem(TokenKey, token);
 }
 // 删除token
-export function removeToken () {
-  return localStorage.removeItem(TokenKey)
+export function removeToken() {
+  return localStorage.removeItem(TokenKey);
 }
diff --git a/resources/frontend/src/util/http.js b/resources/frontend/src/util/http.js
index 383426a..fd16e48 100644
--- a/resources/frontend/src/util/http.js
+++ b/resources/frontend/src/util/http.js
@@ -6,59 +6,61 @@
  * @LastEditTime: 2022-03-13 11:05:08
  * @FilePath: /glxt/src/util/http.js
  */
-import axios from 'axios'
-import { getToken } from '@/util/auth'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { Message } from 'element-ui'
-import router from '@/router'
+import axios from "axios";
+import { getToken } from "@/util/auth";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { Message } from "element-ui";
+import router from "@/router";
 var instance = axios.create({
-
-  timeout: 10000
-})
+  timeout: 10000,
+});
 
 instance.interceptors.request.use(
-  config => {
+  (config) => {
     // config.headers['content-type'] = 'application/json'
 
     // config.headers['Shop-Id'] = localStorage.getItem('shopId') || 1
 
     // 在发送请求之前做些什么
-    // config.headers.Authorization = 'Bearer' + getToken() // 请求头
+    // config.headers.Authorization = "Bearer" + getToken(); // 请求头
     // config.headers['content-type'] = 'application/json'
-    config.headers.Authorization = 'Bearer ' + getToken() // 请求头
-    NProgress.start()
+    config.headers.Authorization = "Bearer " + getToken(); // 请求头
+    NProgress.start();
     // console.log(config, '1111') // for debug
 
-    return config
+    return config;
   },
-  error => {
+  (error) => {
     // 对请求错误做些什么
-    console.log(error, '222222') // for debug
-    return Promise.reject(error)
+    console.log(error, "222222"); // for debug
+    return Promise.reject(error);
   }
-)
+);
 
 // 添加响应拦截器
 instance.interceptors.response.use(
-  response => {
-    NProgress.done()
-    const res = response.status
+  (response) => {
+    NProgress.done();
+    const res = response.status;
     // 对响应数据做点什么
     // console.log(response, '33333') // for debug
     if (res === 200 || res === 201) {
-      return response
+      return response;
     } else {
       Message({
-        message: 'Error',
-        type: 'error'
-      })
+        message: "Error",
+        type: "error",
+      });
     }
   },
-  error => {
+  (error) => {
     // 对响应错误做点什么
-
-    console.log(error, '44444') // for debug
+    Message({
+      message: error,
+      type: "error",
+    });
+    console.log(error, "44444"); // for debug
     // if (error.response.status === 401) {
     //   Message({
     //     message: '账户登录过期,请重新登录',
@@ -74,8 +76,8 @@ instance.interceptors.response.use(
     //   })
     // }
 
-    return Promise.reject(error)
+    return Promise.reject(error);
   }
-)
+);
 
-export default instance
+export default instance;
diff --git a/resources/frontend/src/views/logo.vue b/resources/frontend/src/views/Login.vue
similarity index 77%
rename from resources/frontend/src/views/logo.vue
rename to resources/frontend/src/views/Login.vue
index 95347be..7be4394 100644
--- a/resources/frontend/src/views/logo.vue
+++ b/resources/frontend/src/views/Login.vue
@@ -37,7 +37,7 @@ export default {
   },
   methods: {
     Login() {
-      // 判断复选框是否被勾选 勾选则调用配置cookie方法
+      // 判断记住密码复选框是否被勾选 勾选则调用配置cookie方法
       if (this.checked === true) {
         this.setCookie(this.form.name, this.form.password, true, 7);
       } else {
@@ -50,38 +50,30 @@ export default {
           type: "error",
         });
       } else {
-        let token = localStorage.getItem("token");
-        axios
-          .post("/api/auth/login", this.form, {
-            headers: {
-              Authorization:
-                "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-              token: token,
-            },
-          })
-          .then((res) => {
-            let data = res.data;
-            console.log(data);
-            if (data.error) {
-              this.$message({
-                message: "账号或密码错误，请重新输入",
-                type: "error",
-              });
-              this.form.name = "";
-              this.form.password = "";
-              this.checked = false;
-            }
+        // let token = localStorage.getItem("token");
+        axios.post("/api/auth/login", this.form).then((res) => {
+          let data = res.data;
+          console.log(data);
+          if (data.error) {
+            this.$message({
+              message: "账号或密码错误，请重新输入",
+              type: "error",
+            });
+            this.form.name = "";
+            this.form.password = "";
+            this.checked = false;
+          }
 
-            if (data.token) {
-              this.form = {};
-              localStorage.setItem("token", data.token);
-              this.$message({
-                message: "成功登录，欢迎来到后台管理系统",
-                type: "success",
-              });
-              this.$router.push("/USER_MANAGE");
-            }
-          });
+          if (data.token) {
+            this.form = {};
+            localStorage.setItem("token", data.token);
+            this.$message({
+              message: "成功登录，欢迎来到后台管理系统",
+              type: "success",
+            });
+            this.$router.push("/GOODS_LIST");
+          }
+        });
       }
     },
     // 设置cookie
diff --git a/resources/frontend/src/views/brand/brand.vue b/resources/frontend/src/views/brand/brand.vue
index a2de8bc..dc155d8 100644
--- a/resources/frontend/src/views/brand/brand.vue
+++ b/resources/frontend/src/views/brand/brand.vue
@@ -29,9 +29,9 @@
     </div>
 
     <!-- 新增种类对话框 -->
-    <el-dialog title="新增种类" :visible.sync="dialogFormVisible">
+    <el-dialog title="新增品牌" :visible.sync="dialogFormVisible">
       <el-form :model="form">
-        <el-form-item label="商品种类" :label-width="formLabelWidth">
+        <el-form-item label="商品品牌" :label-width="formLabelWidth">
           <el-input v-model="form.kindName" autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
@@ -72,7 +72,7 @@
 
 <script>
 import {
-  // Brand_goods_types,
+  Brand_goods_types,
   DelBrand_goods_types,
   AddBrandgoods_types,
   editBrand_types,
@@ -113,13 +113,11 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      console.log(1111, val);
       this.getGoods_types();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      console.log(2222, val);
       this.getGoods_types();
     },
     // 新增
@@ -146,7 +144,7 @@ export default {
     // 编辑
     handEdit(id, item) {
       this.id = id;
-      console.log("item", item);
+      // console.log("item", item);
       this.form1.kindName1 = item.name;
       this.dialogFormVisible1 = true;
     },
@@ -165,7 +163,7 @@ export default {
     },
     // 删除
     handdel(id) {
-      this.$confirm("确定删除此条商品种类吗?", "确认删除", {
+      this.$confirm("确定删除此条商品品牌吗?", "确认删除", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -188,34 +186,14 @@ export default {
     },
     // 获取列表
     getGoods_types() {
-      // Brand_goods_types({
-      //   // page: this.current_page,
-      //   // per_page: this.per_page,
-      //   data: {
-      //     page: this.current_page,
-      //     per_page: this.per_page,
-      //   },
-      // }).then((res) => {
-      //   console.log(res);
-      //   this.tableData = res.data.data;
-      //   this.Paginationdata = res.data.data.length;
-      // });
-      axios
-        .get("/api/goods_brands", {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-          params: {
-            page: this.current_page,
-            per_page: this.per_page,
-          },
-        })
-        .then((res) => {
-          // console.log(res);
-          this.tableData = res.data.data;
-          this.Paginationdata = res.data.meta;
-        });
+      let page = {
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+      Brand_goods_types(page).then((res) => {
+        this.tableData = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
     },
   },
 };
diff --git a/resources/frontend/src/views/home/home.vue b/resources/frontend/src/views/home/home.vue
index ca7fead..2a1c1f9 100644
--- a/resources/frontend/src/views/home/home.vue
+++ b/resources/frontend/src/views/home/home.vue
@@ -73,7 +73,7 @@
 
 <script>
 import {
-  // goods_types,
+  goods_types,
   Delgoods_types,
   Addgoods_types,
   editGoods_types,
@@ -115,13 +115,11 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      console.log(1111, val);
       this.getGoods_types();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      console.log(2222, val);
       this.getGoods_types();
     },
     // 新增
@@ -148,7 +146,7 @@ export default {
     // 编辑
     handEdit(id, item) {
       this.id = id;
-      console.log("item", item);
+      // console.log("item", item);
       this.form1.kindName1 = item.name;
       this.dialogFormVisible1 = true;
     },
@@ -190,32 +188,14 @@ export default {
     },
     // 获取列表
     getGoods_types() {
-      // goods_types({
-      //   page: this.page,
-      //   per_page: this.per_page,
-      // }).then((res) => {
-      //   console.log('res=>>>>>>>>', res)
-      //   this.tableData = res.data.data
-      //   this.total = res.data.data.length
-      //   this.page = res.meta.current_page
-      //   this.per_page = res.meta.per_page
-      // })
-      axios
-        .get("/api/goods_types", {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-          params: {
-            page: this.current_page,
-            per_page: this.per_page,
-          },
-        })
-        .then((res) => {
-          // console.log(res);
-          this.tableData = res.data.data;
-          this.Paginationdata = res.data.meta;
-        });
+      let page = {
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+      goods_types(page).then((res) => {
+        this.tableData = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
     },
   },
 };
diff --git a/resources/frontend/src/views/home/home/cesi.vue b/resources/frontend/src/views/home/home/cesi.vue
index d04f4e2..69862bc 100644
--- a/resources/frontend/src/views/home/home/cesi.vue
+++ b/resources/frontend/src/views/home/home/cesi.vue
@@ -7,34 +7,25 @@
  * @FilePath: /glxt/src/views/home/home/cesi.vue
 -->
 <template>
-  <div >
-
-  </div>
+  <div></div>
 </template>
 
 <script>
-
 export default {
-  data () {
-    return {
-
-    }
+  data() {
+    return {};
   },
 
-  created () {
-
-  },
-  mounted () {
-
-  },
+  created() {},
+  mounted() {},
   methods: {
     // 防止按钮多次提交
-    preventRepeatClick () {
-      this.isDisabled = true
+    preventRepeatClick() {
+      this.isDisabled = true;
       setTimeout(() => {
-        this.isDisabled = false
-      }, 1000)
-    }
-  }
-}
+        this.isDisabled = false;
+      }, 1000);
+    },
+  },
+};
 </script>
diff --git a/resources/frontend/src/views/home/home/index.vue b/resources/frontend/src/views/home/home/index.vue
index d8293ed..c554709 100644
--- a/resources/frontend/src/views/home/home/index.vue
+++ b/resources/frontend/src/views/home/home/index.vue
@@ -7,112 +7,108 @@
  * @FilePath: /glxt/src/views/home/home/index.vue
 -->
 <template>
-<div>
-<el-upload
-  name="image"
-          :action="uploadAction"
-          :headers="uploadHeaders"
-          :on-preview="handleChange"
-          :on-remove="beforeRemove"
-          :on-success='good'
-          :file-list="img"
-           :limit="number"
-            :before-upload="handleBeforeUpload"
-              :on-change="handleEditChange"
-           accept=".png,.jpg"
-            list-type="picture-card"
-            :class="hideUploadEdit?'hide':''"
-            :show-file-list='true'
- >
-  <i class="el-icon-plus"></i>
-</el-upload>
+  <div>
+    <el-upload
+      name="image"
+      :action="uploadAction"
+      :headers="uploadHeaders"
+      :on-preview="handleChange"
+      :on-remove="beforeRemove"
+      :on-success="good"
+      :file-list="img"
+      :limit="number"
+      :before-upload="handleBeforeUpload"
+      :on-change="handleEditChange"
+      accept=".png,.jpg"
+      list-type="picture-card"
+      :class="hideUploadEdit ? 'hide' : ''"
+      :show-file-list="true"
+    >
+      <i class="el-icon-plus"></i>
+    </el-upload>
 
-    <div class="demo-image__preview" v-if='imageUrl'>
- <el-image
+    <div class="demo-image__preview" v-if="imageUrl">
+      <el-image
         class="hidden__el-image"
         ref="elImage"
         :src="imageUrl"
         :preview-src-list="previewSrcList"
       >
       </el-image>
-</div>
-{{list}}
-</div>
-
+    </div>
+    {{ list }}
+  </div>
 </template>
 
 <script>
-import {  getToken } from '@/util/auth'
-export default {
-  name: '', // 页面名称
+import { getToken } from "@/util/auth";
+export default {
+  name: "", // 页面名称
   components: {}, // 挂载组件
   props: {
     // 上传图片数量
     number: {
       type: Number,
-      default: 1
+      default: 1,
     },
     file: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   }, // 组件传值
-  data () {
-    return {
+  data() {
+    return {
       hideUploadEdit: false, // 判断显示图片上传限制隐藏
-      url: '/qiniuupload', // 请求接口
-      imageUrl: '', // 图片展示
+      url: "/qiniuupload", // 请求接口
+      imageUrl: "", // 图片展示
       previewSrcList: [], // 展示图片列表
       list: [], // 上传图片列表
-      img: [] // 实际展示的图片
-    }
+      img: [], // 实际展示的图片
+    };
   },
   computed: {
     // 上传的地址
-    uploadAction () {
-      return 'https://dev.zonmind.com/home' + this.url
+    uploadAction() {
+      return "https://dev.zonmind.com/home" + this.url;
     },
     // 设置上传的请求头部
-    uploadHeaders () {
-      return {
-        authorization: 'Bearer' + getToken()
-
-      }
-    }
-
+    uploadHeaders() {
+      return {
+        authorization: "Bearer" + getToken(),
+      };
+    },
   }, // 计算机属性 类似与data概念
   watch: {
     file: {
-      handler (val) {
+      handler(val) {
         if (val) {
-          console.log(val, 'ppp')
-          var imges = []
+          // console.log(val, "ppp");
+          var imges = [];
           val.forEach((element) => {
-            imges = element.url.split(',')
-            this.list = imges
-          })
-          imges.forEach(element => {
-            this.img.push({ url: this.computedGetPictureSrc(element) })
-          })
+            imges = element.url.split(",");
+            this.list = imges;
+          });
+          imges.forEach((element) => {
+            this.img.push({ url: this.computedGetPictureSrc(element) });
+          });
           const previewSrcList = imges.map((ele) => {
-            return this.computedGetPictureSrc(ele)
-          })
-          this.previewSrcList = previewSrcList
+            return this.computedGetPictureSrc(ele);
+          });
+          this.previewSrcList = previewSrcList;
           if (val.length === this.number) {
-            this.hideUploadEdit = true
+            this.hideUploadEdit = true;
           }
         }
       },
       deep: true,
-      immediate: true
-    }
-
+      immediate: true,
+    },
   }, // 监控data中数据变化
-  created () {}, // 生命周期-创建完成(可以访问当前this实例)
-  mounted () {}, // 生命周期-挂载完成(可以访问DOM元素)
+  created() {}, // 生命周期-创建完成(可以访问当前this实例)
+  mounted() {}, // 生命周期-挂载完成(可以访问DOM元素)
   methods: {
-    computedGetPictureSrc (src) {
-      return 'https://devcdn.zonmind.com' + src
+    computedGetPictureSrc(src) {
+      return "https://devcdn.zonmind.com" + src;
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -122,86 +118,85 @@ export default {
      * @return {*}
      * @Date: 2022-03-03 21:16:54
      */
-    handleEditChange (file, fileList) {
+    handleEditChange(file, fileList) {
       if (fileList.length === this.number) {
-        this.hideUploadEdit = true
+        this.hideUploadEdit = true;
       }
     },
     /**
-   * @author: czw (725551805@qq.com)
-   * @description: 上传成功
-   * @param {*}
-   * @return {*}
-   * @Date: 2022-03-03 19:59:45
-   */
-    good (file, fileList) {
-      this.previewSrcList.push(fileList.url)
-      file.data.forEach(element => {
-        this.list.push(element.url)
-      })
+     * @author: czw (725551805@qq.com)
+     * @description: 上传成功
+     * @param {*}
+     * @return {*}
+     * @Date: 2022-03-03 19:59:45
+     */
+    good(file, fileList) {
+      this.previewSrcList.push(fileList.url);
+      file.data.forEach((element) => {
+        this.list.push(element.url);
+      });
 
-      this.$emit('urlimg', this.list)
+      this.$emit("urlimg", this.list);
     },
     /**
-   * @author: czw (725551805@qq.com)
-   * @description: 点击放大
-   * @param {*}
-   * @return {*}
-   * @Date: 2022-03-03 18:59:28
-   */
-    handleChange (file) {
-      this.imageUrl = file.url
+     * @author: czw (725551805@qq.com)
+     * @description: 点击放大
+     * @param {*}
+     * @return {*}
+     * @Date: 2022-03-03 18:59:28
+     */
+    handleChange(file) {
+      this.imageUrl = file.url;
       this.$nextTick(() => {
-        this.$refs.elImage.clickHandler()
-      })
+        this.$refs.elImage.clickHandler();
+      });
     },
     /**
-   * @author: czw (725551805@qq.com)
-   * @description:删除
-   * @param {*}
-   * @return {*}
-   * @Date: 2022-03-03 18:59:40
-   */
-    beforeRemove (file, fileList) {
+     * @author: czw (725551805@qq.com)
+     * @description:删除
+     * @param {*}
+     * @return {*}
+     * @Date: 2022-03-03 18:59:40
+     */
+    beforeRemove(file, fileList) {
       if (fileList.length === this.number) {
-        this.hideUploadEdit = true
+        this.hideUploadEdit = true;
       } else {
-        this.hideUploadEdit = false
+        this.hideUploadEdit = false;
       }
       if (file.response) {
-        file.response.data.forEach(element => {
+        file.response.data.forEach((element) => {
           for (var i = 0; i < this.list.length; i++) {
             if (element.url === this.list[i]) {
-              this.list.splice(i, 1)
+              this.list.splice(i, 1);
             }
           }
-        })
+        });
       } else {
-        console.log(file, 'iiii')
+        console.log(file, "iiii");
         for (var i = 0; i < this.list.length; i++) {
           if (file.url === this.computedGetPictureSrc(this.list[i])) {
-            this.list.splice(i, 1)
+            this.list.splice(i, 1);
           }
         }
       }
     },
     /**
-   * @author: czw (725551805@qq.com)
-   * @description:自动删除
-   * @param {*}
-   * @return {*}
-   * @Date: 2022-03-03 19:53:25
-   */
-    handleBeforeUpload (file) {
-      const isLt2M = file.size / 1024 / 1024 < 2
+     * @author: czw (725551805@qq.com)
+     * @description:自动删除
+     * @param {*}
+     * @return {*}
+     * @Date: 2022-03-03 19:53:25
+     */
+    handleBeforeUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2;
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
-        return false
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+        return false;
       }
-    }
-  } // 挂载一些方法
-
-}
+    },
+  }, // 挂载一些方法
+};
 </script>
 
 <style lang="scss">
diff --git a/resources/frontend/src/views/index.vue b/resources/frontend/src/views/index.vue
index 1b92700..f2d8136 100644
--- a/resources/frontend/src/views/index.vue
+++ b/resources/frontend/src/views/index.vue
@@ -2,25 +2,27 @@
   <div>
     <el-container>
       <el-container>
-        <el-aside :class="show?'width':'width1'">
-          <el-menu router
-                   background-color='#282c34'
-                   text-color='#fff'
-                   :default-active='$route.path'>
-            <div v-for="item in menu"
-                 :key="item.id">
-              <el-menu-item :index="item.code"
-                            v-if="!item.children">
-                <span>{{item.name}}</span>
+        <el-aside :class="show ? 'width' : 'width1'">
+          <el-menu
+            router
+            background-color="#282c34"
+            text-color="#fff"
+            :default-active="$route.path"
+          >
+            <div v-for="item in menu" :key="item.id">
+              <el-menu-item :index="item.code" v-if="!item.children">
+                <span>{{ item.name }}</span>
               </el-menu-item>
-              <el-submenu v-else
-                          :index="item.code">
+              <el-submenu v-else :index="item.code">
                 <template slot="title">
-                  <span>{{item.name}}</span>
+                  <span>{{ item.name }}</span>
                 </template>
-                <el-menu-item :index="items.code"
-                              :key="items.id"
-                              v-for="items in item.children">{{items.name}}</el-menu-item>
+                <el-menu-item
+                  :index="items.code"
+                  :key="items.id"
+                  v-for="items in item.children"
+                  >{{ items.name }}</el-menu-item
+                >
               </el-submenu>
             </div>
           </el-menu>
@@ -29,56 +31,53 @@
           <div class="head">
             <ul>
               <li>
-                <div @click="add"
-                     class="add">
-                  <i class="el-icon-s-unfold"
-                     v-if="show"></i>
-                  <i class="el-icon-s-fold"
-                     v-else></i>
+                <div @click="add" class="add">
+                  <i class="el-icon-s-unfold" v-if="show"></i>
+                  <i class="el-icon-s-fold" v-else></i>
                 </div>
                 <div class="right">
                   <el-breadcrumb separator-class="el-icon-arrow-right">
-                    <el-breadcrumb-item v-for="(item , index) in titie"
-                                        :key="index">{{item.name}}</el-breadcrumb-item>
+                    <el-breadcrumb-item
+                      v-for="(item, index) in titie"
+                      :key="index"
+                      >{{ item.name }}</el-breadcrumb-item
+                    >
                   </el-breadcrumb>
                 </div>
               </li>
               <li>
-                <div class="token"
-                     @click="hanleLogout">
-                  退出
-                </div>
+                <div class="token" @click="hanleLogout">退出</div>
               </li>
             </ul>
           </div>
-          <div class="table"
-               v-if="levelData.length">
+          <div class="table" v-if="levelData.length">
             <ul>
-              <li> <i class="el-icon-arrow-left"
-                   @click="hanlebottom"></i></li>
+              <li><i class="el-icon-arrow-left" @click="hanlebottom"></i></li>
               <li>
-
-                <div class="Navigation"
-                     v-if="levelData.length"
-                     id="Navigation">
+                <div class="Navigation" v-if="levelData.length" id="Navigation">
                   <div id="top"></div>
-                  <div v-for="(item , index) in levelData"
-                       :key="index"
-                       class="tab">
-                    <span :class="head===item.name?'red':''"
-                          @click="handlerclick(item.path)">{{item.name}}</span>
-                    <div class="closure"
-                         :class="head===item.name?'red_1':''"
-                         @click="hanblDelete(index,item.name)">
+                  <div
+                    v-for="(item, index) in levelData"
+                    :key="index"
+                    class="tab"
+                  >
+                    <span
+                      :class="head === item.name ? 'red' : ''"
+                      @click="handlerclick(item.path)"
+                      >{{ item.name }}</span
+                    >
+                    <div
+                      class="closure"
+                      :class="head === item.name ? 'red_1' : ''"
+                      @click="hanblDelete(index, item.name)"
+                    >
                       <i class="el-icon-close"></i>
                     </div>
                   </div>
                   <div id="bottom"></div>
                 </div>
-
               </li>
-              <li><i class="el-icon-arrow-right"
-                   @click="hanletop"></i></li>
+              <li><i class="el-icon-arrow-right" @click="hanletop"></i></li>
             </ul>
           </div>
           <div class="box-card">
@@ -90,13 +89,13 @@
   </div>
 </template>
 <script>
-import { removeToken } from '@/util/auth'
-import { getMenu } from '../api/menu.js'
+import { removeToken } from "@/util/auth";
+import { getMenu } from "../api/menu.js";
 export default {
   mounted() {
     getMenu().then((res) => {
-      this.menu = res.data.data
-    })
+      this.menu = res.data.data;
+    });
   },
   data() {
     return {
@@ -104,28 +103,28 @@ export default {
       show: false, // 导航栏折叠
       levelData: [], // table导航栏
       titie: [], // 面包线
-      head: '', // 路由name
+      head: "", // 路由name
       onindex: 0, // 索引
-    }
+      openeds: ["1"],
+    };
   },
   watch: {
     // table构造
     $route: {
       handler: function (val) {
-        // console.log(val, 99999)
-        this.titie = val.matched
-        this.head = val.name
-        this.levelData.push({ name: val.name, path: val.path })
-        const newArr = []
-        const obj = {}
+        this.titie = val.matched;
+        this.head = val.name;
+        this.levelData.push({ name: val.name, path: val.path });
+        const newArr = [];
+        const obj = {};
         for (var i = 0; i < this.levelData.length; i++) {
           if (!obj[this.levelData[i].name]) {
-            newArr.push(this.levelData[i])
-            obj[this.levelData[i].name] = true
+            newArr.push(this.levelData[i]);
+            obj[this.levelData[i].name] = true;
           }
         }
 
-        this.levelData = newArr
+        this.levelData = newArr;
       },
       deep: true,
       immediate: true,
@@ -140,7 +139,7 @@ export default {
      * @Date: 2022-03-02 19:50:50
      */
     next() {
-      this.hanletop()
+      this.hanletop();
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -150,7 +149,7 @@ export default {
      * @Date: 2022-03-02 19:51:03
      */
     hanletop() {
-      document.getElementById('bottom').scrollIntoView({ behavior: 'smooth' })
+      document.getElementById("bottom").scrollIntoView({ behavior: "smooth" });
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -160,7 +159,7 @@ export default {
      * @Date: 2022-03-02 19:51:07
      */
     hanlebottom() {
-      document.getElementById('top').scrollIntoView({ behavior: 'smooth' })
+      document.getElementById("top").scrollIntoView({ behavior: "smooth" });
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -170,8 +169,8 @@ export default {
      * @Date: 2022-03-02 09:41:37
      */
     hanleLogout() {
-      removeToken()
-      this.$router.push({ path: '/logo' })
+      removeToken();
+      this.$router.push({ path: "/Login" });
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -182,7 +181,7 @@ export default {
      */
     handlerclick(e) {
       if (this.$route.path !== e) {
-        this.$router.push({ path: e })
+        this.$router.push({ path: e });
       }
     },
     /**
@@ -193,7 +192,7 @@ export default {
      * @Date: 2022-03-01 22:25:47
      */
     add() {
-      this.show = !this.show
+      this.show = !this.show;
     },
     /**
      * @author: czw (725551805@qq.com)
@@ -203,26 +202,26 @@ export default {
      * @Date: 2022-03-01 16:53:49
      */
     hanblDelete(index, titie) {
-      var list = this.levelData[index].name
+      var list = this.levelData[index].name;
 
-      this.onindex = index
-      this.levelData.splice(this.onindex, 1)
+      this.onindex = index;
+      this.levelData.splice(this.onindex, 1);
       if (titie === this.head) {
-        var item
-        var name
+        var item;
+        var name;
         for (let i = 0; i < this.levelData.length; i++) {
-          item = this.levelData[i].path
-          name = this.levelData[i].name
+          item = this.levelData[i].path;
+          name = this.levelData[i].name;
         }
         if (this.levelData.length) {
           if (name !== list) {
-            this.$router.push({ path: item })
+            this.$router.push({ path: item });
           }
         }
       }
     },
   },
-}
+};
 </script>
 <style scoped lang="scss">
 .table {
diff --git a/resources/frontend/src/views/shuju/record.vue b/resources/frontend/src/views/shuju/record.vue
index 2c35ac3..72467fc 100644
--- a/resources/frontend/src/views/shuju/record.vue
+++ b/resources/frontend/src/views/shuju/record.vue
@@ -1,192 +1,189 @@
 <template>
   <div>
+    <!-- 筛选框 -->
     <el-card class="box-card">
-      <div class="goods"
-           style="margin:20px">
-        <el-form ref="form"
-                 :inline="true"
-                 :model="form">
+      <div class="goods" style="margin: 20px">
+        <el-form ref="form" :inline="true" :model="form">
           <el-form-item label="查询类别：">
-            <el-select v-model="form.name1"
-                       placeholder="全部">
-              <el-option v-for="item in options"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+            <el-select v-model="form.targetField" placeholder="全部">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="商品编号">
-            <el-input v-model="input"
-                      placeholder="输入商品编号"></el-input>
-          </el-form-item>
-          <el-form-item label="商品名称">
-            <el-input v-model="input"
-                      placeholder="输入商品名称"></el-input>
-          </el-form-item>
-          <el-form-item label="商品种类：">
-            <el-select v-model="form.name1"
-                       placeholder="输入商品种类">
-              <el-option v-for="item in options"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="商品规格：">
-            <el-select v-model="form.name1"
-                       placeholder="输入商品规格">
-              <el-option v-for="item in options"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="商品品牌：">
-            <el-select v-model="form.name1"
-                       placeholder="输入商品品牌">
-              <el-option v-for="item in options"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item label="操作用户">
+            <el-select v-model="form.userId" placeholder="输入操作用户">
+              <el-option
+                v-for="item in options1"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="操作时间：">
-            <el-date-picker v-model="value1"
-                            type="datetimerange"
-                            range-separator="至"
-                            start-placeholder="起"
-                            end-placeholder="止"
-                            align="right">
+            <el-date-picker
+              v-model="value1"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="起"
+              end-placeholder="止"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary">查询</el-button>
+            <el-button type="primary" @click="query()">查询</el-button>
           </el-form-item>
-
         </el-form>
-
       </div>
-
     </el-card>
-    <el-card style="margin-top:30px"
-             class="box-card">
-      <div>
-        <span></span>
-        <span>历史记录</span>
-        <span>（共800条）</span>
-        <span>——玫瑰花</span>
-      </div>
-      <el-table :data="tableData"
-                style="width: 100%">
-        <el-table-column prop="date"
-                         label="序号"
-                         width="180">
+
+    <!-- 表格 -->
+    <el-card style="margin-top: 30px" class="box-card">
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="id" label="序号" width="100"> </el-table-column>
+        <el-table-column prop="created_at" label="时间" width="200">
         </el-table-column>
-        <el-table-column prop="name"
-                         label="时间"
-                         width="180">
+        <el-table-column prop="target_field" label="类别" width="100">
         </el-table-column>
-        <el-table-column prop="address"
-                         label="类别">
-        </el-table-column>
-        <el-table-column prop="address"
-                         label="操作前">
-        </el-table-column>
-        <el-table-column prop="address"
-                         label="操作后">
-        </el-table-column>
-        <el-table-column prop="address"
-                         label="操作人">
+        <el-table-column prop="before_update" label="操作前"> </el-table-column>
+        <el-table-column prop="after_update" label="操作后"> </el-table-column>
+        <el-table-column prop="user.name" label="操作人" width="100">
         </el-table-column>
       </el-table>
-
     </el-card>
-    <el-pagination @size-change="handleSizeChange"
-                   @current-change="handleCurrentChange"
-                   :current-page="currentPage4"
-                   :page-sizes="[100, 200, 300, 400]"
-                   :page-size="100"
-                   layout="total, sizes, prev, pager, next, jumper"
-                   :total="400">
-    </el-pagination>
+
+    <!-- 分页功能 -->
+    <div class="block">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="current_page"
+        :page-sizes="[15, 50, 100]"
+        :page-size="per_page"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="Paginationdata.total"
+      >
+      </el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
+import { userList } from "../../api/user";
+import { recordList } from "../../api/record";
 export default {
   data() {
     return {
       options: [
         {
-          value: '选项1',
-          label: '黄金糕',
+          value: "cost",
+          label: "成本",
         },
         {
-          value: '选项2',
-          label: '双皮奶',
+          value: "stock",
+          label: "库存",
         },
         {
-          value: '选项3',
-          label: '蚵仔煎',
+          value: "inventory",
+          label: "库存盘点",
         },
         {
-          value: '选项4',
-          label: '龙须面',
+          value: "status",
+          label: "状态",
         },
         {
-          value: '选项5',
-          label: '北京烤鸭',
+          value: "set",
+          label: "设置",
         },
-      ],
-      tableData: [
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄',
-        },
-        {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄',
-        },
-        {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄',
-        },
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄',
-        },
-      ],
-      currentPage4: 4,
+      ], //查询类别
+      options1: [], //查询用户列表
       form: {
-        name1: '',
-        name2: '',
-        name3: '',
-        name4: '',
-        name5: '',
-        name6: '',
+        targetField: "",
+        userId: "",
       },
-      input: '',
-      value1: '',
-    }
+      value1: "", //筛选时间变量
+      tableData: [], //列表数据
+      Paginationdata: {}, //分页相关数据
+      current_page: 1, //当前页
+      per_page: 15, //每页显示数量
+      moudule: "goods",
+    };
   },
   methods: {
+    //请求列表数据
+    getList() {
+      let queryData = {
+        userId: this.form.userId,
+        targetField: this.form.targetField,
+        moudule: this.moudule,
+        target_id: this.$route.query.id,
+        startTime: this.value1[0],
+        endTime: this.value1[1],
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+      recordList(queryData).then((res) => {
+        console.log(1111, res);
+        this.tableData = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
+    },
+
+    //分页功能
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
+      //当前条数
+      this.per_page = val;
+      this.getList();
     },
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`)
+      //当前页
+      this.current_page = val;
+      this.getList();
+    },
+
+    // 获取用户列表
+    getUser() {
+      userList().then((res) => {
+        this.options1 = res.data.data;
+        console.log("我是用户", this.options1);
+      });
+    },
+
+    // 查询
+    query() {
+      console.log(this.form.userId, this.form.targetField);
+      let queryData = {
+        userId: this.form.userId,
+        targetField: this.form.targetField,
+        page: this.current_page,
+        per_page: this.per_page,
+        moudule: this.moudule,
+        target_id: this.$route.query.id,
+        startTime: this.value1[0],
+        endTime: this.value1[1],
+      };
+      recordList(queryData).then((res) => {
+        this.tableData = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
     },
   },
-}
+  mounted() {
+    this.getList();
+    this.getUser();
+  },
+};
 </script>
 
 <style>
+.block {
+  margin-top: 30px;
+}
 </style>
diff --git a/resources/frontend/src/views/shuju/shuju.vue b/resources/frontend/src/views/shuju/shuju.vue
index bfd1b1d..6d15743 100644
--- a/resources/frontend/src/views/shuju/shuju.vue
+++ b/resources/frontend/src/views/shuju/shuju.vue
@@ -118,15 +118,15 @@ export default {
   methods: {
     //请求列表数据
     getList() {
+      let token = localStorage.getItem("token");
+      let data = {
+        page: this.current_page,
+        per_page: this.per_page,
+      };
       axios
         .get("/api/logs", {
           headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-          params: {
-            page: this.current_page,
-            per_page: this.per_page,
+            Authorization: `Bearer ${token}`,
           },
         })
         .then((res) => {
diff --git a/resources/frontend/src/views/store/store.vue b/resources/frontend/src/views/store/store.vue
index 973195e..9fff42c 100644
--- a/resources/frontend/src/views/store/store.vue
+++ b/resources/frontend/src/views/store/store.vue
@@ -10,15 +10,13 @@
         <el-table-column prop="id" label="ID" width="180"> </el-table-column>
         <el-table-column prop="name" label="店铺名称" width="180">
         </el-table-column>
-        <el-table-column prop="plat_id" label="所属平台"> </el-table-column>
-        <el-table-column prop="address" label="操作">
+        <el-table-column prop="plat_id" label="所属平台"></el-table-column>
+        <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="primary" @click="handEdit(scope.row.id, scope.row)"
-              >编辑</el-button
-            >
-            <el-button type="danger" @click="handdel(scope.row.id)"
+            <el-button type="danger" v-if="scope.row.status === '未授权'"
               >授权</el-button
             >
+            <span v-else>{{ scope.row.status }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -65,8 +63,7 @@
 </template>
 
 <script>
-import { shopListId, shopAdd } from "../../api/shop";
-import axios from "axios";
+import { shopListId, shopAdd, storeList } from "../../api/shop";
 export default {
   data() {
     return {
@@ -83,10 +80,6 @@ export default {
     };
   },
   mounted() {
-    // 获取平台
-    shopListId().then((res) => {
-      this.storeId = res.data.data;
-    });
     // 展示店铺列表
     this.getStoreList();
   },
@@ -96,7 +89,9 @@ export default {
       this.form.name = "";
       this.form.plat_id = "";
       this.dialogFormVisible = true;
+      this.getshop();
     },
+
     // 新增商品
     addSubmit() {
       const datas = this.form;
@@ -111,29 +106,19 @@ export default {
       });
       this.dialogFormVisible = false;
     },
+
     // 店铺列表
     getStoreList() {
-      // storeList().then((res) => {
-      //   this.tableData = res.data.data;
-      //   console.log(res, "kkk");
-      // });
-      axios
-        .get("/api/shops", {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-          params: {
-            page: this.current_page,
-            per_page: this.per_page,
-          },
-        })
-        .then((res) => {
-          console.log(res);
-          this.tableData = res.data.data;
-          this.Paginationdata = res.data.meta;
-        });
+      let page = {
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+      storeList(page).then((res) => {
+        this.tableData = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
     },
+
     //分页功能
     handleSizeChange(val) {
       //当前条数
@@ -147,6 +132,13 @@ export default {
       // console.log(2222, val);
       this.getStoreList();
     },
+
+    // 店铺平台
+    getshop() {
+      shopListId().then((res) => {
+        this.storeId = res.data.data;
+      });
+    },
   },
 };
 </script>
diff --git a/resources/frontend/src/views/system/authority.vue b/resources/frontend/src/views/system/authority.vue
index 632cc7b..d8e60e1 100644
--- a/resources/frontend/src/views/system/authority.vue
+++ b/resources/frontend/src/views/system/authority.vue
@@ -1,22 +1,19 @@
 <template>
-  <div>
-    权限管理（废弃）
-  </div>
+  <div>权限管理（已废弃）</div>
 </template>
 
 <script>
 export default {
-  name: 'GlxtAuthority',
+  name: "GlxtAuthority",
 
   data() {
-    return {}
+    return {};
   },
 
   mounted() {},
 
   methods: {},
-}
+};
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/resources/frontend/src/views/system/role.vue b/resources/frontend/src/views/system/role.vue
index d9191ef..b60db10 100644
--- a/resources/frontend/src/views/system/role.vue
+++ b/resources/frontend/src/views/system/role.vue
@@ -29,7 +29,11 @@
       <el-table :data="tableList" style="width: 100%">
         <el-table-column prop="id" label="ID"> </el-table-column>
         <el-table-column prop="name" label="角色名称"> </el-table-column>
-        <el-table-column prop="name" label="权限内容"> </el-table-column>
+        <el-table-column label="权限内容">
+          <template slot-scope="scope">
+            {{ scope.row.permissions.join(",") }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button @click="onEdit(scope.row)">编辑</el-button>
@@ -60,7 +64,12 @@
 </template>
 
 <script>
-import axios from "axios";
+import {
+  roleList,
+  roleAdd,
+  jurisdiction,
+  jurisdictionEdit,
+} from "../../api/role.js";
 export default {
   data() {
     return {
@@ -80,35 +89,22 @@ export default {
   },
   mounted() {
     this.getroleList();
-    this.getJurisdiction();
   },
   methods: {
     //角色表单数据请求
     getroleList() {
-      axios
-        .get("/api/roles", {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          this.tableList = res.data.data;
-        });
+      this.getJurisdiction();
+      roleList().then((res) => {
+        console.log(res);
+        this.tableList = res.data.data;
+      });
     },
 
-    //角色权限请求
+    //角色权限数据请求
     getJurisdiction() {
-      axios
-        .get("/api/permissions", {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          this.Role_Permission = res.data.data;
-        });
+      jurisdiction().then((res) => {
+        this.Role_Permission = res.data.data;
+      });
     },
 
     // 点击新增
@@ -116,59 +112,41 @@ export default {
       let roleName = {
         name: this.newrole,
       };
-      axios
-        .post("/api/roles", roleName, {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          this.dialogVisible2 = false;
-          this.getroleList();
-          if (res.status == 201) {
-            this.$message({
-              message: "角色添加成功！",
-              type: "success",
-            });
-          }
-        });
+      roleAdd(roleName).then((res) => {
+        this.dialogVisible2 = false;
+        this.getroleList();
+        if (res.status == 201) {
+          this.$message({
+            message: "角色添加成功！",
+            type: "success",
+          });
+        }
+      });
     },
 
     // 点击编辑
     onEdit(row) {
       this.dialogVisible = true;
-      // console.log(row.id);
       this.id = row.id;
     },
 
     //编辑权限确认
     getCheckedKeys() {
       let id = this.id; //选中角色的ID
-
       this.permissionIds = this.$refs.tree.getCheckedKeys(); //选中权限的ID
-      // console.log(this.permissionIds);
       this.allpermissionIds = {
         permissionIds: this.permissionIds,
       };
-      // console.log(this.allpermissionIds);
-
-      axios
-        .post(`/api/roles/${id}/permissions`, this.allpermissionIds, {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          if (res.status === 200) {
-            this.dialogVisible = false;
-            this.$message({
-              message: "权限修改成功！",
-              type: "success",
-            });
-          }
-        });
+      jurisdictionEdit(id, this.allpermissionIds).then((res) => {
+        if (res.status === 200) {
+          this.dialogVisible = false;
+          this.getroleList();
+          this.$message({
+            message: "权限修改成功！",
+            type: "success",
+          });
+        }
+      });
     },
   },
 };
diff --git a/resources/frontend/src/views/users/users.vue b/resources/frontend/src/views/users/users.vue
index cea907d..ed86fc5 100644
--- a/resources/frontend/src/views/users/users.vue
+++ b/resources/frontend/src/views/users/users.vue
@@ -20,7 +20,18 @@
               <el-input v-model="from.password_confirmation"></el-input>
             </el-form-item>
             <el-form-item label="角色">
-              <el-input v-model="from.role_name"></el-input>
+              <!-- <el-input v-model="from.role_name"></el-input> -->
+              <template>
+                <el-select v-model="value" placeholder="请选择">
+                  <el-option
+                    v-for="item in roleOptions"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
             </el-form-item>
             <div class="from-btn">
               <el-button type="danger" @click="dialogVisible = false"
@@ -48,7 +59,17 @@
               <el-input v-model="edit_from.email"></el-input>
             </el-form-item>
             <el-form-item label="角色">
-              <el-input v-model="edit_from.role_name"></el-input>
+              <template>
+                <el-select v-model="edit_from.role_name" placeholder="请选择">
+                  <el-option
+                    v-for="item in roleOptions"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
             </el-form-item>
             <el-form-item label="密码">
               <el-input v-model="edit_from.password"></el-input>
@@ -72,12 +93,16 @@
       <template>
         <el-table :data="tableList" style="width: 100%">
           <el-table-column prop="id" label="ID"></el-table-column>
-          <el-table-column prop="name" label="姓名"> </el-table-column>
-          <el-table-column label="角色"> 超级管理员</el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
+          <el-table-column label="角色">
+            <template slot-scope="scope">{{
+              scope.row.roles[0].name
+            }}</template>
+          </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button @click="openEdit(scope.row)">编辑</el-button>
-              <el-button type="danger">删除</el-button>
+              <!-- <el-button type="danger">删除</el-button> -->
             </template>
           </el-table-column>
         </el-table>
@@ -101,7 +126,13 @@
 </template>
 
 <script>
-import axios from "axios";
+import {
+  userList,
+  userAdd,
+  userEdit,
+  userConfirm,
+  roleList,
+} from "../../api/user";
 export default {
   data() {
     return {
@@ -130,103 +161,87 @@ export default {
       Paginationdata: {}, //分页相关数据
       current_page: 1, //当前页
       per_page: 15, //每页显示数量
+      roleOptions: [], //角色下拉框
+      value: "", //角色下拉框选择
     };
   },
 
   mounted() {
     this.getList(); //进入调用用户表单数据请求
+    this.getrole(); //进入调用角色数据请求
   },
   methods: {
+    // 角色列表请求
+    getrole() {
+      roleList().then((res) => {
+        this.roleOptions = res.data.data;
+        console.log(this.roleOptions);
+      });
+    },
+
     //用户表单数据请求
     getList() {
-      axios
-        .get("api/users", {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-          params: {
-            page: this.current_page,
-            per_page: this.per_page,
-          },
-        })
-        .then((res) => {
-          this.tableList = res.data.data;
-          this.Paginationdata = res.data.meta;
-        });
+      let page = {
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+      userList(page).then((res) => {
+        this.tableList = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
     },
+
     //点击新增确认
     onSubmit() {
-      // 请求
-      axios
-        .post("/api/users", this.from, {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          this.tableList = [...this.tableList, res.data.data];
-          this.dialogVisible = false;
-          this.getList();
-          this.from = {};
-          this.$message({
-            message: "账号添加成功！",
-            type: "success",
-          });
+      this.from.role_name = this.value;
+      let from = this.from;
+      userAdd(from).then((res) => {
+        this.tableList = [...this.tableList, res.data.data];
+        this.dialogVisible = false;
+        this.getList();
+        this.from = {};
+        this.$message({
+          message: "账号添加成功！",
+          type: "success",
         });
+      });
     },
+
     //点击编辑
     openEdit(e) {
       this.editVisible = true;
-      // console.log(e.id);
       let id = e.id;
       this.id = e.id;
       // 请求id对应数据
-      axios
-        .get(`/api/users/${id}`, {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          this.edit_from = res.data.data;
-        });
+      userEdit(id).then((res) => {
+        this.edit_from = res.data.data;
+        console.log(this.edit_from);
+      });
     },
+
     //编辑完确认请求
     onEdit() {
-      let id = this.id;
-      console.log(id);
-      axios
-        .patch(`/api/users/${id}`, this.edit_from, {
-          headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
-          },
-        })
-        .then((res) => {
-          this.tableList = [...this.tableList, res.data.data];
-          this.editVisible = false;
-          this.getList();
-          this.$message({
-            message: "账号修改成功！",
-            type: "success",
-          });
+      userConfirm(this.id, this.edit_from).then((res) => {
+        this.tableList = [...this.tableList, res.data.data];
+        this.editVisible = false;
+        this.getList();
+        this.$message({
+          message: "账号修改成功！",
+          type: "success",
         });
+      });
       this.editVisible = false;
     },
+
     //分页功能
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      // console.log(1111, val);
       this.getList();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      // console.log(2222, val);
       this.getList();
     },
   },
diff --git a/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue b/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue
index 38cc8b3..f200031 100644
--- a/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue
+++ b/resources/frontend/src/views/yingyeting/addgoods/addgoods.vue
@@ -40,7 +40,97 @@
                class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload> -->
         </div>
-        <el-form ref="form" :inline="true" :model="form">
+        <!-- 编辑按钮进入显示 -->
+        <el-form ref="form" :inline="true" :model="form" v-if="goodsData != ''">
+          <div>
+            <el-form-item label="商品名称：">
+              <el-input
+                placeholder="商品名称"
+                v-model="goodsData.goods.title"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="商品编码：">
+              <el-input
+                placeholder="商品编码"
+                v-model="goodsData.goods.goods_code"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="商品种类：">
+              <el-select
+                v-model="goodsData.goods.type_id"
+                placeholder="商品种类"
+              >
+                <el-option
+                  v-for="item in cate"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="商品品牌：">
+              <el-select
+                v-model="goodsData.goods.brand_id"
+                placeholder="商品品牌"
+              >
+                <el-option
+                  v-for="item in brand"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+          <div>
+            <!-- <span style="margin-right: -15px">{{ i + 1 }}.</span> -->
+            <el-form-item label="商品规格：">
+              <el-input
+                placeholder="商品规格"
+                v-model="goodsData.title"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="规格编码：">
+              <el-input v-model="goodsData.sku_code" placeholder="商品编码">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="商品状态：">
+              <el-select
+                v-model="goodsData.goods.reserve"
+                placeholder="下架（默认）"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <div>
+              <el-form-item label="商品数量：">
+                <el-input v-model="goodsData.num" placeholder="商品数量">
+                </el-input>
+              </el-form-item>
+              <el-form-item label="商品成本：">
+                <el-input v-model="goodsData.cost" placeholder="商品成本">
+                </el-input>
+              </el-form-item>
+            </div>
+          </div>
+          <div class="btn">
+            <el-form-item>
+              <el-button type="primary" @click="Edititem()">保存</el-button>
+              <el-button plain @click="cancel()">取消</el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <!-- 新建商品进入显示 -->
+        <el-form ref="form" :inline="true" :model="form" v-if="goodsData == ''">
           <div>
             <el-form-item label="商品名称：">
               <el-input placeholder="商品名称" v-model="form.title"></el-input>
@@ -82,7 +172,7 @@
                 v-model="skus[i].title"
               ></el-input>
             </el-form-item>
-            <span class="addto" v-if="!gid" @click="handleAdd()">+</span>
+            <span class="addto" @click="handleAdd()">+</span>
             <el-form-item label="规格编码：">
               <el-input v-model="skus[i].sku_code" placeholder="商品编码">
               </el-input>
@@ -115,7 +205,7 @@
           <div class="btn">
             <el-form-item>
               <el-button type="primary" @click="handleSave()">保存</el-button>
-              <el-button plain>取消</el-button>
+              <el-button plain @click="cancel()">取消</el-button>
             </el-form-item>
           </div>
         </el-form>
@@ -147,12 +237,14 @@ export default {
       brand: [], // 品牌列表
       cate: [], // 种类列表
       goodschoose: [], // 商品列表
+      goodsID: "", //进入页面是否有商品id
+      goodsData: [], //编辑按钮进入获取的商品数据
       // 规格列表
       skus: [
         {
           title: "",
           sku_code: "",
-          status: "",
+          status: "0",
           num: "",
           cost: "",
         },
@@ -162,13 +254,18 @@ export default {
       form: {
         goods_id: "",
         title: "",
-        img_url: "https://cn.vuejs.org/images/logo.svg",
+        img_url:
+          "https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-dc-site/c40319b0-6080-11eb-918d-3d24828c498c.png",
         type_id: "",
         brand_id: "",
         goods_code: "",
       },
       // 商品状态
       options: [
+        {
+          id: "0",
+          label: "下架",
+        },
         {
           id: "1",
           label: "在售",
@@ -177,10 +274,6 @@ export default {
           id: "2",
           label: "预警",
         },
-        {
-          id: "0",
-          label: "下架",
-        },
       ],
       file: [],
     };
@@ -221,32 +314,35 @@ export default {
         });
       }
     },
+
     // 商品列表
     handleList() {
       goodsList().then((res) => {
         this.goodschoose = res.data.data;
       });
     },
-    // 保存，增加一个商品
+
+    // 添加商品
     handleSave() {
       const goods = this.form;
-      const sku2 = this.skus[0];
-      const skus = [];
-      skus.push(sku2);
+      // const sku2 = this.skus[0];
+      // const skus = [];
+      // skus.push(sku2);
       // console.log(goods, skus);
 
+      const skus = this.skus;
+
       const updata = {
         ...goods,
         goods_id: this.lid,
         skus: skus,
       };
       // console.log(updata);
-
+      let token = localStorage.getItem("token");
       axios
         .post("/api/goods", updata, {
           headers: {
-            Authorization:
-              "Bearer w1rr6IsxZIud46dIrGIivNAroFpqN52sSpXhk3azpPq2ZTbUXhgKTOLheoRm",
+            Authorization: `Bearer ${token}`,
           },
         })
         .then((res) => {
@@ -256,6 +352,7 @@ export default {
               type: "success",
             });
             this.updateForm();
+            this.$router.push("GOODS_LIST");
           } else {
             this.$message({
               message: "商品添加失败！",
@@ -263,41 +360,6 @@ export default {
             });
           }
         });
-
-      // if (this.gid) {
-      //   const goods = this.form;
-      //   const sku = this.skus[0];
-      //   const updata = {
-      //     ...goods,
-      //     ...sku,
-      //     goods_id: this.lid,
-      //   };
-      //   console.log(updata);
-      // } else {
-      //   console.log(1111);
-      //   const datas = {
-      //     ...this.form,
-      //     skus: this.skus,
-      //   };
-
-      //   addGoods(datas)
-      //     .then((res) => {
-      //       console.log("请求发起");
-      //       if (res.data.httpCode == 200) {
-      //         this.$message({
-      //           type: "success",
-      //           message: "添加成功",
-      //         });
-      //         this.updateForm();
-      //       }
-      //     })
-      //     .catch((e) => {
-      //       this.$message({
-      //         type: "error",
-      //         message: e.response.data.errorMessage.goods_code[0],
-      //       });
-      //     });
-      // }
     },
 
     // 修改成功后重置表单
@@ -319,6 +381,7 @@ export default {
         },
       ];
     },
+
     // 增加一个商品规格
     handleAdd() {
       this.skus.push({
@@ -328,23 +391,100 @@ export default {
         num: "",
         cost: "",
       });
+      console.log(this.skus);
     },
+
     // 删除一个商品规格
     handleDelete(index) {
       this.skus.splice(index, 1);
     },
+
     hanleurlimg(val) {
       console.log(val, "=+++++++++");
     },
+
     // 上传商品图片
     successUpload(file, fileList) {
       console.log(file, fileList, 5555);
     },
+
     errorUpload(file, fileList) {
       console.log(file, fileList, 5555);
     },
+
+    // 商品列表页进入带数据表单
+    getgoodsidData() {
+      let id = this.bigID;
+      let token = localStorage.getItem("token");
+      axios
+        .get(`/api/goods_skus/${id}`, {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        })
+        .then((res) => {
+          this.goodsData = res.data.data;
+        });
+    },
+
     // 移除商品图片
     removeUpload() {},
+
+    // 编辑确认请求
+    Edititem() {
+      let id = this.bigID;
+      console.log("ID", id);
+      console.log("goodsid", this.goodsData.goods_id);
+      let goods = {
+        title: this.goodsData.goods.title,
+        img_url: this.goodsData.goods.img_url,
+        type_id: this.goodsData.goods.type_id,
+        brand_id: this.goodsData.goods.brand_id,
+        goods_code: this.goodsData.goods.goods_code,
+      };
+      let sku = {
+        title: this.goodsData.title,
+        sku_code: this.goodsData.sku_code,
+        status: this.goodsData.status,
+        num: this.goodsData.num,
+        cost: this.goodsData.cost,
+      };
+      if (sku.status == "下架") {
+        sku.status = 0;
+      } else if (sku.status == "在售") {
+        sku.status = 1;
+      } else if (sku.status == "预警") {
+        sku.status = 2;
+      }
+      let data = {
+        goods_id: this.goodsData.goods_id,
+        goods,
+        sku,
+      };
+      console.log(data);
+      let token = localStorage.getItem("token");
+      axios
+        .patch(`/api/goods_skus/${id}`, data, {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        })
+        .then((res) => {
+          console.log(res);
+        });
+    },
+
+    // 取消按钮
+    cancel() {
+      this.$router.push("/GOODS_LIST");
+    },
+  },
+  created() {
+    this.goodsID = sessionStorage.getItem("商品ID");
+    this.bigID = sessionStorage.getItem("ID");
+    // console.log("商品ID", this.goodsID);
+    // console.log("ID", this.bigID);
+    this.getgoodsidData();
   },
   mounted() {
     this.gid = this.$route.query;
@@ -359,6 +499,10 @@ export default {
     this.handleList();
     this.handleUpdate();
   },
+  beforeDestroy() {
+    sessionStorage.removeItem("商品ID"); //销毁内存中的商品ID
+    sessionStorage.removeItem("ID"); //销毁内存中的ID
+  },
 };
 </script>
 
@@ -372,13 +516,15 @@ export default {
 }
 .addto {
   display: inline-block;
-  width: 28px;
-  height: 28px;
+  width: 30px;
+  height: 30px;
   background-color: blue;
   color: #fff;
   font-size: 25px;
   text-align: center;
-  line-height: 28px;
+  line-height: 30px;
+  border-radius: 5px;
+  margin-top: 4px;
 }
 /* .btn {
   text-align: center;
diff --git a/resources/frontend/src/views/yingyeting/yingyeting.vue b/resources/frontend/src/views/yingyeting/yingyeting.vue
index 44d7867..8bf65eb 100644
--- a/resources/frontend/src/views/yingyeting/yingyeting.vue
+++ b/resources/frontend/src/views/yingyeting/yingyeting.vue
@@ -3,9 +3,9 @@
   <div>
     <!-- 条件筛选板块 -->
     <el-card class="box-card">
-      <div class="goods" style="margin: 20px">
+      <div class="goods">
         <el-form ref="form" :inline="true" :model="form">
-          <el-form-item label="商品名称：">
+          <el-form-item label="商品名称：" :style="(marginRight = '80')">
             <el-input v-model="form.goods_title" placeholder="商品名称">
             </el-input>
           </el-form-item>
@@ -35,10 +35,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="商品库存：">
-            <el-input v-model="form.keyword_type" placeholder="商品库存">
-            </el-input>
-          </el-form-item>
           <el-form-item label="商品状态：">
             <el-select v-model="form.status" placeholder="商品状态">
               <el-option
@@ -51,20 +47,22 @@
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间：">
-            <el-date-picker
-              v-model="timer"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              align="right"
-              value-format="yyyy-MM-DD hh:mm:ss"
-            >
-            </el-date-picker>
+            <div class="block">
+              <el-date-picker
+                v-model="value1"
+                type="datetimerange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                @change="getSTime"
+              >
+              </el-date-picker>
+            </div>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleChoose">筛选</el-button>
-            <el-button plain @click="handleReChoose">重置筛选</el-button>
+            <el-button type="primary" @click="handleChoose()">筛选</el-button>
+            <el-button plain @click="handleReChoose()">重置筛选</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -74,22 +72,135 @@
       <div>
         <!-- 表格头部操作 -->
         <div>
-          <span> 全部商品(共{{ total }}条) </span>
+          <span>全部商品(共{{ total }}条)</span>
           <div class="btn">
             <el-button type="primary" plain @click="addNewgoods"
               >新建商品</el-button
             >
-            <el-button type="primary" @click="update()" plain>上新</el-button>
-            <el-button type="primary" plain>库存盘点</el-button>
-            <el-button type="primary" plain @click="handleImport"
+            <el-button type="primary" plain @click="dialogVisible = true"
+              >上新</el-button
+            >
+            <el-button type="primary" plain @click="dialogVisible2 = true"
+              >库存盘点</el-button
+            >
+            <el-button type="primary" plain @click="handleImport()"
               >导入商品</el-button
             >
-            <el-button type="primary" plain @click="handleExport"
+            <el-button type="primary" plain @click="handleExport()"
               >表格导出</el-button
             >
           </div>
         </div>
 
+        <!-- 点击上新弹出确认框 -->
+        <el-dialog :visible.sync="dialogVisible" width="20%">
+          <span>您确定要上新吗?</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="update()">确 定</el-button>
+          </span>
+        </el-dialog>
+
+        <!-- 点击库存盘点弹出确认框 -->
+        <el-dialog :visible.sync="dialogVisible2" width="20%">
+          <span>您确定要开始库存盘点吗?</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible2 = false">取 消</el-button>
+            <el-button type="primary" @click="onCount()">确 定</el-button>
+          </span>
+        </el-dialog>
+
+        <!-- 参考售价弹出确认框 -->
+        <el-dialog :visible.sync="dialogVisible3" width="20%">
+          <span>您确定要修改吗?</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible3 = false">取 消</el-button>
+            <el-button type="primary" @click="reference_priceRequest()"
+              >确 定</el-button
+            >
+          </span>
+        </el-dialog>
+
+        <!-- 预留量弹出框 -->
+        <el-dialog :visible.sync="dialogVisible4" width="20%">
+          <span>您确定要修改吗?</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible4 = false">取 消</el-button>
+            <el-button type="primary" @click="reserveRequest()"
+              >确 定</el-button
+            >
+          </span>
+        </el-dialog>
+
+        <!-- 点击表格导出弹出框 -->
+        <el-dialog title="表格导出" :visible.sync="Tableexport" width="30%">
+          <div>
+            选择:
+            <template>
+              <el-select v-model="value" placeholder="盘点表/运营表/成本表">
+                <el-option
+                  v-for="item in options2"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="Tableexport = false">取 消</el-button>
+            <el-button type="primary" @click="derivation()">确 定</el-button>
+            <!-- <a :href="`http://erp.staging.miaoxuan66.cn/goods_skus/export`">确 定</a> -->
+          </span>
+        </el-dialog>
+
+        <!-- 点击商品文件导入弹出框 -->
+        <el-dialog
+          title="导入商品"
+          :visible.sync="docImportDrawer"
+          direction="rtl"
+          custom-class="demo-drawer"
+          ref="drawer"
+          size="20%"
+          width="30%"
+          @close="importForm.imFileList = []"
+        >
+          <div class="demo-drawer__content">
+            <el-form :model="importForm" :rules="improtRules" ref="importForm">
+              <el-form-item
+                label="上传文件"
+                label-width="100px"
+                prop="fileList"
+              >
+                <el-upload
+                  class="uploader"
+                  action=""
+                  :limit="1"
+                  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                  :file-list="importForm.fileList"
+                  :auto-upload="false"
+                  :on-change="importFileChange"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </el-form-item>
+            </el-form>
+            <div class="demo-drawer__footer btn-style">
+              <el-button @click="docImportDrawer = false">取 消</el-button>
+              <el-button type="primary" @click="saveUpload">上 传</el-button>
+            </div>
+          </div>
+          <div class="import-right">
+            <el-button size="medium" class="button-query">
+              <a
+                :href="`http://erp.staging.miaoxuan66.cn/goods/import/template`"
+                >下载模板</a
+              >
+            </el-button>
+          </div>
+        </el-dialog>
+
         <!-- 表格 -->
         <el-table
           ref="multipleTable"
@@ -99,11 +210,24 @@
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <el-table-column label="商品信息">
+          <!-- 多选框 -->
+          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column label="商品信息" width="250">
             <template slot-scope="scope">
-              <div>{{ scope.row.goods.img_url }}</div>
-              <div>{{ scope.row.goods.title }}</div>
+              <div class="commodityimg">
+                <img
+                  src="https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-dc-site/c40319b0-6080-11eb-918d-3d24828c498c.png"
+                />
+              </div>
+              <div>
+                <p>{{ scope.row.goods.title }}</p>
+                <p>
+                  {{ scope.row.goods.goods_code + "_" + scope.row.sku_code }}
+                </p>
+                <p>
+                  {{ scope.row.goods.updated_at }}
+                </p>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="品类">
@@ -121,109 +245,261 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="two_days_ago_num" sortable label="2天前库存">
+          <el-table-column
+            prop="two_days_ago_num"
+            sortable
+            label="2天前库存"
+            min-width="110"
+          >
           </el-table-column>
-          <el-table-column prop="yesterday_num" sortable label="1天前库存">
+          <el-table-column
+            prop="yesterday_num"
+            sortable
+            label="1天前库存"
+            min-width="110"
+          >
           </el-table-column>
-          <el-table-column sortable label="今日到货">
-            <template slot-scope="scope">
-              <div>
-                <div v-if="true">
-                  <el-input v-model="input"></el-input>
-                </div>
-                <div>
-                  {{
-                    scope.row.daily != null
-                      ? scope.row.daily.arrived_today_num
-                      : 0
-                  }}
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="cost" sortable label="成本">
-            <template>
-              <div v-if="isShow">
-                <el-input v-model="input"></el-input>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="reference_price" sortable label="参考售价">
-          </el-table-column>
-          <el-table-column prop="num" sortable label="总量"> </el-table-column>
-          <el-table-column prop="reserve" sortable label="预留量">
-          </el-table-column>
-          <el-table-column prop="name" sortable label="店铺订单">
-          </el-table-column>
-          <el-table-column sortable label="损耗">
-            <template slot-scope="scope">
-              <el-popover width="200" placement="right" trigger="hover">
-                <div class="detail">
-                  <span>损耗：</span>
-                  <el-input></el-input>
-                </div>
-                <el-radio-group v-model="radio">
-                  <el-radio :label="3">48h以上</el-radio>
-                  <el-radio :label="6">到货错误</el-radio>
-                  <el-radio :label="9">灰霉</el-radio>
-                  <el-radio :label="2">长度</el-radio>
-                  <el-radio :label="4">花朵</el-radio>
-                  <el-radio :label="5">其他</el-radio>
-                </el-radio-group>
 
+          <el-table-column sortable label="今日到货" min-width="110">
+            <template slot-scope="scope">
+              <div v-if="isShow">
+                <el-input
+                  v-model="scope.row.daily.arrived_today_num"
+                ></el-input>
+              </div>
+              <div v-else>
+                {{
+                  scope.row.daily != null
+                    ? scope.row.daily.arrived_today_num
+                    : 0
+                }}
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="cost" sortable label="成本" min-width="110">
+            <template slot-scope="scope">
+              <div v-if="isShow">
+                <el-input v-model="scope.row.cost"></el-input>
+              </div>
+              <div v-else>
+                {{ scope.row.cost != null ? scope.row.cost : 0 }}
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="reference_price"
+            sortable
+            label="参考售价"
+            min-width="110"
+          >
+            <template slot-scope="scope">
+              <div v-if="scope.row.id === id">
+                <el-input
+                  v-model="scope.row.reference_price"
+                  @blur="reference_priceBlur(scope.row)"
+                ></el-input>
+              </div>
+              <div v-else>
+                {{ scope.row.reference_price }}
+                <el-button
+                  slot="reference"
+                  class="btn11"
+                  @click="reference_priceClick(scope.row.id)"
+                  ><img src="../../css/img/编辑.png"
+                /></el-button>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="num" sortable label="总量" min-width="110">
+          </el-table-column>
+          <el-table-column
+            prop="reserve"
+            sortable
+            label="预留量"
+            min-width="110"
+          >
+            <template slot-scope="scope">
+              <div v-if="scope.row.id === id1">
+                <el-input
+                  v-model="scope.row.reserve"
+                  @blur="reservebBlur(scope.row)"
+                ></el-input>
+              </div>
+              <div v-else>
+                {{ scope.row.reserve }}
+              </div>
+              <el-button
+                slot="reference"
+                class="btn11"
+                @click="onreserve(scope.row.id)"
+                ><img src="../../css/img/编辑.png" alt=""
+              /></el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            sortable
+            label="店铺订单"
+            min-width="110"
+          ></el-table-column>
+          <el-table-column sortable label="损耗" min-width="110">
+            <template slot-scope="scope">
+              <div v-if="scope.row.id === id2">
+                <el-input v-model="scope.row.daily.loss_num"></el-input>
+              </div>
+              <div v-else>
+                {{ scope.row.daily.loss_num }}
+              </div>
+              <el-popover placement="right-start" width="220" trigger="click">
+                <p>损耗:</p>
+                <el-input v-model="scope.row.daily.loss_num"></el-input>
+                <el-radio-group v-model="radio">
+                  <el-radio disabled>原因:</el-radio>
+                  <el-radio label="48h以上">48h以上</el-radio>
+                  <el-radio label="到货错误">到货错误</el-radio>
+                  <el-radio label="灰霉">灰霉</el-radio>
+                  <el-radio label="长度">长度</el-radio>
+                  <el-radio label="花朵">花朵</el-radio>
+                  <el-radio label="其他">其他</el-radio>
+                </el-radio-group>
                 <div class="list_btn">
-                  <el-button type="primary">保存</el-button>
-                  <el-button>取消</el-button>
-                </div>
-                <div class="loss" slot="reference">
-                  {{ scope.row.daily ? scope.row.daily.arrived_loss_num : 0 }}
+                  <el-button type="primary" @click="onLoss(scope.row)"
+                    >保存</el-button
+                  >
                 </div>
+                <el-button
+                  slot="reference"
+                  class="btn11"
+                  @click="loss(scope.row.id)"
+                  ><img src="../../css/img/编辑.png" alt=""
+                /></el-button>
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="stock" sortable label="库存">
+          <el-table-column prop="stock" sortable label="库存" min-width="110">
           </el-table-column>
-          <el-table-column prop="address" sortable label="库存盘点">
+          <el-table-column
+            prop="address"
+            sortable
+            label="库存盘点"
+            min-width="110"
+          >
             <template slot-scope="scope">
-              <div>{{ scope.row.daily ? scope.row.daily.inventory : 0 }}</div>
+              <div v-if="stock">
+                <el-input v-model="scope.row.daily.inventory"></el-input>
+              </div>
+              <div v-else>{{ scope.row.daily.inventory }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="status" label="状态"> </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" width="100">
             <template slot-scope="scope">
               <div>
-                <el-button type="text">库存</el-button>
+                <el-button type="text" @click="ejectstock(scope.row)"
+                  >库存</el-button
+                >
               </div>
               <div>
-                <el-button type="text" @click="handleEdit(scope.row.id)"
+                <el-button
+                  type="text"
+                  @click="handleEdit(scope.row.goods_id, scope.row.id)"
                   >编辑</el-button
                 >
               </div>
               <div>
-                <el-button type="text">记录</el-button>
+                <el-button type="text" @click="goodslog(scope.row)"
+                  >记录</el-button
+                >
               </div>
+
+              <!-- 点击库存按钮弹出框 -->
+              <el-dialog title="修改" :visible.sync="ejectstock1" width="30%">
+                <el-table
+                  :data="ommodityInventory"
+                  class="table"
+                  tooltip-effect="dark"
+                  style="width: 100%"
+                  @selection-change="handleSelectionChange"
+                >
+                  <el-table-column prop="two_days_ago_num" label="2天前库存">
+                    <template slot-scope="scope">
+                      <div>
+                        {{ scope.row.two_days_ago_num }}
+                        <el-input
+                          v-model="scope.row.two_days_ago_num"
+                        ></el-input>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="yesterday_num" label="1天前库存">
+                    <template slot-scope="scope">
+                      <div>
+                        {{ scope.row.yesterday_num }}
+                        <el-input v-model="scope.row.yesterday_num"></el-input>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column sortable label="今日到货">
+                    <template slot-scope="scope">
+                      <div>
+                        {{ scope.row.daily.arrived_today_num }}
+                        <el-input
+                          v-model="scope.row.daily.arrived_today_num"
+                        ></el-input>
+                      </div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+
+                <span slot="footer" class="dialog-footer">
+                  <el-button @click="ejectstock1 = false">取 消</el-button>
+                  <el-button type="primary" @click="oldStock()"
+                    >确 定</el-button
+                  >
+                </span>
+              </el-dialog>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <el-button type="primary">确定</el-button>
+
+      <!-- 确定按钮 -->
+      <el-button type="primary" class="confirmbtn" @click="onSubmit()"
+        >确定</el-button
+      >
+
+      <!-- 分页功能 -->
+      <div class="block">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="current_page"
+          :page-sizes="[15, 50, 100]"
+          :page-size="per_page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="Paginationdata.total"
+        >
+        </el-pagination>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script>
 import axios from "axios";
-import { goods } from "../../api/goods";
 import { goods_types, Brand_goods_types } from "../../api/rankingData.js";
+import { goods, update, singleUpdate } from "../../api/goods";
 export default {
   data() {
     return {
+      id: "", //参考售价的id
+      id1: "", //预留量的id
+      id2: "", //损耗的id
       total: 0, // 总条数
-      timer: "", // 筛选的时间
       radio: "", // 损耗选择的原因
       brand: [], // 品牌列表
       cate: [], // 种类列表
-      isShow: false, // 点击上新显示输入框
       tableData: [], // 商品列表
       options: [
         {
@@ -239,7 +515,21 @@ export default {
           label: "下架",
         },
       ], // 商品状态
-
+      options2: [
+        {
+          value: "inventory",
+          label: "盘点表",
+        },
+        // {
+        //   value: "选项2",
+        //   label: "运营表",
+        // },
+        {
+          value: "cost",
+          label: "成本表",
+        },
+      ], //表格导出选项
+      value: "", //表格导出选择的选项
       // 请求商品列表的参数
       form: {
         goods_title: "", // 商品名称
@@ -247,52 +537,115 @@ export default {
         brand_id: "", // 商品品牌id
         sku_title: "", // 商品规格
         status: "", // 商品状态
-        keyword_type: "", // 库存
-        keyword_value: "",
-        page: 1,
-        per_page: 5,
+        keyword_value: "", //日期筛选
       },
-      input: "",
-      value1: "",
+      // cost_input: "", //成本输入input框变量
+      // arrived_today_num: "", //今日到货input框变量
+      Paginationdata: {}, //分页相关数据
+      current_page: 1, //当前页
+      per_page: 15, //每页显示数量
+      multipleSelection: [], //多选框选中的id
+      updateType: "", //更新类型，newest-上新, inventory-库存盘点, stock-库存
+      stock: false, //点击库存显示输入框变量
+      isShow: false, // 点击上新显示输入框
+      ejectstock1: false, //点击库存按钮弹出框变量
+      Importgoods: false, //导入商品变量
+      Tableexport: false, //表格导出变量
+      isShow1: false, //文件传输弹出变量
+      //表格导入相关变量
+      importForm: {
+        fileList: [],
+      },
+      docImportDrawer: false,
+      improtRules: {
+        fileList: [
+          { required: true, message: "请导入Excel文件", trigger: "change" },
+          {
+            validator: (rule, value, callback) => {
+              if (!value.length) {
+                callback(new Error("请导入Excel文件"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+      },
+      // 文件模板手添加到根目录下
+      publicPath: process.env.BASE_URL, // public文件夹路径
+      excelTemplatePath: "", // 数据导入Excel模板下载地址 - 调接口获取
+      visible: false,
+      updateField: "", //reference_price-参考售价, reserve-预留量, loss_num-损耗, status-状态
+      reference_priceShow: false,
+      reserveShow: false, //预留量-input显示变量
+      value1: "", // 筛选的时间
+      ommodityInventory: [], //单个商品库存
+      dialogVisible: false, //上新按钮弹出框变量
+      dialogVisible2: false, //库存盘点弹出框变量
+      dialogVisible3: false, //参考售价弹出框变量
+      dialogVisible4: false, //预留弹出框变量
+      publicId: "", //参考售价 预留量公用id
+      reference_price: "", //参考价格修改传参
+      reserve: "", //预留量修改传参
     };
   },
   methods: {
-    list() {
-      axios.get("/api/goods").then((res) => {
-        console.log("我是商品", res);
+    // 列表编辑
+    handleEdit(goodsid, id) {
+      // console.log(id);
+      // console.log("我是路由信息", this.$route);
+      sessionStorage.setItem("商品ID", goodsid);
+      sessionStorage.setItem("ID", id);
+      this.$router.push("/index/yingyeting/addgoods");
+    },
+
+    // 获取商品列表
+    getList() {
+      let page = {
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+      goods(page).then((res) => {
+        console.log("列表数据", res);
+        this.tableData = res.data.data;
+        this.total = res.data.meta.total;
+        this.Paginationdata = res.data.meta;
       });
     },
 
-    // 列表编辑
-    handleEdit(id) {
-      this.$router.push("/addgoods?id=" + id);
-    },
-    // 获取商品列表
-    getList() {
-      this.form.keyword_value = this.timer[0] + "-" + this.timer[1];
-      const forms = { ...this.form };
-      // console.log(forms, 'opopo')
-      goods(forms).then((res) => {
-        console.log(res);
-        this.tableData = res.data.data;
-        // console.log(res, 111)
-        // console.log(this.tableData, 'ppp')
-      });
-    },
     // 筛选
     handleChoose() {
-      this.getList();
-    },
-    // 分页-当前页改变
-    handleCurrentChange(e) {
-      this.form.page = e;
-      this.handleChoose();
-    },
-    // 分页
-    handleSizeChange(e) {
-      this.form.per_page = e;
-      this.getList();
+      this.form = {
+        ...this.form,
+        page: this.current_page,
+        per_page: this.per_page,
+      };
+
+      // 对象值为空清除
+      const newObj = filterParams(this.form);
+      function filterParams(obj) {
+        const _newPar = {};
+        for (const key in obj) {
+          // 如果对象属性的值不为空，就保存该属性（这里我做了限制，如果属性的值为0，保存该属性。如果属性的值全部是空格，属于为空。）
+          if (
+            (obj[key] === 0 || obj[key]) &&
+            obj[key].toString().replace(/(^\s*)|(\s*$)/g, "") !== ""
+          ) {
+            // 记录属性
+            _newPar[key] = obj[key];
+          }
+        }
+        // 返回对象
+        return _newPar;
+      }
+      goods(newObj).then((res) => {
+        this.tableData = res.data.data;
+        this.total = res.data.meta.total;
+        this.Paginationdata = res.data.meta;
+      });
     },
+
     // 重置筛选
     handleReChoose() {
       this.form = {
@@ -301,42 +654,346 @@ export default {
         brand_id: "", // 商品品牌id
         sku_title: "", // 商品规格
         status: "", // 商品状态
-        keyword_type: "",
       };
-      this.timer = "";
+      this.value1 = "";
     },
 
-    // 导入商品
-    handleImport() {},
-    // 导出商品
-    handleExport() {},
+    // 导入商品按钮
+    handleImport() {
+      this.docImportDrawer = true;
+    },
+    // 导出商品按钮
+    handleExport() {
+      this.Tableexport = true;
+    },
 
     // 点击上新
     update() {
+      this.dialogVisible = false;
       this.isShow = true;
-      console.log(this.isShow, 8888);
+      this.updateType = "newest";
+      this.stock = false;
     },
     // 复选框按钮
     handleSelectionChange(val) {
       console.log(val);
-      this.multipleSelection = val;
+      this.multipleSelection = val.map((item) => item.id);
+      console.log(this.multipleSelection);
     },
     // 新增商品跳转
     addNewgoods() {
       this.$router.push("/index/yingyeting/addgoods");
     },
-  },
-  mounted() {
+
+    //分页功能
+    handleSizeChange(val) {
+      //当前条数
+      this.per_page = val;
+      // console.log(1111, val);
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      //当前页
+      this.current_page = val;
+      // console.log(2222, val);
+      this.getList();
+    },
+
+    // 点击上新or库存盘点后确认
+    onSubmit() {
+      //判断点击的是上新，再发送上新请求
+      if (this.updateType === "newest") {
+        let skus = this.tableData.map((item) => {
+          return [
+            {
+              id: item.id,
+              cost: item.cost,
+              arrived_today_num: item.daily.arrived_today_num,
+            },
+          ];
+        });
+        let patchdata = {
+          updateType: this.updateType,
+          skus: skus.flat(),
+        };
+        console.log(patchdata);
+        // 上新请求
+        update(patchdata).then((res) => {
+          this.getList();
+          this.$message({
+            message: "上新成功！",
+            type: "success",
+          });
+        });
+      }
+
+      //判断点击的是库存盘点，再发送库存盘点请求
+      if (this.updateType === "inventory") {
+        let skus = this.tableData.map((item) => {
+          return [
+            {
+              id: item.id,
+              inventory: item.daily.inventory,
+            },
+          ];
+        });
+        let patchdata = {
+          updateType: this.updateType,
+          skus: skus.flat(),
+        };
+        // 上新请求
+        update(patchdata).then((res) => {
+          this.getList();
+          this.$message({
+            message: "库存盘点成功！",
+            type: "success",
+          });
+        });
+      }
+    },
+
+    // 点击库存盘点弹出框
+    onCount() {
+      this.dialogVisible2 = false;
+      this.isShow = false;
+      this.stock = true;
+      this.updateType = "inventory";
+    },
+
+    // 点击库存弹出框
+    ejectstock(row) {
+      this.ommodityInventory = [];
+      this.ejectstock1 = true;
+      this.updateType = "stock";
+      this.ommodityInventory.push(row);
+    },
+
+    // 库存弹出框确认
+    oldStock() {
+      this.ejectstock1 = false;
+      //判断点击的是库存，再发送库存请求
+      if (this.updateType === "stock") {
+        console.log(this.ommodityInventory);
+        let skus = [
+          {
+            id: this.ommodityInventory[0].id,
+            yesterday_num: this.ommodityInventory[0].yesterday_num,
+            two_days_ago_num: this.ommodityInventory[0].two_days_ago_num,
+            arrived_today_num:
+              this.ommodityInventory[0].daily.arrived_today_num,
+          },
+        ];
+        let stockpatch = {
+          updateType: this.updateType,
+          skus: skus,
+        };
+        // 库存请求
+        update(stockpatch).then((res) => {
+          this.getList();
+          this.$message({
+            message: "库存更新成功！",
+            type: "success",
+          });
+        });
+      }
+    },
+
+    // 商品导入
+    importFile() {
+      this.docImportDrawer = true;
+    },
+    // 数据导入-上传Excel
+    async importFileChange(file, fileList) {
+      this.importForm.fileList = fileList; // 检验上传文件是否为空
+    },
+    // 确定上传
+    saveUpload() {
+      this.$refs.importForm.validate(async (isValid) => {
+        if (!isValid) return;
+        try {
+          // 主要是这二行代码
+          const params = new FormData();
+          params.append("goodsSkus", this.importForm.fileList[0].raw);
+
+          this.isLoadingDialog = true;
+          let token = localStorage.getItem("token");
+          axios
+            .post("/api/goods_skus", params, {
+              headers: {
+                Authorization: `Bearer ${token}`,
+              },
+            })
+            .then((res) => {
+              console.log(res);
+            });
+          this.$message.success("模板导入成功");
+          this.docImportDrawer = false;
+        } finally {
+          this.isLoadingDialog = false;
+        }
+      });
+    },
+
+    // 数据导入-获取Excel模板地址
+    getExcelTemplatePath() {
+      this.$requestInternet.get("/api/xxx").then((res) => {
+        this.excelTemplatePath = res;
+      });
+    },
+
+    // 表格导出
+    derivation() {
+      let data = {
+        exportType: this.value,
+      };
+      console.log(data);
+
+      //  let token = localStorage.getItem("token");
+      // axios
+      //   .get("/api/goods_skus/export", data, {
+      //     headers: {
+      //       Authorization: `Bearer ${token}`,
+      //     },
+      //   })
+      //   .then((res) => {
+      //     console.log(res);
+      //   });
+      this.Tableexport = false;
+    },
+
+    // 点击记录按钮跳转商品记录
+    goodslog(row) {
+      console.log(row.id);
+      this.$router.push({
+        path: "/GOODS_LOG",
+        query: {
+          id: row.id,
+        },
+      });
+    },
+
+    // 获取筛选时间
+    getSTime(val) {
+      val.forEach((item, index, ary) => {
+        this.form.keyword_value = item + "-" + item;
+      });
+    },
+
+    // 参考价格点击修改
+    reference_priceClick(id) {
+      this.updateField = "reference_price";
+      this.reference_priceShow = true;
+      this.id = id;
+      this.id1 = "";
+    },
+
+    // 参考价格input框失去焦点弹出确认框
+    reference_priceBlur(row) {
+      this.dialogVisible3 = true;
+      this.publicId = row.id;
+      this.reference_price = row.reference_price;
+    },
+
+    //参考价格弹出框确认修改请求
+    reference_priceRequest() {
+      this.dialogVisible3 = false;
+      let reference_priceData = {
+        updateField: this.updateField,
+        reference_price: this.reference_price,
+      };
+      singleUpdate(this.publicId, reference_priceData).then((res) => {
+        this.id = "";
+        this.$message({
+          message: "参考售价修改成功！",
+          type: "success",
+        });
+      });
+    },
+
+    onreserve(id) {
+      this.updateField = "reserve";
+      this.id1 = id;
+      this.id = "";
+    },
+
+    // 预留量  失去焦点修改
+    reservebBlur(row) {
+      this.reserve = row.reserve;
+      this.dialogVisible4 = true;
+      // let reservebData = {
+      //   updateField: this.updateField,
+      //   reserve: row.reserve,
+      // };
+      // singleUpdate(row.id, reservebData).then((res) => {
+      //   this.$message({
+      //     message: "预留量修改成功！",
+      //     type: "success",
+      //   });
+      // });
+    },
+
+    // 预留量弹出框确认请求
+    reserveRequest() {
+      let reservebData = {
+        updateField: this.updateField,
+        reserve: this.reserve,
+      };
+      this;
+      singleUpdate(this.publicId, reservebData).then((res) => {
+        this.dialogVisible4 = false;
+        this.$message({
+          message: "预留量修改成功！",
+          type: "success",
+        });
+      });
+    },
+
+    loss(id) {
+      this.updateField = "loss_num";
+      this.id2 = id;
+    },
+
+    // 添加损耗
+    onLoss(row) {
+      // console.log(this.radio);
+      // console.log(row);
+      // console.log(row.id);
+      let id = row.id;
+      let lossData = {
+        updateField: this.updateField,
+        reason: this.radio,
+        loss_num: row.daily.loss_num,
+      };
+      singleUpdate(id, lossData).then((res) => {
+        this.$message({
+          message: "损耗添加成功！",
+          type: "success",
+        });
+      });
+    },
+
     // 获取商品种类
-    goods_types().then((res) => {
-      this.cate = res.data.data;
-    });
+    getgoodsType() {
+      goods_types().then((res) => {
+        this.cate = res.data.data;
+      });
+    },
+
     // 获取商品品牌
-    Brand_goods_types().then((res) => {
-      this.brand = res.data.data;
-    });
-    // 获取商品列表
+    getbrandType() {
+      Brand_goods_types().then((res) => {
+        this.brand = res.data.data;
+      });
+    },
+  },
+
+  mounted() {
+    this.getgoodsType();
+    this.getbrandType();
     this.getList();
+    this.id = "";
+    this.id1 = "";
+    this.id2 = "";
   },
 };
 </script>
@@ -346,24 +1003,53 @@ export default {
   position: relative;
 }
 
-/deep/ .detail .el-button,
-/deep/ .detail .el-button--primary {
-  width: 20px;
-  height: 20px;
-  line-height: 5px;
-}
-/deep/ .detail .el-input,
-/deep/ .detail .el-input__inner {
-  width: 20px;
-  height: 20px;
-}
-
-.goods {
-}
 .table {
   margin-top: 40px;
 }
 .btn {
   float: right;
 }
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+}
+
+.commodityimg {
+  width: 59px;
+  height: 59px;
+  background: rgba(227, 227, 227, 0.39);
+  opacity: 1;
+  display: block;
+  margin-right: 12px;
+}
+
+.confirmbtn {
+  width: 114px;
+  height: 44px;
+  border-radius: 3px;
+  margin-top: 21px;
+  margin-bottom: 8px;
+}
+
+.import-right {
+  margin-top: 30px;
+}
+
+.import-right a {
+  text-decoration: none;
+  color: black;
+}
+
+::v-deep .btn11 {
+  padding: 0;
+  width: 14px;
+  height: 14px;
+}
 </style>
+
+<!-- <style>
+.el-form--inline .el-form-item {
+  margin-right: 30px;
+}
+</style> -->