xiaohaizhao 1 anno fa
parent
commit
7ddfb719cb
4 ha cambiato i file con 9 aggiunte e 5 eliminazioni
  1. 3 2
      pages/login/phone.js
  2. 5 1
      pages/login/selectSite.js
  3. 1 1
      pages/login/selectSite.wxml
  4. 0 1
      utils/language.js

+ 3 - 2
pages/login/phone.js

@@ -7,7 +7,7 @@ Page({
         loading: false, //登陆中
         languages: [],
     },
-    async onLoad(options) {
+    async onLoad() {
         if (wx.getStorageSync('isAgree')) this.setData({
             isAgree: wx.getStorageSync('isAgree')
         })
@@ -20,7 +20,8 @@ Page({
         }).then(res => {
             console.log("语言包列表", res)
             if (res.msg == '成功') {
-                let item = res.data.find(v => v.languagecode == (wx.getStorageSync('languagecode') || 'ZH'))
+                let item = res.data.find(v => v.languagecode == (wx.getStorageSync('languagecode')))
+                console.log("item", item)
                 this.setData({
                     languages: res.data,
                     languagename: item.languagename || '简体中文',

+ 5 - 1
pages/login/selectSite.js

@@ -1,12 +1,16 @@
 Page({
     data: {
-        account_list: wx.getStorageSync('account_list')
+        account_list: []
     },
     toHome(e) {
+        wx.removeStorageSync('userMsg')
         wx.setStorageSync('userMsg', e.currentTarget.dataset.item);
         require('./modules/login').init();
     },
     onShow() {
+        this.setData({
+            account_list: wx.getStorageSync('account_list')
+        })
         if (wx.getStorageSync('languagecode') != 'ZH') getApp().globalData.Language.setNavBarTitle('选择站点')
     }
 })

+ 1 - 1
pages/login/selectSite.wxml

@@ -1,4 +1,4 @@
-<navigator wx:for="{{account_list}}" url="#" data-item='{{item}}' bindtap="toHome">
+<navigator wx:for="{{account_list}}" url="#" wx:key="siteid" data-item='{{item}}' bindtap="toHome">
     <view>{{item.sitename}}</view>
     <view class="iconfont icon-a-wodetiaozhuan" />
 </navigator>

+ 0 - 1
utils/language.js

@@ -32,7 +32,6 @@ class Language {
 	}
 
 	getMapText(text) {
-		console.log("getMapText:", text, this.languagePackage[text] || text)
 		try {
 			return this.languagePackage[text] || text
 		} catch (error) {