Selaa lähdekoodia

feat:“同步11.21”

soobin 1 vuosi sitten
vanhempi
commit
d813f9877a
3 muutettua tiedostoa jossa 11 lisäystä ja 5 poistoa
  1. 1 1
      src/common/js/utils.js
  2. 9 4
      src/views/device/diyFlower/index.vue
  3. 1 0
      src/views/device/index.vue

+ 1 - 1
src/common/js/utils.js

@@ -4461,5 +4461,5 @@ export const prefix = (url) => {
 // 获取当前语言
 export function navigatorLanguage() {
   const navigatorLanguage = (navigator.language || navigator.browserLanguage).toLowerCase()
-  return navigatorLanguage === 'en' ? 'en' : 'zh';
+  return navigatorLanguage.substring(0, 2) == 'zh' ? 'zh' : 'en';
 }

+ 9 - 4
src/views/device/diyFlower/index.vue

@@ -22,7 +22,8 @@
           <div class="l-flex-RC">
             <van-image width="50" height="50" fit="contain" :src="showSugerPhoto(item)" />
             <span class="o-ml-10" style="color: #000;word-wrap: break-word; width: 50px;">{{ item.name }}</span>
-            <van-checkbox class="o-ml-10" checked-color="#2c87c8" shape="square" v-model="shapeStates[index]" @change="shapeChange(index)" />
+            <van-checkbox class="o-ml-10" checked-color="#2c87c8" shape="square" v-model="shapeStates[index]"
+              @change="shapeChange(index)" />
           </div>
         </van-col>
       </van-row>
@@ -33,7 +34,8 @@
           <div class="l-flex-RC">
             <van-image width="50" height="50" fit="contain" :src="showSugerPhoto(item)" />
             <span class="o-ml-10" style="color: #000;word-wrap: break-word; width: 50px;">{{ item.name }}</span>
-            <van-checkbox class="o-ml-10" checked-color="#2c87c8" shape="square" v-model="sugarStates[index]" @change="sugarChange(index)" />
+            <van-checkbox class="o-ml-10" checked-color="#2c87c8" shape="square" v-model="sugarStates[index]"
+              @change="sugarChange(index)" />
           </div>
         </van-col>
       </van-row>
@@ -198,7 +200,7 @@ export default {
         }
       }).catch((error) => {
         console.log(error);
-        Toast.fail(t('device.unknownError'));
+        // Toast.fail(t('device.unknownError'));
       });
     }
 
@@ -227,8 +229,11 @@ export default {
           // }, 1000);
         }).catch((error) => {
           console.log(error);
-          Toast.fail(t('device.unknownError'));
+          // Toast.fail(t('device.unknownError'));
         });
+      }).catch((error) => {
+        console.log(error);
+        // Toast.fail(t('device.unknownError'));
       });
     };
     const activeNames = ref(['1', '2']);

+ 1 - 0
src/views/device/index.vue

@@ -249,6 +249,7 @@
     <deviceOper ref="oprRef" @operfinish="operFinish"></deviceOper>
     <!-- 搜索弹出框 -->
     <deviceSearch ref="searchRef" @search="search($event)"></deviceSearch>
+    <div style="height: 50px;"></div>
     <nav-bar></nav-bar>
   </div>
 </template>