From bb3808bbf9673bf71c33b22878fb405c6df3a679 Mon Sep 17 00:00:00 2001
From: "du.meimei" <du.meimei@ebiz-digits.com>
Date: Sun, 16 Mar 2025 10:42:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update:=E6=8A=95=E6=94=BE=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Survey/views/Create/Index.vue | 77 +++++++++++++++++--------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/views/Survey/views/Create/Index.vue b/src/views/Survey/views/Create/Index.vue
index 6b962ff..8be0041 100644
--- a/src/views/Survey/views/Create/Index.vue
+++ b/src/views/Survey/views/Create/Index.vue
@@ -97,16 +97,12 @@
 
     <!-- 底部功能性按钮 -->
     <div class="survey-action">
-      <!--      <div class="survey-action_setting" @click="openSettingAction">-->
-      <!--        <van-icon name="setting" size="18" class="grid-icon" />-->
-      <!--        <span>投放设置</span>-->
-      <!--      </div>-->
       <div class="survey-action_btn">
         <van-button size="small" plain type="primary" @click="saveAs">保存</van-button>
         <van-button size="small" plain type="primary" @click="previewQuestion">预览</van-button>
-        <van-button size="small" plain type="success" @click="openSettingAction"
-          >投放设置</van-button
-        >
+        <van-button size="small" plain type="success" @click="openSettingAction">
+          投放设置
+        </van-button>
         <van-button size="small" icon="guide-o" @click="publishQuestion">立即投放</van-button>
       </div>
     </div>
@@ -114,12 +110,12 @@
 
   <!--  投放设置-->
 
-  <van-action-sheet v-model:show="showSetting" title="">
+  <van-action-sheet v-model:show="showSetting" title="" style="background-color: #f2f2f2">
     <template #description>
-      <div class="flex flex-start">设置</div>
+      <div class="setting_title flex flex-start">投放设置</div>
     </template>
-    <van-cell-group :border="false" class="ml10">
-      <van-cell title="每页一题" :border="false" label-align="left">
+    <van-cell-group :border="false" class="setting_group">
+      <van-cell title="每页一题" class="setting_block" :border="false" label-align="left">
         <template #right-icon>
           <van-switch
             v-model="questionInfo.survey.is_one_page_one_question"
@@ -132,7 +128,7 @@
         </template>
       </van-cell>
       <van-divider></van-divider>
-      <van-cell title="投放数量" :border="false" label-align="left">
+      <van-cell title="投放数量" class="setting_block" :border="false" label-align="left">
         <template #right-icon>
           <van-switch
             v-model="questionInfo.survey.is_publish_number"
@@ -146,7 +142,7 @@
       </van-cell>
       <van-cell-group
         v-if="questionInfo.survey.is_publish_number === 1"
-        class="child-group"
+        class="child-group setting_block"
         :border="false"
       >
         <van-field
@@ -160,7 +156,7 @@
         </van-field>
       </van-cell-group>
       <van-divider></van-divider>
-      <van-cell title="有效期" :border="false" label-align="left">
+      <van-cell title="有效期" class="border-top" :border="false" label-align="left">
         <template #right-icon>
           <van-switch
             v-model="questionInfo.survey.is_time"
@@ -209,6 +205,7 @@
 
       <van-cell
         title="企微身份获取(开启后仅支持私有化企业环境作答)"
+        class="border-bottom"
         :border="false"
         label-align="left"
       >
@@ -224,7 +221,7 @@
         </template>
       </van-cell>
       <van-divider></van-divider>
-      <van-cell title="IP答题次数限制" :border="false" label-align="left">
+      <van-cell title="IP答题次数限制" class="border-top" :border="false" label-align="left">
         <template #right-icon>
           <van-switch
             v-model="questionInfo.survey.is_ip_number"
@@ -247,7 +244,7 @@
           <template #right-icon> 次 </template>
         </van-field>
       </van-cell-group>
-      <van-cell title="设备答题次数限制" :border="false" label-align="left">
+      <van-cell title="设备答题次数限制" class="border-bottom" :border="false" label-align="left">
         <template #right-icon>
           <van-switch
             v-model="questionInfo.survey.is_browser_number"
@@ -594,9 +591,9 @@ onMounted(async () => {
   button {
     padding: 3px 20px;
     border: none;
+    border-radius: 10px;
     background-color: #70b937;
     color: #fff;
-    border-radius: 10px;
     font-weight: bold;
   }
 
@@ -604,7 +601,34 @@ onMounted(async () => {
     //font-size: 12px;
   }
 }
+::v-deep .van-popup--bottom.van-popup--round {
+  background-color: #f2f2f2 !important;
+}
+.setting_title {
+  font-family:
+    PingFangSC,
+    PingFang SC;
+  font-weight: bold;
+  font-size: 19px;
+  color: #000000;
 
+  line-height: 26px;
+  text-align: left;
+  font-style: normal;
+}
+.setting_group {
+  padding: 10px;
+  background-color: #f2f2f2;
+}
+.setting_block {
+  border-radius: 12px;
+}
+.border-top {
+  border-radius: 12px 12px 0 0;
+}
+.border-bottom {
+  border-radius: 0 0 12px 12px;
+}
 .result-cell {
   margin: 10px 5px;
   padding: 5px;
@@ -700,22 +724,25 @@ onMounted(async () => {
     font-size: 12px;
   }
 }
+
 ::v-deep .van-button--plain.van-button--primary {
-  color: #4b4b59;
+  padding: 13px 15px;
   border: 1px solid #f0f0f0;
-  background-color: #fff;
-  font-weight: bold;
-  padding: 13px 15px;
   border-radius: 10px;
+  background-color: #fff;
+  color: #4b4b59;
+  font-weight: bold;
 }
+
 ::v-deep .van-button--plain.van-button--success {
-  color: #70b937;
-  border: 1px solid #70b937;
-  background-color: #fff;
-  font-weight: bold;
   padding: 13px 15px;
+  border: 1px solid #70b937;
   border-radius: 10px;
+  background-color: #fff;
+  color: #70b937;
+  font-weight: bold;
 }
+
 .survey-action {
   position: fixed;
   bottom: 0;

From 5fea34f1bb2b8cac16741e718cbcb52197f86eb6 Mon Sep 17 00:00:00 2001
From: "du.meimei" <du.meimei@ebiz-digits.com>
Date: Sun, 16 Mar 2025 11:07:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update:NPS=20UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Design/Index.vue                    |  6 +++---
 .../ActionCompoents/QuestionAction.vue        | 20 +++++++++----------
 src/views/Design/components/Questions/NPS.vue |  4 ++--
 .../Design/components/Questions/Rate.vue      |  1 +
 .../components/Questions/RateCharacter.vue    |  2 +-
 src/views/Home/Index.vue                      |  2 +-
 .../Home/components/CreateSurvey/Index.vue    |  6 +-----
 src/views/Home/components/Market/Index.vue    |  4 ++--
 src/views/Survey/views/Create/Index.vue       | 20 +++++++++++--------
 9 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/views/Design/Index.vue b/src/views/Design/Index.vue
index f2c084e..d15c052 100644
--- a/src/views/Design/Index.vue
+++ b/src/views/Design/Index.vue
@@ -52,8 +52,8 @@
           <martrix-question
             v-if="
               element.question_type === 8 ||
-                element.question_type === 9 ||
-                element.question_type === 10
+              element.question_type === 9 ||
+              element.question_type === 10
             "
             :element="computedElement(element)"
             :index="index"
@@ -87,7 +87,7 @@
             :active="chooseQuestionId === element.id"
             @update:element="updateElement"
           />
-          <!--图文-->
+          <!--NPS-->
           <NPS
             v-if="element.question_type === 106"
             :element="computedElement(element)"
diff --git a/src/views/Design/components/ActionCompoents/QuestionAction.vue b/src/views/Design/components/ActionCompoents/QuestionAction.vue
index 32b99c8..9f6630e 100644
--- a/src/views/Design/components/ActionCompoents/QuestionAction.vue
+++ b/src/views/Design/components/ActionCompoents/QuestionAction.vue
@@ -260,8 +260,8 @@ const getSkipTypeText = (skipType) => {
   const ls = [];
   logics.map((item) => {
     if (
-      item.skip_type === skipType
-      && item.question_index === activeQuestion.value.question_index
+      item.skip_type === skipType &&
+      item.question_index === activeQuestion.value.question_index
     ) {
       ls.push(item);
     }
@@ -277,13 +277,13 @@ const getSkipTypeText = (skipType) => {
 
 const questionSetting = (type) => {
   switch (type) {
-  case 'before':
-    questionBeforeShow.value = true;
+    case 'before':
+      questionBeforeShow.value = true;
 
-    break;
-  case 'after':
-    questionBeforeShow.value = true;
-    break;
+      break;
+    case 'after':
+      questionBeforeShow.value = true;
+      break;
   }
   skipType.value = type === 'before' ? 1 : 0;
 };
@@ -316,8 +316,8 @@ const updateConfig = (value) => {
 .question-action-container {
   font-size: 20px;
 
-  & .mobilefont{
-    font-size:18px;
+  & .mobilefont {
+    font-size: 18px;
   }
 
   & .van-icon + .van-icon {
diff --git a/src/views/Design/components/Questions/NPS.vue b/src/views/Design/components/Questions/NPS.vue
index 2c1407c..2e610f0 100644
--- a/src/views/Design/components/Questions/NPS.vue
+++ b/src/views/Design/components/Questions/NPS.vue
@@ -19,12 +19,12 @@
             :key="optionIndex"
             @click="chooseOption(item)"
           >
-            <RateCharacter v-model="answerValue" :config="element.config"></RateCharacter>
             <div class="tips">
               <p>{{ element.config.prompt_left }}</p>
               <p>{{ element.config.prompt_center }}</p>
               <p>{{ element.config.prompt_right }}</p>
             </div>
+            <RateCharacter v-model="answerValue" :config="element.config"></RateCharacter>
           </div>
         </div>
       </template>
@@ -71,6 +71,6 @@ const chooseOption = (item) => {
 .tips {
   display: flex;
   justify-content: space-between;
-  color: #bfbfbf;
+  color: #b8b8b8;
 }
 </style>
diff --git a/src/views/Design/components/Questions/Rate.vue b/src/views/Design/components/Questions/Rate.vue
index 8d69a0c..0ced0a8 100644
--- a/src/views/Design/components/Questions/Rate.vue
+++ b/src/views/Design/components/Questions/Rate.vue
@@ -5,6 +5,7 @@
       :label="element.stem"
       :required="element.config.is_required === 1"
       label-align="top"
+      class="contenteditable-question-title"
     >
       <template #left-icon>
         {{ index + 1 }}
diff --git a/src/views/Design/components/Questions/RateCharacter.vue b/src/views/Design/components/Questions/RateCharacter.vue
index 866ad19..19c8ddd 100644
--- a/src/views/Design/components/Questions/RateCharacter.vue
+++ b/src/views/Design/components/Questions/RateCharacter.vue
@@ -95,7 +95,7 @@ ul {
 .rate_item {
   margin: 0 3px;
   margin-top: 5px;
-  padding: 0 7px;
+  padding: 0 6px;
   border: 1px solid #ddd;
   border-radius: 4px;
   color: #666;
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 26ac7cf..91f1027 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -9,7 +9,7 @@ import { onMounted, ref } from 'vue';
 const contentShow = ref(false);
 const show = ref(false);
 
-onMounted(async() => {
+onMounted(async () => {
   contentShow.value = true;
   // if (utils.getSessionStorage('xToken')) {
   //   const appToken = utils.getParameter('digitalYiliToken');
diff --git a/src/views/Home/components/CreateSurvey/Index.vue b/src/views/Home/components/CreateSurvey/Index.vue
index ddd9517..4a9cabd 100644
--- a/src/views/Home/components/CreateSurvey/Index.vue
+++ b/src/views/Home/components/CreateSurvey/Index.vue
@@ -96,9 +96,7 @@ onMounted(() => {
     color: #000;
     font-weight: bold;
     font-size: 15px;
-    font-family:
-      PingFangSC,
-      'PingFang SC';
+    font-family: PingFangSC, 'PingFang SC';
   }
 }
 
@@ -114,8 +112,6 @@ onMounted(() => {
     color: #000;
     font-weight: 400;
     font-size: 0.34rem;
-
-    //font-family: PingFangHK, PingFangHK;
   }
 }
 </style>
diff --git a/src/views/Home/components/Market/Index.vue b/src/views/Home/components/Market/Index.vue
index 61763be..20b3389 100644
--- a/src/views/Home/components/Market/Index.vue
+++ b/src/views/Home/components/Market/Index.vue
@@ -20,7 +20,7 @@ const marketList = ref([]);
 const active = ref(null);
 const marketInfo = ref([]);
 
-const getTableList = async() => {
+const getTableList = async () => {
   const res = await getListScene();
   if (res.data.code === 0) {
     res.data.data.forEach((item) => {
@@ -32,7 +32,7 @@ const getTableList = async() => {
     getMarketInfo(marketList.value[0]);
   }
 };
-const getMarketInfo = async(item) => {
+const getMarketInfo = async (item) => {
   const code = marketList.value.filter((market, index) => item === index)[0].code;
   const params = {
     page: 1,
diff --git a/src/views/Survey/views/Create/Index.vue b/src/views/Survey/views/Create/Index.vue
index 8be0041..468ec17 100644
--- a/src/views/Survey/views/Create/Index.vue
+++ b/src/views/Survey/views/Create/Index.vue
@@ -601,34 +601,38 @@ onMounted(async () => {
     //font-size: 12px;
   }
 }
+
 ::v-deep .van-popup--bottom.van-popup--round {
   background-color: #f2f2f2 !important;
 }
-.setting_title {
-  font-family:
-    PingFangSC,
-    PingFang SC;
-  font-weight: bold;
-  font-size: 19px;
-  color: #000000;
 
+.setting_title {
+  color: #000;
+  font-weight: bold;
+  font-style: normal;
+  font-size: 19px;
+  font-family: PingFangSC, 'PingFang SC';
   line-height: 26px;
   text-align: left;
-  font-style: normal;
 }
+
 .setting_group {
   padding: 10px;
   background-color: #f2f2f2;
 }
+
 .setting_block {
   border-radius: 12px;
 }
+
 .border-top {
   border-radius: 12px 12px 0 0;
 }
+
 .border-bottom {
   border-radius: 0 0 12px 12px;
 }
+
 .result-cell {
   margin: 10px 5px;
   padding: 5px;

From 4952201e777d91d109682ba7d008e73f321eb98a Mon Sep 17 00:00:00 2001
From: "LHY\\18810" <18810831805@163.com>
Date: Sun, 16 Mar 2025 11:57:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:app=E5=B5=8C=E5=A5=97h=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/public.scss               |   2 +-
 src/assets/img/back.png                  | Bin 0 -> 439 bytes
 src/assets/js/appBridge.js               |  19 +++++++++
 src/layouts/index.vue                    |  39 ++++++++++--------
 src/layouts/utils.js                     |  50 +++++++++++------------
 src/views/Survey/views/Publish/Index.vue |  36 ++++++----------
 6 files changed, 78 insertions(+), 68 deletions(-)
 create mode 100644 src/assets/img/back.png

diff --git a/src/assets/css/public.scss b/src/assets/css/public.scss
index 68c2b25..d21a751 100644
--- a/src/assets/css/public.scss
+++ b/src/assets/css/public.scss
@@ -1,6 +1,6 @@
 .van-nav-bar {
   padding-top: var(--status-bar-height) !important;
-  height: calc(46px + var(--status-bar-height)) !important;
+  height: calc(60px + var(--status-bar-height)) !important;
 }
 .van-cell {
   padding: 8px !important;
diff --git a/src/assets/img/back.png b/src/assets/img/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ecde9e3398f35884e38d6142b3ec1ea40a051d4
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq001%o001lq1^@s6C*$i{00001b5ch_0Itp)
z=>Px$aY;l$RA@up+Fx#iFboE8EWtgt=fEL)l65E9Zqn{1>;_1{^Ee6KT#2e(Ndie0
zeO}+O^TX;Nf0T;Euez?^nfZl?CL;Ri`~IA`#cDZ9*~A!g`T-o5n#?>^RdwjPZc5o_
ztyVI~Z^TWr!!Qi33WyCM6B)<x`L7XDKYAjLNl5)H(};$kAfg~hh+qgBA_#(r*bPBN
z?1CU8Hbc-6n;;qxUWgWi6QT)Wg=j;pLNp>CAX*W35Y31y#DkEf=rhMo5!j<G%W@*w
zv5TU33oHV088e^B81qF$PY@@HIK=;fG);44=2OJYK)AHM?ChTRNh|pj!f9=1knHRl
zKDaPM^qMPZ3%y}?DT-#yLmZ?PvzlvZ#8?A5Z5U_Ls0rhZOtoOV5a0I<%184ihz87N
z2s&mL1R1j%f{F=(AYy_cXqYGn5+)kr!l-%}y6g{*UjSJih$fkc4Wn`*3q~@4d7dR+
hx~#}K{wyH9zXA77>qfC~JWK!p002ovPDHLkV1gqIwPFAO

literal 0
HcmV?d00001

diff --git a/src/assets/js/appBridge.js b/src/assets/js/appBridge.js
index 717c586..96b6029 100644
--- a/src/assets/js/appBridge.js
+++ b/src/assets/js/appBridge.js
@@ -311,5 +311,24 @@ export default {
       type: 'newAuthToken',
       cbId
     });
+  },
+  /**
+   * @desc H5历史记录
+   */
+  routerCanGoBack(router) {
+    const position = router.options.history.state?.position;
+    return typeof position === 'number' && position > 1;
+  },
+  /**
+   * @desc 当前系统h5返回
+   * @returns {Boolean} 操作是否成功
+   */
+  async h5RouterBack(router) {
+    const canGoBack = this.routerCanGoBack(router);
+    if (canGoBack) {
+      router.go(-1);
+    } else {
+      this.navigateBack();
+    }
   }
 };
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 8a1f3a6..cdec601 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -2,12 +2,11 @@
   <div class="common-layout">
     <!-- title 标题和搜索栏 -->
     <header class="header">
-      <van-nav-bar
-        class="header-nav"
-        :title="$route.meta.title"
-        left-arrow
-        @click-left="$router.go(-1)"
-      />
+      <van-nav-bar :title="$route.meta.title" left-arrow safe-area-inset-top @click-left="goBack">
+        <template #left>
+          <img src="@/assets/img/back.png" alt="" class="back-icon" />
+        </template>
+      </van-nav-bar>
     </header>
     <!-- content -->
     <RouterView />
@@ -15,7 +14,14 @@
 </template>
 
 <script setup>
-import { RouterView } from 'vue-router';
+import { RouterView, useRouter } from 'vue-router';
+import appBridge from '@/assets/js/appBridge';
+const router = useRouter();
+
+function goBack() {
+  appBridge.h5RouterBack(router);
+}
+
 </script>
 
 <style scoped lang="scss">
@@ -26,21 +32,20 @@ import { RouterView } from 'vue-router';
 }
 
 .header {
-  .header-nav {
-    background: var(--primary-color) !important;
-  }
-
-  .header-search {
-    padding: 13px;
-
-    //.input-class {
-    //}
-  }
+  position: sticky;
+  top: 0;
+  z-index: 1000;
+  background-color: #a5d380;
 
   .title {
     display: flex;
     align-items: end;
     justify-content: center;
   }
+
+  .back-icon {
+    width: 18px;
+    height: 18px;
+  }
 }
 </style>
diff --git a/src/layouts/utils.js b/src/layouts/utils.js
index 33f0a9b..8df15ec 100644
--- a/src/layouts/utils.js
+++ b/src/layouts/utils.js
@@ -13,17 +13,17 @@ import { getDomText } from '@/utils/utils';
  * @param options
  */
 function showModal(options) {
-  const confirm = (...rest) => {
-    if (options.incompleteQuestionList?.length) {
-      if (options.onOk) {
-        options.onOk(...rest);
-      }
-      // const firstQuestion = options.incompleteQuestionList[0];
-      // store.commit(`common/${A_COMMON_SET_ACTIVEQUESTION}`, JSON.stringify(firstQuestion));
-      // const el = document.getElementById(firstQuestion.id);
-      // new Scroll(el).animate();
-    }
-  };
+  // const confirm = (...rest) => {
+  //   if (options.incompleteQuestionList?.length) {
+  //     if (options.onOk) {
+  //       options.onOk(...rest);
+  //     }
+  //     const firstQuestion = options.incompleteQuestionList[0];
+  //     store.commit(`common/${A_COMMON_SET_ACTIVEQUESTION}`, JSON.stringify(firstQuestion));
+  //     const el = document.getElementById(firstQuestion.id);
+  //     new Scroll(el).animate();
+  //   }
+  // };
 
   showConfirmDialog({
     title: '提示',
@@ -31,11 +31,9 @@ function showModal(options) {
     ...options
   })
     .then(() => {
-      confirm();
+      // confirm();
     })
-    .catch(() => {
-      /**/
-    });
+    .catch(() => {});
 }
 
 /**
@@ -135,9 +133,7 @@ const canPlanetPublish3D = function (data) {
               canFB = false;
               qSteams.push(`(${s.title})`);
             }
-          } catch (error) {
-            // console.warn(error);
-          }
+          } catch (error) {}
         }
       });
 
@@ -178,9 +174,7 @@ const canPlanetPublish3D = function (data) {
 
               const options = s.options.flat();
               s.associate.forEach((ass) => {
-                const question = data.questions.find(
-                  (q) => q.question_index === ass.question_index
-                );
+                const question = data.questions.find((q) => q.question_index == ass.question_index);
                 if (!question) return;
                 options.push(...question.options.flat());
               });
@@ -190,9 +184,7 @@ const canPlanetPublish3D = function (data) {
                 qSteams.push(`(${s.title})`);
               }
             }
-          } catch (error) {
-            // console.warn(error);
-          }
+          } catch (error) {}
         }
       });
 
@@ -230,7 +222,7 @@ const canPlanetPublishImage = function (data) {
               qSteams.push(`(${s.title})`);
             }
           } catch (error) {
-            //   错误返回
+            console.warn(error);
           }
         }
       });
@@ -294,7 +286,7 @@ function canPublishRandom(data, publishType) {
   const errors = [];
   const randomList = data?.survey?.group_pages || [];
 
-  randomList.forEach((random /* randomIndex */) => {
+  randomList.forEach((random, randomIndex) => {
     const list = random.list || [];
 
     // 每一个随机，至少要有两个随机题组
@@ -400,7 +392,11 @@ function isLoopingLogicValid(data, publishType) {
 
   return false;
 }
-
+/**
+ * 判断问卷是否可以投放(原本应该后端实现，前端实现会有并发的问题，但后端表示做不了)
+ * @param sn
+ * @param publishType  undefined投放；null投放；0投放；1预览；2投放；3测试
+ */
 export const canPlanetPublish = async function (sn, publishType) {
   const parsedPublishType = !publishType ? 2 : publishType;
   const num = window.location.href.indexOf('code=');
diff --git a/src/views/Survey/views/Publish/Index.vue b/src/views/Survey/views/Publish/Index.vue
index 1742291..04661b8 100644
--- a/src/views/Survey/views/Publish/Index.vue
+++ b/src/views/Survey/views/Publish/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <van-nav-bar :title="surveyTitle" left-arrow @click-left="$router.go(-1)" />
+    <layout />
     <div class="content">
       <van-cell-group v-if="status === 1" inset style="padding-top: 15px">
         <div>
@@ -39,6 +39,7 @@
 </template>
 
 <script setup lang="ts">
+import layout from '@/layouts/index.vue';
 import { useRoute } from 'vue-router';
 import { onMounted, reactive, ref, watch } from 'vue';
 import { showFailToast, showToast } from 'vant';
@@ -144,22 +145,19 @@ function downLoadImg () {
     document.body.removeChild(link);
   }
 }
-function handlePublish () {
-  publishSurvey({
-    sn,
-    publish_type: publishType.value
-  })
-    .then(() => {
-      fetchInfo();
-    })
-    .catch((error) => {
-      showFailToast(error.data?.message || error.message || '服务器错误');
-    });
-}
 async function openPublishModal () {
-  const res = await canPlanetPublish(route.query.sn as string);
+  const res = await canPlanetPublish(route.query.sn as string, publishType.value);
   if (res) {
-    handlePublish();
+    await publishSurvey({
+      sn,
+      publish_type: publishType.value
+    })
+      .then(() => {
+        fetchInfo();
+      })
+      .catch((error) => {
+        showFailToast(error.data?.message || error.message || '服务器错误');
+      });
   }
 }
 
@@ -206,19 +204,11 @@ onMounted(async () => {
   height: 100vh;
   background-color: #f5f5f5;
 
-  * {
-    font-size: 10px;
-  }
-
   button {
     padding: 3px 20px;
     border: none;
     background-color: #f2f2f2;
   }
-
-  * {
-    font-size: 12px;
-  }
 }
 
 .content {