From 23c2b5cba0970ec1444e86f6a4f54b65db496fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Wed, 3 Jun 2020 23:25:28 +0800
Subject: [PATCH] 1

---
 src/pages/shop/IncreaseWelcomeEdit.vue | 35 ++++++++++++++++++++------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
index ef6b58c..220c786 100644
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -20,19 +20,33 @@
             :key="index"
           >
             <div v-if="item.type == 3">
+              <i-col style="line-height: 32px" :span="2">标题 {{ index + 1 }}</i-col>
+              <i-col :span="4">
+                <i-input class="inputClass" type="text" disabled v-model="item.key"></i-input>
+              </i-col>
               <i-col style="line-height: 32px" :span="2">APPID {{ index + 1 }}</i-col>
               <i-col :span="4">
                 <i-input class="inputClass" type="text" disabled v-model="item.defaultVal"></i-input>
               </i-col>
               <i-col style="line-height: 32px" :span="2">URI {{ index + 1 }}</i-col>
-              <i-col :span="5">
+              <i-col :span="3">
                 <i-input class="inputClass" type="text" disabled v-model="item.description"></i-input>
               </i-col>
               <i-col style="line-height: 32px" :span="2">MediaId{{ index + 1 }}</i-col>
-              <i-col :span="5">
+              <i-col :span="3">
                 <i-input class="inputClass" type="text" disabled v-model="item.limitLower"></i-input>
               </i-col>
             </div>
+            <div v-else-if="item.type == 2">
+              <i-col style="line-height: 32px" :span="4">标题 {{ index + 1 }}</i-col>
+              <i-col :span="8">
+                <i-input class="inputClass" type="text" disabled v-model="item.description"></i-input>
+              </i-col>
+              <i-col style="line-height: 32px" :span="4">URL {{ index + 1 }}</i-col>
+              <i-col :span="8">
+                <i-input class="inputClass" type="text" disabled v-model="item.defaultVal"></i-input>
+              </i-col>
+            </div>
             <div v-else>
               <i-col style="line-height: 32px" :span="4">{{ item.name }}{{ index + 1 }}</i-col>
               <i-col :span="16">
@@ -95,6 +109,9 @@
     </Modal>
     <Modal v-model="showWeb" title="添加网页消息" :loading="true">
       <Form ref="webForm" :model="webForm" :rules="webFormRules">
+        <FormItem label="标题" prop="url">
+          <i-input v-model="webForm.title" type="text" placeholder="请输入网页标题"></i-input>
+        </FormItem>
         <FormItem label="添加网页消息" prop="url">
           <i-input v-model="webForm.url" type="text" placeholder="以http或https开头"></i-input>
         </FormItem>
@@ -195,9 +212,10 @@ export default {
         url: [
           { required: true, message: "请输入url", trigger: "blur" },
           { validator: validateUrl, trigger: "blur" }
-        ]
+        ],
+        title: [{ required: true, message: "请输入url", trigger: "blur" }]
       },
-      webForm: { url: "" },
+      webForm: { url: "", title: "" },
       miniFormRules: {
         appid: [{ required: true, message: "请输入url", trigger: "blur" }],
         uri: [{ required: true, message: "请输入url", trigger: "blur" }],
@@ -267,13 +285,16 @@ export default {
     },
     doShowWeb() {
       this.showWeb = true;
-      this.webForm = { url: "" };
+      this.webForm = { url: "", title: "" };
     },
     doShowMini() {
       this.showMini = true;
       this.miniForm = {
         appid: "",
-        uri: ""
+        uri: "",
+        limitLower: "",
+        limitUpper: "",
+        key: ""
       };
     },
     cancelMini() {
@@ -286,7 +307,7 @@ export default {
           _this.welcome.params.push({
             attr: 2,
             defaultVal: this.webForm.url,
-            description: this.webForm.url,
+            description: this.webForm.title,
             isRequired: 1,
             key: "url",
             limitLower: null,