提交

src/view/fenghui/form.vue

@@ -207,6 +207,7 @@
             </van-field>
 
             <div style="background-color: #F7F7F7;height: 10px;"></div>
+            
             <!-- 接受采访意向  -->
             <van-field size=“large” label-align="top" v-model="formData.interview" required
                 :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].interviewContent }]"
@@ -222,6 +223,54 @@
                     </van-radio-group>
                 </template>
             </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                        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>
+                    </van-radio-group>
+                </template>
+            </van-field>
 
             <!-- 拟参加的活动  -->
             <van-field size=“large” label-align="top" required
@@ -232,19 +281,19 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity1">
+                        <van-cell clickable :title="lang[langType].activity4">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active1" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity2">
+                        <van-cell clickable :title="lang[langType].activity5">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active2" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity3">
+                        <van-cell clickable :title="lang[langType].activity6">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active3" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
                         </van-cell>
                     </van-checkbox-group>
@@ -458,15 +507,18 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const activity = {
-        active1: '否',
-        active2: '否',
-        active3: '否'
+        active4: '否',
+        active5: '否',
+        active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
         activity[item] = '是'
     })
     saveData({
         ...activity,
+        active1: formData.active1 || '否',
+        active2: formData.active2 || '否',
+        active3: formData.active3 || '否',
         code: props.verificationCode, // 邀请码
         lastName: formData.lastName, // 姓
         firstName: formData.firstName, // 名

src/view/fenghui/form1.vue

@@ -204,6 +204,54 @@
                     </van-radio-group>
                 </template>
             </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                        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>
+                    </van-radio-group>
+                </template>
+            </van-field>
 
             <!-- 拟参加的活动  -->
             <van-field size=“large” label-align="top" required
@@ -214,22 +262,19 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity1">
+                        <van-cell clickable :title="lang[langType].activity4">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active1" @click.stop
-                                    shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity2">
+                        <van-cell clickable :title="lang[langType].activity5">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active2" @click.stop
-                                    shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity3">
+                        <van-cell clickable :title="lang[langType].activity6">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active3" @click.stop
-                                    shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
                         </van-cell>
                     </van-checkbox-group>
@@ -443,15 +488,18 @@ const onSubmit = () => {
     console.log('0')
     loading = true
     const activity = {
-        active1: '否',
-        active2: '否',
-        active3: '否'
+        active4: '否',
+        active5: '否',
+        active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
-        activity[item] = '是' 
+        activity[item] = '是'
     })
     saveData({
         ...activity,
+        active1: formData.active1 || '否',
+        active2: formData.active2 || '否',
+        active3: formData.active3 || '否',
         code: props.verificationCode, // 邀请码
         name: formData.name, // 姓名
         provinceCity: formData.provinceCity, // 省市区

src/view/fenghui/form1Recurrence.vue

@@ -204,7 +204,54 @@
                     </van-radio-group>
                 </template>
             </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                        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>
+                    </van-radio-group>
+                </template>
+            </van-field>
 
             <!-- 拟参加的活动  -->
             <van-field size=“large” label-align="top" required
@@ -215,24 +262,25 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity1">
+                        <van-cell clickable :title="lang[langType].activity4">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active1" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity2">
+                        <van-cell clickable :title="lang[langType].activity5">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active2" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity3">
+                        <van-cell clickable :title="lang[langType].activity6">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active3" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
                         </van-cell>
                     </van-checkbox-group>
                 </template>
             </van-field>
+
             <div style="background-color: #F7F7F7;height: 10px;"></div>
 
             <!--  抵达西安交通车次 -->
@@ -358,12 +406,15 @@ const initFormData = () => {
         departureTime: 'leavingTime', // 离开时间
         checkOutTime: 'checkOutTime', // 离店时间
         remarks: 'message', // 备注
+        active1: 'activity1', // 共筑网络安全防线
+        active2: 'activity2', // 共商人工智能发展治理
+        active3: 'activity3', // 共筑网络安全防线
     }
     const subData = JSON.parse(JSON.stringify(props.subData))
     const keys = Object.keys(subData || {});
-    subData.active1 === '是' && activitiesAttended.value.push('active1');
-    subData.active2 === '是' && activitiesAttended.value.push('active2');
-    subData.active3 === '是' && activitiesAttended.value.push('active3');
+    subData.active4 === '是' && activitiesAttended.value.push('active4');
+    subData.active5 === '是' && activitiesAttended.value.push('active5');
+    subData.active6 === '是' && activitiesAttended.value.push('active6');
     for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
         if (key === 'photo') {
@@ -497,15 +548,18 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const activity = {
-        active1: '否',
-        active2: '否',
-        active3: '否'
+        active4: '否',
+        active5: '否',
+        active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
         activity[item] = '是'
     })
     editData({
         ...activity,
+        active1: formData.active1 || '否',
+        active2: formData.active2 || '否',
+        active3: formData.active3 || '否',
         id: props.subData.id, // 人员id
         code: props.verificationCode, // 邀请码
         name: formData.name, // 姓名

src/view/fenghui/formRecurrence.vue

@@ -222,6 +222,54 @@
                     </van-radio-group>
                 </template>
             </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity1"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity1"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity2"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity2"
+                        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>
+                    </van-radio-group>
+                </template>
+            </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">
+                <template #label>
+                    <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].activity3"></span>
+                </template>
+                <template #input>
+                    <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.activity3"
+                        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>
+                    </van-radio-group>
+                </template>
+            </van-field>
 
             <!-- 拟参加的活动  -->
             <van-field size=“large” label-align="top" required
@@ -232,19 +280,19 @@
                 </template>
                 <template #input>
                     <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                        <van-cell clickable :title="lang[langType].activity1">
+                        <van-cell clickable :title="lang[langType].activity4">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active1" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active4" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity2">
+                        <van-cell clickable :title="lang[langType].activity5">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active2" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active5" @click.stop shape="square" />
                             </template>
                         </van-cell>
-                        <van-cell clickable :title="lang[langType].activity3">
+                        <van-cell clickable :title="lang[langType].activity6">
                             <template #icon>
-                                <van-checkbox style="margin-right: 5px;" name="active3" @click.stop shape="square" />
+                                <van-checkbox style="margin-right: 5px;" name="active6" @click.stop shape="square" />
                             </template>
                         </van-cell>
                     </van-checkbox-group>
@@ -380,12 +428,15 @@ const initFormData = () => {
         departureTime: 'leavingTime', // 离开时间
         checkOutTime: 'checkOutTime', // 离店时间
         remarks: 'message', // 备注
+        active1: 'activity1', // 共筑网络安全防线
+        active2: 'activity2', // 共商人工智能发展治理
+        active3: 'activity3', // 共筑网络安全防线
     }
     const subData = JSON.parse(JSON.stringify(props.subData))
     const keys = Object.keys(subData || {});
-    subData.active1 === '是' && activitiesAttended.value.push('active1');
-    subData.active2 === '是' && activitiesAttended.value.push('active2');
-    subData.active3 === '是' && activitiesAttended.value.push('active3');
+    subData.active4 === '是' && activitiesAttended.value.push('active4');
+    subData.active5 === '是' && activitiesAttended.value.push('active5');
+    subData.active6 === '是' && activitiesAttended.value.push('active6');
     for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
         if (key === 'photo') {
@@ -510,15 +561,18 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const activity = {
-        active1: '否',
-        active2: '否',
-        active3: '否'
+        active4: '否',
+        active5: '否',
+        active6: '否'
     }
     activitiesAttended.value.forEach((item) => {
         activity[item] = '是'
     })
     editData({
         ...activity,
+        active1: formData.active1 || '否',
+        active2: formData.active2 || '否',
+        active3: formData.active3 || '否',
         id: props.subData.id, // 人员id
         code: props.verificationCode, // 邀请码
         lastName: formData.lastName, // 姓

src/view/fenghui/index.vue

@@ -39,7 +39,7 @@ import Chin25Recurrence from './form1Recurrence.vue';
 import Work25Recurrence from './form2Recurrence.vue';
 import lang from './lang';
 const langSelect = ref(localStorage.getItem('langSelect') || 'zh');
-const componentId = ref('');
+const componentId = ref('fore25Recurrence');
 const verificationCode = ref('');
 const showLange = ref(false);
 const fore25 = ref(null); // 引入子组件的实例，用于调用子组件的方法
@@ -132,6 +132,10 @@ const langChange = ({ selectedValues }) => {
             -moz-text-align-last: justify;
             text-align-last: justify;
         }
+
+        .van-cell--“large” {
+            padding: 16px 20px;
+        }
     }
 }
 </style>

src/view/fenghui/lang.js

@@ -3,6 +3,12 @@ export default {
         "activity1": "5月15日 “共享数字经济发展机遇”分论坛",
         "activity2": "5月15日“共筑网络安全防线”分论坛",
         "activity3": "5月15日“共商人工智能发展治理”分论坛",
+        "activity4": "观看非遗科技展演《无界一长安》",
+        "activity5": "参观西安交大创新港、互联网企业‘易点天下’",
+        "activity6": "参观秦始皇兵马俑博物馆",
+        "activity1Content": "5月15日 “共享数字经济发展机遇”分论坛",
+        "activity2Content": "5月15日“共筑网络安全防线”分论坛",
+        "activity3Content": "5月15日“共商人工智能发展治理”分论坛",
         "activitiesAttended": "拟参加的活动",
         "activitiesAttendedContent": "选择拟参加的活动",
         "username": "用户名",
@@ -147,9 +153,12 @@ export default {
     },
     "en": {
         "upRegistration": "Registration information updated successfully",
-        "activity1": "May 15 sub Forum on 'sharing the development opportunities of digital economy'",
-        "activity2": "May 15 sub Forum on 'jointly building network security defense'",
-        "activity3": "On May 15, the sub forum of 'discussing the development and governance of artificial intelligence'",
+        "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'",
         "activitiesAttended": "Activities to be attended",
         "activitiesAttendedContent": "Activities to be attended",
         "username": "Username",