xsh_1997 3 日 前
コミット
aa47db21b7
共有3 個のファイルを変更した21 個の追加10 個の削除を含む
  1. 2 2
      ruoyi-ui-app/locale/zh.js
  2. 18 7
      ruoyi-ui-app/pages/mine/index.vue
  3. 1 1
      ruoyi-ui/src/views/livestockFinance/yakAsset/index.vue

+ 2 - 2
ruoyi-ui-app/locale/zh.js

@@ -587,7 +587,7 @@ export default {
587
     formAddress: '服务地址',
587
     formAddress: '服务地址',
588
     formAddressPh: '请填写上门或到场地址',
588
     formAddressPh: '请填写上门或到场地址',
589
     formNeed: '健康档案',
589
     formNeed: '健康档案',
590
-    formNeedPh: '请简要描述动物发病情况',
590
+    formNeedPh: '请简要描述动物情况与服务需求',
591
     btnCancel: '取消',
591
     btnCancel: '取消',
592
     btnSubmit: '提交',
592
     btnSubmit: '提交',
593
     errBooker: '请填写预约人',
593
     errBooker: '请填写预约人',
@@ -595,7 +595,7 @@ export default {
595
     errPhoneFmt: '请输入正确的手机号',
595
     errPhoneFmt: '请输入正确的手机号',
596
     errSlot: '请选择预约时段',
596
     errSlot: '请选择预约时段',
597
     errAddress: '请填写服务地址',
597
     errAddress: '请填写服务地址',
598
-    errNeed: '请填写健康档案',
598
+    errNeed: '请填写服务需求',
599
     toastDayFull: '该日期已约满',
599
     toastDayFull: '该日期已约满',
600
     toastPickDate: '请选择可预约的日期',
600
     toastPickDate: '请选择可预约的日期',
601
     dayNotAvailable: '非服务日',
601
     dayNotAvailable: '非服务日',

+ 18 - 7
ruoyi-ui-app/pages/mine/index.vue

@@ -168,16 +168,27 @@ export default {
168
       this.$i18n.locale = next
168
       this.$i18n.locale = next
169
       this.layoutKey += 1
169
       this.layoutKey += 1
170
       this.$nextTick(() => {
170
       this.$nextTick(() => {
171
-        if (!isTabBarPage()) {
171
+        const applyLangUi = () => {
172
+          if (!isTabBarPage()) {
173
+            return
174
+          }
175
+          syncTabBarText((k) => this.$t(k))
176
+          const p = uni.setNavigationBarTitle({
177
+            title: this.$t(this.navTitleKey)
178
+          })
179
+          if (p && typeof p.catch === 'function') {
180
+            p.catch(() => {})
181
+          }
182
+        }
183
+        if (isTabBarPage()) {
184
+          applyLangUi()
172
           return
185
           return
173
         }
186
         }
174
-        syncTabBarText((k) => this.$t(k))
175
-        const p = uni.setNavigationBarTitle({
176
-          title: this.$t(this.navTitleKey)
187
+        ensureTabBarEntry().then((ok) => {
188
+          if (ok) {
189
+            applyLangUi()
190
+          }
177
         })
191
         })
178
-        if (p && typeof p.catch === 'function') {
179
-          p.catch(() => {})
180
-        }
181
       })
192
       })
182
     }
193
     }
183
   }
194
   }

+ 1 - 1
ruoyi-ui/src/views/livestockFinance/yakAsset/index.vue

@@ -39,7 +39,7 @@
39
 
39
 
40
     <el-card shadow="never">
40
     <el-card shadow="never">
41
       <el-table v-loading="loading" :data="tableList" border>
41
       <el-table v-loading="loading" :data="tableList" border>
42
-        <el-table-column :label="lfT('colYakNo')" prop="yakNo" align="center" min-width="120" :show-overflow-tooltip="true" />
42
+        <el-table-column :label="lfT('c')" prop="yakNo" align="center" min-width="120" :show-overflow-tooltip="true" />
43
         <el-table-column :label="lfT('colPastureName')" prop="pastureName" align="center" min-width="120" :show-overflow-tooltip="true" />
43
         <el-table-column :label="lfT('colPastureName')" prop="pastureName" align="center" min-width="120" :show-overflow-tooltip="true" />
44
         <el-table-column :label="lfT('colGender')" prop="gender" align="center" width="70" />
44
         <el-table-column :label="lfT('colGender')" prop="gender" align="center" width="70" />
45
         <el-table-column :label="lfT('colAgeMonths')" align="center" width="80">
45
         <el-table-column :label="lfT('colAgeMonths')" align="center" width="80">