diff --git a/components.d.ts b/components.d.ts
index 2a5c5c5..35e7713 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -2,7 +2,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-export {}
+export {};
 
 /* prettier-ignore */
 declare module 'vue' {
@@ -10,15 +10,16 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     VanActionSheet: typeof import('vant/es')['ActionSheet']
+    VanButton: typeof import('vant/es')['Button']
     VanCell: typeof import('vant/es')['Cell']
     VanCellGroup: typeof import('vant/es')['CellGroup']
     VanCheckbox: typeof import('vant/es')['Checkbox']
     VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
+    VanDialog: typeof import('vant/es')['Dialog']
     VanDivider: typeof import('vant/es')['Divider']
     VanField: typeof import('vant/es')['Field']
     VanIcon: typeof import('vant/es')['Icon']
     VanPopup: typeof import('vant/es')['Popup']
-    VanRate: typeof import('vant/es')['Rate']
     VanSearch: typeof import('vant/es')['Search']
     VanSwitch: typeof import('vant/es')['Switch']
     VanTabbar: typeof import('vant/es')['Tabbar']
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index b101d8c..c09079b 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -32,6 +32,10 @@ a,
   justify-content: flex-start;
 }
 
+.flex-warp {
+  flex-wrap: wrap;
+}
+
 .space-between {
   justify-content: space-between;
 }
diff --git a/src/components/YLSelect.vue b/src/components/YLSelect.vue
index 55d8424..b558712 100644
--- a/src/components/YLSelect.vue
+++ b/src/components/YLSelect.vue
@@ -6,7 +6,13 @@
       :label="item.label"
       :value="item.value"
       :disabled="item.disabled"
-    />
+    >
+      <span style="float: left" v-html="item.label"></span>
+    </el-option>
+    <template #label="{ label }">
+      <!--      {{ option }}-->
+      <div v-html="label"></div>
+    </template>
   </el-select>
 </template>
 
@@ -70,7 +76,7 @@ export default defineComponent({
 }
 
 .yl-select {
-  height: 44px; /* 增加高度以适应触摸 */
+  height: 35px; /* 增加高度以适应触摸 */
   padding: 10px; /* 增加内边距 */
   border: 1px solid #ccc;
   border-radius: 5px;
diff --git a/src/fonts/demo.css b/src/fonts/demo.css
index 12ec742..18e8077 100644
--- a/src/fonts/demo.css
+++ b/src/fonts/demo.css
@@ -4,11 +4,11 @@
   src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
   src:
     url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix')
-    format('embedded-opentype'),
+      format('embedded-opentype'),
     url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
     url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
     url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont')
-    format('svg');
+      format('svg');
 }
 
 .logo {
diff --git a/src/stores/modules/common.ts b/src/stores/modules/common.ts
index 904795b..703807d 100644
--- a/src/stores/modules/common.ts
+++ b/src/stores/modules/common.ts
@@ -95,12 +95,6 @@ export const useCommonStore = defineStore('common', {
       },
       logics: [
         {
-          id: 472148,
-          question_index: 24,
-          sample_number: 0,
-          skip_question_index: 27,
-          skip_type: 0,
-          question_id: '17852294',
           logic: [
             {
               value: '',
@@ -127,24 +121,13 @@ export const useCommonStore = defineStore('common', {
               question_id: null
             }
           ],
-          autofill: {
-            value: '',
-            date: '',
-            time: '',
-            question_type: 1,
-            option_indexs: [],
-            row_indexs: [],
-            cell_indexs: []
-          },
-          hide_option_index: []
+          skip_question_index: 27,
+          skip_type: 0,
+          id: 472148,
+          question_index: 24,
+          question_id: '17852294'
         },
         {
-          id: 472149,
-          question_index: 24,
-          sample_number: 0,
-          skip_question_index: 0,
-          skip_type: 0,
-          question_id: '17852294',
           logic: [
             {
               value: '',
@@ -171,24 +154,12 @@ export const useCommonStore = defineStore('common', {
               question_id: null
             }
           ],
-          autofill: {
-            value: '',
-            date: '',
-            time: '',
-            question_type: 1,
-            option_indexs: [],
-            row_indexs: [],
-            cell_indexs: []
-          },
-          hide_option_index: []
+          skip_type: 0,
+          id: 472149,
+          question_index: 24,
+          question_id: '17852294'
         },
         {
-          id: 472152,
-          question_index: 24,
-          sample_number: 0,
-          skip_question_index: 0,
-          skip_type: 1,
-          question_id: '17852294',
           logic: [
             {
               value: '',
@@ -205,7 +176,7 @@ export const useCommonStore = defineStore('common', {
               row_index: 0,
               cell_index: 0,
               question_type: 1,
-              question_index: 0,
+              question_index: 24,
               relation_question_index: 0,
               relation_question_row_index: 0,
               relation_question_cell_index: 0,
@@ -215,19 +186,263 @@ export const useCommonStore = defineStore('common', {
               question_id: null
             }
           ],
-          autofill: {
-            value: '',
-            date: '',
-            time: '',
-            question_type: 1,
-            option_indexs: [],
-            row_indexs: [],
-            cell_indexs: []
-          },
-          hide_option_index: []
+          skip_type: 0,
+          id: 472151,
+          question_index: 24,
+          question_id: '17852294'
+        },
+        {
+          logic: [
+            {
+              logic: 'if',
+              question_index: 30,
+              question_type: 1,
+              is_answer: 1,
+              operator: '=',
+              option_index: 2,
+              relation_question_index: 0,
+              type: 0,
+              is_option_group: 0,
+              group_index: null
+            },
+            {
+              logic: 'and',
+              question_index: 30,
+              question_type: 1,
+              is_answer: 1,
+              operator: '=',
+              option_index: 1,
+              relation_question_index: 0,
+              type: 0,
+              is_option_group: 1,
+              group_index: 1
+            }
+          ],
+          skip_question_index: 0,
+          skip_type: 1,
+          id: 472152,
+          question_index: 24,
+          question_id: '17852294'
+        },
+        {
+          logic: [
+            {
+              logic: 'if',
+              question_index: 30,
+              question_type: 1,
+              is_answer: 0,
+              operator: '=',
+              option_index: 0,
+              relation_question_index: 0,
+              type: 0
+            }
+          ],
+          skip_type: 1,
+          id: '28fe4d64-81eb-4937-a082-c519ac74374f',
+          question_index: 24,
+          question_id: '17852294'
+        },
+        {
+          logic: [
+            {
+              operator: '=',
+              is_answer: 1,
+              question_type: 1,
+              logic: 'always'
+            }
+          ],
+          skip_type: 1,
+          id: '459f781f-8db0-4663-b2d1-9ddad627078e',
+          question_index: 24,
+          question_id: '17852294'
         }
       ],
       questions: [
+        {
+          id: '17852442',
+          title: 'Q7',
+          stem: '请选择一个选项',
+          other: '',
+          question_index: 30,
+          question_type: 1,
+          config: {
+            placeholder: '',
+            version: '',
+            scene: null,
+            shelf: null,
+            ware: null,
+            option_groups: {
+              min: 0,
+              max: 2,
+              is_hide: 0,
+              option_group: [
+                {
+                  group_index: 1,
+                  title: '分组1',
+                  min: null,
+                  max: null,
+                  groups: [
+                    {
+                      option: '<p>选项1</p>',
+                      id: '1049037',
+                      type: 0,
+                      is_other: 0,
+                      is_fixed: 0,
+                      is_remove_other: 0,
+                      created_at: null,
+                      created_user_id: null,
+                      parent_id: null,
+                      option_index: 1,
+                      list_id: 74427,
+                      option_code: '',
+                      option_config: {
+                        title: '',
+                        instructions: [],
+                        price: 0,
+                        gradient: '',
+                        image_url: [],
+                        option_type: 0,
+                        type: 0,
+                        limit_right_content: '',
+                        child_area: null,
+                        binding_goods_id: ''
+                      },
+                      disable_option_update: null,
+                      cascade: []
+                    }
+                  ]
+                }
+              ]
+            },
+            is_required: 1,
+            select_random: 0,
+            each_number: 1,
+            is_three_dimensions: 0,
+            material_sn: '',
+            scene_information: null,
+            simple_scene_information: null,
+            is_behavior: 0,
+            is_price_tag: 0,
+            is_brand: 0,
+            is_initialize: 0,
+            is_default_perspective: 0,
+            is_binding_goods: 0,
+            float_window: 0,
+            float_window_content: '',
+            popup_window: 0,
+            popup_window_content: '',
+            is_show: [],
+            quick_type: 0,
+            option_group_random_inside: null,
+            option_group_random_outside: null
+          },
+          created_at: '2025-03-04T13:53:22',
+          created_user_id: 1281,
+          updated_user_id: null,
+          survey_id: 8721,
+          logic_config: {
+            expect: '',
+            order: 0,
+            type: 0,
+            stay_time: ''
+          },
+          options: [
+            [
+              {
+                option: '<p>选项1</p>',
+                id: '1049037',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 1,
+                list_id: 74427,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              },
+              {
+                option: '<p>选项2</p>',
+                id: '1049038',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 2,
+                list_id: 74427,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              },
+              {
+                option: '<p>选项3</p>',
+                id: '1049039',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 3,
+                list_id: 74427,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              }
+            ]
+          ],
+          associate: [],
+          logics_has: false,
+          last_option_index: 3,
+          question_code: '',
+          question_value: '',
+          question_tag: '',
+          planet_id: '',
+          permissions: null
+        },
         {
           id: '17852294',
           title: 'Q2',
@@ -265,7 +480,7 @@ export const useCommonStore = defineStore('common', {
             option_group_random_outside: null
           },
           created_at: '2025-02-27T16:02:34',
-          created_user_id: 9,
+          created_user_id: 1281,
           updated_user_id: null,
           survey_id: 8721,
           logic_config: {
@@ -335,7 +550,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: true,
           last_option_index: 2,
           question_code: '4_gender',
           question_value: '性别',
@@ -391,7 +606,7 @@ export const useCommonStore = defineStore('common', {
             option_group_random_outside: null
           },
           created_at: '2025-03-03T13:55:41',
-          created_user_id: 1280,
+          created_user_id: 1281,
           updated_user_id: null,
           survey_id: 8721,
           logic_config: {
@@ -431,7 +646,8 @@ export const useCommonStore = defineStore('common', {
                 cascade: []
               },
               {
-                option: '<p>选项2</p>',
+                option:
+                  '<p>选项啊萨达萨达爱睡觉的发货尽快发货记录和计划给到付即可了规划到付即可了会更加快乐东方化工节快乐的方式关键看落地符合国家2</p>',
                 id: '1048969',
                 type: 0,
                 is_other: 1,
@@ -461,7 +677,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 2,
           question_code: '',
           question_value: '',
@@ -507,118 +723,119 @@ export const useCommonStore = defineStore('common', {
             stay_time: ''
           },
           options: [
-            [{
-              option: '<p>选项1</p>',
-              id: '1049106',
-              type: 0,
-              is_other: 0,
-              is_fixed: 0,
-              is_remove_other: 0,
-              created_at: null,
-              created_user_id: null,
-              parent_id: null,
-              option_index: 1,
-              list_id: 74455,
-              option_code: '',
-              option_config: {
-                title: '',
-                instructions: [],
-                price: 0.0,
-                gradient: '',
-                image_url: [],
-                option_type: 0,
+            [
+              {
+                option: '<p>选项1</p>',
+                id: '1049106',
                 type: 0,
-                limit_right_content: '',
-                child_area: null,
-                binding_goods_id: ''
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 1,
+                list_id: 74455,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0.0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
               },
-              disable_option_update: null,
-              cascade: []
-            },
-            {
-              option: '<p>选项2</p>',
-              id: '1049107',
-              type: 0,
-              is_other: 0,
-              is_fixed: 0,
-              is_remove_other: 0,
-              created_at: null,
-              created_user_id: null,
-              parent_id: null,
-              option_index: 2,
-              list_id: 74455,
-              option_code: '',
-              option_config: {
-                title: '',
-                instructions: [],
-                price: 0.0,
-                gradient: '',
-                image_url: [],
-                option_type: 0,
+              {
+                option: '<p>选项2</p>',
+                id: '1049107',
                 type: 0,
-                limit_right_content: '',
-                child_area: null,
-                binding_goods_id: ''
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 2,
+                list_id: 74455,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0.0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
               },
-              disable_option_update: null,
-              cascade: []
-            },
-            {
-              option: '<p>选项3</p>',
-              id: '1049108',
-              type: 0,
-              is_other: 0,
-              is_fixed: 0,
-              is_remove_other: 0,
-              created_at: null,
-              created_user_id: null,
-              parent_id: null,
-              option_index: 3,
-              list_id: 74455,
-              option_code: '',
-              option_config: {
-                title: '',
-                instructions: [],
-                price: 0.0,
-                gradient: '',
-                image_url: [],
-                option_type: 0,
+              {
+                option: '<p>选项3</p>',
+                id: '1049108',
                 type: 0,
-                limit_right_content: '',
-                child_area: null,
-                binding_goods_id: ''
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 3,
+                list_id: 74455,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0.0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
               },
-              disable_option_update: null,
-              cascade: []
-            },
-            {
-              option: '<p>选项4</p>',
-              id: '1049171',
-              type: 0,
-              is_other: 0,
-              is_fixed: 0,
-              is_remove_other: 0,
-              created_at: null,
-              created_user_id: null,
-              parent_id: null,
-              option_index: 4,
-              list_id: 74455,
-              option_code: '',
-              option_config: {
-                title: '',
-                instructions: [],
-                price: 0.0,
-                gradient: '',
-                image_url: [],
-                option_type: 0,
+              {
+                option: '<p>选项4</p>',
+                id: '1049171',
                 type: 0,
-                limit_right_content: '',
-                child_area: null,
-                binding_goods_id: ''
-              },
-              disable_option_update: null,
-              cascade: []
-            }
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 4,
+                list_id: 74455,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0.0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              }
             ]
           ],
           associate: [],
@@ -667,7 +884,7 @@ export const useCommonStore = defineStore('common', {
             option_group_random_outside: null
           },
           created_at: '2025-02-27T16:03:05',
-          created_user_id: 9,
+          created_user_id: 1281,
           updated_user_id: null,
           survey_id: 8721,
           logic_config: {
@@ -849,7 +1066,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 8,
           question_code: '4_age',
           question_value: '年龄段',
@@ -898,7 +1115,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [[]],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: null,
           question_code: '4_city',
           question_value: '省市',
@@ -917,6 +1134,19 @@ export const useCommonStore = defineStore('common', {
             disable_copy_update: 1
           }
         },
+        {
+          page: 1,
+          total: 5,
+          first_title: 'Q7',
+          last_title: 'Q3',
+          pages: [],
+          is_short_time: 0,
+          short_time: '',
+          is_show: 0,
+          use_type: 0,
+          pageId: 'f12945ac-5920-42d2-8789-a78379515e80',
+          logics_has: false
+        },
         {
           id: '17835005',
           title: 'A1',
@@ -1108,7 +1338,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 5,
           question_code: '300_purchase_intention',
           question_value: '购买意愿',
@@ -1127,18 +1357,6 @@ export const useCommonStore = defineStore('common', {
             disable_copy_update: 1
           }
         },
-        {
-          page: 1,
-          total: 5,
-          first_title: 'Q2',
-          last_title: 'A1',
-          pages: [],
-          is_short_time: 0,
-          short_time: '',
-          is_show: 0,
-          use_type: 0,
-          pageId: 'ed94e92d-efcf-44f3-9f17-7a11559e3bd9'
-        },
         {
           id: '17835006',
           title: 'A2',
@@ -1330,7 +1548,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 5,
           question_code: '300_overall_liking',
           question_value: '总体喜欢程度',
@@ -1393,7 +1611,7 @@ export const useCommonStore = defineStore('common', {
             quick_type: 0
           },
           created_at: '2024-09-04T14:44:50',
-          created_user_id: 9,
+          created_user_id: 1280,
           updated_user_id: null,
           survey_id: 8721,
           logic_config: {
@@ -1467,11 +1685,11 @@ export const useCommonStore = defineStore('common', {
                   child_area: [
                     {
                       color: 'rgba(54, 167, 185, 0.2000)',
-                      top_left: [0.4, 56.79960731378083],
-                      top_right: [38.8, 56.79960731378083],
-                      bottom_left: [0.4, 93.08381396490368],
+                      top_left: [0, 63.71579334887715],
+                      top_right: [38.4, 63.71579334887715],
+                      bottom_left: [0, 100],
                       child_index: 2,
-                      bottom_right: [38.8, 93.08381396490368],
+                      bottom_right: [38.4, 100],
                       option_index: 2
                     }
                   ],
@@ -1505,11 +1723,20 @@ export const useCommonStore = defineStore('common', {
                   child_area: [
                     {
                       color: 'rgba(239, 0, 0, 0.2000)',
-                      top_left: [55.8, 29.939869922689898],
-                      top_right: [72.80000000000001, 29.939869922689898],
-                      bottom_left: [55.8, 38.57896674438581],
+                      top_left: [55.00000000000001, 30.568167873358693],
+                      top_right: [72.00000000000003, 30.568167873358693],
+                      bottom_left: [55.00000000000001, 39.20726469505461],
                       child_index: 3,
-                      bottom_right: [72.80000000000001, 38.57896674438581],
+                      bottom_right: [72.00000000000003, 39.20726469505461],
+                      option_index: 3
+                    },
+                    {
+                      color: 'rgba(239, 0, 0, 0.2000)',
+                      top_left: [32.6, 30.521536384832498],
+                      top_right: [54.8, 30.521536384832498],
+                      bottom_left: [32.6, 52.98318812124187],
+                      child_index: 4,
+                      bottom_right: [54.8, 52.98318812124187],
                       option_index: 3
                     }
                   ],
@@ -1521,7 +1748,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 3,
           question_code: '300_hate_which',
           question_value: '不喜欢的方面',
@@ -1592,7 +1819,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 0,
           question_code: '300_hate_reason',
           question_value: '不喜欢的原因',
@@ -1678,7 +1905,7 @@ export const useCommonStore = defineStore('common', {
               picture_type: 0
             }
           ],
-          logics_has: null,
+          logics_has: false,
           last_option_index: null,
           question_code: '300_like_which',
           question_value: '喜欢的方面',
@@ -1700,7 +1927,7 @@ export const useCommonStore = defineStore('common', {
         {
           id: '17835010',
           title: 'A6',
-          stem: '<p>请问您为什么<span style="text-decoration: underline; color: #2dc26b;" data-mce-style="text-decoration: underline; color: #2dc26b;"><strong>喜欢</strong></span>这些地方？</p>',
+          stem: '<p>请问您为什么<span style="text-decoration: underline; color: #2dc26b;" data-mce-style="text-decoration: underline; color: #2dc26b;"><strong>喜欢</strong></span>这些地方？</p><p><img style="height: 50px; max-height: 440px;" src="https://test-cxp-public-web-1302259445.cos.ap-beijing.myqcloud.com/uat-yls/packing/imgs/1725421981418_809_mao-23.jpg"></p>',
           other: '概念诊断问卷配置概念诊断1',
           question_index: 6,
           question_type: 4,
@@ -1749,7 +1976,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 0,
           question_code: '300_like_reason',
           question_value: '喜欢的原因',
@@ -2126,7 +2353,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 9,
           question_code: '300_conceptual_image',
           question_value: '概念形象',
@@ -2148,14 +2375,15 @@ export const useCommonStore = defineStore('common', {
         {
           page: 2,
           total: 5,
-          first_title: 'A2',
+          first_title: 'A1',
           last_title: 'A7',
           pages: [],
           is_short_time: 0,
           short_time: '',
           is_show: 0,
           use_type: 0,
-          pageId: 'ca4d13e2-2676-459b-83e1-07e0814ab7d9'
+          pageId: '5cc8bb8d-bfb8-44c7-b546-3e2acc495b51',
+          logics_has: false
         },
         {
           id: '17835012',
@@ -2348,7 +2576,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 5,
           question_code: '300_purchase_intention',
           question_value: '购买意愿',
@@ -2558,7 +2786,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 5,
           question_code: '300_overall_liking',
           question_value: '总体喜欢程度',
@@ -3015,7 +3243,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 10,
           question_code: '300_hate_which',
           question_value: '不喜欢的方面',
@@ -3037,7 +3265,7 @@ export const useCommonStore = defineStore('common', {
         {
           id: '17835015',
           title: 'B4',
-          stem: '<p>请问您为什么<span style="text-decoration: underline; color: #e03e2d;" data-mce-style="text-decoration: underline; color: #e03e2d;"><strong>不喜欢</strong></span>这些地方？</p>',
+          stem: '<p>请问您为什么<span style="text-decoration: underline; color: #e03e2d;" data-mce-style="text-decoration: underline; color: #e03e2d;"><strong>不喜欢</strong></span>这些地方？</p><p><img style="height: 50px; max-height: 440px;" src="https://test-cxp-public-web-1302259445.cos.ap-beijing.myqcloud.com/uat-yls/packing/imgs/1725421988964_889_mao-012-small.jpg"></p>',
           other: '概念诊断问卷配置概念诊断2',
           question_index: 11,
           question_type: 4,
@@ -3086,7 +3314,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 0,
           question_code: '300_hate_reason',
           question_value: '不喜欢的原因',
@@ -3172,7 +3400,7 @@ export const useCommonStore = defineStore('common', {
               picture_type: 0
             }
           ],
-          logics_has: null,
+          logics_has: false,
           last_option_index: null,
           question_code: '300_like_which',
           question_value: '喜欢的方面',
@@ -3243,7 +3471,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 0,
           question_code: '300_like_reason',
           question_value: '喜欢的原因',
@@ -3620,7 +3848,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 9,
           question_code: '300_conceptual_image',
           question_value: '概念形象',
@@ -3649,7 +3877,8 @@ export const useCommonStore = defineStore('common', {
           short_time: '',
           is_show: 0,
           use_type: 0,
-          pageId: 'df2c97e9-beef-4f1d-a589-110dd353beb3'
+          pageId: 'c6ad9336-6122-4698-98cd-2d9535e564d7',
+          logics_has: false
         },
         {
           id: '17835020',
@@ -3842,7 +4071,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 5,
           question_code: '300_purchase_intention',
           question_value: '购买意愿',
@@ -4052,7 +4281,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 5,
           question_code: '300_overall_liking',
           question_value: '总体喜欢程度',
@@ -4281,7 +4510,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 4,
           question_code: '300_hate_which',
           question_value: '不喜欢的方面',
@@ -4352,7 +4581,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 0,
           question_code: '300_hate_reason',
           question_value: '不喜欢的原因',
@@ -4438,7 +4667,7 @@ export const useCommonStore = defineStore('common', {
               picture_type: 0
             }
           ],
-          logics_has: null,
+          logics_has: false,
           last_option_index: null,
           question_code: '300_like_which',
           question_value: '喜欢的方面',
@@ -4509,7 +4738,7 @@ export const useCommonStore = defineStore('common', {
           },
           options: [],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 0,
           question_code: '300_like_reason',
           question_value: '喜欢的原因',
@@ -4886,7 +5115,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 9,
           question_code: '300_conceptual_image',
           question_value: '概念形象',
@@ -4915,7 +5144,8 @@ export const useCommonStore = defineStore('common', {
           short_time: '',
           is_show: 0,
           use_type: 0,
-          pageId: 'adc58337-cef3-4164-94e8-2dc10c70aa38'
+          pageId: 'd610ff3a-2f27-4ba1-a476-5eb6180609be',
+          logics_has: false
         },
         {
           id: '17852299',
@@ -5177,7 +5407,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 8,
           question_code: '',
           question_value: '',
@@ -5308,7 +5538,7 @@ export const useCommonStore = defineStore('common', {
             ]
           ],
           associate: [],
-          logics_has: null,
+          logics_has: false,
           last_option_index: 3,
           question_code: '',
           question_value: '',
@@ -5316,17 +5546,248 @@ export const useCommonStore = defineStore('common', {
           planet_id: '',
           permissions: null
         },
+        {
+          id: '17852446',
+          title: 'Q8',
+          stem: '请选择一个选项',
+          other: '',
+          question_index: 31,
+          question_type: 1,
+          config: {
+            placeholder: '',
+            version: '',
+            scene: null,
+            shelf: null,
+            ware: null,
+            option_groups: null,
+            is_required: 1,
+            select_random: 0,
+            each_number: 1,
+            is_three_dimensions: 0,
+            material_sn: '',
+            scene_information: null,
+            simple_scene_information: null,
+            is_behavior: 0,
+            is_price_tag: 0,
+            is_brand: 0,
+            is_initialize: 0,
+            is_default_perspective: 0,
+            is_binding_goods: 0,
+            float_window: 0,
+            float_window_content: '',
+            popup_window: 0,
+            popup_window_content: '',
+            is_show: [],
+            quick_type: 0,
+            option_group_random_inside: null,
+            option_group_random_outside: null
+          },
+          created_at: '2025-03-04T14:47:01',
+          created_user_id: 1281,
+          updated_user_id: null,
+          survey_id: 8721,
+          logic_config: {
+            expect: '',
+            order: 0,
+            type: 0,
+            stay_time: ''
+          },
+          options: [
+            [
+              {
+                option: '<p>选项1</p>',
+                id: '1049040',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 1,
+                list_id: 74428,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              },
+              {
+                option: '<p>选项2</p>',
+                id: '1049041',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 2,
+                list_id: 74428,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              }
+            ]
+          ],
+          associate: [],
+          logics_has: false,
+          last_option_index: 2,
+          question_code: '',
+          question_value: '',
+          question_tag: '',
+          planet_id: '',
+          permissions: null
+        },
+        {
+          id: '17852449',
+          title: 'Q9',
+          stem: '请选择一个选项',
+          other: '',
+          question_index: 32,
+          question_type: 1,
+          config: {
+            placeholder: '',
+            version: '',
+            scene: null,
+            shelf: null,
+            ware: null,
+            option_groups: null,
+            is_required: 1,
+            select_random: 0,
+            each_number: 1,
+            is_three_dimensions: 0,
+            material_sn: '',
+            scene_information: null,
+            simple_scene_information: null,
+            is_behavior: 0,
+            is_price_tag: 0,
+            is_brand: 0,
+            is_initialize: 0,
+            is_default_perspective: 0,
+            is_binding_goods: 0,
+            float_window: 0,
+            float_window_content: '',
+            popup_window: 0,
+            popup_window_content: '',
+            is_show: [],
+            quick_type: 0,
+            option_group_random_inside: null,
+            option_group_random_outside: null
+          },
+          created_at: '2025-03-04T14:52:03',
+          created_user_id: 1281,
+          updated_user_id: null,
+          survey_id: 8721,
+          logic_config: {
+            expect: '',
+            order: 0,
+            type: 0,
+            stay_time: ''
+          },
+          options: [
+            [
+              {
+                option: '<p>选项1</p>',
+                id: '1049046',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 1,
+                list_id: 74431,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              },
+              {
+                option: '<p>选项2</p>',
+                id: '1049047',
+                type: 0,
+                is_other: 0,
+                is_fixed: 0,
+                is_remove_other: 0,
+                created_at: null,
+                created_user_id: null,
+                parent_id: null,
+                option_index: 2,
+                list_id: 74431,
+                option_code: '',
+                option_config: {
+                  title: '',
+                  instructions: [],
+                  price: 0,
+                  gradient: '',
+                  image_url: [],
+                  option_type: 0,
+                  type: 0,
+                  limit_right_content: '',
+                  child_area: null,
+                  binding_goods_id: ''
+                },
+                disable_option_update: null,
+                cascade: []
+              }
+            ]
+          ],
+          associate: [],
+          logics_has: false,
+          last_option_index: 2,
+          question_code: '',
+          question_value: '',
+          question_tag: '',
+          planet_id: '',
+          permissions: null
+        },
         {
           page: 5,
           total: 5,
           first_title: 'Q5',
-          last_title: 'Q1',
+          last_title: 'Q9',
           pages: [],
           is_short_time: 0,
           short_time: '',
           is_show: 0,
           use_type: 0,
-          pageId: '30bb8256-2069-4458-ad67-0c9cefd3415d'
+          pageId: 'a00b392c-d3cc-47e2-a0c4-3f1cb066d0dc',
+          logics_has: false
         }
       ],
       cycle_pages: null
diff --git a/src/views/Design/Index.vue b/src/views/Design/Index.vue
index d8e5ce3..e38c88d 100644
--- a/src/views/Design/Index.vue
+++ b/src/views/Design/Index.vue
@@ -17,11 +17,11 @@
           @get-choose-question-id="getChooseQuestionId"
         >
           <!-- 选择题 -->
-          <base-select
+          <Choice
             v-if="element.question_type === 1"
             :element="element"
             :active="chooseQuestionId === element.id"
-          ></base-select>
+          ></Choice>
           <!-- 填空题 -->
           <Completion
             v-if="element.question_type === 4"
@@ -57,7 +57,7 @@ import { ref, onMounted } from 'vue';
 import { useCounterStore } from '@/stores/counter';
 import { storeToRefs } from 'pinia';
 import Draggable from './components/Draggable.vue';
-import BaseSelect from './components/Questions/BaseSelect.vue';
+import Choice from './components/Questions/Choice.vue';
 import ChooseQuestion from './components/ChooseQuestion.vue';
 import Paging from './components/Questions/paging/Paging.vue';
 import Completion from './components/Questions/Completion.vue';
diff --git a/src/views/Design/components/ActionCompoents/OptionAction.vue b/src/views/Design/components/ActionCompoents/OptionAction.vue
index d215430..ae6c5a6 100644
--- a/src/views/Design/components/ActionCompoents/OptionAction.vue
+++ b/src/views/Design/components/ActionCompoents/OptionAction.vue
@@ -82,23 +82,23 @@ const openOptionActionModel = (item, index) => {
 // 上下移动
 const optionMove = (action) => {
   switch (action) {
-  case 'up':
-    if (activeIndex.value === 0) {
-      show.value = false;
-      return;
-    }
-    // 向上移动
-    element.value.splice(activeIndex.value - 1, 0, element.value.splice(activeIndex.value, 1)[0]);
-    activeIndex.value -= 1;
-    break;
-  case 'down':
-    if (activeIndex.value === element.value.length) {
-      show.value = false;
-      return;
-    }
-    element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]);
-    activeIndex.value += 1;
-    break;
+    case 'up':
+      if (activeIndex.value === 0) {
+        show.value = false;
+        return;
+      }
+      // 向上移动
+      element.value.splice(activeIndex.value - 1, 0, element.value.splice(activeIndex.value, 1)[0]);
+      activeIndex.value -= 1;
+      break;
+    case 'down':
+      if (activeIndex.value === element.value.length) {
+        show.value = false;
+        return;
+      }
+      element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]);
+      activeIndex.value += 1;
+      break;
   }
 };
 
diff --git a/src/views/Design/components/ActionCompoents/QuestionAction.vue b/src/views/Design/components/ActionCompoents/QuestionAction.vue
index 2423987..19a656c 100644
--- a/src/views/Design/components/ActionCompoents/QuestionAction.vue
+++ b/src/views/Design/components/ActionCompoents/QuestionAction.vue
@@ -35,12 +35,12 @@
       <van-divider></van-divider>
       <van-cell title="题前隐藏" :border="false" @click="questionSetting('before')">
         <template #right-icon>
-          <span> {{ getSkipTypeText(0) }} <van-icon name="arrow"></van-icon></span>
+          <span> {{ getSkipTypeText(1) }} <van-icon name="arrow"></van-icon></span>
         </template>
       </van-cell>
       <van-cell title="题后跳转" :border="false" @click="questionSetting('after')">
         <template #right-icon>
-          <span> {{ getSkipTypeText(1) }} <van-icon name="arrow"></van-icon></span>
+          <span> {{ getSkipTypeText(0) }} <van-icon name="arrow"></van-icon></span>
         </template>
       </van-cell>
       <van-divider></van-divider>
@@ -54,25 +54,52 @@
   <van-popup
     v-model:show="questionBeforeShow"
     title="题前隐藏逻辑"
+    label="题前隐藏逻辑"
     position="bottom"
+    :overlay="false"
+    closeable
+    close-icon="close"
     round
-    :style="{ minHeight: '60%' }"
+    :style="{ maxHeight: '75%' }"
   >
-    <template v-for="(item, logicIndex) in logics" :key="logicIndex">
-      <div
-        v-if="item.skip_type === skipType && item.question_index === activeQuestion.question_index"
-        class="mv10 question-setting"
-      >
-        <template v-for="(log, logIndex) in item.logic" :key="logIndex">
-          <yl-select
-            v-model="log.logic"
-            :options="settingIfOption"
-            class="question-setting-if"
-          ></yl-select>
-          <yl-select v-model="log.logic" :options="settingIfOption"></yl-select>
-        </template>
-      </div>
-    </template>
+    <div class="mv10">
+      <header><strong>题前隐藏逻辑</strong></header>
+      <question-before
+        v-model="questionsInfo.logics"
+        :skipType="skipType"
+        :activeQuestion="activeQuestion"
+      ></question-before>
+      <van-button>添加逻辑</van-button>
+    </div>
+
+    <!--    <template v-for="(item, index) in logics" :key="index" class="flex">-->
+    <!--      <div class="flex space-between mv10">-->
+    <!--        <div-->
+    <!--          v-if="-->
+    <!--            item.skip_type === skipType && item.question_index === activeQuestion.question_index-->
+    <!--          "-->
+    <!--          class="question-setting"-->
+    <!--        >-->
+    <!--          <template v-for="(log, logIndex) in item.logic" :key="logIndex">-->
+    <!--            <div>-->
+    <!--              <yl-select-->
+    <!--                v-model="log.logic"-->
+    <!--                :options="settingIfOption"-->
+    <!--                class="question-setting-if"-->
+    <!--              ></yl-select>-->
+    <!--              <yl-select v-model="log.logic" :options="settingIfOption"></yl-select>-->
+    <!--            </div>-->
+    <!--          </template>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          v-if="-->
+    <!--            item.skip_type === skipType && item.question_index === activeQuestion.question_index-->
+    <!--          "-->
+    <!--        >-->
+    <!--          del-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--    </template>-->
   </van-popup>
 </template>
 <script setup>
@@ -80,18 +107,11 @@ import { showConfirmDialog } from 'vant';
 import { ref } from 'vue';
 import { useCounterStore } from '@/stores/counter';
 import { storeToRefs } from 'pinia';
-
-import YlSelect from '@/components/YLSelect.vue';
-
+import QuestionBefore from '@/views/Design/components/ActionCompoents/components/QuestionBefore.vue';
 const store = useCounterStore();
 const { questionsInfo } = storeToRefs(store);
 const logics = questionsInfo.value.logics;
 
-const settingIfOption = [
-  { label: 'if', value: 'if' },
-  { label: 'always', value: 'always' }
-];
-
 const props = defineProps({
   index: {
     type: Number,
@@ -187,7 +207,7 @@ const questionSetting = (type) => {
       questionBeforeShow.value = true;
       break;
   }
-  skipType.value = type === 'before' ? 0 : 1;
+  skipType.value = type === 'before' ? 1 : 0;
 };
 </script>
 <style scoped lang="scss">
@@ -205,10 +225,6 @@ const questionSetting = (type) => {
   //max-width: 90vw;
 }
 
-.question-setting-if {
-  width: 140px;
-}
-
 .question-action-container {
   font-size: 20px;
 
diff --git a/src/views/Design/components/ActionCompoents/components/QuestionBefore.vue b/src/views/Design/components/ActionCompoents/components/QuestionBefore.vue
new file mode 100644
index 0000000..fadcfab
--- /dev/null
+++ b/src/views/Design/components/ActionCompoents/components/QuestionBefore.vue
@@ -0,0 +1,309 @@
+<template>
+  <template v-for="(item, index) in logics" :key="index">
+    <div
+      v-if="item.skip_type === skipType && item.question_index === activeQuestion.question_index"
+    >
+      <div class="mt10">
+        <template v-for="(log, logIndex) in item.logic" :key="logIndex">
+          <div class="flex align-center space-between">
+            <div class="question-before mb10">
+              <!--          if  always-->
+              <yl-select
+                v-model="log.logic"
+                :options="logIndex === 0 ? settingIfOptions : settingAndOptions"
+                class="if mr10"
+                @change="logicIf($event, index)"
+              ></yl-select>
+              <!--          问题-->
+              <yl-select
+                v-if="log.logic !== 'always'"
+                v-model="log.question_index"
+                class="question"
+                :options="beforeQuesOptions"
+                placeholder="请选择问题"
+              ></yl-select>
+              <!--          为空 不为空-->
+              <yl-select
+                v-if="log.logic !== 'always'"
+                v-model="log.is_answer"
+                class="answer mr10 mt10"
+                :options="answerOptions"
+              ></yl-select>
+              <!--          选项 or 分组 -->
+              <yl-select
+                v-if="log.logic !== 'always' && log.is_answer !== 0"
+                v-model="log.is_option_group"
+                :options="groupOptions"
+                class="mr10 group mt10"
+              ></yl-select>
+              <!--          符号-->
+              <yl-select
+                v-if="log.logic !== 'always' && log.is_answer !== 0"
+                v-model="log.operator"
+                :options="symbolOptions"
+                class="mr10 symbol mt10"
+              ></yl-select>
+              <!--            分组 option   选项option-->
+              <div
+                v-if="log.logic !== 'always' && log.is_answer !== 0"
+                class="flex align-center space-between option mt10"
+              >
+                <yl-select
+                  v-if="log.is_option_group === 0"
+                  v-model="log.option_index"
+                  class="mr10"
+                  :options="changeQuestionIndex(log.question_index, log)"
+                ></yl-select>
+                <yl-select
+                  v-else
+                  v-model="log.group_index"
+                  class="mr10"
+                  :options="changeQuestionIndex(log.question_index, log)"
+                ></yl-select>
+              </div>
+            </div>
+
+            <div class="action">
+              <van-icon
+                v-if="logIndex !== 0 || log.logic === 'always'"
+                name="clear"
+                class="mr10"
+                @click="deleteLogic(logIndex, item.logic, index)"
+              ></van-icon>
+              <van-icon
+                v-if="log.logic !== 'always'"
+                name="add"
+                @click="addLogic(logIndex, item.logic)"
+              ></van-icon>
+            </div>
+          </div>
+        </template>
+        <!--            如果是题前隐藏-->
+        <div v-if="skipType === 1">隐藏本题</div>
+      </div>
+
+      <van-divider
+        :dashed="true"
+        :hairline="false"
+        content-position="right"
+        :style="{ borderColor: '#bfbfbf' }"
+      >
+        <van-icon name="delete">删除</van-icon>
+      </van-divider>
+      <!--      <div-->
+      <!--        v-if="item.skip_type === skipType && item.question_index === activeQuestion.question_index"-->
+      <!--      >-->
+      <!--        del-->
+      <!--      </div>-->
+    </div>
+  </template>
+</template>
+<script setup>
+import YlSelect from '@/components/YLSelect.vue';
+import { ref } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useCounterStore } from '@/stores/counter';
+const store = useCounterStore();
+const { questionsInfo } = storeToRefs(store);
+const logics = ref(questionsInfo.value.logics);
+const questions = questionsInfo.value.questions;
+const props = defineProps({
+  activeQuestion: {
+    type: Object,
+    default: () => {
+      return {};
+    }
+  },
+  skipType: {
+    type: [Number, String],
+    default: ''
+  }
+});
+// 变量为beforeList  questions里面 获取activeQuestion 之前所有的题目
+
+const questionIndex = questions.findIndex((item) => {
+  return item.id === props.activeQuestion.id;
+});
+
+// 当前题目之前的列表
+let beforeQuesOptions = [];
+if (questionIndex > 0) {
+  beforeQuesOptions = questions.slice(0, questionIndex).map((item) => {
+    return {
+      ...item,
+      label: item.stem,
+      value: item.question_index
+    };
+  });
+}
+// 题目选项
+let optionOptions = [];
+
+const changeQuestionIndex = (value, logicItem) => {
+  if (!value) {
+    return [];
+  }
+  beforeQuesOptions.map((item) => {
+    if (item.question_index === value) {
+      if (logicItem.is_option_group === 0) {
+        optionOptions = item.options[0].map((optItem) => {
+          return {
+            ...optItem,
+            label: optItem.option,
+            value: optItem.option_index
+          };
+        });
+      } else if (logicItem.is_option_group === 1) {
+        optionOptions = item.config.option_groups.option_group.map((groupItem) => {
+          return {
+            ...groupItem,
+            label: groupItem.title,
+            value: groupItem.group_index
+          };
+        });
+      } else {
+        optionOptions = [];
+      }
+    }
+  });
+  return optionOptions;
+};
+
+// 删除 题目设置
+const deleteLogic = (logIndex, item, index) => {
+  item.splice(logIndex, 1);
+  // 如果小删除  删除后一个都没有了 就删除掉整个数组
+  if (item.length === 0) {
+    logics.value.splice(index, 1);
+  }
+};
+//  添加题目
+const addLogic = (logIndex, item) => {
+  item.splice(logIndex + 1, 0, {
+    logic: 'and',
+    question_index: '',
+    question_type: '',
+    is_answer: 1,
+    operator: '=',
+    option_index: '',
+    relation_question_index: 0,
+    type: 0,
+    is_option_group: '',
+    group_index: null
+  });
+};
+const groupOptions = [
+  {
+    label: '选项',
+    value: 0
+  },
+  {
+    label: '分组',
+    value: 1
+    // disabled: true
+  }
+];
+const settingIfOptions = [
+  { label: 'if', value: 'if' },
+  { label: 'always', value: 'always' }
+];
+const settingAndOptions = [{ label: 'and', value: 'and' }];
+const answerOptions = [
+  { label: '为空', value: 0 },
+  { label: '不为空', value: 1 }
+];
+
+const symbolOptions = [
+  {
+    label: '=',
+    value: '='
+  },
+  {
+    label: '≠',
+    value: '≠'
+  },
+  {
+    label: '>',
+    value: '>'
+  },
+  {
+    label: '≥',
+    value: '>'
+  },
+  {
+    label: '<',
+    value: '<'
+  },
+  {
+    label: '≤',
+    value: '≤'
+  }
+];
+
+const logicIf = (value, index) => {
+  if (value === 'always') {
+    logics.value[index].logic = [logics.value[index].logic[0]];
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.flex1 {
+  flex: 1;
+}
+
+.mr10 {
+  margin-right: 10px;
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+
+.mv10 {
+  margin: 0 5px;
+}
+
+.action {
+  flex: none;
+  width: 40px;
+}
+
+.question-before {
+  & .if {
+    flex: none;
+    width: 90px;
+  }
+
+  & .question {
+    flex: none;
+    width: 210px;
+  }
+
+  & .group {
+    flex: none;
+    width: 75px;
+  }
+
+  & .answer {
+    flex: none;
+    width: 80px;
+  }
+
+  & .symbol {
+    flex: none;
+    width: 50px;
+  }
+
+  & .option {
+    //width: 120px;
+    width: 100%;
+
+    //flex: 1;
+  }
+}
+</style>
diff --git a/src/views/Design/components/ChooseQuestion.vue b/src/views/Design/components/ChooseQuestion.vue
index 32388d6..0c87162 100644
--- a/src/views/Design/components/ChooseQuestion.vue
+++ b/src/views/Design/components/ChooseQuestion.vue
@@ -79,13 +79,14 @@ const radioAddOption = () => {
         option_type: 0,
         limit_right_content: ''
       },
-      option_index: 1,
+      option_index: element.value.last_option_index + 1,
       parent_id: 0,
       type: 0,
       cascade: [],
       config: []
     });
   });
+  element.value.last_option_index += 1;
 };
 
 // emit 事件
diff --git a/src/views/Design/components/Questions/BaseSelect.vue b/src/views/Design/components/Questions/Choice.vue
similarity index 100%
rename from src/views/Design/components/Questions/BaseSelect.vue
rename to src/views/Design/components/Questions/Choice.vue
diff --git a/src/views/Design/components/Questions/paging/Paging.vue b/src/views/Design/components/Questions/paging/Paging.vue
index 62d9592..57eb0e1 100644
--- a/src/views/Design/components/Questions/paging/Paging.vue
+++ b/src/views/Design/components/Questions/paging/Paging.vue
@@ -11,7 +11,8 @@
           class="iconfont active-icon"
           :style="{ marginRight: isLastPage ? '0' : '16px' }"
           @click="activePage"
-        >&#xe86c;</i>
+          >&#xe86c;</i
+        >
         <template v-if="!isLastPage">
           <i class="iconfont moverQues" style="margin-right: 16px">&#xe71b;</i>
           <i class="iconfont" @click="deleteHandle">&#xe6c5;</i>