Merge remote-tracking branch 'origin/master'

doum

15 小时以前 b902b40fda2f1dccca0825277d07908119deecfd

 mini-program/pages/index/index.vue

@@ -14,7 +14,7 @@
               bgColor="rgba(255,255,255,0.9)" :showAction="false" />
         </view>
         <view class="banner">
            <u-swiper :list="list" keyName="imgurl" height="150"></u-swiper>
            <u-swiper :list="list" keyName="imgurl" height="150" indicator indicatorMode="dot"></u-swiper>
         </view>
         <u-scroll-list indicatorActiveColor="#004096">
            <view class="scroll-list">
@@ -288,7 +288,6 @@
                     latitude: res1.latitude,
                     longitude: res1.longitude
                  };
                  console.log(locParam)
                  const qqmapsdk = new QQMapWX({
                     key: 'HEIBZ-QJLLM-SZ36X-6ZBHI-S6Y2J-S6FND'
                  });
@@ -297,6 +296,7 @@
                     locParam,
                     success: function(res) {
                        console.log(res,  '==================index获取地址')
                        console.log(locParam)
                        that.$store.commit('setPosition', res.result)
                     },
                     fail: (err) => {