update xiaochengxu

sleep/components/musicControl/index.vue

@@ -56,9 +56,9 @@ export default {
 .fotter-container {
 	height: 110rpx;
 	width: 100%;
-	position: fixed;
-	bottom: 50px;
-	left: 0;
+	// position: fixed;
+	// bottom: 0px;
+	// left: 0;
 	z-index: 9999;
 
 	.fixed-container {
@@ -66,7 +66,7 @@ export default {
 		z-index: 20;
 		width: 100%;
 		height: 110rpx;
-		bottom: 50px;
+		bottom: 0px;
 		// box-shadow: 0 1px 2px rgb(0, 21, 0.1);
 		display: flex;
 		background: rgba(22, 125, 242, 1);;

sleep/components/tabBar/index.vue

@@ -72,10 +72,10 @@ export default {
 				url: '/pages/my/index'
 			});
 		},
-		
+			
 		handleToHome(){
-			uni.navigateTo({
-				url: '/pages/home/index'
+			uni.reLaunch({
+				url: '/pages/home/index'
 			});
 		},
 

sleep/pages.json

@@ -116,5 +116,32 @@
 		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#ffffff"
+	},
+	"tabBar": {
+		"color": "#ffffff",
+		"selectedColor": "#ffffff",
+		"borderStyle": "black",
+		"backgroundColor": "#167DF2",
+		"list": [{
+			"pagePath": "pages/home/index",
+			"iconPath": "static/tabBar/home.png",
+			"selectedIconPath": "static/tabBar/homeSel.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/report/report",
+			"iconPath": "static/tabBar/report.png",
+			"selectedIconPath": "static/tabBar/reportSel.png",
+			"text": "报告"
+		}, {
+			"pagePath": "pages/index/index",
+			"iconPath": "static/tabBar/discover.png",
+			"selectedIconPath": "static/tabBar/discoverSel.png",
+			"text": "发现"
+		}, {
+			"pagePath": "pages/my/index",
+			"iconPath": "static/tabBar/my.png",
+			"selectedIconPath": "static/tabBar/mySel.png",
+			"text": "我的"
+		}]
 	}
 }

sleep/pages/alertSetting/alertSetting.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-col justify-start page">
-	  <cu-custom bgColor="#000000"><view slot="content" style="color: #FFFFFF">UU睡眠</view></cu-custom>
+	  <cu-custom isBack="true" bgColor="#000000"><view slot="content" style="color: #FFFFFF">UU睡眠</view></cu-custom>
 
 	  <view class="flex-col justify-start section">
 		  

sleep/pages/dayRecommend/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="day-recommend-container">
 		<view class="vague-wrapper flex align-center">
-			<image src="../../static/background.png" class="background-img"></image>
+			<!-- <image src="../../static/background.png" class="background-img"></image> -->
 			<view class="absolve-wrapper">
 				<cu-custom class="head-title" :isBack="true" bgColor="unset"><block slot="content">每日推荐</block></cu-custom>
 				<view class="day-recommend-info" :style="{ 'padding-top': CustomBar + 'px' }">

sleep/pages/home/index.vue

@@ -199,7 +199,7 @@
 				</view>
 			
 				<view class="flex-col home-alert space-y-4">
-					<view class="flex-row items-center space-x-4 home-alert-header">
+					<view @click="jumpToAlertSetting" class="flex-row items-center space-x-4 home-alert-header">
 						<image
 							class="image_10"
 							src="../../static/home/homeIconHeart.png"
@@ -207,7 +207,7 @@
 						<text class="font_1">实时预警</text>
 					</view>
 					
-					<view class="flex-col home-alert-list">
+					<view @click="handleAlertSetting" class="flex-col home-alert-list">
 						<view class="flex-row justify-between items-center list-item" :key="i" v-for="(item, i) in list_alerts">
 							<view class="flex-row items-center space-x-6">
 								<image
@@ -228,7 +228,7 @@
 			</view>
 	  </view>
 	  
-	  <tab-bar currentPage="home" />
+	  <!-- <tab-bar currentPage="home" /> -->
 	  
 	</view>
 </template>
@@ -258,7 +258,11 @@ export default {
 		
 	},
 	methods: {
-	
+		handleAlertSetting() {
+			uni.navigateTo({
+				url: "/pages/alertSetting/alertSetting"
+			});
+		}
 	}
 };
 </script>
@@ -482,12 +486,13 @@ export default {
 	
 	
 .container-bg {
-	position: absolute;
+	position: fixed;
 	left: -130px;
 	top: -130px;
 	width: 480px;
 	height: 344px;
 	opacity: 1;
+	overflow: hidden;
 	border-radius: 63px;
 	-webkit-transform: rotate(-315deg);
 	transform: rotate(-315deg);

sleep/pages/index/index.vue

@@ -75,22 +75,123 @@
 		
 		<music-control />
 		
-		<tab-bar currentPage="index" />
+		<!-- <tab-bar currentPage="index" /> -->
 	</view>
 </template>
 
 <script>
 import songList from './components/songList.vue';
 import musicList from './components/musicList.vue';
-import singerList from './components/singerList.vue';
 import { getImage, getName } from '@/utils/index.js';
 export default {
 	data() {
 		return {
 			//轮播图
-			swiperList: [],
-			recommendList: [],
-			dayRecommendList: [],
+			swiperList: [
+				{
+					"pic": "http://p1.music.126.net/ZuDmYz9gKTes67weCA6roQ==/109951168702825545.jpg",
+					"bannerId": "1687869567089252"
+				},
+				{
+					"pic": "http://p1.music.126.net/vrPXmAQsg-aW5I3EEFcKcw==/109951168702819867.jpg",
+					"bannerId": "1687869640017460"
+				},
+				{
+					"pic": "http://p1.music.126.net/xK69a1N5DCqNQXts64y3xA==/109951168703821815.jpg",
+					"bannerId": "1687869708598159"
+				}
+			],
+			recommendList: [
+				{
+				    "id": 331841455,
+				    "type": 0,
+				    "name": "深度睡眠 |重度失眠者专用歌单",
+				    "copywriter": "",
+				    "picUrl": "https://p2.music.126.net/g2_Gv0dtAicJ3ChTYu28_g==/1393081239628722.jpg",
+				    "canDislike": true,
+				    "trackNumberUpdateTime": 1552746520361,
+				    "playCount": 72862600,
+				    "trackCount": 32,
+				    "highQuality": true,
+				    "alg": "alg_high_quality"
+				},
+				{
+				    "id": 5338700800,
+			        "type": 0,
+				    "name": "一个双子座的听歌列表",
+				    "copywriter": "",
+				    "picUrl": "https://p2.music.126.net/SATl5PH1NpEPHsYaB24t5A==/109951166269856073.jpg",
+				    "canDislike": true,
+				    "trackNumberUpdateTime": 1685028754372,
+				    "playCount": 29329484,
+				    "trackCount": 361,
+				    "highQuality": false,
+				    "alg": "alg_high_quality"        
+				},
+				{
+				    "id": 2042205655,
+				    "type": 0,
+				    "name": "愿还会有人，做个傻子陪你浪费一生",
+				    "copywriter": "",
+				    "picUrl": "https://p2.music.126.net/AWcDI5wc9fkS2bZt6wIm-Q==/109951163212638897.jpg",
+				    "canDislike": true,
+				    "trackNumberUpdateTime": 1679320967844,
+				    "playCount": 25818546,
+				    "trackCount": 41,
+				    "highQuality": false,
+				    "alg": "alg_high_quality"        
+				},
+				{
+				    "id": 2139324915,
+				    "type": 0,
+				    "name": "歌词唱透了心声，回忆模糊了眼眸",
+				    "copywriter": "",
+				    "picUrl": "https://p2.music.126.net/pa1t9G_Mt2xJm_xqUUjvIw==/109951163676905233.jpg",
+				    "canDislike": true,
+				    "trackNumberUpdateTime": 1687945378874,
+				    "playCount": 69736672,
+				    "trackCount": 514,
+				    "highQuality": false,
+				    "alg": "alg_high_quality"    
+				}        
+			],
+			dayRecommendList: [
+				{
+					"id": 159400773,
+					"name": "JJ的咖啡调调, Vol. 2",
+					"picUrl": "http://p2.music.126.net/4x-65bnidSKyEMDBmGtn8g==/109951168466764238.jpg"
+				},
+				{
+					"id": 160760191,
+					"name": "我们的歌",
+					"picUrl": "http://p2.music.126.net/Gm2v1KrDe2TwplzxcmTxYg==/109951168428025131.jpg"
+				},
+				{
+					"id": 78938226,
+					"name": "听闻余生",
+					"picUrl": "http://p2.music.126.net/DK1_4sP_339o5rowMdPXdw==/109951164071024476.jpg"
+				},
+				{
+					"id": 129849508,
+					"name": "时光背面的我",
+					"picUrl": "http://p2.music.126.net/VOcPF6uCGAlwESFyyGqHrg==/109951166141514551.jpg"
+				},
+				{
+					"id": 160760191,
+					"name": "我们的歌",
+					"picUrl": "http://p2.music.126.net/Gm2v1KrDe2TwplzxcmTxYg==/109951168428025131.jpg"
+				},
+				{
+					"id": 78938226,
+					"name": "听闻余生",
+					"picUrl": "http://p2.music.126.net/DK1_4sP_339o5rowMdPXdw==/109951164071024476.jpg"
+				},
+				{
+					"id": 129849508,
+					"name": "时光背面的我",
+					"picUrl": "http://p2.music.126.net/VOcPF6uCGAlwESFyyGqHrg==/109951166141514551.jpg"
+				}
+			],
 			dayRecommendMusicList: [],
 			newSongList: [],
 			hotSingerList: [],
@@ -99,8 +200,7 @@ export default {
 	},
 	components: {
 		songList,
-		musicList,
-		singerList
+		musicList
 	},
 	computed: {
 		cookie() {
@@ -112,14 +212,14 @@ export default {
 		}
 	},
 	onShow() {
-		this.getDayRecommendData();
-		this.getDayRecommendMusicData();
+		// this.getDayRecommendData();
+		// this.getDayRecommendMusicData();
 	},
 	created() {
-		this.getData();
+		// this.getData();
 	},
 	onPullDownRefresh() {
-		this.getData();
+		// this.getData();
 		setTimeout(() => {
 			uni.stopPullDownRefresh();
 		}, 1000);
@@ -162,13 +262,16 @@ export default {
 
 		//获取推荐歌单数据
 		async getRecommendData() {
-			const data = await this.$api.getRecommendList();
+			const data = await this.$api.getRecommendList();
+			
 			this.recommendList = data.result.slice(0, 8);
 		},
 
 		//获取猜你喜欢歌曲
 		async getDayRecommendData() {
-			const { data } = await this.$api.getDayRecommendList();
+			const { data } = await this.$api.getDayRecommendList();
+			console.log('data recommend');
+			console.log(data);
 			this.dayRecommendList = data.dailySongs;
 		},
 

sleep/pages/login/index.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="login-container">
-		<image src="../../static/loginBg.png" class="background-img"></image>
+		<!-- <image src="../../static/loginBg.png" class="background-img"></image> -->
 		<view class="absolve-wrapper">
-			<view class="logo"><image src="../../static/logo.png" class="logo-img"></image></view>
+			<!-- <view class="logo"><image src="../../static/logo.png" class="logo-img"></image></view> -->
 			<view class="text-title">我有故事和歌，你听吗？</view>
 			<view class="login-main">
 				<view class="input-wrapper">

sleep/pages/my/index.vue

@@ -12,7 +12,7 @@
 		      <view class="flex-col section pos">
 		        
 		        <view class="flex-col my_device_profile">
-		          <view class="flex-row space-x-19">
+		          <view @click="handleAuth" class="flex-row space-x-19">
 		            <image
 		              class="shrink-0 image_5"
 					  src="../../static/mine/myAvatar.png"
@@ -102,7 +102,7 @@
 		                class="shrink-0 image_10 image_11"
 		                src="../../static/mine/myIconLink.png"
 		              />
-		              <text class="font_5 text_14">共享数据</text>
+		              <text @click="handleShareData" class="font_5 text_14">共享数据</text>
 		              <image
 		                class="shrink-0 image_10 image_12"
 		                src="../../static/mine/myIconSetting.png"
@@ -151,7 +151,7 @@
 		                class="shrink-0 image_10 image_15"
 		                src="../../static/mine/myIconLink.png"
 		              />
-		              <text class="font_5 text_23">共享数据</text>
+		              <text @click="handleShareData" class="font_5 text_23">共享数据</text>
 		              <image
 		                class="shrink-0 image_10 image_16"
 		                src="../../static/mine/myIconSetting.png"
@@ -286,7 +286,7 @@
 		  </view>
 		</view>
 		
-		<tab-bar currentPage="my" />
+		<!-- <tab-bar currentPage="my" /> -->
 	</view>
 </template>
 
@@ -307,12 +307,23 @@ export default {
 	}),
 	onShow() {
 		if (this.currentType == 'history') {
-			this.getUserHistory();
+			// this.getUserHistory();
 		} else {
-			this.getUserInfo();
+			// this.getUserInfo();
 		}
 	},
-	methods: {
+	methods: {
+		handleAuth() {
+			uni.navigateTo({
+				url: '/pages/auth/auth'	
+			});
+		},
+		handleShareData () {
+			uni.navigateTo({
+				url: '/pages/shareUser/shareUser'
+			})
+		},
+		
 		//获取用户喜欢的音乐
 		async getUserInfo() {
 			const uid = this.userInfo.id;
@@ -408,7 +419,7 @@ export default {
 		}
 	}
 	.container-bg {
-		position: absolute;
+		position: fixed;
 		left: -130px;
 		top: -130px;
 		width: 480px;

sleep/pages/report/report.vue

@@ -370,7 +370,7 @@
 		
 		  
 		</view>
-		<tab-bar currentPage="report" />
+		<!-- <tab-bar currentPage="report" /> -->
 	</view>
 </template>
 
@@ -1131,10 +1131,12 @@
 	    .report_header {
 		  
 		  .report-header-img {
-			  width: 100%;
-			  height: 100%;			  
 			  position: absolute;
 			  top: -3rem;
+			  left: 50%;
+			  width: 22.5rem;
+			  height: 28.5em;
+			  margin-left: -11.25rem;    
 		  }
 	      .report_score {
 			padding-top: 1rem;

sleep/pages/shareUser/shareUser.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-col justify-start page">
-	  <cu-custom bgColor="#000000"><view slot="content" style="color: #FFFFFF">UU睡眠</view></cu-custom>
+	  <cu-custom isBack="true" bgColor="#000000"><view slot="content" style="color: #FFFFFF">UU睡眠</view></cu-custom>
 		
 	  <view class="flex-col justify-start section">
 	    <view class="flex-col section_2 space-y-421">

sleep/pages/songDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="song-detail-container">
 		<view class="vague-wrapper  flex align-center">
-			<image src="../../static/background.png" class="background-img"></image>
+			<!-- <image src="../../static/background.png" class="background-img"></image> -->
 			<view class="absolve-wrapper">
 			<cu-custom class="head-title" :isBack="true" bgColor="unset"><block slot="content">歌单详情</block></cu-custom>
 			<view class="day-recommend-info" :style="{ 'padding-top': CustomBar + 'px' }">

sleep/unpackage/dist/dev/mp-weixin/app.json

@@ -27,6 +27,38 @@
     "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#ffffff"
   },
+  "tabBar": {
+    "color": "#ffffff",
+    "selectedColor": "#ffffff",
+    "borderStyle": "black",
+    "backgroundColor": "#167DF2",
+    "list": [
+      {
+        "pagePath": "pages/home/index",
+        "iconPath": "static/tabBar/home.png",
+        "selectedIconPath": "static/tabBar/homeSel.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/report/report",
+        "iconPath": "static/tabBar/report.png",
+        "selectedIconPath": "static/tabBar/reportSel.png",
+        "text": "报告"
+      },
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tabBar/discover.png",
+        "selectedIconPath": "static/tabBar/discoverSel.png",
+        "text": "发现"
+      },
+      {
+        "pagePath": "pages/my/index",
+        "iconPath": "static/tabBar/my.png",
+        "selectedIconPath": "static/tabBar/mySel.png",
+        "text": "我的"
+      }
+    ]
+  },
   "requiredBackgroundModes": [
     "audio"
   ],

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

@@ -3759,7 +3759,7 @@ function populateParameters(result) {
   // wx.getAccountInfoSync
 
   var parameters = {
-    appId: "",
+    appId: "__UNI__42E80AD",
     appName: "sleep",
     appVersion: "1.0.0",
     appVersionCode: "100",
@@ -3858,7 +3858,7 @@ var getAppBaseInfo = {
     var _hostName = getHostName(result);
     var hostLanguage = language.replace('_', '-');
     result = sortObject(Object.assign(result, {
-      appId: "",
+      appId: "__UNI__42E80AD",
       appName: "sleep",
       appVersion: "1.0.0",
       appVersionCode: "100",

sleep/unpackage/dist/dev/mp-weixin/components/musicControl/index.wxss

@@ -27,9 +27,6 @@
 .fotter-container.data-v-cfcae314 {
   height: 110rpx;
   width: 100%;
-  position: fixed;
-  bottom: 50px;
-  left: 0;
   z-index: 9999;
 }
 .fotter-container .fixed-container.data-v-cfcae314 {
@@ -37,7 +34,7 @@
   z-index: 20;
   width: 100%;
   height: 110rpx;
-  bottom: 50px;
+  bottom: 0px;
   display: flex;
   background: #167df2;
 }

sleep/unpackage/dist/dev/mp-weixin/components/tabBar/index.js

@@ -197,7 +197,7 @@ var _default = {
       });
     },
     handleToHome: function handleToHome() {
-      uni.navigateTo({
+      uni.reLaunch({
         url: '/pages/home/index'
       });
     },

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

@@ -158,7 +158,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -418,9 +418,16 @@ var _default = {
   },
   created: function created() {},
   computed: {},
-  methods: {}
+  methods: {
+    handleAlertSetting: function handleAlertSetting() {
+      uni.navigateTo({
+        url: "/pages/alertSetting/alertSetting"
+      });
+    }
+  }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

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

@@ -223,12 +223,13 @@
   margin-left: 1rem;
 }
 .container-bg.data-v-71e217db {
-  position: absolute;
+  position: fixed;
   left: -130px;
   top: -130px;
   width: 480px;
   height: 344px;
   opacity: 1;
+  overflow: hidden;
   border-radius: 63px;
   -webkit-transform: rotate(-315deg);
   transform: rotate(-315deg);

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

@@ -168,18 +168,98 @@ var musicList = function musicList() {
     return resolve(__webpack_require__(/*! ./components/musicList.vue */ 264));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
-var singerList = function singerList() {
-  __webpack_require__.e(/*! require.ensure | pages/index/components/singerList */ "pages/index/components/singerList").then((function () {
-    return resolve(__webpack_require__(/*! ./components/singerList.vue */ 271));
-  }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
-};
 var _default = {
   data: function data() {
     return {
       //轮播图
-      swiperList: [],
-      recommendList: [],
-      dayRecommendList: [],
+      swiperList: [{
+        "pic": "http://p1.music.126.net/ZuDmYz9gKTes67weCA6roQ==/109951168702825545.jpg",
+        "bannerId": "1687869567089252"
+      }, {
+        "pic": "http://p1.music.126.net/vrPXmAQsg-aW5I3EEFcKcw==/109951168702819867.jpg",
+        "bannerId": "1687869640017460"
+      }, {
+        "pic": "http://p1.music.126.net/xK69a1N5DCqNQXts64y3xA==/109951168703821815.jpg",
+        "bannerId": "1687869708598159"
+      }],
+      recommendList: [{
+        "id": 331841455,
+        "type": 0,
+        "name": "深度睡眠 |重度失眠者专用歌单",
+        "copywriter": "",
+        "picUrl": "https://p2.music.126.net/g2_Gv0dtAicJ3ChTYu28_g==/1393081239628722.jpg",
+        "canDislike": true,
+        "trackNumberUpdateTime": 1552746520361,
+        "playCount": 72862600,
+        "trackCount": 32,
+        "highQuality": true,
+        "alg": "alg_high_quality"
+      }, {
+        "id": 5338700800,
+        "type": 0,
+        "name": "一个双子座的听歌列表",
+        "copywriter": "",
+        "picUrl": "https://p2.music.126.net/SATl5PH1NpEPHsYaB24t5A==/109951166269856073.jpg",
+        "canDislike": true,
+        "trackNumberUpdateTime": 1685028754372,
+        "playCount": 29329484,
+        "trackCount": 361,
+        "highQuality": false,
+        "alg": "alg_high_quality"
+      }, {
+        "id": 2042205655,
+        "type": 0,
+        "name": "愿还会有人，做个傻子陪你浪费一生",
+        "copywriter": "",
+        "picUrl": "https://p2.music.126.net/AWcDI5wc9fkS2bZt6wIm-Q==/109951163212638897.jpg",
+        "canDislike": true,
+        "trackNumberUpdateTime": 1679320967844,
+        "playCount": 25818546,
+        "trackCount": 41,
+        "highQuality": false,
+        "alg": "alg_high_quality"
+      }, {
+        "id": 2139324915,
+        "type": 0,
+        "name": "歌词唱透了心声，回忆模糊了眼眸",
+        "copywriter": "",
+        "picUrl": "https://p2.music.126.net/pa1t9G_Mt2xJm_xqUUjvIw==/109951163676905233.jpg",
+        "canDislike": true,
+        "trackNumberUpdateTime": 1687945378874,
+        "playCount": 69736672,
+        "trackCount": 514,
+        "highQuality": false,
+        "alg": "alg_high_quality"
+      }],
+      dayRecommendList: [{
+        "id": 159400773,
+        "name": "JJ的咖啡调调, Vol. 2",
+        "picUrl": "http://p2.music.126.net/4x-65bnidSKyEMDBmGtn8g==/109951168466764238.jpg"
+      }, {
+        "id": 160760191,
+        "name": "我们的歌",
+        "picUrl": "http://p2.music.126.net/Gm2v1KrDe2TwplzxcmTxYg==/109951168428025131.jpg"
+      }, {
+        "id": 78938226,
+        "name": "听闻余生",
+        "picUrl": "http://p2.music.126.net/DK1_4sP_339o5rowMdPXdw==/109951164071024476.jpg"
+      }, {
+        "id": 129849508,
+        "name": "时光背面的我",
+        "picUrl": "http://p2.music.126.net/VOcPF6uCGAlwESFyyGqHrg==/109951166141514551.jpg"
+      }, {
+        "id": 160760191,
+        "name": "我们的歌",
+        "picUrl": "http://p2.music.126.net/Gm2v1KrDe2TwplzxcmTxYg==/109951168428025131.jpg"
+      }, {
+        "id": 78938226,
+        "name": "听闻余生",
+        "picUrl": "http://p2.music.126.net/DK1_4sP_339o5rowMdPXdw==/109951164071024476.jpg"
+      }, {
+        "id": 129849508,
+        "name": "时光背面的我",
+        "picUrl": "http://p2.music.126.net/VOcPF6uCGAlwESFyyGqHrg==/109951166141514551.jpg"
+      }],
       dayRecommendMusicList: [],
       newSongList: [],
       hotSingerList: [],
@@ -188,8 +268,7 @@ var _default = {
   },
   components: {
     songList: songList,
-    musicList: musicList,
-    singerList: singerList
+    musicList: musicList
   },
   computed: {
     cookie: function cookie() {
@@ -201,14 +280,14 @@ var _default = {
     }
   },
   onShow: function onShow() {
-    this.getDayRecommendData();
-    this.getDayRecommendMusicData();
+    // this.getDayRecommendData();
+    // this.getDayRecommendMusicData();
   },
   created: function created() {
-    this.getData();
+    // this.getData();
   },
   onPullDownRefresh: function onPullDownRefresh() {
-    this.getData();
+    // this.getData();
     setTimeout(function () {
       uni.stopPullDownRefresh();
     }, 1000);
@@ -297,8 +376,10 @@ var _default = {
               case 2:
                 _yield$_this3$$api$ge = _context3.sent;
                 data = _yield$_this3$$api$ge.data;
+                console.log('data recommend');
+                console.log(data);
                 _this3.dayRecommendList = data.dailySongs;
-              case 5:
+              case 7:
               case "end":
                 return _context3.stop();
             }

sleep/unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -2,7 +2,6 @@
   "enablePullDownRefresh": true,
   "usingComponents": {
     "song-list": "/pages/index/components/songList",
-    "music-list": "/pages/index/components/musicList",
-    "singer-list": "/pages/index/components/singerList"
+    "music-list": "/pages/index/components/musicList"
   }
 }

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

@@ -458,12 +458,22 @@ var _default = {
   }),
   onShow: function onShow() {
     if (this.currentType == 'history') {
-      this.getUserHistory();
+      // this.getUserHistory();
     } else {
-      this.getUserInfo();
+      // this.getUserInfo();
     }
   },
   methods: {
+    handleAuth: function handleAuth() {
+      uni.navigateTo({
+        url: '/pages/auth/auth'
+      });
+    },
+    handleShareData: function handleShareData() {
+      uni.navigateTo({
+        url: '/pages/shareUser/shareUser'
+      });
+    },
     //获取用户喜欢的音乐
     getUserInfo: function getUserInfo() {
       var _this = this;

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

@@ -44,7 +44,7 @@
   margin-top: 0.3rem;
 }
 .container-bg.data-v-4dcceeb0 {
-  position: absolute;
+  position: fixed;
   left: -130px;
   top: -130px;
   width: 480px;

sleep/unpackage/dist/dev/mp-weixin/pages/report/report.wxss

@@ -716,10 +716,12 @@
   overflow-y: auto;
 }
 .page .report .report_header .report-header-img {
-  width: 100%;
-  height: 100%;
   position: absolute;
   top: -3rem;
+  left: 50%;
+  width: 22.5rem;
+  height: 28.5em;
+  margin-left: -11.25rem;
 }
 .page .report .report_header .report_score {
   padding-top: 1rem;