项目日志:12.28 我的页面订单数字渲染

components/dialogPanel/dialogPanel.vue

@@ -112,7 +112,7 @@
 	
 		.btn {
 			width: 100%;
-			height: 110rpx;
+			height: 115rpx;
 			display: flex;
 			align-items: center;
 	

components/my-nav/my-nav.vue

@@ -9,7 +9,7 @@
 			<view class="nav-main flex align-center justify-center" :style="{height: navBarHeight+'px'}">
 				<view class="nav-main-back" @click="search" v-if="backIcon">
 					<!-- <uni-icons type="search" size="26" color="#000"></uni-icons> -->
-					<image style="width: 32rpx;height: 32rpx;" src="/static/icon/search02.png" mode=""></image>
+					<image style="width: 42rpx;height: 34rpx;" src="https://t9.9026.com/imgs/homeSearch.png" mode=""></image>
 				</view>
 				<text class="nav-main-title">{{title}}</text>
 			</view>
@@ -106,7 +106,7 @@
 		// background:#f00;
 		.nav-main-back {
 			position: absolute;
-			left: 10rpx;
+			left: 30rpx;
 		}
 
 		.nav-main-title {

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotel_uni",
-    "appid" : "__UNI__9140D70",
+    "appid" : "__UNI__807A871",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages.json

@@ -1,7 +1,7 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-
+	
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -122,8 +122,9 @@
 				"navigationBarTitleText": "登录账号",
 				"enablePullDownRefresh": false
 			}
-
+		
 		},
+
 		{
 			"path": "pages/login/youyue",
 			"style": {
@@ -245,7 +246,7 @@
 			}
 
 		},
-		
+
 		{
 			"path": "pages/my/prize/exchangeDetail",
 			"style": {
@@ -253,9 +254,9 @@
 				"navigationStyle": "custom", //隐藏系统导航栏
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
-		
+
 		{
 			"path": "pages/my/prize/prize",
 			"style": {

pages/goods/goods-detail/index.scss

@@ -46,42 +46,42 @@ $pageColor:#F9F9F9;
 				height: 390rpx;
 			}
 		}
-
-		.btn {
-			margin-top: 40rpx;
-			width: 100%;
-			height: 115rpx;
-			display: flex;
-			align-items: center;
-
-			.cancel {
-				@include flexlayout();
-				width: 50%;
-				height: 100%;
-				border-top: #E5E5E5 solid 1rpx;
-				border-right: #E5E5E5 solid 1rpx;
-
-				text {
-					font-size: 32rpx;
-					font-family: PingFangSC-Medium, PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
+	}
+	
+	.btn {
+		margin-top: 40rpx;
+		width: 100%;
+		height: 115rpx !important;
+		display: flex;
+		align-items: center;
+	
+		.cancel {
+			@include flexlayout();
+			width: 50%;
+			height: 100%;
+			border-top: #E5E5E5 solid 1rpx;
+			border-right: #E5E5E5 solid 1rpx;
+	
+			text {
+				font-size: 32rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #666666;
 			}
-
-			.download {
-				border-top: #E5E5E5 solid 1rpx;
-				// border-left:#E5E5E5 solid 0.3rpx;
-				@include flexlayout();
-				height: 100%;
-				width: 50%;
-
-				text {
-					font-size: 32rpx;
-					font-family: PingFangSC-Medium, PingFang SC;
-					font-weight: 500;
-					color: #FF7119;
-				}
+		}
+	
+		.download {
+			border-top: #E5E5E5 solid 1rpx;
+			// border-left:#E5E5E5 solid 0.3rpx;
+			@include flexlayout();
+			height: 100%;
+			width: 50%;
+	
+			text {
+				font-size: 32rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #FF7119;
 			}
 		}
 	}

pages/goods/goods-detail/index.vue

@@ -146,7 +146,7 @@
 			</view>
 		</uni-popup>
 		<!-- 二维码购买 -->
-		<uni-popup ref="codePurchase" type="center">
+		<!-- <uni-popup ref="codePurchase" type="center">
 			<view class="code-purchase">
 				<view class="title"><text>识别下方二维码即可购买</text></view>
 				<view style="margin-left:30rpx;width: 580rpx;height: 2rpx;background: #F0F0F0;"></view>
@@ -158,7 +158,7 @@
 					<view class="download" @click="dialogConfirm"><text>保存图片</text></view>
 				</view>
 			</view>
-		</uni-popup>
+		</uni-popup> -->
 		<!-- 弹出层/核销码 -->
 		<dialogPanel ref="dialogPanel"/>
 	</view>
@@ -524,23 +524,24 @@
 			},
 			//积分兑换
 			goProductChange(id, flavorIsActive) {
-				const resArr = [];
-				outer: for (const k in this.flavorIsActive) {
-					inner: for (const i in this.attr_groups) {
-						if (this.attr_groups[i].attr_group_name == k) {
-							laster: for (const l in this.attr_groups[i].attr_list) {
-								if (this.attr_groups[i].attr_list[l].attr_name == this.flavorIsActive[k]) {
-									resArr.push(this.attr_groups[i].attr_list[l].attr_id);
-									break inner;
-								}
-							}
-						}
-					}
-				}
-				const selectedIds = resArr.join(':');
-				uni.navigateTo({
-					url: `/pages/my/integral/integralOrder?product_id=${this.productDetail.id}&attr=${selectedIds}&integral=${this.productDetail.integral}&attrName=${this.showAttr}`
-				})
+				this.Recipientopen()
+				// const resArr = [];
+				// outer: for (const k in this.flavorIsActive) {
+				// 	inner: for (const i in this.attr_groups) {
+				// 		if (this.attr_groups[i].attr_group_name == k) {
+				// 			laster: for (const l in this.attr_groups[i].attr_list) {
+				// 				if (this.attr_groups[i].attr_list[l].attr_name == this.flavorIsActive[k]) {
+				// 					resArr.push(this.attr_groups[i].attr_list[l].attr_id);
+				// 					break inner;
+				// 				}
+				// 			}
+				// 		}
+				// 	}
+				// }
+				// const selectedIds = resArr.join(':');
+				// uni.navigateTo({
+				// 	url: `/pages/my/integral/integralOrder?product_id=${this.productDetail.id}&attr=${selectedIds}&integral=${this.productDetail.integral}&attrName=${this.showAttr}`
+				// })
 
 			},
 			// 跳转积分兑换

pages/goods/goods-hotel/index.vue

@@ -2,7 +2,7 @@
 	<view class="goods-hotel">
 
 		<view class="search">
-			<u-input placeholder="搜索" border='none' v-model="search" @input="searchText">
+			<u-input placeholderStyle='color:#999' placeholder="搜索" border='none' v-model="search" @input="searchText">
 				<template slot="suffix" style='margin-right:40rpx;'>
 					<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 						height="32rpx"></u-image>
@@ -19,12 +19,12 @@
 					<view class="content-item-main-call" style="margin: 20rpx 0 12rpx;">
 						<image style="width: 26rpx;height: 26rpx; margin-right: 8rpx;" src="/static/icon/phone02.png"
 							mode=""></image>
-						<text>{{item.phone?item.phone:""}}</text>
+						<text style="font-size: 26rpx; color: #666; ">{{item.phone?item.phone:""}}</text>
 					</view>
 					<view class="content-item-main-call">
-						<image style="width: 24rpx;height: 28rpx; margin-right: 8rpx; " src="/static/icon/address01.png"
+						<image style="width: 24rpx;height: 28rpx; margin-right: 10rpx; " src="/static/icon/address01.png"
 							mode=""></image>
-						<text>{{item.distanceToMe?item.distanceToMe+"km":""}}</text>
+						<text style="font-size: 26rpx; color: #999; ">{{item.distanceToMe?item.distanceToMe+"km":""}}</text>
 					</view>
 				</view>
 				<view class="content-item-right">

pages/goods/goods.vue

@@ -11,7 +11,7 @@
 			<!-- 内容 -->
 			<view class="main">
 				<view class="search">
-					<u-input id="search-input" placeholder="搜索" border='none'  v-model="search" @input="searchText">
+					<u-input placeholderStyle='color:#999' id="search-input" placeholder="搜索" border='none'  v-model="search" @input="searchText">
 						<template slot="suffix" style='margin-right:40rpx;'>
 							<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 								height="32rpx"></u-image>
@@ -353,7 +353,7 @@
 			background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
 			border-radius: 6px;
 			position: absolute;
-			bottom: -32rpx;
+			bottom: -26rpx;
 			left: 51rpx;
 		}
 	}

pages/index/active-detail/index.vue

@@ -61,7 +61,7 @@
 				</view>
 			</view>
 			<view class="rank-search" v-if="isActive==0">
-				<u-input placeholder="输入IHG酒店名称或编号" border='none' v-model="search" @input='searchText'>
+				<u-input placeholderStyle='color:#999' placeholder="输入IHG酒店名称或编号" border='none' v-model="search" @input='searchText'>
 					<template slot="suffix" style='margin-right:40rpx;'>
 						<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 							height="32rpx"></u-image>
@@ -652,7 +652,7 @@
 				background: linear-gradient(180deg, rgba(249, 231, 219, 0) 0%, #F3C063 100%);
 				border-radius: 12rpx;
 				position: absolute;
-				bottom: -22rpx;
+				bottom: -20rpx;
 				left: 25rpx;
 			}
 		}

pages/index/active-list/index.vue

@@ -4,7 +4,7 @@
 		<view class="active-list-search">
 			<!-- 搜索框 -->
 			<view class="search">
-				<u-input placeholder="输入活动名称或参赛项目" border='none' v-model="search" @input="searchText">
+				<u-input placeholderStyle='color:#999' placeholder="输入活动名称或参赛项目" border='none' v-model="search" @input="searchText">
 					<template slot="suffix" style='margin-right:40rpx;'>
 						<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 							height="32rpx"></u-image>
@@ -278,7 +278,7 @@
 				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
 				border-radius: 6px;
 				position: absolute;
-				bottom:-40rpx;
+				bottom:-36rpx;
 				left:40rpx;
 			}
 		}

pages/index/index.scss

@@ -90,9 +90,9 @@
 
 	.home-nav {
 		position: relative;
-		top: -18rpx;
+		top: -10rpx;
 		padding-top: 60rpx;
-		border-radius: 24rpx 24rpx 0px 0px;
+		border-radius: 20rpx 20rpx 0px 0px;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
@@ -258,7 +258,7 @@
 
 	.home-hotel-img {
 		background-color: #F9f9f9;
-		padding: 20rpx 30rpx;
+		padding: 10rpx 30rpx 20rpx;
 
 		.home-hotel-img-content {
 			display: flex;

pages/index/index.vue

@@ -71,7 +71,8 @@
 		</view>
 
 		<!-- 广告图 -->
-		<view class="home-banner" v-if="!isShowAdver">
+		<view class="home-banner" v-if="!isShowAdver && in_page ==1">
+			
 			<view class="home-banner-img" v-if="in_page==1 && type == 1 ">
 				<image style="width: 100%; height: 576rpx; border-radius: 12rpx;" :src="advData.img" mode="" @click="$utils.jump({
 					jump_type: advData.jump_type,
@@ -97,13 +98,13 @@
 		<movable-area class="movableArea">
 			<movable-view class="movableView" direction="all" x="630rpx" y="700rpx">
 				<view class="img-IHg" @click="goJoin()">
-					<image style="width: 64rpx; height: 58rpx; " src="/static/icon/vip.png" mode=""></image>
+					<image style="width: 64rpx; height: 58rpx;border-radius: 50%;" :src="indexVipImg" mode=""></image>
 				</view>
 			</movable-view>
 		</movable-area>
 
 		<!-- 广告的附图 -->
-		<view class="home-attach" @click="$utils.jump({
+		<view v-if="advertisInsetImg" class="home-attach" @click="$utils.jump({
 				jump_type: advInsetImg.jump_type,
 				jump_config: advInsetImg.jump_config
 			})">
@@ -197,6 +198,8 @@
 		},
 		data() {
 			return {
+				//vip图标
+				indexVipImg:'',
 				//加入会员跳转
 				adviseVip: '',
 				jump_type_vip: '',
@@ -374,22 +377,29 @@
 						return item.in_page == 1
 					})
 					this.advData = this.advertis[0];
-					if (this.advertis[0].type == 1) {
-						this.in_page = 1
-						this.type = 1
-						this.advertisImg = this.advertis[0].img
-					} else if (this.advertis[0].type == 2) {
-						this.in_page = 1
-						this.type = 2
-						this.videoCoverImg = this.advertis[0].video_cover
-						this.videoSrc = this.advertis[0].video
+					if(this.advData){
+						if (this.advertis[0].type == 1) {
+							this.in_page = 1
+							this.type = 1
+							this.advertisImg = this.advertis[0].img
+						} else if (this.advertis[0].type == 2) {
+							this.in_page = 1
+							this.type = 2
+							this.videoCoverImg = this.advertis[0].video_cover
+							this.videoSrc = this.advertis[0].video
+						}
 					}
+					
 					//胶囊图
 					this.advertisInset = this.$store.getters.allset.advertises.filter(item => {
 						return item.in_page == 2
 					})
-					this.advInsetImg = this.advertisInset[0]
-					this.advertisInsetImg = this.advertisInset[0].img
+					
+					if(this.advertisInset[0]){
+						this.advInsetImg = this.advertisInset[0]
+						this.advertisInsetImg = this.advertisInset[0].img
+					}
+			
 					//广告弹框图
 					this.popupData = this.$store.getters.allset.popup_ads[0]
 					//弹窗是否展示
@@ -401,6 +411,8 @@
 					this.open()
 					//加入vip跳转
 					this.adviseVip = this.$store.getters.allset.add_member
+					//vip图标
+					this.indexVipImg = this.adviseVip.value.index_page
 					this.jump_type_vip = this.adviseVip.value.index_jump_type
 					if (this.jump_type_vip == 1) {
 						this.jump_config_vip = this.adviseVip.value.index_h5_url

pages/index/vote-detail/index.vue

@@ -363,9 +363,9 @@
 						this.video_url = res.data.video_url
 						//视频自动播放
 						this.openVideoPlay()
-						//海报图片
-						this.posterData.mainImg = res.data.share_img
-						this.codeImg = res.data.qrcode_url
+						// //海报图片
+						// this.posterData.mainImg = res.data.share_img
+						// this.codeImg = res.data.qrcode_url
 
 					}
 				})
@@ -868,7 +868,7 @@
 			image {
 				width: 100%;
 				height: 100%;
-				border-radius: 12rpx;
+				border-radius: 10rpx;
 			}
 		}
 
@@ -889,7 +889,8 @@
 
 		.btn {
 			width: 100%;
-			height: 110rpx;
+			height: 110rpx;
+			padding: 0;
 			display: flex;
 			align-items: center;
 

pages/index/vote-detail/poster.vue

@@ -68,7 +68,8 @@
 								css: {
 									width: "170rpx",
 									height: "80rpx",
-									left: "50rpx",
+									// left: "50rpx",
+									left: "100rpx",
 									top: '70rpx',
 									fontSize: '26rpx',
 									lineHeight: '80rpx',
@@ -82,13 +83,14 @@
 								css: {
 									width: "330rpx",
 									height: "80rpx",
-									left: "220rpx",
+									// left: "220rpx",
+									left: "280rpx",
 									display: "flex",
 									justifyContent: 'center',
 									top: '70rpx',
 									fontSize: '26rpx',
 									lineHeight: '80rpx',
-									color:'#EEA470',
+									color:'#FF6200',
 									textAlign: 'left',
 								}
 							},
@@ -125,7 +127,7 @@
 									top: '150rpx',
 									width: '540rpx',
 									height: '540rpx',
-									borderRadius: '20rpx'
+									borderRadius: '10rpx'
 								}
 							}
 						]

pages/login/login.vue

@@ -16,12 +16,12 @@
 			</view>
 			<view class="item" @click="getmsg">
 				<image src="/static/icon/wechart.png" mode="scaleToFill"></image>
-				<text v-if="!isLoginOff">微信登录</text>
-				<text v-if="isLoginOff">授权登录</text>
+				<text>微信登录</text>
+				<!-- <text v-if="isLoginOff">授权登录</text> -->
 			</view>
 		</view>
 
-		<u-modal @close="closeMask" closeOnClickOverlay="true" :show="modal.show" :title="modal.title"
+		<!-- <u-modal @close="closeMask" closeOnClickOverlay="true" :show="modal.show" :title="modal.title"
 			:show-confirm-button="false">
 			<view>
 				<button class="avatar" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar">
@@ -32,8 +32,35 @@
 					@change="handleChangeNickname">
 				<button class="confirm" @click="handleConfirmWechatUserInfo">提交</button>
 			</view>
-		</u-modal>
+		</u-modal> -->
+		<u-popup :show="modal.show" :round="10" mode="bottom" @close="close">
+			<view class="popup-login">
+				<view class="popup-login-top">
+					<image style="width: 56rpx; height: 56rpx; margin-right: 20rpx; "
+						src="https://t9.9026.com/imgs/loginLogo1.png" mode=""></image>
+					<text>登录后体验更多功能</text>
+				</view>
+				<view class="popup-login-main">
+					<button class="avatar" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar">
+						<image class="user-avatar" style="height: 176rpx;width: 176rpx;border-radius: 50%;"
+							:src="modal.avatar?modal.avatar:'https://t9.9026.com/imgs/loginAvatar.png'" />
+					</button>
+				</view>
 
+				<view class="popup-login-ipt">
+					<input class="avatar" type="nickname" :value="modal.nickname" placeholder="输入昵称"
+						@change="handleChangeNickname">
+				</view>
+
+				<view class="popup-login-btn" @click="handleConfirmWechatUserInfo">
+					<button class="confirm">完成</button>
+				</view>
+
+				<view class="popup-login-text">
+					<view>登录即代表已阅读并同意<text style="color: #FF6200;">服务协议、隐私协议</text></view>
+				</view>
+			</view>
+		</u-popup>
 
 	</view>
 </template>
@@ -42,7 +69,7 @@
 	export default {
 		data() {
 			return {
-				imgBase64:'',
+				imgBase64: '',
 				isLoginOff: false,
 				modal: {
 					show: false,
@@ -60,30 +87,33 @@
 			this.isLoginOff = this.$store.getters.userInfo
 		},
 		methods: {
-			
+
 			getPageUrl() {
 				const pages = getCurrentPages();
-				console.log(pages,'--------->pages')
-				if(pages.length==1){
+				console.log(pages, '--------->pages')
+				if (pages.length == 1) {
 					const currentPage = pages[0];
 					let pageUrl = `${currentPage.$page.fullPath}`;
 					console.log('当前页面url1：', pageUrl);
 					return pageUrl
-					
-				}else{
+
+				} else {
 					const currentPage = pages[pages.length - 2];
 					let pageUrl = `${currentPage.$page.fullPath}`;
 					console.log('当前页面url2：', pageUrl);
 					return pageUrl
-					
+
 				}
 			},
-			
-			
+
+
 			//关闭遮罩层
 			closeMask() {
 				this.modal.show = false
 			},
+			close() {
+				this.modal.show = false
+			},
 			//提交
 			handleConfirmWechatUserInfo() {
 				if (!this.modal.avatar) {
@@ -102,14 +132,14 @@
 					this.$hideLoading()
 					this.$store.dispatch('user/info', res.data)
 					this.modal.show = false
-					
+
 					//获取登录页前地址
 					let pages = this.getPageUrl()
-					if(pages){
+					if (pages != '/pages/login/login') {
 						uni.reLaunch({
-							url:pages
+							url: pages,
 						})
-					}else{
+					} else {
 						uni.switchTab({
 							url: '/pages/my/my'
 						})
@@ -120,31 +150,37 @@
 				this.modal.show = true
 			},
 			// 获取头像
-			handleChooseAvatar({detail}) {
+			handleChooseAvatar({
+				detail
+			}) {
 				let _this = this
 				// this.modal.avatar = detail.avatarUrl
 				uni.getFileSystemManager().readFile({
-				  filePath:detail.avatarUrl, // 选择图片返回的相对路径
-				  encoding: 'base64', // 编码格式
-				  success: res => { // 成功的回调
-				    uni.uploadFile({
-				      url: _this.$setting.BASE_URL + '/v1/user/uploadFile',
-				      // filePath: 'data:image/png;base64,' + res.data,
-				      filePath: detail.avatarUrl,
-				      name: 'file',
-				      success({ data }) {
-				        const res = JSON.parse(data)
-				        const { url } = res.data
-				        _this.modal.avatar = url
-				        console.log('-->data', _this.modal.avatar)
-				      }
-				    })
-				    // this.modal.avatar = detail.avatarUrl
-				    // console.log('data:image/png;base64,' + res.data)
-				  }
+					filePath: detail.avatarUrl, // 选择图片返回的相对路径
+					encoding: 'base64', // 编码格式
+					success: res => { // 成功的回调
+						uni.uploadFile({
+							url: _this.$setting.BASE_URL + '/v1/user/uploadFile',
+							// filePath: 'data:image/png;base64,' + res.data,
+							filePath: detail.avatarUrl,
+							name: 'file',
+							success({
+								data
+							}) {
+								const res = JSON.parse(data)
+								const {
+									url
+								} = res.data
+								_this.modal.avatar = url
+								console.log('-->data', _this.modal.avatar)
+							}
+						})
+						// this.modal.avatar = detail.avatarUrl
+						// console.log('data:image/png;base64,' + res.data)
+					}
 				})
-				
-				
+
+
 			},
 			//获取昵称
 			handleChangeNickname(res) {
@@ -169,41 +205,34 @@
 			},
 			//获取微信登录的code码
 			getmsg() {
-				if (this.isLoginOff) {
-					uni.switchTab({
-						url: '/pages/my/my'
-					})
-				} else {
-					uni.login({
-						provider: uni.$u.platform,
-						success: res => {
-							this.getCode().then((data) => {
-								const params = {
-									code: res.code,
-									iv: data.iv,
-									encryptData: data.encryptData
+				uni.login({
+					provider: uni.$u.platform,
+					success: res => {
+						this.getCode().then((data) => {
+							const params = {
+								code: res.code,
+								iv: data.iv,
+								encryptData: data.encryptData
+							}
+							console.log(params);
+							this.$api.my.myLogin(params).then(res => {
+								if (res.code == 0) {
+									let {
+										token
+									} = res.data
+									this.handleGetWechatUserInfo()
+									// this.handleConfirmWechatUserInfo()
+									this.$store.dispatch('user/token', token)
+								} else {
+									uni.showToast({
+										icon: 'none',
+										title: res.msg
+									})
 								}
-								console.log(params);
-								this.$api.my.myLogin(params).then(res => {
-									if(res.code == 0){
-										let {
-											token
-										} = res.data
-										this.$store.dispatch('user/token', token)
-										this.handleGetWechatUserInfo()
-										this.handleConfirmWechatUserInfo()
-									}else{
-										uni.showToast({
-											icon:'none',
-											title:res.msg
-										})
-									}
-								})
 							})
-						}
-					})
-				}
-
+						})
+					}
+				})
 			},
 
 		}
@@ -220,16 +249,7 @@
 		box-sizing: border-box;
 	}
 
-	.avatar {
-		width: 176rpx;
-		height: 176rpx;
-		border-radius: 50%;
-	}
 
-	.user-avatar {
-		object-fit: cover;
-		object-position: center;
-	}
 
 	.userinfo {
 		position: absolute;
@@ -332,4 +352,102 @@
 			}
 		}
 	}
+
+	//登录弹框
+	.popup-login {
+		width: 100%;
+		height: 706rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx -10rpx 32rpx 0px rgba(0, 0, 0, 0.04);
+		border-radius: 16rpx 16rpx 0px 0px;
+		padding: 40rpx 64rpx 92rpx;
+
+		.popup-login-top {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.popup-login-main {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 62rpx;
+
+			.avatar {
+				width: 176rpx;
+				height: 176rpx;
+				border-radius: 50%;
+				border: 0;
+				background: transparent;
+
+				&::after {
+					border: none;
+				}
+
+				.user-avatar {
+					object-fit: cover;
+					object-position: center;
+				}
+			}
+		}
+
+		.popup-login-ipt {
+			width: 100%;
+			height: 88rpx;
+			background: #F6F6F6;
+			border-radius: 44rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 48rpx;
+
+			.avatar {
+				width: 100%;
+				height: 100%;
+				text-align: center;
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #999999;
+			}
+
+		}
+
+		.popup-login-btn {
+			width: 100%;
+			height: 88rpx;
+			background: #1AAC1B;
+			border-radius: 38rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 32rpx;
+
+			.confirm {
+				border: 0;
+				background: transparent;
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+
+				&::after {
+					border: none;
+				}
+			}
+		}
+
+		.popup-login-text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 32rpx;
+			font-weight: bold;
+			color: #999999;
+			font-size: 22rpx;
+		}
+	}
 </style>

pages/login/youyue.vue

@@ -51,7 +51,7 @@
 				<text>微信登录</text>
 			</view>
 		</view>
-		<u-modal @close="closeMask" closeOnClickOverlay="true" :show="modal.show" :title="modal.title"
+		<!-- <u-modal @close="closeMask" closeOnClickOverlay="true" :show="modal.show" :title="modal.title"
 			:show-confirm-button="false">
 			<view>
 				<button class="avatar" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar">
@@ -62,7 +62,35 @@
 					@change="handleChangeNickname">
 				<button class="confirm" @click="handleConfirmWechatUserInfo">提交</button>
 			</view>
-		</u-modal>
+		</u-modal> -->
+		<u-popup :show="modal.show" :round="10" mode="bottom" @close="close">
+			<view class="popup-login">
+				<view class="popup-login-top">
+					<image style="width: 56rpx; height: 56rpx; margin-right: 20rpx; "
+						src="https://t9.9026.com/imgs/loginLogo1.png" mode=""></image>
+					<text>登录后体验更多功能</text>
+				</view>
+				<view class="popup-login-main">
+					<button class="avatar" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar">
+						<image class="user-avatar" style="height: 176rpx;width: 176rpx;border-radius: 50%;"
+							:src="modal.avatar?modal.avatar:'https://t9.9026.com/imgs/loginAvatar.png'" />
+					</button>
+				</view>
+		
+				<view class="popup-login-ipt">
+					<input class="avatar" type="nickname" :value="modal.nickname" placeholder="输入昵称"
+						@change="handleChangeNickname">
+				</view>
+		
+				<view class="popup-login-btn" @click="handleConfirmWechatUserInfo">
+					<button class="confirm">完成</button>
+				</view>
+		
+				<view class="popup-login-text">
+					<view>登录即代表已阅读并同意<text style="color: #FF6200;">服务协议、隐私协议</text></view>
+				</view>
+			</view>
+		</u-popup>
 
 	</view>
 </template>
@@ -93,16 +121,19 @@
 		onLoad() {
 			this.isLoginOff = this.$store.getters.userInfo
 			this.advise = this.$store.getters.allset.add_member
-			this.jump_type = this.advise.value.member_info_jump_type
-			if( this.jump_type == 1){
-				this.jump_config = this.advise.value.member_info_h5_url
-			}else if(this.jump_type == 2){
-				this.jump_config.appid = this.advise.value.member_info_appid
-				this.jump_config.path = this.advise.value.member_info_path
-			}else if(this.jump_type == 3){
-				this.jump_config =this.advise.value.member_info_other_path
+			if(this.advise){
+				this.jump_type = this.advise.value.member_info_jump_type
+				if( this.jump_type == 1){
+					this.jump_config = this.advise.value.member_info_h5_url
+				}else if(this.jump_type == 2){
+					this.jump_config.appid = this.advise.value.member_info_appid
+					this.jump_config.path = this.advise.value.member_info_path
+				}else if(this.jump_type == 3){
+					this.jump_config =this.advise.value.member_info_other_path
+				}
 			}
 			
+			
 		},
 		methods: {
 			// 跳转其他小程序
@@ -165,6 +196,9 @@
 			closeMask() {
 				this.modal.show = false
 			},
+			close() {
+				this.modal.show = false
+			},
 			//提交微信名称和头像
 			handleConfirmWechatUserInfo() {
 				if (!this.modal.avatar) {
@@ -280,9 +314,9 @@
 										let {
 											token
 										} = res.data
-										this.$store.dispatch('user/token', token)
 										this.handleGetWechatUserInfo()
-										this.handleConfirmWechatUserInfo()
+										// this.handleConfirmWechatUserInfo()
+										this.$store.dispatch('user/token', token)
 									}else{
 										uni.showToast({
 											icon:'none',
@@ -310,19 +344,6 @@
 		position: relative;
 	}
 
-
-
-	.avatar {
-		width: 176rpx;
-		height: 176rpx;
-		border-radius: 50%;
-	}
-
-	.user-avatar {
-		object-fit: cover;
-		object-position: center;
-	}
-
 	.userinfo {
 		position: absolute;
 		top: 38rpx;
@@ -519,4 +540,105 @@
 			color: #333333;
 		}
 	}
+	
+	//登录弹框
+	.popup-login {
+		width: 100%;
+		height: 706rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx -10rpx 32rpx 0px rgba(0, 0, 0, 0.04);
+		border-radius: 16rpx 16rpx 0px 0px;
+		padding: 40rpx 64rpx 92rpx;
+	
+		.popup-login-top {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #000000;
+		}
+	
+		.popup-login-main {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 62rpx;
+	
+			.avatar {
+				width: 176rpx;
+				height: 176rpx;
+				border-radius: 50%;
+				border: 0;
+				background: transparent;
+	
+				&::after {
+					border: none;
+				}
+	
+				.user-avatar {
+					object-fit: cover;
+					object-position: center;
+				}
+			}
+		}
+	
+		.popup-login-ipt {
+			width: 100%;
+			height: 88rpx;
+			background: #F6F6F6;
+			border-radius: 44rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 48rpx;
+	
+			.avatar {
+				width: 100%;
+				height: 100%;
+				text-align: center;
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #999999;
+			}
+	
+		}
+	
+		.popup-login-btn {
+			width: 100%;
+			height: 88rpx;
+			background: #1AAC1B;
+			border-radius: 38rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 32rpx;
+	
+			.confirm {
+				border: 0;
+				background: transparent;
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+	
+				&::after {
+					border: none;
+				}
+			}
+		}
+	
+		.popup-login-text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 32rpx;
+			font-weight: bold;
+			color: #999999;
+			font-size: 22rpx;
+		}
+	}
+	
+	
+	
 </style>

pages/map/map.vue

@@ -30,10 +30,10 @@
 						</image>
 					</view>
 				</view>
-				<image @click="goJoin"  style=" flex: none; width: 52rpx;height: 46rpx;" src="/static/icon/vip.png" mode=""></image>
+				<image @click="goJoin"  style=" flex: none; width: 56rpx;height: 50rpx;" src="/static/icon/vip.png" mode=""></image>
 			</view>
 			<view class="search-detail search-detail-input"    style="z-index:9" v-if="search.openId==-2">
-				<u-input placeholder="输入酒店/城市名称搜索酒店" border='none' :value="search.text" @input="syncSearchInput">
+				<u-input placeholderStyle='color:#999' placeholder="输入酒店/城市名称搜索酒店" border='none' :value="search.text" @input="syncSearchInput">
 					<template slot="suffix" style='margin-right:40rpx;'>
 						<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 							height="32rpx" @click="confirmSearch"></u-image>

pages/msg/msg.vue

@@ -7,7 +7,7 @@
 		 </u-navbar> -->
 		<!-- 搜索框 -->
 		<view class="search">
-			<u-input placeholder="搜索" border='none' v-model="search"  @input="searchText">
+			<u-input placeholderStyle='color:#999' placeholder="搜索" border='none' v-model="search"  @input="searchText">
 				<template slot="suffix" style='margin-right:40rpx;'>
 					<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 						height="32rpx"></u-image>

pages/my/PersonalData/personalData.vue

@@ -101,6 +101,12 @@
 			//获取用户信息
 			this.getUserInfo()
 		},
+		
+		
+		onUnload() {
+			uni.$emit('refreshAdminName',this.formData.nickname )
+		},
+		
 
 		methods: {
 			//获取用户信息

pages/my/integral/integralRecord.vue

@@ -188,7 +188,7 @@
 				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
 				border-radius: 6px;
 				position: absolute;
-				bottom: -30rpx;
+				bottom: -26rpx;
 				left: 40rpx;
 			}
 		}

pages/my/my.vue

@@ -2,7 +2,9 @@
 
 	<view class="my">
 		<MyNav title="我的" bgColor="" :backIcon="false"></MyNav>
-		<view class="topCard" :style="{backgroundImage:'url('+imgurl+')'}">
+		<!-- <view class="topCard" :style="{backgroundImage:'url('+imgurl+')'}"> -->
+		<view class="topCard">
+			<image class="topCard-img" style="width: 560rpx; height: 584rpx; " :src="imgurl" mode=""></image>
 			<!-- 用户名 -->
 			<view class="user">
 				<view v-if="admin.avatar">
@@ -52,10 +54,11 @@
 
 				<view class="content">
 					<view class="flexbox" @click="goMyorders(1)">
-						<view style="width: 56rpx; height: 56rpx; display: flex;align-items: center;justify-content: center; ">
+						<view
+							style="width: 56rpx; height: 56rpx; display: flex;align-items: center;justify-content: center; ">
 							<image style="width: 56rpx ;height: 42rpx;" src="../../static/icon/exchange.png"></image>
 						</view>
-						<view class="flexbox-number">
+						<view class="flexbox-number" v-if="exchange != 0 ">
 							<text>{{exchange}}</text>
 						</view>
 						<text class="flexbox-number-text">待兑换</text>
@@ -64,9 +67,9 @@
 						<view
 							style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
 							<image style="width: 54rpx ;height: 52rpx;" src="../../static/icon/shipments.png"></image>
-							
+
 						</view>
-						<view class="flexbox-number">
+						<view class="flexbox-number" v-if="shipped != 0 ">
 							<text>{{shipped}}</text>
 						</view>
 						<text class="flexbox-number-text">待发货</text>
@@ -76,7 +79,7 @@
 							style="width: 56rpx; height: 56rpx;display: flex;align-items: center;justify-content: center; ">
 							<image style="width: 56rpx ;height: 56rpx;" src="../../static/icon/Receipt.png"></image>
 						</view>
-						<view class="flexbox-number">
+						<view class="flexbox-number" v-if="receive != 0 ">
 							<text>{{receive}}</text>
 						</view>
 						<text class="flexbox-number-text">待收货</text>
@@ -132,13 +135,13 @@
 		data() {
 			return {
 				//待兑换
-				exchange:'',
+				exchange: '',
 				//待发货
-				shipped:'',
+				shipped: '',
 				//待收货
-				receive:'',
+				receive: '',
 				//已完成
-				finish:'',				
+				finish: '',
 				//跳转h5,小程序,其他页面
 				jump_type: '',
 				jump_config: {},
@@ -169,13 +172,9 @@
 			};
 		},
 
-		onShow() {
+		async onLoad() {
 			this.admin = this.$store.getters.userInfo
-		},
-
-
-		onLoad() {
-			if(this.$store.getters.allset){
+			if (this.$store.getters.allset) {
 				this.advise = this.$store.getters.allset.add_member
 				this.jump_type = this.advise.value.me_jump_type
 				if (this.jump_type == 1) {
@@ -187,14 +186,30 @@
 					this.jump_config = this.advise.value.me_other_path
 				}
 			}
-			this.getMyOrder(1)
-			this.getMyOrder(2)
-			this.getMyOrder(3)
-			this.getMyOrder(4)
+			if (this.admin) {
+					await this.init()
+			}
+			
+			uni.$on('refreshOrderNum',()=>{
+				this.init()
+			})
+			uni.$on('refreshAdminName',(res)=>{
+				this.admin.nickname = res
+			})
+			
+
 		},
 
 
 		methods: {
+			
+			init(){
+			 this.getMyOrder(1)
+				this.getMyOrder(2)
+				this.getMyOrder(3)
+				this.getMyOrder(4)
+			},
+			
 			//关闭遮罩层
 			closeMask() {
 				this.modal.show = false
@@ -320,16 +335,16 @@
 					status: type || ''
 				}).then(res => {
 					if (res.code == 0) {
-						if(type == 1 ){						
+						if (type == 1) {
 							this.exchange = res.data.total
-							console.log(this.exchange );
-						}else if(type== 2) {
+							console.log(this.exchange);
+						} else if (type == 2) {
 							this.shipped = res.data.total
 							console.log(this.shipped);
-						}else if(type== 3) {
+						} else if (type == 3) {
 							this.receive = res.data.total
 							console.log(this.receive);
-						}else if(type== 4) {
+						} else if (type == 4) {
 							this.finish = res.data.total
 							console.log(this.finish);
 						}
@@ -508,9 +523,18 @@
 		border-radius: 0rpx 0rpx 16rpx 16rpx;
 		padding: 40rpx 30rpx 38rpx 30rpx;
 		box-sizing: border-box;
-		background-position: center;
-		background-repeat: no-repeat;
-		background-size: cover;
+		// background-position: center;
+		// background-repeat: no-repeat;
+		// background-size: cover;
+		background-color: #627885;
+		position: relative;
+		z-index: 99;
+
+		.topCard-img {
+			position: absolute;
+			right: 0rpx;
+			bottom: 0rpx;
+		}
 
 
 		.user {
@@ -518,6 +542,8 @@
 			height: 176rpx;
 			position: relative;
 			margin-bottom: 38rpx;
+			position: relative;
+			z-index: 99;
 
 			.user-avatar {
 				object-fit: cover;
@@ -572,6 +598,8 @@
 			padding-right: 24rpx;
 			box-sizing: border-box;
 			margin-bottom: 24rpx;
+			position: relative;
+			z-index: 99;
 
 			.flex {
 				display: flex;
@@ -606,6 +634,8 @@
 			border-radius: 8rpx;
 			padding: 40rpx 30rpx 36rpx 36rpx;
 			box-sizing: border-box;
+			position: relative;
+			z-index: 99;
 
 			.nav {
 				height: 50rpx;
@@ -642,6 +672,7 @@
 					flex-direction: column;
 					align-items: center;
 					position: relative;
+
 					.flexbox-number-text {
 						margin-top: 16rpx;
 						font-size: 28rpx;
@@ -649,7 +680,8 @@
 						font-weight: 500;
 						color: #627885;
 					}
-					.flexbox-number{
+
+					.flexbox-number {
 						position: absolute;
 						top: -30rpx;
 						right: -14rpx;
@@ -657,13 +689,13 @@
 						height: 46rpx;
 						border-radius: 50%;
 						background-color: #ff6c0e;
-						font-size:26rpx;
+						font-size: 26rpx;
 						color: #fff;
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						
-						
+
+
 					}
 				}
 			}

pages/my/myorders/orders.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索栏 -->
 			<view class="navbox">
 				<view class="search">
-					<u-input placeholder="搜索" border='none' v-model='search' @input="searchText">
+					<u-input placeholderStyle='color:#999' placeholder="搜索" border='none' v-model='search' @input="searchText">
 						<template slot="suffix" style='margin-right:40rpx;'>
 							<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 								height="32rpx"></u-image>
@@ -121,6 +121,8 @@
 	export default {
 		data() {
 			return {
+				//兑换是否过期
+				isEnd:'',
 				//核销码
 				check_qrcode: '', //二维码内容（扫码识别后需要访问的网址）
 				// 搜索
@@ -142,7 +144,7 @@
 				totalElements: '',
 				allListItem: '',
 				// 组件uni-load-more
-				status: 'loading',
+				status: 'noMore',
 			}
 		},
 		onLoad(o) {
@@ -157,9 +159,13 @@
 				this.isActive = 3
 				this.getMyOrder(this.isActive )
 			})
-			
 		},
 		
+		onUnload() {
+			uni.$emit('refreshOrderNum');
+		},
+		
+		
 		// 触底加载
 		onReachBottom() {
 			// 触底的时候请求数据，即为上拉加载更多
@@ -192,7 +198,7 @@
 		
 		
 		methods: {
-
+			
 			//确定收货
 			takeOver(id) {
 				uni.showLoading({
@@ -218,7 +224,17 @@
 
 				})
 			},
-
+			
+			//判断兑换是否过期
+			cancelTime(i, j) {
+				let nowtime = new Date() //获取当前时间
+				let endtime = new Date(j); //活动结束时间
+				let lefttime = endtime.getTime() - nowtime.getTime() //距离结束时间的毫秒数
+				if (lefttime < 0) {
+					//兑换过期
+					this.isEnd = true
+				} 
+			},
 
 			// 获取订单列表
 			getMyOrder(type) {

pages/my/prize/prize.vue

@@ -34,7 +34,7 @@
 		</view>
 
 
-		<view style="margin-bottom: 60rpx;">
+		<view style="margin-bottom: 60rpx;margin-top: 24rpx;">
 			<!-- 实物奖品 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}"
 				v-if="isActive == 0  && PhysicalPrizes.length > 0  ">
@@ -81,7 +81,7 @@
 				<view class="ListItem" v-for="(item,index) in prizeRecord" :key="index">
 					<view style="display: flex; justify-content: space-between;">
 						<view class="title"><text>{{item.name}}</text> </view>
-						<view class='data'><text>{{item.created_at}}</text></view>
+						<view class='data' style="flex:none;"><text>{{item.created_at}}</text></view>
 					</view>
 					<view class="content"><text>{{item.remark||'无'}}</text></view>
 				</view>
@@ -89,13 +89,20 @@
 		</view>
 
 		<!-- 已经到底啦 -->
-		<uni-load-more v-if="isActive == 0  && PhysicalPrizes.length > 0  " :status="status" color="#CCCCCC"
-			:content-text="contentText" />
-		<uni-load-more v-if="isActive == 1  && VirtualPrizes.length > 0  " :status="status" color="#CCCCCC"
-			:content-text="contentText" />
-		<uni-load-more v-if="isActive == 2  && prizeRecord.length > 0  " :status="status" color="#CCCCCC"
-			:content-text="contentText" />
-
+		<view class="home-bottom" style="margin-top: 88rpx;padding-bottom: 60rpx;"  v-if="isActive == 0  && PhysicalPrizes.length > 0  " >
+			<uni-load-more :status="status" color="#CCCCCC"
+				:content-text="contentText" />
+		</view>
+		
+		<view class="home-bottom" style="margin-top: 88rpx;padding-bottom: 60rpx;" v-if="isActive == 1  && VirtualPrizes.length > 0  " >
+			<uni-load-more  :status="status" color="#CCCCCC"
+				:content-text="contentText" />
+		</view>
+		<view class="home-bottom" style="margin-top: 88rpx;padding-bottom: 60rpx;" v-if="isActive == 2  && prizeRecord.length > 0  " >
+			<uni-load-more  :status="status" color="#CCCCCC"
+				:content-text="contentText" />
+		</view>
+		
 	</view>
 </template>
 
@@ -351,7 +358,7 @@
 				background: linear-gradient(90deg, #F3D69F 0%, #D9A94D 100%);
 				border-radius: 6px;
 				position: absolute;
-				bottom: -35rpx;
+				bottom: -30rpx;
 				left: 40rpx;
 			}
 		}

pages/my/setting/setting.vue

@@ -70,8 +70,8 @@
 					// this.$store.getters.userInfo.isLoginOff = true
 					// this.$store.dispatch("user/info", this.$store.getters.userInfo)
 					this.$store.dispatch("user/info", null)
-					this.$store.dispatch("user/token", null)
-					uni.removeStorageSync('auth_token')
+					// this.$store.dispatch("user/token", null)
+					// uni.removeStorageSync('auth_token')
 					uni.removeStorageSync('userInfo')
 					uni.reLaunch({
 						url:'/pages/login/login'

pages/my/verification/verification.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索栏 -->
 			<view class="navbox">
 				<view class="search">
-					<u-input placeholder="搜索" border='none' v-model="search"  @input="searchText">
+					<u-input placeholderStyle='color:#999' placeholder="搜索" border='none' v-model="search"  @input="searchText">
 						<template slot="suffix" style='margin-right:40rpx;'>
 							<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
 								height="32rpx"></u-image>
@@ -97,7 +97,7 @@
 				totalElements: '',
 				allListItem: '',
 				// 组件uni-load-more
-				status: 'loading',
+				status: 'noMore',
 				//当前页条数
 				allTotal:'',
 			}

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 = {