未注册用户登录错误修复

App.vue

@@ -27,10 +27,7 @@
 			let that = this;
 			let sessionId =  uni.getStorageSync('sessionId');// 用户token
 			let userInfo = uni.getStorageSync('userInfo');// 用户头像信息
-			console.log(userInfo);
-			console.log("打印用户信息")
 			let getcode= uni.getStorageSync('getcode');// 用户code oppenid
-			console.log(userInfo)
 			if(sessionId != '') {
 				uni.checkSession({
 					   success(){  
@@ -42,7 +39,6 @@
 								let { data } = res.data;
 						 		that.username.avatarUrl= data.member_avatar;
 								that.username.nickName = data.member_truename;
-								console.log(that.username)
 								that.login(that.username);
 						 	}
 						 })
@@ -53,7 +49,6 @@
 						 that.islogionsuccess(true);
 					    },  
 						fail(){  
-						 console.log("登录过期")
 			             // 登录过期 重新登录
 					     uni.login({
 					     		provider: 'weixin',
@@ -96,7 +91,6 @@
 			  		provider: 'weixin',
 			  		success: (res) => {
 						let code = res.code;
-						console.log(code);
 			  			 uni.request({
 			  				  url: 'https://www.qzaiwang.com' +'/v1/entry/mp_openid',
 							  method:'post',
@@ -106,6 +100,7 @@
 			  				  success: (res) => {
 								  let { data } = res.data;
 								  data.code = code;
+								  console.log(code)
 								  this.setcode(data); // 保存用户登录code session
 								  let token = data.token;
 								  if(token == '') {
@@ -122,7 +117,7 @@
 			  			  })
 			  		},
 			  		fail: function(res) {
-			  			consoel.log(res);
+			  			consoel.log("失败");
 			  		}
 			  })
 			};

pages.json

@@ -1,207 +1,206 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-	     	"path": "pages/index/index",
-	     	"style": {
-	     		 "navigationBarTitleText": "首页",
-				  "usingComponents":{
-						"van-search": "/wxcomponents/dist/search/index"
-					}
-				
-	     	}
-	     },
-		 {
-		 	"path": "pages/index/hotel",
-		 	"style": {
-		 		"navigationStyle":"custom",
-		 		"usingComponents":{
-		 			     "van-sticky": "/wxcomponents/dist/sticky/index",
-		 				 "van-nav-bar": "/wxcomponents/dist/nav-bar/index",
-		 			     "van-search": "/wxcomponents/dist/search/index",
-		 				 "van-tab": "/wxcomponents/dist/tab/index",
-		 				 "van-tabs": "/wxcomponents/dist/tabs/index",
-		 				 "van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
-		 				 "van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
-		 				 "van-row": "/wxcomponents/dist/row/index",
-		 				 "van-col": "/wxcomponents/dist/col/index",
-		 				 "van-icon": "/wxcomponents/dist/icon/index"
-		 				}
-		 	}
-		 },
-		 {
-		 	"path": "pages/index/hoteldetail",
-		 	"style": {
-		 		"navigationBarTitleText": "商品销售",
-		 		"usingComponents":{
-		 				 "van-tab": "/wxcomponents/dist/tab/index",
-		 				 "van-tabs": "/wxcomponents/dist/tabs/index",
-		 				 "van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
-		 				 "van-dropdown-item": "/wxcomponents/dist/dropdown-item/index"
-		 				}
-		 	}
-		 },
-		
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"usingComponents": {
+					"van-search": "/wxcomponents/dist/search/index"
+				}
+
+			}
+		},
+		{
+			"path": "pages/index/hotel",
+			"style": {
+				"navigationStyle": "custom",
+				"usingComponents": {
+					"van-sticky": "/wxcomponents/dist/sticky/index",
+					"van-nav-bar": "/wxcomponents/dist/nav-bar/index",
+					"van-search": "/wxcomponents/dist/search/index",
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index",
+					"van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
+					"van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
+					"van-row": "/wxcomponents/dist/row/index",
+					"van-col": "/wxcomponents/dist/col/index",
+					"van-icon": "/wxcomponents/dist/icon/index"
+				}
+			}
+		},
+		{
+			"path": "pages/index/hoteldetail",
+			"style": {
+				"navigationBarTitleText": "商品销售",
+				"usingComponents": {
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index",
+					"van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
+					"van-dropdown-item": "/wxcomponents/dist/dropdown-item/index"
+				}
+			}
+		},
+
 		{
 			"path": "pages/index/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
 				"usingComponents": {
-				  "van-icon": "/wxcomponents/dist/icon/index",
-				  "van-card": "/wxcomponents/dist/card/index",
-				   "van-goods-action": "/wxcomponents/dist/goods-action/index",
-				   "van-goods-action-icon": "/wxcomponents/dist/goods-action-icon/index",
-				   "van-goods-action-button": "/wxcomponents/dist/goods-action-button/index",
-				    "van-submit-bar": "/wxcomponents/dist/submit-bar/index",
-				    "van-checkbox": "/wxcomponents/dist/checkbox/index",
-				    "van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
+					"van-icon": "/wxcomponents/dist/icon/index",
+					"van-card": "/wxcomponents/dist/card/index",
+					"van-goods-action": "/wxcomponents/dist/goods-action/index",
+					"van-goods-action-icon": "/wxcomponents/dist/goods-action-icon/index",
+					"van-goods-action-button": "/wxcomponents/dist/goods-action-button/index",
+					"van-submit-bar": "/wxcomponents/dist/submit-bar/index",
+					"van-checkbox": "/wxcomponents/dist/checkbox/index",
+					"van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
 					"van-radio": "/wxcomponents/dist/radio/index",
 					"van-radio-group": "/wxcomponents/dist/radio-group/index"
-			}
+				}
 			}
 		},
-		
-		
+
+
 		{
 			"path": "pages/index/shop",
 			"style": {
 				"navigationBarTitleText": "商品详情",
-				"usingComponents":{
-						 "van-tab": "/wxcomponents/dist/tab/index",
-						 "van-tabs": "/wxcomponents/dist/tabs/index",
-						 "van-goods-action": "/wxcomponents/dist/goods-action/index",
-						 "van-goods-action-icon": "/wxcomponents/dist/goods-action-icon/index",
-						 "van-goods-action-button": "/wxcomponents/dist/goods-action-button/index"
+				"usingComponents": {
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index",
+					"van-goods-action": "/wxcomponents/dist/goods-action/index",
+					"van-goods-action-icon": "/wxcomponents/dist/goods-action-icon/index",
+					"van-goods-action-button": "/wxcomponents/dist/goods-action-button/index"
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/index/commemt",
 			"style": {
 				"navigationBarTitleText": "评价",
-				"usingComponents":{
-						 "van-rate": "/wxcomponents/dist/rate/index"
-						}
+				"usingComponents": {
+					"van-rate": "/wxcomponents/dist/rate/index"
+				}
 			}
 		},
 		{
 			"path": "pages/myOrder/returngood",
 			"style": {
 				"navigationBarTitleText": "退货退款",
-				"usingComponents":{
+				"usingComponents": {
 					"van-card": "/wxcomponents/dist/card/index"
 				}
-				
+
 			}
 		},
 		{
 			"path": "pages/myOrder/returndetail",
 			"style": {
 				"navigationBarTitleText": "退货详情",
-				"usingComponents":{
+				"usingComponents": {
 					"van-card": "/wxcomponents/dist/card/index"
 				}
-				
+
 			}
 		},
 		{
 			"path": "pages/myOrder/refuend",
 			"style": {
 				"navigationBarTitleText": "退货/售后",
-				"usingComponents":{
+				"usingComponents": {
 					"van-card": "/wxcomponents/dist/card/index"
 				}
-				
+
 			}
 		},
-		
-		
+
+
 		{
 			"path": "pages/myCenter/orderdetail",
 			"style": {
 				"navigationBarTitleText": "",
-				"usingComponents":{
+				"usingComponents": {
 					"van-card": "/wxcomponents/dist/card/index"
 				}
-				
+
 			}
 		},
-		
-		
-		
+
+
+
 		{
 			"path": "pages/index/searchresult",
 			"style": {
 				"navigationBarTitleText": "酒店搜索",
-				"usingComponents":{
+				"usingComponents": {
 					"van-search": "/wxcomponents/dist/search/index"
-			    }
+				}
 			}
 		},
 		{
 			"path": "pages/index/feedback",
 			"style": {
 				"navigationBarTitleText": "入住反馈",
-				"usingComponents":{
-							"van-uploader": "/wxcomponents/dist/uploader/index"
-						}
+				"usingComponents": {
+					"van-uploader": "/wxcomponents/dist/uploader/index"
+				}
 			}
 		},
 		{
 			"path": "pages/index/hotelsearch",
 			"style": {
 				"navigationBarTitleText": "商品搜索",
-				"usingComponents":{
+				"usingComponents": {
 					"van-search": "/wxcomponents/dist/search/index",
 					"van-icon": "/wxcomponents/dist/icon/index"
-			    }
+				}
 			}
 		},
-		
+
 		{
 			"path": "pages/myone/oneIndex",
 			"style": {
-				"usingComponents":{
-					     "van-tab": "/wxcomponents/dist/tab/index",
-					      "van-tabs": "/wxcomponents/dist/tabs/index"
-						},
+				"usingComponents": {
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index"
+				},
 				"navigationBarTitleText": "发现"
 			}
 		},
-		
+
 		{
 			"path": "pages/myone/onedetail",
-			"style": {
-			}
+			"style": {}
 		},
-		
+
 		// onedetail
-		
+
 		{
 			"path": "pages/myOrder/index",
 			"style": {
 				"navigationBarTitleText": "我的订单",
-				"usingComponents":{
-					 "van-tab": "/wxcomponents/dist/tab/index",
-					 "van-tabs": "/wxcomponents/dist/tabs/index",
-					 "van-card": "/wxcomponents/dist/card/index",
-					 "van-icon": "/wxcomponents/dist/icon/index"
+				"usingComponents": {
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index",
+					"van-card": "/wxcomponents/dist/card/index",
+					"van-icon": "/wxcomponents/dist/icon/index"
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/index/sureBuy",
 			"style": {
 				"navigationBarTitleText": "确认订单",
 				"usingComponents": {
-				  "van-cell-group": "/wxcomponents/dist/cell-group/index",
-				  "van-radio": "/wxcomponents/dist/radio/index",
-				  "van-radio-group": "/wxcomponents/dist/radio-group/index",
-				  "van-tab": "/wxcomponents/dist/tab/index",
-				  "van-tabs": "/wxcomponents/dist/tabs/index",
-				  "van-card": "/wxcomponents/dist/card/index",
-				  "van-field": "/wxcomponents/dist/field/index"
+					"van-cell-group": "/wxcomponents/dist/cell-group/index",
+					"van-radio": "/wxcomponents/dist/radio/index",
+					"van-radio-group": "/wxcomponents/dist/radio-group/index",
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index",
+					"van-card": "/wxcomponents/dist/card/index",
+					"van-field": "/wxcomponents/dist/field/index"
 				}
 			}
 		},
@@ -210,9 +209,9 @@
 			"style": {
 				"navigationBarTitleText": "支付方式",
 				"usingComponents": {
-				  "van-cell-group": "/wxcomponents/dist/cell-group/index",
-				  "van-radio": "/wxcomponents/dist/radio/index",
-				  "van-radio-group": "/wxcomponents/dist/radio-group/index"
+					"van-cell-group": "/wxcomponents/dist/cell-group/index",
+					"van-radio": "/wxcomponents/dist/radio/index",
+					"van-radio-group": "/wxcomponents/dist/radio-group/index"
 				}
 			}
 		},
@@ -220,64 +219,64 @@
 			"path": "pages/myOrder/order",
 			"style": {
 				"navigationBarTitleText": "订单详情",
-				"usingComponents":{
-					 "van-card": "/wxcomponents/dist/card/index",
-					 "van-dialog": "/wxcomponents/dist/dialog/index"
+				"usingComponents": {
+					"van-card": "/wxcomponents/dist/card/index",
+					"van-dialog": "/wxcomponents/dist/dialog/index"
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/myOrder/reminder",
 			"style": {
 				"navigationBarTitleText": "催单",
-				"usingComponents":{
-					     "van-field": "/wxcomponents/dist/field/index"
-						}
+				"usingComponents": {
+					"van-field": "/wxcomponents/dist/field/index"
+				}
 			}
-			
+
 		},
 		{
 			"path": "pages/myone/ariclle",
 			"style": {
 				"navigationBarTitleText": "文章搜索",
-				"usingComponents":{
-					     "van-field": "/wxcomponents/dist/field/index"
-						}
+				"usingComponents": {
+					"van-field": "/wxcomponents/dist/field/index"
+				}
 			}
-			
+
 		},
 		{
 			"path": "pages/myOrder/estimate",
 			"style": {
 				"navigationBarTitleText": "评价晒单",
-				"usingComponents":{
-					     "van-field": "/wxcomponents/dist/field/index",
-						 "van-rate": "/wxcomponents/dist/rate/index"
-						}
+				"usingComponents": {
+					"van-field": "/wxcomponents/dist/field/index",
+					"van-rate": "/wxcomponents/dist/rate/index"
+				}
 			}
-			
+
 		},
 		{
 			"path": "pages/myOrder/adress",
 			"style": {
 				"navigationBarTitleText": "我的地址",
-				"usingComponents":{
-					     "van-field": "/wxcomponents/dist/field/index",
-						  "van-checkbox": "/wxcomponents/dist/checkbox/index",
-						  "van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
-						  "van-submit-bar": "/wxcomponents/dist/submit-bar/index"
-						}
+				"usingComponents": {
+					"van-field": "/wxcomponents/dist/field/index",
+					"van-checkbox": "/wxcomponents/dist/checkbox/index",
+					"van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
+					"van-submit-bar": "/wxcomponents/dist/submit-bar/index"
+				}
 			}
-			
+
 		},
 		{
 			"path": "pages/myOrder/adressManger",
 			"style": {
-				"usingComponents":{
-					     "van-field": "/wxcomponents/dist/field/index",
-						  "van-area": "/wxcomponents/dist/area/index"
-						}
+				"usingComponents": {
+					"van-field": "/wxcomponents/dist/field/index",
+					"van-area": "/wxcomponents/dist/area/index"
+				}
 			}
 		},
 		//applyfor
@@ -292,7 +291,7 @@
 			"style": {
 				"navigationBarTitleText": "支付成功",
 				"usingComponents": {
-				   "van-icon": "/wxcomponents/dist/icon/index"
+					"van-icon": "/wxcomponents/dist/icon/index"
 				}
 			}
 		},
@@ -301,8 +300,8 @@
 			"style": {
 				"navigationBarTitleText": "申请代理",
 				"usingComponents": {
-				  "van-field": "/wxcomponents/dist/field/index",
-				  "van-uploader": "/wxcomponents/dist/uploader/index"
+					"van-field": "/wxcomponents/dist/field/index",
+					"van-uploader": "/wxcomponents/dist/uploader/index"
 				}
 			}
 		},
@@ -311,36 +310,36 @@
 			"style": {
 				"navigationBarTitleText": "申请酒店入驻",
 				"usingComponents": {
-				  "van-field": "/wxcomponents/dist/field/index",
-				  "van-uploader": "/wxcomponents/dist/uploader/index"
+					"van-field": "/wxcomponents/dist/field/index",
+					"van-uploader": "/wxcomponents/dist/uploader/index"
 				}
 			}
 		},
 		{
 			"path": "pages/myCenter/definite",
 			"style": {
-				"navigationBarTitleText": "圈币明细", 
-				 "usingComponents": {
-				   "van-cell-group": "/wxcomponents/dist/cell-group/index"
-				 }
+				"navigationBarTitleText": "圈币明细",
+				"usingComponents": {
+					"van-cell-group": "/wxcomponents/dist/cell-group/index"
+				}
 			}
 		},
 		{
 			"path": "pages/myCenter/logion",
 			"style": {
-				"navigationBarTitleText": "登录", 
-				 "usingComponents": {
-					 
-				 }
+				"navigationBarTitleText": "登录",
+				"usingComponents": {
+
+				}
 			}
 		},
 		{
 			"path": "pages/myCenter/business",
 			"style": {
-				"navigationBarTitleText": "商务合作", 
-				 "usingComponents": {
-				   "van-cell-group": "/wxcomponents/dist/cell-group/index"
-				 }
+				"navigationBarTitleText": "商务合作",
+				"usingComponents": {
+					"van-cell-group": "/wxcomponents/dist/cell-group/index"
+				}
 			}
 		},
 		{
@@ -366,10 +365,10 @@
 			"style": {
 				"navigationBarTitleText": "我的收藏",
 				"usingComponents": {
-				  "van-tab": "/wxcomponents/dist/tab/index",
-				  "van-tabs": "/wxcomponents/dist/tabs/index",
-				  "van-card": "/wxcomponents/dist/card/index"
-				  
+					"van-tab": "/wxcomponents/dist/tab/index",
+					"van-tabs": "/wxcomponents/dist/tabs/index",
+					"van-card": "/wxcomponents/dist/card/index"
+
 				}
 			}
 		},
@@ -379,15 +378,14 @@
 				"navigationBarTitleText": "消息通知"
 			}
 		}
-    ],
+	],
 	"tabBar": {
 		"color": "#7F8389",
 		"selectedColor": "#fa436a",
-		"list": [
-			{
+		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/bottombtn0101.png",
-				 "selectedIconPath": "static/bottombtn0102.png",
+				"selectedIconPath": "static/bottombtn0102.png",
 				"text": "首页"
 			},
 			{
@@ -401,7 +399,7 @@
 				"iconPath": "static/bottombtn0301.png",
 				"selectedIconPath": "static/bottombtn0302.png",
 				"text": "订单"
-			}, 
+			},
 			{
 				"pagePath": "pages/myCenter/index",
 				"iconPath": "static/bottombtn0401.png",
@@ -410,24 +408,24 @@
 			}
 		]
 	},
-	
+
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8",
-		"usingComponents":{
-			 "van-dialog": "/wxcomponents/dist/dialog/index",
-			 "van-rate": "/wxcomponents/dist/rate/index",
-			 "van-cell": "/wxcomponents/dist/cell/index",
-			 "van-skeleton": "/wxcomponents/dist/skeleton/index",
-			 "van-icon": "/wxcomponents/dist/icon/index"
+		"usingComponents": {
+			"van-dialog": "/wxcomponents/dist/dialog/index",
+			"van-rate": "/wxcomponents/dist/rate/index",
+			"van-cell": "/wxcomponents/dist/cell/index",
+			"van-skeleton": "/wxcomponents/dist/skeleton/index",
+			"van-icon": "/wxcomponents/dist/icon/index"
 		}
-		
+
 	},
 	"permission": {
-	      "scope.userLocation": {
-	        "desc": "你的位置信息将用于小程序位置接口的效果展示" 
-	      }
-	    }
+		"scope.userLocation": {
+			"desc": "你的位置信息将用于小程序位置接口的效果展示"
+		}
+	}
 }

pages/index/hotel.vue

@@ -1,129 +1,122 @@
 <template>
     <view>
 	   <van-skeleton  :loading="loading">
+		<view class="home" v-if="isfx" @click="openHome()">
+			<image src="../../static/bottombtn0101.png"></image>
+		</view>   
        <view style="height: 65upx;"></view>
         <scroll-view  style="height: 95vh;" class="floor-list"
          :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
          :refresher-enabled="false">
-       <view class="scrollswiper">
-                <swiper class="swiper" 	  
-				 indicator-dots 
-				 circular=true
-				 :autoplay="autoplay" 
-				 :interval="interval" 
-				 :duration="duration"
-				>
-                   <swiper-item v-for="(item,index) in store_slide" :key="index"> 
-                       <view style="height: 100%;" class="swiper-item">
-						    <image style="height: 100%;width: 100%;" :src='item' />
+		   <view class="scrollswiper">
+			   <swiper class="swiper" indicator-dots circular=true :autoplay="autoplay" :interval="interval" :duration="duration">
+				   <swiper-item v-for="(item,index) in store_slide" :key="index"> 
+					   <view style="height: 100%;" class="swiper-item">
+							<image style="height: 100%;width: 100%;" :src='item' />
 					   </view>
-                   </swiper-item>
-                </swiper>
-       </view>
+				   </swiper-item>
+				</swiper>
+		   </view>
        
-       <view class="titeTop"  :class="iScrolltop == 2?'activeColor' : ''">
-           <view @tap="goback()" class="topleft">
-               <uniIcon type="back" size="22" color="#666666" />
-           </view>
-           <view @click="gotosearch">
-               <view class="input-view">
-                    <uniIcon type="search" size="22" color="#666666" />
-                    <input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" @confirm="confirm" />
-               </view>
-           </view>
-          <!-- <view class="topright">
-               <uniIcon type="arrowright" size="22" color="#666666" />
-           </view> -->
-       </view>
-       <view class="tip">
-           <view style="font-size: 36upx;color: #303133;">{{hotelitle}}</view>
-           <view >
-			   <van-icon name="star-o" @click="gocollect" v-if="has_collected == 0" size="22" />
-			   <van-icon name="star-o" @click="gocollect" v-if="has_collected == 1"  size="22" color= "#D9332E" /> 
-           </view>
-       </view>
-	   <view v-if="store_summary" style="color: #666;padding: 0 32upx 10upx 32upx;">{{store_summary}}</view>
-       <view>
-                  <van-tabs title-active-color="#D9332E" v-model="activeindex" @click.stop="onChange">
-                    <van-tab :name="0" title="服务项目">
-                  <view>
-					  <!-- background: #909399 -->
-                      <view class="giveList">
-                          <view class="giveItem" v-for="(item,index) in category_list" :key="index" @click.stop="godetail(item)">
-                            <image :src="item.pic" 
-							style="width:100%;height: 69%;">
-							</image>
-                            <p style="text-align: center;font-size: 24rpx;">{{item.gc_name}}</p>
-                          </view>
-                      </view>
-                  
-                  <view style="padding: 0upx 18upx 20upx 18upx ;">
-                      <view style="width: 95%;margin: 0 auto;">
-                              <view @click.stop="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
-                                  综合
-                              </view>
-                              <view@click.stop="choseType(2)"   class="typeItem">
-                                <view class="iconClass">
-                                    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
-                                    <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
-										<view  v-if="istopclick==0">
-											<!-- <van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /> -->
-											<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
-										</view>
-                                        <view  v-if="istopclick==1">
-											<!-- <van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /> -->
-											<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
-										</view>
-                                        <view  v-if="istopclick==2">
-											<!-- <van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" /> -->
-											<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
+		   <view class="titeTop"  :class="iScrolltop == 2?'activeColor' : ''">
+			   <view @tap="goback()" class="topleft">
+				   <uniIcon type="back" size="22" color="#666666" />
+			   </view>
+			   <view @click="gotosearch">
+				   <view class="input-view">
+						<uniIcon type="search" size="22" color="#666666" />
+						<input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" @confirm="confirm" />
+				   </view>
+			   </view>
+		   </view>
+		   <view class="tip">
+			   <view style="font-size: 36upx;color: #303133;">{{hotelitle}}</view>
+			   <view >
+				   <van-icon name="star-o" @click="gocollect" v-if="has_collected == 0" size="22" />
+				   <van-icon name="star-o" @click="gocollect" v-if="has_collected == 1"  size="22" color= "#D9332E"/> 
+			   </view>
+		   </view>
+			<view v-if="store_summary" style="color: #666;padding: 0 32upx 10upx 32upx;">{{store_summary}}</view>
+		   <view>
+			  <van-tabs title-active-color="#D9332E" v-model="activeindex" @click.stop="onChange">
+				 <van-tab :name="0" title="服务项目">
+					<view>
+						  <view class="giveList">
+								  <view class="giveItem" v-for="(item,index) in category_list" :key="index" @click.stop="godetail(item)">
+									<image :src="item.pic" 
+									style="width:100%;height: 69%;">
+									</image>
+									<p style="text-align: center;font-size: 24rpx;">{{item.gc_name}}</p>
+								  </view>
+							  </view>
+						  
+						  <view style="padding: 0upx 18upx 20upx 18upx ;">
+							  <view style="width: 95%;margin: 0 auto;">
+									  <view @click.stop="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
+										  综合
+									  </view>
+									  <view@click.stop="choseType(2)"   class="typeItem">
+										<view class="iconClass">
+											<view :class="tabIndex==2 ? 'active' : ''">上新</view>
+											<view style="display: flex;flex-direction: column;margin-left: 10rpx;">
+												<view  v-if="istopclick==0">
+													<!-- <van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /> -->
+													<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
+												</view>
+												<view  v-if="istopclick==1">
+													<!-- <van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /> -->
+													<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
+												</view>
+												<view  v-if="istopclick==2">
+													<!-- <van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" /> -->
+													<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
+												</view>
+											</view>
 										</view>
-                                    </view>
-                                </view>
-                              </view>
-                              <view @click.stop="choseType(3)"  class="typeItem">
-                                  <view class="iconClass">
-                                      <view :class="tabIndex==3 ? 'active' : ''">价格</view>
-                                      <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
-										 <view v-if="isprice==0">
-										 	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
-										 </view>
-										 <view  v-if="isprice==3">
-										 	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
-										 </view>
-										 <view  v-if="isprice==4">
-										 	<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
-										 </view>
-										 
-                                      </view>
-                                  </view>
-                              </view>
-                              <view  @click.stop="choseType(4)" class="typeItem">
-								    <view :class="ishowpull ? 'active' : ''">分类
-										<img v-if="!ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
-										<img v-if="ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
-									</view>
-                              </view>
-                          </view>
-                  </view>
-				  <view v-if="ishowpull" style="display: flex;flex-wrap: wrap;padding: 10upx  12upx;">
-						  <view class="spacedance"
-						   v-for="(item, index) in classify" :key="index"
-							 @click.stop="confirm(item)" >
-							 {{item.gc_name}}
-						  </view> 
-				  </view>
-                 <!-- 商品列表 -->
-                     <shopList :goodId="goodId" :productList="goods_list" />
-					 <view v-if="isDetail==1"  class="fontcenter">加载中...</view>
-					 <view v-if="isDetail==2" class="fontcenter">暂无更多商品</view>
-                  </view> 
-                 </van-tab>
-                    <van-tab  :name="1" :title="'评价' +'  '+feedback_count">
-                     <!-- 评价列表 -->
-                     <assess :feedback_list="feedback_list" :showpicture="showpicture" />
-                 </van-tab>
-                    <van-tab  :name="2" title="酒店信息">
+									  </view>
+									  <view @click.stop="choseType(3)"  class="typeItem">
+										  <view class="iconClass">
+											  <view :class="tabIndex==3 ? 'active' : ''">价格</view>
+											  <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
+												 <view v-if="isprice==0">
+													<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
+												 </view>
+												 <view  v-if="isprice==3">
+													<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
+												 </view>
+												 <view  v-if="isprice==4">
+													<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
+												 </view>
+												 
+											  </view>
+										  </view>
+									  </view>
+									  <view  @click.stop="choseType(4)" class="typeItem">
+											<view :class="ishowpull ? 'active' : ''">分类
+												<img v-if="!ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
+												<img v-if="ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
+											</view>
+									  </view>
+								  </view>
+						  </view>
+						  <view v-if="ishowpull" style="display: flex;flex-wrap: wrap;padding: 10upx  12upx;">
+								  <view class="spacedance"
+								   v-for="(item, index) in classify" :key="index"
+									 @click.stop="confirm(item)" >
+									 {{item.gc_name}}
+								  </view> 
+						  </view>
+						 <!-- 商品列表 -->
+						 <shopList :goodId="goodId" :productList="goods_list" />
+						 <view v-if="isDetail==1"  class="fontcenter">加载中...</view>
+						 <view v-if="isDetail==2" class="fontcenter">暂无更多商品</view>
+					 </view> 
+					 </van-tab>
+					<van-tab  :name="1" :title="'评价' +'  '+feedback_count">
+						<!-- 评价列表 -->
+						<assess :feedback_list="feedback_list" :showpicture="showpicture" />
+					</van-tab>
+					<van-tab  :name="2" title="酒店信息">
 						<view style="padding: 20upx 32upx 0upx 32upx;margin-bottom: 200upx;">
 							  <view style="padding-bottom: 10upx;">商家信息</view>
 							  <rich-text :nodes="store_description"></rich-text> 
@@ -138,15 +131,16 @@
 								  <view v-else>暂无</view>
 							  </view>
 						</view>
-                 </van-tab>
-                  </van-tabs>
-             
-       </view>
-       </scroll-view>
-	   <view v-if="activeindex == 2" class="bottomButton">
-	         <button type="warn" @click="gofeedback">您的入住意见反馈(反馈送圈币)</button>
-	    </view>
-	   <Gobacktop @getop="getop" v-if="isTop" />
+				   </van-tab>
+				   
+			   </van-tabs>
+		   </view>
+		   
+		   </scroll-view>
+		   <view v-if="activeindex == 2" class="bottomButton">
+				 <button type="warn" @click="gofeedback">您的入住意见反馈(反馈送圈币)</button>
+			</view>
+		   <Gobacktop @getop="getop" v-if="isTop" />
 	   </van-skeleton>
 	</view>
 </template>
@@ -172,6 +166,7 @@
         },
         data() {
             return {
+				isfx:false,
 				firstloading: 0,
 				showpicture: false,
 				loading: true,
@@ -219,8 +214,7 @@
                 {
                     name:'分类',
                     id:'3'
-                }
-                ],
+                }],
 				ishowpull: false,
 				classify: [],
                 background: ['color1', 'color2', 'color3'],
@@ -230,11 +224,9 @@
                 duration: 500,
                 activeindex: 0,
                 scrollTop: 0,
-                old: {
-                    scrollTop: 0
-                },
-                    value1: 0,
-                    iScrolltop: 1
+                old: { scrollTop: 0},
+				value1: 0,
+				iScrolltop: 1,	
             }
         },
         onShareAppMessage(res) {
@@ -257,6 +249,11 @@
         
         },
 		onLoad(options){
+			if(options.isfx){
+				this.isfx=true;
+			}else{
+				this.isfx=false;
+			}
 			this.goodId = options.id;  // 商品和酒店Id
 			this.activeindex = 0;
 			this.getshopdetail(); // 获取商品详情
@@ -377,6 +374,11 @@
 			// 点击切换上下
 			changeisclick(e) {
 				
+			},
+			openHome(){
+				uni.switchTab({
+					url: `/pages/index/index`
+				})
 			},
 			godetail(item) {
 				let id = item.gc_id; // 一级菜单id
@@ -561,6 +563,23 @@
 </script>
   
 <style scoped>
+	.home{
+		position: absolute;
+		width: 60upx;
+		height: 60upx;
+		background-color: #fff;
+		border-radius: 50%;
+		box-shadow: 0 0 3upx #333333;
+		text-align: center;
+		top: 100upx;
+		z-index: 999;
+		left: 0;
+	}
+	.home image{
+		width: 40upx;
+		height: 40upx;
+		padding-top: 8rpx;
+	}
 	.van-tab--active {
 		color: #D9332E!important; 
 	}
@@ -657,7 +676,10 @@
         width: 100%;
     }
     .topleft {
-        
+        width: 60upx;
+		height: 60upx;
+		line-height: 60upx;
+		margin: 0 5upx;
     }
         
     .topright {

pages/index/hoteldetail.vue

@@ -1,271 +1,261 @@
 <template>
 	<view>
-		
-	  <view style='width: 100%;height: 70upx;'>
-	      <view style="width: 95%;margin: 0 auto;height: 80upx;position: fixed;top:0;width: 100%;background-color: #fff;z-index:99;">
-			 <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
-			    综合
-			 </view>
-			 <view @click="choseType(2)" class="typeItem">
-			   <view class="iconClass">
-				    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
-			     <view  v-if="istopclick==0">
-			     	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
-			     </view>
-			     <view  v-if="istopclick==1">
-			     	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
-			     </view>
-			     <view  v-if="istopclick==2">
-			     	<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
-			     </view>
-			   </view>
-			 </view>
-			 <view @click="choseType(3)"  class="typeItem">
-			     <view class="iconClass">
-			         <view :class="tabIndex==3 ? 'active' : ''">价格</view>
-			         <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
-						  <view v-if="isprice==0">
-							<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
-						  </view>
-						  <view  v-if="isprice==3">
-							<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
-						  </view>
-						  <view  v-if="isprice==4">
-							<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
-						  </view>
-			         </view>
-			     </view>
-			 </view>
-			 <view  @click.stop="choseType(4)" class="typeItem">
-				<view :class="ishowpull ? 'active' : ''">分类
-					<img v-if="!ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
-					<img v-if="ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
+		<view style="width: 100%;height: 70upx;">
+			<view style="width: 95%;margin: 0 auto;height: 80upx;position: fixed;top:0;width: 100%;background-color: #fff;z-index:99;">
+				<view @click="choseType(1)" :class="tabIndex == 1 ? 'active' : ''" class="typeItem">综合</view>
+				<view @click="choseType(2)" class="typeItem">
+					<view class="iconClass">
+						<view :class="tabIndex == 2 ? 'active' : ''">上新</view>
+						<view v-if="istopclick == 0"><img style="width: 36upx;height: 36upx;vertical-align: middle;" src="../../static/sort.png" /></view>
+						<view v-if="istopclick == 1"><img style="width: 36upx;height: 36upx;vertical-align: middle;" src="../../static/sort_down.png" /></view>
+						<view v-if="istopclick == 2"><img style="width: 36upx;height: 36upx;vertical-align: middle;" src="../../static/sort_up.png" /></view>
+					</view>
+				</view>
+				<view @click="choseType(3)" class="typeItem">
+					<view class="iconClass">
+						<view :class="tabIndex == 3 ? 'active' : ''">价格</view>
+						<view style="display: flex;flex-direction: column;margin-left: 10rpx;">
+							<view v-if="isprice == 0"><img style="width: 36upx;height: 36upx;vertical-align: middle;" src="../../static/sort.png" /></view>
+							<view v-if="isprice == 3"><img style="width: 36upx;height: 36upx;vertical-align: middle;" src="../../static/sort_down.png" /></view>
+							<view v-if="isprice == 4"><img style="width: 36upx;height: 36upx;vertical-align: middle;" src="../../static/sort_up.png" /></view>
+						</view>
+					</view>
 				</view>
-			 </view>
-	      </view>
-			
-	  </view>
-	     <view style="clear: both;
+				<view @click.stop="choseType(4)" class="typeItem">
+					<view :class="ishowpull ? 'active' : ''">
+						分类
+						<img v-if="!ishowpull" style="width: 36upx;height: 36upx;" src="../../static/sortb.png" />
+						<img v-if="ishowpull" style="width: 36upx;height: 36upx;" src="../../static/sortb_up.png" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view
+			style="clear: both;
 		    width: 100%;
 			overflow: hidden;
 			position: fixed;
 			z-index: 99;
-			background: #fff;">
+			background: #fff;"
+		>
 			<view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="ishowpull">
-			  <view  class="spacedance"
-			   v-for="(item, index) in category_list" :key="index"
-				 @click.stop="confirm(item)" >
-				 {{item.gc_name}}
-			  </view> 
-			</view>
+				<view class="spacedance" v-for="(item, index) in category_list" :key="index" @click.stop="confirm(item)">{{ item.gc_name }}</view>
 			</view>
+		</view>
 
-			<scroll-view  style="height: 95vh;" class="floor-list"
-			 :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
-			 :refresher-enabled="false">
-		       <shopList  :goodId="store_id" :productList="goods_list" />
-			   <view v-if="ispill"  class="fontcenter">加载中...</view>
-			   <view v-if="!ispill" class="fontcenter">暂无更多商品</view>
-		   </scroll-view>
-		    <Gobacktop @getop="getop" v-if="isTop" />
-		  </view>
-		  
+		<scroll-view
+			style="height: 95vh;"
+			class="floor-list"
+			:scroll-top="scrollTop"
+			scroll-y="true"
+			@scroll="scroll"
+			@scrolltoupper="upper"
+			@scrolltolower="lower"
+			:refresher-enabled="false"
+		>
+			<shopList :goodId="store_id" :productList="goods_list" />
+			<view v-if="ispill" class="fontcenter">加载中...</view>
+			<view v-if="!ispill" class="fontcenter">暂无更多商品</view>
+		</scroll-view>
+		<Gobacktop @getop="getop" v-if="isTop" />
+	</view>
 </template>
 
 <script>
-    import shopList from '@/component/shopList.vue'  // 商品列表	
-	import Gobacktop from '@/component/Gobacktop.vue'
-	export default {
-		components: {
-		    shopList,
-			Gobacktop
-		},
-		data() {
-			return {
-				loadingpull: true,
-				ispill: true,
-				ishowpull: false,
-				isTop: 0,
-				isprice: 0,
-				goods_list:[],
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				chosegoods_commonid:　true,
-				chosegoods_price: true,
-				istopclick: 0,
-				tabIndex: 	1,
-				title:'',
-				store_id:'',
-				category_list:[],
-				page: 1,
-				page_size: 10,
-				gc_id_1:'',//	一级分类id
-				gc_id_2:'',//	二级分类id
-				goods_commonid:'',//	上新排序 desc-降序 asc-尚需
-				goods_price	:'',//	价格排序 desc-降序 asc-尚需
-				praise	:'',//	好评率排序 desc-降序 asc-尚需
-			}
-		},
-		onLoad(options){
-			this.title = options.gc_name;
-			this.gc_id_1 = options.id;
-			this.store_id = options.store_id;
-			uni.setNavigationBarTitle({
-			    title: options.gc_name
+import shopList from '@/component/shopList.vue'; // 商品列表
+import Gobacktop from '@/component/Gobacktop.vue';
+export default {
+	components: {
+		shopList,
+		Gobacktop
+	},
+	data() {
+		return {
+			loadingpull: true,
+			ispill: true,
+			ishowpull: false,
+			isTop: 0,
+			isprice: 0,
+			goods_list: [],
+			scrollTop: 0,
+			old: {
+				scrollTop: 0
+			},
+			chosegoods_commonid: true,
+			chosegoods_price: true,
+			istopclick: 0,
+			tabIndex: 1,
+			title: '',
+			store_id: '',
+			category_list: [],
+			page: 1,
+			page_size: 10,
+			gc_id_1: '', //	一级分类id
+			gc_id_2: '', //	二级分类id
+			goods_commonid: '', //	上新排序 desc-降序 asc-尚需
+			goods_price: '', //	价格排序 desc-降序 asc-尚需
+			praise: '' //	好评率排序 desc-降序 asc-尚需
+		};
+	},
+	onLoad(options) {
+		this.title = options.gc_name;
+		this.gc_id_1 = options.id;
+		this.store_id = options.store_id;
+		uni.setNavigationBarTitle({
+			title: options.gc_name
+		});
+		this.getshopdetail();
+		this.hotelsecondmenu(); // 二级菜单
+	},
+	methods: {
+		
+		getop() {
+			this.scrollTop = this.old.scrollTop;
+			this.$nextTick(function() {
+				this.scrollTop = 0;
 			});
-			this.getshopdetail();
-			this.hotelsecondmenu(); // 二级菜单
+			this.isTop = false;
 		},
-		methods: {
-			getop() {
-				this.scrollTop = this.old.scrollTop
-                this.$nextTick(function(){
-                    this.scrollTop=0;
-                });
-				this.isTop = false;
-			},
-			choseType(e) {
-		      this.page = 1;
-			  this.tabIndex = e;
-			if(this.tabIndex == 1) {  // 服务
+		choseType(e) {
+			this.page = 1;
+			this.tabIndex = e;
+			if (this.tabIndex == 1) {
+				// 服务
 				this.istopclick = 0;
 				this.isprice = 0;
 				this.gc_id_2 = '';
-				this.goods_price = ''; 
+				this.goods_price = '';
 				this.goods_commonid = '';
-				this.getshopdetail(2); 
-			}else if(this.tabIndex == 2){ //伤
-			        this.chosegoods_price = true;
-					this.istopclick = this.chosegoods_commonid?1:2;
-					this.isprice = 0;
-					this.goods_price = ''; 
-					this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
-					this.chosegoods_commonid = !this.chosegoods_commonid;
-					this.getshopdetail(2);
-			}else if(this.tabIndex == 3){ // 价格
-					this.chosegoods_commonid = true;
-					this.isprice = this.chosegoods_price?3:4;
-					this.goods_price = this.chosegoods_price?'desc':'asc';
-					this.goods_commonid = '';
-					this.istopclick = 0;
-					this.chosegoods_price = !this.chosegoods_price;
-					this.getshopdetail(2);
-				}else if(this.tabIndex ==4) {  // 分类
-					this.istopclick = 0;
-					this.isprice = 0;
-					this.goods_price = ''; 
-					this.goods_commonid = '';
-					this.chosegoods_price = true;
-					this.chosegoods_commonid = true;
-					this.ishowpull = !this.ishowpull;
-				}
-			
-			},
-			
-			// 点击图标上下筛选切换
-			changeisclick(e) {
-				
-			},
-			confirm(e) {
-				this.tabIndex = 0;
-				this.gc_id_2 = e.gc_id;
-				this.ishowpull = false;
 				this.getshopdetail(2);
-			},
-			// 获取商品详情
-			getshopdetail(e) {
-				this.request({
-				                url:"/v2/entry/storeGoods",
-				                method:'get',
-				                data: {
-				                         store_id: this.store_id,
-										 page: this.page,
-										 goods_commonid: this.goods_commonid, // 上新排序
-										 goods_price: this.goods_price,
-										 gc_id_1: this.gc_id_1,
-										 gc_id_2: this.gc_id_2
-				                    },
-								success: (res)=> {
-									if(res.data.data.goods_list.length>10) {
-										this.ispill = true;
-									}else {
-										this.ispill = false;
-									}
-									if(e == 2) {
-										this.goods_list = [];
-									}
-									this.goods_list = this.goods_list.concat(res.data.data.goods_list);
-								},
-			    })
-			},
-			// 二级菜单
-			hotelsecondmenu(){
-				let that = this;
-				this.request({
-					url:'/v1/entry/storeCategory2',
-					method:'POST',
-					data: {
-						store_id: this.store_id,
-						gc_id: this.gc_id_1
-					},
-					success: function(res) {
-						let { category_list } = res.data.data;
-						let array = [{gc_id:'',gc_name:'全部'}];
-						that.category_list = array.concat(category_list)
-						
+			} else if (this.tabIndex == 2) {
+				//伤
+				this.chosegoods_price = true;
+				this.istopclick = this.chosegoods_commonid ? 1 : 2;
+				this.isprice = 0;
+				this.goods_price = '';
+				this.goods_commonid = this.chosegoods_commonid ? 'asc' : 'desc';
+				this.chosegoods_commonid = !this.chosegoods_commonid;
+				this.getshopdetail(2);
+			} else if (this.tabIndex == 3) {
+				// 价格
+				this.chosegoods_commonid = true;
+				this.isprice = this.chosegoods_price ? 3 : 4;
+				this.goods_price = this.chosegoods_price ? 'desc' : 'asc';
+				this.goods_commonid = '';
+				this.istopclick = 0;
+				this.chosegoods_price = !this.chosegoods_price;
+				this.getshopdetail(2);
+			} else if (this.tabIndex == 4) {
+				// 分类
+				this.istopclick = 0;
+				this.isprice = 0;
+				this.goods_price = '';
+				this.goods_commonid = '';
+				this.chosegoods_price = true;
+				this.chosegoods_commonid = true;
+				this.ishowpull = !this.ishowpull;
+			}
+		},
+
+		// 点击图标上下筛选切换
+		changeisclick(e) {},
+		confirm(e) {
+			this.tabIndex = 0;
+			this.gc_id_2 = e.gc_id;
+			this.ishowpull = false;
+			this.getshopdetail(2);
+		},
+		// 获取商品详情
+		getshopdetail(e) {
+			this.request({
+				url: '/v2/entry/storeGoods',
+				method: 'get',
+				data: {
+					store_id: this.store_id,
+					page: this.page,
+					goods_commonid: this.goods_commonid, // 上新排序
+					goods_price: this.goods_price,
+					gc_id_1: this.gc_id_1,
+					gc_id_2: this.gc_id_2
+				},
+				success: res => {
+					if (res.data.data.goods_list.length > 10) {
+						this.ispill = true;
+					} else {
+						this.ispill = false;
 					}
-				})
-			},
-			// 滚动到顶部
-			upper(e) {
-			},
-			
-			// 滚到底部
-			lower(e) {
-				if(this.ispill) {
-					this.page = this.page + 1;
-					this.getshopdetail();
+					if (e == 2) {
+						this.goods_list = [];
+					}
+					this.goods_list = this.goods_list.concat(res.data.data.goods_list);
 				}
-			},
-			
-			// 滚动时触发
-			scroll(e) {
-				if(e.detail.scrollTop > 400) {
-						this.isTop = true;
-				}else{ //当距离小于500时显示回到顶部按钮
-						this.isTop = false;
+			});
+		},
+		// 二级菜单
+		hotelsecondmenu() {
+			let that = this;
+			this.request({
+				url: '/v1/entry/storeCategory2',
+				method: 'POST',
+				data: {
+					store_id: this.store_id,
+					gc_id: this.gc_id_1
+				},
+				success: function(res) {
+					let { category_list } = res.data.data;
+					let array = [{ gc_id: '', gc_name: '全部' }];
+					that.category_list = array.concat(category_list);
 				}
-				this.old.scrollTop = e.detail.scrollTop
+			});
+		},
+		// 滚动到顶部
+		upper(e) {},
+
+		// 滚到底部
+		lower(e) {
+			if (this.ispill) {
+				this.page = this.page + 1;
+				this.getshopdetail();
+			}
+		},
+
+		// 滚动时触发
+		scroll(e) {
+			if (e.detail.scrollTop > 400) {
+				this.isTop = true;
+			} else {
+				//当距离小于500时显示回到顶部按钮
+				this.isTop = false;
 			}
+			this.old.scrollTop = e.detail.scrollTop;
 		}
 	}
+};
 </script>
 
 <style>
-	.active {
-	    color: #F76260;
-	}
-	.typeItem {
-	    width: 25%;
-	    display: inline-block;
-	    text-align: center;
-	}
-	.iconClass {
-	    display: flex;
-	    flex-direction: row;
-	    align-items: center;
-	    justify-content: center;
-
-	}
-	.spacedance {
-		border:1px solid #666;
-		flex: 1;width: 20%;
-		text-align: center;
-		min-width: 20%;
-		max-width: 20%;
-		margin: 6rpx 0 25rpx 4%;
-		padding:4upx 0;
-	}
+.active {
+	color: #f76260;
+}
+.typeItem {
+	width: 25%;
+	display: inline-block;
+	text-align: center;
+}
+.iconClass {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+}
+.spacedance {
+	border: 1px solid #666;
+	flex: 1;
+	width: 20%;
+	text-align: center;
+	min-width: 20%;
+	max-width: 20%;
+	margin: 6rpx 0 25rpx 4%;
+	padding: 4upx 0;
+}
 </style>

pages/index/shop.vue

@@ -86,34 +86,13 @@
 			</van-tabs>
  		</view>
 		</scroll-view>
- 		<!-- 底部操作菜单 -->
- 	<!-- 	<view class="page-bottom">
- 			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
- 				<text class="yticon icon-xiatubiao--copy"></text>
- 				<text>首页</text>
- 			</navigator>
- 			<navigator url="/pages/index/cart" open-type="navigate"   class="p-b-btn">
- 				<text class="yticon icon-gouwuche"></text>
- 				<text>购物车</text>
- 			</navigator>
- 			<view class="p-b-btn" :class="{active: favorite}" @click="toFavorite">
- 				<text class="yticon icon-shoucang"></text>
- 				<text>收藏</text>
- 			</view>
- 			<view class="action-btn-group">
-				<button type="primary" @click="openCar"  class=" action-btn no-border add-cart-btn">加入购物车</button>
- 				<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy">立即购买</button>
- 			</view>
- 		</view> -->
-		
-		
+
  		<!-- 规格-模态层弹窗 -->
  		<view 
  			class="popup spec" 
  			:class="specClass"
  			@touchmove.stop.prevent="stopPrevent"
- 			@click="toggleSpec"
- 		>
+ 			@click="toggleSpec">
  			<!-- 遮罩层 -->
  			<view class="mask"></view>
  			<view class="layer attr-content" @click.stop="stopPrevent">
@@ -164,13 +143,6 @@
 				</view>
  			</view>
  		</view>
- 		<!-- 分享 -->
- 		<!-- <share 
- 			ref="share" 
- 			:contentHeight="580"
- 			:shareList="shareList"
- 		></share> -->
-		
 		<View class="page-bottom">
 			<van-goods-action>
 			<!--  <van-goods-action-icon @click="goIndex" icon="bag-o" /> -->
@@ -190,6 +162,9 @@
 		<Gobacktop @getop="getop" :bottomtop="2" v-if="isTop" />
 		 <unipopup :images="images"  :show="ishow"/>
 		</van-skeleton>
+		<view class="home" v-if="isfx" @click="openHome()">
+			<image src="../../static/bottombtn0101.png"></image>
+		</view>
  	</view>
  </template>
  
@@ -249,14 +224,11 @@
 				firstprice: 0,
  				favorite: true,
  				shareList: [],
- 				imgList: [
- 				],
- 				desc: `
- 					
- 				`,
- 				specList: [
- 				],
-				onlystoreId: 0 // 总酒店id
+ 				imgList: [],
+ 				desc:'',
+ 				specList: [],
+				onlystoreId: 0 ,// 总酒店id
+				isfx:false,
  			};
  		},
 		onLaunch: function(){
@@ -282,6 +254,11 @@
 			});
 		},
  		async onLoad(options){
+			if(options.isfx){
+				this.isfx=true;
+			}else{
+				this.isfx=false;
+			}
  			this.goodId = options.id;  // 商品公共id
 			this.store_id =  options.store_id; // 酒店id
 			this.onlystoreId = options.goodId;
@@ -322,6 +299,11 @@
 			
 		},
  		methods:{
+			openHome(){
+				uni.switchTab({
+					url: `/pages/index/index`
+				})
+			},
 			shoupicture(item) {
 				this.images =this.pictureUrl+'/uploads/home/store/goods/'+item.goodsimage_url.substr(0, item.goodsimage_url.indexOf('\_')) + '/' + item.goodsimage_url;
 				this.ishow = true;
@@ -723,7 +705,23 @@
  		/* padding-bottom: 160upx; */
 		position: relative;
  	}
-	
+	.home{
+		position: absolute;
+		width: 60upx;
+		height: 60upx;
+		background-color: #fff;
+		border-radius: 50%;
+		box-shadow: 0 0 3upx #333333;
+		text-align: center;
+		top: 100upx;
+		z-index: 999;
+		left: 0;
+	}
+	.home image{
+		width: 40upx;
+		height: 40upx;
+		padding-top: 8rpx;
+	}
  	.icon-you{
  		font-size: 28upx + 2upx;
  		color: #888;

pages/myCenter/logion.vue

@@ -1,153 +1,132 @@
 <template>
 	<view>
-		<view style="text-align: center;margin-top: 60upx;">
-			<image src="../../static/logo.png" style="width: 150upx;height: 150upx;" />
-		</view>
-		<view v-if='!hasLogin'>
+		<view style="text-align: center;margin-top: 60upx;"><image src="../../static/logo.png" style="width: 150upx;height: 150upx;" /></view>
+		<view v-if="!isLogin">
 			<view style="text-align: center;margin: 50upx 0 10upx 0;font-size: 36upx;">圈在网申请获取您的以下权限</view>
 			<view style="text-align: center;margin: 0 0 50upx 0;font-size: 24upx;color: #666666;">获取您的公开信息(昵称，头像等)</view>
-			<view style="width: 50%;margin: 0 auto;">
-				<button @click="wxlogion"  type="warn" open-type='getUserInfo'>
-					授权登录
-				</button>
-			</view>
+			<view style="width: 50%;margin: 0 auto;"><button @getuserinfo="wxlogion" type="warn" open-type="getUserInfo">授权登录</button></view>
 		</view>
-		<view  v-if='hasLogin&& !successlogion'>
+		<view v-if="isLogin && !successlogion">
 			<view style="text-align: center;margin: 100upx;font-size: 36upx;">登录即注册立即成为圈在网会员</view>
-			<view style="width: 50%;margin: 0 auto;">
-				 <button type="warn" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">微信手机号登录</button>
-			</view>
-		</view>
-		<view @click="closesure" style="width: 50%;margin: 30upx auto;text-align:center;font-szie: 30upx;">
-				暂不授权
+			<view style="width: 50%;margin: 0 auto;"><button type="warn" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">微信手机号登录</button></view>
 		</view>
+		<view @click="closesure" style="width: 50%;margin: 30upx auto;text-align:center;font-szie: 30upx;">暂不授权</view>
 		<view style="position: fixed; bottom: 30upx;width: 100%;">
-			<view style="text-align: center;padding-bottom: 20upx;">
-				请仔细阅读以下协议，若不同意相关内容，您应停止授权
-			</view>
+			<view style="text-align: center;padding-bottom: 20upx;">请仔细阅读以下协议，若不同意相关内容，您应停止授权</view>
 			<view style="text-align: center;">
-		     	<span style="color: #D9332E;padding-right: 20upx;" @click="gouser"> 《用户协议》   </span> 
-				<span style="color: #D9332E;" @click="goforate">  《隐私政策》 </span>
+				<span style="color: #D9332E;padding-right: 20upx;" @click="gouser">《用户协议》</span>
+				<span style="color: #D9332E;" @click="goforate">《隐私政策》</span>
 			</view>
 		</view>
 	</view>
-	
 </template>
 
 <script>
-	import {
-		mapMutations,mapState
-	} from 'vuex'
-	export default {
-		props:{
-		  showdialog:{
-		    default: false,
-		    type: Boolean
-		  },
-		  ishow:{
-		    default: true,
-		    type: Boolean
-		  },
+import { mapMutations, mapState } from 'vuex';
+export default {
+	props: {
+		showdialog: {
+			default: false,
+			type: Boolean
 		},
-		 data() {
-			return{
-				show: false
-			}
+		ishow: {
+			default: true,
+			type: Boolean
+		}
+	},
+	data() {
+		return {
+			show: false,
+			isLogin:false,
+		};
+	},
+	computed: {
+		...mapState([
+			'hasLogin', // 用户是否同意授权
+			'userInfo', // 同意授权用户头像
+			'successlogion', // 同意手机号授权 登录成功
+			'sessionId', // 登录成功的token
+			'getcode' // logion时候获取的code session_key oppen_id
+		])
+	},
+	onLoad() {
+	},
+	methods: {
+		...mapMutations(['login', 'showDialog', 'setOpenid', 'setcode', 'islogionsuccess']),
+		closesure() {
+			uni.navigateBack();
+		},
+		// 隐私政策
+		goforate() {
+			uni.navigateTo({
+				url: './goforate'
+			});
 		},
-		computed:{
-			...mapState([
-			  'hasLogin',  // 用户是否同意授权
-			  'userInfo',   // 同意授权用户头像
-			  'successlogion', // 同意手机号授权 登录成功
-			  'sessionId',   // 登录成功的token
-			  'getcode',  // logion时候获取的code session_key oppen_id
-			]),
+
+		// 用户协议
+		gouser() {
+			uni.navigateTo({
+				url: './gouser'
+			});
 		},
-		onLoad(){
-			console.log(this.successlogion);
+		// 授权用户信息头像
+		wxlogion(e) {
+			let userInfo = e.detail.userInfo;
+			if(userInfo){
+				this.login(userInfo);
+				this.$msg('授权成功');
+				if (this.successlogion) {
+					this.showDialog(true); 
+					uni.navigateBack();
+				}else{
+					this.isLogin=true;
+				}
+			}else{
+				this.showDialog(false);
+				this.$msg('授权失败');
+			}
+
 		},
-		methods:{
-			...mapMutations(['login','showDialog', 'setOpenid', 'setcode','islogionsuccess']),
-			closesure() {
-				uni.navigateBack();
-			},
-			// 隐私政策
-			goforate() {
-				uni.navigateTo({
-					url: './goforate'
-				})
-			},
-			
-			// 用户协议
-			gouser() {
-				uni.navigateTo({
-					url: './gouser'
-				})
-			},
-			// 授权用户信息头像
-			wxlogion() {
-				let  that = this;
-				    uni.getUserInfo({
-					     success: (res) => {
-						     console.log(res)
-							 let userInfo = res.userInfo;
-							 that.login(userInfo);
-							 if(userInfo!='') {
-								 that.showDialog(true); // 改变haslogion的值
-								 that.$msg("授权成功");
-							 }
-							 if(this.successlogion) {
-								uni.navigateBack();
-							 }
-					     },
-					     fail(res) {
-						     console.log(res);
-							 that.showDialog(false);
-							 that.$msg("授权失败")
-					     }
-				    })
-			},
-			// 获取手机号码
-			decryptPhoneNumber(e) {
-			              console.log(e);    
-			              if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {    
-			                  console.log(e);
-			              } else {    
-			                  console.log('用户同意提供手机号');
-							  console.log(this.getcode);
-											let encryptedData = e.detail.encryptedData;
-											let iv = e.detail.iv;
-											console.log(this.userInfo);
-											// 调取注册账号
-											this.request({
-												url: '/v1/entry/mp_account',
-												method:'POST',
-												data: {
-													code: this.getcode.code,
-													encryptedData:　encryptedData,
-													iv:　iv,
-													name: this.userInfo.nickName,
-													avatar: this.userInfo.avatarUrl
-												},
-												success: (res) => {
-													let token = res.data.data.token;
-													this.setOpenid(token);
-													this.islogionsuccess(true);
-													uni.navigateBack();
-												},
-												fail: (res) => {
-													    console.log(res);
-														 this.islogionsuccess(false);
-														 this.setOpenid('');
-														 this.$msg("获取失败")
-												     }
-											})
-											
-									    }
-			  },
+		// 获取手机号码
+		decryptPhoneNumber(e) {
+			if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
+				
+			} else {
+				let encryptedData = e.detail.encryptedData;
+				let iv = e.detail.iv;
+				console.log("1");
+				console.log(this.getcode);
+				// 调取注册账号
+				this.request({
+					url: '/v1/entry/mp_account',
+					method: 'POST',
+					data: {
+						code: this.getcode.code,
+						encryptedData: encryptedData,
+						iv: iv,
+						name: this.userInfo.nickName,
+						avatar: this.userInfo.avatarUrl
+					},
+					success: res => {
+						console.log(res);
+						let token = res.data.data.token;
+						this.setOpenid(token);
+						this.islogionsuccess(true);
+						this.showDialog(true); // 改变haslogion的值
+						uni.navigateBack();
+					},
+					fail: res => {
+						console.log("2");
+						console.log(res);
+						this.islogionsuccess(false);
+						this.setOpenid('');
+						this.$msg('获取失败');
+					}
+				});
+			}
 		}
 	}
+};
 </script>
 
-<style>
-</style>
+<style></style>

pages/myOrder/index.vue

@@ -216,7 +216,6 @@
 				
 			},
 			
-			
 			// 订单退款售后列表
 			refund() {
 				this.request({
@@ -251,6 +250,9 @@
 						page_size:　10
 					},
 					success: (res) => {
+						console.log("订单");
+						console.log(res);
+						return;
 						if(res.data.data.order_list.length< 10) {
 							this.ispull = false;
 						}

pages/myOrder/reminder.vue

@@ -1,7 +1,7 @@
 <template>
 	  <view style="padding: 0upx 5%;">
 		  <TextArea ref="getValue" :tips="tips" @submitValue="submitValue"/>
-		  <view class="submitRemin" @click="submitRemin">提交</view>
+		  <button class="submitRemin" @click="submitRemin" :loading="Loading" :disabled="Loading">提交</button>
 	  </view>
 	  
 </template>
@@ -17,11 +17,11 @@
 				tips: '填写催单内容',
 				reminder: '',
 				order_id:'',
-				types: 0
+				types: 0,
+				Loading:false,
 			}
 		},
 		onLoad(e) {
-			console.log(e.a);
 			this.order_id = e.order_id;
 			this.types = e.a;
 			if(this.types== 1) {
@@ -45,6 +45,7 @@
 				   this.$msg("请填写内容");
 				   return;
 			   }
+			   this.Loading=true;
 			   this.request({
 				   url: '/v1/order/urge',
 				   method:'post',
@@ -53,19 +54,21 @@
 					   content: this.reminder
 				   },
 				   success:(res) => {
+					   this.Loading=false;
 					   if(res.data.code == 1000) {
 						   if(this.types == 1) {
 							   this.$msg("催单成功");
 						   }else if(this.types== 2) {
 							    this.$msg("联系酒店成功");
 						   }
-						   
 						   setTimeout(() => {
 							  uni.navigateBack();
 						   }, 500)
-						 
 					   }
- 				   }
+ 				   },
+				   complete:()=>{
+					    this.Loading=false;
+				   }
 			   })
 			}
 		}
@@ -74,11 +77,12 @@
 
 <style>
 	.submitRemin {
-		color: #fff;
-		background-color: #D9332E;
+		color: #fff !important;
+		background-color: #D9332E !important;
 		height: 70upx;
 		text-align: center;
 		line-height: 70upx;
         margin-top: 25upx;
+		width: 100%;
 	}
 </style>

store/logion.js

@@ -19,8 +19,7 @@ const store = new Vuex.Store({
 			uni.setStorage({//缓存用户登陆信息
 			    key: 'userInfo',  
 			    data: provider  
-			}) 
-			console.log(state.userInfo);
+			});
 		},
 		beginload(state, provider) {
 			state.beginload = provider
@@ -30,6 +29,7 @@ const store = new Vuex.Store({
 			}) 
 		},
 		setcode(state, provider) {
+			state.getcode = provider
 			uni.setStorage({//缓存用户登陆信息
 			    key: 'getcode',  
 			    data: provider