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/index/index.js

pages/activity_detail/activity_detail.js

@@ -46,7 +46,6 @@ Page({
     }],
     qrImageUrl: "",
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
@@ -61,7 +60,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    //获取活动详情
+    //获取活动详情 
     this.getActivityDetail();
   },
 

pages/at_present/at_present.js

@@ -52,7 +52,6 @@ Page({
               },    
               success: function(res) {
                 //  打印对应想得到的数据
-                console.log(res)
                 var cityId = res.data.response[0].cityId;
                 var cityName = res.data.response[0].cityName;
                 var districtId = res.data.response[0].districtId;

pages/city/city.js

@@ -30,9 +30,7 @@ Page({
         'Content-Type': 'application/x-www-form-urlencoded'
       },
       success: function (res) {
-        console.log(res.data)
         var citys = res.data;
-        console.log(citys);
         that.setData({
           citys
         }); 

pages/district/district.js

@@ -25,8 +25,6 @@ Page({
       }
     });
     cityId = options.cityId;
-
-    console.log(cityId);
     wx.request({
       url: app.gw.hostUrl + '/mall/wxa/index/opendistictlist',
       method: 'get',
@@ -38,7 +36,6 @@ Page({
       },
       success: function (res) {
         var districts = res.data;
-        console.log(districts)
         that.setData({
           districts
         });

pages/index/index.js

@@ -1,6 +1,6 @@
 //获取应用实例
 const app = getApp()
-
+var merchantNo = '';
 Page({
   /**
    * 页面的初始数据
@@ -11,7 +11,9 @@ Page({
     interval: 5000,
     duration: 1000,
     imgUrls: [],
-    merchantNo: '',
+    // merchantNo: '',
+    // bannerImage: '/images/activity_banner.png',
+
     menu_list: [
       { name: '拼团', disabled: false, className: 'green_button' },
       { name: '秒杀', disabled: true, className: 'gray_button' },
@@ -41,7 +43,7 @@ Page({
    * 生命周期函数--监听页面加载 
    */
   onShow: function (options) {
-    var that = this;
+    let that = this;
     //获取本地数据
     // 获取地址
     wx.getStorage({
@@ -51,7 +53,9 @@ Page({
           districtName: res.data
         })
       }
+      
     });
+    
     // 商家编号
     wx.getStorage({
       key: 'merchantNo',
@@ -60,6 +64,8 @@ Page({
           merchantNo: res.data
         }),
           that.getActivityList(res.data);
+          merchantNo = res.data
+          that.getActivityList();
         wx.request({
           url: app.gw.hostUrl + '/mall/wxa/activity/banner',
           method: 'get',
@@ -100,9 +106,10 @@ Page({
 
   },
 
-  getActivityList: function ( merchantNo) {
+  getActivityList: function () {
     let that = this;
     wx.showNavigationBarLoading() //在标题栏中显示加载
+    console.log("districtName:" + that.districtName);
     wx.request({
       url: app.gw.hostUrl + '/mall/wxa/activity/list',
       method: 'get',

pages/loding/loding.js

@@ -16,7 +16,6 @@ Page({
     wx.getStorage({
       key: "merchantNo",
       success: function (res) {
-        console.log(res.data);
         if (res.data == "") {
           that.queryCartList();
         } else {
@@ -29,7 +28,6 @@ Page({
         });
       },
       fail: function (res) {
-        console.log(res);
         that.queryCartList();
       }
     });
@@ -44,7 +42,6 @@ Page({
         });
       },
       fail:function(error){
-        console.log(error);
         wx.navigateTo({
             url: '../city/city',
           })