liyongli пре 1 дан
родитељ
комит
24bcb3a726

+ 56 - 28
src/view/fenghui/form.vue

@@ -255,9 +255,9 @@
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.interview"
                             direction="horizontal">
                             <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm
-                                }}</van-radio>
+                            }}</van-radio>
                             <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel
-                                }}</van-radio>
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -275,9 +275,9 @@
                         <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>
                             <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel
-                                }}</van-radio>
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -293,42 +293,53 @@
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
                             <van-radio style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇">{{ lang[langType].active1
-                                }}</van-radio>
+                            }}</van-radio>
                             <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
-                                }}</van-radio>
+                            }}</van-radio>
                             <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
-                                }}</van-radio>
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
 
                 <!-- 拟参加的活动  -->
-                <van-field size="large" label-align="top" :placeholder="lang[langType].activitiesAttendedContent">
+                <van-field size="large" label-align="top" v-model="formData.activitiesAttended"
+                    :placeholder="lang[langType].activitiesAttendedContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''"
                             v-html="lang[langType].activitiesAttended"></span>
                     </template>
                     <template #input>
-                        <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                            <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
-                                        name="active4" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                            <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
-                                        name="active5" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                            <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
+                        <div>
+                            <van-checkbox-group :border="false" ref="checkbox" checked-color="#3F5AC8"
+                                v-model="activitiesAttended" @change="isGroup">
+                                <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
+                                            name="active4" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
+                                            name="active5" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
+                                            name="active6" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                            </van-checkbox-group>
+                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde">
                                 <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
-                                        name="active6" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
+                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
                                 </template>
                             </van-cell>
-                        </van-checkbox-group>
+                        </div>
+
                     </template>
                 </van-field>
 
@@ -429,13 +440,28 @@ const showLeavingTime = ref(false)
 const showCheckOutTime = ref(false)
 const showUnitType = ref(false)
 const showCountryRegion = ref(false)
+const selectunde = ref(false)
 const photo = ref([]);
 const checkboxRefs = ref([]);
+const checkbox = ref(null);
 
 const onClickLeft = () => {
     emits('closeComponent');
 };
 
+const isGroup = (val) => {
+    if (val.length > 0) {
+        formData.activitiesAttended = val.join(',')
+        selectunde.value = false
+    }
+}
+const isUndefined = (val) => {
+    if (val) {
+        activitiesAttended.value = []
+        formData.activitiesAttended = 'undefined'
+    }
+}
+
 const reset = () => {
     form.value.resetValidation();
 }
@@ -551,9 +577,11 @@ const onSubmit = () => {
         active5: '否',
         active6: '否'
     }
-    activitiesAttended.value.forEach((item) => {
-        active[item] = '是'
-    })
+    if (!selectunde.value) {
+        activitiesAttended.value.forEach((item) => {
+            active[item] = '是'
+        })
+    }
     saveData({
         ...active,
         active1: formData.active1 || '否',

+ 49 - 21
src/view/fenghui/form1.vue

@@ -272,32 +272,43 @@
                 </van-field>
 
                 <!-- 拟参加的活动  -->
-                <!-- <van-field size="large" label-align="top" :placeholder="lang[langType].activitiesAttendedContent">
+                <!-- <van-field size="large" label-align="top" v-model="formData.activitiesAttended"
+                    :placeholder="lang[langType].activitiesAttendedContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''"
                             v-html="lang[langType].activitiesAttended"></span>
                     </template>
                     <template #input>
-                        <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                            <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                        <div>
+                            <van-checkbox-group :border="false" ref="checkbox" checked-color="#3F5AC8"
+                                v-model="activitiesAttended" @change="isGroup">
+                                <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
+                                            name="active4" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
+                                            name="active5" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
+                                            name="active6" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                            </van-checkbox-group>
+                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde">
                                 <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
-                                        name="active4" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
+                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
                                 </template>
                             </van-cell>
-                            <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
-                                        name="active5" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                            <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
-                                        name="active6" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                        </van-checkbox-group>
+                        </div>
+
                     </template>
                 </van-field> -->
 
@@ -397,15 +408,30 @@ const showReachTime = ref(false)
 const showUnitType = ref(false)
 const showLeavingTime = ref(false)
 const showCheckOutTime = ref(false)
+const selectunde = ref(false)
 const activitiesAttended = ref([])
 const form = ref(null);
 const photo = ref([]);
+// const checkbox = ref(null);
 // const checkboxRefs = ref([]);
 
 const reset = () => {
     form.value.resetValidation();
 }
 
+// const isGroup = (val) => {
+//     if (val.length > 0) {
+//         formData.activitiesAttended = val.join(',')
+//         selectunde.value = false
+//     }
+// }
+// const isUndefined = (val) => {
+//     if (val) {
+//         activitiesAttended.value = []
+//         formData.activitiesAttended = 'undefined'
+//     }
+// }
+
 const onClickLeft = () => {
     emits('closeComponent');
 };
@@ -517,9 +543,11 @@ const onSubmit = () => {
         active5: '否',
         active6: '否'
     }
-    activitiesAttended.value.forEach((item) => {
-        active[item] = '是'
-    })
+    if (!selectunde.value) {
+        activitiesAttended.value.forEach((item) => {
+            active[item] = '是'
+        })
+    }
     saveData({
         ...active,
         active1: formData.active1 || '否',

+ 50 - 21
src/view/fenghui/form1Recurrence.vue

@@ -273,35 +273,47 @@
                 </van-field>
 
                 <!-- 拟参加的活动  -->
-                <!-- <van-field size="large" label-align="top" :placeholder="lang[langType].activitiesAttendedContent">
+                <!-- <van-field size="large" label-align="top" v-model="formData.activitiesAttended"
+                    :placeholder="lang[langType].activitiesAttendedContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''"
                             v-html="lang[langType].activitiesAttended"></span>
                     </template>
                     <template #input>
-                        <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                            <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                        <div>
+                            <van-checkbox-group :border="false" ref="checkbox" checked-color="#3F5AC8"
+                                v-model="activitiesAttended" @change="isGroup">
+                                <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
+                                            name="active4" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
+                                            name="active5" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
+                                            name="active6" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                            </van-checkbox-group>
+                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde">
                                 <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
-                                        name="active4" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
+                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
                                 </template>
                             </van-cell>
-                            <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
-                                        name="active5" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                            <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
-                                        name="active6" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                        </van-checkbox-group>
+                        </div>
+
                     </template>
                 </van-field> -->
 
+
                 <div style="background-color: #F7F7F7;height: 10px;"></div>
 
                 <!--  抵达西安交通车次 -->
@@ -396,9 +408,11 @@ const showReachTime = ref(false)
 const showUnitType = ref(false)
 const showLeavingTime = ref(false)
 const showCheckOutTime = ref(false)
+const selectunde = ref(false)
 const form = ref(null);
 const activitiesAttended = ref([])
 const photo = ref([]);
+// const checkbox = ref(null);
 // const checkboxRefs = ref([]);
 
 /**
@@ -463,6 +477,19 @@ const reset = () => {
     form.value.resetValidation();
 }
 
+// const isGroup = (val) => {
+//     if (val.length > 0) {
+//         formData.activitiesAttended = val.join(',')
+//         selectunde.value = false
+//     }
+// }
+// const isUndefined = (val) => {
+//     if (val) {
+//         activitiesAttended.value = []
+//         formData.activitiesAttended = 'undefined'
+//     }
+// }
+
 const onClickLeft = () => {
     emits('closeComponent');
 };
@@ -574,9 +601,11 @@ const onSubmit = () => {
         active5: '否',
         active6: '否'
     }
-    activitiesAttended.value.forEach((item) => {
-        active[item] = '是'
-    })
+    if (!selectunde.value) {
+        activitiesAttended.value.forEach((item) => {
+            active[item] = '是'
+        })
+    }
     editData({
         ...active,
         active1: formData.active1 || '否',

+ 48 - 21
src/view/fenghui/formRecurrence.vue

@@ -301,32 +301,43 @@
                 </van-field>
 
                 <!-- 拟参加的活动  -->
-                <van-field size="large" label-align="top" :placeholder="lang[langType].activitiesAttendedContent">
+                <van-field size="large" label-align="top" v-model="formData.activitiesAttended"
+                    :placeholder="lang[langType].activitiesAttendedContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''"
                             v-html="lang[langType].activitiesAttended"></span>
                     </template>
                     <template #input>
-                        <van-checkbox-group checked-color="#3F5AC8" v-model="activitiesAttended">
-                            <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                        <div>
+                            <van-checkbox-group :border="false" ref="checkbox" checked-color="#3F5AC8"
+                                v-model="activitiesAttended" @change="isGroup">
+                                <van-cell clickable :title="lang[langType].active4" @click="checkboxRefs[0].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
+                                            name="active4" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
+                                            name="active5" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                                <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
+                                    <template #icon>
+                                        <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
+                                            name="active6" @click.stop shape="square" />
+                                    </template>
+                                </van-cell>
+                            </van-checkbox-group>
+                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde">
                                 <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[0] = el" style="margin-right: 5px;"
-                                        name="active4" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
+                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
                                 </template>
                             </van-cell>
-                            <van-cell clickable :title="lang[langType].active5" @click="checkboxRefs[1].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[1] = el" style="margin-right: 5px;"
-                                        name="active5" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                            <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
-                                <template #icon>
-                                    <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
-                                        name="active6" @click.stop shape="square" />
-                                </template>
-                            </van-cell>
-                        </van-checkbox-group>
+                        </div>
+
                     </template>
                 </van-field>
 
@@ -425,15 +436,29 @@ const showReachTime = ref(false)
 const showLeavingTime = ref(false)
 const showCheckOutTime = ref(false)
 const showUnitType = ref(false)
+const selectunde = ref(false)
 const showCountryRegion = ref(false)
 const activitiesAttended = ref([])
 const photo = ref([]);
 const checkboxRefs = ref([]);
+const checkbox = ref(null);
 
 const onClickLeft = () => {
     emits('closeComponent');
 };
 
+const isGroup = (val) => {
+    if (val.length > 0) {
+        formData.activitiesAttended = val.join(',')
+        selectunde.value = false
+    }
+}
+const isUndefined = (val) => {
+    if (val) {
+        activitiesAttended.value = []
+        formData.activitiesAttended = 'undefined'
+    }
+}
 /**
  * 将subData数据转换为formData
  */
@@ -609,9 +634,11 @@ const onSubmit = () => {
         active5: '否',
         active6: '否'
     }
-    activitiesAttended.value.forEach((item) => {
-        active[item] = '是'
-    })
+    if (!selectunde.value) {
+        activitiesAttended.value.forEach((item) => {
+            active[item] = '是'
+        })
+    }
     editData({
         ...active,
         active1: formData.active1 || '否',

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

@@ -186,7 +186,7 @@
 
         <p class="tologo" v-html="lang[langType].tologoText + '>>'" @click="showLogin = true"></p>
         <p class="tologo" style="margin-top: 1em;margin-bottom: 1em;font-size: 0.9rem;color: rgba(255,255,255,0.8)">
-            {{lang[langType].technicalAdvice}} <a href="tel:18502918086" style="color: #fff;">18502918086</a>
+            {{lang[langType].technicalAdvice}}
         </p>
         
         <!-- 邀请码校验 -->

+ 10 - 9
src/view/fenghui/lang.js

@@ -1,6 +1,6 @@
 export default {
     "zh": {
-        "technicalAdvice": "技术咨询:",
+        "technicalAdvice": "技术咨询:18502918086",
         "identityType": "身份类别",
         "identityTypeContent": "身份类别",
         "media": "媒体",
@@ -198,7 +198,7 @@ export default {
         ],
     },
     "en": {
-        "technicalAdvice": "Technical Advice",
+        "technicalAdvice": "Technical Support:18502918086,15809218541",
         "level": "Position Level",
         "levelContent": "Position Level",
         "identityType": "Identity category",
@@ -235,7 +235,7 @@ export default {
         "wrestleMania": "Date",
         "wrestleManiaContent": "May 15 - 16, 2025",
         "venue": "Venue",
-        "venueContent": "Xi'an International Convention Center<br />(No. 2626, Expo Avenue, Chanba Ecological Area, Baqiao District, Xi'an City)",
+        "venueContent": "Xian International Convention Center<br />(No. 2626, Expo Avenue, Chanba Ecological Area, Baqiao District, Xian City)",
         "marst": "Forum Theme",
         "marstContent": "Sharing Digital Development Opportunities<br />Jointly Building a Community with a Shared Future for China-CELAC in Cyberspace",
         "organization": "Organizer",
@@ -412,8 +412,9 @@ export default {
         "active2": "Subforo II: Colaborar en el mantenimiento la seguridad en el ciberespacio",
         "active3": "Subforo III: Promover conjuntamente el desarrollo y la gobernanza de la inteligencia artificial",
         "active4": "Ver OMNI Chang'An(el primer teatro conceptual de China)",
-        "active5": "Visitar el Puerto de Innovacion Tecnologica Occidental en la Universidad Jiaotong de Xi'an y eclicktech(una empresa basada en Internet)",
+        "active5": "Visitar el Puerto de Innovacion Tecnologica Occidental en la Universidad Jiaotong de Xian y eclicktech(una empresa basada en Internet)",
         "active6": "Visitar el Museo del Mausoleo del Emperador Qinshihuang",
+        "active7": "不参加",
         "active1Content": "Subforo I: Compartir oportunidades para el desarrollo de la economia digital",
         "activitiesAttended": "Actividades a las que asistirá",
         "activitiesAttendedContent": "Seleccione las actividades a las que asistirá",
@@ -433,7 +434,7 @@ export default {
         "wrestleMania": "Fecha de celebración",
         "wrestleManiaContent": "los dias 15 y 16 de mayo de 2025",
         "venue": "Lugar de celebración",
-        "venueContent": "Centro Internacional de Conferencias de Xi'an<br />(No. 2626, Avenida Expo, Area Ecologica de Chanba, Distrito de Baqiao, Ciudad de Xi'an)",
+        "venueContent": "Centro Internacional de Conferencias de Xi’an<br />(No. 2626, Avenida Expo, Area Ecologica de Chanba, Distrito de Baqiao, Ciudad de Xi’an)",
         "marst": "Tema del foro",
         "marstContent": "Compartir las nuevas oportunidades de desarrollo digital<br />Construir conjuntamente una comunidad de destino compartido en el ciberespacio para China-CELAC",
         "organization": "Organización",
@@ -507,12 +508,12 @@ export default {
         "emergencyContactPhoneContent": "Teléfono",
         "interview": "Acepta entrevistas",
         "interviewContent": "Seleccione si acepta entrevistas",
-        "reach": "Medio de llegada a Xi'an",
-        "reachContent": "Ingrese medio de transporte a Xi'an",
+        "reach": "Medio de llegada a Xian",
+        "reachContent": "Ingrese medio de transporte a Xian",
         "reachTrainNumber": "Tren/Vuelo de llegada",
         "reachTrainNumberContent": "Ingrese tren/vuelo/matrícula de llegada",
-        "reachTime": "Hora de llegada a Xi'an",
-        "reachTimeContent": "Ingrese hora de llegada a Xi'an",
+        "reachTime": "Hora de llegada a Xian",
+        "reachTimeContent": "Ingrese hora de llegada a Xian",
         "leavingTrainNumber": "Tren/Vuelo de salida",
         "leavingTrainNumberContent": "Ingrese tren/vuelo/matrícula de salida",
         "leavingTime": "Hora de partida",