From 076f7f422e82f1b20baccc17faf8313565ee0633 Mon Sep 17 00:00:00 2001
From: shuiqing <luoshuiqing@1hhd.com>
Date: Thu, 19 Jul 2018 13:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 11 ++++++-----
 pages/index/index.wxml |  2 +-
 pages/loding/loding.js | 32 +++-----------------------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index efd36b1..7b8aeaf 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -29,7 +29,7 @@ Page({
     // typeNum: 10,
     // addrArray: { id: [440100000, 430426000], name: ['长沙', '深圳', '上海', '长沙', '武汉', '杭州', '北京'] },
     addrIndex: 0,
-    cityName:'',
+    districtName:'',
   },
   /**
    * 城市选择
@@ -49,12 +49,12 @@ Page({
     // //获取本地数据
     // // 获取地址
     // wx.getStorage({
-    //   key: 'cityName',
+    //   key: 'districtName',
     //   success: function (res) {
     //     console.log(111111111111111111)
     //     console.log(res.data)
     //     that.setData({
-    //       cityName: res.data
+    //       districtName: res.data
     //     })
     //     console.log(222222222222222222)
 
@@ -195,10 +195,11 @@ Page({
     //获取本地数据
     // 获取地址
     wx.getStorage({
-      key: 'cityName',
+      key: 'districtName',
       success: function (res) {
+        // console.log(res.data)
         that.setData({
-          cityName: res.data
+          districtName: res.data
         })
       }
     });
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 71a599f..ad02bb7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -2,7 +2,7 @@
 <view class="content">
   <view class='header'>
     <view class='top-left'>
-   <navigator url="../city/city" class="address"><image src='{{img1}}' mode='widthFix' class="imgs"></image> {{cityName}}</navigator>
+   <navigator url="../city/city" class="address"><image src='{{img1}}' mode='widthFix' class="imgs"></image> {{districtName}}</navigator>
    <!-- 地址 -->
        <!-- <text class='address'>{{addrArray.name[0]}}</text>   -->
     </view>
diff --git a/pages/loding/loding.js b/pages/loding/loding.js
index 2095b98..720dd7e 100644
--- a/pages/loding/loding.js
+++ b/pages/loding/loding.js
@@ -15,14 +15,15 @@ Page({
   onLoad: function (options) {　　 // 实例化腾讯地图API核心类
     let that = this;　
     qqmapsdk = new QQMapWX({
+      // 二号家政
       key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'
+      //微信正式用    key:'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'
     });
        wx.getStorage({
       key: 'merchantNo',
       success: function (res) {
         console.log(res.data)
         if (res.data == '') {
-          console.log(1111);
           // 页面渲染完成 
           var tt = this;
           setTimeout(function () {
@@ -41,14 +42,13 @@ Page({
               } else {
                 //未授权
                 wx.navigateTo({
-                  url: '../city/city/?1',
+                  url: '../city/city/',
                 })
               }
             }
           });
 
         } else {
-          console.log(6666);
           wx.switchTab({
             url: '../index/index'
           })
@@ -56,37 +56,11 @@ Page({
         that.setData({
           merchantNo: res.data
         })
-        console.log(222);
-        // that.setData({ userName: res.data });
       }
     });
 
   },
 
   onReady: function () {
-    // // 页面渲染完成 
-    // var tt = this;
-    // setTimeout(function () {
-    //   tt.setData({
-    //     hiddenLoading: true
-    //   });
-    //   tt.update();
-    // }, 2000);
-    // wx.getSetting({
-    //   success: function (res) {
-    //     if (res.authSetting['scope.userInfo']) {
-    //       //授权了
-    //       wx.navigateTo({
-    //         url: '../at_present/at_present',
-    //       })
-    //     } else {
-    //       //未授权
-    //       wx.navigateTo({
-    //         url: '../city/city/?1',
-    //       })
-    //     }
-    //   }
-    // });
-
   },
 })
\ No newline at end of file