样式修改

component/shopList.vue

@@ -61,9 +61,11 @@ export default {
 		border: 1px solid #D9332E;
 		color: #D9332E;
 		text-align: center;
-		line-height: 50upx;
+		line-height: 45upx;
 		width:auto;
 		padding: 0 10upx;
 		margin-top: 10upx;
+		border-radius: 6upx;
+		font-size: 24upx;
 	}
 </style>

pages.json

@@ -332,6 +332,7 @@
 			"style": {
 				"navigationBarTitleText": "登录", 
 				 "usingComponents": {
+					 
 				 }
 			}
 		},
@@ -350,6 +351,18 @@
 				"navigationBarTitleText": "意见反馈"
 			}
 		},
+		{
+			"path": "pages/myCenter/gouser",
+			"style": {
+				"navigationBarTitleText": "用户协议"
+			}
+		},
+		{
+			"path": "pages/myCenter/goforate",
+			"style": {
+				"navigationBarTitleText": "隐私政策"
+			}
+		},
 		{
 			"path": "pages/myCenter/myCollect",
 			"style": {

pages/index/hotel.vue

@@ -463,6 +463,7 @@
 						})
 						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;

pages/index/hoteldetail.vue

@@ -10,15 +10,12 @@
 			   <view class="iconClass">
 				    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
 			     <view  v-if="istopclick==0">
-			     	<!-- <van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /> -->
 			     	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
 			     </view>
 			     <view  v-if="istopclick==1">
-			     	<!-- <van-icon size="8px" name="arrow-up"    :class="istopclick==1 ? 'active' : ''"  /> -->
 			     	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
 			     </view>
 			     <view  v-if="istopclick==2">
-			     	<!-- <van-icon  :class="istopclick==2 ? 'active' : ''"  size="8px" name="arrow-down" /> -->
 			     	<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
 			     </view>
 			   </view>
@@ -39,7 +36,6 @@
 			            
 			         </view>
 			     </view>
-			     
 			 </view>
 			 <view  @click.stop="choseType(4)" class="typeItem">
 				<view :class="tabIndex==4 ? 'active' : ''">分类

pages/index/hotelsearch.vue

@@ -15,7 +15,7 @@
 		 
 		 <view style="padding: 30upx 18upx;">
 		     <view style="width: 95%;margin: 0 auto;">
-		 			 <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
+		 			<!-- <view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
 		 			     综合
 		 			 </view>
 		 			 <view @click="choseType(2)"   class="typeItem">
@@ -43,8 +43,41 @@
 		 			         </view>
 		 			     </view>
 		 			     
-		 			 </view>
-					
+		 			 </view> -->
+					<view @click="choseType(1)" :class="tabIndex==1 ? 'active' : ''" class="typeItem">
+					   综合
+					</view>
+					<view @click="choseType(2)"   class="typeItem">
+					  <view class="iconClass">
+									    <view :class="tabIndex==2 ? 'active' : ''">上新</view>
+					    <view  v-if="istopclick==0">
+					    	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
+					    </view>
+					    <view  v-if="istopclick==1">
+					    	<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
+					    </view>
+					    <view  v-if="istopclick==2">
+					    	<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
+					    </view>
+					  </view>
+					</view>
+					<view @click="choseType(3)"  class="typeItem">
+					    <view class="iconClass">
+					        <view :class="tabIndex==3 ? 'active' : ''">价格</view>
+					        <view style="display: flex;flex-direction: column;margin-left: 10rpx;">
+											  <view v-if="isprice==0">
+												<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort.png' />
+											  </view>
+											  <view  v-if="isprice==3">
+												<img style="width: 36upx;height: 36upx;vertical-align: middle;" src='../../static/sort_down.png' />
+											  </view>
+											  <view  v-if="isprice==4">
+												<img style="width: 36upx;height: 36upx;vertical-align: middle;"  src='../../static/sort_up.png' />
+											  </view>
+					           
+					        </view>
+					    </view>
+					</view>
 		     </view>
 		 			
 		 </view>
@@ -67,6 +100,9 @@
 		},
 		data() {
 			return {
+				
+				
+				isprice: 0,
 				page: 1,
 				goodId:0,
 				tabIndex: 1,
@@ -89,7 +125,7 @@
 				// /this.getshopdetail();
 			},
 			// 获取商品详情
-			getshopdetail() {
+			getshopdetail(e) {
 				if(this.searchvalue == '') {
 						 this.$msg("关键字不能为空")
 						 return;
@@ -105,6 +141,9 @@
 										 keyword: this.searchvalue
 				                    },
 								success: (res) => {
+									if(e == 2) {
+										this.goods_list = [];
+									}
 									this.goods_list = this.goods_list.concat(res.data.data.goods_list);
 									if(res.data.data.goods_list.length < 10) {
 										this.isDetail = 2;
@@ -113,38 +152,74 @@
 			    })
 			},
 			choseType(e) {
-			    this.tabIndex = e;
 				if(this.searchvalue == '') {
-					return;
+					 this.$msg("关键字不能为空")
+					 return;
 				}
-				this.goods_list = [];
+				  this.page = 1;
+				  this.tabIndex = e;
+				  //this.goods_list = [];
 				if(this.tabIndex == 1) {  // 服务
 					this.istopclick = 0;
-					this.gc_id_1 = '';
+					this.isprice = 0;
+					this.gc_id_2 = '';
 					this.goods_price = ''; 
 					this.goods_commonid = '';
+					this.getshopdetail(2); 
 				}else if(this.tabIndex == 2){ //伤
 				        this.chosegoods_price = true;
 						this.istopclick = this.chosegoods_commonid?1:2;
+						this.isprice = 0;
 						this.goods_price = ''; 
 						this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
-						this.gc_id_1 = '';
+						//this.gc_id_1 = '';
 						this.chosegoods_commonid = !this.chosegoods_commonid;
+						this.getshopdetail(2);
 				}else if(this.tabIndex == 3){ // 价格
 						this.chosegoods_commonid = true;
-						this.istopclick = this.chosegoods_price?3:4;
+						this.isprice = this.chosegoods_price?3:4;
 						this.goods_price = this.chosegoods_price?'desc':'asc';
 						this.goods_commonid = '';
-						this.gc_id_1 = '';
-						this.chosegoods_price = !this.chosegoods_price;
-					}else if(this.tabIndex ==4) {  // 分类
 						this.istopclick = 0;
-						this.goods_price = ''; 
-						this.goods_commonid = '';
-						this.chosegoods_price = true;
-						this.chosegoods_commonid = true;
+						//this.gc_id_1 = '';
+						this.chosegoods_price = !this.chosegoods_price;
+						this.getshopdetail(2);
 					}
-				this.getshopdetail();
+				
+					
+				
+			 //    this.tabIndex = e;
+				// if(this.searchvalue == '') {
+				// 	return;
+				// }
+				// this.goods_list = [];
+				// if(this.tabIndex == 1) {  // 服务
+				// 	this.istopclick = 0;
+				// 	this.gc_id_1 = '';
+				// 	this.goods_price = ''; 
+				// 	this.goods_commonid = '';
+				// }else if(this.tabIndex == 2){ //伤
+				//         this.chosegoods_price = true;
+				// 		this.istopclick = this.chosegoods_commonid?1:2;
+				// 		this.goods_price = ''; 
+				// 		this.goods_commonid = this.chosegoods_commonid?'asc':'desc';
+				// 		this.gc_id_1 = '';
+				// 		this.chosegoods_commonid = !this.chosegoods_commonid;
+				// }else if(this.tabIndex == 3){ // 价格
+				// 		this.chosegoods_commonid = true;
+				// 		this.istopclick = this.chosegoods_price?3:4;
+				// 		this.goods_price = this.chosegoods_price?'desc':'asc';
+				// 		this.goods_commonid = '';
+				// 		this.gc_id_1 = '';
+				// 		this.chosegoods_price = !this.chosegoods_price;
+				// 	}else if(this.tabIndex ==4) {  // 分类
+				// 		this.istopclick = 0;
+				// 		this.goods_price = ''; 
+				// 		this.goods_commonid = '';
+				// 		this.chosegoods_price = true;
+				// 		this.chosegoods_commonid = true;
+				// 	}
+				
 			},
 		}
 	}

pages/index/index.vue

@@ -5,8 +5,8 @@
 	 	<block  style="width: 70%;padding-left: 32upx;" slot="left">
 	 		<view class="city" v-if="!allow">
 	 			<view style="font-size: 35upx;">
-				  <image @click="refeshadress" v-if="isrefesh" src="../../static/address.png" style="width: 50rpx;height: 50rpx;vertical-align: middle;padding-right:10upx;" ></image>
-				  <image @click="refeshadress"  v-if="!isrefesh" src="../../static/home_local2.png" style="width: 50rpx;height: 50rpx;vertical-align: middle;padding-right:10upx;" ></image>
+				  <image @click="refeshadress" v-if="isrefesh" src="../../static/home_local.png" style="width: 40rpx;height: 45rpx;vertical-align: middle;padding-right:10upx;" ></image>
+				  <image @click="refeshadress"  v-if="!isrefesh" src="../../static/home_local2.png" style="width: 40rpx;height: 45rpx;vertical-align: middle;padding-right:10upx;" ></image>
 				  {{ location }}
 				</view>
 	 		</view>
@@ -42,7 +42,7 @@
 		 > 
 			<swiper-item v-for="(item,index) in backgroundlist" :key="index">
 			<view class="swiper-item"  @tap="shopDetail(item)" >
-				 <image style="height: 100%;width: 100%;" :src='pictureUrl +"/uploads/home/adv/"+item.adv_code' />
+				 <image style="height: 100%;width: 100%;border-radius: 10upx;" :src='pictureUrl +"/uploads/home/adv/"+item.adv_code' />
 		    </view>
 			</swiper-item>
 		 </swiper>
@@ -482,7 +482,7 @@
 		flex-wrap: nowrap;
 		margin: 7px 0;
 		line-height: 30px;
-		margin: 24upx auto;
+		margin: 10upx auto;
 	}
 	
 	.searchType .input-view .uni-icon {
@@ -500,17 +500,25 @@
 	}
 	.swiper {
 		height: 300upx;
+		border-radius: 10upx;
 	}
 	.swiper-item {
 		display: block;
 		height: 300upx;
 		line-height: 300upx;
 		text-align: center;
+		border-radius: 10upx;
 	}
-		
+	swiper-item {
+		border-radius: 15upx;
+	}
+	.swiper-item image {
+		border-radius: 10upx;
+	}	
 	.scrollswiper {
 		width: 90%;
 		margin: 20upx auto;
+		border-radius: 10upx;
 	}
 		
 	.tips {

pages/index/shop.vue

@@ -34,9 +34,9 @@
  			<view  class="titleLayout price-box">
 				<view>
 					<text class="price-tip">¥</text>
-					<text class="price">{{datalist.goods_price}}</text>
+					<text class="price" style="color: #D9332E;">{{datalist.goods_price}}</text>
 					<text class="m-price">¥{{datalist.goods_marketprice}}</text>
-					<text class="price-tip" v-if="datalist.goods_storage == 0">已下架</text>
+					<text class="price-tip" style="color: #D9332E;" v-if="datalist.goods_storage == 0">已下架</text>
 				</view>
 				<view>
 					<text style="color: #909399">月销售{{datalist.sale_number}}</text>
@@ -48,7 +48,7 @@
  		
  		<view class="c-list">
  			<view  style="display: flex;justify-content: space-between;" class="c-row b-b" @click="toggleSpec">
- 				<view style="font-size: 32upx;color: #909399;">规则数量选择</view>
+ 				<view style="font-size: 32upx;">规则数量选择</view>
 				<view>
 				  <uni-icon  size="20" type="arrowright"></uni-icon>
 				</view>
@@ -133,8 +133,9 @@
 							X {{shopnumber}}
 						</view>
  					</view>
-					<view @click="closeCar" style="position: absolute;right: 10%;"> 
-						<uni-icon size="20" type="close"></uni-icon>
+					<view @click="closeCar" style="position: absolute;right: 10%;font-size: 40upx;"> 
+					<!-- 	<uni-icon size="20" type="close"></uni-icon> -->
+				      x
 					</view>
  				</view>
  				<view v-for="(item,index) in datalist.spec_list" :key="index" class="attr-list">
@@ -528,7 +529,7 @@
 				this.specSelected = []; 
  				let list = this.datalist.spec_list[index].value_list;
  				this.datalist.spec_list[index].value_list.forEach(item=>{
- 					if(item.value_id === pid){
+ 					if(item.value_id === pid){ 
  						this.$set(item, 'selected', true);
  					}else {
 						this.$set(item, 'selected', false);
@@ -971,7 +972,7 @@
 				justify-content: space-around;
  				.price{
  					font-size: $font-lg;
- 					color: #fa436a;
+ 					color: #D9332E;
  					margin-bottom: 10upx;
  				}
  				.selected-text{
@@ -1007,7 +1008,7 @@
  			}
  			.selected{
  				background: #fbebee;
- 				color: #fa436a;
+ 				color: #D9332E;
  			}
 				
 			.disabled {

pages/index/sureBuy.vue

@@ -112,7 +112,7 @@
 		
 		 <van-dialog
 		   use-slot
-		   title="预订须知"
+		   title="<<预定须知>>"
 		   :show="ishow"
 		   @confirm="confirmOrder"
 		   :show-cancel-button="false"
@@ -155,8 +155,8 @@
 				  </van-card>
 			  </view>
 		  </view>
-			   <view class="topTip"  v-if="radio === 1">
-				  <view style="font-size: 28upx;">运费：{{ralodprice}}</view>
+			   <view class="topTip" style="border-top: 1px solid #eee;" v-if="radio === 1">
+				  <view style="font-size: 28upx;">运费：￥{{ralodprice}}</view>
 			   </view>
 		 </view>
 		 </scroll-view>
@@ -193,7 +193,7 @@
 				list:[
 					{title:'请送到我的房间'},
 					{title:'快递到我的地址'},
-					{title:'处理我的客房预定'}
+					{title:'处理我的客房预订'}
 				],
 				
 				shipping_type: 0,
@@ -242,7 +242,7 @@
 				if(this.store.buy_notice!='') {
 					this.ishow = true;
 				}else {
-					this.$msg("暂无预定须知哦")
+					this.$msg("暂无预订须知哦")
 				}
 				
 			},
@@ -456,7 +456,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/myCenter/goforate.vue

@@ -0,0 +1,35 @@
+<template>
+	<view style="padding: 0 32upx;">
+		<rich-text :nodes="menberinfo"></rich-text>
+	</view>
+</template>
+  <!-- :nodes="datalist.issue" -->
+<script>
+	export default {
+		onLoad() {
+			this.getuserinfo();
+		},
+		data() {
+			return {
+				menberinfo: ''
+			}
+		},
+		methods: {
+			getuserinfo() {
+				this.request({
+						url:'/v2/entry/private_protocol',
+						method:'post',
+						success: (res)=>{
+							let { data } = res.data;
+							// userinfo
+							this.menberinfo = data.protocol;
+						}
+				})
+			}
+		}
+		
+	}
+</script>
+
+<style>
+</style>

pages/myCenter/gouser.vue

@@ -0,0 +1,35 @@
+<template>
+	<view style="padding: 0 32upx;">
+		<rich-text :nodes="menberinfo"></rich-text>
+	</view>
+</template>
+  <!-- :nodes="datalist.issue" -->
+<script>
+	export default {
+		onLoad() {
+			this.getuserinfo();
+		},
+		data() {
+			return {
+				menberinfo: ''
+			}
+		},
+		methods: {
+			getuserinfo() {
+				this.request({
+						url:'/v1/entry/register_protocol',
+						method:'post',
+						success: (res)=>{
+							let { data } = res.data;
+							// userinfo
+							this.menberinfo = data.protocol;
+						}
+				})
+			}
+		}
+		
+	}
+</script>
+
+<style>
+</style>

pages/myCenter/logion.vue

@@ -1,17 +1,33 @@
 <template>
 	<view>
+		<view style="text-align: center;margin-top: 60upx;">
+			<image src="../../static/logo.png" style="width: 150upx;height: 150upx;" />
+		</view>
 		<view v-if='!hasLogin'>
-			<view style="text-align: center;margin: 100upx;font-size: 36upx;">欢迎回来</view>
+			<view style="text-align: center;margin: 50upx 0 10upx 0;font-size: 36upx;">圈在网申请获取您的以下权限</view>
+			<view style="text-align: center;margin: 0 0 50upx 0;font-size: 24upx;color: #666666;">获取您的公开信息(昵称，头像等)</view>
 			<view style="width: 50%;margin: 0 auto;">
-				<button @click="wxlogion"  type="primary" open-type='getUserInfo'>
+				<button @click="wxlogion"  type="warn" open-type='getUserInfo'>
 					授权登录
 				</button>
 			</view>
 		</view>
 		<view  v-if='hasLogin&& !successlogion'>
-			<view style="text-align: center;margin: 100upx;font-size: 36upx;">获取您手机号码权限</view>
+			<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>
+				 <button type="warn" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">使用微信手机号登录</button>
+			</view>
+		</view>
+		<view @click="closesure"   style="width: 50%;margin: 30upx auto;text-align:center;font-szie: 30upx;">
+				暂不授权
+		</view>
+		<view style="position: fixed; bottom: 30upx;width: 100%;">
+			<view style="text-align: center;padding-bottom: 20upx;">
+				请仔细阅读以下协议，若不同意相关内容，您应停止授权
+			</view>
+			<view style="text-align: center;">
+		     	<span style="color: #D9332E;padding-right: 20upx;" @click="gouser"> 《用户协议》   </span> 
+				<span style="color: #D9332E;" @click="goforate">  《隐私政策》 </span>
 			</view>
 		</view>
 	</view>
@@ -52,6 +68,22 @@
 		},
 		methods:{
 			...mapMutations(['login','showDialog', 'setOpenid', 'setcode','islogionsuccess']),
+			closesure() {
+				uni.navigateBack();
+			},
+			// 隐私政策
+			goforate() {
+				uni.navigateTo({
+					url: './goforate'
+				})
+			},
+			
+			// 用户协议
+			gouser() {
+				uni.navigateTo({
+					url: './gouser'
+				})
+			},
 			// 授权用户信息头像
 			wxlogion() {
 				let  that = this;

pages/myone/onedetail.vue

@@ -1,9 +1,9 @@
 <template>
 		<view style="padding: 20upx 32upx;">
-			<view style="font-size: 35rpx;padding-bottom: 30upx;">{{aricte.article_title}}</view>
-			<view style="color: #999;padding-bottom: 30upx;">{{aricte.article_time}}</view>
+			<view style="font-size: 35rpx;padding-bottom: 40upx;">{{aricte.article_title}}</view>
+			<view style="color: #999;padding-bottom: 40upx;">{{aricte.article_time}}</view>
 			<rich-text :nodes="nodes"></rich-text>
-			<view v-if="aricte.ad_type!=0" class="aricte" :class="isclose?'closeacrile':''">
+			<view v-if="aricte.ad_type!=0 && nodes!='' " class="aricte" :class="isclose?'closeacrile':''">
 				<view style="display: flex;justify-content: space-between;padding: 20upx 0;">
 					<view>{{aricte.ad_title}}</view>
 					<view style="color:#4399FC;" @click="close">x关闭</view>
@@ -80,7 +80,7 @@
 <style>
 	.aricte {
 		background-color: #EEEEEE;
-		padding: 0 28upx 10upx 28upx;
+		padding: 0 33upx 10upx 33upx;
 	}
 	.closeacrile {
 		display: none;