项目日志:11.24登录授权头像

api/my/my.js

@@ -14,6 +14,16 @@ export function joinVip(data){
 		data
 	)
 }
+
+export function update(data){
+	return request.post(
+		`users/1/update_avatar_nickname`,
+		data
+	)
+}
+//http://t9.9026.com/api/users/1/update_avatar_nickname
+
 export default {
-  myLogin
+  myLogin,
+  update
 }

pages/goods/goods-lucky/index.vue

@@ -153,7 +153,8 @@
 			// 用户点击开始抽奖
 			turntableStart() {
 				let index = Math.floor(Math.random() * 6 + 1) //前端随机数，这里应该后台返回中奖结果
-				this.award = index
+				// this.award = index
+				this.award = 2
 				this.$refs.turntable.begin(this.award);
 			},
 

pages/index/index.vue

@@ -4,9 +4,9 @@
 		<view class="home-swiper">
 			<uni-swiper-dot :info="info" :current="current1" :mode="mode" :dots-styles="dotsStyles">
 				<swiper class="swiper-box" @change="change1" circular>
-					<swiper-item v-for="(item ,index) in info" :key="index">
-						<view class="swiper-item" @click="goGoodsDetail(item.pic_url)">
-							<image style="width: 100%;height:416rpx;" :src="item.img"
+					<swiper-item v-for="(items ,index) in info" :key="index">
+						<view v-for="(item ,j) in items" :key="j" class="swiper-item" @click="goGoodsDetail(item.pic_url)">
+							<image style="width:100%;height:142rpx;" :src="item.img"
 								mode="aspectFill"></image>
 						</view>
 					</swiper-item>
@@ -76,7 +76,7 @@
 		<view class="home-hotel-img">
 			
 			<view class="home-hotel-img-content">
-				<view class="home-hotel-img-content-item" v-for="item in goodsList">
+				<view class="home-hotel-img-content-item" v-for="item in goodsList" :style="{marginTop:item.marginTop || 0 }">
 					<image  class="home-hotel-img-content-item-img"   :class="item.short?'home-hotel-img-content-item-img': 'home-hotel-img-content-item-img-long' "  :src="item.img" mode=""></image>
 					<view class="text">
 						<text class="text-top">{{item.text}}</text>
@@ -148,6 +148,47 @@
 						title:'环球洲际',
 						short:'',
 					},
+					{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},{
+						img:'http://t9.9026.com/imgs/goodsimg01.png',
+						text:'中秋佳节五仁月饼，惊喜特供，限时抢购',
+						title:'环球洲际',
+						short:'',
+					},
 				],
 				status: 'noMore',
 				contentText: {
@@ -157,10 +198,39 @@
 				},
 				//轮播图
 				info: [
+					[{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
 					{
 						img:'http://t9.9026.com/imgs/swiper01.png',
 						name:'酒店预订'
 					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					}],
+					[{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					},
+					{
+						img:'http://t9.9026.com/imgs/swiper01.png',
+						name:'酒店预订'
+					}],
+					
 				],
 				dotsStyles: {
 					bottom:24,
@@ -243,6 +313,7 @@
 					}
 					if(index%4===2){
 						item.long = true
+						item.marginTop = -66+"rpx"
 					}
 					if(index%4===3){
 						item.short = true
@@ -345,7 +416,18 @@
 	.home-swiper {
 		height: 416rpx;
 		.swiper-box{
-			height: 416rpx;
+			::v-deep swiper-item{
+				width: 100%;
+				height: 208px;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				view{
+					width: 25%;
+				}
+				
+			}
+			
 		}
 	}
 
@@ -491,14 +573,14 @@
 				box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
 				border-radius: 12rpx;
 				margin-bottom: 26rpx;
-				&:nth-child(2n+1){
-					position: relative;
-					top: -33px;
-				}
-				&:nth-child(1){
-					position: relative;
-					top: 0;
-				}
+				// &:nth-child(2n+1){
+				// 	// position: relative;
+				// 	top: -33px;
+				// }
+				// &:nth-child(1){
+				// 	// position: relative;
+				// 	top: 0;
+				// }
 				
 				.home-hotel-img-content-item-img{
 					width: 332rpx; 

pages/my/my.vue

@@ -4,18 +4,26 @@
 		<view class="topCard" :style="{backgroundImage:'url('+imgurl+')'}">
 			<!-- 用户名 -->
 			<view class="user">
-				<view class="">
-					<image class="user-avatar" src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;" ></image>
+				<view v-if="admin.avatar">
+					<button class="avatar" open-type="chooseAvatar" @click="handleGetWechatUserInfo">
+						<image class="user-avatar" style="height: 176rpx;width: 176rpx;border-radius: 50%;"
+							:src="admin.avatar? admin.avatar : '/static/icon/avatar.png'" />
+					</button>
+					<view class="userinfo">
+						<text class="unlogin">{{admin.nickname}}</text>
+					</view>
+				</view>
+				<view v-else>
+					<image class="user-avatar" src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;">
+					</image>
 					<view class="userinfo">
 						<text class="unlogin" v-if="!islogin" @click="login">请点击登录</text>
-						<text class="username" v-if="islogin" @click="goPersonData">用户oo1</text>
-						<text class="userId" v-if="islogin" @click="goPersonData">ID23923</text>
 					</view>
 				</view>
-				<image src="/static/icon/setting.png"	@click="goSetting"
+				<image src="/static/icon/setting.png" @click="goSetting"
 					style="width: 44rpx;height: 44rpx; position: absolute;top:0rpx;right: 24rpx;"></image>
 			</view>
-			
+
 			<!-- 会员 -->
 			<view class="membership">
 				<view class="flex">
@@ -30,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<!-- 订单 -->
 			<view class="orders">
 				<view class="nav">
@@ -40,28 +48,32 @@
 						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right05.png"></image>
 					</view>
 				</view>
-				
+
 				<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>
 						<text>待兑换</text>
 					</view>
 					<view class="flexbox" @click="goMyorders(2)">
-						<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: 54rpx ;height: 52rpx;" src="../../static/icon/shipments.png"></image>
 						</view>
 						<text>待发货</text>
 					</view>
 					<view class="flexbox" @click="goMyorders(3)">
-						<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: 56rpx;" src="../../static/icon/Receipt.png"></image>
 						</view>
 						<text>待收货</text>
 					</view>
 					<view class="flexbox" @click="goMyorders(4)">
-						<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: 54rpx ;height: 54rpx;" src="../../static/icon/finish.png"></image>
 						</view>
 						<text>已完成</text>
@@ -69,21 +81,31 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 列表 -->
 		<view style="padding:0 30rpx;">
 			<view class="list" v-for="(item,index) in list" @click="goDetail(index)">
 				<view class="title">{{item.title}}</view>
 				<view class="container">{{item.content}}</view>
-				<image  src="../../static/icon/right.png"></image>
+				<image src="../../static/icon/right.png"></image>
 			</view>
-			
+
 		</view>
-		
+		<u-modal :show="modal.show" :title="modal.title" :show-confirm-button="false">
+			<view>
+				<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:'/static/icon/avatar.png'" />
+				</button>
+				<input class="avatar" type="nickname" :value="modal.nickname" placeholder="填写昵称"
+					@change="handleChangeNickname">
+
+				<button class="confirm" @click="handleConfirmWechatUserInfo">提交</button>
+			</view>
+		</u-modal>
 		<!-- 底部导航栏 -->
 		<view style="height: 140rpx; width: 100%;"></view>
 		<tab-bar checked="my"></tab-bar>
-
 	</view>
 </template>
 
@@ -97,99 +119,146 @@
 		},
 		data() {
 			return {
-				admin:'',
+				modal: {
+					show: false,
+					title: '用户信息获取',
+					nickname: '',
+					avatar: ''
+				},
+				admin: '',
 				// 顶部背景图
-				imgurl:'http://t9.9026.com/imgs/bg@2x.png',
+				imgurl: 'http://t9.9026.com/imgs/bg@2x.png',
 				// 是否登录
 				islogin: false,
 				// 列表内容
-				list:[{
-					title:'积分',
-					content:'积分兑换奖品'
-				},{
-					title:'奖品',
-					content:'查看所有奖品'
-				},{
-					title:'点赞',
-					content:'查看所有点赞'
+				list: [{
+					title: '积分',
+					content: '积分兑换奖品'
+				}, {
+					title: '奖品',
+					content: '查看所有奖品'
+				}, {
+					title: '点赞',
+					content: '查看所有点赞'
 				}]
 			};
 		},
-		
-		onLoad() {
-			this.$store.getters = this.admin
-			console.log(this.$store.getters,111);
-			
+
+		onShow() {
+			this.admin = this.$store.getters.userInfo
 		},
-		
-		methods:{
+
+		methods: {
+			// 微信获取头像
+			handleGetWechatUserInfo() {
+				console.log(1111);
+				this.modal.show = true
+				this.modal.nickname = this.admin.nickname
+				this.modal.avatar = this.admin.avatar
+			},
+
+
+			//提交微信名称和头像
+			handleConfirmWechatUserInfo() {
+				if (!this.modal.avatar) {
+					this.$u.toast('请上传头像')
+					return
+				}
+				if (!this.modal.nickname) {
+					this.$u.toast('请填写昵称')
+					return
+				}
+				this.$loading('数据提交中...')
+				this.$api.my.update({avatar: this.modal.avatar, nickname: this.modal.nickname}).then(res=>{
+					  this.$hideLoading()  
+					  this.$store.dispatch('user/info', res.data)
+					  this.modal.show = false
+				})
+				// this.$api.user.update({ avatar: this.modal.avatar, nickname: this.modal.nickname }).then(res => {
+				//   this.code = null
+				//   this.$hideLoading()
+				//   this.$store.dispatch('user/info', res.data)
+				//   this.modal.show = false
+				// }).catch(() => {
+				//   this.$hideLoading()
+				// })
+			},
+			// 微信获取头像
+			handleChooseAvatar(e) {
+				console.log(e.detail);
+				this.modal.avatar = e.detail.avatarUrl
+			},
+			handleChangeNickname(res) {
+				this.modal.nickname = res.detail.value
+			},
+
 			// 跳转登录页
-			login(){
+			login() {
 				uni.navigateTo({
-					url:'/pages/login/login'
+					url: '/pages/login/login'
 				})
 			},
 			// 跳转个人信息
-			goPersonData(){
+			goPersonData() {
 				uni.navigateTo({
-					url:'/pages/my/PersonalData/personalData'
+					url: '/pages/my/PersonalData/personalData'
 				})
 			},
 			// 跳转设置页面
-			goSetting(){
+			goSetting() {
 				uni.navigateTo({
-					url:'/pages/my/setting/setting'
+					url: '/pages/my/setting/setting'
 				})
 			},
 			// 跳转积分页
-			goDetail(index){
-				if(index==0){
+			goDetail(index) {
+				if (index == 0) {
 					uni.navigateTo({
-						url:'/pages/my/integral/integral'
+						url: '/pages/my/integral/integral'
 					})
-				}else if(index==1){
+				} else if (index == 1) {
 					uni.navigateTo({
-						url:'/pages/my/prize/prize'
+						url: '/pages/my/prize/prize'
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'/pages/my/Kudos/Kudos'
+						url: '/pages/my/Kudos/Kudos'
 					})
 				}
 			},
 			// 跳转订单页
-			goMyorders(index){
-				switch(index){
+			goMyorders(index) {
+				switch (index) {
 					case 0:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders'
+							url: '/pages/my/myorders/orders'
 						})
 						break;
 					case 1:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+1
+							url: '/pages/my/myorders/orders?isActive=' + 1
 						})
-					break;
+						break;
 					case 2:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+2
+							url: '/pages/my/myorders/orders?isActive=' + 2
 						})
-					break;
+						break;
 					case 3:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+3
+							url: '/pages/my/myorders/orders?isActive=' + 3
 						})
-					break;
+						break;
 					case 4:
 						uni.navigateTo({
-							url:'/pages/my/myorders/orders?isActive='+4
+							url: '/pages/my/myorders/orders?isActive=' + 4
 						})
-					break;
+						break;
 				}
-				
+
 			},
 			// 上传头像
-			uploadAvatar(){
+			uploadAvatar() {
 				// let img = []
 				// uni.chooseImage({
 				// 	count: 1, //默认9
@@ -229,6 +298,14 @@
 		background-color: $pageColor;
 	}
 
+	.avatar {
+		width: 176rpx;
+		height: 176rpx;
+		border-radius: 50%;
+	}
+
+
+
 	.topCard {
 		width: 100%;
 		border-radius: 0rpx 0rpx 16rpx 16rpx;
@@ -237,14 +314,15 @@
 		background-position: center;
 		background-repeat: no-repeat;
 		background-size: cover;
-		
+
 
 		.user {
 			width: 690rpx;
 			height: 176rpx;
 			position: relative;
 			margin-bottom: 38rpx;
-			.user-avatar{
+
+			.user-avatar {
 				object-fit: cover;
 				object-position: center;
 			}
@@ -297,12 +375,14 @@
 			padding-right: 24rpx;
 			box-sizing: border-box;
 			margin-bottom: 24rpx;
+
 			.flex {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
 				height: 68rpx;
 				width: 650rpx;
+
 				.join {
 					font-size: 36rpx;
 					font-family: PingFang-SC-Bold, PingFang-SC;
@@ -322,44 +402,51 @@
 
 
 		}
-		.orders{
+
+		.orders {
 			width: 690rpx;
 			background: $bgColor;
 			border-radius: 8rpx;
 			padding: 40rpx 30rpx 36rpx 36rpx;
 			box-sizing: border-box;
-			.nav{
+
+			.nav {
 				height: 50rpx;
 				width: 633rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				.myorder{
+
+				.myorder {
 					font-size: 28rpx;
 					font-family: PingFang-SC-Heavy, PingFang-SC;
 					font-weight: 800;
 					color: #333333;
 				}
-				.more{
+
+				.more {
 					font-size: 28rpx;
 					font-family: PingFang-SC-Bold, PingFang-SC;
 					font-weight: bold;
 					color: #627885;
-					
+
 				}
 			}
-			.content{
+
+			.content {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				padding:0 20rpx;
-				margin-top:72rpx;
-				.flexbox{
+				padding: 0 20rpx;
+				margin-top: 72rpx;
+
+				.flexbox {
 					display: flex;
 					flex-direction: column;
 					align-items: center;
-					text{
-						margin-top:16rpx;
+
+					text {
+						margin-top: 16rpx;
 						font-size: 28rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;
 						font-weight: 500;
@@ -371,36 +458,41 @@
 
 
 	}
-	.list{
+
+	.list {
 		width: 100%;
 		padding-top: 32rpx;
-		padding-bottom:32rpx;
-		border-bottom: 2rpx solid  #F0F0F0;
+		padding-bottom: 32rpx;
+		border-bottom: 2rpx solid #F0F0F0;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		position: relative;
-		&:first-child{
+
+		&:first-child {
 			padding-top: 50rpx;
 		}
-		.title{
+
+		.title {
 			font-size: 36rpx;
 			font-family: PingFang-SC-Bold, PingFang-SC;
 			font-weight: bold;
 			color: #333333;
 			margin-bottom: 16rpx;
 		}
-		.container{
+
+		.container {
 			font-size: 28rpx;
 			font-family: PingFang-SC-Medium, PingFang-SC;
 			font-weight: 500;
 			color: #333333;
 		}
-		image{
-			width: 12rpx ;
+
+		image {
+			width: 12rpx;
 			height: 20rpx;
 			position: absolute;
-			top:70rpx;
+			top: 70rpx;
 			right: 0rpx;
 		}
 	}

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -20591,7 +20591,7 @@ function agreement() {
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.myLogin = myLogin;exports.joinVip = joinVip;exports.default = void 0;var request = uni.$u.http;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.myLogin = myLogin;exports.joinVip = joinVip;exports.update = update;exports.default = void 0;var request = uni.$u.http;
 
 // 隐私协议http://t9.9026.com/api/auth/mnplogin
 function myLogin(data) {
@@ -20606,9 +20606,19 @@ function joinVip(data) {
 
   data);
 
-}var _default =
+}
+
+function update(data) {
+  return request.post("users/1/update_avatar_nickname",
+
+  data);
+
+}
+//http://t9.9026.com/api/users/1/update_avatar_nickname
+var _default =
 {
-  myLogin: myLogin };exports.default = _default;
+  myLogin: myLogin,
+  update: update };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
@@ -21645,6 +21655,105 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* 522 */,
 /* 523 */,
 /* 524 */
+/*!************************************************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-modal/props.js ***!
+  \************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
+  props: {
+    // 是否展示modal
+    show: {
+      type: Boolean,
+      default: uni.$u.props.modal.show },
+
+    // 标题
+    title: {
+      type: [String],
+      default: uni.$u.props.modal.title },
+
+    // 弹窗内容
+    content: {
+      type: String,
+      default: uni.$u.props.modal.content },
+
+    // 确认文案
+    confirmText: {
+      type: String,
+      default: uni.$u.props.modal.confirmText },
+
+    // 取消文案
+    cancelText: {
+      type: String,
+      default: uni.$u.props.modal.cancelText },
+
+    // 是否显示确认按钮
+    showConfirmButton: {
+      type: Boolean,
+      default: uni.$u.props.modal.showConfirmButton },
+
+    // 是否显示取消按钮
+    showCancelButton: {
+      type: Boolean,
+      default: uni.$u.props.modal.showCancelButton },
+
+    // 确认按钮颜色
+    confirmColor: {
+      type: String,
+      default: uni.$u.props.modal.confirmColor },
+
+    // 取消文字颜色
+    cancelColor: {
+      type: String,
+      default: uni.$u.props.modal.cancelColor },
+
+    // 对调确认和取消的位置
+    buttonReverse: {
+      type: Boolean,
+      default: uni.$u.props.modal.buttonReverse },
+
+    // 是否开启缩放效果
+    zoom: {
+      type: Boolean,
+      default: uni.$u.props.modal.zoom },
+
+    // 是否异步关闭，只对确定按钮有效
+    asyncClose: {
+      type: Boolean,
+      default: uni.$u.props.modal.asyncClose },
+
+    // 是否允许点击遮罩关闭modal
+    closeOnClickOverlay: {
+      type: Boolean,
+      default: uni.$u.props.modal.closeOnClickOverlay },
+
+    // 给一个负的margin-top，往上偏移，避免和键盘重合的情况
+    negativeTop: {
+      type: [String, Number],
+      default: uni.$u.props.modal.negativeTop },
+
+    // modal宽度，不支持百分比，可以数值，px，rpx单位
+    width: {
+      type: [String, Number],
+      default: uni.$u.props.modal.width },
+
+    // 确认按钮的样式，circle-圆形，square-方形，如设置，将不会显示取消按钮
+    confirmButtonShape: {
+      type: String,
+      default: uni.$u.props.modal.confirmButtonShape } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 525 */,
+/* 526 */,
+/* 527 */,
+/* 528 */,
+/* 529 */,
+/* 530 */,
+/* 531 */,
+/* 532 */
 /*!*****************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/uni_modules/uni-forms/components/uni-forms/validate.js ***!
   \*****************************************************************************************/
@@ -22140,7 +22249,7 @@ SchemaValidator.message = new Message();var _default =
 SchemaValidator;exports.default = _default;
 
 /***/ }),
-/* 525 */
+/* 533 */
 /*!**************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/uni_modules/uni-forms/components/uni-forms/utils.js ***!
   \**************************************************************************************/
@@ -22443,14 +22552,6 @@ var isEqual = function isEqual(a, b) {
 };exports.isEqual = isEqual;
 
 /***/ }),
-/* 526 */,
-/* 527 */,
-/* 528 */,
-/* 529 */,
-/* 530 */,
-/* 531 */,
-/* 532 */,
-/* 533 */,
 /* 534 */,
 /* 535 */,
 /* 536 */,
@@ -22471,7 +22572,15 @@ var isEqual = function isEqual(a, b) {
 /* 551 */,
 /* 552 */,
 /* 553 */,
-/* 554 */
+/* 554 */,
+/* 555 */,
+/* 556 */,
+/* 557 */,
+/* 558 */,
+/* 559 */,
+/* 560 */,
+/* 561 */,
+/* 562 */
 /*!***********************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/uni_modules/hu-pickerAddress/data.js ***!
   \***********************************************************************/
@@ -27390,12 +27499,12 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     "南区"] }] }];exports.default = _default;
 
 /***/ }),
-/* 555 */,
-/* 556 */,
-/* 557 */,
-/* 558 */,
-/* 559 */,
-/* 560 */
+/* 563 */,
+/* 564 */,
+/* 565 */,
+/* 566 */,
+/* 567 */,
+/* 568 */
 /*!*******************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-loading-icon/props.js ***!
   \*******************************************************************************************/
@@ -27462,14 +27571,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 561 */,
-/* 562 */,
-/* 563 */,
-/* 564 */,
-/* 565 */,
-/* 566 */,
-/* 567 */,
-/* 568 */
+/* 569 */,
+/* 570 */,
+/* 571 */,
+/* 572 */,
+/* 573 */,
+/* 574 */,
+/* 575 */,
+/* 576 */
 /*!*************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-swiper/props.js ***!
   \*************************************************************************************/
@@ -27602,14 +27711,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 569 */,
-/* 570 */,
-/* 571 */,
-/* 572 */,
-/* 573 */,
-/* 574 */,
-/* 575 */,
-/* 576 */
+/* 577 */,
+/* 578 */,
+/* 579 */,
+/* 580 */,
+/* 581 */,
+/* 582 */,
+/* 583 */,
+/* 584 */
 /*!***********************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-icon/icons.js ***!
   \***********************************************************************************/
@@ -27832,7 +27941,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   'uicon-en': "\uE692" };exports.default = _default;
 
 /***/ }),
-/* 577 */
+/* 585 */
 /*!***********************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-icon/props.js ***!
   \***********************************************************************************/
@@ -27929,14 +28038,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 578 */,
-/* 579 */,
-/* 580 */,
-/* 581 */,
-/* 582 */,
-/* 583 */,
-/* 584 */,
-/* 585 */
+/* 586 */,
+/* 587 */,
+/* 588 */,
+/* 589 */,
+/* 590 */,
+/* 591 */,
+/* 592 */,
+/* 593 */
 /*!*****************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-transition/props.js ***!
   \*****************************************************************************************/
@@ -27968,7 +28077,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 586 */
+/* 594 */
 /*!**********************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-transition/transition.js ***!
   \**********************************************************************************************/
@@ -27979,7 +28088,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 34));
 
 
-var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 587));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};} // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
+var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 595));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};} // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
 var nextTick = function nextTick() {return new Promise(function (resolve) {return setTimeout(resolve, 1000 / 50);});}; // nvue动画模块实现细节抽离在外部文件
 
 // 定义类名，通过给元素动态切换类名，赋予元素一定的css动画样式
@@ -28133,7 +28242,7 @@ var getClassNames = function getClassNames(name) {return {
     } } };exports.default = _default;
 
 /***/ }),
-/* 587 */
+/* 595 */
 /*!************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-transition/nvue.ani-map.js ***!
   \************************************************************************************************/
@@ -28209,14 +28318,14 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     'leave-to': { opacity: 0, transform: 'scale(0.95)' } } };exports.default = _default;
 
 /***/ }),
-/* 588 */,
-/* 589 */,
-/* 590 */,
-/* 591 */,
-/* 592 */,
-/* 593 */,
-/* 594 */,
-/* 595 */
+/* 596 */,
+/* 597 */,
+/* 598 */,
+/* 599 */,
+/* 600 */,
+/* 601 */,
+/* 602 */,
+/* 603 */
 /*!**********************************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
   \**********************************************************************************************************/
@@ -28355,12 +28464,154 @@ function createAnimation(option, _this) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 596 */,
-/* 597 */,
-/* 598 */,
-/* 599 */,
-/* 600 */,
-/* 601 */
+/* 604 */,
+/* 605 */,
+/* 606 */,
+/* 607 */,
+/* 608 */,
+/* 609 */
+/*!************************************************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-popup/props.js ***!
+  \************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
+  props: {
+    // 是否展示弹窗
+    show: {
+      type: Boolean,
+      default: uni.$u.props.popup.show },
+
+    // 是否显示遮罩
+    overlay: {
+      type: Boolean,
+      default: uni.$u.props.popup.overlay },
+
+    // 弹出的方向，可选值为 top bottom right left center
+    mode: {
+      type: String,
+      default: uni.$u.props.popup.mode },
+
+    // 动画时长，单位ms
+    duration: {
+      type: [String, Number],
+      default: uni.$u.props.popup.duration },
+
+    // 是否显示关闭图标
+    closeable: {
+      type: Boolean,
+      default: uni.$u.props.popup.closeable },
+
+    // 自定义遮罩的样式
+    overlayStyle: {
+      type: [Object, String],
+      default: uni.$u.props.popup.overlayStyle },
+
+    // 点击遮罩是否关闭弹窗
+    closeOnClickOverlay: {
+      type: Boolean,
+      default: uni.$u.props.popup.closeOnClickOverlay },
+
+    // 层级
+    zIndex: {
+      type: [String, Number],
+      default: uni.$u.props.popup.zIndex },
+
+    // 是否为iPhoneX留出底部安全距离
+    safeAreaInsetBottom: {
+      type: Boolean,
+      default: uni.$u.props.popup.safeAreaInsetBottom },
+
+    // 是否留出顶部安全距离（状态栏高度）
+    safeAreaInsetTop: {
+      type: Boolean,
+      default: uni.$u.props.popup.safeAreaInsetTop },
+
+    // 自定义关闭图标位置，top-left为左上角，top-right为右上角，bottom-left为左下角，bottom-right为右下角
+    closeIconPos: {
+      type: String,
+      default: uni.$u.props.popup.closeIconPos },
+
+    // 是否显示圆角
+    round: {
+      type: [Boolean, String, Number],
+      default: uni.$u.props.popup.round },
+
+    // mode=center，也即中部弹出时，是否使用缩放模式
+    zoom: {
+      type: Boolean,
+      default: uni.$u.props.popup.zoom },
+
+    // 弹窗背景色，设置为transparent可去除白色背景
+    bgColor: {
+      type: String,
+      default: uni.$u.props.popup.bgColor },
+
+    // 遮罩的透明度，0-1之间
+    overlayOpacity: {
+      type: [Number, String],
+      default: uni.$u.props.popup.overlayOpacity } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 610 */,
+/* 611 */,
+/* 612 */,
+/* 613 */,
+/* 614 */,
+/* 615 */,
+/* 616 */,
+/* 617 */
+/*!***********************************************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-line/props.js ***!
+  \***********************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
+  props: {
+    color: {
+      type: String,
+      default: uni.$u.props.line.color },
+
+    // 长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带px单位的值等
+    length: {
+      type: [String, Number],
+      default: uni.$u.props.line.length },
+
+    // 线条方向，col-竖向，row-横向
+    direction: {
+      type: String,
+      default: uni.$u.props.line.direction },
+
+    // 是否显示细边框
+    hairline: {
+      type: Boolean,
+      default: uni.$u.props.line.hairline },
+
+    // 线条与上下左右元素的间距，字符串形式，如"30px"、"20px 30px"
+    margin: {
+      type: [String, Number],
+      default: uni.$u.props.line.margin },
+
+    // 是否虚线，true-实线，false-虚线
+    dashed: {
+      type: Boolean,
+      default: uni.$u.props.line.dashed } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 618 */,
+/* 619 */,
+/* 620 */,
+/* 621 */,
+/* 622 */,
+/* 623 */,
+/* 624 */,
+/* 625 */
 /*!**************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \**************************************************************************************/
@@ -29536,21 +29787,21 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     "unicode_decimal": 58929 }] };exports.default = _default;
 
 /***/ }),
-/* 602 */,
-/* 603 */,
-/* 604 */,
-/* 605 */,
-/* 606 */,
-/* 607 */,
-/* 608 */,
-/* 609 */,
-/* 610 */,
-/* 611 */,
-/* 612 */,
-/* 613 */,
-/* 614 */,
-/* 615 */,
-/* 616 */
+/* 626 */,
+/* 627 */,
+/* 628 */,
+/* 629 */,
+/* 630 */,
+/* 631 */,
+/* 632 */,
+/* 633 */,
+/* 634 */,
+/* 635 */,
+/* 636 */,
+/* 637 */,
+/* 638 */,
+/* 639 */,
+/* 640 */
 /*!***********************************************************************************************!*\
   !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-swiper-indicator/props.js ***!
   \***********************************************************************************************/
@@ -29586,6 +29837,87 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
       default: uni.$u.props.swiperIndicator.indicatorMode } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
+/***/ }),
+/* 641 */,
+/* 642 */,
+/* 643 */,
+/* 644 */,
+/* 645 */,
+/* 646 */,
+/* 647 */,
+/* 648 */
+/*!**************************************************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-overlay/props.js ***!
+  \**************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
+  props: {
+    // 是否显示遮罩
+    show: {
+      type: Boolean,
+      default: uni.$u.props.overlay.show },
+
+    // 层级z-index
+    zIndex: {
+      type: [String, Number],
+      default: uni.$u.props.overlay.zIndex },
+
+    // 遮罩的过渡时间，单位为ms
+    duration: {
+      type: [String, Number],
+      default: uni.$u.props.overlay.duration },
+
+    // 不透明度值，当做rgba的第四个参数
+    opacity: {
+      type: [String, Number],
+      default: uni.$u.props.overlay.opacity } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 649 */,
+/* 650 */,
+/* 651 */,
+/* 652 */,
+/* 653 */,
+/* 654 */,
+/* 655 */,
+/* 656 */
+/*!*****************************************************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-status-bar/props.js ***!
+  \*****************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
+  props: {
+    bgColor: {
+      type: String,
+      default: uni.$u.props.statusBar.bgColor } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ }),
+/* 657 */,
+/* 658 */,
+/* 659 */,
+/* 660 */,
+/* 661 */,
+/* 662 */,
+/* 663 */,
+/* 664 */
+/*!******************************************************************************************!*\
+  !*** D:/vscode-demo/IHG/IHG/IHG/node_modules/uview-ui/components/u-safe-bottom/props.js ***!
+  \******************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default = {
+  props: {} };exports.default = _default;
+
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

unpackage/dist/dev/mp-weixin/components/SwiperBox/index.js

@@ -80,10 +80,10 @@ var components
 try {
   components = {
     uLoadingIcon: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-loading-icon/u-loading-icon.vue */ 555))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-loading-icon/u-loading-icon.vue */ 563))
     },
     uSwiper: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-swiper/u-swiper.vue */ 563))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-swiper/u-swiper.vue */ 571))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js

@@ -80,10 +80,10 @@ var components
 try {
   components = {
     uTransition: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-transition/u-transition.vue */ 580))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-transition/u-transition.vue */ 588))
     },
     uIcon: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 571))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 579))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uIcon: function() {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 571))
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 579))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/goods/goods-lucky/index.js

@@ -313,7 +313,8 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     // 用户点击开始抽奖
     turntableStart: function turntableStart() {
       var index = Math.floor(Math.random() * 6 + 1); //前端随机数，这里应该后台返回中奖结果
-      this.award = index;
+      // this.award = index
+      this.award = 2;
       this.$refs.turntable.begin(this.award);
     },
 

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -302,6 +302,47 @@ __webpack_require__.r(__webpack_exports__);
         text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
         title: '环球洲际' },
 
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
+      {
+        img: 'http://t9.9026.com/imgs/goodsimg01.png',
+        text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
+        title: '环球洲际',
+        short: '' },
       {
         img: 'http://t9.9026.com/imgs/goodsimg01.png',
         text: '中秋佳节五仁月饼，惊喜特供，限时抢购',
@@ -317,10 +358,39 @@ __webpack_require__.r(__webpack_exports__);
 
       //轮播图
       info: [
+      [{
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
       {
         img: 'http://t9.9026.com/imgs/swiper01.png',
         name: '酒店预订' }],
 
+      [{
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' },
+
+      {
+        img: 'http://t9.9026.com/imgs/swiper01.png',
+        name: '酒店预订' }]],
+
+
 
       dotsStyles: {
         bottom: 24,
@@ -403,6 +473,7 @@ __webpack_require__.r(__webpack_exports__);
         }
         if (index % 4 === 2) {
           item.long = true;
+          item.marginTop = -66 + "rpx";
         }
         if (index % 4 === 3) {
           item.short = true;

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -35,8 +35,15 @@ page.data-v-57280228 {
 .home-swiper.data-v-57280228 {
   height: 416rpx;
 }
-.home-swiper .swiper-box.data-v-57280228 {
-  height: 416rpx;
+.home-swiper .swiper-box.data-v-57280228  swiper-item {
+  width: 100%;
+  height: 208px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.home-swiper .swiper-box.data-v-57280228  swiper-item view {
+  width: 25%;
 }
 .home-nav.data-v-57280228 {
   position: relative;
@@ -170,14 +177,6 @@ page.data-v-57280228 {
   border-radius: 12rpx;
   margin-bottom: 26rpx;
 }
-.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item.data-v-57280228:nth-child(2n+1) {
-  position: relative;
-  top: -33px;
-}
-.home-hotel-img .home-hotel-img-content .home-hotel-img-content-item.data-v-57280228:nth-child(1) {
-  position: relative;
-  top: 0;
-}
 .home-hotel-img .home-hotel-img-content .home-hotel-img-content-item .home-hotel-img-content-item-img.data-v-57280228 {
   width: 332rpx;
   height: 332rpx;

unpackage/dist/dev/mp-weixin/pages/my/PersonalData/personalData.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 519))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 527))
     },
     uniFormsItem: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 528))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 536))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 535))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 543))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/my/integral/integral.js

@@ -155,7 +155,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var helangWaterfallList = function helangWaterfallList() {__webpack_require__.e(/*! require.ensure | components/waterfall/waterfall-list */ "components/waterfall/waterfall-list").then((function () {return resolve(__webpack_require__(/*! components/waterfall/waterfall-list */ 542));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var helangWaterfallList = function helangWaterfallList() {__webpack_require__.e(/*! require.ensure | components/waterfall/waterfall-list */ "components/waterfall/waterfall-list").then((function () {return resolve(__webpack_require__(/*! components/waterfall/waterfall-list */ 550));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/my/integral/integralOrder.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 519))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 527))
     },
     uniFormsItem: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 528))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 536))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 535))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 543))
     },
     uniPopup: function() {
       return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 488))
@@ -164,7 +164,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var pickerAddress = function pickerAddress() {Promise.all(/*! require.ensure | uni_modules/hu-pickerAddress/hu-pickerAddress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/hu-pickerAddress/hu-pickerAddress")]).then((function () {return resolve(__webpack_require__(/*! @/uni_modules/hu-pickerAddress/hu-pickerAddress.vue */ 549));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var pickerAddress = function pickerAddress() {Promise.all(/*! require.ensure | uni_modules/hu-pickerAddress/hu-pickerAddress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/hu-pickerAddress/hu-pickerAddress")]).then((function () {return resolve(__webpack_require__(/*! @/uni_modules/hu-pickerAddress/hu-pickerAddress.vue */ 557));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -95,6 +95,29 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
+try {
+  components = {
+    uModal: function() {
+      return Promise.all(/*! import() | node-modules/uview-ui/components/u-modal/u-modal */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-modal/u-modal")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-modal/u-modal.vue */ 519))
+    }
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function() {
   var _vm = this
   var _h = _vm.$createElement
@@ -203,6 +226,28 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -231,6 +276,12 @@ __webpack_require__.r(__webpack_exports__);
 
   data: function data() {
     return {
+      modal: {
+        show: false,
+        title: '用户信息获取',
+        nickname: '',
+        avatar: '' },
+
       admin: '',
       // 顶部背景图
       imgurl: 'http://t9.9026.com/imgs/bg@2x.png',
@@ -250,13 +301,54 @@ __webpack_require__.r(__webpack_exports__);
 
   },
 
-  onLoad: function onLoad() {
-    this.$store.getters = this.admin;
-    console.log(this.$store.getters, 111);
-
+  onShow: function onShow() {
+    this.admin = this.$store.getters.userInfo;
   },
 
   methods: {
+    // 微信获取头像
+    handleGetWechatUserInfo: function handleGetWechatUserInfo() {
+      console.log(1111);
+      this.modal.show = true;
+      this.modal.nickname = this.admin.nickname;
+      this.modal.avatar = this.admin.avatar;
+    },
+
+
+    //提交微信名称和头像
+    handleConfirmWechatUserInfo: function handleConfirmWechatUserInfo() {var _this = this;
+      if (!this.modal.avatar) {
+        this.$u.toast('请上传头像');
+        return;
+      }
+      if (!this.modal.nickname) {
+        this.$u.toast('请填写昵称');
+        return;
+      }
+      this.$loading('数据提交中...');
+      this.$api.my.update({ avatar: this.modal.avatar, nickname: this.modal.nickname }).then(function (res) {
+        _this.$hideLoading();
+        _this.$store.dispatch('user/info', res.data);
+        _this.modal.show = false;
+      });
+      // this.$api.user.update({ avatar: this.modal.avatar, nickname: this.modal.nickname }).then(res => {
+      //   this.code = null
+      //   this.$hideLoading()
+      //   this.$store.dispatch('user/info', res.data)
+      //   this.modal.show = false
+      // }).catch(() => {
+      //   this.$hideLoading()
+      // })
+    },
+    // 微信获取头像
+    handleChooseAvatar: function handleChooseAvatar(e) {
+      console.log(e.detail);
+      this.modal.avatar = e.detail.avatarUrl;
+    },
+    handleChangeNickname: function handleChangeNickname(res) {
+      this.modal.nickname = res.detail.value;
+    },
+
     // 跳转登录页
     login: function login() {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/my/my.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "我的",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "u-modal": "/node-modules/uview-ui/components/u-modal/u-modal",
     "tab-bar": "/components/TabBar/tabbar"
   }
 }

unpackage/dist/dev/mp-weixin/pages/my/my.wxss

@@ -28,6 +28,11 @@
   height: 100%;
   background-color: #F9F9F9;
 }
+.avatar.data-v-0be17cc6 {
+  width: 176rpx;
+  height: 176rpx;
+  border-radius: 50%;
+}
 .topCard.data-v-0be17cc6 {
   width: 100%;
   border-radius: 0rpx 0rpx 16rpx 16rpx;
@@ -161,7 +166,7 @@
   width: 100%;
   padding-top: 32rpx;
   padding-bottom: 32rpx;
-  border-bottom: 2rpx solid  #F0F0F0;
+  border-bottom: 2rpx solid #F0F0F0;
   display: flex;
   flex-direction: column;
   justify-content: center;

unpackage/dist/dev/mp-weixin/pages/my/prize/exchangePrize.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 519))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 527))
     },
     uniFormsItem: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 528))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 536))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 535))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 543))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/my/verification/orderVerification.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 519))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 527))
     },
     uniFormsItem: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 528))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 536))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 535))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 543))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniTransition: function() {
-      return Promise.all(/*! import() | uni_modules/uni-transition/components/uni-transition/uni-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-transition/components/uni-transition/uni-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-transition/components/uni-transition/uni-transition.vue */ 590))
+      return Promise.all(/*! import() | uni_modules/uni-transition/components/uni-transition/uni-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-transition/components/uni-transition/uni-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-transition/components/uni-transition/uni-transition.vue */ 598))
     }
   }
 } catch (e) {