From dfbd3cc04d3cc2742748817509fa0f32caeb53cd Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 7 Jul 2022 18:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/build/beike/admin/css/app.css          |  4 ++++
 resources/beike/admin/css/_global.scss        |  4 ++++
 .../admin/views/pages/plugins/form.blade.php  | 20 ++++++++++---------
 themes/default/account/forgotten.blade.php    |  9 +++++++--
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css
index ca5d4482..fe69be08 100644
--- a/public/build/beike/admin/css/app.css
+++ b/public/build/beike/admin/css/app.css
@@ -29,6 +29,10 @@ body {
   min-height: 600px;
 }
 
+.font-size-12 {
+  font-size: 12px;
+}
+
 .main-content {
   display: flex;
   transition: margin-left 0.25s ease-in-out, left 0.25s ease-in-out, margin-right 0.25s ease-in-out, right 0.25s ease-in-out;
diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss
index b3d8174e..4f3bdfa7 100644
--- a/resources/beike/admin/css/_global.scss
+++ b/resources/beike/admin/css/_global.scss
@@ -23,6 +23,10 @@ body {
   }
 }
 
+.font-size-12 {
+  font-size: 12px;
+}
+
 .main-content {
   display: flex;
   // flex-direction: column;
diff --git a/resources/beike/admin/views/pages/plugins/form.blade.php b/resources/beike/admin/views/pages/plugins/form.blade.php
index 76164b4c..edb026af 100644
--- a/resources/beike/admin/views/pages/plugins/form.blade.php
+++ b/resources/beike/admin/views/pages/plugins/form.blade.php
@@ -12,12 +12,14 @@
     <div class="card-body pt-5">
       <el-form :model="form" :rules="rules" ref="form" label-width="110px">
         <div v-for="column, index in source.columns">
-          <el-form-item :label="column.label" v-if="column.type == 'string'" class="form-max-w">
+          <el-form-item :label="column.label" v-if="column.type == 'string'" class="form-max-w" :prop="column.required ? column.name : ''">
             <el-input v-model="form[column.name]" :placeholder="column.label"></el-input>
+            <div class="text-muted font-size-12 lh-base" v-if="column.description">@{{ column.description }}</div>
           </el-form-item>
 
-          <el-form-item :label="column.label" v-if="column.type == 'text'" style="max-width: 900px;">
+          <el-form-item :label="column.label" v-if="column.type == 'text'" style="max-width: 900px;" :prop="column.required ? column.name : ''">
             <textarea v-model="form[column.name]" :data-key="column.name" id="input-tinymce"></textarea>
+            <div class="text-muted font-size-12 lh-base" v-if="column.description">@{{ column.description }}</div>
           </el-form-item>
 
           <el-form-item :label="column.label" v-if="column.type == 'select'" class="form-max-w">
@@ -26,9 +28,11 @@
                 :value="option.value">
               </el-option>
             </el-select>
+            <div class="text-muted font-size-12 lh-base" v-if="column.description">@{{ column.description }}</div>
           </el-form-item>
           <el-form-item :label="column.label" v-if="column.type == 'bool'">
             <el-switch v-model="form[column.name]" :active-value="1" :inactive-value="0"></el-switch>
+            <div class="text-muted font-size-12 lh-base" v-if="column.description">@{{ column.description }}</div>
           </el-form-item>
         </div>
         <el-form-item>
@@ -64,6 +68,9 @@
       beforeMount () {
         this.source.columns.forEach((e) => {
           this.$set(this.form, e.name, e.value)
+          if (e.required) {
+            this.rules[e.name] = [{required: true, message: `请输入${e.label}`, trigger: 'blur'}]
+          }
         })
       },
       // 实例被挂载后调用
@@ -79,13 +86,8 @@
               return;
             }
 
-            $.ajax({
-              url: `/admin/plugins/{{ $plugin->code }}`,
-              type: 'PUT',
-              data: this.form,
-              success: function(res) {
-                console.log(res)
-              }
+            $http.put(`/admin/plugins/{{ $plugin->code }}`, this.form).then((res) => {
+              this.$message.success(res.message);
             })
           });
         },
diff --git a/themes/default/account/forgotten.blade.php b/themes/default/account/forgotten.blade.php
index 92847fb8..4a000c5e 100644
--- a/themes/default/account/forgotten.blade.php
+++ b/themes/default/account/forgotten.blade.php
@@ -43,9 +43,10 @@
                 <el-input type="password" v-model="form.password_confirmation" placeholder="确认密码"></el-input>
               </el-form-item>
 
-              <div class="mt-5 mb-3">
+              <div class="mt-5 mb-3 d-flex justify-content-between">
                 <button type="button" @click="submitForm('form')" class="btn w-50 btn-dark">@{{ !isCode ? '发送验证码' : '提交' }}</button>
               </div>
+              <a href="javascript:void(0)" v-if="isCode" @click="isCode = false" class="text-muted">返回上一步</a>
             </div>
           </el-form>
         </div>
@@ -126,8 +127,12 @@
 
             $http.post(url, this.form).then((res) => {
               this.$message.success(res.message);
+              this.$refs[form].clearValidate();
+
+              if (this.isCode) {
+                location = "{{ shop_route('login.index') }}"
+              }
               this.isCode = true
-              this.$refs[form].resetFields();
             })
           });
         }