11.17

component/Gobacktop.vue

@@ -1,5 +1,5 @@
 <template>
-	<view @click="goback" class="top" :class="bottomtop==1?'':'activebottom' ">
+	<view @click="goback" class="top" :style="{bottom:height+'px'}" :class="bottomtop==1?'':'activebottom' ">
 		<img class="imgTop" src="/static/back_top.png" />
 	</view>
 </template>
@@ -13,6 +13,10 @@
 			},
 			bottomtop: {
 				default: 1,
+			},
+			height:{
+				default: 25,
+				type: Number
 			}
 		},
 		methods: {
@@ -32,7 +36,7 @@
 		border: 1px solid #ccc;
 		position: fixed;
 		right: 32upx;
-		bottom: 15upx;
+		bottom: 180upx;
 		background-color: transparent;
 	}
 	.activebottom {
@@ -43,7 +47,7 @@
 		border: 1px solid #ccc;
 		position: fixed;
 		right: 32upx;
-		bottom: 150upx;
+		bottom: 230upx;
 		background-color: transparent;
 	}
 	.imgTop {

component/openpictrue.vue

@@ -40,7 +40,7 @@
 				type: Boolean
 			},
 			images: {
-				default: '',
+				default: [],
 				type:Array
 			}
 		},
@@ -71,7 +71,6 @@
 		// 	}
 		// },
 		mounted() {
-			console.log(this.$props);
 		},
 		methods: {
 			// imageLoad() {

pages/index/commemt.vue

@@ -33,9 +33,7 @@
 		<view style="text-align: center;" v-if="assesslist.length == 0">
 			暂无评价
 		</view>
-		
-		 <unipopup :images="images"  :show="ishow"/>
-		 
+		<unipopup :images="images"  :show="ishow"/>
 	</view>
 </template>
 

pages/index/hotel.vue

@@ -42,12 +42,23 @@
 					<van-tabs title-active-color="#D9332E" v-model="activeindex" @click.stop="onChange">
 						<van-tab :name="0" title="服务项目">
 							<view>
-								<view class="giveList">
+								<swiper class="swiper2" :style="{height:sHeight}" @change="transition">
+									<swiper-item class="flex-box flex-d-wrap" v-for="(item, index) in category_list" :key="index">
+										<view class="giveItem" v-for="(item2, index2) in item" :key="index2" @click.stop="godetail(item2)">
+											<image :src="item2.pic" style="width:100%;height: 69%;"></image>
+											<p style="text-align: center;font-size: 24rpx;">{{ item2.gc_name }}</p>
+										</view>
+									</swiper-item>
+								</swiper>
+								<view class="flex-box flex-center-center" style="margin-bottom: 20upx;">
+									<view v-for="(item, index) in category_list" :key="index" class="swiperDian" :class="isActive==index ? 'activeDian':''"></view>
+								</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> -->
 								<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>
@@ -125,7 +136,7 @@
 				</view>
 			</scroll-view>
 			<view v-if="activeindex == 2" class="bottomButton"><button type="warn" @click="gofeedback">您的入住意见反馈(反馈送圈币)</button></view>
-			<Gobacktop @getop="getop" v-if="isTop" />
+			<Gobacktop @getop="getop" :height="80" v-if="isTop" />
 		</van-skeleton>
 	</view>
 </template>
@@ -181,7 +192,7 @@ export default {
 			goods_price: '', //	价格排序 desc-降序 asc-尚需
 			praise: '', //	好评率排序 desc-降序 asc-尚需
 			keyword: '', //g	关键字搜索
-			category_list: [{ gc_id_1: '', gc_name: '全部' }], // 一级菜单栏
+			category_list: [], // 一级菜单栏
 			tabIndex: 1,
 			isprice: 0,
 			menu: [
@@ -213,7 +224,9 @@ export default {
 			scrollTop: 0,
 			old: { scrollTop: 0 },
 			value1: 0,
-			iScrolltop: 1
+			iScrolltop: 1,
+			sHeight:'100px',//商品分类轮播高度
+			isActive:0//商品分类默认选中
 		};
 	},
 	onShareAppMessage(res) {
@@ -263,6 +276,9 @@ export default {
 		...mapState(['hasLogin', 'userInfo', 'successlogion'])
 	},
 	methods: {
+		transition(e){
+			this.isActive=e.detail.current;
+		},
 		openPhone(){
 			uni.makePhoneCall({
 			    phoneNumber: this.storeinformation.store_phone //仅为示例
@@ -427,11 +443,21 @@ export default {
 					});
 					let array = [{ gc_id: '', gc_name: '全部' }];
 					_this.classify = array.concat(category_list);
-					_this.category_list = category_list.splice(0, 10);
+					if(category_list.length>5){
+						_this.sHeight="200px";
+					}
+					_this.category_list =_this.group(category_list,10);
 				}
 			});
 		},
-
+		group(array, subGroupLength) {
+			  let index = 0;
+			  let newArray = [];
+			  while(index < array.length) {
+				  newArray.push(array.slice(index, index += subGroupLength));
+			  }
+			  return newArray;
+		},
 		onChange(event) {
 			this.activeindex = event.detail.name;
 			this.page = 1;
@@ -549,6 +575,19 @@ export default {
 </script>
 
 <style scoped>
+.swiperDian{
+	width:46upx;
+	height: 6upx;
+	border-radius: 3px;
+	background-color: #C7C7C7;
+}
+.activeDian{
+	background-color: #D9332E;
+}
+.swiper2{
+	width: 100%;
+	height: auto;
+}
 .search{
 	position: fixed;
 	top: 65upx;
@@ -622,6 +661,7 @@ export default {
 	padding: 10upx 12upx;
 	display: flex;
 	flex-wrap: wrap;
+	overflow-x: scroll;
 }
 .giveItem {
 	height: 150rpx;

pages/index/hotelsearch.vue

@@ -78,7 +78,8 @@ export default {
 			chosegoods_commonid: true,
 			chosegoods_price: true,
 			searchvalue: '',
-			goods_list: []
+			goods_list: [],
+			isLoad: true
 		};
 	},
 	methods: {
@@ -90,14 +91,16 @@ export default {
 			this.isTop = false;
 		},
 		search() {
-			uni.navigateBack()
+			uni.navigateBack();
 		},
 		confirm(e) {
-			if(e.detail.value){
+			if (e.detail.value) {
 				this.searchvalue = e.detail.value;
 				this.goods_list = [];
-				this.getshopdetail();
-			}else{
+				if (this.isLoad) {
+					this.getshopdetail();
+				}
+			} else {
 				this.goods_list = [];
 			}
 		},
@@ -124,6 +127,7 @@ export default {
 		},
 		// 获取商品详情
 		getshopdetail(e) {
+			this.isLoad = false;
 			uni.showLoading();
 			this.request({
 				url: '/v2/entry/storeGoods',
@@ -144,6 +148,7 @@ export default {
 					if (res.data.data.goods_list.length < 10) {
 						this.isDetail = 2;
 					}
+					this.isLoad = true;
 				}
 			});
 		},
@@ -183,11 +188,11 @@ export default {
 </script>
 
 <style>
-	.noData {
-		margin-top: 30%;
-		text-align: center;
-		color: #999;
-	}
+.noData {
+	margin-top: 30%;
+	text-align: center;
+	color: #999;
+}
 .sx {
 	padding: 20upx 18upx;
 	padding-top: 0rpx;

pages/index/index.vue

@@ -101,7 +101,7 @@
 		</scroll-view>
 		
 		<unipopup :images="images" v-if="enable == 1" :show="ishow" />
-		<Gobacktop @getop="getop" v-if="isTop" />
+		<Gobacktop :height="30" @getop="getop" v-if="isTop" />
 	</view>
 </template>
 
@@ -305,7 +305,6 @@ export default {
 				//当距离小于500时显示回到顶部按钮
 				this.isTop = false;
 			}
-
 			this.old.scrollTop = e.detail.scrollTop;
 		},
 		isGetLocation(a = 'scope.userLocation') {

pages/index/searchresult.vue

@@ -45,7 +45,8 @@ export default {
 			pictureUrl: this.pictureUrl,
 			hotelist: [],
 			searchvalue: '',
-			page: 1
+			page: 1,
+			isLoad:true,
 		};
 	},
 	methods: {
@@ -59,7 +60,9 @@ export default {
 			if(e.detail.value){
 				this.hotelist = [];
 				this.searchvalue = e.detail.value;
-				this.gethotelist();
+				if(this.isLoad){
+					this.gethotelist();
+				}
 			}else{
 				this.hotelist = [];
 			}
@@ -73,6 +76,7 @@ export default {
 		},
 		// 获取酒店列表
 		gethotelist() {
+			this.isLoad=false;
 			uni.showLoading();
 			this.request({
 				url: '/v2/entry/storeList',
@@ -99,6 +103,7 @@ export default {
 					} else {
 						this.$msg('网络错误稍后再试');
 					}
+					this.isLoad=true;
 				}
 			});
 		}

pages/index/shop.vue

@@ -6,7 +6,7 @@
 				class="floor-list"
 				:scroll-top="scrollTop"
 				scroll-y="true"
-				@scroll="scroll"
+				@scroll="scroll"				
 				:refresher-enabled="false">
 				<view class="carousel">
 					<swiper indicator-dots circular="true" duration="400">
@@ -63,19 +63,33 @@
 					</view>
 				</view>
 				<view class="detail-desc">
-					<van-tabs v-model="active" @click="onChange">
-						<van-tab :name="0" title="详情">
-							<view style="padding: 0 32upx;"><rich-text :nodes="datalist.goods_body"></rich-text></view>
+					<view class="flex-box flex-v-ce dets">
+						<view @click="onChange(true)" class="flex-1" :class="isShowDetail? 'activeDet':''">详情</view>
+						<view @click="onChange(false)" class="flex-1" :class="!isShowDetail? 'activeDet':''">常见问题</view>
+					</view>
+					
+					<view style="padding: 0 32upx;" v-show="isShowDetail">
+						<rich-text :nodes="datalist.goods_body"></rich-text>
+					</view>
+					<view style="padding: 0 32upx;" v-show="!isShowDetail">
+						<rich-text  :nodes="datalist.issue"></rich-text>
+						<view v-if="!datalist.issue" class="noData">暂无相关内容</view>
+					</view>
+<!-- 					<van-tabs v-model="active" @click="onChange">
+						<van-tab title="详情" name="0" v-show="active=='0'">
+							<view style="padding: 0 32upx;">
+								<rich-text :nodes="datalist.goods_body"></rich-text>
+							</view>
 						</van-tab>
-						<van-tab :name="1" title="常见问题">
+						<van-tab  title="常见问题" name="1" v-show="active=='1'">
 							<view style="padding: 0 32upx;">
-								
-								<rich-text v-if="datalist.issue" :nodes="datalist.issue"></rich-text>
-								<view v-else class="noData">暂无相关内容</view>
+								<rich-text  :nodes="datalist.issue"></rich-text>
+								<view v-if="!datalist.issue" class="noData">暂无相关内容</view>
 							</view>
 						</van-tab>
-					</van-tabs>
+					</van-tabs> -->
 				</view>
+				<view style="height: 135upx;"></view>
 			</scroll-view>
 
 			<!-- 规格-模态层弹窗 -->
@@ -134,10 +148,10 @@
 					<van-goods-action-button color="#E72028" text="立即购买" @click="dianBuynow()"/>
 				</van-goods-action>
 			</View>
-			<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>
+		<Gobacktop @getop="getop" :height="115" :bottomtop="2" v-if="isTop"/>
 	</view>
 </template>
 
@@ -184,7 +198,7 @@ export default {
 			goods_id: 0, // 商品规格id
 			windowHeight: 0, // 窗口高度
 			iScrolltop: 1,
-			active: 0,
+			active: "0",
 			scrollTop: 0,
 			old: {
 				scrollTop: 0
@@ -199,7 +213,8 @@ export default {
 			desc: '',
 			specList: [],
 			onlystoreId: 0, // 总酒店id
-			isfx: false
+			isfx: false,
+			isShowDetail:true,
 		};
 	},
 	onLaunch: function() {
@@ -315,7 +330,6 @@ export default {
 				method: 'POST',
 				data: params,
 				success: res => {
-					console.log(res.data.code);
 					let { data } = res.data;
 					if(res.data.code == 1001){
 						this.$msg(res.data.cod);
@@ -360,7 +374,11 @@ export default {
 			});
 		},
 		onChange(event) {
-			this.active = event.detail.name;
+			if(this.isShowDetail==event){
+				return false;
+			}
+			this.isShowDetail=event
+			// this.active = event.detail.name;
 		},
 		//规格弹窗开关
 		toggleSpec() {
@@ -550,7 +568,7 @@ export default {
 			}
 		},
 		// 滚动时触发
-		scroll(e) {
+		scroll(e) {	
 			this.old.scrollTop = e.detail.scrollTop;
 			if (e.detail.scrollTop > this.windowHeight) {
 				this.iScrolltop = 2;
@@ -559,6 +577,7 @@ export default {
 			}
 			if (e.detail.scrollTop > 250) {
 				this.isTop = true;
+				console.log(e.detail.scrollTop)
 			} else {
 				//当距离小于500时显示回到顶部按钮
 				this.isTop = false;
@@ -614,6 +633,21 @@ export default {
 	}
 </style>
 <style lang="scss">
+	.dets view{
+		position: relative;
+		text-align: center;
+		padding: 20upx 0;
+	}
+	.activeDet::after{
+		position: absolute;
+		content: "";
+		width: 50%;
+		left: 50%;
+		margin-left: -25%;
+		height: 6upx;
+		background-color: #E72028;
+		bottom: 0;
+	}
 page {
 	/* background: $page-color-base; */
 	/* padding-bottom: 160upx; */
@@ -676,12 +710,12 @@ page {
 	.title {
 		font-size: 36upx;
 		color: #303133;
-		height: 50upx;
-		line-height: 50upx;
 		width: 70%;
-		white-space: nowrap;
-		overflow: hidden;
+		overflow : hidden;
 		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
 	}
 
 	.titleRight {
@@ -889,7 +923,7 @@ page {
 .detail-desc {
 	background: #fff;
 	margin-top: 16upx;
-	margin-bottom: 135rpx;
+	// margin-bottom: 135rpx;
 	width: 100%;
 	.d-header {
 		display: flex;

pages/myone/ariclle.vue

@@ -54,7 +54,8 @@
 				isTop: false,
 				typelist:[],
 				acrelist:[],
-				ispull: true
+				ispull: true,
+				isHttp:true,
 		    }
 	    },
 		onLoad() {
@@ -78,6 +79,7 @@
 			},
 			
 			getlist() {
+				this.isHttp=false;
 				this.request({
 					url: '/v1/entry/news',
 					method:'POST',
@@ -92,7 +94,8 @@
 							this.ispull = false;
 						}
 						this.acrelist = this.acrelist.concat(data.new_list);
-					}
+						this.isHttp=true;
+					},
 				})
 			},
 			confirm(e) {
@@ -106,7 +109,9 @@
 					return;
 				}
 				this.acrelist = [];
-				this.getlist();
+				if(this.isHttp){
+				   this.getlist();
+				}
 			},
 			// 滚动到顶部
 			upper(e) {

pages/myone/onedetail.vue

@@ -9,7 +9,7 @@
 					<view style="color:#4399FC;" @click="close">x关闭</view>
 				</view>
 				<view @click="godetail" style="padding: 10upx 0upx;position: relative;">
-					<image :src=" pictureUrl + '/' + aricte.ad_image" style="height: 600upx;width: 100%;" />
+					<image :src=" pictureUrl + '/' + aricte.ad_image" style="width: 100%;" mode="widthFix"/>
 					<view style="color: #fff;position: absolute;bottom: 20upx;left: 20upx;">广告</view>
 				</view>
 			</view>
@@ -28,25 +28,7 @@
 				aricte: {}
 		    }
 		},
-		
-		// onShareAppMessage(res) {
-		// 	uni.showShareMenu({
-		// 	     withShareTicket: true  
-		// 	});  
-		// 	let that = this;
-		// 	let id = this.article_id;  // 酒店id
-		// 	console.log(id);
-		// 	if (res.from === 'button') {
-		//       // 来自页面内分享按钮
-		// 	}
-		// 	return {
-		// 		title: that.hotelitle,
-		// 		path: `/pages/myone/onedetail?id=${id}`,
-		// 		imageUrl: this.pictureUrl+'/'+this.article_thumb
-		// 	}
-		// },
 		onLoad(a) {
-			console.log(a);
 			this.article_id = a.id;
 			this.article_thumb = a.article_thumb;
 			let name = a.name;
@@ -55,17 +37,14 @@
 			});
 			this.getactrile();
 		},
-		
 		methods: {
 			godetail() {
 				if(this.aricte.ad_type == 1) {
-					//商品 
 					let id = this.aricte.goods_id;  // 商品Id
 					let store_id = this.aricte.store_id;  // 商品Id
 					uni.navigateTo({
 						url:`/pages/index/shop?id=${id}&store_id=${store_id}`
 					})
-				
 				}else if(this.aricte.ad_type == 2) {
 				   //商品
 				   let id = this.aricte.store_id;  // 商品Id
@@ -89,6 +68,7 @@
 						this.aricte = data;
 						const regex = new RegExp('<img', 'gi');
 						data.article_content =data.article_content.replace(regex,`<img class="changeimg"`);
+						console.log(data.article_content);
 						this.nodes = data.article_content;  // 富文本渲染
 					}
 				})
@@ -106,6 +86,7 @@
 		display: none;
 	}
 	.changeimg {
+		max-width: 100% !important;
 		width: 100%;
 		height: auto!important;
 		padding: 8upx 0;