From de31647c81ab180fa31a0607daa421b94968157c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 17 Dec 2021 09:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8A=E6=9E=B6=E4=BC=81?=
 =?UTF-8?q?=E5=BE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppAskForm/{components => }/FormSetting.vue |  6 ++----
 src/apps/AppAskForm/components/AddForm.vue           |  2 +-
 src/apps/AppAskForm/components/List.vue              | 10 +++++++---
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename src/apps/AppAskForm/{components => }/FormSetting.vue (96%)

diff --git a/src/apps/AppAskForm/components/FormSetting.vue b/src/apps/AppAskForm/FormSetting.vue
similarity index 96%
rename from src/apps/AppAskForm/components/FormSetting.vue
rename to src/apps/AppAskForm/FormSetting.vue
index 749f8e02..c19832aa 100644
--- a/src/apps/AppAskForm/components/FormSetting.vue
+++ b/src/apps/AppAskForm/FormSetting.vue
@@ -9,7 +9,7 @@
         </div>
         <div class="setting-item__right">
           <u-radio-group v-model="periodValidityType" active-color="#1088F9">
-            <u-radio name="0" label="永久有效" style="padding-right: 20rpx;">永久有效</u-radio>
+            <u-radio name="0" label="永久有效">永久有效</u-radio>
             <u-radio name="1" label="自定义时间">自定义时间</u-radio>
           </u-radio-group>
           <u-icon name="arrow-right" color="#E1E2E3"/>
@@ -40,7 +40,7 @@
         </div>
         <div class="setting-item__right">
           <u-radio-group v-model="commitType" active-color="#1088F9">
-            <u-radio name="0" label="不限次数" style="padding-right: 20rpx;">不限次数</u-radio>
+            <u-radio name="0" label="不限次数">不限次数</u-radio>
             <u-radio name="1" label="限提交一次">限提交一次</u-radio>
           </u-radio-group>
         </div>
@@ -104,9 +104,7 @@ export default {
 
   mounted() {
     if (this.id) {
-      this.id = this.id
       this.getInfo(this.id)
-      this.type = this.type
     } else if (this.formConfig) {
       const res = this.formConfig
       this.periodValidityType = res.periodValidityType || '0'
diff --git a/src/apps/AppAskForm/components/AddForm.vue b/src/apps/AppAskForm/components/AddForm.vue
index 546ef94a..8384bcce 100644
--- a/src/apps/AppAskForm/components/AddForm.vue
+++ b/src/apps/AppAskForm/components/AddForm.vue
@@ -141,7 +141,7 @@
 <script>
 import draggable from 'vuedraggable'
 import FiledConfig from './FiledConfig'
-import FormSetting from './FormSetting'
+import FormSetting from '../FormSetting'
 import PreviewForm from './PreviewForm'
 
 export default {
diff --git a/src/apps/AppAskForm/components/List.vue b/src/apps/AppAskForm/components/List.vue
index e571106e..75dd4726 100644
--- a/src/apps/AppAskForm/components/List.vue
+++ b/src/apps/AppAskForm/components/List.vue
@@ -40,7 +40,7 @@
             </div>
             <h3>编辑</h3>
           </div>
-          <div class="operate-item" @click="linkTo('/pages/mainEntry?app=AppForm&preview=1&id=' + id)">
+          <div class="operate-item" @click="linkTo('./AppForm?preview=1&id=' + id)">
             <div>
               <image :src="`${$cdn}askform/yl.png`"/>
             </div>
@@ -206,7 +206,7 @@ export default {
         return this.$u.toast('该表单已发布')
       }
 
-      this.linkTo(`/pages/askForm/formSetting?id=${this.info.id}&type=edit`)
+      this.linkTo(`./formSetting?id=${this.info.id}&type=edit`)
       this.isShow = false
     },
 
@@ -303,6 +303,10 @@ export default {
   height: 100vh;
   overflow: hidden;
 
+  u-radio + u-radio {
+    margin-left: 20px;
+  }
+
   ::v-deep .u-search {
     margin-bottom: 0 !important;
 
@@ -312,7 +316,7 @@ export default {
   }
 
   .form-list {
-    height: calc(100vh - 98rpx - 100rpx);
+    height: calc(100vh - 98px - 100px);
     background: #f5f5f5;
     overflow: hidden;
   }