liyongli il y a 1 mois
Parent
commit
dc22c27014

+ 6 - 3
package.json

@@ -8,6 +8,9 @@
     "build:local": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build --mode pro",
     "gitPush": "node ./saveOSSAGitte.js"
   },
+  "env": {
+    "vue/setup-compiler-macros": true
+  },
   "dependencies": {
     "animate.css": "^4.1.1",
     "axios": "^1.2.1",
@@ -27,10 +30,10 @@
     "eslint": "^6.8.0",
     "eslint-plugin-vue": "^7.20.0",
     "sass": "^1.63.6",
-    "sass-loader": "^10.4.1", 
+    "sass-loader": "^10.4.1",
     "unplugin-vue-components": "^0.22.11",
     "vue-loader-v16": "16.0.0-beta.5.4",
-    "webpack": "^4.46.0" 
+    "webpack": "^4.46.0"
   },
   "eslintConfig": {
     "root": true,
@@ -61,4 +64,4 @@
   },
   "author": "",
   "license": "ISC"
-}
+}

+ 22 - 22
src/view/fenghui/form.vue

@@ -225,14 +225,14 @@
             </van-field>
 
             <!-- 共享数字经济发展机遇  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity1" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity1Content }]"
-                :placeholder="lang[langType].activity1Content">
+            <van-field size=“large” label-align="top" v-model="formData.active1" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active1Content }]"
+                :placeholder="lang[langType].active1Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active1"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -241,14 +241,14 @@
             </van-field>
 
             <!-- 共筑网络安全防线  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity2" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity2Content }]"
-                :placeholder="lang[langType].activity2Content">
+            <van-field size=“large” label-align="top" v-model="formData.active2" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active2Content }]"
+                :placeholder="lang[langType].active2Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active2"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active2"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -257,14 +257,14 @@
             </van-field>
 
             <!-- 共商人工智能发展治理  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity3" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity3Content }]"
-                :placeholder="lang[langType].activity3Content">
+            <van-field size=“large” label-align="top" v-model="formData.active3" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active3Content }]"
+                :placeholder="lang[langType].active3Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active3"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active3"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -279,17 +279,17 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity4">
+                        <van-cell clickable :title="lang[langType].active4">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity5">
+                        <van-cell clickable :title="lang[langType].active5">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity6">
+                        <van-cell clickable :title="lang[langType].active6">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
@@ -372,7 +372,7 @@
     </div>
 </template>
 <script setup>
-import { defineEmits, defineProps, reactive, ref, computed, defineExpose } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { showToast, showDialog } from 'vant';
 import { saveData, uploadImage } from '@/api/2025.js';
 import lang from './lang.js';
@@ -505,16 +505,16 @@ let loading = false
 const onSubmit = () => {
     if (loading) return
     loading = true
-    const activity = {
+    const active = {
         active4: '否',
         active5: '否',
         active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
-        activity[item] = '是'
+        active[item] = '是'
     })
     saveData({
-        ...activity,
+        ...active,
         active1: formData.active1 || '否',
         active2: formData.active2 || '否',
         active3: formData.active3 || '否',

+ 22 - 22
src/view/fenghui/form1.vue

@@ -206,14 +206,14 @@
             </van-field>
 
             <!-- 共享数字经济发展机遇  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity1" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity1Content }]"
-                :placeholder="lang[langType].activity1Content">
+            <van-field size=“large” label-align="top" v-model="formData.active1" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active1Content }]"
+                :placeholder="lang[langType].active1Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active1"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -222,14 +222,14 @@
             </van-field>
 
             <!-- 共筑网络安全防线  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity2" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity2Content }]"
-                :placeholder="lang[langType].activity2Content">
+            <van-field size=“large” label-align="top" v-model="formData.active2" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active2Content }]"
+                :placeholder="lang[langType].active2Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active2"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active2"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -238,14 +238,14 @@
             </van-field>
 
             <!-- 共商人工智能发展治理  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity3" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity3Content }]"
-                :placeholder="lang[langType].activity3Content">
+            <van-field size=“large” label-align="top" v-model="formData.active3" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active3Content }]"
+                :placeholder="lang[langType].active3Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active3"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active3"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -260,17 +260,17 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity4">
+                        <van-cell clickable :title="lang[langType].active4">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity5">
+                        <van-cell clickable :title="lang[langType].active5">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity6">
+                        <van-cell clickable :title="lang[langType].active6">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
@@ -354,7 +354,7 @@
     </div>
 </template>
 <script setup>
-import { defineEmits, defineProps, reactive, ref, computed, defineExpose } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { showToast, showDialog } from 'vant';
 import { saveData, uploadImage } from '@/api/2025.js';
 import lang from './lang.js';
@@ -486,16 +486,16 @@ const onSubmit = () => {
     if (loading) return
     console.log('0')
     loading = true
-    const activity = {
+    const active = {
         active4: '否',
         active5: '否',
         active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
-        activity[item] = '是'
+        active[item] = '是'
     })
     saveData({
-        ...activity,
+        ...active,
         active1: formData.active1 || '否',
         active2: formData.active2 || '否',
         active3: formData.active3 || '否',

+ 25 - 25
src/view/fenghui/form1Recurrence.vue

@@ -206,14 +206,14 @@
             </van-field>
 
             <!-- 共享数字经济发展机遇  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity1" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity1Content }]"
-                :placeholder="lang[langType].activity1Content">
+            <van-field size=“large” label-align="top" v-model="formData.active1" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active1Content }]"
+                :placeholder="lang[langType].active1Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active1"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -222,14 +222,14 @@
             </van-field>
 
             <!-- 共筑网络安全防线  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity2" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity2Content }]"
-                :placeholder="lang[langType].activity2Content">
+            <van-field size=“large” label-align="top" v-model="formData.active2" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active2Content }]"
+                :placeholder="lang[langType].active2Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active2"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active2"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -238,14 +238,14 @@
             </van-field>
 
             <!-- 共商人工智能发展治理  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity3" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity3Content }]"
-                :placeholder="lang[langType].activity3Content">
+            <van-field size=“large” label-align="top" v-model="formData.active3" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active3Content }]"
+                :placeholder="lang[langType].active3Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active3"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active3"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -260,17 +260,17 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity4">
+                        <van-cell clickable :title="lang[langType].active4">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity5">
+                        <van-cell clickable :title="lang[langType].active5">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity6">
+                        <van-cell clickable :title="lang[langType].active6">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
@@ -353,7 +353,7 @@
     </div>
 </template>
 <script setup>
-import { defineEmits, defineProps, reactive, ref, computed, defineExpose } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { showToast, showDialog } from 'vant';
 import { editData, uploadImage } from '@/api/2025.js';
 import lang from './lang.js';
@@ -405,9 +405,9 @@ const initFormData = () => {
         departureTime: 'leavingTime', // 离开时间
         checkOutTime: 'checkOutTime', // 离店时间
         remarks: 'message', // 备注
-        active1: 'activity1', // 共筑网络安全防线
-        active2: 'activity2', // 共商人工智能发展治理
-        active3: 'activity3', // 共筑网络安全防线
+        active1: 'active1', // 共筑网络安全防线
+        active2: 'active2', // 共商人工智能发展治理
+        active3: 'active3', // 共筑网络安全防线
     }
     const subData = JSON.parse(JSON.stringify(props.subData))
     const keys = Object.keys(subData || {});
@@ -546,16 +546,16 @@ let loading = false
 const onSubmit = () => {
     if (loading) return
     loading = true
-    const activity = {
+    const active = {
         active4: '否',
         active5: '否',
         active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
-        activity[item] = '是'
+        active[item] = '是'
     })
     editData({
-        ...activity,
+        ...active,
         active1: formData.active1 || '否',
         active2: formData.active2 || '否',
         active3: formData.active3 || '否',

+ 1 - 1
src/view/fenghui/form2.vue

@@ -81,7 +81,7 @@
     </div>
 </template>
 <script setup>
-import { defineEmits, defineProps, reactive, ref, computed, defineExpose } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { showToast, showDialog } from 'vant';
 import { saveData, uploadImage } from '@/api/2025.js';
 import lang from './lang.js';

+ 1 - 1
src/view/fenghui/form2Recurrence.vue

@@ -81,7 +81,7 @@
     </div>
 </template>
 <script setup>
-import { defineEmits, defineProps, reactive, ref, computed, defineExpose } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { showToast, showDialog } from 'vant';
 import { editData, uploadImage } from '@/api/2025.js';
 import lang from './lang.js';

+ 26 - 26
src/view/fenghui/formRecurrence.vue

@@ -215,7 +215,7 @@
                     <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].interview"></span>
                 </template>
                 <template #input>
-                    <van-radio-group style="justify-content: flex-end;width: 100%;" v-model="formData.interview"
+                    <van-radio-group checked-color="#3F5AC8" style="justify-content: flex-end;width: 100%;" v-model="formData.interview"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -224,14 +224,14 @@
             </van-field>
 
             <!-- 共享数字经济发展机遇  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity1" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity1Content }]"
-                :placeholder="lang[langType].activity1Content">
+            <van-field size=“large” label-align="top" v-model="formData.active1" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active1Content }]"
+                :placeholder="lang[langType].active1Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active1"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -240,14 +240,14 @@
             </van-field>
 
             <!-- 共筑网络安全防线  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity2" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity2Content }]"
-                :placeholder="lang[langType].activity2Content">
+            <van-field size=“large” label-align="top" v-model="formData.active2" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active2Content }]"
+                :placeholder="lang[langType].active2Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active2"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active2"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -256,14 +256,14 @@
             </van-field>
 
             <!-- 共商人工智能发展治理  -->
-            <van-field size=“large” label-align="top" v-model="formData.activity3" required
-                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activity3Content }]"
-                :placeholder="lang[langType].activity3Content">
+            <van-field size=“large” label-align="top" v-model="formData.active3" required
+                :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active3Content }]"
+                :placeholder="lang[langType].active3Content">
                 <template #label>
-                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active3"></span>
                 </template>
                 <template #input>
-                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active3"
                         direction="horizontal">
                         <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm }}</van-radio>
                         <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel }}</van-radio>
@@ -278,17 +278,17 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity4">
+                        <van-cell clickable :title="lang[langType].active4">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity5">
+                        <van-cell clickable :title="lang[langType].active5">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity6">
+                        <van-cell clickable :title="lang[langType].active6">
                             <template #icon>
                                 <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
@@ -371,7 +371,7 @@
     </div>
 </template>
 <script setup>
-import { defineEmits, defineProps, reactive, ref, computed, defineExpose } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { showToast, showDialog } from 'vant';
 import { editData, uploadImage } from '@/api/2025.js';
 import lang from './lang.js';
@@ -427,9 +427,9 @@ const initFormData = () => {
         departureTime: 'leavingTime', // 离开时间
         checkOutTime: 'checkOutTime', // 离店时间
         remarks: 'message', // 备注
-        active1: 'activity1', // 共筑网络安全防线
-        active2: 'activity2', // 共商人工智能发展治理
-        active3: 'activity3', // 共筑网络安全防线
+        active1: 'active1', // 共筑网络安全防线
+        active2: 'active2', // 共商人工智能发展治理
+        active3: 'active3', // 共筑网络安全防线
     }
     const subData = JSON.parse(JSON.stringify(props.subData))
     const keys = Object.keys(subData || {});
@@ -559,16 +559,16 @@ let loading = false
 const onSubmit = () => {
     if (loading) return
     loading = true
-    const activity = {
+    const active = {
         active4: '否',
         active5: '否',
         active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
-        activity[item] = '是'
+        active[item] = '是'
     })
     editData({
-        ...activity,
+        ...active,
         active1: formData.active1 || '否',
         active2: formData.active2 || '否',
         active3: formData.active3 || '否',

+ 1 - 1
src/view/fenghui/index.js

@@ -13,7 +13,7 @@ window.weixin_Share_Init(
   window.$originData.orginParames.title || "",
   "",
   "https://cxzx.smcic.net/topic/tool/img/2025lm.png",
-  "https://cxzx.smcic.net/topic/activity/fenghui.html?" + Date.now()
+  "https://cxzx.smcic.net/topic/active/fenghui.html?" + Date.now()
 );
 
 var SL = new window.SmcicLogger("special", "c6124e08");

+ 1 - 1
src/view/fenghui/introduction.vue

@@ -215,7 +215,7 @@
     </div>
 </template>
 <script setup>
-import { defineProps, ref, defineEmits, reactive } from 'vue';
+import { ref, reactive } from 'vue';
 import { checkCode, getUserInfo } from '@/api/2025.js';
 import { showToast } from 'vant';
 import lang from './lang.js';

+ 17 - 17
src/view/fenghui/lang.js

@@ -1,22 +1,22 @@
 export default {
     "zh": {
-        "activity1": "5月15日 “共享数字经济发展机遇”分论坛",
-        "activity2": "5月15日“共筑网络安全防线”分论坛",
-        "activity3": "5月15日“共商人工智能发展治理”分论坛",
-        "activity4": "观看非遗科技展演《无界一长安》",
-        "activity5": "参观西安交大创新港、互联网企业‘易点天下’",
-        "activity6": "参观秦始皇兵马俑博物馆",
-        "activity1Content": "5月15日 “共享数字经济发展机遇”分论坛",
-        "activity2Content": "5月15日“共筑网络安全防线”分论坛",
-        "activity3Content": "5月15日“共商人工智能发展治理”分论坛",
+        "active1": "5月15日 “共享数字经济发展机遇”分论坛",
+        "active2": "5月15日“共筑网络安全防线”分论坛",
+        "active3": "5月15日“共商人工智能发展治理”分论坛",
+        "active4": "观看非遗科技展演《无界一长安》",
+        "active5": "参观西安交大创新港、互联网企业‘易点天下’",
+        "active6": "参观秦始皇兵马俑博物馆",
+        "active1Content": "5月15日 “共享数字经济发展机遇”分论坛",
+        "active2Content": "5月15日“共筑网络安全防线”分论坛",
+        "active3Content": "5月15日“共商人工智能发展治理”分论坛",
         "activitiesAttended": "拟参加的活动",
         "activitiesAttendedContent": "选择拟参加的活动",
         "username": "用户名",
         "password": "密码",
         "login": "登录",
         "tologoText": "已报名登陆通道",
-        "confirm": "同意",
-        "cancel": "取消",
+        "confirm": "",
+        "cancel": "",
         "verificationCode": "邀请码",
         "title": "中拉互联网发展与合作论坛",
         "verificationCodeError": "验证失败",
@@ -153,12 +153,12 @@ export default {
     },
     "en": {
         "upRegistration": "Registration information updated successfully",
-        "activity1": "May 15 sub Forum on 'Sharing Opportunities for the Digital Economy Development'",
-        "activity2": "May 15 sub Forum on 'Jointly Maintaining Safety in Cyberspace'",
-        "activity3": "On May 15, the sub forum of 'Jointly Promoting Artificial Intelligence Development and Governance'",
-        "activity1Content": "May 15 sub Forum on 'Sharing Opportunities for the Digital Economy Development'",
-        "activity2Content": "May 15 sub Forum on 'Jointly Maintaining Safety in Cyberspace'",
-        "activity3Content": "On May 15, the sub forum of 'Jointly Promoting Artificial Intelligence Development and Governance'",
+        "active1": "May 15 sub Forum on 'Sharing Opportunities for the Digital Economy Development'",
+        "active2": "May 15 sub Forum on 'Jointly Maintaining Safety in Cyberspace'",
+        "active3": "On May 15, the sub forum of 'Jointly Promoting Artificial Intelligence Development and Governance'",
+        "active1Content": "May 15 sub Forum on 'Sharing Opportunities for the Digital Economy Development'",
+        "active2Content": "May 15 sub Forum on 'Jointly Maintaining Safety in Cyberspace'",
+        "active3Content": "On May 15, the sub forum of 'Jointly Promoting Artificial Intelligence Development and Governance'",
         "activitiesAttended": "Activities to be attended",
         "activitiesAttendedContent": "Activities to be attended",
         "username": "Username",