合并分支 'wumengyu' 到 'master'

优化获取城市及实验



查看合并请求 !8

@@ -230,7 +230,9 @@ Page({
     },
     },
     getData() {
     getData() {
         const self = this;
         const self = this;
+        console.log(wx.getStorageSync('city') == wx.getStorageSync('choose-city'),wx.getStorageSync('city') === wx.getStorageSync('choose-city'),wx.getStorageSync('choose-city') !=='');
         if ((wx.getStorageSync('city') === wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
         if ((wx.getStorageSync('city') === wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
+            console.log('相同');
             const city = wx.getStorageSync('city');
             const city = wx.getStorageSync('city');
             // console.log('city',city);
             // console.log('city',city);
             self.getChooseSession(city);
             self.getChooseSession(city);
@@ -239,13 +241,19 @@ Page({
             // console.log(self.data.currentCity);
             // console.log(self.data.currentCity);
 
 
         }else if((wx.getStorageSync('city') !== wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
         }else if((wx.getStorageSync('city') !== wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
+            console.log('不同');
             const city = wx.getStorageSync('choose-city');
             const city = wx.getStorageSync('choose-city');
             self.getChooseSession(city);
             self.getChooseSession(city);
             self.setData({currentCity: city})
             self.setData({currentCity: city})
         } else if(wx.getStorageSync('city') === ''){
         } else if(wx.getStorageSync('city') === ''){
-            // console.log('aaa');
+            console.log('aaa');
             const city = '北京市';
             const city = '北京市';
             self.getChooseSession(city);
             self.getChooseSession(city);
+            self.setData({currentCity: city})
+        }else if(wx.getStorageSync('city') !== '') {//授权过城市
+            const city = wx.getStorageSync('city');
+            self.getChooseSession(city);
+            self.setData({currentCity: city})
         }
         }
         self.getCity();
         self.getCity();
     },
     },