回到顶部 首页广告

App.vue

@@ -1,8 +1,8 @@
 <script>
-
 	import {
 		mapMutations,mapState
 	} from 'vuex';
+	
 	export default {
 		methods: {
 			...mapMutations(['setOpenid','login','showDialog','setcode','islogionsuccess'])
@@ -20,10 +20,10 @@
 			// 用户登录
 			let that = this;
 			let sessionId =  uni.getStorageSync('sessionId');// 用户token
+			console.log(sessionId);
 			let userInfo = uni.getStorageSync('userInfo');// 用户头像信息
 			let getcode= uni.getStorageSync('getcode');// 用户code oppenid
 			console.log(userInfo)
-			console.log(getcode)
 			if(sessionId != '') {
 				uni.checkSession({
 					   success(){  
@@ -57,7 +57,6 @@
 												   that.setOpenid(token); // 保存用户token
 												   that.islogionsuccess(false);
 											  }else {
-												  console.log("进来了")
 												  that.setOpenid(token); // 保存用户token
 												  that.islogionsuccess(true);
 											  }
@@ -79,7 +78,6 @@
 			  		provider: 'weixin',
 			  		success: (res) => {
 						let code = res.code;
-						console.log("oooo")
 						console.log(code);
 			  			 uni.request({
 			  				  url: 'https://www.qzaiwang.com' +'/v1/entry/mp_openid',
@@ -97,7 +95,6 @@
 									   this.setOpenid(token); // 保存用户token
 									   this.islogionsuccess(false);
 								  }else {
-									  console.log("进来了")
 									  this.setOpenid(token); // 保存用户token
 									  this.islogionsuccess(true);
 								  }

component/Gobacktop.vue

@@ -0,0 +1,53 @@
+<template>
+	<view @click="goback" class="top" :class="bottomtop==1?'':'activebottom' ">
+		<img class="imgTop" src="/static/back_top.png" />
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			isTop: {
+				default: false,
+				type: Boolean
+			},
+			bottomtop: {
+				default: 1,
+			}
+		},
+		methods: {
+			goback() {
+				this.$emit('getop')
+			},
+		}
+	}
+</script>
+
+<style>
+	.top {
+		width: 90upx;
+		height: 90upx;
+		border-radius: 50%;
+		background-color: #fff;
+		border: 1px solid #ccc;
+		position: fixed;
+		right: 32upx;
+		bottom: 15upx;
+		background-color: transparent;
+	}
+	.activebottom {
+		width: 90upx;
+		height: 90upx;
+		border-radius: 50%;
+		background-color: #fff;
+		border: 1px solid #ccc;
+		position: fixed;
+		right: 32upx;
+		bottom: 130upx;
+		background-color: transparent;
+	}
+	.imgTop {
+		width: 100%;
+		height: 100%;
+	}
+</style>

component/assess.vue

@@ -3,7 +3,7 @@
 		<view  v-for="(item,index) in feedback_list" :key="index" class="uni-padding-wrap" style="border-bottom: 1px solid #EEEEEE;padding-bottom: 10upx;">
 			<view class="uni-comment">
 				<view class="uni-comment-list">
-					<view class="uni-comment-face"><image :src="item.member_avatar"></image></view>
+					<view class="uni-comment-face"><image  style="width: 100%;height: 100%;" :src="item.member_avatar"></image></view>
 					<view class="uni-comment-body">
 						<view class="uni-comment-top">
 							<text style="font-size: 28upx;color: #303133">{{item.member_truename}}</text>

component/popup.vue

@@ -13,8 +13,8 @@
 			<!-- <view class="example-title">slot用法</view> -->
 			<!-- <button type="button" @click="togglePopup('middle-img')">居中弹出（插屏广告）</button> -->
 			<uniPopup :show="type" position="middle" mode="insert" @hidePopup="togglePopup('')">
-				<view class="uni-center center-box">
-					<image class="image" src="" style="background-color: #007AFF;" />
+				<view  @click="gomoney" class="uni-center center-box">
+					<image class="image" :src="pictureUrl+'/uploads/home/adv/'+images"  />
 				</view>
 			</uniPopup>
 			<!-- <button type="button" @click="togglePopup('middle-list')">居中弹出（滚动列表）</button>
@@ -49,6 +49,10 @@
 			ishow: {
 				default: false,
 				type: Boolean
+			},
+			images: {
+				default: '',
+				type: String
 			}
 		},
 		components: {
@@ -67,6 +71,7 @@
 		data() {
 			return {
 				type: true,
+				pictureUrl: this.pictureUrl,
 				list: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
 				bottomData: [{
 						text: '微信',
@@ -110,6 +115,11 @@
 		methods: {
 			togglePopup() {
 				this.type = false;
+			},
+			gomoney() {
+				uni.navigateTo({
+					url:'/pages/myCenter/definite'
+				})
 			}
 		}
 	};
@@ -162,8 +172,8 @@
 	}
 
 	.center-box {
-		width: 500upx;
-		height: 500upx;
+		width: 700upx;
+		height: 700upx;
 	}
 
 	.uni-list-item {

pages/index/hotel.vue

@@ -38,11 +38,11 @@
        
 	   <view v-if="store_summary" style="padding: 0 32upx;">{{store_summary}}</view>
        <view>
-                  <van-tabs v-model="activeindex" @click="onChange">
+                  <van-tabs 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="godetail(item)">
+                          <view class="giveItem" v-for="(item,index) in category_list" :key="index" @click.stop="godetail(item)">
                             <image :src="item.pic" 
 							style="width:100%;height: 100upx;background: #909399">
 							</image>
@@ -52,41 +52,62 @@
                   
                   <view style="padding: 0upx 18upx;">
                       <view style="width: 95%;margin: 0 auto;">
-                              <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
+                              <view @click.stop="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
                                   综合
                               </view>
-                              <view @click="choseType(2)"   class="typeItem">
+                              <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 @click.stop="changeisclick(1)"><van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /></view>
-                                        <view @click.stop="changeisclick(2)">
-											<van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" />
+										<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 @click="choseType(3)"  class="typeItem">
+                              <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 @click.stop="changeisclick(3)" >
+                                       <!--  <view @click.stop="changeisclick(3)" >
 											 <van-icon    :class="istopclick==3 ? 'active' : ''" size="8px" name="arrow-up" />
 										 </view> 
 										 <view   @click.stop="changeisclick(4)">
 											  <van-icon  :class="istopclick==4 ? 'active' : ''" size="8px" name="arrow-down" />
+										 </view> -->
+										 <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="tabIndex==4 ? 'active' : ''">分类</view>
+								    <view :class="tabIndex==4 ? 'active' : ''">分类
+										<img v-if="tabIndex != 4" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
+										<img v-if="tabIndex == 4" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
+									</view>
                               </view>
                           </view>
                   </view>
 				  <view v-if="tabIndex==4">
-						  <view style="margin: 10upx 36upx;float: left;" 
-						   v-for="(item, index) in category_list" :key="index"
+						  <view style="margin: 18upx 36upx;float: left;width: 110upx;text-align: center;" 
+						   v-for="(item, index) in classify" :key="index"
 							 @click.stop="confirm(item)" >
 							 {{item.gc_name}}
 						  </view> 
@@ -110,8 +131,8 @@
                 </view>
        </view>
        </scroll-view>
-       <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/>
-    </view>
+	   <Gobacktop @getop="getop" v-if="isTop" />
+	</view>
 </template>
   
 <script>
@@ -119,11 +140,11 @@
 		mapMutations,mapState
 	} from 'vuex'
     import uniIcon from '@/component/uni-icon/uni-icon.vue'
-	import logionDialog from '@/component/loginDialog.vue'
     import uniNavBar from '@/component/uni-nav-bar/uni-nav-bar.vue'
     import commoNar from '@/component/commoNar.vue'  // 筛选栏
     import shopList from '@/component/shopList.vue'  // 商品列表
     import assess from '@/component/assess.vue'  // 评价列表
+	import Gobacktop from '@/component/Gobacktop.vue'
     export default {
         components: {
             uniIcon,
@@ -131,10 +152,11 @@
             commoNar,
             assess,
             shopList,
-			logionDialog
+			Gobacktop
         },
         data() {
             return {
+				isTop: 0,
 				hoteldetail: {},
 				has_collected: 0, // 收藏酒店
 				chosegoods_commonid:　true,
@@ -160,8 +182,9 @@
 				goods_price	:'',//	价格排序 desc-降序 asc-尚需
 				praise	:'',//	好评率排序 desc-降序 asc-尚需
 				keyword:'',//g	关键字搜索
-				category_list: [], // 一级菜单栏
+				category_list: [{gc_id_1:'',gc_name:'全部'}], // 一级菜单栏
                 tabIndex: 1,
+				isprice:0,
                 menu: [{
                     name: '综合',
                     id: '0'
@@ -177,6 +200,7 @@
                     id:'3'
                 }
                 ],
+				classify: [],
                 background: ['color1', 'color2', 'color3'],
                 indicatorDots: true,
                 autoplay: true,
@@ -236,6 +260,13 @@
 			]),
 		},
         methods: {
+			getop() {
+				this.scrollTop = this.old.scrollTop
+                this.$nextTick(function(){
+                    this.scrollTop=0;
+                });
+				this.isTop = false;
+			},
 			// 入住酒店反馈
 			gofeedback() {
 				if(this.hoteldetail.can_feedback == 0) {
@@ -276,18 +307,19 @@
 				}
 			},
 			// 关闭弹窗
-			cancelDiaolog() {
-				this.showdialog = false;
-			},
-			// 确定
-			confirmDiaolog() {
-				this.showdialog = false;
-			},
+			// cancelDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// // 确定
+			// confirmDiaolog() {
+			// 	this.showdialog = false;
+			// },
 			choseType(e) {
 			    this.tabIndex = e;
-				this.goods_list = [];
+				//this.goods_list = [];
 				if(this.tabIndex == 1) {  // 服务
 					this.istopclick = 0;
+					this.isprice = 0;
 					this.gc_id_1 = '';
 					this.goods_price = ''; 
 					this.goods_commonid = '';
@@ -295,26 +327,28 @@
 				        this.chosegoods_price = true;
 						console.log(this.chosegoods_commonid);
 						this.istopclick = this.chosegoods_commonid?1:2;
+						this.isprice = 0;
 						this.goods_price = ''; 
 						this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
-						this.gc_id_1 = '';
 						this.chosegoods_commonid = !this.chosegoods_commonid;
 				}else if(this.tabIndex == 3){ // 价格
 						this.chosegoods_commonid = true;
 						console.log(this.chosegoods_price);
-						this.istopclick = this.chosegoods_price?3:4;
+						this.istopclick = 0;
+						this.isprice = this.chosegoods_price?3:4;
 						this.goods_price = this.chosegoods_price?'desc':'asc';
 						this.goods_commonid = '';
-						this.gc_id_1 = '';
 						this.chosegoods_price = !this.chosegoods_price;
 					}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.getshopdetail();
+					
+				    this.getshopdetail(2);
 			},
 			// 点击切换上下
 			changeisclick(e) {
@@ -331,7 +365,7 @@
 			},
 			
 			// 获取商品详情
-			getshopdetail() {
+			getshopdetail(e) {
 				this.request({
 				                url:"/v2/entry/storeGoods",
 				                method:'get',
@@ -343,6 +377,9 @@
 										 gc_id_1: this.gc_id_1
 				                    },
 								success: (res) => {
+									if(e == 2) {
+										this.goods_list = [];
+									}
 									this.goods_list = this.goods_list.concat(res.data.data.goods_list);
 									if(res.data.data.goods_list.length < 10) {
 										this.isDetail = 2;
@@ -365,7 +402,10 @@
 										 item.text = item.gc_name;
 										 item.value = idx;
 									 })
+									 let array = [{gc_id:'',gc_name:'全部'}];
+									 _this.classify =  array.concat(category_list);
 									 _this.category_list = category_list;
+									 console.log(_this.category_list)
 								},
 				})
 			},
@@ -425,7 +465,7 @@
             confirm(e) {
 				this.tabIndex = 0;
 				this.gc_id_1 = e.gc_id;
-				this.getshopdetail();
+				this.getshopdetail(2);
             },
             upper(e) {
                 console.log("顶部")
@@ -449,12 +489,17 @@
             
             // 滚动时触发
             scroll(e) {
-                this.old.scrollTop = e.detail.scrollTop
+				   if(e.detail.scrollTop > 400) {
+					this.isTop = true;
+				   }else{ //当距离小于500时显示回到顶部按钮
+					this.isTop = false;
+				   }
                 if(e.detail.scrollTop > 160) {
                     this.iScrolltop = 2;
                 }else {
                     this.iScrolltop = 1;
                 }
+				this.old.scrollTop = e.detail.scrollTop
             },
             
             // 返回上一页

pages/index/hoteldetail.vue

@@ -6,36 +6,48 @@
 	  <view style="padding: 40upx 18upx;">
 	      <view style="width: 95%;margin: 0 auto;">
 			 <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 style="display: flex;flex-direction: column;margin-left: 10rpx;">
-			           <view @click.stop="changeisclick(1)"><van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /></view>
-			           <view @click.stop="changeisclick(2)">
-			 											<van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" />
-			 										</view>
-			       </view>
+				    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
+			     <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 @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 @click.stop="changeisclick(3)" >
-			 											 <van-icon    :class="istopclick==3 ? 'active' : ''" size="8px" name="arrow-up" />
-			 										 </view> 
-			 										 <view   @click.stop="changeisclick(4)">
-			 											  <van-icon  :class="istopclick==4 ? 'active' : ''" size="8px" name="arrow-down" />
-			 										 </view>
+						  <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="tabIndex==4 ? 'active' : ''">分类</view>
+				<view :class="tabIndex==4 ? 'active' : ''">分类
+					<img v-if="tabIndex != 4" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
+					<img v-if="tabIndex == 4" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
+				</view>
 			 </view>
 	      </view>
 			
@@ -62,6 +74,7 @@
 		},
 		data() {
 			return {
+				isprice: 0,
 				goods_list:[],
 				scrollTop: 0,
 				old: {
@@ -102,27 +115,31 @@
 			  this.goods_list = [];
 			if(this.tabIndex == 1) {  // 服务
 				this.istopclick = 0;
-				this.gc_id_1 = '';
+				this.isprice = 0;
+				this.gc_id_2 = '';
 				this.goods_price = ''; 
 				this.goods_commonid = '';
 			}else if(this.tabIndex == 2){ //伤
 			        this.chosegoods_price = true;
 					console.log(this.chosegoods_commonid);
 					this.istopclick = this.chosegoods_commonid?1:2;
+					this.isprice = 0;
 					this.goods_price = ''; 
 					this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
-					this.gc_id_1 = '';
+					//this.gc_id_1 = '';
 					this.chosegoods_commonid = !this.chosegoods_commonid;
 			}else if(this.tabIndex == 3){ // 价格
 					this.chosegoods_commonid = true;
 					console.log(this.chosegoods_price);
-					this.istopclick = this.chosegoods_price?3:4;
+					this.isprice = this.chosegoods_price?3:4;
 					this.goods_price = this.chosegoods_price?'desc':'asc';
 					this.goods_commonid = '';
-					this.gc_id_1 = '';
+					this.istopclick = 0;
+					//this.gc_id_1 = '';
 					this.chosegoods_price = !this.chosegoods_price;
 				}else if(this.tabIndex ==4) {  // 分类
 					this.istopclick = 0;
+					this.isprice = 0;
 					this.goods_price = ''; 
 					this.goods_commonid = '';
 					this.chosegoods_price = true;
@@ -161,9 +178,8 @@
 										_this.ispill = true;
 									}else {
 										_this.ispill = false;
-										
 									}
-									_this.goods_list = res.data.data.goods_list;
+									_this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
 								},
 			    })
 			},
@@ -179,7 +195,9 @@
 					},
 					success: function(res) {
 						let { category_list } = res.data.data;
-						that.category_list = category_list;
+						let array = [{gc_id:'',gc_name:'全部'}];
+						that.category_list = array.concat(category_list)
+						console.log(that.category_list)
 					}
 				})
 			},
@@ -190,10 +208,9 @@
 			
 			// 滚到底部
 			lower(e) {
-				
-				if(this.ispull) {
+				if(this.ispill) {
 					this.page = this.page + 1;
-					this.gethotelist();
+					this.getshopdetail();
 				}
 			},
 			
@@ -218,6 +235,7 @@
 	    display: flex;
 	    flex-direction: row;
 	    align-items: center;
-	    justify-content: space-around;
+	    justify-content: center;
+
 	}
 </style>

pages/index/index.vue

@@ -44,7 +44,6 @@
 				 <image style="height: 100%;width: 100%;" :src='pictureUrl +"/uploads/home/adv/"+item.adv_code' />
 		    </view>
 			</swiper-item>
-			
 		 </swiper>
 	 </view>
 	
@@ -59,10 +58,10 @@
 			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_banner" />
 		 </view>
 		 <view class="hotelright">
-		 	<view style="font-size: 32upx;color: #303133;font-weight: 550;">{{item.store_name}}
+		 	<view style="font-size: 28upx;color: #303133;font-weight: 600;">{{item.store_name}}
 			</view>
 		    <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;padding: 10rpx 0;">
-				<view style="font-size: 32upx; color: #303133;font-weight: 550;">{{item.store_servicecredit}}</view>
+				<view style="font-size: 46upx; color: #303133;font-weight: 900;">{{item.store_servicecredit}}</view>
 				<view style="color: #606266;font-size: 24upx;">月访客{{item.store_visitor}}</view>
 				<view style="color: #606266;font-size: 24upx;">{{item.distance}}</view>
 			</view>
@@ -76,17 +75,8 @@
 		 定位失败暂时获取不到周边酒店信息哦
 	 </view>
      </scroll-view>
-     <!--首次登录领取圈币-->
-	<!-- <van-dialog
-	   use-slot
-	   :show="firstpoint" 
-	   show-cancel-button
-	   bind:close="onClose"
-	   bind:getuserinfo="getUserInfo"
-	 >
-	   <image src="https://img.yzcdn.cn/1.jpg" />
-	 </van-dialog> -->
-	 <unipopup :show="ishow"/>
+	 <unipopup :images="images" v-if="enable == 1 || !successlogion" :show="ishow"/>
+	 <Gobacktop @getop="getop" v-if="isTop" />
 	</view>
 </template>
 
@@ -99,12 +89,14 @@
 	import uniIcon from '@/component/uni-icon/uni-icon.vue'
 	import logionDialog from '@/component/loginDialog.vue'
 	import amap from '@/common/amap-wx.js'
+	import Gobacktop from '@/component/Gobacktop.vue'
 	export default {
 		components: {
 			unipopup,
 			uniNavBar,
 			uniIcon,
-			logionDialog
+			logionDialog,
+			Gobacktop
 		},
 		data() {
 			return {
@@ -127,10 +119,13 @@
 				title: 'Hello',
 				location:'正在定位...',
 				scrollTop: 0,
+	            isTop: false,
 				old: {
 					scrollTop: 0
 				},
-				allow:　false
+				allow:　false,
+				images: '',  // 开机图片广告
+				enable: '', // 是否展示广告
 			}
 		},
 		computed:{
@@ -141,6 +136,13 @@
 			]),
 		},
 		onLoad() {
+			// setTimeout( () => {
+			// 		uni.pageScrollTo({  
+			// 		   duration:0,			//过渡时间必须为0，uniapp bug，否则运行到手机会报错
+			// 		   scrollTop: 400,  
+			// 		})  
+			// },300)  
+			this.getpicture(); // 开机广告
 			this.getswiper();   // 获取首页轮播
 			this.gethotelist(); // 酒店列表
 			if(this.allow) {
@@ -157,6 +159,19 @@
 	    },
 		methods: {
 			...mapMutations(['login','showDialog']),
+			getpicture() {
+				this.request({
+					url: '/v1/entry/poster',
+					method: 'get',
+					success: (res) => {
+						let { data } = res.data;
+						console.log(res.data.data);
+						this.images = data.images;
+						this.enable = data.enable;
+					}
+				})
+			},
+			
 			handler() {
 				console.log("kkkkk")
 				this.getAuthorizeInfo();
@@ -171,7 +186,7 @@
 						url:'/pages/myCenter/logion'
 					})
 					// this.showdialog = true;
-				}
				
			},
+				}
			},
 			// // 关闭弹窗
 			// cancelDiaolog() {
 			// 	this.showdialog = false;
@@ -193,6 +208,21 @@
 				console.log("顶部")
 			},
 			
+			getop() {
+				//  setTimeout( () => {  
+				// 		uni.pageScrollTo({  
+				// 		   duration:0,			//过渡时间必须为0，uniapp bug，否则运行到手机会报错
+				// 		   scrollTop: 0,  
+				// 		})  
+				// },300)  
+			
+				   this.scrollTop = this.old.scrollTop
+	                this.$nextTick(function(){
+	                    this.scrollTop=0;
+	                });
+					this.isTop = false;
+			},
+			
 			// 滚到底部
 			lower(e) {
 				this.page = this.page + 1;
@@ -203,6 +233,12 @@
 			
 			// 滚动时触发
 			scroll(e) {
+				if(e.detail.scrollTop > 400) {
+					this.isTop = true;
+				}else{ //当距离小于500时显示回到顶部按钮
+					this.isTop = false;
+				}
+
 				this.old.scrollTop = e.detail.scrollTop
 			},
 			isGetLocation(a="scope.userLocation"){ //  检查当前是否已经授权访问scope属性W

pages/index/shop.vue

@@ -174,7 +174,9 @@
 			  <van-goods-action-button text="立即购买"  @click="buynow"   />
 			</van-goods-action>
 		</View>
-		 <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/>
+		<Gobacktop @getop="getop" :bottomtop="2" v-if="isTop" />
+
+		<!-- <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
  	</view>
  </template>
  
@@ -182,7 +184,8 @@
 	 import {
 	 	mapMutations,mapState
 	 } from 'vuex'
-	import logionDialog from '@/component/loginDialog.vue'
+	// import logionDialog from '@/component/loginDialog.vue'
+	import Gobacktop from '@/component/Gobacktop.vue'
 	import uninumberbox  from '@/component/uinNumber.vue' 
 	import assess from '@/component/assess.vue'  // 评价列表
  	import uniIcon from '@/component/uni-icon/uni-icon.vue'
@@ -191,11 +194,13 @@
  			uniIcon,
 			assess,
 			uninumberbox,
-			logionDialog
+			Gobacktop
  		},
  		data() {
  			return {
+				isTop: false,
 				arrayId:[],
+				bottomtop: '55upx',
 				scopemapId: 0,
 				showdialog:　false,
 				has_collected: false, // 是否收藏
@@ -291,7 +296,13 @@
 			
 		},
  		methods:{
-			
+			getop() {
+			        this.scrollTop = this.old.scrollTop
+			                this.$nextTick(function(){
+			                    this.scrollTop=0;
+			                });
+			        this.isTop = false;
+			      },
 					
 			// 跳转到首页
 			goIndex() {
@@ -363,16 +374,16 @@
  			},
 			 
 			 // 关闭弹窗
-			 cancelDiaolog() {
-			 	this.showdialog = false;
-			 },
-			 // 确定
-			 confirmDiaolog() {
-			 	this.showdialog = false;
-			 	uni.navigateTo({
-			 	   url: '../myCenter/information'  // 我的收藏
-			 	})
-			 },
+			 // cancelDiaolog() {
+			 // 	this.showdialog = false;
+			 // },
+			 // // 确定
+			 // confirmDiaolog() {
+			 // 	this.showdialog = false;
+			 // 	uni.navigateTo({
+			 // 	   url: '../myCenter/information'  // 我的收藏
+			 // 	})
+			 // },
 			
 			openCar() {
 				if(this.hasLogin && this.successlogion) { 
@@ -560,6 +571,12 @@
  				}else {
  					this.iScrolltop = 1;
  				}
+				if(e.detail.scrollTop > 400) {
+				  this.isTop = true;
+				}else{ //当距离小于500时显示回到顶部按钮
+				  this.isTop = false;
+				}
+
  			},
  			
  			//收藏

pages/myOrder/index.vue

@@ -63,6 +63,7 @@
 		    @colseDialog="cancelDialog" 
 		    @confirmPay="confirmOrder"
 		 />
+		 <Gobacktop @getop="getop" v-if="isTop" />
 		<!--  <logionDialog @confirmDiaolog="confirmDiaolog" :ishow="false" @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
 	</view>
 </template>
@@ -72,14 +73,15 @@
 		mapMutations,mapState
 	} from 'vuex'
 	import Dialog from '@/component/Dialog.vue'
-	import logionDialog from '@/component/loginDialog.vue'
+	import Gobacktop from '@/component/Gobacktop.vue'
 	export default{
 		components: {
 			Dialog,
-			logionDialog
+			Gobacktop
 		},
 		data() {
 			return {
+				isTop: false,
 				ispull: true,
 				showdialog: false,
 				orderCancel:　false,
@@ -169,6 +171,13 @@
 			
 		},
 		methods: {
+			getop() {
+			        this.scrollTop = this.old.scrollTop
+			                this.$nextTick(function(){
+			                    this.scrollTop=0;
+			                });
+			        this.isTop = false;
+			      },
 			gotologion() {
 				uni.navigateTo({
 					url: '/pages/myCenter/logion'
@@ -317,7 +326,13 @@
 			
 			// 滚动时触发
 			scroll(e) {
-				this.old.scrollTop = e.detail.scrollTop
+				if(e.detail.scrollTop > 400) {
+				          this.isTop = true;
+				        }else{ //当距离小于500时显示回到顶部按钮
+				          this.isTop = false;
+				        }
+				
+				        this.old.scrollTop = e.detail.scrollTop
 			}
 		}
 		

pages/myone/oneIndex.vue

@@ -29,13 +29,18 @@
 			</view>
 			</view>
 		 </scroll-view>
+		 <Gobacktop @getop="getop" v-if="isTop" />
+
    </view>
 </template>
 <script>
 	import uniIcon from '@/component/uni-icon/uni-icon.vue'
+	import Gobacktop from '@/component/Gobacktop.vue'
+
 	export default {
 		components: {
-			uniIcon
+			uniIcon,
+			Gobacktop
 		},
 		data() {
 			return {
@@ -49,6 +54,7 @@
 				old: {
 					scrollTop: 0
 				},
+				isTop: false,
 				typelist:[],
 				acrelist:[],
 				ispull: true
@@ -59,6 +65,13 @@
 			this.getlist(); // 获取文章列表
 		},
 		methods: {
+			getop() {
+			        this.scrollTop = this.old.scrollTop
+			                this.$nextTick(function(){
+			                    this.scrollTop=0;
+			                });
+			        this.isTop = false;
+			      },
 			goIndex(items) {
 				let article_id = items.article_id;
 				let ac_id = items.ac_id;
@@ -136,6 +149,11 @@
 			
 			// 滚动时触发
 			scroll(e) {
+				if(e.detail.scrollTop > 400) {
+				          this.isTop = true;
+				        }else{ //当距离小于500时显示回到顶部按钮
+				          this.isTop = false;
+				        }
 				this.old.scrollTop = e.detail.scrollTop
 			},
 		}
@@ -152,7 +170,6 @@
 	.hotleLeft {
 		width: 214upx;
 		height: 152upx;
-		background-color: #007AFF;
 	}
 		
 	.hotelright {

unpackage/dist/dev/.sourcemap/mp-weixin/component/gotop.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"component/gotop.js","sourceRoot":""}

unpackage/dist/dev/mp-weixin/App.wxml

@@ -0,0 +1 @@
+<view style="width:50px;height:50px;">dlsko'kd\aodp[o\er[k]]</view>

unpackage/dist/dev/mp-weixin/app.json

@@ -69,5 +69,5 @@
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
   },
-  "sitemapLocation": "sitemap68.json"
+  "sitemapLocation": "sitemap57.json"
 }

unpackage/dist/dev/mp-weixin/common/main.js

@@ -113,10 +113,10 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
-
 var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var _default =
 
 
+
 {
   methods: _objectSpread({},
   (0, _vuex.mapMutations)(['setOpenid', 'login', 'showDialog', 'setcode', 'islogionsuccess'])),
@@ -134,10 +134,10 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     // 用户登录
     var that = this;
     var sessionId = uni.getStorageSync('sessionId'); // 用户token
+    console.log(sessionId);
     var userInfo = uni.getStorageSync('userInfo'); // 用户头像信息
     var getcode = uni.getStorageSync('getcode'); // 用户code oppenid
     console.log(userInfo);
-    console.log(getcode);
     if (sessionId != '') {
       uni.checkSession({
         success: function success() {
@@ -171,7 +171,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
                     that.setOpenid(token); // 保存用户token
                     that.islogionsuccess(false);
                   } else {
-                    console.log("进来了");
                     that.setOpenid(token); // 保存用户token
                     that.islogionsuccess(true);
                   }
@@ -193,7 +192,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
         provider: 'weixin',
         success: function success(res) {
           var code = res.code;
-          console.log("oooo");
           console.log(code);
           uni.request({
             url: 'https://www.qzaiwang.com' + '/v1/entry/mp_openid',
@@ -211,7 +209,6 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
                 _this.setOpenid(token); // 保存用户token
                 _this.islogionsuccess(false);
               } else {
-                console.log("进来了");
                 _this.setOpenid(token); // 保存用户token
                 _this.islogionsuccess(true);
               }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -156,9 +156,6 @@
 
 
 
-
-
-
 
 
 

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -104,11 +104,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"component/popup":1,"component/uni-icon/uni-icon":1,"component/uni-nav-bar/uni-nav-bar":1,"component/assess":1,"component/commoNar":1,"component/shopList":1,"component/uinNumberCart":1,"component/uinNumber":1,"component/textarea":1,"component/uploadImage":1,"component/Dialog":1,"component/mpvue-citypicker/mpvueCityPicker":1,"component/uni-popup":1,"component/uni-status-bar/uni-status-bar":1};
+/******/ 		var cssChunks = {"component/Gobacktop":1,"component/popup":1,"component/uni-icon/uni-icon":1,"component/uni-nav-bar/uni-nav-bar":1,"component/assess":1,"component/commoNar":1,"component/shopList":1,"component/uinNumberCart":1,"component/uinNumber":1,"component/textarea":1,"component/uploadImage":1,"component/Dialog":1,"component/mpvue-citypicker/mpvueCityPicker":1,"component/uni-popup":1,"component/uni-status-bar/uni-status-bar":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"component/loginDialog":"component/loginDialog","component/popup":"component/popup","component/uni-icon/uni-icon":"component/uni-icon/uni-icon","component/uni-nav-bar/uni-nav-bar":"component/uni-nav-bar/uni-nav-bar","component/assess":"component/assess","component/commoNar":"component/commoNar","component/shopList":"component/shopList","component/uinNumberCart":"component/uinNumberCart","component/uinNumber":"component/uinNumber","component/textarea":"component/textarea","component/uploadImage":"component/uploadImage","component/Dialog":"component/Dialog","component/mpvue-citypicker/mpvueCityPicker":"component/mpvue-citypicker/mpvueCityPicker","component/uni-popup":"component/uni-popup","component/uni-status-bar/uni-status-bar":"component/uni-status-bar/uni-status-bar"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"component/Gobacktop":"component/Gobacktop","component/loginDialog":"component/loginDialog","component/popup":"component/popup","component/uni-icon/uni-icon":"component/uni-icon/uni-icon","component/uni-nav-bar/uni-nav-bar":"component/uni-nav-bar/uni-nav-bar","component/assess":"component/assess","component/commoNar":"component/commoNar","component/shopList":"component/shopList","component/uinNumberCart":"component/uinNumberCart","component/uinNumber":"component/uinNumber","component/textarea":"component/textarea","component/uploadImage":"component/uploadImage","component/Dialog":"component/Dialog","component/mpvue-citypicker/mpvueCityPicker":"component/mpvue-citypicker/mpvueCityPicker","component/uni-popup":"component/uni-popup","component/uni-status-bar/uni-status-bar":"component/uni-status-bar/uni-status-bar"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/component/Gobacktop.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/component/Gobacktop.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['goback',['$event']]]]]}}" class="{{['top',bottomtop==1?'':'activebottom']}}" bindtap="__e"><image class="imgTop _img" src="/static/back_top.png"></image></view>

unpackage/dist/dev/mp-weixin/component/Gobacktop.wxss

@@ -0,0 +1,28 @@
+
+.top {
+	width: 90rpx;
+	height: 90rpx;
+	border-radius: 50%;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	position: fixed;
+	right: 32rpx;
+	bottom: 15rpx;
+	background-color: transparent;
+}
+.activebottom {
+	width: 90rpx;
+	height: 90rpx;
+	border-radius: 50%;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	position: fixed;
+	right: 32rpx;
+	bottom: 130rpx;
+	background-color: transparent;
+}
+.imgTop {
+	width: 100%;
+	height: 100%;
+}
+

unpackage/dist/dev/mp-weixin/component/assess.js

@@ -171,7 +171,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 283:
+/***/ 290:
 /*!***********************************************!*\
   !*** D:/uinapp/myuinapp/component/assess.vue ***!
   \***********************************************/
@@ -180,8 +180,8 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _assess_vue_vue_type_template_id_df52fd36___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./assess.vue?vue&type=template&id=df52fd36& */ 284);
-/* harmony import */ var _assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./assess.vue?vue&type=script&lang=js& */ 286);
+/* harmony import */ var _assess_vue_vue_type_template_id_df52fd36___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./assess.vue?vue&type=template&id=df52fd36& */ 291);
+/* harmony import */ var _assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./assess.vue?vue&type=script&lang=js& */ 293);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 
@@ -210,7 +210,7 @@ component.options.__file = "D:/uinapp/myuinapp/component/assess.vue"
 
 /***/ }),
 
-/***/ 284:
+/***/ 291:
 /*!******************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/assess.vue?vue&type=template&id=df52fd36& ***!
   \******************************************************************************/
@@ -219,7 +219,7 @@ component.options.__file = "D:/uinapp/myuinapp/component/assess.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_template_id_df52fd36___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./assess.vue?vue&type=template&id=df52fd36& */ 285);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_template_id_df52fd36___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./assess.vue?vue&type=template&id=df52fd36& */ 292);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_template_id_df52fd36___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_template_id_df52fd36___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -232,7 +232,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 285:
+/***/ 292:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/component/assess.vue?vue&type=template&id=df52fd36& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -259,7 +259,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 286:
+/***/ 293:
 /*!************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/assess.vue?vue&type=script&lang=js& ***!
   \************************************************************************/
@@ -268,14 +268,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./assess.vue?vue&type=script&lang=js& */ 287);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./assess.vue?vue&type=script&lang=js& */ 294);
 /* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_assess_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 287:
+/***/ 294:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/component/assess.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -357,7 +357,7 @@ var _default = { props: { feedback_list: { type: Array } }, component: { uniIcon
     'component/assess-create-component',
     {
         'component/assess-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(283))
+            __webpack_require__('1')['createComponent'](__webpack_require__(290))
         })
     },
     [['component/assess-create-component']]

unpackage/dist/dev/mp-weixin/component/assess.wxml

@@ -1 +1 @@
-<view><block wx:for="{{feedback_list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="uni-padding-wrap" style="border-bottom:1px solid #EEEEEE;padding-bottom:10rpx;"><view class="uni-comment"><view class="uni-comment-list"><view class="uni-comment-face"><image src="{{item.member_avatar}}"></image></view><view class="uni-comment-body"><view class="uni-comment-top"><text style="font-size:28rpx;color:#303133;">{{item.member_truename}}</text><uni-icon vue-id="{{'1573bc42-1-'+index}}" type="star" size="16" bind:__l="__l"></uni-icon></view><view class="uni-comment-date"><text style="color:#909399;font-size:20rpx;">{{item.add_time}}</text></view></view><view><van-rate vue-id="{{'1573bc42-2-'+index}}" value="{{item.satisfaction}}" void-icon="star" void-color="#eee" color="#ee0a24" readonly="true" data-com-type="wx" bind:__l="__l"></van-rate></view></view><view class="uni-comment-content" style="color:#303133;font-size:28rpx;">{{item.content}}</view></view></view></block></view>
+<view><block wx:for="{{feedback_list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="uni-padding-wrap" style="border-bottom:1px solid #EEEEEE;padding-bottom:10rpx;"><view class="uni-comment"><view class="uni-comment-list"><view class="uni-comment-face"><image style="width:100%;height:100%;" src="{{item.member_avatar}}"></image></view><view class="uni-comment-body"><view class="uni-comment-top"><text style="font-size:28rpx;color:#303133;">{{item.member_truename}}</text><uni-icon vue-id="{{'1573bc42-1-'+index}}" type="star" size="16" bind:__l="__l"></uni-icon></view><view class="uni-comment-date"><text style="color:#909399;font-size:20rpx;">{{item.add_time}}</text></view></view><view><van-rate vue-id="{{'1573bc42-2-'+index}}" value="{{item.satisfaction}}" void-icon="star" void-color="#eee" color="#ee0a24" readonly="true" data-com-type="wx" bind:__l="__l"></van-rate></view></view><view class="uni-comment-content" style="color:#303133;font-size:28rpx;">{{item.content}}</view></view></view></block></view>

unpackage/dist/dev/mp-weixin/component/popup.js

@@ -114,7 +114,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniPopup = function uniPopup() {__webpack_require__.e(/*! require.ensure | component/uni-popup */ "component/uni-popup").then((function () {return resolve(__webpack_require__(/*! ./uni-popup.vue */ 333));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniPopup = function uniPopup() {__webpack_require__.e(/*! require.ensure | component/uni-popup */ "component/uni-popup").then((function () {return resolve(__webpack_require__(/*! ./uni-popup.vue */ 340));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -164,7 +164,11 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   props: {
     ishow: {
       default: false,
-      type: Boolean } },
+      type: Boolean },
+
+    images: {
+      default: '',
+      type: String } },
 
 
   components: {
@@ -183,6 +187,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   data: function data() {
     return {
       type: true,
+      pictureUrl: this.pictureUrl,
       list: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
       bottomData: [{
         text: '微信',
@@ -226,7 +231,13 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   methods: {
     togglePopup: function togglePopup() {
       this.type = false;
+    },
+    gomoney: function gomoney() {
+      uni.navigateTo({
+        url: '/pages/myCenter/definite' });
+
     } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/component/popup.wxml

@@ -1 +1 @@
-<view><view class="example"><uni-popup vue-id="99e654ec-1" show="{{type}}" position="middle" mode="insert" data-event-opts="{{[['^hidePopup',[['togglePopup',['']]]]]}}" bind:hidePopup="__e" bind:__l="__l" vue-slots="{{['default']}}"><view class="uni-center center-box"><image class="image" style="background-color:#007AFF;" src></image></view></uni-popup></view></view>
+<view><view class="example"><uni-popup vue-id="99e654ec-1" show="{{type}}" position="middle" mode="insert" data-event-opts="{{[['^hidePopup',[['togglePopup',['']]]]]}}" bind:hidePopup="__e" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['gomoney',['$event']]]]]}}" class="uni-center center-box" bindtap="__e"><image class="image" src="{{pictureUrl+'/uploads/home/adv/'+images}}"></image></view></uni-popup></view></view>

unpackage/dist/dev/mp-weixin/component/popup.wxss

@@ -42,8 +42,8 @@ button {
 	text-align: center;
 }
 .center-box {
-	width: 500rpx;
-	height: 500rpx;
+	width: 700rpx;
+	height: 700rpx;
 }
 .uni-list-item {
 	text-align: left;

unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js

@@ -114,7 +114,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniStatusBar = function uniStatusBar() {__webpack_require__.e(/*! require.ensure | component/uni-status-bar/uni-status-bar */ "component/uni-status-bar/uni-status-bar").then((function () {return resolve(__webpack_require__(/*! ../uni-status-bar/uni-status-bar.vue */ 340));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! ../uni-icon/uni-icon.vue */ 257));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniStatusBar = function uniStatusBar() {__webpack_require__.e(/*! require.ensure | component/uni-status-bar/uni-status-bar */ "component/uni-status-bar/uni-status-bar").then((function () {return resolve(__webpack_require__(/*! ../uni-status-bar/uni-status-bar.vue */ 347));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! ../uni-icon/uni-icon.vue */ 257));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/cart.js

@@ -147,7 +147,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniNavBar = function uniNavBar() {__webpack_require__.e(/*! require.ensure | component/uni-nav-bar/uni-nav-bar */ "component/uni-nav-bar/uni-nav-bar").then((function () {return resolve(__webpack_require__(/*! @/component/uni-nav-bar/uni-nav-bar.vue */ 250));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uninumberbox = function uninumberbox() {__webpack_require__.e(/*! require.ensure | component/uinNumberCart */ "component/uinNumberCart").then((function () {return resolve(__webpack_require__(/*! @/component/uinNumberCart.vue */ 288));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniNavBar = function uniNavBar() {__webpack_require__.e(/*! require.ensure | component/uni-nav-bar/uni-nav-bar */ "component/uni-nav-bar/uni-nav-bar").then((function () {return resolve(__webpack_require__(/*! @/component/uni-nav-bar/uni-nav-bar.vue */ 250));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uninumberbox = function uninumberbox() {__webpack_require__.e(/*! require.ensure | component/uinNumberCart */ "component/uinNumberCart").then((function () {return resolve(__webpack_require__(/*! @/component/uinNumberCart.vue */ 295));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/commemt.js

@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var assess = function assess() {__webpack_require__.e(/*! require.ensure | component/assess */ "component/assess").then((function () {return resolve(__webpack_require__(/*! @/component/assess.vue */ 283));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var assess = function assess() {__webpack_require__.e(/*! require.ensure | component/assess */ "component/assess").then((function () {return resolve(__webpack_require__(/*! @/component/assess.vue */ 290));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/feedback.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 302));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 316));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/hotel.json

@@ -16,6 +16,6 @@
     "commo-nar": "/component/commoNar",
     "assess": "/component/assess",
     "shop-list": "/component/shopList",
-    "logion-dialog": "/component/loginDialog"
+    "gobacktop": "/component/Gobacktop"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.js

@@ -131,7 +131,19 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 276));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 283));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -195,6 +207,7 @@ var _default = {
 
   data: function data() {
     return {
+      isprice: 0,
       goods_list: [],
       scrollTop: 0,
       old: {
@@ -235,27 +248,31 @@ var _default = {
       this.goods_list = [];
       if (this.tabIndex == 1) {// 服务
         this.istopclick = 0;
-        this.gc_id_1 = '';
+        this.isprice = 0;
+        this.gc_id_2 = '';
         this.goods_price = '';
         this.goods_commonid = '';
       } else if (this.tabIndex == 2) {//伤
         this.chosegoods_price = true;
         console.log(this.chosegoods_commonid);
         this.istopclick = this.chosegoods_commonid ? 1 : 2;
+        this.isprice = 0;
         this.goods_price = '';
         this.goods_commonid = this.chosegoods_commonid ? 'asc' : 'desc';
-        this.gc_id_1 = '';
+        //this.gc_id_1 = '';
         this.chosegoods_commonid = !this.chosegoods_commonid;
       } else if (this.tabIndex == 3) {// 价格
         this.chosegoods_commonid = true;
         console.log(this.chosegoods_price);
-        this.istopclick = this.chosegoods_price ? 3 : 4;
+        this.isprice = this.chosegoods_price ? 3 : 4;
         this.goods_price = this.chosegoods_price ? 'desc' : 'asc';
         this.goods_commonid = '';
-        this.gc_id_1 = '';
+        this.istopclick = 0;
+        //this.gc_id_1 = '';
         this.chosegoods_price = !this.chosegoods_price;
       } else if (this.tabIndex == 4) {// 分类
         this.istopclick = 0;
+        this.isprice = 0;
         this.goods_price = '';
         this.goods_commonid = '';
         this.chosegoods_price = true;
@@ -294,9 +311,8 @@ var _default = {
             _this.ispill = true;
           } else {
             _this.ispill = false;
-
           }
-          _this.goods_list = res.data.data.goods_list;
+          _this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
         } });
 
     },
@@ -312,7 +328,9 @@ var _default = {
 
         success: function success(res) {var
           category_list = res.data.data.category_list;
-          that.category_list = category_list;
+          var array = [{ gc_id: '', gc_name: '全部' }];
+          that.category_list = array.concat(category_list);
+          console.log(that.category_list);
         } });
 
     },
@@ -323,10 +341,9 @@ var _default = {
 
     // 滚到底部
     lower: function lower(e) {
-
-      if (this.ispull) {
+      if (this.ispill) {
         this.page = this.page + 1;
-        this.gethotelist();
+        this.getshopdetail();
       }
     },
 

unpackage/dist/dev/mp-weixin/pages/index/hoteldetail.wxss

@@ -18,7 +18,8 @@
     -webkit-box-align: center;
     -webkit-align-items: center;
             align-items: center;
-    -webkit-justify-content: space-around;
-            justify-content: space-around;
+    -webkit-box-pack: center;
+    -webkit-justify-content: center;
+            justify-content: center;
 }
 

unpackage/dist/dev/mp-weixin/pages/index/hotelsearch.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! @/component/uni-icon/uni-icon.vue */ 257));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 276));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! @/component/uni-icon/uni-icon.vue */ 257));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var shopList = function shopList() {__webpack_require__.e(/*! require.ensure | component/shopList */ "component/shopList").then((function () {return resolve(__webpack_require__(/*! @/component/shopList.vue */ 283));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -5,6 +5,7 @@
     "unipopup": "/component/popup",
     "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
     "uni-icon": "/component/uni-icon/uni-icon",
-    "logion-dialog": "/component/loginDialog"
+    "logion-dialog": "/component/loginDialog",
+    "gobacktop": "/component/Gobacktop"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/shop.json

@@ -9,6 +9,6 @@
     "uni-icon": "/component/uni-icon/uni-icon",
     "assess": "/component/assess",
     "uninumberbox": "/component/uinNumber",
-    "logion-dialog": "/component/loginDialog"
+    "gobacktop": "/component/Gobacktop"
   }
 }

unpackage/dist/dev/mp-weixin/pages/myCenter/Settled.js

@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 316));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js

@@ -168,7 +168,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _new_file = _interopRequireDefault(__webpack_require__(/*! @/common/new_file.js */ 18));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _new_file = _interopRequireDefault(__webpack_require__(/*! @/common/new_file.js */ 18));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 316));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 {
   components: {
     uploadImage: uploadImage },

unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 302));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 316));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myOrder/adressManger.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var mpvueCityPicker = function mpvueCityPicker() {Promise.all(/*! require.ensure | component/mpvue-citypicker/mpvueCityPicker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("component/mpvue-citypicker/mpvueCityPicker")]).then((function () {return resolve(__webpack_require__(/*! @/component/mpvue-citypicker/mpvueCityPicker.vue */ 323));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var mpvueCityPicker = function mpvueCityPicker() {Promise.all(/*! require.ensure | component/mpvue-citypicker/mpvueCityPicker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("component/mpvue-citypicker/mpvueCityPicker")]).then((function () {return resolve(__webpack_require__(/*! @/component/mpvue-citypicker/mpvueCityPicker.vue */ 330));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myOrder/estimate.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 302));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 309));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 316));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myOrder/index.js

@@ -224,7 +224,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 316));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var logionDialog = function logionDialog() {__webpack_require__.e(/*! require.ensure | component/loginDialog */ "component/loginDialog").then((function () {return resolve(__webpack_require__(/*! @/component/loginDialog.vue */ 264));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 323));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var Gobacktop = function Gobacktop() {__webpack_require__.e(/*! require.ensure | component/Gobacktop */ "component/Gobacktop").then((function () {return resolve(__webpack_require__(/*! @/component/Gobacktop.vue */ 269));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -232,10 +233,11 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 {
   components: {
     Dialog: Dialog,
-    logionDialog: logionDialog },
+    Gobacktop: Gobacktop },
 
   data: function data() {
     return {
+      isTop: false,
       ispull: true,
       showdialog: false,
       orderCancel: false,
@@ -325,6 +327,13 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
 
   methods: {
+    getop: function getop() {
+      this.scrollTop = this.old.scrollTop;
+      this.$nextTick(function () {
+        this.scrollTop = 0;
+      });
+      this.isTop = false;
+    },
     gotologion: function gotologion() {
       uni.navigateTo({
         url: '/pages/myCenter/logion' });
@@ -473,6 +482,12 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
     // 滚动时触发
     scroll: function scroll(e) {
+      if (e.detail.scrollTop > 400) {
+        this.isTop = true;
+      } else {//当距离小于500时显示回到顶部按钮
+        this.isTop = false;
+      }
+
       this.old.scrollTop = e.detail.scrollTop;
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))