!97 develop

Merge pull request !97 from develop

app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php

@@ -138,7 +138,7 @@ class KuaiTuanTuan extends BusinessClient
             if ('业务服务错误' === $res['error_response']['error_msg'] && '该店铺下不存在该商品' === $res['error_response']['sub_msg']) {
                 BusinessGoodsSku::where('goods_id', $appendParams['goods_id'])->where('sku_id', $appendParams['sku_id'])->delete();
             } else {
-                throw new \RuntimeException($res['error_response']['error_msg'] . ':' . $res['error_response']['error_msg']);
+//                throw new \RuntimeException($res['error_response']['error_msg'] . ':' . $res['error_response']['error_msg']);
             }
         }
 

public/dist/css/chunk-253ca5b0.e94ab248.css

@@ -1 +0,0 @@
-.block[data-v-4d020ce1]{margin-top:20px}

public/dist/css/chunk-2d9c0b4e.0d54de90.css

@@ -0,0 +1 @@
+.table[data-v-1c7595f6]{margin-top:20px;position:relative}.btn[data-v-1c7595f6]{float:right}[data-v-1c7595f6] .cell{display:flex;align-items:center}.commodityimg[data-v-1c7595f6]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-1c7595f6]{width:100%;height:100%}.confirmbtn[data-v-1c7595f6]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-1c7595f6]{margin-top:30px}.import-right a[data-v-1c7595f6]{text-decoration:none;color:#000}[data-v-1c7595f6] .btn11{padding:0;width:14px;height:14px}[data-v-1c7595f6] .btn11 img{width:100%;height:100%}.page[data-v-1c7595f6]{margin-top:20px}

public/dist/css/chunk-4cc75dcf.05c81c5f.css

@@ -0,0 +1 @@
+.block[data-v-6c494536]{margin-top:20px}

public/dist/css/chunk-5e4a5e4e.7dcbe287.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)}}.block[data-v-25465f92]{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)}}.block[data-v-4483eb33]{margin-top:20px}

public/dist/css/chunk-5fe65568.884dd222.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-1137cbaa]{text-decoration:none;color:#fff}.block[data-v-1137cbaa]{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)}}a[data-v-55ceb94a]{text-decoration:none;color:#fff}.block[data-v-55ceb94a]{margin-top:20px}

public/dist/css/chunk-7529a615.00296464.css

@@ -1 +0,0 @@
-.table[data-v-42dfed8f]{margin-top:20px;position:relative}.btn[data-v-42dfed8f]{float:right}[data-v-42dfed8f] .cell{display:flex;align-items:center}.commodityimg[data-v-42dfed8f]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-42dfed8f]{width:100%;height:100%}.confirmbtn[data-v-42dfed8f]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-42dfed8f]{margin-top:30px}.import-right a[data-v-42dfed8f]{text-decoration:none;color:#000}[data-v-42dfed8f] .btn11{padding:0;width:14px;height:14px}[data-v-42dfed8f] .btn11 img{width:100%;height:100%}.page[data-v-42dfed8f]{margin-top:20px}

public/dist/css/chunk-dfcdd772.d7b6548a.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)}}.block[data-v-0780dc0d]{margin-top:20px}[data-v-0780dc0d] .el-card__body{padding:0}
+#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)}}.block[data-v-f2a74266]{margin-top:20px}[data-v-f2a74266] .el-card__body{padding:0}

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-0050b7a0.29a99b3a.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-0f6801be.5b16ca29.css" rel="prefetch"><link href="css/chunk-253ca5b0.e94ab248.css" rel="prefetch"><link href="css/chunk-288420ae.363cf34f.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4f15b41a.2cf53495.css" rel="prefetch"><link href="css/chunk-5c4e4e5e.6bab9f78.css" rel="prefetch"><link href="css/chunk-698f0f68.96d82e53.css" rel="prefetch"><link href="css/chunk-7529a615.00296464.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-d98e057e.1d268c2c.css" rel="prefetch"><link href="js/chunk-0050b7a0.55e2f736.js" rel="prefetch"><link href="js/chunk-0cbcaa56.114d39a7.js" rel="prefetch"><link href="js/chunk-0f6801be.02751f94.js" rel="prefetch"><link href="js/chunk-253ca5b0.37e2e0e1.js" rel="prefetch"><link href="js/chunk-288420ae.01dbede2.js" rel="prefetch"><link href="js/chunk-35db73ce.a3585c34.js" rel="prefetch"><link href="js/chunk-4f15b41a.059677d1.js" rel="prefetch"><link href="js/chunk-5c4e4e5e.96b6dca7.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-698f0f68.a0f8050b.js" rel="prefetch"><link href="js/chunk-7529a615.a6b91ae6.js" rel="prefetch"><link href="js/chunk-75426f71.aa7e65a8.js" rel="prefetch"><link href="js/chunk-a3ddd952.ad97c910.js" rel="prefetch"><link href="js/chunk-d98e057e.6df199dd.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.728c36ae.js" rel="preload" as="script"><link href="js/chunk-vendors.13743003.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.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.13743003.js"></script><script src="js/app.728c36ae.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-0050b7a0.29a99b3a.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-288420ae.363cf34f.css" rel="prefetch"><link href="css/chunk-2d9c0b4e.0d54de90.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4cc75dcf.05c81c5f.css" rel="prefetch"><link href="css/chunk-4f15b41a.2cf53495.css" rel="prefetch"><link href="css/chunk-5e4a5e4e.7dcbe287.css" rel="prefetch"><link href="css/chunk-5fe65568.884dd222.css" rel="prefetch"><link href="css/chunk-698f0f68.96d82e53.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-dfcdd772.d7b6548a.css" rel="prefetch"><link href="js/chunk-0050b7a0.55e2f736.js" rel="prefetch"><link href="js/chunk-0cbcaa56.114d39a7.js" rel="prefetch"><link href="js/chunk-288420ae.01dbede2.js" rel="prefetch"><link href="js/chunk-2d9c0b4e.5cf6d39b.js" rel="prefetch"><link href="js/chunk-35db73ce.a3585c34.js" rel="prefetch"><link href="js/chunk-4cc75dcf.4b8c2114.js" rel="prefetch"><link href="js/chunk-4f15b41a.059677d1.js" rel="prefetch"><link href="js/chunk-5e4a5e4e.dc83d342.js" rel="prefetch"><link href="js/chunk-5fe65568.fd880c4a.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-698f0f68.a0f8050b.js" rel="prefetch"><link href="js/chunk-75426f71.aa7e65a8.js" rel="prefetch"><link href="js/chunk-a3ddd952.ad97c910.js" rel="prefetch"><link href="js/chunk-dfcdd772.a3dbdd95.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.e2565684.js" rel="preload" as="script"><link href="js/chunk-vendors.13743003.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.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.13743003.js"></script><script src="js/app.e2565684.js"></script></body></html>

resources/frontend/src/views/goods/goods.vue

@@ -48,7 +48,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="handleChoose()">筛选</el-button>
+                        <el-button type="primary" @click="handleChoose(1)">筛选</el-button>
                         <el-button plain @click="handleReChoose()">重置筛选</el-button>
                     </el-form-item>
                 </el-form>
@@ -528,10 +528,10 @@ export default {
         },
 
         // 筛选
-        handleChoose() {
+        handleChoose(page) {
             this.form = {
                 ...this.form,
-                page: 1,
+                page: page,
                 per_page: this.per_page,
             };
 
@@ -607,17 +607,17 @@ export default {
         handleSizeChange(val) {
             //当前条数
             this.per_page = val;
-            this.handleChoose();
+            this.handleChoose(1);
         },
         handleCurrentChange(val) {
             //当前页
             this.current_page = val;
-            this.handleChoose();
+            this.handleChoose(this.current_page);
         },
 
         //取消上新or库存盘点
         cancel() {
-            this.handleChoose();
+            this.handleChoose(this.current_page);
             this.isShow = false;
             this.stock = false;
         },
@@ -641,7 +641,6 @@ export default {
                 };
                 // 上新请求
                 update(patchdata).then((res) => {
-                    this.handleChoose();
                     this.$message({
                         message: "上新成功！",
                         type: "success",
@@ -665,7 +664,6 @@ export default {
                 };
                 // 上新请求
                 update(patchdata).then((res) => {
-                    this.handleChoose();
                     this.$message({
                         message: "库存盘点成功！",
                         type: "success",
@@ -674,7 +672,7 @@ export default {
             }
             this.isShow = false;
             this.stock = false;
-            this.handleChoose();
+            this.handleChoose(this.current_page);
         },
 
         // 点击库存盘点
@@ -695,7 +693,7 @@ export default {
 
         //库存弹出框取消
         cancelStock() {
-            this.handleChoose();
+            this.handleChoose(this.current_page);
             this.ejectstock1 = false;
         },
 
@@ -718,7 +716,7 @@ export default {
                 };
                 // 库存请求
                 update(stockpatch).then((res) => {
-                    this.handleChoose();
+                    this.handleChoose(this.current_page);
                     this.$message({
                         message: "库存更新成功！",
                         type: "success",
@@ -883,7 +881,7 @@ export default {
 
         //损耗框取消
         noBubbles() {
-            this.handleChoose();
+            this.handleChoose(this.current_page);
             this.updateField = "";
             this.id2 = "";
         },

resources/frontend/src/views/logs/logs.vue

@@ -43,7 +43,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="query()">查询</el-button>
+                    <el-button type="primary" @click="query(1)">查询</el-button>
                 </el-form-item>
             </el-form>
         </el-card>
@@ -320,9 +320,9 @@ export default {
         },
 
         // 查询
-        query() {
+        query(page) {
             let queryData = {
-                page: 1,
+                page: page,
                 per_page: this.per_page,
                 module: this.form.module,
                 action: this.form.action,
@@ -344,12 +344,12 @@ export default {
         handleSizeChange(val) {
             //当前条数
             this.per_page = val;
-            this.query();
+            this.query(1);
         },
         handleCurrentChange(val) {
             //当前页
             this.current_page = val;
-            this.query();
+            this.query(this.current_page);
         },
     },
     mounted() {

resources/frontend/src/views/logs/record.vue

@@ -37,7 +37,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="query()">查询</el-button>
+          <el-button type="primary" @click="query(1)">查询</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -139,12 +139,12 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      this.query();
+      this.query(1);
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      this.query();
+      this.query(this.current_page);
     },
 
     // 获取用户列表
@@ -155,11 +155,11 @@ export default {
     },
 
     // 查询
-    query() {
+    query(page) {
       let queryData = {
         userId: this.form.userId,
         target_field: this.form.targetField,
-        page: 1,
+        page: page,
         per_page: this.per_page,
         moudule: this.moudule,
         target_id: this.$route.query.id,

resources/frontend/src/views/plat/goodsList.vue

@@ -111,6 +111,7 @@ export default {
         //分页功能
         handleSizeChange(val) {
             //当前条数
+            this.current_page = 1;
             this.per_page = val;
             this.getPlatGoodsList();
         },

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

@@ -147,6 +147,7 @@ export default {
         // 下载商品
         download(row) {
             downloadGoods(row.id).then((res) => {
+
             });
         },
     },

resources/frontend/vue.config.js

@@ -2,7 +2,7 @@ module.exports = {
   lintOnSave: false,
   publicPath: "./", // 配置打包之后的相对路径
   devServer: {
-    open: true, // 设置浏览器自动打开项目
+    open: false, // 设置浏览器自动打开项目
     port: 8080, // 开发服务器运行端口号
     overlay: {
       warnings: false,