Merge branch 'master' of http://192.168.1.218:3000/liyingqu/cyzh-SoundOfMusic-H5

common/utils/mpi.js

@@ -6,7 +6,7 @@ mpi.uploadFile = (count = 1) => {
 	return new Promise((resolve, reject) => {
 		uni.chooseImage({
 			count, //默认100
-			sizeType: ['original', 'compressed'],
+			sizeType: ['compressed'],
 			sourceType: ['album', 'camera'],
 			success: function(res) {
 				uni.uploadFile({

components/homeViews/activity-view.vue

@@ -14,7 +14,7 @@
 				</view>
 			</block>
 		</view>
-		<view class="margin-top-sm bg-white flex justify-around align-end" style="height: 350upx;">
+		<view v-if="!$u.test.isEmpty(rankList)" class="margin-top-sm bg-white flex justify-around align-end" style="height: 350upx;">
 			<view class="second text-center" @click="navWithParm(rankList[1].id)" v-if="!$u.test.isEmpty(rankList[1])">
 				<view class="margin-top-sm">
 					<u-avatar :src="rankList[1].avatar" size="120"></u-avatar>
@@ -52,8 +52,8 @@
 				</view>
 			</view>
 		</view>
-		<block v-for="(item, index) in rankList.slice(3, rankList.length + 1)" :key="index">
-			<view class="padding-sm flex justify-between align-center bg-white" @click="navWithParm(item.id)">
+		<block v-if="!$u.test.isEmpty(rankList)" >
+			<view class="padding-sm flex justify-between align-center bg-white" v-for="(item, index) in rankList.slice(3, rankList.length + 1)" :key="index" @click="navWithParm(item.id)">
 				<view class="flex justify-around align-center">
 					<view class="padding-right text-black text-bold">{{item.rank}}</view>
 					<view class="padding-right">
@@ -97,6 +97,12 @@
 					return []
 				}
 			},
+			rankList: {
+				type: Array,
+				default() {
+					return []
+				}
+			},
 		},
 		data() {
 			return {
@@ -108,11 +114,9 @@
 					{image: '/static/more.png', name: '更多', url: '/pages/activityList/activity/songRank'},
 				],
 				activity: {},
-				rankList: [],
 			}
 		},
 		mounted() {
-			this.getRankList();
 			this.getActivityDetail();
 		},
 		methods: {
@@ -121,17 +125,6 @@
 					this.activity = res;
 				})
 			},
-			getRankList() {
-				let params={
-					activityId:this.activityId,
-					type:0,//选手排名
-					current:1,
-					size:20
-				}
-				this.$u.api.activity.rankList(params).then(res => {
-					this.rankList = res.records;
-				})
-			},
 			navByIcon(path, index) {
 				let url;
 				if (index == 0) { //图片 和 活动详情

manifest.json

@@ -69,7 +69,7 @@
         "enable" : false
     },
     "h5" : {
-        "title" : "SoundOfMusic-H5",
+        "title" : "音乐之声",
         "domain" : "yyzs.nanyue6688.com",
         "router" : {
             "base" : "./"

pages/activityList/home/home.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!--活动页面-->
 		<view v-if="current == 0">
-			<activity-view :imgList="imgList" :activityId="activityId"></activity-view>
+			<activity-view :rankList="rankList" :imgList="imgList" :activityId="activityId"></activity-view>
 		</view>
 		<!--花积分-->
 		<view v-if="current == 1">
@@ -36,6 +36,7 @@
 		},
 		data() {
 			return {
+				rankList:[],
 				activityId: '',
 				current: 0,
 				imgList: [
@@ -51,11 +52,26 @@
 			this.addVisit(options.activityId);
 		},
 		onShow() {
+			if (this.current == 0) {
+				this.getRankList()
+			}
+			
 			if (this.current == 2) {
 				this.$refs.mine.getUserInfo();
 			}
 		},
 		methods: {
+			getRankList() {
+				let params={
+					activityId:this.activityId,
+					type:0,//选手排名
+					current:1,
+					size:20
+				}
+				this.$u.api.activity.rankList(params).then(res => {
+					this.rankList = res.records;
+				})
+			},
 			async authorization(current) {
 				let agenterId=uni.getStorageSync("agenterId")
 				let params = getUrlParams(window.location.search);

pages/activityList/mine/myMusic.vue

@@ -7,7 +7,7 @@
 				<view>上传封面</view>
 			</view>
 		</view>
-		<u-action-sheet :list="list" @click="changeCover" v-model="selectShow"></u-action-sheet>
+		<u-action-sheet :list="list1" @click="changeCover" v-model="selectShow"></u-action-sheet>
 		<view class="head">
 			<view class="cu-avatar avatar round" :style="[{backgroundImage:'url('+ data.avatar +')'}]"></view>
 			<view style="margin: 0 30upx 30upx 70upx;">
@@ -80,7 +80,7 @@
 				status: 'loadmore',
 				current:1,
 				selectShow: false,
-				list: [{
+				list1: [{
 					text: '查看原图'
 				}, {
 					text: '更换封面'