Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform

pages/detail/index.js

@@ -379,29 +379,41 @@ Page({
     var that = this;
     console.log(e.currentTarget.dataset.address);
     var address = e.currentTarget.dataset.address
-
+    wx.openLocation({
-    wx.getLocation({
+      latitude: Number(address.storeLat),
-      type: 'gcj02', //返回可以用于wx.openLocation的经纬度
+      longitude:  Number(address.storeLng),
+      name: address.storeName,
+      address: address.storeAddr,
+      scale: 15,
       success (res) {
         console.log(res)
-        wx.openLocation({
-          latitude: Number(address.storeLat),
-          longitude:  Number(address.storeLng),
-          name: address.storeName,
-          address: address.storeAddr,
-          scale: 15,
-          success (res) {
-            console.log(res)
-          },
-          fail (res) {
-            console.log(res)
-          }
-        });
       },
-      fail(res){
+      fail (res) {
-        console.log(res);
+        console.log(res)
       }
-    })  
+    });
+    // wx.getLocation({
+    //   type: 'gcj02', //返回可以用于wx.openLocation的经纬度
+    //   success (res) {
+    //     console.log(res)
+    //     wx.openLocation({
+    //       latitude: Number(address.storeLat),
+    //       longitude:  Number(address.storeLng),
+    //       name: address.storeName,
+    //       address: address.storeAddr,
+    //       scale: 15,
+    //       success (res) {
+    //         console.log(res)
+    //       },
+    //       fail (res) {
+    //         console.log(res)
+    //       }
+    //     });
+    //   },
+    //   fail(res){
+    //     console.log(res);
+    //   }
+    // })  
 		// console.log(e);
 		// try {
 		// 	wx.setStorageSync("onSiteRemark", that.data.onSiteRemark);

pages/index/index.wxml

@@ -35,7 +35,7 @@
           </view>
           <view class="xgxg" id="menu">
             <view class="fsa" style="justify-content:space-beteween; height: 44px">
-              <view class="csbf f14 c6 {{whichOneShow == 'gj' ?'active':''}} {{ activez!='' && activez!='zuigao'?'activecolor':''}}" catchtap="chooseNl" data-type="gj">
+              <!-- <view class="csbf f14 c6 {{whichOneShow == 'gj' ?'active':''}} {{ activez!='' && activez!='zuigao'?'activecolor':''}}" catchtap="chooseNl" data-type="gj">
                 {{firstMenu}}
                 <i class="iconfont icon-shouqi f12 {{activez=='zuijin' ?'cf40':'c9'}} fst ml4" wx:if="{{whichOneShow == 'gj'}}"></i>
                 <i class="iconfont icon-zhankai f12 {{activez=='zuijin' ?'cf40':'c9'}} fst ml4" wx:else data-type="gj"></i>
@@ -46,7 +46,7 @@
                     <view class="f16 fw500 p016 bb1 {{activez=='zuijin'?'cf00 b1':''}}" data-id="zuijin" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">距离优先</view>
                   </view>
                 </scroll-view>
-              </view>
+              </view> -->
               <view class="csbf c6 f14 dn {{whichOneShow == 'sex'?'active':''}} {{ sexid!='' && sexid!='-1'?'activecolor':''}}" catchtap="chooseNl" data-type="sex" style>
                 {{ secondMenu }}
                 <i class="iconfont icon-shouqi f12 {{ sexid!='-1' ?'cf40':'c9'}} fst ml4" wx:if="{{whichOneShow == 'sex'}}"></i>

pages/index/index.wxss

@@ -726,7 +726,7 @@ button.collect icon::before {
 	align-items: center;
 	justify-content: center;
 	border: 1px solid transparent;
-	padding: 0px 8px;
+	/* padding: 0px 4px; */
 	width: 30%;
 	height: 36px;
 	font-size: 16px;