样式修改

component/shopList.vue

@@ -66,6 +66,6 @@ export default {
 		padding: 0 10upx;
 		margin-top: 10upx;
 		border-radius: 6upx;
-		font-size: 24upx;
+		font-size: 22upx;
 	}
 </style>

pages.json

@@ -383,7 +383,7 @@
 		}
     ],
 	"tabBar": {
-		"color": "#C0C4CC",
+		"color": "#7F8389",
 		"selectedColor": "#fa436a",
 		"list": [
 			{

pages/index/cart.vue

@@ -9,7 +9,7 @@
 			  		 <view class="cart-list">
 			  		  <view style="display: flex;align-items: center;padding: 20upx 36upx;
 			  		   border-bottom: 1px solid #F5F5F5;">
-			  			  <image :src="pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_logo" style="border-radius: 50%;
+			  			  <image :src="pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_banner" style="border-radius: 50%;
 			  width: 50upx;height: 50upx;"></image>
 			  			  <span style="padding-left: 8upx;">{{store.store_name}}</span>
 			  		  </view>

pages/index/hotel.vue

@@ -43,20 +43,20 @@
        </view>
 	   <view v-if="store_summary" style="color: #666;padding: 0 32upx 10upx 32upx;">{{store_summary}}</view>
        <view>
-                  <van-tabs v-model="activeindex" @click.stop="onChange">
-                    <van-tab  :name="0" title="服务项目">
+                  <van-tabs title-active-color="#D9332E" v-model="activeindex" @click.stop="onChange">
+                    <van-tab :name="0" title="服务项目">
                   <view>
 					  <!-- background: #909399 -->
                       <view class="giveList">
                           <view class="giveItem" v-for="(item,index) in category_list" :key="index" @click.stop="godetail(item)">
                             <image :src="item.pic" 
-							style="width:100%;height: 100upx;">
+							style="width:100%;height: 69%;">
 							</image>
-                            <p style="text-align: center;">{{item.gc_name}}</p>
+                            <p style="text-align: center;font-size: 24rpx;">{{item.gc_name}}</p>
                           </view>
                       </view>
                   
-                  <view style="padding: 0upx 18upx;">
+                  <view style="padding: 0upx 18upx 20upx 18upx ;">
                       <view style="width: 95%;margin: 0 auto;">
                               <view @click.stop="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
                                   综合
@@ -104,15 +104,15 @@
                                   </view>
                               </view>
                               <view  @click.stop="choseType(4)" class="typeItem">
-								    <view :class="tabIndex==4 ? 'active' : ''">分类
-										<img v-if="tabIndex != 4" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
-										<img v-if="tabIndex == 4" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
+								    <view :class="ishowpull ? 'active' : ''">分类
+										<img v-if="!ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
+										<img v-if="ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
 									</view>
                               </view>
                           </view>
                   </view>
-				  <view v-if="tabIndex==4">
-						  <view style="margin: 18upx 36upx;float: left;width: 110upx;text-align: center;" 
+				  <view v-if="ishowpull" style="display: flex;flex-wrap: wrap;padding: 10upx  12upx;">
+						  <view class="spacedance"
 						   v-for="(item, index) in classify" :key="index"
 							 @click.stop="confirm(item)" >
 							 {{item.gc_name}}
@@ -128,7 +128,18 @@
                  </van-tab>
                     <van-tab  :name="2" title="酒店信息">
 						<view style="padding: 20upx 32upx 0upx 32upx;margin-bottom: 200upx;">
+							  <view style="padding-bottom: 10upx;">商家信息</view>
 							  <rich-text :nodes="store_description"></rich-text> 
+							  <view class="newadress">
+								  <view>酒店地址</view>
+								  <view v-if="storeinformation.store_address!='' ">{{storeinformation.store_address}}</view>
+								   <view v-else>暂无</view>
+							  </view>
+							  <view class="newadress">
+								  <view>联系酒店</view>
+								  <view v-if="storeinformation.store_phone!='' ">{{storeinformation.store_phone}}</view>
+								  <view v-else>暂无</view>
+							  </view>
 						</view>
                  </van-tab>
                   </van-tabs>
@@ -163,6 +174,7 @@
         },
         data() {
             return {
+				storeinformation: {},
 				isTop: 0,
 				hoteldetail: {},
 				has_collected: 0, // 收藏酒店
@@ -207,6 +219,7 @@
                     id:'3'
                 }
                 ],
+				ishowpull: false,
 				classify: [],
                 background: ['color1', 'color2', 'color3'],
                 indicatorDots: true,
@@ -350,6 +363,7 @@
 						this.chosegoods_price = !this.chosegoods_price;
 						this.getshopdetail(2);
 					}else if(this.tabIndex ==4) {  // 分类
+					    this.ishowpull = !this.ishowpull;
 						this.istopclick = 0;
 						this.isprice = 0;
 						this.goods_price = ''; 
@@ -461,11 +475,20 @@
 								this.store_slide.push(item);
 							}
 						})
+						this.storeinformation = data;
 						this.store_summary = data.store_summary;
+						
+						// const regex = new RegExp('<img', 'gi');
+						// console.log(data.store_description);
+						// data.store_description = data.store_description.replace(regex, 
+						// `<img style="width: 100%;height: auto;display: block;text-align: center;`);
+						// this.store_description = data.store_description;
+						
+						
+						//data.store_description = data.store_description.replace(/\(<img\)/ig, '');
 						const regex = new RegExp('<img', 'gi');
-						console.log(data.store_description);
 						data.store_description = data.store_description.replace(regex, 
-						`<img style="width: 100%;height: auto;display: block;text-align: center;`);
+						`<img style="width: 100%;height: auto!important;display: block;text-align: center;"`);
 						this.store_description = data.store_description;
 						this.has_collected = data.has_collected; // 是否收藏
 					}
@@ -478,6 +501,7 @@
 			},
             confirm(e) {
 				this.tabIndex = 0;
+				this.ishowpull = false;
 				this.gc_id_1 = e.gc_id;
 				this.getshopdetail(2);
             },
@@ -524,6 +548,18 @@
 </script>
   
 <style scoped>
+	.van-tab--active {
+		color: #D9332E!important; 
+	}
+	.newadress {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #F5F5F5;
+		padding: 15upx 0;
+	}
+	.changfecolor {
+		color: green; 
+	}
     .scrollswiper {
         width: 100%;
         position: relative;
@@ -563,13 +599,13 @@
         flex-wrap: wrap;
     }
     .giveItem {
-        height: 120rpx;
+        height: 150rpx;
         flex: 1;
-        width: 16%;
-        min-width: 16%;
-        max-width: 16%;
+        width: 14%;
+        min-width: 14%;
+        max-width: 14%;
         /* margin: 24rpx 0 25rpx 4%; */
-		margin: 24upx 2%;
+		margin: 24upx 3%;
     }
     .active {
         color: #F76260;
@@ -615,7 +651,7 @@
         
     }
      .input-view {
-        width: 85%;
+        width: 100%;
         display: flex;
         height: 30px;
         border-radius: 15px;
@@ -625,7 +661,6 @@
         line-height: 30px;
         margin: 24upx auto;
         background:rgba(0,0,0,1);
-        border-radius:15px;
         opacity:0.4;
     }
     
@@ -655,4 +690,21 @@
 		display: block;
 		text-align: center;
 	}
+	.spacedance{
+		/* margin: 18upx 17upx;float: left;
+		width: 110upx;
+		border: 1px solid #666;
+		padding: 3upx 22upx;
+		text-align: center; */
+		border:1px solid #eee;
+		flex: 1;width: 20%;
+		text-align: center;
+		min-width: 20%;
+		max-width: 20%;
+		margin: 6rpx 0 15rpx 2%;
+		padding:4upx 8upx;
+		color: #666
+	}
+	/* 轮播切换图标字体红 */
+	
 </style>

pages/index/hoteldetail.vue

@@ -6,7 +6,7 @@
 			 <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
 			    综合
 			 </view>
-			 <view @click="choseType(2)"   class="typeItem">
+			 <view @click="choseType(2)" class="typeItem">
 			   <view class="iconClass">
 				    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
 			     <view  v-if="istopclick==0">
@@ -33,21 +33,20 @@
 						  <view  v-if="isprice==4">
 							<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
 						  </view>
-			            
 			         </view>
 			     </view>
 			 </view>
 			 <view  @click.stop="choseType(4)" class="typeItem">
-				<view :class="tabIndex==4 ? 'active' : ''">分类
-					<img v-if="tabIndex != 4" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
-					<img v-if="tabIndex == 4" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
+				<view :class="ishowpull ? 'active' : ''">分类
+					<img v-if="!ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb.png' />
+					<img v-if="ishowpull" style="width: 36upx;height: 36upx;" src='../../static/sortb_up.png' />
 				</view>
 			 </view>
 	      </view>
 			
 	  </view>
-		  <view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="tabIndex==4">
-			  <view style=" flex: 1;width: 20%;min-width: 20%;max-width: 20%;margin: 24rpx 0 25rpx 4%;" 
+		  <view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="ishowpull">
+			  <view  class="spacedance"
 			   v-for="(item, index) in category_list" :key="index"
 				 @click.stop="confirm(item)" >
 				 {{item.gc_name}}
@@ -74,6 +73,7 @@
 		},
 		data() {
 			return {
+				ishowpull: false,
 				isTop: 0,
 				isprice: 0,
 				goods_list:[],
@@ -152,6 +152,7 @@
 					this.goods_commonid = '';
 					this.chosegoods_price = true;
 					this.chosegoods_commonid = true;
+					this.ishowpull = !this.ishowpull;
 				}
 			
 			},
@@ -163,6 +164,7 @@
 			confirm(e) {
 				this.tabIndex = 0;
 				this.gc_id_2 = e.gc_id;
+				this.ishowpull = false;
 				this.getshopdetail(2);
 			},
 			// 获取商品详情
@@ -252,4 +254,13 @@
 	    justify-content: center;
 
 	}
+	.spacedance {
+		border:1px solid #666;
+		flex: 1;width: 20%;
+		text-align: center;
+		min-width: 20%;
+		max-width: 20%;
+		margin: 6rpx 0 25rpx 4%;
+		padding:4upx 0;
+	}
 </style>

pages/index/index.vue

@@ -26,7 +26,8 @@
 	<view @click="goSearch" class="searchType" style="background: #fff;">
 		 <view class="input-view">
 		 	<uni-icon type="search" size="22" color="#666666" />
-		 	<input confirm-type="search" class="input" type="text" placeholder="搜索您入住的酒店" disabled="true" />
+			<view style="color: #999;">搜索您入住的酒店</view>
+		 <!-- 	<input placeholder-style="text-align: center;"	 confirm-type="search" class="input" type="text" placeholder="搜索您入住的酒店" disabled="true" /> -->
 		 </view>
 	 </view>
 	 </view>
@@ -62,7 +63,7 @@
 		 <view class="hotelright">
 		 	<view style="font-size: 28upx;color: #303133;font-weight: bold;">{{item.store_name}}
 			</view>
-		    <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;padding: 10rpx 0;">
+		    <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;padding: 2rpx 0;">
 				<view style="font-size: 46upx; color: #303133;font-weight: 900;">{{intToFloat(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>
@@ -483,6 +484,8 @@
 		margin: 7px 0;
 		line-height: 30px;
 		margin: 10upx auto;
+		display: flex;
+		justify-content: center
 	}
 	
 	.searchType .input-view .uni-icon {
@@ -526,7 +529,7 @@
 		font-size: 28upx;
 		text-align: center;
 		margin: 24upx 0; */
-		padding: 20upx 32upx;
+		padding: 20upx 32upx 0 32upx;
 		display: flex;
 		justify-content: space-between;
 		font-size: 30upx;
@@ -556,12 +559,15 @@
 		align-items: center;
 	}
 	.tipsTop {
-		border: 2upx solid #606266;
+		border: 1upx solid #606266;
 		margin-right: 12upx;
 		color: #606266;
-		padding: 4upx;
-		font-size: 24upx;
-		border-radius: 4upx;
-		padding: 0 3upx;
+		font-size: 22rpx;
+		border-radius: 5rpx;
+		padding: 0rpx 5rpx;
+
+	}
+	.placeholdercenter {
+		text-align: center;
 	}
 </style>

pages/index/shop.vue

@@ -1061,7 +1061,6 @@
  			z-index: 99;
  			bottom: 100upx;
  			width: 100%;
- 			min-height: 40vh;
  			border-radius: 10upx 10upx 0 0;
  			background-color: #fff;
  			.btn{
@@ -1127,6 +1126,7 @@
 		overflow: hidden;
 		clear: both;
 		padding-right: 59rpx;
+		padding-bottom: 50rpx;
 	}
 	.uni-numbox {
 		float: right;
@@ -1202,7 +1202,14 @@
  			}
  		}
  	}
- 	
+ 	.van-goods-action-button--last {
+		border-radius: none!important;
+		--button-border-radius: none!important;
+	}
+	.van-goods-action-button--first {
+		border-radius: none!important;
+		--button-border-radius: none!important;
+	}
 	.changeimg {
 		width: 100%;
 		height: auto!important;

pages/index/sureBuy.vue

@@ -22,7 +22,10 @@
 		     </van-cell>
 		   </van-cell-group>
 		 </van-radio-group>
-		 
+		 <view v-if="is_traffic == 0 && radio === 0" style="background-color: #D9332E;color: #fff;margin: 10upx 0;
+		 padding: 0 32upx;">
+			 酒店现在是休息时间,可能无法及时为您配送
+		 </view>
 		 <view v-if="radio === 0"
 		  style="border-top: 15upx solid #F5F5F5;
 		  border-bottom: 15upx solid #F5F5F5;
@@ -36,12 +39,17 @@
 			 readonly
 		     placeholder="请输入酒店"
 		   />
-		   <van-field
-		      @change="gethonename"
-		      :value="honename"
-		      label="房间号"
-		      placeholder="请输入房间号"
-		    />
+		   <view @click="goshopvalue">
+			   <van-field
+			      :disabled="first==1&&!pleasesure"
+			   	  @focus="getplaese"
+			      :value="honename"
+			      label="房间号"
+			      placeholder="请输入房间号"
+			    />
+		   </view>
+		  
+			
 			<van-field
 			   @change="getusername"
 			   :value="username"
@@ -65,8 +73,8 @@
 		    @change="getreserve"
 		     :value="reserve"
 			 readonly
-		     label="预定酒店"
-		     placeholder="请输入预定酒店"
+		     label="预订酒店"
+		     placeholder="请输入预订酒店"
 		   />
 		   
 		   <van-field
@@ -97,7 +105,7 @@
 				   :border="false"
 			     >
 				 <template slot="title">
-					 我已阅读并同意 <span @click="readshouknow" style="color: #007AFF">预定须知</span>
+					 我已阅读并同意 <span @click="readshouknow" style="color: #007AFF">《预订须知》</span>
 				 </template>
 				 <template   @click="getread" slot="right-icon">
 				    <van-radio-group style="width: 20upx;" :value="read" >
@@ -110,9 +118,27 @@
 			 </van-radio-group>
 		</view>
 		
+		
+		<van-dialog
+		  use-slot
+		  :show="pleasesure"
+		  :showCancelButton='true'
+		  cancel-button-text="返回"	
+		  @confirm="confirmstore"
+		  confirm-button-color="#D9332E"	
+		  @cancel="cancelstore"
+		>
+		 <view style="padding: 50upx 32rpx;text-align: center;">
+			<view style="padding: 15upx 0;">购物前请确认</view>
+			<view  style="padding: 15upx 0;font-size: 38rpx;color: #D9332E;font-weight: bold;">{{hotelname}}</view>
+			<view  style="padding: 15upx 0;">是否您入住的酒店</view>
+		 </view>
+		</van-dialog>
+		
+		
 		 <van-dialog
 		   use-slot
-		   title="<<预定须知>>"
+		   title="预订须知"
 		   :show="ishow"
 		   @confirm="confirmOrder"
 		   :show-cancel-button="false"
@@ -136,8 +162,8 @@
 		  
 		 <view @tap="goDetail()" class="cart-list">
 		  <view class="topTip">
-			   <view style="display: flex;align-items: center;border-bottom: 1px solid #F5F5F5;">
-				<image :src="pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_logo" style="border-radius: 50%;
+			   <view style="display: flex;align-items: center;">
+				<image :src="pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_banner" style="border-radius: 50%;
 				width: 50upx;height: 50upx;"></image>
 				<span style="padding-left: 8upx;">{{store.store_name}}</span>
 			   </view>
@@ -171,10 +197,15 @@
 		</view>
 </template>
 <script>
-	
+	import {
+		mapMutations,mapState
+	} from 'vuex'
 	export default {
 		data() {
 			return {
+				is_traffic: 1,
+				pleasesure: false,
+				first: 1,
 				scrollTop: 0,
 				ishow: false,
 				firstprice: 0,
@@ -225,6 +256,14 @@
 		},
 		
 		methods: {
+			// 确定入住酒店
+			confirmstore() {
+				this.pleasesure = false;
+			},
+			// 返回确认入住酒店
+			cancelstore() {
+				uni.navigateBack();
+			},
 			getuserinfo() {
 				this.request({
 					url:'/v2/member/info',
@@ -253,9 +292,16 @@
 				this.read = 4;
 			},
 			
-				gethonename(e) {
-					this.honename = e.detail;
-				},
+			getplaese(e) {
+				this.honename = e.detail.value;
+			},
+			goshopvalue() {
+				if(!this.pleasesure && this.first == 1) {
+					this.pleasesure = true;
+					this.first = 2;
+					return;
+				}
+			},	
 				getphone(e) {
 					this.phone = e.detail;
 				},
@@ -290,6 +336,7 @@
 						   item.descire = item.goods_name.replace(arr[0], '');
 						   totalprice+=Number(item.goods_pay_price*item.goods_num);
 						})
+						this.is_traffic = data.is_traffic;
 						this.hotelname = this.store.store_name
 						this.reserve = this.store.store_name
 						this.pricelist = data.og_list;
@@ -342,7 +389,7 @@
 					
 				}else if(this.radio == 2) {
 					if(this.reserve == '') {
-						this.$msg("请输入预定酒店")
+						this.$msg("请输入预订酒店")
 						return;
 					}else if(this.Checkedin == '') {
 						this.$msg("请输入入住人")
@@ -351,7 +398,7 @@
 						this.$msg("请输入正确手机号")
 						return;
 					}else if(this.read !=4) {
-						this.$msg("请阅读预定须知");
+						this.$msg("请阅读预订须知");
 						return;
 					}
 					this.request({
@@ -456,7 +503,7 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 20upx 36upx;
-		//border-bottom: 1px solid #F5F5F5;
+		border-bottom: 1px solid #F5F5F5;
 		background-color: #fff;
 	}
 	.changewidth {

pages/myOrder/order.vue

@@ -21,7 +21,7 @@
 	   		 <view class="adressDetail">{{detail.reciver_info.mob_phone}}</view>
 	   		 <view>{{detail.reciver_info.address}}</view>
 	   </view>
-	   <view style="padding: 30upx 36upx 15upx 36upx;border-bottom: 1px solid #F5F5F5;">
+	   <view @click="goStore" style="padding: 30upx 36upx 15upx 36upx;border-bottom: 1px solid #F5F5F5;">
 		   <image :src="pictureUrl+'/uploads/home/store/'+detail.store_id+'/'+detail.store_avatar" style="border-radius: 50%;
 		   width: 50upx;height: 50upx;vertical-align: middle;"></image>
 		  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
@@ -57,11 +57,11 @@
 		     <text class="time"  v-else>{{detail.payment_time}}</text>
 		 </view>
 		 <view>商家发货: 
-		   <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0 ||  detail.order_state == 20">未发货</text>
+		   <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0 ||  detail.order_state == 20 || detail.order_state == 60">未发货</text>
 		   <text class="time"  v-else>{{happenTimeFun(detail.shipping_time)}}</text>
 		 </view>
 		 <view>确认收货: 
-			<text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0||  detail.order_state == 20">未确认</text>
+			<text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0||  detail.order_state == 20|| detail.order_state == 60">未确认</text>
 			<text class="time"  v-else>{{detail.finnshed_time}}</text>
 		 </view>
 	 </view>
@@ -80,7 +80,7 @@
 			<view v-if=" detail.status == '已发货'" @click="cancelOrder(3)" class="deleteOrder">确认收货</view>
 			<!-- <view v-if=" detail.status == '已收货'"  evaluation_state  class="deleteOrder">退货退款</view> -->
 			<view v-if=" detail.status == '已收货' && detail.evaluation_state == 0 || detail.status == '已完成' && detail.evaluation_state == 0 " @click="estimate" class="deleteOrder">去评价</view>
-			<view v-if=" detail.order_state == 40 && detail.evaluation_state == 1 || detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
+			<view v-if=" detail.order_state == 40 && detail.evaluation_state == 1 || detail.status == '已取消' || detail.status == '退款关闭' " @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
 		</view>
 		<!-- <view v-else>
 			<view v-if="detail.refund_state == 2">
@@ -126,7 +126,12 @@
 			
 		},
 		methods: {
-			
+			  goStore() {
+			     let id = this.detail.store_id;
+			  	 uni.navigateTo({
+			  	       url: `/pages/index/hotel?id=${id}`
+			  	 });
+			  },
 			  happenTimeFun(num){//时间戳数据处理
 			                  let date = new Date(num * 1000);
 			                //时间戳为10位需*1000，时间戳为13位的话不需乘1000

pages/myone/onedetail.vue

@@ -1,7 +1,7 @@
 <template>
 		<view style="padding: 20upx 32upx;">
-			<view style="font-size: 35rpx;padding-bottom: 40upx;">{{aricte.article_title}}</view>
-			<view style="color: #999;padding-bottom: 40upx;">{{aricte.article_time}}</view>
+			<view style="font-size: 35rpx;padding-bottom: 46upx;">{{aricte.article_title}}</view>
+			<view style="color: #999;padding-bottom: 46upx;">{{aricte.article_time}}</view>
 			<rich-text :nodes="nodes"></rich-text>
 			<view v-if="aricte.ad_type!=0 && nodes!='' " class="aricte" :class="isclose?'closeacrile':''">
 				<view style="display: flex;justify-content: space-between;padding: 20upx 0;">
@@ -88,6 +88,7 @@
 	.changeimg {
 		width: 100%;
 		height: auto!important;
+		padding: 8upx 0;
 		display: block;
 		text-align: center;
 	}