Merge branch 'master' of http://git.fmode.cn:3000/bin/tourism-wxapp

nova-tourism/pages/homestay/homestay-detail/index.js

@@ -187,7 +187,7 @@ Page({
         this.setData({
             imageUrls:storeList[0].image
         })
-        // this.Getlocation()
+        this.Getlocation()
         console.log(this.data.storeList);
     },
     //获取房间信息

nova-tourism/pages/index/index.wxml

@@ -25,8 +25,8 @@
 	<block wx:for="{{tabbarList.list}}" wx:key="index">
 		<van-tabbar-item wx:if="{{item.open}}" name="{{index}}">
 			<image slot="icon" src="{{ item.iconPath }}" mode="aspectFit" style="width:40rpx;height:40rpx;" />
-			<image class="active" slot="icon-active" src="{{ item.selectedIconPath }}" mode="aspectFit" style="width:48rpx;height:48rpx;" />
-			<view slot="icon">{{item.text}}</view>
+			<image  slot="icon-active" src="{{ item.selectedIconPath }}" mode="aspectFit" style="width:40rpx;height:40rpx;" />
+			{{item.text}}
 		</van-tabbar-item>
 	</block>
 </van-tabbar>

nova-tourism/pages/my/merchant/merchant-home/account/index.js

@@ -141,11 +141,11 @@ Page({
         if (this.data.locations) {
             ShopStore.set("location", this.data.locations)
         } else {
-            // wx.showToast({
-            //     title: '请选择民宿地址',
-            //     icon: 'none'
-            // })
-            // return
+            wx.showToast({
+                title: '请选择民宿地址',
+                icon: 'none'
+            })
+            return
         }
         ShopStore.set("storeName", this.data.storeName)
         if (Number(this.data.perCapita)) {

nova-tourism/pages/my/merchant/merchant-home/index.wxml

@@ -79,13 +79,13 @@
             </view>
             <van-icon name="arrow" />
         </view>
-        <view class="box-title" bindtap="comments"wx:if="{{store.type!='shop'}}">
+        <!-- <view class="box-title" bindtap="comments"wx:if="{{store.type!='shop'}}">
             <view class="box-details">
                 <van-icon name="https://file-cloud.fmode.cn/sHNeVwSaAg/20230705/eb7p71112500348.png" size="20"/>
                 <view class="name">评价管理</view>
             </view>
             <van-icon name="arrow" />
-        </view>
+        </view> -->
 
         <!-- <block wx:if="{{store.type=='catering'}}">
             <view class="box-title" bindtap="package">