登录注册

App.vue

@@ -1,47 +1,69 @@
 <script>
 
 	import {
-		mapMutations,
+		mapMutations,mapState
 	} from 'vuex';
 	export default {
 		methods: {
-			...mapMutations(['setOpenid','login','showDialog'])
+			...mapMutations(['setOpenid','login','showDialog','setcode','islogionsuccess'])
+		},
+		computed:{
+			...mapState([
+			  'hasLogin',  // 用户是否同意授权
+			  'userInfo',   // 同意授权用户头像
+			  'successlogion', // 同意手机号授权 登录成功
+			  'sessionId',   // 登录成功的token
+			  'getcode',  // logion时候获取的code session_key oppen_id
+			]),
 		},
-		
 		onLaunch: function() {
 			// 用户登录
-			console.log(this.$store)
 			let that = this;
-			let sessionId =  uni.getStorageSync('sessionId');// 用户sessinid
-			console.log(sessionId)
+			let sessionId =  uni.getStorageSync('sessionId');// 用户token
+			let userInfo = uni.getStorageSync('userInfo');// 用户头像信息
+			let getcode= uni.getStorageSync('getcode');// 用户code oppenid
+			console.log(userInfo)
+			console.log(getcode)
 			if(sessionId != '') {
 				uni.checkSession({
 					   success(){  
 					     console.log("登录未过期")  
 						 that.setOpenid(sessionId);
+						 that.login(userInfo);
+						 that.setcode(getcode);
+						 that.showDialog(true);
+						 that.islogionsuccess(true);
 					    },  
-					
 						fail(){  
-						 console.log("jjjj")
+						 console.log("登录过期")
 			             // 登录过期 重新登录
 					     uni.login({
 					     		provider: 'weixin',
-					     		success: function(res) {
-								   console.log(res);
-								   console.log(sessionId)
-					     		  // 获取code  
-					     			 that.setOpenid("22222");
-					     			// that.login();
-									// that.showDialog(false);
-					     			 // 获取sessionId
+					     		success: (res) => {
+									let code = res.code;
 					     			 uni.request({
-					     				  url: '',
+					     				  url: 'https://www.qzaiwang.com' +'/v1/entry/mp_openid',
+					     				  method:'post',
 					     				  data: {
-					     				  
+					     					code:　code
 					     				  },
 					     				  success: (res) => {
+											  let { data } = res.data;
+											  console.log(data);
+											  data.code = code;
+											  that.setcode(data);
+											  let token = data.token;
+											  if(token == '') {
+												   that.setOpenid(token); // 保存用户token
+												   that.islogionsuccess(false);
+											  }else {
+												  console.log("进来了")
+												  that.setOpenid(token); // 保存用户token
+												  that.islogionsuccess(true);
+											  }
+											  that.showDialog(false); // 没有同意授权头像等;
+											  that.login(); // 清空用户头像信息
 					     					  //this.setOpenid("dddd")
-					     					  
 					     				  }
 					     			  })
 					     		},
@@ -52,28 +74,41 @@
 						}  
 				})
 			}else {
+			  console.log("登录")
 			  uni.login({
 			  		provider: 'weixin',
-			  		success: function(res) {
-						console.log(res);
-			  		  // 获取code  
-			  			 that.setOpenid("22222");
-			  			// that.login();
-						// that.showDialog(false);
-			  			 // 获取sessionId
+			  		success: (res) => {
+						let code = res.code;
+						console.log("oooo")
+						console.log(code);
 			  			 uni.request({
-			  				  url: '',
+			  				  url: 'https://www.qzaiwang.com' +'/v1/entry/mp_openid',
+							  method:'post',
 			  				  data: {
-			  				  
+								code:　code
 			  				  },
 			  				  success: (res) => {
-			  					  //this.setOpenid("dddd")
-			  					  
+								  console.log("ddddd")
+								  let { data } = res.data;
+								  data.code = code;
+								  this.setcode(data); // 保存用户登录code session
+								  let token = data.token;
+								  if(token == '') {
+									   this.setOpenid(token); // 保存用户token
+									   this.islogionsuccess(false);
+								  }else {
+									  console.log("进来了")
+									  this.setOpenid(token); // 保存用户token
+									  this.islogionsuccess(true);
+								  }
+								  this.showDialog(false); // 没有同意授权头像等;
+								  this.login(); // 清空用户头像信息
+								
 			  				  }
 			  			  })
 			  		},
 			  		fail: function(res) {
-			  			
+			  			consoel.log(res);
 			  		}
 			  })
 			};

common/request.js

@@ -19,7 +19,6 @@ const request = function(options) {
     // 这里对response进行处理，
     // 401表示登录状态过期，需重新登录
 	options.complete = (response) => {
-		console.log(response)
 		if(response.data.code != 1000) {
 			uni.showToast({
 				title: response.data.msg,

component/shopList.vue

@@ -2,8 +2,8 @@
 	<view class="page">
 		<view class="uni-product-list">
 			<view class="uni-product" v-for="(product,index) in productList" :key="index" @click="goshop(product)">
-				<view class="image-view">
-					<image style="background-color: #007AFF;" class="uni-product-image" :src="pictureUrl+'/uploads/home/store/' + product.goods_image"></image>
+				<view class="image-view">												
+					<image  class="uni-product-image" :src="pictureUrl+'/uploads/home/store/goods/' + product.goods_image.substr(0, product.goods_image.indexOf('\_')) + '/' + product.goods_image "></image>
 				</view>
 				<view class="uni-product-title textover">{{product.goods_name}}</view>
 				<view class="uni-product-price">

pages/index/hotel.vue

@@ -1,6 +1,6 @@
 <template>
     <view>
-         <view style="height: 50upx;"></view>
+       <view style="height: 65upx;"></view>
         <scroll-view  style="height: 95vh;" class="floor-list"
          :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
          refresher-enabled="true">
@@ -215,7 +215,8 @@
 		computed:{
 			...mapState([
 			  'hasLogin',
-			  'userInfo'
+			  'userInfo',
+			  'successlogion'
 			]),
 		},
         methods: {
@@ -239,7 +240,7 @@
 			},
 			// 收藏
 			gocollect() {
-				if(this.hasLogin) {
+				if(this.hasLogin && this.successlogion) {
 				 this.request({
 				 	url: '/v1/favorites/collect',
 				 	method: 'post',
@@ -252,7 +253,10 @@
 				 	}
 				 })
 				}else {
-					this.showdialog = true;
+					// this.showdialog = true;
+					uni.navigateTo({
+						url:'/pages/myCenter/logion'
+					})
 				}
 			},
 			// 关闭弹窗
@@ -563,9 +567,10 @@
     }
     .activeColor {
         background: #fff!important;
-        position: sticky;
+        position: fixed;
         background-color: #fff;
-        top: 50upx;
+        top: 65upx;
+		left: 0;
         z-index: 99;
     }
     .listType {

pages/index/index.vue

@@ -4,7 +4,7 @@
 		<view>点击授权{{hasLogin}}</view>
 		<button @click="wxlogion"   open-type="getUserInfo">请点击授权</button>
 	 </view> -->
-	 <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/>
+	<!-- <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
 	 <scroll-view  style="height: 100vh;" class="floor-list"
 	  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 	  refresher-enabled="true">
@@ -17,9 +17,9 @@
 			  v-if="allow" @opensetting='handler'
 			  open-type="openSetting" >定位失败，点击重新获取</button>
 	 	</block>
-			<!-- <view class="input-view" style="float: right;display: none;">
+			<view class="input-view" style="float: right;visibility: hidden;">
 			  <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>
@@ -47,7 +47,7 @@
 			
 		 </swiper>
 	 </view>
-	 <button type="primary" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">微信登录</button>
+	
 	 <view class="tips">
 		 在附近酒店找到您入住的酒店
 	 </view>
@@ -55,8 +55,8 @@
 	
 	<view v-if="!allow">
      <view class="hotelList" v-for='(item,index) in hotelist' :key="index" @click="openinfo(item)">
-		 <view class="hotleLeft">
-			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/adv/'+item.store_logo"/>
+		 <view class="hotleLeft">					
+			 <image  style="width: 214upx;height: 152upx;" :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_banner" />
 		 </view>
 		 <view class="hotelright">
 		 	<view style="font-size: 32upx;color: #303133;font-weight: 550;">{{item.store_name}}
@@ -122,7 +122,8 @@
 		computed:{
 			...mapState([
 			  'hasLogin',
-			  'userInfo'
+			  'userInfo',
+			  'successlogion'
 			]),
 		},
 		onLoad() {
@@ -142,44 +143,32 @@
 	    },
 		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();
 			},
 			goinfor() {
-				if(this.hasLogin) {
+				if(this.successlogion && this.hasLogin) {
 					uni.navigateTo({
-						url: '/pages/myOrder/finsh'
-					   //url: '../myCenter/information'  // 我的收藏
+					   url: '../myCenter/information'  // 我的消息通知
 					})
 				}else {
-					this.showdialog = true;
+					uni.navigateTo({
+						url:'/pages/myCenter/logion'
+					})
+					// this.showdialog = true;
 				}
				
			},
-			// 关闭弹窗
-			cancelDiaolog() {
-				this.showdialog = false;
-			},
-			// 确定
-			confirmDiaolog() {
-				this.showdialog = false;
-				uni.navigateTo({
-				   url: '../myCenter/information'  // 我的收藏
-				})
-			},
+			// // 关闭弹窗
+			// cancelDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// // 确定
+			// confirmDiaolog() {
+			// 	this.showdialog = false;
+			// 	uni.navigateTo({
+			// 	   url: '../myCenter/information'  // 我的收藏
+			// 	})
+			// },
 			goSearch() {
 				uni.navigateTo({
 					url: './searchresult'  // 我的搜索
@@ -187,7 +176,6 @@
 			},
 			// 滚动到顶部
 			upper(e) {
-				
 				console.log("顶部")
 			},
 			
@@ -223,13 +211,10 @@
 				uni.getSetting({
 					success(res) {
 						if(!res.authSetting[b]) {
-							console.log("没有授权")
 							_this.showDialog(false);
 						}else {
-							console.log("yijing授权")
 							_this.showDialog(true);
 							let userInfo = uni.getStorageSync('userInfo');
-							 console.log(userInfo);
 							 _this.login(userInfo);
 						}
 					}
@@ -271,7 +256,6 @@
 			
 			// 获取首页轮播
 			 getswiper() {
-			  
 				this.request({
 	                url:"/v1/entry/adv",
 	                method:'get',
@@ -279,7 +263,6 @@
 						 this.backgroundlist = res.data.data;
 					}
 			   })
-			 
 			 },
 		 // 获取酒店列表
 		 gethotelist() {
@@ -293,7 +276,6 @@
 				success: (res) => {
 					 let { data,code } = res.data;
 					 if(code == 1000) {
-							 
 						 if(data.store_list.length<10) {
 							 this.ispull = false;
 						 }
@@ -325,8 +307,8 @@
 		 openinfo(item) {
 			 let id = item.store_id;
 			  uni.navigateTo({
-			                    url: `/pages/index/hotel?id=${id}`
-			                 });
+			        url: `/pages/index/hotel?id=${id}`
+			  });
 		 },
 		 
 		 // 跳转到商品详情
@@ -335,14 +317,14 @@
 			 let store_id = item.adv_target.store_id;
 			 if(item.adv_target.type == 'goods') {
 				 uni.navigateTo({
-									 url: `/pages/index/shop?id=${id}&store_id=${store_id}`
-				                }); 
+					url: `/pages/index/shop?id=${id}&store_id=${store_id}`
+				}); 
 			 }else if(item.adv_target.type == 'store') {
 				 let id = item.adv_target.store_id;
 				 let title = item.adv_target.store_name;
 				 uni.navigateTo({
-				                    url: `/pages/index/hotel?id=${id}`
-				                });
+				   url: `/pages/index/hotel?id=${id}`
+				 });
 			 }
 			
 		 }

pages/index/shop.vue

@@ -8,7 +8,7 @@
  				<swiper-item class="swiper-item" v-for="(item,index) in datalist.images" :key="index">
  					<view class="image-wrapper">
  						<image
-						    :src="pictureUrl+'/uploads/home/adv/'+item.goodsimage_url"
+						    :src="pictureUrl+'/uploads/home/store/goods/'+item.goodsimage_url.substr(0, item.goodsimage_url.indexOf('\_')) + '/' + item.goodsimage_url"
  							class="loaded" 
  							mode="aspectFill"
  						></image>
@@ -80,6 +80,7 @@
 			  </van-tab>
 			</van-tabs>
  		</view>
+		</scroll-view>
  		<!-- 底部操作菜单 -->
  	<!-- 	<view class="page-bottom">
  			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
@@ -100,16 +101,7 @@
  			</view>
  		</view> -->
 		
-		<View class="page-bottom">
-			<van-goods-action>
-			  <van-goods-action-icon @click="goIndex" icon="bag-o" />
-			  <van-goods-action-icon icon="cart-o" @click="openCar" :info="cartnumber" />
-			  <van-goods-action-icon icon="star-o" v-if="has_collected == 0"  @click="toFavorite"/>
-			   <van-goods-action-icon icon="star" v-if="has_collected == 1"   icon-class="colored"   @click="toFavorite"/>
-			  <van-goods-action-button  @click="addCar"   text="加入购物车" type="warning" />
-			  <van-goods-action-button text="立即购买"  @click="buynow"   />
-			</van-goods-action>
-		</View>
+		
  		<!-- 规格-模态层弹窗 -->
  		<view 
  			class="popup spec" 
@@ -121,7 +113,7 @@
  			<view class="mask"></view>
  			<view class="layer attr-content" @click.stop="stopPrevent">
  				<view class="a-t">
- 					<image :src="nuberImg"></image>
+ 					<image :src="nuberImg==''?firstImg:nuberImg"></image>
  					<view class="right">
  						<text class="price" style="font-size: 36upx;color: #303133">{{datalist.goods_price}}</text>
 						<view v-if="datalist.spec_list.length > 0 ">
@@ -171,7 +163,17 @@
  			:contentHeight="580"
  			:shareList="shareList"
  		></share> -->
-		</scroll-view>
+		
+		<View class="page-bottom">
+			<van-goods-action>
+			  <van-goods-action-icon @click="goIndex" icon="bag-o" />
+			  <van-goods-action-icon icon="cart-o" @click="openCar" :info="cartnumber" />
+			  <van-goods-action-icon icon="star-o" v-if="has_collected == 0"  @click="toFavorite"/>
+			   <van-goods-action-icon icon="star" v-if="has_collected == 1"   icon-class="colored"   @click="toFavorite"/>
+			  <van-goods-action-button  @click="addCar"   text="加入购物车" type="warning" />
+			  <van-goods-action-button text="立即购买"  @click="buynow"   />
+			</van-goods-action>
+		</View>
 		 <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/>
  	</view>
  </template>
@@ -202,6 +204,7 @@
 				ismax: false, // 输入狂禁止数量
 				goods_storage: '', // 规格商品参数
 				nuberImg:'',
+				firstImg:'',
 				shopnumber: 1,
 				pictureUrl: this.pictureUrl,
 				datalist: {},
@@ -235,7 +238,8 @@
 		computed:{
 			...mapState([
 			  'hasLogin',
-			  'userInfo'
+			  'userInfo',
+			  'successlogion'
 			]),
 		},
 		onShow: function() {
@@ -292,6 +296,10 @@
 						this.cartnumber = data.cart;
 						this.has_collected = data.has_collected;
 						let array = data;
+						array.images.forEach(item => {
+							this.firstImg = this.pictureUrl+'/uploads/home/store/goods/'+item.goodsimage_url.substr(0, item.goodsimage_url.indexOf('\_')) + '/' + item.goodsimage_url
+						})
+						
 						if(array.spec_list.length == 0) {
 							this.datalist = data;
 							this.goods_id = data.goods_list[0].goods_id;
@@ -346,18 +354,21 @@
 			 },
 			
 			openCar() {
-				if(this.hasLogin) { 
+				if(this.hasLogin && this.successlogion) { 
 					let store_id = this.store_id;
 					uni.navigateTo({
 						url:`/pages/index/cart?store_id=${store_id}`
 					})
 				}else {
-					this.showdialog = true;
+					//this.showdialog = true;
+					uni.navigateTo({
+						url:'/pages/myCenter/logion'
+					})
 				}
 			},
 			// 立即购买
 			buynow() {
-				if(this.hasLogin) {
+				if(this.hasLogin  && this.successlogion) {
 					if(this.datalist.store_id == 1 || this.datalist.goods_state != 1 ||　this.datalist.goods_storage < 1) {
 						this.$msg("商品已下架");
 						return;
@@ -396,12 +407,14 @@
 						 }
 					 })
 				}else {
-					this.showdialog = true;
+					uni.navigateTo({
+						url:'/pages/myCenter/logion'
+					})
 				}
 			},
 			// 加入购物车
 			addCar() {
-				if(this.hasLogin) {
+				if(this.hasLogin && this.successlogion) {
 					if(this.datalist.store_id == 1 || this.datalist.goods_state != 1 ||　this.datalist.goods_storage < 1) {
 						this.$msg("商品已下架");
 						return;
@@ -431,7 +444,9 @@
 							})
 						}
 				}else {
-					this.showdialog = true;
+					uni.navigateTo({
+						url:'/pages/myCenter/logion'
+					})
 				}
 			},
 			
@@ -528,7 +543,7 @@
  			
  			//收藏
  			toFavorite(){
-				if(this.hasLogin) {
+				if(this.hasLogin && this.successlogion) {
 					this.request({
 						url: '/v1/favorites/collect',
 						method: 'post',
@@ -541,7 +556,9 @@
 						}
 					})
 				}else {
-					this.showdialog = true;
+					uni.navigateTo({
+						url:'/pages/myCenter/logion'
+					})
 				}
  				//this.favorite = !this.favorite;
  			},
@@ -818,7 +835,7 @@
  	.detail-desc{
  		background: #fff;
  		margin-top: 16upx;
-		margin-bottom: 150rpx;
+		margin-bottom: 20rpx;
 		width: 100%;
  		.d-header{
  			display: flex;

pages/myCenter/definite.vue

@@ -77,6 +77,7 @@
 		text-align: center;
 		background-color: #D9332E;
 		font-size: 28upx;
+		padding: 20upx 0 40upx 0;
 		.moneysize {
 			font-size: 42upx;
 			padding-top: 25upx;

pages/myCenter/index.vue

@@ -9,19 +9,23 @@
 					<view class="myNmaeImg">
 						<image :src="userInfo.avatarUrl"></image>
 					</view>
-                    <view v-if="hasLogin">
-						
+                    <view v-if="successlogion">
 						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
-						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{userinfo.member_points}}></view>
+						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{menberinfo.member_points}}></view>
 					</view>
-					<view v-else>
+					<view v-if="!successlogion && hasLogin">
 						
-						<view  style="font-size: 34upx;margin-bottom: 32upx;">请登录</view>
+						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
+						<view style="font-size: 24upx"  @click="goAdress(3)" >请绑定手机号></view>
+					</view>
+					
+					<view v-if="!successlogion && !hasLogin">
+						<view  style="font-size: 34upx;margin-bottom: 32upx;"  @click="goAdress(3)">请登录</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币***></view>
 					</view>
 				</view>
-					<view class="myNmaeRight" @click="writeday" v-if="userinfo.has_sign == 0">每日签到></view>
-					<view class="myNmaeRight" v-if="userinfo.has_sign == 1">已签到></view>
+					<view class="myNmaeRight" @click="writeday" v-if="menberinfo.has_sign == 0">每日签到></view>
+					<view class="myNmaeRight" v-if="menberinfo.has_sign == 1">已签到></view>
 			</view>
 		</view>
 		<van-cell @click="gomyorder(0)"  title="我的订单" is-link />
@@ -82,7 +86,6 @@
 		<van-cell  @click="goAdress(1)" title="我的地址" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-			
 				margin-right: 8upx;
 				vertical-align:middle"
 				src="../../static/local.png" />
@@ -112,7 +115,6 @@
 		<van-cell  @click="goAdress(7)"  title="商务合作" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				
 				margin-right: 8upx;
 				vertical-align:middle"
 				src="../../static/setting.png" />
@@ -142,19 +144,20 @@
 			return {
 				showdialog: false,
 				ishow: false,
-				userinfo: {}
+				menberinfo: {}
 			}
 		},
 		computed:{
 			...mapState([
 			  'hasLogin',
-			  'userInfo'
+			  'userInfo',
+			  'successlogion'
 			]),
 		},
 		onLoad() {
 			console.log(this.userInfo);
 			console.log(this.hasLogin);
-			if(this.hasLogin) {
+			if(this.successlogion && this.hasLogin) {
 				this.getuserinfo();
 		  	}else {
 				uni.navigateTo({
@@ -169,7 +172,16 @@
 				console.log("监听")
 			   if(val) {
 				  this.getuserinfo(); 
-				   
+			   }else {
+				  uni.navigateTo({
+				  	url: './logion'
+				  })
+			   }
+			},
+			'successlogion':function(val) {
+				console.log("监听")
+			   if(val) {
+				  this.getuserinfo(); 
 			   }else {
 				  uni.navigateTo({
 				  	url: './logion'
@@ -181,7 +193,7 @@
 		methods: {
 			// 跳转到我的订单
 			gomyorder(e) {
-				if(this.hasLogin) {
+				if(this.successlogion && this.hasLogin) {
 					if(e == 0) {
 						 ({
 							url: '/pages/myOrder/index'
@@ -221,7 +233,8 @@
 					method:'GET',
 					success: (res)=>{
 						let { data } = res.data;
-						this.userinfo = data;
+						// userinfo
+						this.menberinfo = data;
 					}
 				})
 			},
@@ -253,7 +266,7 @@
 				})
 			},
 			goAdress(e) {
-				if(this.hasLogin) {
+				if(this.successlogion && this.hasLogin) {
 					if(e == 1) {
 							uni.navigateTo({
 								url: '../myOrder/adress'  // 我的地址
@@ -301,7 +314,7 @@
 			},
 				
 			goinfor() {
-				if(this.hasLogin) {
+				if(this.successlogion && this.hasLogin) {
 					uni.navigateTo({
 						url: './information'  // 我的xiaoxi
 					})

pages/myCenter/logion.vue

@@ -1,12 +1,19 @@
 <template>
 	<view>
-		<view style="text-align: center;margin: 100upx;font-size: 36upx;">欢迎回来</view>
-		<view style="width: 50%;margin: 0 auto;">
-			<button @click="wxlogion" open-type='getUserInfo'>
-				授权登录
-			</button>
+		<view v-if='!hasLogin'>
+			<view style="text-align: center;margin: 100upx;font-size: 36upx;">欢迎回来</view>
+			<view style="width: 50%;margin: 0 auto;">
+				<button @click="wxlogion"  type="primary" open-type='getUserInfo'>
+					授权登录
+				</button>
+			</view>
+		</view>
+		<view  v-if='hasLogin&& !successlogion'>
+			<view style="text-align: center;margin: 100upx;font-size: 36upx;">获取您手机号码权限</view>
+			<view style="width: 50%;margin: 0 auto;">
+				 <button type="primary" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">手机号登录</button>
+			</view>
 		</view>
-		
 	<!-- 	<van-dialog  title="请登录"
 		:show-cancel-button="ishow"
 		:show="show"
@@ -40,27 +47,69 @@
 				show: false
 			}
 		},
-		
+		computed:{
+			...mapState([
+			  'hasLogin',  // 用户是否同意授权
+			  'userInfo',   // 同意授权用户头像
+			  'successlogion', // 同意手机号授权 登录成功
+			  'sessionId',   // 登录成功的token
+			  'getcode',  // logion时候获取的code session_key oppen_id
+			]),
+		},
+		onLoad(){
+			console.log(this.successlogion);
+		},
 		methods:{
-			...mapMutations(['login','showDialog']),
+			...mapMutations(['login','showDialog', 'setOpenid', 'setcode','islogionsuccess']),
+			// 授权用户信息头像
 			wxlogion() {
 				let  that = this;
 				    uni.getUserInfo({
-					     success(res) {
+					     success: (res) => {
 							 console.log(res.userInfo);
 							 that.login(res.userInfo);
 							 that.showDialog(true); // 改变haslogion的值
-						//	 that.$emit('confirmDiaolog');
-							 that.$msg("登录成功")
-							 uni.navigateBack()
+							 that.$msg("授权成功");
+							 console.log(this.successlogion)
+							 if(this.successlogion) {
+								uni.navigateBack();
+							 }
 					     },
 					     fail(res) {
-						     //that.$emit('keepdialog');  // 订单我的保持登录
 							 that.showDialog(false);
-							 that.$msg("登录失败")
+							 that.$msg("授权失败")
 					     }
 				    })
-			}
+			},
+			// 获取手机号码
+			decryptPhoneNumber(e) {
+			              console.log(e);    
+			              if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {    
+			                  console.log(e);
+			              } else {    
+			                  console.log('用户同意提供手机号');
+							  console.log(this.getcode);
+											let encryptedData = e.detail.encryptedData;
+											let iv = e.detail.iv;
+											// 调取注册账号
+											this.request({
+												url: '/v1/entry/mp_account',
+												method:'POST',
+												data: {
+													code: this.getcode.code,
+													encryptedData:　encryptedData,
+													iv:　iv
+												},
+												success: (res) => {
+													let token = res.data.data.token;
+													this.setOpenid(token);
+													this.islogionsuccess(true);
+													uni.navigateBack();
+												}
+											})
+											
+									    }
+			  },
 		}
 	}
 </script>

pages/myOrder/index.vue

@@ -44,13 +44,13 @@
 		  </view>
 		
 		</scroll-view> 
-		<view  v-if="order_list.length == 0 && hasLogin" >
+		<view  v-if="order_list.length == 0 && successlogion && hasLogin" >
 			  <view style="margin: 120upx auto;text-align: center;">
 					<van-icon size="160rpx" color="#909399" name="description" />
 					<view style="text-align: center;color: #909399;"> 去买点什么</view>
 			  </view>
 		</view>
-		<view  v-if="order_list.length == 0 && !hasLogin" >
+		<view  v-if="order_list.length == 0 && !successlogion || order_list.length == 0 && !hasLogin" >
 			  <view style="margin: 120upx auto;text-align: center;">
 					<van-icon size="160rpx" color="#909399" name="description" />
 					<view style="text-align: center;color: #909399;">啥都没有
@@ -110,7 +110,8 @@
 		computed:{
 			...mapState([
 			  'hasLogin',
-			  'userInfo'
+			  'userInfo',
+			  'successlogion'
 			]),
 		},
 		onLoad(a) {
@@ -123,19 +124,25 @@
 				   this.order_list = [];
 			       this.getlist();
 			   })
-			if(this.hasLogin) {
-				console.log(a);
+			if(this.successlogion &&　this.hasLogin) {
 				this.getlist(); // 获取订单
-				
 		  	}else {
 				uni.navigateTo({
 					url: '/pages/myCenter/logion'
 				})
-				//this.showdialog = true;
 			}
-			
 		},
 		watch:{
+			'successlogion':function(val) {
+			   if(val) {
+				  this.active = 0;
+				  this.getlist(); 
+			   }else {
+				  uni.navigateTo({
+				  	url: '/pages/myCenter/logion'
+				  })
+			   }
+			},
 			'hasLogin':function(val) {
 			   if(val) {
 				  this.active = 0;
@@ -164,7 +171,7 @@
 			// 	this.getlist(); // 获取订单
 			// },
 			changeselect(e) {
-				if(this.hasLogin) {
+				if(this.successlogion　&&　this.hasLogin) {
 					  console.log(e);
 					  this.active = e.target.name;
 					  this.page = 1;
@@ -210,12 +217,11 @@
 								items.descire = items.goods_name.replace(arr[0], '');
 							})
 						})
-						console.log(res.data.data.order_list)
+					
 						// let arr = item.goods_name.split(' ');
 						// item.desarray = arr[0];
 						// item.descire = arr.replace(arr[0], '');
 						this.order_list = this.order_list.concat(res.data.data.order_list);
-						
 					}
 				})
 			},
@@ -269,6 +275,8 @@
 					},
 					success: (res) => {
 						this.order_list = [];
+						this.page = 1;
+						this.ispull = true;
 						this.getlist();
 					}
 				})
@@ -286,8 +294,8 @@
 			
 			// 滚到底部
 			lower(e) {
-				console.log("底部")
 				if(this.ispull) {
+					console.log("l;ll")
 					this.page += 1;
 					this.getlist();
 				}

pages/myOrder/order.vue

@@ -1,15 +1,16 @@
 <template>
 	<view class="cart-list">
-       <view v-if="detail.refund_state == 0" style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+       <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
 		   
-		   <span v-if="detail.order_state == 10">未付款</span>
+		 <!--  <span v-if="detail.order_state == 10">未付款</span>
 		   <span v-if="detail.order_state == 0">已取消</span>
 		   <span v-if="detail.order_state == 20">待发货</span>  
 		   <!-- 已付款  -->
-		   <span v-if="detail.order_state == 30">已发货</span>
-		   <span v-if="detail.order_state == 40">已收货</span>
+		 <!--  <span v-if="detail.order_state == 30">已发货</span>
+		   <span v-if="detail.order_state == 40">已收货</span> -->
+		   <span>{{detail.status}}</span>
 	   </view>  
-	   <view v-else style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+	   <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
 	   		   <span v-if="detail.refund_state == 1">等待酒店处理退货申请</span>
 	   		   <span v-if="detail.refund_state == 2">同意退款售后</span>
 	   		   <span v-if="detail.order_state == 3">拒绝退款</span>  
@@ -59,16 +60,22 @@
 	 </view>
 	 
 	 <view class="adressbutton">
-		<view v-if="detail.refund_state == 0" class="buttonStatus">
-			<view v-if="detail.order_state == 0 || detail.order_state == 40 " @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
+		<view  class="buttonStatus">
+		<!-- 	<view>{{detail.operate}}</view> -->
+			<!-- <view v-if="detail.order_state == 0 " @click="cancelOrder(2)" class="deleteOrder">删除订单</view> -->
 			<view @click="reminder"  v-if="detail.order_state == 20" class="deleteOrder">催单</view>
 			<view @click="cancelOrder(1)" v-if="detail.order_state == 10" class="deleteOrder">取消订单</view>
 			<view class="payOrder" v-if="detail.order_state == 10" @click="goPay">去付款</view>
+			<!-- detail.order_state == 40 && detail.refund_state == 0 -->
+			<view v-if=" detail.status == '已发货'" @click="cancelOrder(3)" class="deleteOrder">确认收货</view>
+			<view v-if=" detail.status == '已收货'"  class="deleteOrder">退货退款</view>
+			<view v-if=" detail.status == '已收货'" @click="estimate" class="deleteOrder">去评价</view>
+			<view v-if=" detail.status == '已完成' ||  detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
 		</view>
-		<view v-else>
+		<!-- <view v-else>
 			<view v-if="detail.refund_state == 2">删除订单</view>
 			
-		</view>
+		</view> -->
 	 </view>
 
 	<Dialog  :orderCancel="orderCancel" 
@@ -89,6 +96,7 @@
 			return {
 			  isCancel: false,
 			  isDelete: false,
+			  isGet: false,
 			  titles:'',
 			  pictureUrl: this.pictureUrl,
 			  orderCancel: false,
@@ -120,6 +128,9 @@
 				if(e == 1) {
 					this.titles="确认取消订单？"
 					this.isCancel = true;
+				}else if(e == 3){
+					this.titles="确认收货？"
+					this.isGet = true;
 				}else {
 				   this.titles="确认删除订单？"
 				   this.isDelete = true;
@@ -129,6 +140,7 @@
 			cancelDialog() {
 				this.isCancel = false;
 				this.isDelete = false;
+				this.isGet = false;
 				this.orderCancel = false;
 			},
 			confirmOrder() {
@@ -140,7 +152,10 @@
 				}else if(this.isDelete) {
 					// 删除
 					url = '/v2/order/drop';
-				}
+				}else if(this.isGet) {
+					// 收货
+					url = '/v2/order/confirm';
+				} 
 				this.request({
 					url: url,
 					method:'post',
@@ -148,8 +163,18 @@
 						order_id: this.id
 					},
 					success: (res) => {
-						uni.$emit("refehlist");
-						uni.navigateBack();
+						if(this.isDelete) {
+							this.$msg("删除成功");
+						}else if(this.isGet) {
+							this.$msg("收货成功");
+						}else if(this.isCancel) {
+							this.$msg("取消成功");
+						}
+						setTimeout(()=> {
+							uni.$emit("refehlist");
+							uni.navigateBack();
+						}, 2000)
+						
 					}
 				})
 				
@@ -169,16 +194,19 @@
 			
 			// 催单
 			reminder() {
+			   let order_id = this.id;
 				uni.navigateTo({
-					url: './reminder'
+					url: `/pages/myOrder/reminder?order_id=${order_id}`
 				})
 			},
 		    
 			// 评价晒单
 			estimate() {
+				let order_id = this.id;
 				uni.navigateTo({
-					url: './estimate'
+					url: `/pages/myOrder/estimate?order_id=${order_id}`
 				})
+				
 			}
 		}
 	}

store/logion.js

@@ -5,8 +5,10 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		hasLogin: false,  //是否授权
+		hasLogin: false,  //代表用户授权头像等信息
 		sessionId:'',
+		successlogion: false, // 同意授权手机号 成功登录
+		getcode: {}, // code 后获取的token session_key等值
 		//showModal: false, //登录授权弹窗
 		userInfo: {},
 	},
@@ -19,7 +21,14 @@ const store = new Vuex.Store({
 			}) 
 			console.log(state.userInfo);
 		},
-		
+		setcode(state, provider) {
+			state.getcode = provider;
+			uni.setStorage({//缓存用户登陆信息
+			    key: 'getcode',  
+			    data: provider  
+			}) 
+			console.log(state.getcode);
+		},
 		setOpenid(state, provider) {
 			state.sessionId = provider;
 			uni.setStorage({//缓存用户登陆状态
@@ -36,15 +45,25 @@ const store = new Vuex.Store({
 			}) 
 			console.log(state.hasLogin);
 		},
-		
-		
+		islogionsuccess(state,provider) {
+			state.successlogion = provider;
+			uni.setStorage({
+			    key: 'successlogion',  
+			    data: provider  
+			}) 
+			console.log(state.successlogion);
+		},
 		logout(state) {
 			state.hasLogin = false;
 			state.userInfo = {};
+			state.getcode = {};
 			state.sessionId = '';
 			uni.removeStorage({  
 		        key: 'userInfo'  
 		    })
+			uni.removeStorage({
+			    key: 'getcode'  
+			})
 			uni.removeStorage({
 			    key: 'sessionId'  
 			})

unpackage/dist/build/mp-weixin/app.js

@@ -0,0 +1,4 @@
+
+require('./common/runtime.js')
+require('./common/vendor.js')
+require('./common/main.js')

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

@@ -0,0 +1,73 @@
+{
+  "pages": [
+    "pages/index/index",
+    "pages/index/hotel",
+    "pages/index/hoteldetail",
+    "pages/index/cart",
+    "pages/index/shop",
+    "pages/index/commemt",
+    "pages/index/searchresult",
+    "pages/index/feedback",
+    "pages/index/hotelsearch",
+    "pages/myone/oneIndex",
+    "pages/myone/onedetail",
+    "pages/myOrder/index",
+    "pages/index/sureBuy",
+    "pages/myOrder/paymoment",
+    "pages/myOrder/order",
+    "pages/myOrder/reminder",
+    "pages/myOrder/estimate",
+    "pages/myOrder/adress",
+    "pages/myOrder/adressManger",
+    "pages/myCenter/index",
+    "pages/myOrder/finsh",
+    "pages/myCenter/applyfor",
+    "pages/myCenter/Settled",
+    "pages/myCenter/definite",
+    "pages/myCenter/logion",
+    "pages/myCenter/business",
+    "pages/myCenter/commentback",
+    "pages/myCenter/myCollect",
+    "pages/myCenter/information"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#fff",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "color": "#C0C4CC",
+    "selectedColor": "#fa436a",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/myone/oneIndex",
+        "text": "发现"
+      },
+      {
+        "pagePath": "pages/myOrder/index",
+        "text": "订单"
+      },
+      {
+        "pagePath": "pages/myCenter/index",
+        "text": "我的"
+      }
+    ]
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "演示定位能力"
+    }
+  },
+  "usingComponents": {
+    "van-dialog": "/wxcomponents/dist/dialog/index",
+    "van-rate": "/wxcomponents/dist/rate/index",
+    "van-cell": "/wxcomponents/dist/cell/index"
+  },
+  "sitemapLocation": "sitemap.json"
+}

unpackage/dist/build/mp-weixin/app.wxss

@@ -0,0 +1 @@
+@import './common/main.wxss';

unpackage/dist/build/mp-weixin/component/Dialog.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/Dialog"],{1218:function(t,n,e){},2677:function(t,n,e){"use strict";var o=e("1218"),i=e.n(o);i.a},3489:function(t,n,e){"use strict";e.r(n);var o=e("83a9"),i=e.n(o);for(var a in o)"default"!==a&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=i.a},"37f5":function(t,n,e){"use strict";e.r(n);var o=e("79c2"),i=e("3489");for(var a in i)"default"!==a&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("2677");var u,c=e("f0c5"),r=Object(c["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],u);n["default"]=r.exports},"79c2":function(t,n,e){"use strict";var o,i=function(){var t=this,n=t.$createElement;t._self._c},a=[];e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}))},"83a9":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{orderCancel:{default:!1,type:Boolean},titles:{default:"确定取消订单？",type:String},values:{default:"",type:String}},data:function(){return{showdialog:!1}},watch:{orderCancel:function(t){this.showdialog=!!t}},onLoad:function(){console.log(this.titles)},methods:{cancelDialog:function(){this.show=!1,this.$emit("colseDialog")},confirmOrder:function(){this.show=!1,this.$emit("confirmPay")}}};n.default=o}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/Dialog-create-component',
+    {
+        'component/Dialog-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("37f5"))
+        })
+    },
+    [['component/Dialog-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/Dialog.json

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

unpackage/dist/build/mp-weixin/component/Dialog.wxml

@@ -0,0 +1 @@
+<block wx:if="{{showdialog}}"><view><van-dialog vue-id="2ef268be-1" title="{{titles}}" show-cancel-button="true" show="{{showdialog}}" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l" vue-slots="{{['default']}}"><view>{{''+values+''}}</view></van-dialog></view></block>

unpackage/dist/build/mp-weixin/component/Dialog.wxss

@@ -0,0 +1 @@
+.showdialog{width:100%;height:100vh}

unpackage/dist/build/mp-weixin/component/assess.json

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

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

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

unpackage/dist/build/mp-weixin/component/commoNar.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/commoNar"],{"0876":function(n,t,e){"use strict";e.r(t);var u=e("0aec"),c=e.n(u);for(var r in u)"default"!==r&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=c.a},"0aec":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{menu:{type:Array}}};t.default=u},"7b79":function(n,t,e){},cbc7:function(n,t,e){"use strict";var u,c=function(){var n=this,t=n.$createElement;n._self._c},r=[];e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}))},e217:function(n,t,e){"use strict";e.r(t);var u=e("cbc7"),c=e("0876");for(var r in c)"default"!==r&&function(n){e.d(t,n,(function(){return c[n]}))}(r);e("e392");var a,o=e("f0c5"),f=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],a);t["default"]=f.exports},e392:function(n,t,e){"use strict";var u=e("7b79"),c=e.n(u);c.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/commoNar-create-component',
+    {
+        'component/commoNar-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("e217"))
+        })
+    },
+    [['component/commoNar-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/commoNar.json

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

unpackage/dist/build/mp-weixin/component/commoNar.wxml

@@ -0,0 +1 @@
+<view style="width:95%;margin:12rpx auto;"><view class="typeItem">全部</view><view class="typeItem">上新<van-icon vue-id="d9624d2c-1" size="20px" name="arrow-up" bind:__l="__l"></van-icon><van-icon vue-id="d9624d2c-2" size="20px" name="arrow-down" bind:__l="__l"></van-icon></view><view class="typeItem">价格<van-icon vue-id="d9624d2c-3" size="20px" name="arrow-up" bind:__l="__l"></van-icon><van-icon vue-id="d9624d2c-4" size="20px" name="arrow-down" bind:__l="__l"></van-icon></view><view class="typeItem"><van-dropdown-menu vue-id="d9624d2c-5" bind:__l="__l" vue-slots="{{['default']}}"><van-dropdown-item vue-id="{{('d9624d2c-6')+','+('d9624d2c-5')}}" title="分类" bind:__l="__l"></van-dropdown-item></van-dropdown-menu></view></view>

unpackage/dist/build/mp-weixin/component/commoNar.wxss

@@ -0,0 +1 @@
+.typeItem{width:25%;display:inline-block;text-align:center}

unpackage/dist/build/mp-weixin/component/loginDialog.json

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

unpackage/dist/build/mp-weixin/component/loginDialog.wxml

@@ -0,0 +1 @@
+<view><van-dialog vue-id="c0a83d76-1" title="请登录" show-cancel-button="{{ishow}}" show="{{show}}" confirm-button-open-type="getUserInfo" confirm-button-color="#323232" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></van-dialog></view>

unpackage/dist/build/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.json

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

unpackage/dist/build/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.wxml

@@ -0,0 +1 @@
+<view class="mpvue-picker _div"><view class="{{['_div',(showPicker)?'pickerMask':'']}}" catchtouchmove="true" data-event-opts="{{[['tap',[['maskClick',['$event']]]]]}}" bindtap="__e"></view><view class="{{['mpvue-picker-content  _div',(showPicker)?'mpvue-picker-view-show':'']}}"><view class="mpvue-picker__hd _div" catchtouchmove="true"><view data-event-opts="{{[['tap',[['pickerCancel',['$event']]]]]}}" class="mpvue-picker__action _div" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['pickerConfirm',['$event']]]]]}}" class="mpvue-picker__action _div" style="{{'color:'+(themeColor)+';'}}" bindtap="__e">确定</view></view><picker-view class="mpvue-picker-view" indicator-style="height: 40px;" value="{{pickerValue}}" data-event-opts="{{[['change',[['pickerChange',['$event']]]]]}}" bindchange="__e"><block><picker-view-column><block wx:for="{{provinceDataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="picker-item _div">{{item.label}}</view></block></picker-view-column><picker-view-column><block wx:for="{{cityDataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="picker-item _div">{{item.label}}</view></block></picker-view-column><picker-view-column><block wx:for="{{areaDataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="picker-item _div">{{item.label}}</view></block></picker-view-column></block></picker-view></view></view>

unpackage/dist/build/mp-weixin/component/mpvue-citypicker/mpvueCityPicker.wxss

@@ -0,0 +1 @@
+.pickerMask{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0;background:rgba(0,0,0,.6)}.mpvue-picker-content{position:fixed;bottom:0;left:0;width:100%;-webkit-transition:all .3s ease;transition:all .3s ease;-webkit-transform:translateY(100%);transform:translateY(100%);z-index:3000}.mpvue-picker-view-show{-webkit-transform:translateY(0);transform:translateY(0)}.mpvue-picker__hd{display:-webkit-box;display:-webkit-flex;display:flex;padding:9px 15px;background-color:#fff;position:relative;text-align:center;font-size:17px}.mpvue-picker__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.mpvue-picker__action{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#1aad19}.mpvue-picker__action:first-child{text-align:left;color:#888}.mpvue-picker__action:last-child{text-align:right}.picker-item{text-align:center;line-height:40px;text-overflow:ellipsis;white-space:nowrap;font-size:16px}.mpvue-picker-view{position:relative;bottom:0;left:0;width:100%;height:238px;background-color:#fff}

unpackage/dist/build/mp-weixin/component/shopList.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/shopList"],{"5cf7":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{productList:{type:Array}},data:function(){return{title:"product-list",renderImage:!1,pictureUrl:this.pictureUrl}},methods:{goshop:function(n){console.log(n);var o=n.goods_commonid,e=n.store_id;t.navigateTo({url:"/pages/index/shop?id=".concat(o,"&store_id=").concat(e)})}},onLoad:function(){},onPullDownRefresh:function(){},onReachBottom:function(){}};n.default=o}).call(this,o("543d")["default"])},"989b":function(t,n,o){"use strict";o.r(n);var e=o("a948"),c=o("d4f4");for(var u in c)"default"!==u&&function(t){o.d(n,t,(function(){return c[t]}))}(u);o("f2ca");var r,a=o("f0c5"),i=Object(a["a"])(c["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],r);n["default"]=i.exports},a01a:function(t,n,o){},a948:function(t,n,o){"use strict";var e,c=function(){var t=this,n=t.$createElement;t._self._c},u=[];o.d(n,"b",(function(){return c})),o.d(n,"c",(function(){return u})),o.d(n,"a",(function(){return e}))},d4f4:function(t,n,o){"use strict";o.r(n);var e=o("5cf7"),c=o.n(e);for(var u in e)"default"!==u&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=c.a},f2ca:function(t,n,o){"use strict";var e=o("a01a"),c=o.n(e);c.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/shopList-create-component',
+    {
+        'component/shopList-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("989b"))
+        })
+    },
+    [['component/shopList-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/shopList.json

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

unpackage/dist/build/mp-weixin/component/shopList.wxml

@@ -0,0 +1 @@
+<view class="page"><view class="uni-product-list"><block wx:for="{{productList}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" class="uni-product" bindtap="__e"><view class="image-view"><image class="uni-product-image" style="background-color:#007AFF;" src="{{pictureUrl+'/uploads/home/store/'+product.goods_image}}"></image></view><view class="uni-product-title textover">{{product.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"￥"+product.goods_marketprice}}</text><text class="uni-product-price-favour">{{"￥"+product.goods_costprice}}</text></view></view></block></view></view>

unpackage/dist/build/mp-weixin/component/shopList.wxss

@@ -0,0 +1 @@
+.textover{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

unpackage/dist/build/mp-weixin/component/textarea.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/textarea"],{"3daf":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{tips:{default:"填写催单内容",type:String},maxnumber:{default:100,type:Number}},data:function(){return{numberList:0,focus:!1}},methods:{bindTextAreaBlur:function(t){this.numberList=t.detail.value.length,this.$emit("submitValue",t)}}};n.default=u},6950:function(t,n,e){"use strict";e.r(n);var u=e("af31"),a=e("8813");for(var r in a)"default"!==r&&function(t){e.d(n,t,(function(){return a[t]}))}(r);e("c858");var f,i=e("f0c5"),c=Object(i["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],f);n["default"]=c.exports},"6f3a":function(t,n,e){},8813:function(t,n,e){"use strict";e.r(n);var u=e("3daf"),a=e.n(u);for(var r in u)"default"!==r&&function(t){e.d(n,t,(function(){return u[t]}))}(r);n["default"]=a.a},af31:function(t,n,e){"use strict";var u,a=function(){var t=this,n=t.$createElement;t._self._c},r=[];e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return u}))},c858:function(t,n,e){"use strict";var u=e("6f3a"),a=e.n(u);a.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/textarea-create-component',
+    {
+        'component/textarea-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("6950"))
+        })
+    },
+    [['component/textarea-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/textarea.json

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

unpackage/dist/build/mp-weixin/component/textarea.wxml

@@ -0,0 +1 @@
+<view><view class="uni-textarea"><textarea maxlength="{{maxnumber}}" placeholder="{{tips}}" data-event-opts="{{[['input',[['bindTextAreaBlur',['$event']]]]]}}" bindinput="__e"></textarea><view style="color:#909399;text-align:right;">{{numberList+"/100"}}</view></view></view>

unpackage/dist/build/mp-weixin/component/textarea.wxss

@@ -0,0 +1 @@
+.uni-textarea textarea{padding:30rpx 2% 18rpx 2%}

unpackage/dist/build/mp-weixin/component/uinNumber.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/uinNumber"],{"0189":function(t,e,n){},"31a6":function(t,e,n){"use strict";n.r(e);var u=n("31e3"),i=n("ccc9");for(var a in i)"default"!==a&&function(t){n.d(e,t,(function(){return i[t]}))}(a);n("f50b");var l,c=n("f0c5"),r=Object(c["a"])(i["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],l);e["default"]=r.exports},"31e3":function(t,e,n){"use strict";var u,i=function(){var t=this,e=t.$createElement;t._self._c},a=[];n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return u}))},8538:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={name:"UniNumberBox",props:{value:{type:[Number,String],default:1},min:{type:Number,default:0},max:{type:Number,default:100},step:{type:Number,default:1},disabled:{type:Boolean,default:!1}},data:function(){return{inputValue:0}},watch:{value:function(t){this.inputValue=+t},inputValue:function(t,e){+t!==+e&&this.$emit("change",t)}},created:function(){this.inputValue=+this.value},methods:{_calcValue:function(t){if(!this.disabled){var e=this._getDecimalScale(),n=this.inputValue*e,u=this.step*e;"minus"===t?n-=u:"plus"===t&&(n+=u),n<this.min||n>this.max||(this.inputValue=n/e)}},_getDecimalScale:function(){var t=1;return~~this.step!==this.step&&(t=Math.pow(10,(this.step+"").split(".")[1].length)),t},_onBlur:function(t){var e=t.detail.value;e?(e=+e,e>this.max?e=this.max:e<this.min&&(e=this.min),this.inputValue=e):this.inputValue=0}}};e.default=u},ccc9:function(t,e,n){"use strict";n.r(e);var u=n("8538"),i=n.n(u);for(var a in u)"default"!==a&&function(t){n.d(e,t,(function(){return u[t]}))}(a);e["default"]=i.a},f50b:function(t,e,n){"use strict";var u=n("0189"),i=n.n(u);i.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/uinNumber-create-component',
+    {
+        'component/uinNumber-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("31a6"))
+        })
+    },
+    [['component/uinNumber-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/uinNumber.json

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

unpackage/dist/build/mp-weixin/component/uinNumber.wxml

@@ -0,0 +1 @@
+<view class="uni-numbox"><view data-event-opts="{{[['tap',[['_calcValue',['minus']]]]]}}" class="{{['uni-numbox__minus',(inputValue<=min||disabled)?'uni-numbox--disabled':'']}}" bindtap="__e">-</view><input class="uni-numbox__value" disabled="{{disabled}}" type="number" data-event-opts="{{[['blur',[['_onBlur',['$event']]]],['input',[['__set_model',['','inputValue','$event',[]]]]]]}}" value="{{inputValue}}" bindblur="__e" bindinput="__e"/><view data-event-opts="{{[['tap',[['_calcValue',['plus']]]]]}}" class="{{['uni-numbox__plus',(inputValue>=max||disabled)?'uni-numbox--disabled':'']}}" bindtap="__e">+</view></view>

unpackage/dist/build/mp-weixin/component/uinNumber.wxss

@@ -0,0 +1,2 @@
+.uni-numbox{display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;height:70rpx;position:relative}.uni-numbox:after{content:"";position:absolute;-webkit-transform-origin:center;transform-origin:center;box-sizing:border-box;pointer-events:none;top:-50%;left:-50%;right:-50%;bottom:-50%;border:1px solid #c8c7cc;border-radius:12rpx;-webkit-transform:scale(.5);transform:scale(.5)}.uni-numbox__minus,
+.uni-numbox__plus{margin:0;background-color:#f8f8f8;width:70rpx;font-size:40rpx;height:100%;line-height:70rpx;text-align:center;display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#333;position:relative}.uni-numbox__value{position:relative;background-color:#fff;width:80rpx;height:100%;text-align:center;padding:0}.uni-numbox__value:after{content:"";position:absolute;-webkit-transform-origin:center;transform-origin:center;box-sizing:border-box;pointer-events:none;top:-50%;left:-50%;right:-50%;bottom:-50%;border-style:solid;border-color:#c8c7cc;border-left-width:1px;border-right-width:1px;border-top-width:0;border-bottom-width:0;-webkit-transform:scale(.5);transform:scale(.5)}.uni-numbox--disabled{color:silver}

unpackage/dist/build/mp-weixin/component/uinNumberCart.json

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

unpackage/dist/build/mp-weixin/component/uinNumberCart.wxml

@@ -0,0 +1 @@
+<view class="uni-numbox"><view data-event-opts="{{[['tap',[['_calcValue',['subtract']]]]]}}" class="uni-numbox-minus" bindtap="__e"><text class="{{['yticon icon--jianhao',minDisabled?'uni-numbox-disabled':'']}}">-</text></view><input class="uni-numbox-value" type="number" disabled="{{disabled}}" data-event-opts="{{[['blur',[['_onBlur',['$event']]]]]}}" value="{{inputValue}}" bindblur="__e"/><view data-event-opts="{{[['tap',[['_calcValue',['add']]]]]}}" class="uni-numbox-plus" bindtap="__e"><text class="{{[maxDisabled?'uni-numbox-disabled':'']}}">+</text></view></view>

unpackage/dist/build/mp-weixin/component/uinNumberCart.wxss

@@ -0,0 +1,3 @@
+.uni-numbox{position:absolute;left:30rpx;bottom:0;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:230rpx;height:70rpx;background:#f5f5f5}.uni-numbox-minus,
+.uni-numbox-plus{margin:0;background-color:#f5f5f5;width:70rpx;height:100%;line-height:70rpx;text-align:center;position:relative}.uni-numbox-minus .yticon,
+.uni-numbox-plus .yticon{font-size:36rpx;color:#555}.uni-numbox-minus{border-right:none;border-top-left-radius:6rpx;border-bottom-left-radius:6rpx}.uni-numbox-plus{border-left:none;border-top-right-radius:6rpx;border-bottom-right-radius:6rpx}.uni-numbox-value{position:relative;background-color:#f5f5f5;width:90rpx;height:50rpx;text-align:center;padding:0;font-size:30rpx}.uni-numbox-disabled.yticon{color:#d6d6d6}

unpackage/dist/build/mp-weixin/component/uni-icon/uni-icon.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/uni-icon/uni-icon"],{"23cf":function(n,t,e){"use strict";e.r(t);var u=e("f95c"),c=e.n(u);for(var i in u)"default"!==i&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=c.a},a752:function(n,t,e){},a888:function(n,t,e){"use strict";var u=e("a752"),c=e.n(u);c.a},d4ee:function(n,t,e){"use strict";e.r(t);var u=e("e5d3"),c=e("23cf");for(var i in c)"default"!==i&&function(n){e.d(t,n,(function(){return c[n]}))}(i);e("a888");var r,a=e("f0c5"),o=Object(a["a"])(c["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],r);t["default"]=o.exports},e5d3:function(n,t,e){"use strict";var u,c=function(){var n=this,t=n.$createElement;n._self._c},i=[];e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return u}))},f95c:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={name:"UniIcon",props:{type:{type:String,default:""},color:{type:String,default:"#333333"},size:{type:[Number,String],default:16}},methods:{_onClick:function(){this.$emit("click")}}};t.default=u}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/uni-icon/uni-icon-create-component',
+    {
+        'component/uni-icon/uni-icon-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("d4ee"))
+        })
+    },
+    [['component/uni-icon/uni-icon-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/uni-icon/uni-icon.json

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

unpackage/dist/build/mp-weixin/component/uni-icon/uni-icon.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['_onClick',['$event']]]]]}}" class="{{['uni-icon','uni-icon-'+type]}}" style="{{'color:'+(color)+';'+('font-size:'+(size+'px')+';')}}" bindtap="__e"></view>

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

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/uni-nav-bar/uni-nav-bar"],{"1dcb":function(t,n,e){},"5d07":function(t,n,e){"use strict";e.r(n);var u=e("e752"),o=e.n(u);for(var i in u)"default"!==i&&function(t){e.d(n,t,(function(){return u[t]}))}(i);n["default"]=o.a},8685:function(t,n,e){"use strict";var u,o=function(){var t=this,n=t.$createElement;t._self._c},i=[];e.d(n,"b",(function(){return o})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return u}))},"9d62":function(t,n,e){"use strict";e.r(n);var u=e("8685"),o=e("5d07");for(var i in o)"default"!==i&&function(t){e.d(n,t,(function(){return o[t]}))}(i);e("d16b");var a,r=e("f0c5"),c=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],a);n["default"]=c.exports},d16b:function(t,n,e){"use strict";var u=e("1dcb"),o=e.n(u);o.a},e752:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=function(){e.e("component/uni-status-bar/uni-status-bar").then(function(){return resolve(e("424e"))}.bind(null,e)).catch(e.oe)},o=function(){e.e("component/uni-icon/uni-icon").then(function(){return resolve(e("d4ee"))}.bind(null,e)).catch(e.oe)},i={name:"UniNavBar",components:{uniStatusBar:u,uniIcon:o},props:{title:{type:String,default:""},leftText:{type:String,default:""},rightText:{type:String,default:""},leftIcon:{type:String,default:""},rightIcon:{type:String,default:""},fixed:{type:Boolean,default:!1},color:{type:String,default:"#000000"},backgroundColor:{type:String,default:"#FFFFFF"},statusBar:{type:Boolean,default:!1},shadow:{type:Boolean,default:!0},border:{type:Boolean,default:!0}},methods:{onClickLeft:function(){this.$emit("click-left")},onClickRight:function(){this.$emit("click-right")}}};n.default=i}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/uni-nav-bar/uni-nav-bar-create-component',
+    {
+        'component/uni-nav-bar/uni-nav-bar-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("9d62"))
+        })
+    },
+    [['component/uni-nav-bar/uni-nav-bar-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/uni-nav-bar/uni-nav-bar.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-status-bar": "/component/uni-status-bar/uni-status-bar",
+    "uni-icon": "/component/uni-icon/uni-icon"
+  }
+}

unpackage/dist/build/mp-weixin/component/uni-nav-bar/uni-nav-bar.wxml

@@ -0,0 +1 @@
+<view class="uni-navbar" style="width:100%;"><view class="{{['uni-navbar__content',(fixed)?'uni-navbar--fixed':'',(border)?'uni-navbar--shadow':'',(border)?'uni-navbar--border':'']}}" style="{{'background-color:'+(backgroundColor)+';'}}"><block wx:if="{{statusBar}}"><uni-status-bar vue-id="672e6a66-1" bind:__l="__l"></uni-status-bar></block><view class="uni-navbar__header uni-navbar__content_view" style="{{'color:'+(color)+';'}}"><view data-event-opts="{{[['tap',[['onClickLeft',['$event']]]]]}}" class="uni-navbar__header-btns uni-navbar__content_view" bindtap="__e"><block wx:if="{{leftIcon.length}}"><view class="uni-navbar__content_view"><uni-icon vue-id="672e6a66-2" type="{{leftIcon}}" color="{{color}}" size="24" bind:__l="__l"></uni-icon></view></block><block wx:if="{{leftText.length}}"><view class="{{['uni-navbar-btn-text uni-navbar__content_view',(!leftIcon.length)?'uni-navbar-btn-icon-left':'']}}">{{leftText}}</view></block><slot name="left"></slot></view><view class="uni-navbar__header-container uni-navbar__content_view"><block wx:if="{{title.length}}"><view class="uni-navbar__header-container-inner uni-navbar__content_view">{{title}}</view></block><slot></slot></view><view data-event-opts="{{[['tap',[['onClickRight',['$event']]]]]}}" class="uni-navbar__header-btns uni-navbar__content_view" bindtap="__e"><block wx:if="{{rightIcon.length}}"><view class="uni-navbar__content_view"><uni-icon vue-id="672e6a66-3" type="{{rightIcon}}" color="{{color}}" size="24" bind:__l="__l"></uni-icon></view></block><block wx:if="{{rightText.length&&!rightIcon.length}}"><view class="uni-navbar-btn-text uni-navbar__content_view">{{rightText}}</view></block><slot name="right"></slot></view></view></view><block wx:if="{{fixed}}"><view class="uni-navbar__placeholder"><block wx:if="{{statusBar}}"><uni-status-bar vue-id="672e6a66-4" bind:__l="__l"></uni-status-bar></block><view class="uni-navbar__placeholder-view"></view></view></block></view>

unpackage/dist/build/mp-weixin/component/uni-nav-bar/uni-nav-bar.wxss

@@ -0,0 +1 @@
+.uni-navbar{width:100%}.uni-navbar__content{display:block;position:relative;width:100%;background-color:#fff;overflow:hidden}.uni-navbar__content .uni-navbar__content_view{line-height:44px}.uni-navbar__header{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;width:100%;height:44px;line-height:44px;font-size:16px}.uni-navbar__header-btns{display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;flex-shrink:0;width:120rpx;padding:0 12rpx}.uni-navbar__header-btns:first-child{padding-left:0}.uni-navbar__header-btns:last-child{width:60rpx}.uni-navbar__header-container{width:100%;margin:0 10rpx}.uni-navbar__header-container-inner{font-size:30rpx;text-align:center;padding-right:60rpx}.uni-navbar__placeholder-view{height:44px}.uni-navbar--fixed{position:fixed;z-index:998}.uni-navbar--border:after{position:absolute;z-index:3;bottom:0;left:0;right:0;height:1px;content:"";-webkit-transform:scaleY(.5);transform:scaleY(.5);background-color:#c8c7cc}

unpackage/dist/build/mp-weixin/component/uni-status-bar/uni-status-bar.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/uni-status-bar/uni-status-bar"],{"107b":function(t,n,u){"use strict";u.r(n);var e=u("c944"),a=u.n(e);for(var c in e)"default"!==c&&function(t){u.d(n,t,(function(){return e[t]}))}(c);n["default"]=a.a},"424e":function(t,n,u){"use strict";u.r(n);var e=u("d875"),a=u("107b");for(var c in a)"default"!==c&&function(t){u.d(n,t,(function(){return a[t]}))}(c);u("b4eb");var r,i=u("f0c5"),f=Object(i["a"])(a["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],r);n["default"]=f.exports},"7cdc":function(t,n,u){},b4eb:function(t,n,u){"use strict";var e=u("7cdc"),a=u.n(e);a.a},c944:function(t,n,u){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=t.getSystemInfoSync().statusBarHeight+"px",e={name:"UniStatusBar",data:function(){return{statusBarHeight:u}}};n.default=e}).call(this,u("543d")["default"])},d875:function(t,n,u){"use strict";var e,a=function(){var t=this,n=t.$createElement;t._self._c},c=[];u.d(n,"b",(function(){return a})),u.d(n,"c",(function(){return c})),u.d(n,"a",(function(){return e}))}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/uni-status-bar/uni-status-bar-create-component',
+    {
+        'component/uni-status-bar/uni-status-bar-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("424e"))
+        })
+    },
+    [['component/uni-status-bar/uni-status-bar-create-component']]
+]);

unpackage/dist/build/mp-weixin/component/uni-status-bar/uni-status-bar.json

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

unpackage/dist/build/mp-weixin/component/uni-status-bar/uni-status-bar.wxml

@@ -0,0 +1 @@
+<view class="uni-status-bar" style="{{'height:'+(statusBarHeight)+';'}}"><slot></slot></view>

unpackage/dist/build/mp-weixin/component/uni-status-bar/uni-status-bar.wxss

@@ -0,0 +1 @@
+.uni-status-bar{display:block;width:100%;height:20px;height:25px}

unpackage/dist/build/mp-weixin/component/uploadImage.json

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

unpackage/dist/build/mp-weixin/component/uploadImage.wxml

@@ -0,0 +1 @@
+<view class="cell-pd"><view class="uni-uploader"><view class="uni-uploader-body"><view class="uni-uploader__files"><block wx:for="{{imageList}}" wx:for-item="image" wx:for-index="index" wx:key="index"><block><view class="uni-uploader__file" style="position:relative;"><image class="uni-uploader__img" src="{{image}}" data-src="{{image}}"></image><view data-event-opts="{{[['tap',[['deleteImg',[index]]]]]}}" style="position:absolute;right:0;top:0;" bindtap="__e">X</view></view></block></block><block wx:if="{{imageList.length!=3}}"><view class="uni-uploader__input-box deepHeight"><view data-event-opts="{{[['tap',[['chooseImage',['$event']]]]]}}" class="uni-uploader__input" bindtap="__e"></view></view></block></view></view></view></view>

unpackage/dist/build/mp-weixin/component/uploadImage.wxss

@@ -0,0 +1 @@
+.deepHeight{height:108rpx;width:108rpx}.uni-uploader__file{width:30%!important}

unpackage/dist/build/mp-weixin/pages/index/cart.json

@@ -0,0 +1,17 @@
+{
+  "navigationBarTitleText": "购物车",
+  "usingComponents": {
+    "van-icon": "/wxcomponents/dist/icon/index",
+    "van-card": "/wxcomponents/dist/card/index",
+    "van-goods-action": "/wxcomponents/dist/goods-action/index",
+    "van-goods-action-icon": "/wxcomponents/dist/goods-action-icon/index",
+    "van-goods-action-button": "/wxcomponents/dist/goods-action-button/index",
+    "van-submit-bar": "/wxcomponents/dist/submit-bar/index",
+    "van-checkbox": "/wxcomponents/dist/checkbox/index",
+    "van-checkbox-group": "/wxcomponents/dist/checkbox-group/index",
+    "van-radio": "/wxcomponents/dist/radio/index",
+    "van-radio-group": "/wxcomponents/dist/radio-group/index",
+    "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
+    "uninumberbox": "/component/uinNumberCart"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/cart.wxss

@@ -0,0 +1 @@
+.uniNavBar{height:100%}.cart-list{background-color:#fff}.titleright{text-align:right;padding:10rpx 30rpx;background:#fff;border-bottom:1px solid #eee;height:4vh}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important;width:70%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.priceClass{color:#303133!important;font-weight:100!important;font-size:36rpx}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;padding:0 35rpx;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding-bottom:25rpx}.checklabel{-webkit-transform:scale(.7);transform:scale(.7);border-radius:100%}.checkboxteil{-webkit-transform:scale(.7);transform:scale(.7);border-radius:100%}.uni-numbox{position:static!important;float:right}.isdiaplay .van-submit-bar__text{visibility:hidden}.isdiaplay{visibility:hidden}

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

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/commemt"],{"0059":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=function(){n.e("component/assess").then(function(){return resolve(n("553f"))}.bind(null,n)).catch(n.oe)},s={components:{assess:o},data:function(){return{goodId:0,assesslist:[],store_id:0}},onLoad:function(t){this.goodId=t.goodId,this.store_id=t.store_id,this.getassess()},methods:{getassess:function(){var t=this;this.request({url:"/api/index.php?do=getevaluategoods",method:"post",data:{goodsid:this.goodId},success:function(e){t.assesslist=e.data}})}}};e.default=s},2154:function(t,e,n){"use strict";(function(t){n("0bef"),n("921b");o(n("66fd"));var e=o(n("d6d4"));function o(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},d643:function(t,e,n){"use strict";n.r(e);var o=n("0059"),s=n.n(o);for(var u in o)"default"!==u&&function(t){n.d(e,t,(function(){return o[t]}))}(u);e["default"]=s.a},d6d4:function(t,e,n){"use strict";n.r(e);var o=n("ea91"),s=n("d643");for(var u in s)"default"!==u&&function(t){n.d(e,t,(function(){return s[t]}))}(u);var a,d=n("f0c5"),i=Object(d["a"])(s["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);e["default"]=i.exports},ea91:function(t,e,n){"use strict";var o,s=function(){var t=this,e=t.$createElement;t._self._c},u=[];n.d(e,"b",(function(){return s})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return o}))}},[["2154","common/runtime","common/vendor"]]]);

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

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

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

@@ -0,0 +1 @@
+<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><block wx:if="{{assesslist.length==0}}"><view style="text-align:center;">暂无评价</view></block></view>

unpackage/dist/build/mp-weixin/pages/index/feedback.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "入住反馈",
+  "usingComponents": {
+    "van-uploader": "/wxcomponents/dist/uploader/index",
+    "text-area": "/component/textarea",
+    "upload-image": "/component/uploadImage"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/feedback.wxss

@@ -0,0 +1 @@
+.comment{text-align:center;padding:20rpx 0}

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

@@ -0,0 +1,21 @@
+{
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "van-sticky": "/wxcomponents/dist/sticky/index",
+    "van-nav-bar": "/wxcomponents/dist/nav-bar/index",
+    "van-search": "/wxcomponents/dist/search/index",
+    "van-tab": "/wxcomponents/dist/tab/index",
+    "van-tabs": "/wxcomponents/dist/tabs/index",
+    "van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
+    "van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
+    "van-row": "/wxcomponents/dist/row/index",
+    "van-col": "/wxcomponents/dist/col/index",
+    "van-icon": "/wxcomponents/dist/icon/index",
+    "uni-icon": "/component/uni-icon/uni-icon",
+    "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
+    "commo-nar": "/component/commoNar",
+    "assess": "/component/assess",
+    "shop-list": "/component/shopList",
+    "logion-dialog": "/component/loginDialog"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/hoteldetail.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "商品销售",
+  "usingComponents": {
+    "van-tab": "/wxcomponents/dist/tab/index",
+    "van-tabs": "/wxcomponents/dist/tabs/index",
+    "van-dropdown-menu": "/wxcomponents/dist/dropdown-menu/index",
+    "van-dropdown-item": "/wxcomponents/dist/dropdown-item/index",
+    "van-icon": "/wxcomponents/dist/icon/index",
+    "shop-list": "/component/shopList"
+  }
+}

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

@@ -0,0 +1 @@
+.active{color:#f76260}.typeItem{width:25%;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-justify-content:space-around;justify-content:space-around}

unpackage/dist/build/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/build/mp-weixin/pages/index/hotelsearch.wxss

@@ -0,0 +1 @@
+.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/build/mp-weixin/pages/index/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "首页",
+  "usingComponents": {
+    "van-search": "/wxcomponents/dist/search/index",
+    "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
+    "uni-icon": "/component/uni-icon/uni-icon",
+    "logion-dialog": "/component/loginDialog"
+  }
+}

unpackage/dist/build/mp-weixin/pages/index/searchresult.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/searchresult"],{"27f3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=function(){n.e("component/uni-icon/uni-icon").then(function(){return resolve(n("d4ee"))}.bind(null,n)).catch(n.oe)},u={components:{uniIcon:i},onLoad:function(){},data:function(){return{pictureUrl:this.pictureUrl,hotelist:[],searchvalue:"",page:1}},methods:{search:function(){this.gethotelist()},confirm:function(t){this.searchvalue=t.detail.value,this.gethotelist()},gethotelist:function(){var t=this;""!=this.searchvalue?this.request({url:"/v2/entry/storeList",method:"get",data:{page:this.page,page_size:10,keyword:this.searchvalue},success:function(e){var n=e.data,i=n.data,u=n.code;1e3==u?(i.store_list.length<10&&(t.ispull=!1),0==t.hotelist.length?t.hotelist=i.store_list:t.hotelist=t.hotelist.concat(i.store_list)):t.$msg("网络错误稍后再试")}}):this.$msg("关键字不能为空")}}};e.default=u},"5f01":function(t,e,n){"use strict";var i=n("a943"),u=n.n(i);u.a},a10f:function(t,e,n){"use strict";n.r(e);var i=n("27f3"),u=n.n(i);for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=u.a},a4cf:function(t,e,n){"use strict";var i,u=function(){var t=this,e=t.$createElement;t._self._c},o=[];n.d(e,"b",(function(){return u})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return i}))},a943:function(t,e,n){},f268:function(t,e,n){"use strict";(function(t){n("0bef"),n("921b");i(n("66fd"));var e=i(n("f4b1"));function i(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},f4b1:function(t,e,n){"use strict";n.r(e);var i=n("a4cf"),u=n("a10f");for(var o in u)"default"!==o&&function(t){n.d(e,t,(function(){return u[t]}))}(o);n("5f01");var a,c=n("f0c5"),r=Object(c["a"])(u["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],a);e["default"]=r.exports}},[["f268","common/runtime","common/vendor"]]]);

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

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

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

@@ -0,0 +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 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>