立即购买

App.vue

@@ -31,7 +31,8 @@
 								   console.log(sessionId)
 					     		  // 获取code  
 					     			 that.setOpenid("22222");
-					     			 that.login();
+					     			// that.login();
+									// that.showDialog(false);
 					     			 // 获取sessionId
 					     			 uni.request({
 					     				  url: '',
@@ -54,9 +55,11 @@
 			  uni.login({
 			  		provider: 'weixin',
 			  		success: function(res) {
+						console.log(res);
 			  		  // 获取code  
 			  			 that.setOpenid("22222");
-			  			 that.login();
+			  			// that.login();
+						// that.showDialog(false);
 			  			 // 获取sessionId
 			  			 uni.request({
 			  				  url: '',
@@ -74,7 +77,7 @@
 			  		}
 			  })
 			};
-		   // 用户授全
+		  // 用户授全
 			// uni.getSetting({
 			//   success(res) {
 			//    if (res.authSetting['scope.userInfo']) {
@@ -109,8 +112,8 @@
 			// 	        }
 			// 	    }
 			// 	});
-			// //     console.log("未授权=====")
-			// //     that.showSettingToast("请授权")
+			//     console.log("未授权=====")
+			//     that.showSettingToast("请授权")
 			//    }
 			//   }
 			//  })

pages.json

@@ -78,18 +78,31 @@
 		{
 			"path": "pages/index/commemt",
 			"style": {
-				"navigationBarTitleText": "评价"
+				"navigationBarTitleText": "评价",
+				"usingComponents":{
+						 "van-rate": "/wxcomponents/dist/rate/index"
+						}
 			}
 		},
 		{
 			"path": "pages/index/searchresult",
 			"style": {
-				"navigationBarTitleText": "搜索",
+				"navigationBarTitleText": "酒店搜索",
 				"usingComponents":{
 					"van-search": "/wxcomponents/dist/search/index"
 			    }
 			}
 		},
+		{
+			"path": "pages/index/hotelsearch",
+			"style": {
+				"navigationBarTitleText": "商品搜索",
+				"usingComponents":{
+					"van-search": "/wxcomponents/dist/search/index",
+					"van-icon": "/wxcomponents/dist/icon/index"
+			    }
+			}
+		},
 		
 		{
 			"path": "pages/myone/oneIndex",

pages/index/cart.vue

@@ -119,7 +119,6 @@
 				let ids = array.toString();
 				if(this.isdelete) {
 					// 结算
-					
 					this.getorderId(); // 保存订单生成订单id
 					uni.navigateTo({
 						// url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}`

pages/index/commemt.vue

@@ -1,6 +1,31 @@
 <template>
 	<view>
-		<assess />
+		<view  v-for="(item,index) in assesslist" :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-body">
+						<view class="uni-comment-top">
+							<text style="font-size: 28upx;color: #303133">{{item.member_truename}}</text>
+						    <uniIcon type="star" size="16"></uniIcon>
+						</view>
+						<view class="uni-comment-date">
+							<text style="color: #909399;font-size: 20upx;">{{item.geval_addtime}}</text>
+						</view>
+					</view>
+					<view>
+						<van-rate
+						  :value="item.satisfaction"
+						  void-icon="star"
+						  void-color="#eee"
+						  color="#ee0a24"
+						  readonly='true'
+						/>
+					</view>
+				</view>
+				<view style="color: #303133;font-size: 28upx;" class="uni-comment-content">{{item.geval_content}}</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -13,6 +38,7 @@
 		data(){
 			return {
 				goodId: 0,
+				assesslist:[],
 				store_id: 0
 			}
 		},
@@ -24,13 +50,13 @@
 		methods: {
 			getassess() {
 				this.request({
-					url: '?do=getevaluategoods',
+					url: '/api/index.php?do=getevaluategoods',
 					method: 'post',
 					data: {
 						goodsid: this.goodId
 					},
-					success: function(res) {
-						console.log(res);
+					success: (res) => {
+						this.assesslist = res.data;
 					}
 				})
 			}

pages/index/hotel.vue

@@ -18,19 +18,16 @@
            <view @tap="goback()" class="topleft">
                <uniIcon type="back" size="22" color="#666666" />
            </view>
-           <view>
+           <view @click="gotosearch">
                <view class="input-view">
                     <uniIcon type="search" size="22" color="#666666" />
                     <input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" @confirm="confirm" />
                </view>
            </view>
-           
-           <view class="topright">
+          <!-- <view class="topright">
                <uniIcon type="arrowright" size="22" color="#666666" />
-           </view>
+           </view> -->
        </view>
-       
-       
        <view class="tip">
            <view style="font-size: 36upx;color: #303133;">{{hotelitle}}</view>
            <view >
@@ -224,7 +221,13 @@
 			]),
 		},
         methods: {
-			
+			// 搜说
+			gotosearch() {
+				let store_id = this.goodId;
+				uni.navigateTo({
+				        url: `/pages/index/hotelsearch?store_id=${store_id}`
+				    });
+			},
 			// 收藏
 			gocollect() {
 				if(this.hasLogin) {
@@ -259,7 +262,7 @@
 					this.gc_id_1 = '';
 					this.goods_price = ''; 
 					this.goods_commonid = '';
-				}else if(this.tabIndex == 2){ //价格
+				}else if(this.tabIndex == 2){ //伤
 				        this.chosegoods_price = true;
 						console.log(this.chosegoods_commonid);
 						this.istopclick = this.chosegoods_commonid?1:2;
@@ -267,11 +270,11 @@
 						this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
 						this.gc_id_1 = '';
 						this.chosegoods_commonid = !this.chosegoods_commonid;
-				}else if(this.tabIndex == 3){ // 上新
+				}else if(this.tabIndex == 3){ // 价格
 						this.chosegoods_commonid = true;
 						console.log(this.chosegoods_price);
 						this.istopclick = this.chosegoods_price?3:4;
-						this.goods_price = this.chosegoods_price?'asc':'desc';
+						this.goods_price = this.chosegoods_price?'desc':'asc';
 						this.goods_commonid = '';
 						this.gc_id_1 = '';
 						this.chosegoods_price = !this.chosegoods_price;
@@ -434,7 +437,7 @@
     }
 </script>
   
-<style>
+<style scoped>
     .scrollswiper {
         width: 100%;
         position: relative;
@@ -480,7 +483,6 @@
         min-width: 20%;
         max-width: 20%;
         margin: 24rpx 0 25rpx 4%;
-        /* background-color: #909399 */
     }
     .active {
         color: #F76260;
@@ -512,7 +514,7 @@
         
     .titeTop {
         display: flex;
-        justify-content: space-between;
+        /* justify-content: space-between; */
         align-items: center;
         position: absolute;
         top: 10upx;

pages/index/hoteldetail.vue

@@ -5,37 +5,39 @@
 		 refresher-enabled="true">
 	  <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;">
-	                      <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>
-	              </view>
-	              <view @click="choseType(3)"  class="typeItem">
-	                  <view class="iconClass">
-	                      <view :class="tabIndex==3 ? 'active' : ''">价格</view>
-	                      <view style="display: flex;flex-direction: column;">
-	                         <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>
-	                  </view>
-	              </view>
-	              <view  @click="choseType(4)" class="typeItem">
-	                <view :class="tabIndex==4 ? 'active' : ''">分类</view>
-	              </view>
-	          </view>
+			 <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>
+			 </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>
+			     </view>
+			     
+			 </view>
+			 <view  @click.stop="choseType(4)" class="typeItem">
+			 								    <view :class="tabIndex==4 ? 'active' : ''">分类</view>
+			 </view>
+	      </view>
 			
 	  </view>
 		  <view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="tabIndex==4">
@@ -65,6 +67,8 @@
 				old: {
 					scrollTop: 0
 				},
+				chosegoods_commonid:　true,
+				chosegoods_price: true,
 				ispull: false,
 				istopclick: 0,
 				tabIndex: 	1,
@@ -93,49 +97,43 @@
 		},
 		methods: {
 			choseType(e) {
+		      this.page = 1;
 			  this.tabIndex = e;
-			  if(this.tabIndex == 1) {
-			  	this.istopclick = 0;
-			  	this.goods_price = ''; 
-			  	this.goods_commonid = '';
-			  }else if(this.tabIndex == 2){
-			  		this.istopclick = 1;
-			  		this.goods_commonid = 'asc';
+			  this.goods_list = [];
+			if(this.tabIndex == 1) {  // 服务
+				this.istopclick = 0;
+				this.gc_id_1 = '';
+				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.goods_price = ''; 
-					this.gc_id_2 = '';
-			  }else if(this.tabIndex == 3){
-			  		this.istopclick = 3;
-			  		this.goods_price = 'asc';
+					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.goods_price = this.chosegoods_price?'desc':'asc';
 					this.goods_commonid = '';
-					this.gc_id_2 = '';
-			  	}else if(this.tabIndex ==4) {
-			  		this.istopclick = 0;
-			  		this.goods_price = ''; 
-			  		this.goods_commonid = '';
-			  	}
+					this.gc_id_1 = '';
+					this.chosegoods_price = !this.chosegoods_price;
+				}else if(this.tabIndex ==4) {  // 分类
+					this.istopclick = 0;
+					this.goods_price = ''; 
+					this.goods_commonid = '';
+					this.chosegoods_price = true;
+					this.chosegoods_commonid = true;
+				}
 			  this.getshopdetail();
 			},
+			
+			// 点击图标上下筛选切换
 			changeisclick(e) {
-				this.istopclick = e;
-				this.gc_id_2 = '';
-				if(e == 2) {
-					this.goods_commonid = 'desc';
-					this.goods_price = ''
-					this.tabIndex = 2;
-				}else if(e == 4) {
-					this.goods_price = 'desc';
-					this.goods_commonid = '';
-					this.tabIndex = 3;
-				}else if(e == 1) {
-					this.tabIndex = 2;
-					this.goods_commonid = 'asc';
-					this.goods_price = ''
-				}else if(e == 3) {
-					this.tabIndex = 3;
-					this.goods_commonid = '';
-					this.goods_price = 'asc';
-				}
-				 this.getshopdetail();
+				
 			},
 			confirm(e) {
 				console.log(e);

pages/index/hotelsearch.vue

@@ -0,0 +1,201 @@
+<template>
+	<view class="searchType" style="background: #fff;height: 100vh;">
+		 <van-cell value-class="searchclass">
+			 <template slot="title">
+				<view class="input-view">
+					<uni-icon type="search" size="22" color="#666666" />
+					<input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" 
+					@input="confirm" />
+				</view> 
+			 </template>
+			 <template>
+				 <view @click="search">搜索</view>
+			 </template>
+		 </van-cell>
+		 
+		 <view style="padding: 30upx 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 ><van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /></view>
+		 			           <view>
+		 			 				<van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" />
+		 			 				</view>
+		 			       </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>
+									 <van-icon    :class="istopclick==3 ? 'active' : ''" size="8px" name="arrow-up" />
+								 </view> 
+								 <view>
+									  <van-icon  :class="istopclick==4 ? 'active' : ''" size="8px" name="arrow-down" />
+								 </view>
+		 			            
+		 			         </view>
+		 			     </view>
+		 			     
+		 			 </view>
+					
+		     </view>
+		 			
+		 </view>
+		  <shopList :productList="goods_list" />
+	 </view>
+</template>
+
+<script>
+	import uniIcon from '@/component/uni-icon/uni-icon.vue'
+	import shopList from '@/component/shopList.vue'  // 商品列表
+	export default {
+		components: {
+			uniIcon,
+			shopList
+		},
+		onLoad(a) {
+			console.log(a);
+			this.goodId = a.store_id;
+			//this.gethotelist();
+		},
+		data() {
+			return {
+				page: 1,
+				goodId:0,
+				tabIndex: 1,
+				istopclick: 0,
+				goods_price:'',
+				goods_commonid:"",
+				chosegoods_commonid:　true,
+				chosegoods_price: true,
+				searchvalue:'',
+				goods_list:[]
+			}
+		},
+		methods: {
+			search() {
+				this.getshopdetail();
+			},
+			confirm(e) {
+				this.searchvalue = e.detail.value;
+				// /this.getshopdetail();
+			},
+			// 获取商品详情
+			getshopdetail() {
+				if(this.searchvalue == '') {
+						 this.$msg("关键字不能为空")
+						 return;
+				}
+				this.request({
+				                url:"/v2/entry/storeGoods",
+				                method:'get',
+				                data: {
+				                         store_id: this.goodId,
+										 page: this.page,
+										 goods_commonid: this.goods_commonid, // 上新排序
+										 goods_price: this.goods_price,
+										 keyword: this.searchvalue
+				                    },
+								success: (res) => {
+									this.goods_list = this.goods_list.concat(res.data.data.goods_list);
+									if(res.data.data.goods_list.length < 10) {
+										this.isDetail = 2;
+									}
+								},
+			    })
+			},
+			choseType(e) {
+			    this.tabIndex = e;
+				if(this.searchvalue == '') {
+					return;
+				}
+				this.goods_list = [];
+				if(this.tabIndex == 1) {  // 服务
+					this.istopclick = 0;
+					this.gc_id_1 = '';
+					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.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.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.goods_price = ''; 
+						this.goods_commonid = '';
+						this.chosegoods_price = true;
+						this.chosegoods_commonid = true;
+					}
+				this.getshopdetail();
+			},
+		}
+	}
+</script>
+
+<style>
+.searchType .input-view {
+		width: 80%;
+		display: flex;
+		background-color: #e7e7e7;
+		height: 30px;
+		border-radius: 15px;
+		padding: 0 4%;
+		flex-wrap: nowrap;
+		margin: 7px 0;
+		line-height: 30px;
+		margin: 24upx 0 24upx 32upx;
+	}
+	
+	.searchType .input-view .uni-icon {
+		line-height: 30px !important;
+	}
+	
+	.searchType .input-view .input {
+		height: 30px;
+		line-height: 30px;
+		width: 94%;
+		padding: 0 3%;
+	}
+	.van-cell__title {
+		flex: 6!important;
+	}
+	.searchclass {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.active {
+	    color: #F76260;
+	}
+	.typeItem {
+	    width: 33%;
+	    display: inline-block;
+	    text-align: center;
+	}  
+	.iconClass {
+	    display: flex;
+	    flex-direction: row;
+	    align-items: center;
+	    justify-content: center;
+	}
+	
+</style>

pages/index/index.vue

@@ -13,11 +13,13 @@
 	 		<view class="city" v-if="!allow">
 	 			<view style="font-size: 35upx;">{{ location }}</view>
 	 		</view>
-			<button plain="true" style="border: none;" v-if="allow" @opensetting='handler'  open-type="openSetting">定位失败，点击重新获取</button>
+			<button plain="true" style="border: none;" 
+			  v-if="allow" @opensetting='handler'
+			  open-type="openSetting" >定位失败，点击重新获取</button>
 	 	</block>
-			<view  class="input-view" style="float: right;">
+			<!-- <view class="input-view" style="float: right;display: none;">
 			  <uni-icon color="#606266" size="22" @click="scan" type="scan"></uni-icon>
-			</view>
+			</view> -->
 		<block  slot="right">
 			<view  @click="goinfor">
 				<uni-icon color="#606266" size="22" type="chat"></uni-icon>
@@ -37,7 +39,6 @@
 		 :interval="interval" 
 		 :duration="duration"
 		 > 
-		   <!-- <img src="' + siteurl + "uploads/home/adv/" + item.adv_code + '"/></div>'); -->
 			<swiper-item v-for="(item,index) in backgroundlist" :key="index">
 			<view class="swiper-item"  @tap="shopDetail(item)" >
 				 <image style="height: 100%;width: 100%;" :src='pictureUrl +"/uploads/home/adv/"+item.adv_code' />
@@ -46,6 +47,7 @@
 			
 		 </swiper>
 	 </view>
+	 <button type="primary" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">微信登录</button>
 	 <view class="tips">
 		 在附近酒店找到您入住的酒店
 	 </view>
@@ -140,6 +142,20 @@
 	    },
 		methods: {
 			...mapMutations(['login','showDialog']),
+			  decryptPhoneNumber(e) {    
+			                console.log(e);    
+			                if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {    
+			                    console.log(e);
+			                } else {    
+			                    console.log('用户同意提供手机号');
+								console.log(JSON.stringify(e.detail.encryptedData));
+								console.log(JSON.stringify(e.detail.iv));
+								let encryptedData = e.detail.encryptedData;
+								let iv = e.detail.iv;
+								console.log( iv );
+								console.log( encryptedData );
+						    }
+			    },
 			handler() {
 				console.log("kkkkk")
 				this.getAuthorizeInfo();
@@ -206,9 +222,19 @@
 				uni.getSetting({
 					success(res) {
 						if(!res.authSetting[b]) {
+							console.log("没有授权")
 							_this.showDialog(false);
 						}else {
+							console.log("yijing授权")
 							_this.showDialog(true);
+							// uni.getUserInfo({
+							// 	     success(res) {
+							// 		 console.log(res);
+							// 		 console.log("oooooo")
+							// 			 that.login(res.userInfo);
+							// 			 //that.showDialog(true); // 改变haslogion的值
+							// 	     }
+							//     })
 						}
 					}
 				})

pages/index/searchresult.vue

@@ -9,26 +9,26 @@
 				</view> 
 			 </template>
 			 <template>
-				 <view>搜索</view>
+				 <view @click="search">搜索</view>
 			 </template>
 		 </van-cell>
 		 
-		 <view class="hotelList">
+		 <view class="hotelList" v-for="(item,index) in hotelist" :key="index">
 		 		 <view class="hotleLeft">
-		 			 <image  style="width: 214upx;height: 152upx;" src=""/>
+		 		 			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/adv/'+item.store_logo"/>
+		 		 		 </view>
+		 		 		 <view class="hotelright">
+		 		 		 	<view style="font-size: 32upx;color: #303133;font-weight: 550;">{{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="color: #606266;font-size: 24upx;">月访客{{item.store_visitor}}</view>
+		 		 				<view style="color: #606266;font-size: 24upx;">{{item.distance}}</view>
+		 		 			</view>
+		 		 			<view  v-if="item.tages.length!=1" class="undertip">
+		 		 				<view  v-for="(items,index) in item.tages" :key="index" class="tipsTop">{{items}}</view>
+		 		 			</view>
 		 		 </view>
-		 		 <view class="hotelright">
-		 		 	<view style="font-size: 36upx;color: #303133;">华南城市酒店</view>
-		 		    <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-		 				<view style="font-size: 40upx; color: #303133;"> 0.0</view>
-		 				<view>月访客990</view>
-		 				<view>8km</view>
-		 			</view>
-		 			<view class="undertip">
-		 				<view class="tipsTop">有停车为</view>
-		 				<view class="tipsTop">内置酒店</view>
-		 			</view>
-		 </view>
 		 </view>
 	 </view>
 </template>
@@ -40,26 +40,37 @@
 			uniIcon
 		},
 		onLoad() {
-			this.gethotelist();
+			//this.gethotelist();
 		},
 		data() {
 			return {
-				searchvalue:''
+				pictureUrl: this.pictureUrl,
+				hotelist: [],
+				searchvalue:'',
+				page: 1
 			}
 		},
 		methods: {
+			search() {
+				this.gethotelist();
+			},
 			confirm(e) {
 				this.searchvalue = e.detail.value;
+				this.gethotelist();
 			},
 			// 获取酒店列表
 					 gethotelist() {
+						 if(this.searchvalue == '') {
+							 this.$msg("关键字不能为空")
+							 return;
+						 }
 						 this.request({
 			                url:"/v2/entry/storeList",
 			                method:'get',
 			                data: {
 			                    page: this.page,
 							    page_size: 10,
-								keyword: this.keyword
+								keyword: this.searchvalue
 			                 },
 							success: (res) => {
 								 let { data,code } = res.data;
@@ -72,12 +83,9 @@
 									 }else {
 										 this.hotelist =  this.hotelist.concat(data.store_list);
 									 }
-									this.hotelist.forEach(item => {
-										item.tages = item.store_summary.split('  ');
-									})
 									 
 								 }else {
-									 console.log(_this.hotelist).$msg("网络错误稍后再试")
+									 this.$msg("网络错误稍后再试")
 								 }
 							}
 					   })

pages/index/shop.vue

@@ -354,6 +354,41 @@
 					this.showdialog = true;
 				}
 			},
+			// 立即购买
+			buynow() {
+				if(this.hasLogin) {
+					if(this.specSelected.length == 0) {
+						this.$msg("请选择规格数量");
+						this.specClass = 'show';
+						return;
+					}
+					let goods = [];
+					this.specSelected.forEach((item,index) => {
+						 goods.push({});
+						 goods[0].goods_id = item.goods_id;
+						 goods[0].buy_num = this.shopnumber;
+					 })
+					 console.log(goods)
+					 this.request({
+						 url:'/v1/order/save_og',
+						 method: 'post',
+						 data: {
+							 store_id: this.store_id,
+							 goods: JSON.stringify(goods)
+						 },
+						 success:(res) => {
+							 console.log(res);
+							 let order_id = res.data.data.order_id;
+							 uni.navigateTo({
+							   url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}&order_id=${order_id}`
+							 });
+							 
+						 }
+					 })
+				}else {
+					this.showdialog = true;
+				}
+			},
 			// 加入购物车
 			addCar() {
 				if(this.hasLogin) {
@@ -381,14 +416,7 @@
 					this.showdialog = true;
 				}
 			},
-			// 立即购买
-			buynow() {
-				if(this.hasLogin) {
-					
-				}else {
-					this.showdialog = true;
-				}
-			},
+			
 			closeCar() {
 				this.specClass = 'none';
 			},
@@ -416,7 +444,6 @@
 				}
 				this.arrayId = array;
 				if(this.arrayId.length == this.datalist.spec_list.length) {
-					console.log("进来了")
 					this.scopemapId = array.join("_");
 					let goodId = this.datalist.spec_map[this.scopemapId]; //
 					let items = this.datalist.goods_list[goodId]

pages/myCenter/applyfor.vue

@@ -96,7 +96,6 @@
 						licence_image: licence_image
 					},
 					success: (res) => {
-							
 						if(res.data.code == 1000) {
 							this.$msg("申请成功");
 							setTimeout(() => {

pages/myCenter/index.vue

@@ -14,30 +14,30 @@
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{userinfo.member_points}}></view>
 					</view>
 				</view>
-					<view class="myNmaeRight" v-if="userinfo.has_sign == 0">每日签到></view>
+					<view class="myNmaeRight" @click="writeday" v-if="userinfo.has_sign == 0">每日签到></view>
 					<view class="myNmaeRight" v-if="userinfo.has_sign == 1">已签到></view>
 			</view>
 		</view>
-		<van-cell  title="我的订单" is-link />
+		<van-cell @click="gomyorder(0)"  title="我的订单" is-link />
 	    <view class="myorder">
 			<view class="orderList">
-				<view class="orderOne">
+				<view class="orderOne"  @click="gomyorder(1)">
 					<image class="imagewidth" src=""></image>
 					<view>待付款</view>
 				</view>
-				<view class="orderOne">
+				<view class="orderOne"  @click="gomyorder(2)">
 					<image class="imagewidth" src=""></image>
 					<view>处理中</view>
 				</view>
-				<view class="orderOne">
+				<view class="orderOne"  @click="gomyorder(3)">
 					<image class="imagewidth" src=""></image>
 					<view>带评价</view>
 				</view>
-				<view class="orderOne">
+				<view class="orderOne"  @click="gomyorder(4)">
 					<image class="imagewidth" src=""></image>
 					<view>已取消</view>
 				</view>
-				<view class="orderOne">
+				<view class="orderOne"  @click="gomyorder(5)">
 					<image class="imagewidth" src=""></image>
 					<view>退款/售后</view>
 				</view>
@@ -173,14 +173,48 @@
 			
 		},
 		methods: {
+			// 跳转到我的订单
+			gomyorder(e) {
+				if(this.hasLogin) {
+					if(e == 0) {
+						uni.navigateTo({
+							url: '/pages/myOrder/index'
+						})
+					}else if(e == 1) {
+						let state = 'waiting';
+						uni.navigateTo({
+							url: `/pages/myOrder/index?state=${state}`
+						})
+						
+					}else if(e == 2) {
+						let state = 'payed'; 
+						uni.navigateTo({
+							url: `/pages/myOrder/index?state=${state}`
+						})
+					}else if(e == 3) {
+						let state = 'complete-';
+						
+					}else if(e == 4) {
+						let state = 'cancel';
+						uni.navigateTo({
+							url: `/pages/myOrder/index?state=${state}`
+						})
+					}else if(e == 5) {
+						let state = 'refund';
+						uni.navigateTo({
+							url: `/pages/myOrder/index?state=${state}`
+						})
+					}
+					
+				}
+				
+			},
 			getuserinfo() {
 				this.request({
 					url:'/v2/member/info',
 					method:'GET',
 					success: (res)=>{
 						let { data } = res.data;
-						console.log(data);
-						
 						this.userinfo = data;
 					}
 				})
@@ -199,9 +233,20 @@
 			// keepdialog() {
 			// 	this.showdialog = true;
 			// },
+			// 签到
+			writeday() {
+				this.request({
+					url: '/v1/member/point',
+					method: 'POST',
+					data: {
+						stage: 'sign'
+					},
+					success: (res) => {
+						this.getuserinfo();
+					}
+				})
+			},
 			goAdress(e) {
-				console.log(this.hasLogin)
-				console.log(e);
 				if(this.hasLogin) {
 					if(e == 1) {
 							uni.navigateTo({

pages/myOrder/index.vue

@@ -79,6 +79,7 @@
 		},
 		data() {
 			return {
+				ispull: true,
 				showdialog: false,
 				orderCancel:　false,
 				titles:'',
@@ -110,11 +111,12 @@
 			  'userInfo'
 			]),
 		},
-		onLoad() {
+		onLoad(a) {
 			uni.$emit("refehlist",()=>{
 			      this.getlist();
 			  })
 			if(this.hasLogin) {
+				console.log(a);
 				this.getlist(); // 获取订单
 				
 		  	}else {
@@ -124,6 +126,19 @@
 				//this.showdialog = true;
 			}
 			
+		},
+		watch:{
+			'hasLogin':function(val) {
+			   if(val) {
+				  this.active = 0;
+				  this.getlist(); 
+			   }else {
+				  uni.navigateTo({
+				  	url: '/pages/myCenter/logion'
+				  })
+			   }
+			},
+			
 		},
 		methods: {
 			gotologion() {
@@ -144,6 +159,7 @@
 				if(this.hasLogin) {
 					  console.log(e);
 					  this.active = e.target.name;
+					  this.page = 1;
 					  if(e.target.name == 0) {
 						this.state = 'all';
 					  }else if(e.target.name == 1) {
@@ -175,7 +191,10 @@
 						page_size:　10
 					},
 					success: (res) => {
-						this.order_list = res.data.data.order_list;
+						if(res.data.data.order_list.length< 10) {
+							this.ispull = false;
+						}
+						this.order_list = this.order_list.concat(res.data.data.order_list);
 					}
 				})
 			},
@@ -223,6 +242,11 @@
 			// 滚到底部
 			lower(e) {
 				console.log("底部")
+				if(this.ispull) {
+					this.page += 1;
+					this.getlist();
+				}
+				
 			},
 			
 			// 滚动时触发

pages/myOrder/paymoment.vue

@@ -41,7 +41,6 @@
 				titles:'',
 				list:[
 					{title:'微信支付'},
-					{title:'支付宝支付'},
 					{title:'圈币支付'}
 				],
 				radio: 0,
@@ -79,8 +78,32 @@
 				console.log("kkk")
 				if(this.radio == 0) {
 					// 微信支付
-				}else if(this.radio == 1) {
-					// 支付宝支付
+					this.request({
+						url:'/v1/payment/pay',
+						method: 'post',
+						data: {
+							pay_code: 'wx',
+							order_id: this.order_id
+						},
+						success:(res) => {
+							let { wx } = res.data.data;
+							console.log('prepay_id='+wx.prepayid,)
+							uni.requestPayment({
+								    provider: 'wxpay',
+								    timeStamp: wx.timestamp,
+								    nonceStr: wx.noncestr,
+								    package:  'prepay_id='+wx.prepayid,
+								    signType: 'MD5',
+								    paySign: wx.sign,
+								    success: function (res) {
+								        console.log('success:' + JSON.stringify(res));
+								    },
+								    fail: function (err) {
+								        console.log('fail:' + JSON.stringify(err));
+								    }
+							})
+						}
+					})
 				}else {
 					this.titles = "圈币支付";
 					this.values = "使用圈币支付"+this.prices;

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

@@ -7,6 +7,7 @@
     "pages/index/shop",
     "pages/index/commemt",
     "pages/index/searchresult",
+    "pages/index/hotelsearch",
     "pages/myone/oneIndex",
     "pages/myone/onedetail",
     "pages/myOrder/index",
@@ -64,6 +65,5 @@
     "van-dialog": "/wxcomponents/dist/dialog/index",
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  },
-  "sitemapLocation": "sitemap81.json"
+  }
 }

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

@@ -145,7 +145,8 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
               console.log(sessionId);
               // 获取code  
               that.setOpenid("22222");
-              that.login();
+              // that.login();
+              // that.showDialog(false);
               // 获取sessionId
               uni.request({
                 url: '',
@@ -168,9 +169,11 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
       uni.login({
         provider: 'weixin',
         success: function success(res) {
+          console.log(res);
           // 获取code  
           that.setOpenid("22222");
-          that.login();
+          // that.login();
+          // that.showDialog(false);
           // 获取sessionId
           uni.request({
             url: '',
@@ -223,8 +226,8 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     // 	        }
     // 	    }
     // 	});
-    // //     console.log("未授权=====")
-    // //     that.showSettingToast("请授权")
+    //     console.log("未授权=====")
+    //     that.showSettingToast("请授权")
     //    }
     //   }
     //  })

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

@@ -121,6 +121,9 @@
 
 
 
+
+
+
 
 
 

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["component/loginDialog"],{
 
-/***/ 229:
+/***/ 235:
 /*!****************************************************!*\
   !*** D:/uinapp/myuinapp/component/loginDialog.vue ***!
   \****************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 230);
-/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 232);
+/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 236);
+/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 238);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _loginDialog_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 _loginDialog_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);
 
@@ -39,7 +39,7 @@ component.options.__file = "D:/uinapp/myuinapp/component/loginDialog.vue"
 
 /***/ }),
 
-/***/ 230:
+/***/ 236:
 /*!***********************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=template&id=67987460& ***!
   \***********************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "D:/uinapp/myuinapp/component/loginDialog.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_loginDialog_vue_vue_type_template_id_67987460___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!./loginDialog.vue?vue&type=template&id=67987460& */ 231);
+/* 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_loginDialog_vue_vue_type_template_id_67987460___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!./loginDialog.vue?vue&type=template&id=67987460& */ 237);
 /* 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_loginDialog_vue_vue_type_template_id_67987460___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_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 231:
+/***/ 237:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/loginDialog.vue?vue&type=template&id=67987460& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 232:
+/***/ 238:
 /*!*****************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=script&lang=js& ***!
   \*****************************************************************************/
@@ -97,14 +97,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_loginDialog_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!./loginDialog.vue?vue&type=script&lang=js& */ 233);
+/* 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_loginDialog_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!./loginDialog.vue?vue&type=script&lang=js& */ 239);
 /* 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_loginDialog_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_loginDialog_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_loginDialog_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_loginDialog_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_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 233:
+/***/ 239:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/loginDialog.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -199,7 +199,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     'component/loginDialog-create-component',
     {
         'component/loginDialog-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(229))
+            __webpack_require__('1')['createComponent'](__webpack_require__(235))
         })
     },
     [['component/loginDialog-create-component']]

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 */ 215));}).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 */ 253));}).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 */ 221));}).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 */ 259));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -268,7 +268,6 @@ __webpack_require__.r(__webpack_exports__);
       var ids = array.toString();
       if (this.isdelete) {
         // 结算
-
         this.getorderId(); // 保存订单生成订单id
         uni.navigateTo({
           // url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}`

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

@@ -129,7 +129,32 @@ __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 */ 248));}).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 */ 254));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -144,6 +169,7 @@ var _default = {
   data: function data() {
     return {
       goodId: 0,
+      assesslist: [],
       store_id: 0 };
 
   },
@@ -153,15 +179,15 @@ var _default = {
     this.getassess();
   },
   methods: {
-    getassess: function getassess() {
+    getassess: function getassess() {var _this = this;
       this.request({
-        url: '?do=getevaluategoods',
+        url: '/api/index.php?do=getevaluategoods',
         method: 'post',
         data: {
           goodsid: this.goodId },
 
         success: function success(res) {
-          console.log(res);
+          _this.assesslist = res.data;
         } });
 
     } } };exports.default = _default;

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

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "评价",
   "usingComponents": {
+    "van-rate": "/wxcomponents/dist/rate/index",
     "assess": "/component/assess"
   }
 }

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

@@ -1 +1 @@
-<view><assess vue-id="aa985128-1" bind:__l="__l"></assess></view>
+<view><block wx:for="{{assesslist}}" 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="{{'aa985128-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.geval_addtime}}</text></view></view><view><van-rate vue-id="{{'aa985128-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.geval_content}}</view></view></view></block></view>

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

@@ -1,31 +1,31 @@
 
-.scrollswiper {
+.scrollswiper.data-v-5ac9c6cd {
     width: 100%;
     position: relative;
 }
-.titleFixed {
+.titleFixed.data-v-5ac9c6cd {
     position: absolute;
     top: 0;
     left: 0;
     z-index: 99;
     padding-top: 0;
 }
-.van-nav-bar {
+.van-nav-bar.data-v-5ac9c6cd {
     padding-top: 0!important;
     /* background: #000000!important; */
     /* opacity: 0.2; */
     background:rgba(0,0,0,0.2)!important;
 }
-.swiper {
+.swiper.data-v-5ac9c6cd {
     height: 300rpx;
 }
-.swiper-item {
+.swiper-item.data-v-5ac9c6cd {
     display: block;
     height: 100%!important;
     line-height: 300rpx;
     text-align: center;
 }
-.tip {
+.tip.data-v-5ac9c6cd {
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
@@ -34,7 +34,7 @@
             justify-content: space-between;
     padding: 36rpx 32rpx;
 }
-.giveList {
+.giveList.data-v-5ac9c6cd {
     padding: 10rpx  12rpx;
     display: -webkit-box;
     display: -webkit-flex;
@@ -42,7 +42,7 @@
     -webkit-flex-wrap: wrap;
             flex-wrap: wrap;
 }
-.giveItem {
+.giveItem.data-v-5ac9c6cd {
     height: 120rpx;
     -webkit-box-flex: 1;
     -webkit-flex: 1;
@@ -51,17 +51,16 @@
     min-width: 20%;
     max-width: 20%;
     margin: 24rpx 0 25rpx 4%;
-    /* background-color: #909399 */
 }
-.active {
+.active.data-v-5ac9c6cd {
     color: #F76260;
 }
-.typeItem {
+.typeItem.data-v-5ac9c6cd {
     width: 25%;
     display: inline-block;
     text-align: center;
 }
-.iconClass {
+.iconClass.data-v-5ac9c6cd {
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
@@ -76,7 +75,7 @@
     -webkit-justify-content: center;
             justify-content: center;
 }
-.hotlItem {
+.hotlItem.data-v-5ac9c6cd {
     padding: 22rpx 30rpx;
     border-bottom: 1px solid #EEEEEE;
     display: -webkit-box;
@@ -86,19 +85,17 @@
     -webkit-justify-content: space-between;
             justify-content: space-between;
 }
-.bottomButton {
+.bottomButton.data-v-5ac9c6cd {
     width: 95%;
     left: 2.5%;
     position: fixed;
     bottom: 2.5%;
 }
-.titeTop {
+.titeTop.data-v-5ac9c6cd {
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
-    -webkit-box-pack: justify;
-    -webkit-justify-content: space-between;
-            justify-content: space-between;
+    /* justify-content: space-between; */
     -webkit-box-align: center;
     -webkit-align-items: center;
             align-items: center;
@@ -106,11 +103,11 @@
     top: 10rpx;
     width: 100%;
 }
-.topleft {
+.topleft.data-v-5ac9c6cd {
 }
-.topright {
+.topright.data-v-5ac9c6cd {
 }
-.input-view {
+.input-view.data-v-5ac9c6cd {
     width: 85%;
     display: -webkit-box;
     display: -webkit-flex;
@@ -127,22 +124,22 @@
     border-radius:15px;
     opacity:0.4;
 }
-.input-view .uni-icon {
+.input-view .uni-icon.data-v-5ac9c6cd {
     line-height: 30px !important;
 }
-.input-view .input {
+.input-view .input.data-v-5ac9c6cd {
     height: 30px;
     line-height: 30px;
     width: 94%;
     padding: 0 3%;
 }
-.activeColor {
+.activeColor.data-v-5ac9c6cd {
     background: #fff!important;
     position: fixed;
     background-color: #fff;
     top: 50rpx;
     z-index: 99;
 }
-.listType {
+.listType.data-v-5ac9c6cd {
 }
 

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

@@ -131,7 +131,9 @@ __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 */ 241));}).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 */ 247));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
+
+
 
 
 
@@ -198,6 +200,8 @@ var _default = {
       old: {
         scrollTop: 0 },
 
+      chosegoods_commonid: true,
+      chosegoods_price: true,
       ispull: false,
       istopclick: 0,
       tabIndex: 1,
@@ -226,49 +230,43 @@ var _default = {
   },
   methods: {
     choseType: function choseType(e) {
+      this.page = 1;
       this.tabIndex = e;
-      if (this.tabIndex == 1) {
+      this.goods_list = [];
+      if (this.tabIndex == 1) {// 服务
         this.istopclick = 0;
+        this.gc_id_1 = '';
         this.goods_price = '';
         this.goods_commonid = '';
-      } else if (this.tabIndex == 2) {
-        this.istopclick = 1;
-        this.goods_commonid = 'asc';
+      } else if (this.tabIndex == 2) {//伤
+        this.chosegoods_price = true;
+        console.log(this.chosegoods_commonid);
+        this.istopclick = this.chosegoods_commonid ? 1 : 2;
         this.goods_price = '';
-        this.gc_id_2 = '';
-      } else if (this.tabIndex == 3) {
-        this.istopclick = 3;
-        this.goods_price = 'asc';
+        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.goods_price = this.chosegoods_price ? 'desc' : 'asc';
         this.goods_commonid = '';
-        this.gc_id_2 = '';
-      } else if (this.tabIndex == 4) {
+        this.gc_id_1 = '';
+        this.chosegoods_price = !this.chosegoods_price;
+      } else if (this.tabIndex == 4) {// 分类
         this.istopclick = 0;
         this.goods_price = '';
         this.goods_commonid = '';
+        this.chosegoods_price = true;
+        this.chosegoods_commonid = true;
       }
       this.getshopdetail();
     },
+
+    // 点击图标上下筛选切换
     changeisclick: function changeisclick(e) {
-      this.istopclick = e;
-      this.gc_id_2 = '';
-      if (e == 2) {
-        this.goods_commonid = 'desc';
-        this.goods_price = '';
-        this.tabIndex = 2;
-      } else if (e == 4) {
-        this.goods_price = 'desc';
-        this.goods_commonid = '';
-        this.tabIndex = 3;
-      } else if (e == 1) {
-        this.tabIndex = 2;
-        this.goods_commonid = 'asc';
-        this.goods_price = '';
-      } else if (e == 3) {
-        this.tabIndex = 3;
-        this.goods_commonid = '';
-        this.goods_price = 'asc';
-      }
-      this.getshopdetail();
+
     },
     confirm: function confirm(e) {
       console.log(e);

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

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "商品搜索",
+  "usingComponents": {
+    "van-search": "/wxcomponents/dist/search/index",
+    "van-icon": "/wxcomponents/dist/icon/index",
+    "uni-icon": "/component/uni-icon/uni-icon",
+    "shop-list": "/component/shopList"
+  }
+}

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

@@ -0,0 +1,66 @@
+
+.searchType .input-view {
+		width: 80%;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		background-color: #e7e7e7;
+		height: 30px;
+		border-radius: 15px;
+		padding: 0 4%;
+		-webkit-flex-wrap: nowrap;
+		        flex-wrap: nowrap;
+		margin: 7px 0;
+		line-height: 30px;
+		margin: 24rpx 0 24rpx 32rpx;
+}
+.searchType .input-view .uni-icon {
+		line-height: 30px !important;
+}
+.searchType .input-view .input {
+		height: 30px;
+		line-height: 30px;
+		width: 94%;
+		padding: 0 3%;
+}
+.van-cell__title {
+		-webkit-box-flex: 6!important;
+		-webkit-flex: 6!important;
+		        flex: 6!important;
+}
+.searchclass {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		        align-items: center;
+		-webkit-box-pack: center;
+		-webkit-justify-content: center;
+		        justify-content: center;
+}
+.active {
+	    color: #F76260;
+}
+.typeItem {
+	    width: 33%;
+	    display: inline-block;
+	    text-align: center;
+}
+.iconClass {
+	    display: -webkit-box;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-orient: horizontal;
+	    -webkit-box-direction: normal;
+	    -webkit-flex-direction: row;
+	            flex-direction: row;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	            align-items: center;
+	    -webkit-box-pack: center;
+	    -webkit-justify-content: center;
+	            justify-content: center;
+}
+	
+

unpackage/dist/dev/mp-weixin/pages/index/searchresult.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 */ 222));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+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 */ 228));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -173,44 +173,52 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     uniIcon: uniIcon },
 
   onLoad: function onLoad() {
-    this.gethotelist();
+    //this.gethotelist();
   },
   data: function data() {
     return {
-      searchvalue: '' };
+      pictureUrl: this.pictureUrl,
+      hotelist: [],
+      searchvalue: '',
+      page: 1 };
 
   },
   methods: {
+    search: function search() {
+      this.gethotelist();
+    },
     confirm: function confirm(e) {
       this.searchvalue = e.detail.value;
+      this.gethotelist();
     },
     // 获取酒店列表
-    gethotelist: function gethotelist() {var _this2 = this;
+    gethotelist: function gethotelist() {var _this = this;
+      if (this.searchvalue == '') {
+        this.$msg("关键字不能为空");
+        return;
+      }
       this.request({
         url: "/v2/entry/storeList",
         method: 'get',
         data: {
           page: this.page,
           page_size: 10,
-          keyword: this.keyword },
+          keyword: this.searchvalue },
 
         success: function success(res) {var _res$data =
           res.data,data = _res$data.data,code = _res$data.code;
           if (code == 1000) {
             if (data.store_list.length < 10) {
-              _this2.ispull = false;
+              _this.ispull = false;
             }
-            if (_this2.hotelist.length == 0) {
-              _this2.hotelist = data.store_list;
+            if (_this.hotelist.length == 0) {
+              _this.hotelist = data.store_list;
             } else {
-              _this2.hotelist = _this2.hotelist.concat(data.store_list);
+              _this.hotelist = _this.hotelist.concat(data.store_list);
             }
-            _this2.hotelist.forEach(function (item) {
-              item.tages = item.store_summary.split('  ');
-            });
 
           } else {
-            console.log(_this.hotelist).$msg("网络错误稍后再试");
+            _this.$msg("网络错误稍后再试");
           }
         } });
 

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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "搜索",
+  "navigationBarTitleText": "酒店搜索",
   "usingComponents": {
     "van-search": "/wxcomponents/dist/search/index",
     "uni-icon": "/component/uni-icon/uni-icon"

unpackage/dist/dev/mp-weixin/pages/index/searchresult.wxml

@@ -1 +1 @@
-<view class="searchType" style="background:#fff;height:100vh;"><van-cell vue-id="92afc16a-1" value-class="searchclass" data-com-type="wx" bind:__l="__l" vue-slots="{{['default','title']}}"><view slot="title"><view class="input-view"><uni-icon vue-id="{{('92afc16a-2')+','+('92afc16a-1')}}" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="输入搜索关键词" data-event-opts="{{[['input',[['confirm',['$event']]]]]}}" bindinput="__e"/></view></view><view>搜索</view></van-cell><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src></image></view><view class="hotelright"><view style="font-size:36rpx;color:#303133;">华南城市酒店</view><view style="display:flex;flex-direction:row;justify-content:space-between;align-items:center;"><view style="font-size:40rpx;color:#303133;">0.0</view><view>月访客990</view><view>8km</view></view><view class="undertip"><view class="tipsTop">有停车为</view><view class="tipsTop">内置酒店</view></view></view></view></view>
+<view class="searchType" style="background:#fff;height:100vh;"><van-cell vue-id="92afc16a-1" value-class="searchclass" data-com-type="wx" bind:__l="__l" vue-slots="{{['default','title']}}"><view slot="title"><view class="input-view"><uni-icon vue-id="{{('92afc16a-2')+','+('92afc16a-1')}}" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="输入搜索关键词" data-event-opts="{{[['input',[['confirm',['$event']]]]]}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['search',['$event']]]]]}}" bindtap="__e">搜索</view></van-cell><block wx:for="{{hotelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src="{{pictureUrl+'/uploads/home/adv/'+item.store_logo}}"></image></view><view class="hotelright"><view style="font-size:32rpx;color:#303133;font-weight:550;">{{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:32rpx;color:#303133;font-weight:550;">{{item.store_servicecredit}}</view><view style="color:#606266;font-size:24rpx;">{{"月访客"+item.store_visitor}}</view><view style="color:#606266;font-size:24rpx;">{{item.distance}}</view></view><block wx:if="{{item.tages.length!=1}}"><view class="undertip"><block wx:for="{{item.tages}}" wx:for-item="items" wx:for-index="index" wx:key="index"><view class="tipsTop">{{items}}</view></block></view></block></view></view></block></view>

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 */ 281));}).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 */ 287));}).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 */ 281));}).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 */ 287));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 {
   components: {
     uploadImage: uploadImage },
@@ -229,7 +229,6 @@ var _new_file = _interopRequireDefault(__webpack_require__(/*! @/common/new_file
           licence_image: licence_image },
 
         success: function success(res) {
-
           if (res.data.code == 1000) {
             _this.$msg("申请成功");
             setTimeout(function () {

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/business"],{
 
-/***/ 185:
+/***/ 191:
 /*!*************************************************************************!*\
   !*** D:/uinapp/myuinapp/main.js?{"page":"pages%2FmyCenter%2Fbusiness"} ***!
   \*************************************************************************/
@@ -11,13 +11,13 @@
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _business = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/business.vue */ 186));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _business = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/business.vue */ 192));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 createPage(_business.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 186:
+/***/ 192:
 /*!******************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/business.vue ***!
   \******************************************************/
@@ -26,8 +26,8 @@ createPage(_business.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./business.vue?vue&type=template&id=626f98f8& */ 187);
-/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 189);
+/* harmony import */ var _business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./business.vue?vue&type=template&id=626f98f8& */ 193);
+/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 195);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _business_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 _business_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);
 
@@ -56,7 +56,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/business.vue"
 
 /***/ }),
 
-/***/ 187:
+/***/ 193:
 /*!*************************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=template&id=626f98f8& ***!
   \*************************************************************************************/
@@ -65,7 +65,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/business.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_business_vue_vue_type_template_id_626f98f8___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!./business.vue?vue&type=template&id=626f98f8& */ 188);
+/* 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_business_vue_vue_type_template_id_626f98f8___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!./business.vue?vue&type=template&id=626f98f8& */ 194);
 /* 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_business_vue_vue_type_template_id_626f98f8___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_business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -78,7 +78,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 188:
+/***/ 194:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/pages/myCenter/business.vue?vue&type=template&id=626f98f8& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -105,7 +105,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 189:
+/***/ 195:
 /*!*******************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/business.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************/
@@ -114,14 +114,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_business_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!./business.vue?vue&type=script&lang=js& */ 190);
+/* 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_business_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!./business.vue?vue&type=script&lang=js& */ 196);
 /* 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_business_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_business_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_business_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_business_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_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 190:
+/***/ 196:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/pages/myCenter/business.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -162,5 +162,5 @@ var _default =
 
 /***/ })
 
-},[[185,"common/runtime","common/vendor"]]]);
+},[[191,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/business.js.map

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

@@ -259,7 +259,7 @@ __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 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 */ 222));}).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 */ 229));}).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 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 */ 228));}).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 */ 235));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 {
@@ -306,14 +306,48 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
 
   methods: {
+    // 跳转到我的订单
+    gomyorder: function gomyorder(e) {
+      if (this.hasLogin) {
+        if (e == 0) {
+          uni.navigateTo({
+            url: '/pages/myOrder/index' });
+
+        } else if (e == 1) {
+          var state = 'waiting';
+          uni.navigateTo({
+            url: "/pages/myOrder/index?state=".concat(state) });
+
+
+        } else if (e == 2) {
+          var _state = 'payed';
+          uni.navigateTo({
+            url: "/pages/myOrder/index?state=".concat(_state) });
+
+        } else if (e == 3) {
+          var _state2 = 'complete-';
+
+        } else if (e == 4) {
+          var _state3 = 'cancel';
+          uni.navigateTo({
+            url: "/pages/myOrder/index?state=".concat(_state3) });
+
+        } else if (e == 5) {
+          var _state4 = 'refund';
+          uni.navigateTo({
+            url: "/pages/myOrder/index?state=".concat(_state4) });
+
+        }
+
+      }
+
+    },
     getuserinfo: function getuserinfo() {var _this = this;
       this.request({
         url: '/v2/member/info',
         method: 'GET',
         success: function success(res) {var
           data = res.data.data;
-          console.log(data);
-
           _this.userinfo = data;
         } });
 
@@ -332,9 +366,20 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     // keepdialog() {
     // 	this.showdialog = true;
     // },
+    // 签到
+    writeday: function writeday() {var _this2 = this;
+      this.request({
+        url: '/v1/member/point',
+        method: 'POST',
+        data: {
+          stage: 'sign' },
+
+        success: function success(res) {
+          _this2.getuserinfo();
+        } });
+
+    },
     goAdress: function goAdress(e) {
-      console.log(this.hasLogin);
-      console.log(e);
       if (this.hasLogin) {
         if (e == 1) {
           uni.navigateTo({

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/logion"],{
 
-/***/ 338:
+/***/ 185:
 /*!***********************************************************************!*\
   !*** D:/uinapp/myuinapp/main.js?{"page":"pages%2FmyCenter%2Flogion"} ***!
   \***********************************************************************/
@@ -11,13 +11,13 @@
 /* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);
 
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _logion = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/logion.vue */ 339));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _logion = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/logion.vue */ 186));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 createPage(_logion.default);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
 
 /***/ }),
 
-/***/ 339:
+/***/ 186:
 /*!****************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/logion.vue ***!
   \****************************************************/
@@ -26,8 +26,8 @@ createPage(_logion.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _logion_vue_vue_type_template_id_5d7eeb08___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./logion.vue?vue&type=template&id=5d7eeb08& */ 340);
-/* harmony import */ var _logion_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./logion.vue?vue&type=script&lang=js& */ 342);
+/* harmony import */ var _logion_vue_vue_type_template_id_5d7eeb08___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./logion.vue?vue&type=template&id=5d7eeb08& */ 187);
+/* harmony import */ var _logion_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./logion.vue?vue&type=script&lang=js& */ 189);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _logion_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 _logion_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);
 
@@ -56,7 +56,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/logion.vue"
 
 /***/ }),
 
-/***/ 340:
+/***/ 187:
 /*!***********************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/logion.vue?vue&type=template&id=5d7eeb08& ***!
   \***********************************************************************************/
@@ -65,7 +65,7 @@ component.options.__file = "D:/uinapp/myuinapp/pages/myCenter/logion.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_logion_vue_vue_type_template_id_5d7eeb08___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!./logion.vue?vue&type=template&id=5d7eeb08& */ 341);
+/* 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_logion_vue_vue_type_template_id_5d7eeb08___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!./logion.vue?vue&type=template&id=5d7eeb08& */ 188);
 /* 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_logion_vue_vue_type_template_id_5d7eeb08___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_logion_vue_vue_type_template_id_5d7eeb08___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -78,7 +78,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 341:
+/***/ 188:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/pages/myCenter/logion.vue?vue&type=template&id=5d7eeb08& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -105,7 +105,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 342:
+/***/ 189:
 /*!*****************************************************************************!*\
   !*** D:/uinapp/myuinapp/pages/myCenter/logion.vue?vue&type=script&lang=js& ***!
   \*****************************************************************************/
@@ -114,14 +114,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_logion_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!./logion.vue?vue&type=script&lang=js& */ 343);
+/* 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_logion_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!./logion.vue?vue&type=script&lang=js& */ 190);
 /* 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_logion_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_logion_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_logion_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_logion_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_logion_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 343:
+/***/ 190:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/pages/myCenter/logion.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -195,5 +195,5 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
 /***/ })
 
-},[[338,"common/runtime","common/vendor"]]]);
+},[[185,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/logion.js.map

unpackage/dist/dev/mp-weixin/pages/myCenter/logion.wxss

@@ -1 +0,0 @@
-/* pages/myCenter/logion.wxss */

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 */ 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 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 */ 294));}).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";
-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 */ 274));}).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 */ 281));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+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 */ 280));}).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 */ 287));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

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

@@ -227,7 +227,7 @@ __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 */ 267));}).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 */ 229));}).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 */ 273));}).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 */ 235));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -239,6 +239,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
 
   data: function data() {
     return {
+      ispull: true,
       showdialog: false,
       orderCancel: false,
       titles: '',
@@ -270,11 +271,12 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
   'userInfo'])),
 
 
-  onLoad: function onLoad() {var _this = this;
+  onLoad: function onLoad(a) {var _this = this;
     uni.$emit("refehlist", function () {
       _this.getlist();
     });
     if (this.hasLogin) {
+      console.log(a);
       this.getlist(); // 获取订单
 
     } else {
@@ -285,6 +287,19 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     }
 
   },
+  watch: {
+    'hasLogin': function hasLogin(val) {
+      if (val) {
+        this.active = 0;
+        this.getlist();
+      } else {
+        uni.navigateTo({
+          url: '/pages/myCenter/logion' });
+
+      }
+    } },
+
+
   methods: {
     gotologion: function gotologion() {
       uni.navigateTo({
@@ -304,6 +319,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
       if (this.hasLogin) {
         console.log(e);
         this.active = e.target.name;
+        this.page = 1;
         if (e.target.name == 0) {
           this.state = 'all';
         } else if (e.target.name == 1) {
@@ -335,7 +351,10 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           page_size: 10 },
 
         success: function success(res) {
-          _this2.order_list = res.data.data.order_list;
+          if (res.data.data.order_list.length < 10) {
+            _this2.ispull = false;
+          }
+          _this2.order_list = _this2.order_list.concat(res.data.data.order_list);
         } });
 
     },
@@ -383,6 +402,11 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     // 滚到底部
     lower: function lower(e) {
       console.log("底部");
+      if (this.ispull) {
+        this.page += 1;
+        this.getlist();
+      }
+
     },
 
     // 滚动时触发