From d762d18c7b8ee5e00e5a4b4eccd6c74174590459 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 23 Dec 2021 11:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=94=AF=E4=BB=98=E5=BA=94=E7=94=A8id?=
 =?UTF-8?q?=E5=88=86=E5=88=AB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/setting-manage/pay/WECHAT_PAYMENT.vue | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
index a1976b8e..4d728e7a 100644
--- a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -2,26 +2,35 @@
   <div class="layout">
     <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
       <FormItem label="appId" prop="appId">
-        <Input class="w200" v-model="formValidate.appId" />
+        <Input class="w200" v-model="formValidate.appId"/>
+        <p style="color: red">*APP应用 AppID 非必填</p>
+      </FormItem>
+      <FormItem label="mpAppId" prop="mpAppId">
+        <Input class="w200" v-model="formValidate.mpAppId"/>
+        <p style="color: red">*小程序 AppID 非必填</p>
+      </FormItem>
+      <FormItem label="serviceAppId" prop="serviceAppId">
+        <Input class="w200" v-model="formValidate.serviceAppId"/>
+        <p style="color: red">*服务号 AppID 非必填</p>
       </FormItem>
       <FormItem label="mchId" prop="mchId">
-        <Input class="w200" v-model="formValidate.mchId" />
+        <Input class="w200" v-model="formValidate.mchId"/>
       </FormItem>
       <FormItem label="apiKey3" prop="apiKey3">
-        <Input v-model="formValidate.apiKey3" />
+        <Input v-model="formValidate.apiKey3"/>
       </FormItem>
       <FormItem label="apiclient_cert_p12" class="label-item" prop="apiclient_cert_p12">
-        <Input v-model="formValidate.apiclient_cert_p12" />
+        <Input v-model="formValidate.apiclient_cert_p12"/>
       </FormItem>
       <FormItem label="apiclient_cert_pem" prop="apiclient_cert_pem">
-        <Input v-model="formValidate.apiclient_cert_pem" />
+        <Input v-model="formValidate.apiclient_cert_pem"/>
       </FormItem>
       <FormItem label="apiclient_key" prop="apiclient_key">
-        <Input v-model="formValidate.apiclient_key" />
+        <Input v-model="formValidate.apiclient_key"/>
       </FormItem>
 
       <FormItem label="serialNumber" prop="serialNumber">
-        <Input v-model="formValidate.serialNumber" />
+        <Input v-model="formValidate.serialNumber"/>
       </FormItem>
       <div class="label-btns">
         <Button type="primary" @click="submit('formValidate')">保存</Button>
@@ -31,19 +40,15 @@
   </div>
 </template>
 <script>
-import { setSetting } from "@/api/index";
-import { handleSubmit } from "../setting/validate";
+import {setSetting} from "@/api/index";
+import {handleSubmit} from "../setting/validate";
+
 export default {
   data() {
     return {
       ruleValidate: {}, // 验证规则
-      formValidate: { // 表单数据
-        accessKeyId: "",
-        accessKeySecret: "",
-        bucketName: "",
-        picLocation: "",
-        endPoint: "",
-      },
+      formValidate: {},// 表单数据
+
     };
   },
   props: ["res", "type"],
@@ -71,15 +76,19 @@ export default {
     init() {
       this.res = JSON.parse(this.res);
 
-      this.$set(this, "formValidate", { ...this.res });
+      this.$set(this, "formValidate", {...this.res});
       Object.keys(this.formValidate).forEach((item) => {
-        this.ruleValidate[item] = [
-          {
-            required: true,
-            message: "请填写必填项",
-            trigger: "blur",
-          },
-        ];
+        if (item.indexOf("pId") < 0) {
+
+          this.ruleValidate[item] = [
+            {
+              required: true,
+              message: "请填写必填项",
+              trigger: "blur",
+            },
+          ];
+
+        }
       });
     },
   },
@@ -92,16 +101,19 @@ export default {
 .label-item {
   display: flex;
 }
+
 .w200 {
   /deep/ .ivu-input {
     width: 250px !important;
     margin: 0 10px;
   }
 }
+
 /deep/ .ivu-input {
   width: 450px !important;
   margin: 0 10px;
 }
+
 .ivu-input-wrapper {
   width: 450px;
   margin-right: 10px;