提交

src/view/fenghui/form.vue

@@ -52,7 +52,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showBirthday" destroy-on-close round position="bottom">
-                <van-date-picker @confirm="packerConfirm" :title="lang[langType].birthday"
+                <van-date-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" @confirm="packerConfirm" :title="lang[langType].birthday"
                     @cancel="showBirthday = false" :min-date="new Date(1970, 0, 1)" :max-date="new Date()" />
             </van-popup>
 
@@ -118,7 +118,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showCardType" destroy-on-close round position="bottom">
-                <van-picker :model-value="formData.cardType" :columns="cardTypeList" @cancel="showCardType = false"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :model-value="formData.cardType" :columns="cardTypeList" @cancel="showCardType = false"
                     @confirm="onConfirm" />
             </van-popup>
 
@@ -170,7 +170,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showUnitType" destroy-on-close round position="bottom">
-                <van-picker :model-value="formData.unitType" :columns="unitTypeList" @cancel="showUnitType = false"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :model-value="formData.unitType" :columns="unitTypeList" @cancel="showUnitType = false"
                     @confirm="onUnitTypeConfirm" />
             </van-popup>
 
@@ -236,7 +236,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showReachTime" destroy-on-close round position="bottom">
-                <van-picker :title="lang[langType].reachTime" :columns="dateTimeColumns" @confirm="reachTimeConfirm"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :title="lang[langType].reachTime" :columns="dateTimeColumns" @confirm="reachTimeConfirm"
                     @cancel="showReachTime = false" />
             </van-popup>
 
@@ -256,7 +256,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showLeavingTime" destroy-on-close round position="bottom">
-                <van-picker :title="lang[langType].leavingTime" :columns="dateTimeColumns" @confirm="leavingTimeConfirm"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :title="lang[langType].leavingTime" :columns="dateTimeColumns" @confirm="leavingTimeConfirm"
                     @cancel="showLeavingTime = false" />
             </van-popup>
 
@@ -268,7 +268,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showCheckOutTime" destroy-on-close round position="bottom">
-                <van-picker :title="lang[langType].checkOutTime" :columns="dateTimeColumns"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :title="lang[langType].checkOutTime" :columns="dateTimeColumns"
                     @confirm="checkOutTimeConfirm" @cancel="showCheckOutTime = false" />
             </van-popup>
 

src/view/fenghui/form1.vue

@@ -44,7 +44,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showBirthday" destroy-on-close round position="bottom">
-                <van-date-picker @confirm="packerConfirm" :title="lang[langType].birthday"
+                <van-date-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" @confirm="packerConfirm" :title="lang[langType].birthday"
                     @cancel="showBirthday = false" :min-date="new Date(1970, 0, 1)" :max-date="new Date()" />
             </van-popup>
 
@@ -110,7 +110,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showCardType" destroy-on-close round position="bottom">
-                <van-picker :model-value="formData.cardType" :columns="cardTypeList" @cancel="showCardType = false"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :model-value="formData.cardType" :columns="cardTypeList" @cancel="showCardType = false"
                     @confirm="onConfirm" />
             </van-popup>
 
@@ -153,7 +153,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showUnitType" destroy-on-close round position="bottom">
-                <van-picker :model-value="formData.unitType" :columns="unitTypeList" @cancel="showUnitType = false"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :model-value="formData.unitType" :columns="unitTypeList" @cancel="showUnitType = false"
                     @confirm="onUnitTypeConfirm" />
             </van-popup>
 
@@ -219,7 +219,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showReachTime" destroy-on-close round position="bottom">
-                <van-picker :title="lang[langType].reachTime" :columns="dateTimeColumns" @confirm="reachTimeConfirm"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :title="lang[langType].reachTime" :columns="dateTimeColumns" @confirm="reachTimeConfirm"
                     @cancel="showReachTime = false" />
             </van-popup>
 
@@ -239,7 +239,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showLeavingTime" destroy-on-close round position="bottom">
-                <van-picker :title="lang[langType].leavingTime" :columns="dateTimeColumns" @confirm="leavingTimeConfirm"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :title="lang[langType].leavingTime" :columns="dateTimeColumns" @confirm="leavingTimeConfirm"
                     @cancel="showLeavingTime = false" />
             </van-popup>
 
@@ -251,7 +251,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showCheckOutTime" destroy-on-close round position="bottom">
-                <van-picker :title="lang[langType].checkOutTime" :columns="dateTimeColumns"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :title="lang[langType].checkOutTime" :columns="dateTimeColumns"
                     @confirm="checkOutTimeConfirm" @cancel="showCheckOutTime = false" />
             </van-popup>
 

src/view/fenghui/form2.vue

@@ -60,7 +60,7 @@
                 </template>
             </van-field>
             <van-popup v-model:show="showUnitType" destroy-on-close round position="bottom">
-                <van-picker :model-value="formData.unitType" :columns="unitTypeList" @cancel="showUnitType = false"
+                <van-picker :confirm-button-text="lang[langType].confirm" :cancel-button-text="lang[langType].cancel" :model-value="formData.unitType" :columns="unitTypeList" @cancel="showUnitType = false"
                     @confirm="onUnitTypeConfirm" />
             </van-popup>
 

src/view/fenghui/index.vue

@@ -29,8 +29,8 @@ const componentId = ref('');
 const showLange = ref(false);
 
 const langObj = [
-    { text: '中文', value: 'zh' },
-    { text: 'English', value: 'en' },
+    { text: 'English', value: 'zh' },
+    { text: '中文', value: 'en' },
 ]
 const langObjT = {
     zh: '中文',

src/view/fenghui/introduction.vue

@@ -148,16 +148,16 @@
                 </g>
             </g>
         </svg>
-        <h4 class="text" v-text="lang[langType].title"></h4>
+        <h4 class="text" style="font-size: 20px;" v-text="lang[langType].title"></h4>
         <div style="font-size: 14px;margin-bottom: 40px" class="text" v-html="lang[langType].marstContent"></div>
 
-        <h4 class="text" v-text="lang[langType].wrestleMania"></h4>
+        <h4 class="text" style="font-size: 16px;" v-text="lang[langType].wrestleMania"></h4>
         <p class="text" v-html="lang[langType].wrestleManiaContent"></p>
         <div class="line"></div>
-        <h4 class="text" v-text="lang[langType].venue"></h4>
+        <h4 class="text" style="font-size: 16px;" v-text="lang[langType].venue"></h4>
         <p class="text" v-html="lang[langType].venueContent"></p>
         <div class="line"></div>
-        <h4 class="text" v-text="lang[langType].organization"></h4>
+        <h4 class="text" style="font-size: 16px;" v-text="lang[langType].organization"></h4>
         <van-row>
             <van-col span="7">
                 <div class="text" v-text="lang[langType].organizationSub1"></div>