4 年之前 · 8461183ca3
--- a/components/homeViews/mine-view.vue
+++ b/components/homeViews/mine-view.vue
@@ -1,10 +1,9 @@
 
				 <template>
			
 
				 	<view>
			
 
				 		<view class="container">
			
 
				-			<view class="flex justify-between align-center" style="height: 200upx;">
			
 
				+			<view class="flex justify-between align-center" style="height: 200upx;" v-if="isLogin">
			
 
				 				<view class="padding-left">
			
 
				-					<view class="text-black text-bold text-xl">{{name}}</view>
			
 
				-					<button @click="toAuth">授权</button>  
			
 
				+					<view class="text-black text-bold text-xl">{{userData.nickname}}</view>
			
 
				 					<view class="flex align-center padding-top-sm">
			
 
				 						<view>
			
 
				 							<view class="text-black text-bold">205</view>
			
@@ -25,10 +24,16 @@
 
				 				</view>
			
 
				 				<view class="flex align-center">
			
 
				 					<view class="padding-right">
			
 
				-						<u-avatar src="/static/avatar.png" size="120"></u-avatar>
			
 
				+						<u-avatar :src="userData.headimgurl" size="120"></u-avatar>
			
 
				 					</view>
			
 
				 				</view>
			
 
				 			</view>
			
 
				+			<view class="text-center padding-sm" v-else>
			
 
				+				<view class="margin-bottom">
			
 
				+					<u-avatar size="120"></u-avatar>
			
 
				+				</view>
			
 
				+				<u-button class="custom-style" shape="circle" @click="toAuth">授权登录</u-button>
			
 
				+			</view>
			
 
				 			<view class="padding-lg flex justify-around align-center">
			
 
				 				<view class="flex" @click="navByIcon('/pages/activityList/mine/pointsDetail')">
			
 
				 					<image src="/static/icon-points.png" style="width: 80upx;height: 80upx;"></image>
			
@@ -69,13 +74,18 @@
 
				 	import {authUrl } from '@/common/conf/config.js'
			
 
				 	export default {
			
 
				 		props: {
			
 
				-
			
 
				+			userData: {
			
 
				+				type: Object,
			
 
				+				default() {
			
 
				+					return {}
			
 
				+				}
			
 
				+			}
			
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
 
				-				name: 'Daniel Hua',
			
 
				 				hotVaule: '205',
			
 
				 				points: '886',
			
 
				+				isLogin: false,
			
 
				 				iconList: [
			
 
				 					{name: '我的礼品', icon: '/static/icon-gift.png', width: '36upx', height: '33upx', url: '/pages/activityList/mine/myGift'},
			
 
				 					{name: '我的音乐', icon: '/static/icon-music.png', width: '33upx', height: '32upx', url: '/pages/activityList/mine/myMusic'},
			
@@ -89,6 +99,13 @@
 
				 				],
			
 
				 			}
			
 
				 		},
			
 
				+		mounted() {
			
 
				+			if (this.$u.test.isEmpty(this.userData)) {
			
 
				+				this.isLogin = false;
			
 
				+			} else {
			
 
				+				this.isLogin = true;
			
 
				+			}
			
 
				+		},
			
 
				 		methods: {
			
 
				 			toAuth() {
			
 
				 				 window.location.href = authUrl;
			
@@ -96,12 +113,12 @@
 
				 			//跳转需要带参数
			
 
				 			edit() {
			
 
				 				uni.navigateTo({
			
 
				-					url: '/pages/activityList/mine/edit'
			
 
				+					url: '/pages/activityList/mine/edit?openid=' + this.userData.openid
			
 
				 				})
			
 
				 			},
			
 
				 			navByIcon(url) {
			
 
				 				uni.navigateTo({
			
 
				-					url: url
			
 
				+					url: url 
			
 
				 				})
			
 
				 			}
			
 
				 		}
			
@@ -115,4 +132,10 @@
 
				 		border-radius: 28upx;
			
 
				 		box-shadow: -1upx -1upx 60upx #d8d8d8;
			
 
				 	}
			
 
				+	.custom-style {
			
 
				+		background-color: #5b3ee7;
			
 
				+		width: 200upx;
			
 
				+		height: 60upx;
			
 
				+		color: #ffffff;
			
 
				+	}
			
 
				 </style>
			
--- a/pages/activityList/home/home.vue
+++ b/pages/activityList/home/home.vue
@@ -6,7 +6,7 @@
 
				 		</view>
			
 
				 		<!--个人中心-->
			
 
				 		<view v-if="current == 2">
			
 
				-			<mine-view></mine-view>
			
 
				+			<mine-view :userData="userData"></mine-view>
			
 
				 		</view>
			
 
				 		<view style="height: 100upx;"></view>
			
 
				 		<view class="footer-fixed">
			
@@ -38,6 +38,7 @@
 
				 					{image: '/static/swiper1.png'},
			
 
				 					{image: '/static/swiper1.png'}
			
 
				 				],
			
 
				+				userData: {},
			
 
				 			}
			
 
				 		},
			
 
				 		async onLoad(options) {
			
@@ -48,7 +49,7 @@
 
				 			async authorization() {
			
 
				 				let params = getUrlParams(window.location.search);
			
 
				 				this.$u.api.wxInfo.getUserInfo({userCode: params.code}).then(res => {
			
 
				-					alert(JSON.parse(res))
			
 
				+					this.userData = res.data;
			
 
				 				})
			
 
				 			},
			
 
				 			change(index) {
			
--- a/unpackage/dist/build/.automator/h5/.automator.json
+++ b/unpackage/dist/build/.automator/h5/.automator.json
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +0,0 @@
 
				-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>SoundOfMusic-H5</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
			
 
				-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.776c78d1.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0f7df6ff.js></script><script src=./static/js/index.40a53570.js></script></body></html>
			
--- a/unpackage/dist/build/h5/static/1.png
+++ b/unpackage/dist/build/h5/static/1.png
--- a/unpackage/dist/build/h5/static/2.png
+++ b/unpackage/dist/build/h5/static/2.png
--- a/unpackage/dist/build/h5/static/3.png
+++ b/unpackage/dist/build/h5/static/3.png
--- a/unpackage/dist/build/h5/static/activity.png
+++ b/unpackage/dist/build/h5/static/activity.png
--- a/unpackage/dist/build/h5/static/address.png
+++ b/unpackage/dist/build/h5/static/address.png
--- a/unpackage/dist/build/h5/static/avatar.png
+++ b/unpackage/dist/build/h5/static/avatar.png
--- a/unpackage/dist/build/h5/static/avatar2.png
+++ b/unpackage/dist/build/h5/static/avatar2.png
--- a/unpackage/dist/build/h5/static/bgimg.png
+++ b/unpackage/dist/build/h5/static/bgimg.png
--- a/unpackage/dist/build/h5/static/crown.png
+++ b/unpackage/dist/build/h5/static/crown.png
--- a/unpackage/dist/build/h5/static/dialogBgImg.png
+++ b/unpackage/dist/build/h5/static/dialogBgImg.png
--- a/unpackage/dist/build/h5/static/gift/commodity1.png
+++ b/unpackage/dist/build/h5/static/gift/commodity1.png
--- a/unpackage/dist/build/h5/static/gift/commodity2.png
+++ b/unpackage/dist/build/h5/static/gift/commodity2.png
--- a/unpackage/dist/build/h5/static/gift/commodity3.png
+++ b/unpackage/dist/build/h5/static/gift/commodity3.png
--- a/unpackage/dist/build/h5/static/gift/commodity4.png
+++ b/unpackage/dist/build/h5/static/gift/commodity4.png
--- a/unpackage/dist/build/h5/static/hot.png
+++ b/unpackage/dist/build/h5/static/hot.png
--- a/unpackage/dist/build/h5/static/icon-activity.png
+++ b/unpackage/dist/build/h5/static/icon-activity.png
--- a/unpackage/dist/build/h5/static/icon-awards.png
+++ b/unpackage/dist/build/h5/static/icon-awards.png
--- a/unpackage/dist/build/h5/static/icon-gift.png
+++ b/unpackage/dist/build/h5/static/icon-gift.png
--- a/unpackage/dist/build/h5/static/icon-history.png
+++ b/unpackage/dist/build/h5/static/icon-history.png
--- a/unpackage/dist/build/h5/static/icon-lottery.png
+++ b/unpackage/dist/build/h5/static/icon-lottery.png
--- a/unpackage/dist/build/h5/static/icon-mall.png
+++ b/unpackage/dist/build/h5/static/icon-mall.png
--- a/unpackage/dist/build/h5/static/icon-music.png
+++ b/unpackage/dist/build/h5/static/icon-music.png
--- a/unpackage/dist/build/h5/static/icon-order.png
+++ b/unpackage/dist/build/h5/static/icon-order.png
--- a/unpackage/dist/build/h5/static/icon-person.png
+++ b/unpackage/dist/build/h5/static/icon-person.png
--- a/unpackage/dist/build/h5/static/icon-points.png
+++ b/unpackage/dist/build/h5/static/icon-points.png
--- a/unpackage/dist/build/h5/static/icon-rule.png
+++ b/unpackage/dist/build/h5/static/icon-rule.png
--- a/unpackage/dist/build/h5/static/icon-vip.png
+++ b/unpackage/dist/build/h5/static/icon-vip.png
--- a/unpackage/dist/build/h5/static/icon-welfare.png
+++ b/unpackage/dist/build/h5/static/icon-welfare.png
--- a/unpackage/dist/build/h5/static/index.776c78d1.css
+++ b/unpackage/dist/build/h5/static/index.776c78d1.css
--- a/unpackage/dist/build/h5/static/index/finish.png
+++ b/unpackage/dist/build/h5/static/index/finish.png
--- a/unpackage/dist/build/h5/static/index/fire.png
+++ b/unpackage/dist/build/h5/static/index/fire.png
--- a/unpackage/dist/build/h5/static/index/huodong1.png
+++ b/unpackage/dist/build/h5/static/index/huodong1.png
--- a/unpackage/dist/build/h5/static/index/huodong2x.png
+++ b/unpackage/dist/build/h5/static/index/huodong2x.png
--- a/unpackage/dist/build/h5/static/index/ing.png
+++ b/unpackage/dist/build/h5/static/index/ing.png
--- a/unpackage/dist/build/h5/static/index/swiper.png
+++ b/unpackage/dist/build/h5/static/index/swiper.png
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.0f7df6ff.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.0f7df6ff.js
--- a/unpackage/dist/build/h5/static/js/index.40a53570.js
+++ b/unpackage/dist/build/h5/static/js/index.40a53570.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-activityDetail.33c74318.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-activityDetail.33c74318.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-activityDetail~pages-activityList-activity-boost~pages-activityList-acti~cfae8e48.71b259fb.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-activityDetail~pages-activityList-activity-boost~pages-activityList-acti~cfae8e48.71b259fb.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-awards.20c50f53.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-awards.20c50f53.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-boost.e6a1dc2f.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-boost.e6a1dc2f.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-boost~pages-activityList-mine-edit~pages-activityList-mine-myGift~pages-~9c3006db.c2cf43cd.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-boost~pages-activityList-mine-edit~pages-activityList-mine-myGift~pages-~9c3006db.c2cf43cd.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-hot.0740872b.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-hot.0740872b.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-signUp.b2d62000.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-signUp.b2d62000.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-songRank.9ecc3dea.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-songRank.9ecc3dea.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-activity-songRank~pages-activityList-mine-myGift~pages-activityList-mine-order-address.70ca7117.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-activity-songRank~pages-activityList-mine-myGift~pages-activityList-mine-order-address.70ca7117.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-home-home.317cbe89.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-home-home.317cbe89.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-index.0ba23fa9.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-index.0ba23fa9.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-boostDetail.9ff72532.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-boostDetail.9ff72532.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-edit.4ecc7c84.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-edit.4ecc7c84.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-introduction.e9858fdf.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-introduction.e9858fdf.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-myBoost.35ee69c2.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-myBoost.35ee69c2.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-myGift.ba1c086b.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-myGift.ba1c086b.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-myMusic.f5bf13fe.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-myMusic.f5bf13fe.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-myWelfare.c07571d6.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-myWelfare.c07571d6.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-order-address.3152af57.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-order-address.3152af57.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-order-orderConfirm.c2217264.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-order-orderConfirm.c2217264.js
--- a/unpackage/dist/build/h5/static/js/pages-activityList-mine-pointsDetail.a2f23fa3.js
+++ b/unpackage/dist/build/h5/static/js/pages-activityList-mine-pointsDetail.a2f23fa3.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.8d2a6f82.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.8d2a6f82.js
--- a/unpackage/dist/build/h5/static/ldt/aolinpike.png
+++ b/unpackage/dist/build/h5/static/ldt/aolinpike.png
--- a/unpackage/dist/build/h5/static/ldt/costPoints.png
+++ b/unpackage/dist/build/h5/static/ldt/costPoints.png
--- a/unpackage/dist/build/h5/static/ldt/earnPoints.png
+++ b/unpackage/dist/build/h5/static/ldt/earnPoints.png
--- a/unpackage/dist/build/h5/static/ldt/exchangePoints.png
+++ b/unpackage/dist/build/h5/static/ldt/exchangePoints.png
--- a/unpackage/dist/build/h5/static/long.png
+++ b/unpackage/dist/build/h5/static/long.png
--- a/unpackage/dist/build/h5/static/more.png
+++ b/unpackage/dist/build/h5/static/more.png
--- a/unpackage/dist/build/h5/static/musicCover.png
+++ b/unpackage/dist/build/h5/static/musicCover.png
--- a/unpackage/dist/build/h5/static/personBgImg.png
+++ b/unpackage/dist/build/h5/static/personBgImg.png
--- a/unpackage/dist/build/h5/static/present1.png
+++ b/unpackage/dist/build/h5/static/present1.png
--- a/unpackage/dist/build/h5/static/present2.png
+++ b/unpackage/dist/build/h5/static/present2.png
--- a/unpackage/dist/build/h5/static/present3.png
+++ b/unpackage/dist/build/h5/static/present3.png
--- a/unpackage/dist/build/h5/static/present4.png
+++ b/unpackage/dist/build/h5/static/present4.png
--- a/unpackage/dist/build/h5/static/signUp.png
+++ b/unpackage/dist/build/h5/static/signUp.png
--- a/unpackage/dist/build/h5/static/singerBg.png
+++ b/unpackage/dist/build/h5/static/singerBg.png
--- a/unpackage/dist/build/h5/static/song.png
+++ b/unpackage/dist/build/h5/static/song.png
--- a/unpackage/dist/build/h5/static/songRank/fm1.png
+++ b/unpackage/dist/build/h5/static/songRank/fm1.png
--- a/unpackage/dist/build/h5/static/songRank/fm2.png
+++ b/unpackage/dist/build/h5/static/songRank/fm2.png
--- a/unpackage/dist/build/h5/static/songRank/fm3.png
+++ b/unpackage/dist/build/h5/static/songRank/fm3.png
--- a/unpackage/dist/build/h5/static/songRank/fm4.png
+++ b/unpackage/dist/build/h5/static/songRank/fm4.png
--- a/unpackage/dist/build/h5/static/songRank/medal.png
+++ b/unpackage/dist/build/h5/static/songRank/medal.png
--- a/unpackage/dist/build/h5/static/songRank/songRankBgImg.png
+++ b/unpackage/dist/build/h5/static/songRank/songRankBgImg.png
--- a/unpackage/dist/build/h5/static/swiper1.png
+++ b/unpackage/dist/build/h5/static/swiper1.png
--- a/unpackage/dist/build/h5/static/userBgImg.png
+++ b/unpackage/dist/build/h5/static/userBgImg.png
--- a/unpackage/dist/build/h5/static/welfare/welfare1.png
+++ b/unpackage/dist/build/h5/static/welfare/welfare1.png
--- a/unpackage/dist/build/h5/static/welfare/welfare2.png
+++ b/unpackage/dist/build/h5/static/welfare/welfare2.png
--- a/unpackage/dist/build/h5/static/welfare/welfare3.png
+++ b/unpackage/dist/build/h5/static/welfare/welfare3.png
--- a/unpackage/dist/build/h5/static/welfare/welfare4.png
+++ b/unpackage/dist/build/h5/static/welfare/welfare4.png
--- a/unpackage/dist/build/h5/static/welfare/welfare5.png
+++ b/unpackage/dist/build/h5/static/welfare/welfare5.png