首页样式修改

components/pay-popup/pay-popup.vue

@@ -22,7 +22,7 @@
 					</view>
 				</view>
 				<view class="flex agreement">
-					<view class="txt" @click="toNotice">同意<text>《盲票购买须知》</text></view>
+					<view class="txt" @click="toRule">同意<text>《盲票购买须知》</text></view>
 					<view class="checked">
 						<u-checkbox-group>
 							<u-checkbox :value="checked" :checked="checked" shape="circle" activeColor="#E96737"
@@ -82,6 +82,12 @@
 					url: '/pages/about/notice'
 				})
 			},
+			
+			toRule(){
+				uni.navigateTo({
+					url: '/pages/about/rule'
+				})
+			},
 
 			close() {
 				this.checked = false
@@ -179,7 +185,7 @@
 			.image-wrap {
 				width: 220rpx;
 				height: 220rpx;
-				border: 1px solid rgba(236, 236, 236, 100);
+				border: 1px solid #F8F8F8;
 				border-radius: 10rpx;
 
 				image {
@@ -224,10 +230,13 @@
 		}
 
 		.coupon {
+			box-sizing: border-box;
+			height: 110rpx;
+			line-height: 110rpx;
 			justify-content: space-between;
-			padding: 30rpx 40rpx;
-			border-top: 1px solid rgba(187, 187, 187, 100);
-			border-bottom: 1px solid rgba(187, 187, 187, 100);
+			padding: 0 40rpx;
+			border-top: 1px solid #F8F8F8;
+			border-bottom: 1px solid #F8F8F8;
 
 			.txt {
 				margin: 0 24rpx;
@@ -235,9 +244,12 @@
 		}
 
 		.agreement {
+			box-sizing: border-box;
+			height: 110rpx;
+			line-height: 110rpx;
 			justify-content: space-between;
-			padding: 50rpx 40rpx;
-			border-bottom: 1px solid rgba(187, 187, 187, 100);
+			padding: 0 40rpx;
+			border-bottom: 1px solid #F8F8F8;
 
 			.txt text {
 				color: #007aff;

pages/address/index.vue

@@ -83,7 +83,7 @@
 					.then(() => {
 						uni.hideLoading();
 						// 列表排序把默认收货地址放到最前
-						app.onReorder()
+						// app.onReorder()
 					}).catch(() => {
 						uni.hideLoading();
 					})

pages/goods/detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="兑换详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
+		<u-navbar title="商品详情" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
 		<view class="detail">
 			<view class="detail-top">
 				<u-swiper :list="picUrlArr" height="348" radius="0" :indicator="true" :circular="true"></u-swiper>

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 非H5撑高元素 -->
-		<view class="status_bar"></view>
+		<!-- <view class="status_bar"></view> -->
 		<view class="box">
 			<view class="box-top">
 				<view class="box-top-action">
@@ -20,7 +20,7 @@
 				</view>
 				<view class="box-top-tip" @click="toRule">
 					<view class="flex box-top-tip-txt">
-						<u-icon name="file-text" color="#fff" size="20"></u-icon>
+						<u-icon name="file-text" color="#5F5F5F" size="20"></u-icon>
 						<text>规则说明</text>
 					</view>
 				</view>
@@ -28,13 +28,18 @@
 			<view class="box-ticket">
 				<carousel :img-list="imgList" url-key="picUrl" @selected="selectedBanner" @changeTicket="getTicket" />
 			</view>
-			<view class="box-ticket-tip">100%保底必中</view>
+			<view class="box-ticket-tip">超值保底100%中奖</view>
 			<view class="box-start flex">
 				<view class="flex box-start-action" @click="exchange">
 					<text>立即</text>
 					<text>开刮</text>
 				</view>
-				<view class="box-start-all" @click="toTicket">所有盲票</view>
+				<view class="box-start-all" @click="toTicket">
+					<view class="flex icon">
+						<image class="icon-image" src="../../static/icon/index_all.png" mode="aspectFill"></image>
+					</view>
+					<view class="title">更多盲票</view>
+				</view>
 			</view>
 		</view>
 		<custom-tab-bar :activeValue="'index'" />
@@ -179,13 +184,14 @@
 <style lang="scss" scoped>
 	.box {
 		width: 100%;
-		height: calc(100vh - 50px);
-		background-image: linear-gradient(to right, #ebbba7 0%, #cfc7f8 100%);
+		min-height: calc(100vh - 50px);
+		// background-image: linear-gradient(to right, #ebbba7 0%, #cfc7f8 100%);
+		background: url(https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/background.png) center center;
 
 		&-top {
 			display: flex;
 			justify-content: space-between;
-			padding: 80rpx 40rpx 0;
+			padding: 100rpx 40rpx 0;
 
 			&-action {
 				display: flex;
@@ -196,14 +202,14 @@
 					&-cir {
 						width: 104rpx;
 						height: 104rpx;
-						background-color: #FCB824;
+						background-color: #FE5924;
 						border-radius: 50%;
 						margin-bottom: 14rpx;
 					}
 
 					&-txt {
 						text-align: center;
-						color: #FFFFFF;
+						color: #5F5F5F;
 					}
 				}
 			}
@@ -213,7 +219,7 @@
 				flex-direction: column;
 				align-items: flex-end;
 				justify-content: flex-end;
-				color: #FFFFFF;
+				color: #5F5F5F;
 			}
 		}
 
@@ -226,38 +232,56 @@
 			margin-top: 20rpx;
 			line-height: 40rpx;
 			text-align: center;
-			font-size: 24rpx;
-			color: #F44200;
+			font-size: 40rpx;
+			color: #FE5924;
 		}
 
 		&-start {
+			align-items: flex-end;
 			position: relative;
 			margin-top: 60rpx;
 
 			&-action {
 				flex-direction: column;
-				width: 226rpx;
-				height: 226rpx;
+				width: 220rpx;
+				height: 220rpx;
+				font-size: 36rpx;
 				border-radius: 50%;
-				background-color: #EB7009;
-				box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
+				background-color: #FE5924;
+				border: 4rpx solid #FFFFFF;
 
 				text {
 					display: inline-block;
+					padding-left: 8rpx;
+					text-align: center;
 					color: #FFFFFF;
 					line-height: 50rpx;
+					letter-spacing: 8rpx;
 				}
 			}
 
 			&-all {
 				position: absolute;
-				right: 50rpx;
-				text-align: center;
-				width: 156rpx;
-				height: 156rpx;
-				line-height: 156rpx;
-				border-radius: 50%;
-				background-color: #FFFFFF;
+				right: 70rpx;
+
+				.icon{
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					background-color: #FE5924;
+					
+					.icon-image{
+						width: 80rpx;
+						height: 80rpx;
+					}
+				}
+				
+				.title{
+					margin-top: 20rpx;
+					font-size: 34rpx;
+					color: #EA350A;
+					text-align: center;
+				}
 			}
 		}
 	}

pages/lucky/index.vue

@@ -15,7 +15,7 @@
 			</view>
 			<!-- <view class="flex lucky-tip"><text>请刮开纸质票面的数字，与此幸运数字相同的就是所中奖项</text></view> -->
 			<view class="flex lucky-btn">
-				<view class="pay" @click="pay" v-if="info.status == 1">支付{{ info.facePrice / 100 }}元 立即查看</view>
+				<view class="pay" @click="pay" v-if="info.status == 1">支付{{ info.salePrice / 100 }}元 立即查看</view>
 				<view class="pay" @click="saveImg" v-else>保存至手机相册</view>
 			</view>
 		</view>

pages/order/detail.vue

@@ -100,7 +100,7 @@
 				list: [],
 			};
 		},
-		onShow(opthios) {
+		onLoad(opthios) {
 			this.orderId = opthios.id
 			this.getDetail()
 		},

pages/user/index.vue

@@ -8,7 +8,7 @@
 		<view class="account">
 			<view class="flex account-ava">
 				<image :src="avatar" mode="aspectFill" v-if="loginState"></image>
-				<image src="../../static/logo.png" mode="aspectFill" v-else></image>
+				<view class="no-ava" v-else @click="toLogin"></view>
 				<view class="account-ava-name" v-if="loginState">{{ userInfo.nickName }}</view>
 				<view class="account-ava-no" @click="toLogin" v-else>登录</view>
 			</view>
@@ -52,7 +52,7 @@
 			</u-cell-group>
 		</view>
 		<view class="cancel">
-			<u-cell icon="close-circle" title="注销登录" :isLink="true" :border="false" @click="logout"></u-cell>
+			<u-cell icon="close-circle" title="退出登录" :isLink="true" :border="false" @click="logout"></u-cell>
 		</view>
 
 		<custom-tab-bar :activeValue="'user'" />
@@ -203,6 +203,14 @@
 				border-radius: 50%;
 				overflow: hidden;
 			}
+			
+			.no-ava{
+				width: 106rpx;
+				height: 106rpx;
+				border-radius: 50%;
+				overflow: hidden;
+				background: #C0C0C0;
+			}
 
 			&-name {
 				margin-left: 20rpx;