Merge branch 'master' of http://git.9026.com/gubai/IHG

components/dialogPanel/dialogPanel.vue

@@ -8,6 +8,7 @@
 			</view>
 			<view class="btn">
 				<view class="cancel" @click="$refs.main.close()"><text>取消</text></view>
+				<view style="width: 2rpx;height: 100%;background: rgba(0,0,0,0.1);"></view>
 				<view class="download" @click="saveImg"><text>保存图片</text></view>
 			</view>
 		</view>
@@ -112,7 +113,7 @@
 	
 		.btn {
 			width: 100%;
-			height: 115rpx;
+			height: 114rpx;
 			display: flex;
 			align-items: center;
 	
@@ -121,7 +122,7 @@
 				width: 50%;
 				height: 100%;
 				border-top: #E5E5E5 solid 1rpx;
-				border-right: #E5E5E5 solid 1rpx;
+				// border-right: #E5E5E5 solid 1rpx;
 	
 				text {
 					font-size: 32rpx;

pages/goods/goods-hotel/index.vue

@@ -235,13 +235,11 @@
 				margin-top: 12rpx;
 
 				.content-item-main-text {
-					font-weight: 500;
 					color: #333333;
 					font-size: 30rpx;
 				}
 
 				.content-item-main-call {
-					font-weight: 500;
 					color: #666666;
 					font-size: 26rpx;
 					display: flex;

pages/goods/goods.vue

@@ -292,7 +292,7 @@
 
 	.content {
 		background-color: #FFF;
-		padding: 20rpx 30rpx;
+		padding: 10rpx 30rpx 0rpx;
 
 		.home-hotel-img-content {
 			display: flex;

pages/index/active-detail/index.vue

@@ -73,8 +73,8 @@
 			<view class="tab_area" v-if="isActive==0">
 				<view class="areaTitle" v-for="(item,index) in areaList" :key="index"
 					@click="checkedArea(index,item.id)">
-					<view class="areaTitle-item">
-						<view :class="{'active-area':isActiveArea === index}">
+					<view class="areaTitle-item" :class="{'active-area':isActiveArea === index}">
+						<view>
 							{{item.name}}
 						</view>
 					</view>
@@ -263,6 +263,9 @@
 			this.getList(o.id)
 			this.getActiveDetail(o.id)
 			this.getCategoryList(o.id)
+			uni.$on('refreshVoteNum',()=>{
+				this.getList(o.id)
+			})
 		},
 		onUnload(){
 			clearInterval(this.timer)
@@ -462,7 +465,7 @@
 	}
 
 	.rank-search {
-		margin-top: 80rpx;
+		margin-top: 66rpx;
 
 		::v-deep .u-input {
 			width: 690rpx !important;
@@ -573,7 +576,7 @@
 	}
 
 	.area_nav .areaTitle {
-		width: 140rpx;
+		// width: 140rpx;
 		height: 52rpx;
 		background-color: #F1F1F1;
 		border-radius: 26rpx;
@@ -581,11 +584,12 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		padding: 0 46rpx;
 
 	}
 
 	.areaTitle-item {
-		width: 140rpx;
+		// width: 140rpx;
 		height: 52rpx;
 		background-color: #F1F1F1;
 		border-radius: 26rpx;
@@ -595,18 +599,19 @@
 		justify-content: center;
 		align-items: center;
 		margin-right: 16rpx;
-
+		padding: 0 46rpx;
 	}
 
 	.active-area {
-		width: 100%;
+		// width: 100%;
 		height: 52rpx;
-		border-radius: 26rpx;
+		// border-radius: 26rpx;
 		background-color: #FF6200;
 		color: #fff;
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		// padding: 0 46rpx;
 	}
 
 
@@ -654,6 +659,7 @@
 				position: absolute;
 				bottom: -20rpx;
 				left: 25rpx;
+				
 			}
 		}
 	}
@@ -671,7 +677,7 @@
 			background: #FFFFFF;
 			box-shadow: 0px 20rpx 40rpx 0px rgba(220, 222, 229, 0.4);
 			border-radius: 16rpx;
-			padding: 40rpx 26rpx 0;
+			padding: 40rpx 30rpx 0;
 
 			.vote-detail-top {
 				display: flex;
@@ -932,7 +938,7 @@
 		.vote-detail-top-main-text{
 			position: relative;
 			top: 0;
-			left: 40rpx;
+			left: 38rpx;
 		}
 		
 		&::before,&::after{
@@ -943,6 +949,8 @@
 		}
 		
 		>view{
+			position: relative;
+			left: -8rpx;
 			width: 256px;
 			font-size: 30rpx;
 			display: flex;
@@ -960,7 +968,6 @@
 				border-radius: 3px;
 				background-color: #000;
 				color: #fff;
-				
 				&::before{
 					content: ":";
 					width: 0px;
@@ -972,7 +979,11 @@
 				&:first-child::before{
 					content: "";
 				}
+				&:nth-child(1){
+					margin-left: 15px;
+				}
 			}
+			
 		}
 		
 		

pages/index/index.scss

@@ -109,8 +109,8 @@
 	}
 
 	.home-special-area {
-		height: 146rpx;
-		padding: 0 30rpx;
+
+		padding: 72rpx 30rpx 38rpx;
 		// background-color: deeppink;
 		display: flex;
 		align-items: center;
@@ -248,11 +248,11 @@
 
 	.home-attach {
 		background-color: #f9f9f9;
-		padding: 25rpx 30rpx 5rpx;
+		padding: 20rpx 30rpx 0rpx;
 	}
 
 	.home-hotel {
-		height: 120rpx;
+		// height: 120rpx;
 		background-color: #f9f9f9;
 	}
 

pages/index/index.vue

@@ -111,7 +111,7 @@
 			<image style="width: 690rpx;height: 156rpx;border-radius: 79rpx;" :src="advInsetImg.img" mode=""></image>
 		</view>
 		<!-- 酒店推荐 -->
-		<view class="home-hotel home-special-area">
+		<view class="home-hotel home-special-area" style="padding-top: 50rpx;">
 			<view class="home-special-area-left">
 				<text>西区优品</text>
 				<view class="text-shadow"></view>

pages/index/vote-detail/index.vue

@@ -256,7 +256,12 @@
 				return;
 			}
 			this.videoContext = uni.createVideoContext('myVideo')
-		},
+		},
+		
+		onUnload() {
+			uni.$emit('refreshVoteNum');
+		},
+		
 		onLoad(op) {
 			this.activity_project_id = op.id
 			this.getDetail(op.id)

pages/msg/msg.vue

@@ -301,10 +301,10 @@
 
 	// 消息列表
 	.msgListBox {
-		padding: 48rpx 30rpx;
+		padding: 48rpx 30rpx 0;
 		padding-top: 0;
 		margin-top: 24rpx;
-		background: #f9f9f9;
+		background: #fff;
 		box-shadow: 0rpx 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
 		.childBox {
@@ -346,10 +346,8 @@
 
 	::v-deep .uni-swipe_text--center {
 		padding-bottom: 40rpx;
-		border-bottom: 2rpx solid rgba(240, 240, 240, 0.7);
-		&:last-child {
-			padding-bottom: 0;
-			border-bottom: none;
-		}		
+		border-bottom: 2rpx solid rgba(240, 240, 240, 0.7);	
 	}
+
+	
 </style>

pages/my/integral/integralOrder.vue

@@ -81,7 +81,7 @@
 				<text>积分</text>
 				<text>{{integral}}积分</text>
 			</view>
-			<view style="width: 694rpx;height: 4rpx;border: 2rpx dashed #F2F2F2;margin-top: 38rpx;"></view>
+			<view style="width: 694rpx;height: 2rpx;border: 2rpx dashed #F2F2F2;margin-top: 38rpx;"></view>
 			<view class="shopNumber" style="margin-top: 38rpx;">
 				<text>合计</text>
 				<text>{{integral}}积分</text>

pages/my/integral/integralRecord.vue

@@ -233,6 +233,7 @@
 			justify-content: space-between;
 			align-items: center;
 			font-family: PingFang-SC-Heavy, PingFang-SC;
+			margin-top: 14rpx;
 		}
 		.tab_nav .navTitle {
 			@include flexlayout()
@@ -256,7 +257,7 @@
 				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
 				border-radius: 6px;
 				position: absolute;
-				bottom: -26rpx;
+				bottom: -24rpx;
 				left: 40rpx;
 			}
 		}
@@ -264,7 +265,6 @@
 	::v-deep .segmented-control__text {
 		font-size: 32rpx !important;
 		font-family: PingFang-SC-Heavy, PingFang-SC;
-		font-weight: 500 !important;
 		color: #666666 !important;
 	}
 	
@@ -312,7 +312,6 @@
 				text {
 					font-size: 26rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
 					color: #999999;
 				}
 			}
@@ -320,7 +319,6 @@
 				text {
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
 					color: #333333;
 				}
 			}
@@ -349,7 +347,6 @@
 				text {
 					font-size: 26rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
 					color: #999999;
 				}
 			}
@@ -357,7 +354,6 @@
 				text {
 					font-size: 28rpx;
 					font-family: PingFang-SC-Medium, PingFang-SC;
-					font-weight: 500;
 					color: #333333;
 				}
 			}

pages/my/my.vue

@@ -650,7 +650,7 @@
 			z-index: 99;
 
 			.nav {
-				height: 50rpx;
+				// height: 50rpx;
 				width: 633rpx;
 				display: flex;
 				align-items: center;

pages/my/myorders/orders.vue

@@ -106,6 +106,7 @@
 				</view>
 				<view class="btn">
 					<view class="cancel" @click="closeVFcode"><text>取消</text></view>
+					<view style="width: 2rpx;height: 100%;background: rgba(0,0,0,0.1);"></view>
 					<view class="download" @click="handleDownImg"><text>保存图片</text></view>
 				</view>
 			</view>
@@ -643,7 +644,7 @@
 		.btn {
 			margin-top: 40rpx;
 			width: 100%;
-			height: 110rpx;
+			height: 112rpx;
 			display: flex;
 			align-items: center;
 
@@ -652,8 +653,6 @@
 				width: 50%;
 				height: 100%;
 				border-top: #E5E5E5 solid 1rpx;
-				border-right: #E5E5E5 solid 1rpx;
-
 				text {
 					font-size: 32rpx;
 					font-family: PingFangSC-Medium, PingFang SC;

pages/my/prize/exchangePrize.vue

@@ -73,7 +73,7 @@
 				<text>件数</text>
 				<text>1件</text>
 			</view>
-			<view style="width: 694rpx;height: 4rpx;border: 2rpx dashed #F2F2F2;margin-top: 38rpx;"></view>
+			<view style="width: 694rpx;height: 2rpx;border: 2rpx dashed #F2F2F2;margin-top: 38rpx;"></view>
 			<view class="shopRemark">
 				<view class="shopRemark-title">
 					<text>奖品说明</text>

pages/my/prize/prize.vue

@@ -34,7 +34,7 @@
 		</view>
 
 
-		<view style="padding-bottom: 60rpx;margin-top: 24rpx; background-color: #fff; ">
+		<view style="margin-top: 24rpx; background-color: #f9f9f9; ">
 			<!-- 实物奖品 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}"
 				v-if="isActive == 0  && PhysicalPrizes.length > 0  ">

setting.js

@@ -3,8 +3,8 @@
  */
 const IS_DEV = process.env.NODE_ENV === 'development'
 
-// const URL = 'https://t9.9026.com'
-const URL = 'https://ihg.9026.com'
+const URL = 'https://t9.9026.com'
+// const URL = 'https://ihg.9026.com'
 
 	
 module.exports = {