lingdu 4 päivää sitten
vanhempi
commit
ad8bf1a8bf

+ 27 - 30
src/view/fenghui/form.vue

@@ -13,13 +13,20 @@
         <div class="form">
             <van-form ref="form" @submit="onSubmit" label-width="8em">
                 <!-- 国家/地区 -->
-                <van-field size="large" input-align="right"
+                <van-field size="large" input-align="right" clickable readonly
+                    @click="showCountryRegion = true" right-icon="arrow"
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].countryRegionContent }]"
                     required v-model="formData.countryRegion" :placeholder="lang[langType].countryRegionContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].countryRegion"></span>
                     </template>
                 </van-field>
+                <van-popup v-model:show="showCountryRegion" destroy-on-close round position="bottom">
+                    <van-picker :confirm-button-text="lang[langType].confirm"
+                        :columns="lang[langType].countryRegionList" :cancel-button-text="lang[langType].cancel"
+                        @confirm="countryRegionConfirm" :title="lang[langType].countryRegion"
+                        @cancel="showCountryRegion = false" />
+                </van-popup>
 
                 <!-- 姓 -->
                 <van-field size="large" input-align="right"
@@ -251,12 +258,13 @@
                 </van-field>
 
                 <div style="background-color: #F7F7F7;height: 10px;"></div>
-                <!-- 共享数字经济发展机遇  -->
+
+                <!-- 是否参加开幕式 active0  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active0Content }]"
+                    :placeholder="lang[langType].active0Content">
                     <template #label>
-                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active0"></span>
                     </template>
                     <template #input>
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active1"
@@ -269,37 +277,21 @@
                     </template>
                 </van-field>
 
-                <!-- 共筑网络安全防线  -->
+                <!-- 选择分论坛  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
+                    :placeholder="lang[langType].activeContent">
                     <template #label>
-                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active2"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <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-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 style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel
+                            <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
                                 }}</van-radio>
-                        </van-radio-group>
-                    </template>
-                </van-field>
-
-                <!-- 共商人工智能发展治理  -->
-                <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].active3"></span>
-                    </template>
-                    <template #input>
-                        <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 style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
                                 }}</van-radio>
                         </van-radio-group>
                     </template>
@@ -431,6 +423,7 @@ const showReachTime = ref(false)
 const showLeavingTime = ref(false)
 const showCheckOutTime = ref(false)
 const showUnitType = ref(false)
+const showCountryRegion = ref(false)
 const photo = ref([]);
 const checkboxRefs = ref([]);
 
@@ -463,6 +456,10 @@ const onUnitTypeConfirm = (values) => {
     formData.unitType = values.selectedOptions[0].value;
     formData.unitTypeName = values.selectedOptions[0].text;
 }
+const countryRegionConfirm = (values) => {
+    showCountryRegion.value = false;
+    formData.countryRegion = values.selectedOptions[0].value;
+}
 
 // 上传
 const beforeDelete = (index) => {

+ 20 - 39
src/view/fenghui/form1.vue

@@ -223,67 +223,48 @@
                         <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>
                             <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel
-                                }}</van-radio>
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
                 <div style="background-color: #F7F7F7;height: 10px;"></div>
 
-                <!-- 共享数字经济发展机遇  -->
+                <!-- 是否参加开幕式 active0  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active0Content }]"
+                    :placeholder="lang[langType].active0Content">
                     <template #label>
-                        <span style="text-align-last: left" :class="langType === 'zh' ? 'label' : ''"
-                            v-html="lang[langType].active1"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active0"></span>
                     </template>
                     <template #input>
                         <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>
 
-                <!-- 共筑网络安全防线  -->
+                <!-- 选择分论坛  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
+                    :placeholder="lang[langType].activeContent">
                     <template #label>
-                        <span style="text-align-last: left" :class="langType === 'zh' ? 'label' : ''"
-                            v-html="lang[langType].active2"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <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>
-                        </van-radio-group>
-                    </template>
-                </van-field>
-
-                <!-- 共商人工智能发展治理  -->
-                <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 style="text-align-last: left" :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.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>
+                        <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 style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
+                            }}</van-radio>
+                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>

+ 18 - 34
src/view/fenghui/form1Recurrence.vue

@@ -232,56 +232,40 @@
                 </van-field>
                 <div style="background-color: #F7F7F7;height: 10px;"></div>
 
-                <!-- 共享数字经济发展机遇  -->
+                <!-- 是否参加开幕式 active0  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active0Content }]"
+                    :placeholder="lang[langType].active0Content">
                     <template #label>
-                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active0"></span>
                     </template>
                     <template #input>
                         <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>
 
-                <!-- 共筑网络安全防线  -->
+                <!-- 选择分论坛  -->
                 <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].active2"></span>
-                    </template>
-                    <template #input>
-                        <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>
-                        </van-radio-group>
-                    </template>
-                </van-field>
-
-                <!-- 共商人工智能发展治理  -->
-                <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
+                    :placeholder="lang[langType].activeContent">
                     <template #label>
-                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active3"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <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>
+                        <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 style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
+                                }}</van-radio>
+                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
+                                }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>

+ 30 - 35
src/view/fenghui/formRecurrence.vue

@@ -12,13 +12,18 @@
         <div class="form">
             <van-form ref="form" @submit="onSubmit" label-width="8em">
                 <!-- 国家/地区 -->
-                <van-field size="large" input-align="right"
+                <van-field size="large" input-align="right" clickable right-icon="arrow" readonly @click="showCountryRegion = true"
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].countryRegionContent }]"
                     required v-model="formData.countryRegion" :placeholder="lang[langType].countryRegionContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].countryRegion"></span>
                     </template>
                 </van-field>
+                <van-popup v-model:show="showCountryRegion" destroy-on-close round position="bottom">
+                    <van-picker :confirm-button-text="lang[langType].confirm" :columns="lang[langType].countryRegionList"
+                        :cancel-button-text="lang[langType].cancel" @confirm="countryRegionConfirm"
+                        :title="lang[langType].countryRegion" @cancel="showCountryRegion = false" />
+                </van-popup>
 
                 <!-- 姓 -->
                 <van-field size="large" input-align="right"
@@ -249,56 +254,41 @@
                 </van-field>
 
                 <div style="background-color: #F7F7F7;height: 10px;"></div>
-                <!-- 共享数字经济发展机遇  -->
+                
+                <!-- 是否参加开幕式 active0  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].active0Content }]"
+                    :placeholder="lang[langType].active0Content">
                     <template #label>
-                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active1"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active0"></span>
                     </template>
                     <template #input>
                         <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>
 
-                <!-- 共筑网络安全防线  -->
+                <!-- 选择分论坛  -->
                 <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">
+                    :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
+                    :placeholder="lang[langType].activeContent">
                     <template #label>
-                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active2"></span>
+                        <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <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>
-                        </van-radio-group>
-                    </template>
-                </van-field>
-
-                <!-- 共商人工智能发展治理  -->
-                <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].active3"></span>
-                    </template>
-                    <template #input>
-                        <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>
+                        <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 style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
+                                }}</van-radio>
+                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
+                                }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -428,6 +418,7 @@ const showReachTime = ref(false)
 const showLeavingTime = ref(false)
 const showCheckOutTime = ref(false)
 const showUnitType = ref(false)
+const showCountryRegion = ref(false)
 const activitiesAttended = ref([])
 const photo = ref([]);
 const checkboxRefs = ref([]);
@@ -521,6 +512,10 @@ const onUnitTypeConfirm = (values) => {
     formData.unitType = values.selectedOptions[0].value;
     formData.unitTypeName = values.selectedOptions[0].text;
 }
+const countryRegionConfirm = (values) => {
+    showCountryRegion.value = false;
+    formData.countryRegion = values.selectedOptions[0].value;
+}
 
 // 上传
 const beforeDelete = (index) => {

+ 130 - 24
src/view/fenghui/lang.js

@@ -5,15 +5,15 @@ export default {
         "media": "媒体",
         "staff": "工作人员",
         "volunteer": "志愿者",
-        "active1": "是否参加5月15日 “共享数字经济发展机遇”分论坛",
-        "active2": "是否参加5月15日“共筑网络安全防线”分论坛",
-        "active3": "是否参加5月15日“共商人工智能发展治理”分论坛",
+        "active0": "是否参加5月15日开幕式(上午)",
+        "active": "选择分论坛",
+        "active1": "共享数字经济发展机遇",
+        "active2": "共同维护网络空间安全",
+        "active3": "共商人工智能发展治理",
         "active4": "观看非遗科技展演《无界一长安》",
         "active5": "参观西安交大创新港、互联网企业‘易点天下’",
         "active6": "参观秦始皇兵马俑博物馆",
-        "active1Content": "是否参加5月15日 “共享数字经济发展机遇”分论坛",
-        "active2Content": "是否参加5月15日“共筑网络安全防线”分论坛",
-        "active3Content": "是否参加5月15日“共商人工智能发展治理”分论坛",
+        "active0Content": "是否参加5月15日开幕式(上午)",
         "activitiesAttended": "拟参加的活动",
         "activitiesAttendedContent": "选择拟参加的活动",
         "username": "用户名",
@@ -162,7 +162,42 @@ export default {
             { text: '综合保障组-报名通道维护', value: '综合保障组-报名通道维护' },
             { text: '综合保障组-志愿者', value: '综合保障组-志愿者' },
             { text: '综合保障组-其他', value: '综合保障组-其他' },
-        ]
+        ],
+        "countryRegionList": [
+            { text: '安提瓜和巴布达', value: '安提瓜和巴布达' },
+            { text: '阿根廷', value: '阿根廷' },
+            { text: '阿根廷', value: '阿根廷' },
+            { text: '巴巴多斯', value: '巴巴多斯' },
+            { text: '伯利兹', value: '伯利兹' },
+            { text: '玻利维亚', value: '玻利维亚' },
+            { text: "巴西", "value": "巴西" },
+            { "text": "智利", "value": "智利" },
+            { "text": "哥伦比亚", "value": "哥伦比亚" },
+            { "text": "哥斯达黎加", "value": "哥斯达黎加" },
+            { "text": "古巴", "value": "古巴" },
+            { "text": "多米尼加", "value": "多米尼加" },
+            { "text": "多米尼克", "value": "多米尼克" },
+            { "text": "厄瓜多尔", "value": "厄瓜多尔" },
+            { "text": "萨尔瓦多", "value": "萨尔瓦多" },
+            { "text": "格林纳达", "value": "格林纳达" },
+            { "text": "危地马拉", "value": "危地马拉" },
+            { "text": "圭亚那", "value": "圭亚那" },
+            { "text": "海地", "value": "海地" },
+            { "text": "洪都拉斯", "value": "洪都拉斯" },
+            { "text": "牙买加", "value": "牙买加" },
+            { "text": "墨西哥", "value": "墨西哥" },
+            { "text": "尼加拉瓜", "value": "尼加拉瓜" },
+            { "text": "巴拿马", "value": "巴拿马" },
+            { "text": "巴拉圭", "value": "巴拉圭" },
+            { "text": "秘鲁", "value": "秘鲁" },
+            { "text": "圣卢西亚", "value": "圣卢西亚" },
+            { "text": "圣基茨和尼维斯", "value": "圣基茨和尼维斯" },
+            { "text": "圣文森特和格林纳丁斯", "value": "圣文森特和格林纳丁斯" },
+            { "text": "苏里南", "value": "苏里南" },
+            { "text": "特立尼达和多巴哥", "value": "特立尼达和多巴哥" },
+            { "text": "乌拉圭", "value": "乌拉圭" },
+            { "text": "委内瑞拉", "value": "委内瑞拉" }
+        ],
     },
     "en": {
         "identityType": "Identity category",
@@ -171,15 +206,15 @@ export default {
         "staff": "For Chinese staff",
         "volunteer": "For Chinese volunteer",
         "upRegistration": "Registration information updated successfully",
-        "active1": "Willingness to attend the sub-forum on sharing opportunities for the digital economy development on May 15",
-        "active2": "Willingness to attend the sub-forum on jointly maintaining safety in cyberspace on May 15",
-        "active3": "Willingness to attend the sub-forum on jointly promoting artificial intelligence development and governance on May",
-        "active4": "Watch OMNI Chang'An (China's First Ever Site-specific Conceptual Theatre)",
-        "active5": "Visit the Western Technological Innovation Port in Xi'an Jiaotong University and eclicktech (an internet-based company)",
-        "active6": "Visit the Emperor Qinshihuang's Mausoleum Site Museum",
-        "active1Content": "Willingness to attend the sub-forum on sharing opportunities for the digital economy development on May 15",
-        "active2Content": "Willingness to attend the sub-forum on jointly maintaining safety in cyberspace on May 15",
-        "active3Content": "Willingness to attend the sub-forum on jointly promoting artificial intelligence development and governance on May",
+        "active0": "Will you attend the opening ceremony on the morning of May 15th",
+        "active": "选择分论坛",
+        "active0Content": "Will you attend the opening ceremony on the morning of May 15th",
+        "active1": "Sharing Opportunities for the Digital Economy Development",
+        "active2": "Jointly Maintaining Safety in Cyberspace ",
+        "active3": "Jointly Promoting Artificial Intelligence Development and Governance",
+        "active4": "Please indicate which of the following activities on May 16th you will attend (multiple selections allowed): Watch OMNI Chang’An (China’s First Ever Site-specific Conceptual Theatre)",
+        "active5": "Visit the Western Technological Innovation Port in Xi’an Jiaotong University and eclicktech, an internet-based company",
+        "active6": "Visit the Emperor Qinshihuang’s Mausoleum Site Museum Will not attend",
         "activitiesAttended": "Please indicate which of the following activities on May 16 you will attend (multiple selections allowed)",
         "activitiesAttendedContent": "Activities to be attended",
         "username": "Username",
@@ -326,7 +361,42 @@ export default {
             { "text": "Comprehensive Support Group - Volunteer", "value": "综合保障组-志愿者" },
             { "text": "Foreign Affairs Group", "value": "外事组" },
             { "text": "Comprehensive Support Group - Others", "value": "综合保障组-其他" }
-        ]
+        ],
+        "countryRegionList": [
+            { "text": "Antigua and Barbuda", "value": "安提瓜和巴布达" },
+            { "text": "Argentina", "value": "阿根廷" },
+            { "text": "The Bahamas", "value": "巴哈马" },
+            { "text": "Barbados", "value": "巴巴多斯" },
+            { "text": "Belize", "value": "伯利兹" },
+            { "text": "Bolivia", "value": "玻利维亚" },
+            { "text": "Brazil", "value": "巴西" },
+            { "text": "Chile", "value": "智利" },
+            { "text": "Colombia", "value": "哥伦比亚" },
+            { "text": "Costa Rica", "value": "哥斯达黎加" },
+            { "text": "Cuba", "value": "古巴" },
+            { "text": "Dominican Republic", "value": "多米尼加" },
+            { "text": "Dominica", "value": "多米尼克" },
+            { "text": "Ecuador", "value": "厄瓜多尔" },
+            { "text": "El Salvador", "value": "萨尔瓦多" },
+            { "text": "Grenada", "value": "格林纳达" },
+            { "text": "Guatemala", "value": "危地马拉" },
+            { "text": "Guyana", "value": "圭亚那" },
+            { "text": "Haiti", "value": "海地" },
+            { "text": "Honduras", "value": "洪都拉斯" },
+            { "text": "Jamaica", "value": "牙买加" },
+            { "text": "Mexico", "value": "墨西哥" },
+            { "text": "Nicaragua", "value": "尼加拉瓜" },
+            { "text": "Panama", "value": "巴拿马" },
+            { "text": "Paraguay", "value": "巴拉圭" },
+            { "text": "Peru", "value": "秘鲁" },
+            { "text": "Saint Lucia", "value": "圣卢西亚" },
+            { "text": "Kitts and Nevis", "value": "圣基茨和尼维斯" },
+            { "text": "Saint Vincent and the Grenadines", "value": "圣文森特和格林纳丁斯" },
+            { "text": "Suriname", "value": "苏里南" },
+            { "text": "Trinidad and Tobago", "value": "特立尼达和多巴哥" },
+            { "text": "Uruguay", "value": "乌拉圭" },
+            { "text": "Venezuela", "value": "委内瑞拉" }
+        ],
     },
     "es": {
         "identityType": "Categoría de identidad",
@@ -334,6 +404,9 @@ export default {
         "media": "Medios de comunicación",
         "staff": "Funcionarios",
         "volunteer": "Voluntarios",
+        "active0": "¿Asistirás a la ceremonia de inauguración en la mañana del 15 de mayo?",
+        "active": "¿A cuál de las siguientes actividades asistirás el 16 de mayo?",
+        "active0Content": "¿Asistirás a la ceremonia de inauguración en la mañana del 15 de mayo?",
         "active1": "Subforo I: Compartir oportunidades para el desarrollo de la economia digital",
         "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",
@@ -341,8 +414,6 @@ export default {
         "active5": "Visitar el Puerto de Innovacion Tecnologica Occidental en la Universidad Jiaotong de Xi'an y eclicktech(una empresa basada en Internet)",
         "active6": "Visitar el Museo del Mausoleo del Emperador Qinshihuang",
         "active1Content": "Subforo I: Compartir oportunidades para el desarrollo de la economia digital",
-        "active2Content": "Subforo II: Colaborar en el mantenimiento la seguridad en el ciberespacio",
-        "active3Content": "Subforo III: Promover conjuntamente el desarrollo y la gobernanza de la inteligencia artificial",
         "activitiesAttended": "Actividades a las que asistirá",
         "activitiesAttendedContent": "Seleccione las actividades a las que asistirá",
         "username": "Nombre de usuario",
@@ -448,10 +519,10 @@ export default {
         "checkOutTime": "Hora de salida del hotel",
         "checkOutTimeContent": "Ingrese hora de salida del hotel",
         "careerList": [
-            { text: '正部', value: '正部' },
-            { text: '副部', value: '副部' },
-            { text: '司局', value: '司局' },
-            { text: '其他', value: '其他' },
+            { text: 'Nivel Provincial-Ministerial', value: '正部' },
+            { text: 'Nivel Subprovincial (ministerial)', value: '副部' },
+            { text: 'Nivel de Director de Buró/ Nivel de Director Adjunto de Buró', value: '司局' },
+            { text: 'Otros', value: '其他' },
         ],
         "cardTypeList": [
             // { "text": "Documento de identidad", "value": "身份证" },
@@ -489,6 +560,41 @@ export default {
             { "text": "Equipo de Apoyo Integral- Mantenimiento del Sistema de Registro", "value": "综合保障组-报名通道维护" },
             { "text": "Equipo de Apoyo Integral- Voluntarios", "value": "综合保障组-志愿者" },
             { "text": "Equipo de Apoyo Integral-Otros", "value": "综合保障组-其他" }
-        ]
+        ],
+        "countryRegionList": [
+            { "text": "Antigua y Barbuda", "value": "安提瓜和巴布达" },
+            { "text": "Argentina", "value": "阿根廷" },
+            { "text": "Bahamas", "value": "巴哈马" },
+            { "text": "Barbados", "value": "巴巴多斯" },
+            { "text": "Belice", "value": "伯利兹" },
+            { "text": "Bolivia", "value": "玻利维亚" },
+            { "text": "Brasil", "value": "巴西" },
+            { "text": "Chile", "value": "智利" },
+            { "text": "Colombia", "value": "哥伦比亚" },
+            { "text": "Costa Rica", "value": "哥斯达黎加" },
+            { "text": "Cuba", "value": "古巴" },
+            { "text": "República Dominicana", "value": "多米尼加" },
+            { "text": "Dominica", "value": "多米尼克" },
+            { "text": "Ecuador", "value": "厄瓜多尔" },
+            { "text": "El Salvador", "value": "萨尔瓦多" },
+            { "text": "Granada", "value": "格林纳达" },
+            { "text": "Guatemala", "value": "危地马拉" },
+            { "text": "Guyana", "value": "圭亚那" },
+            { "text": "Haití", "value": "海地" },
+            { "text": "Honduras", "value": "洪都拉斯" },
+            { "text": "Jamaica", "value": "牙买加" },
+            { "text": "México", "value": "墨西哥" },
+            { "text": "Nicaragua", "value": "尼加拉瓜" },
+            { "text": "Panamá", "value": "巴拿马" },
+            { "text": "Paraguay", "value": "巴拉圭" },
+            { "text": "Perú", "value": "秘鲁" },
+            { "text": "Santa Lucía", "value": "圣卢西亚" },
+            { "text": "San Cristóbal y Nieves", "value": "圣基茨和尼维斯" },
+            { "text": "San Vicente y las Granadinas", "value": "圣文森特和格林纳丁斯" },
+            { "text": "Surinam", "value": "苏里南" },
+            { "text": "Trinidad y Tobago", "value": "特立尼达和多巴哥" },
+            { "text": "Uruguay", "value": "乌拉圭" },
+            { "text": "Venezuela", "value": "委内瑞拉" }
+        ],
     }
 }