Merge branch 'feature/medou/mini-v1.1.0' of ssh://47.106.79.88:10022/1hjz-3N/1hjz-mini into feature/medou/mini-v1.1.0

# Conflicts:
#	pages/at_present/at_present.js
#	pages/city/city.js

app.js

@@ -1,7 +1,7 @@
 //app.js
 App({
   gw: {
-    // hostUrl: 'https://www.1hjz.cn',
+    //hostUrl: 'https://www.1hjz.cn',
     hostUrl: 'https://test.1hjz.cn/',
     mapUrl:'https://api.map.baidu.com',
     systemInfo : null,//系统信息

pages/at_present/at_present.js

@@ -23,8 +23,8 @@ Page({
   onLoad: function(options) {
     // let that = this;　
     qqmapsdk = new QQMapWX({
-      key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'
-      //正式的上线 key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'
+     // key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'//测试
+      key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'//正式
     });
     // this.setData({
     //   groupNo: options.groupNo == undefined ? "" : options.groupNo,
@@ -55,6 +55,7 @@ Page({
               }, 
               
               success: function(res) {
+<<<<<<< HEAD
                 //  打印对应想得到的数据
                 var cityId = res.data.response[0].cityId;
                 var cityName = res.data.response[0].cityName;
@@ -85,6 +86,42 @@ Page({
                   key: 'merchantNo',
                   data: merchantNo, 
                 });
+=======
+                if (res.code== 0){
+                  //  打印对应想得到的数据
+                  var cityId = res.data.response[0].cityId;
+                  var cityName = res.data.response[0].cityName;
+                  var districtId = res.data.response[0].districtId;
+                  var districtName = res.data.response[0].districtName;
+                  var merchantNo = res.data.response[0].merchantNo;
+                  var lists = res.data.msg
+                  that.setData({
+                    lists
+                  });
+                  wx.setStorage({
+                    key: 'cityId',
+                    data: cityId,
+                  });
+                  wx.setStorage({
+                    key: 'cityName',
+                    data: cityName,
+                  });
+                  wx.setStorage({
+                    key: 'districtId',
+                    data: districtId,
+                  });
+                  wx.setStorage({
+                    key: 'districtName',
+                    data: districtName,
+                  });
+                  wx.setStorage({
+                    key: 'merchantNo',
+                    data: merchantNo,
+                  });
+                }else{
+                  showorHide: false;
+                }
+>>>>>>> 4ec3090552fa1d2d848a27c00f116a54ddd8adb7
               }
             });
            

pages/city/city.js

@@ -2,6 +2,10 @@
 //获取应用实例
 const app = getApp()
 Page({
+  data:{
+    cityName:'',
+    districtName: '',
+  },
   onLoad: function (options) {
     var that = this
     // 商家编号
@@ -22,6 +26,10 @@ Page({
         })
       }
     });
+<<<<<<< HEAD
+=======
+    
+>>>>>>> 4ec3090552fa1d2d848a27c00f116a54ddd8adb7
     wx.request({
       url: app.gw.hostUrl + '/mall/wxa/index/opencitylist',
       data: { cityName: 'cityName' },
@@ -33,7 +41,7 @@ Page({
         var citys = res.data;
         console.log(citys)
         that.setData({
-          citys
+          citys:citys
         }); 
       },
       fail: function () {