Merge branch 'develop' of gitee.com:hzchunfen/erp into develop

public/dist/css/chunk-3043d49d.3ff10d3b.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.loss[data-v-bd299e24]{position:relative}.table[data-v-bd299e24]{margin-top:40px;position:relative}.btn[data-v-bd299e24]{float:right}[data-v-bd299e24] .cell{display:flex;align-items:center}.commodityimg[data-v-bd299e24]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-bd299e24]{width:100%;height:100%}.confirmbtn[data-v-bd299e24]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-bd299e24]{margin-top:30px}.import-right a[data-v-bd299e24]{text-decoration:none;color:#000}[data-v-bd299e24] .btn11{padding:0;width:14px;height:14px}[data-v-bd299e24] .btn11 img{width:100%;height:100%}.page[data-v-bd299e24]{margin-top:20px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.loss[data-v-83f3bb02]{position:relative}.table[data-v-83f3bb02]{margin-top:40px;position:relative}.btn[data-v-83f3bb02]{float:right}[data-v-83f3bb02] .cell{display:flex;align-items:center}.commodityimg[data-v-83f3bb02]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-83f3bb02]{width:100%;height:100%}.confirmbtn[data-v-83f3bb02]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-83f3bb02]{margin-top:30px}.import-right a[data-v-83f3bb02]{text-decoration:none;color:#000}[data-v-83f3bb02] .btn11{padding:0;width:14px;height:14px}[data-v-83f3bb02] .btn11 img{width:100%;height:100%}.page[data-v-83f3bb02]{margin-top:20px}

public/dist/css/chunk-3e22dfcf.0c73552c.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a[data-v-5edd565e]{text-decoration:none;color:#fff}.conent[data-v-5edd565e]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-5edd565e]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-5edd565e]{width:114px;height:44px;border-radius:3px}.table[data-v-5edd565e]{margin-top:20px}.block[data-v-5edd565e]{margin-top:30px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a[data-v-ef1e5d30]{text-decoration:none;color:#fff}.conent[data-v-ef1e5d30]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-ef1e5d30]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-ef1e5d30]{width:114px;height:44px;border-radius:3px}.table[data-v-ef1e5d30]{margin-top:20px}.block[data-v-ef1e5d30]{margin-top:30px}

public/dist/css/chunk-dce0c6c0.3d009b2d.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.conent[data-v-d0756c04]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-d0756c04]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-d0756c04]{width:114px;height:44px;border-radius:3px}.table[data-v-d0756c04]{margin-top:20px}.block[data-v-d0756c04]{margin-top:30px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.conent[data-v-2bed7ffe]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-2bed7ffe]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-2bed7ffe]{width:114px;height:44px;border-radius:3px}.table[data-v-2bed7ffe]{margin-top:20px}.block[data-v-2bed7ffe]{margin-top:30px}

public/dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-0f67ac47.e437602b.css" rel="prefetch"><link href="css/chunk-14ff3ba6.56e84236.css" rel="prefetch"><link href="css/chunk-3ad98ce0.c0acee9a.css" rel="prefetch"><link href="css/chunk-50481dc1.e437602b.css" rel="prefetch"><link href="css/chunk-516d32cc.90c055c4.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-62101cb8.67947a26.css" rel="prefetch"><link href="css/chunk-78bf44ba.3a189719.css" rel="prefetch"><link href="css/chunk-84c0d1fa.47f57404.css" rel="prefetch"><link href="css/chunk-8eb4b592.9e793ba8.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="js/chunk-0f67ac47.eed43c85.js" rel="prefetch"><link href="js/chunk-14ff3ba6.8a0304d0.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3ad98ce0.0fb41c18.js" rel="prefetch"><link href="js/chunk-50481dc1.4db40c89.js" rel="prefetch"><link href="js/chunk-516d32cc.5004e058.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-62101cb8.df8fe332.js" rel="prefetch"><link href="js/chunk-78bf44ba.c9810140.js" rel="prefetch"><link href="js/chunk-84c0d1fa.4b6880d0.js" rel="prefetch"><link href="js/chunk-8eb4b592.e5b9638c.js" rel="prefetch"><link href="js/chunk-959f9a24.5809f600.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.2c649b2a.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.2c649b2a.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-0f67ac47.e437602b.css" rel="prefetch"><link href="css/chunk-14ff3ba6.56e84236.css" rel="prefetch"><link href="css/chunk-3043d49d.3ff10d3b.css" rel="prefetch"><link href="css/chunk-3ad98ce0.c0acee9a.css" rel="prefetch"><link href="css/chunk-3e22dfcf.0c73552c.css" rel="prefetch"><link href="css/chunk-50481dc1.e437602b.css" rel="prefetch"><link href="css/chunk-516d32cc.90c055c4.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-62101cb8.67947a26.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="css/chunk-dce0c6c0.3d009b2d.css" rel="prefetch"><link href="js/chunk-0f67ac47.d6c77755.js" rel="prefetch"><link href="js/chunk-14ff3ba6.faaa4534.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3043d49d.669d344b.js" rel="prefetch"><link href="js/chunk-3ad98ce0.d4852cea.js" rel="prefetch"><link href="js/chunk-3e22dfcf.17a21be0.js" rel="prefetch"><link href="js/chunk-50481dc1.2ba9dc04.js" rel="prefetch"><link href="js/chunk-516d32cc.5004e058.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-62101cb8.df8fe332.js" rel="prefetch"><link href="js/chunk-959f9a24.63a93281.js" rel="prefetch"><link href="js/chunk-dce0c6c0.51e6f004.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.946c8748.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.946c8748.js"></script></body></html>

resources/frontend/src/api/rankingData.js

@@ -44,11 +44,11 @@ export function storeDetail(params) {
 }
 // 鲜花项目接口从这里开始
 // 商品种类列表
-export function goods_types(data) {
+export function goods_types(params) {
   return http({
     url: "/api/goods_types",
     method: "get",
-    data,
+    params,
   });
 }
 // 商品种类列表删除

resources/frontend/src/api/shop.js

@@ -18,10 +18,11 @@ export function shopAdd(data) {
   });
 }
 // 店铺列表
-export function storeList() {
+export function storeList(params) {
   return http({
     url: "/api/shops",
     method: "get",
+    params,
   });
 }
 

resources/frontend/src/api/user.js

@@ -11,10 +11,11 @@ export function roleList() {
 }
 
 //用户列表请求
-export function userList() {
+export function userList(params) {
   return http({
     url: "/api/users",
     method: "get",
+    params,
   });
 }
 

resources/frontend/src/views/home/home.vue

@@ -86,7 +86,7 @@ import {
   Addgoods_types,
   editGoods_types,
 } from "../../api/rankingData";
-import axios from "axios";
+// import axios from "axios";
 export default {
   data() {
     return {
@@ -109,7 +109,7 @@ export default {
       per_page: 15, //每页显示数量
     };
   },
-  created() {
+  mounted() {
     this.getGoods_types();
   },
   methods: {

resources/frontend/src/views/store/store.vue

@@ -153,13 +153,11 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      // console.log(1111, val);
       this.getStoreList();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      // console.log(2222, val);
       this.getStoreList();
     },
 

resources/frontend/src/views/yingyeting/yingyeting.vue

@@ -55,7 +55,7 @@
             <el-select
               v-model="form.status"
               placeholder="商品状态"
-              style="width: 125px"
+              style="width: 115px"
             >
               <el-option
                 v-for="item in options"
@@ -72,11 +72,11 @@
                 v-model="value1"
                 type="datetimerange"
                 range-separator="至"
-                start-placeholder="开始日期"
+                start-placeholder="开始时间"
-                end-placeholder="结束日期"
+                end-placeholder="结束时间"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 @change="getSTime"
-                style="width: 350px"
+                style="width: 190px"
               >
               </el-date-picker>
             </div>
@@ -228,13 +228,13 @@
         >
           <!-- 多选框 -->
           <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="商品信息" width="250">
+          <el-table-column label="商品信息" width="300">
             <template slot-scope="scope">
               <div class="commodityimg">
                 <img :src="scope.row.goods.img_url" class="Img" />
               </div>
               <div>
-                <p>{{ scope.row.goods.title }}</p>
+                <p>{{ scope.row.goods.title }}&nbsp;{{ scope.row.title }}</p>
                 <p>
                   {{ scope.row.goods.goods_code + "_" + scope.row.sku_code }}
                 </p>