!51 10000

Merge pull request !51 from develop

app/Http/Controllers/User/UsersController.php

@@ -34,7 +34,6 @@ class UsersController extends Controller
         $validator = Validator::make($request->all(), [
             'name' => 'required|string|max:191|unique:users,name',
             'password' => 'required|string|min:8|confirmed',
-            'email' => 'email',
             'role_name' => 'required|string|exists:roles,name'
         ]);
         if ($validator->fails()) {
@@ -70,7 +69,6 @@ class UsersController extends Controller
             ],
 //            'old_password' => 'sometimes|required|string|min:8',
             'password' => 'sometimes|string|min:8|confirmed',
-            'email' => 'sometimes|email',
             'role_name' => 'sometimes|required|string|exists:roles,name'
         ]);
         if ($validator->fails()) {

database/migrations/2014_10_12_000000_create_users_table.php

@@ -17,7 +17,7 @@ class CreateUsersTable extends Migration
         Schema::create('users', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name')->unique();
-            $table->string('email')->nullable()->unique();
+            $table->string('email')->nullable(true);
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->string('api_token', 80)->unique();

public/dist/css/chunk-dee9adee.5a9e4325.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)}}.el-upload--picture-card[data-v-1c75a95b]{width:50px;height:50px}.el-form-item[data-v-1c75a95b]{margin-left:60px}.addto[data-v-1c75a95b]{display:inline-block;width:30px;height:30px;background-color:#00f;color:#fff;font-size:25px;text-align:center;line-height:30px;border-radius:5px;margin-top:4px}.avatar-uploader .el-upload[data-v-1c75a95b]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-1c75a95b]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-1c75a95b]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-1c75a95b]{width:148px;height:148px;display:block}
+#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)}}.el-upload--picture-card[data-v-6a2b83b4]{width:50px;height:50px}.el-form-item[data-v-6a2b83b4]{margin-left:60px}.addto[data-v-6a2b83b4]{display:inline-block;width:30px;height:30px;background-color:#00f;color:#fff;font-size:25px;text-align:center;line-height:30px;border-radius:5px;margin-top:4px}.avatar-uploader .el-upload[data-v-6a2b83b4]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-6a2b83b4]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-6a2b83b4]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-6a2b83b4]{width:148px;height:148px;display:block}

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-3ad98ce0.c0acee9a.css" rel="prefetch"><link href="css/chunk-3c532032.e437602b.css" rel="prefetch"><link href="css/chunk-3e22dfcf.0c73552c.css" rel="prefetch"><link href="css/chunk-4da2392c.0ff9404a.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-ba60ef82.e437602b.css" rel="prefetch"><link href="css/chunk-dce0c6c0.3d009b2d.css" rel="prefetch"><link href="css/chunk-f823a01a.de53573d.css" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3ad98ce0.d4852cea.js" rel="prefetch"><link href="js/chunk-3c532032.adbdd0d5.js" rel="prefetch"><link href="js/chunk-3e22dfcf.17a21be0.js" rel="prefetch"><link href="js/chunk-4da2392c.ab05e274.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-ba60ef82.bd8a71c1.js" rel="prefetch"><link href="js/chunk-dce0c6c0.51e6f004.js" rel="prefetch"><link href="js/chunk-f823a01a.0e9a6380.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.b6cb810e.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.b6cb810e.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-3ad98ce0.c0acee9a.css" rel="prefetch"><link href="css/chunk-3c532032.e437602b.css" rel="prefetch"><link href="css/chunk-3e22dfcf.0c73552c.css" rel="prefetch"><link href="css/chunk-4da2392c.0ff9404a.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-ba60ef82.e437602b.css" rel="prefetch"><link href="css/chunk-dce0c6c0.3d009b2d.css" rel="prefetch"><link href="css/chunk-dee9adee.5a9e4325.css" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3ad98ce0.d4852cea.js" rel="prefetch"><link href="js/chunk-3c532032.adbdd0d5.js" rel="prefetch"><link href="js/chunk-3e22dfcf.17a21be0.js" rel="prefetch"><link href="js/chunk-4da2392c.ab05e274.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-ba60ef82.bd8a71c1.js" rel="prefetch"><link href="js/chunk-dce0c6c0.51e6f004.js" rel="prefetch"><link href="js/chunk-dee9adee.6297d8e4.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.f8eef007.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.f8eef007.js"></script></body></html>

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

@@ -98,10 +98,7 @@
               </el-input>
             </el-form-item>
             <el-form-item label="商品状态：">
-              <el-select
+              <el-select v-model="goodsData.status">
-                v-model="goodsData.goods.reserve"
-                placeholder="下架（默认）"
-              >
                 <el-option
                   v-for="item in options"
                   :key="item.id"
@@ -230,7 +227,7 @@
               </el-input>
             </el-form-item>
             <el-form-item label="商品状态：">
-              <el-select v-model="skus[i].status" placeholder="下架（默认）">
+              <el-select v-model="skus[i].reserve" placeholder="下架（默认）">
                 <el-option
                   v-for="item in options"
                   :key="item.id"
@@ -300,6 +297,7 @@ export default {
           status: "0",
           num: "0",
           cost: "0",
+          reserve: "0",
         },
       ],
 
@@ -365,7 +363,7 @@ export default {
       imgUpload(formData, requestConfig).then((res) => {
         console.log(res);
         this.form.img_url = res.data.resource;
-        console.log(this.form.img_url);
+        this.goodsData.goods.img_url = res.data.resource;
       });
     },
 
@@ -479,12 +477,10 @@ export default {
       let id = this.bigID;
       checkGoods(id).then((res) => {
         this.goodsData = res.data.data;
+        console.log(this.goodsData);
       });
     },
 
-    // 移除商品图片
-    removeUpload() {},
-
     // 编辑确认请求
     Edititem() {
       let id = this.bigID;
@@ -492,9 +488,9 @@ export default {
       // console.log("goodsid", this.goodsData.goods_id);
       let goods = {
         title: this.goodsData.goods.title,
-        img_url: this.goodsData.goods.img_url
+        img_url: this.goodsData.goods.img_url,
-          ? this.goodsData.goods.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,
@@ -547,7 +543,6 @@ export default {
   created() {
     this.goodsID = sessionStorage.getItem("商品ID");
     this.bigID = sessionStorage.getItem("ID");
-    this.getgoodsidData();
   },
 
   mounted() {
@@ -562,6 +557,7 @@ export default {
     });
     this.handleList();
     this.handleUpdate();
+    this.getgoodsidData();
   },
 
   beforeDestroy() {