修改

common/conf/config.js

@@ -1,14 +1,21 @@
 //公众号ID
- const appId = 'wx7e7a38f071b360e9';
- //公众号密钥
- const appSecret = '4e862f91b48ac85a91380fa0991c9fda';
+const appId = 'wx7e7a38f071b360e9';
+
+//公众号密钥
+const appSecret = '4e862f91b48ac85a91380fa0991c9fda';
+
 //经过编码后的回调地址
-const redireactUrl = 'https://vote.guosen-fumao.cn/vote-h5/index.html#/pages/home/home';
+const redireactUrl = 'https://vote.guosen-fumao.cn/vote-h5/index.html#/pages/activityList/home/home';
+
 //获取用户授权信息Code
- const authUrl =  `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${encodeURIComponent(redireactUrl)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`;
- //获取用户的Access-token
-const atUrl =  (code)=>{ return `https://api.weixin.qq.com/sns/oauth2/access_token?appid=${appId}&secret=${appSecret}&code=${code}&grant_type=authorization_code`}
- //拉取用户信息
- const	getWXUserInfoUrl = (ACCESS_TOKEN,OPENID) =>{ return `https://api.weixin.qq.com/sns/userinfo?access_token=${ACCESS_TOKEN}&openid=${OPENID}&lang=zh_CN`} 
- 
- export { appId , authUrl ,atUrl,getWXUserInfoUrl };
+const authUrl =  `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${encodeURIComponent(redireactUrl)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`;
+
+//获取用户的Access-token
+const atUrl = (code) =>{ return `https://api.weixin.qq.com/sns/oauth2/access_token?appid=${appId}&secret=${appSecret}&code=${code}&grant_type=authorization_code`}
+
+//拉取用户信息
+const getWXUserInfoUrl = (ACCESS_TOKEN, OPENID) => { 
+	return `https://api.weixin.qq.com/sns/userinfo?access_token=${ACCESS_TOKEN}&openid=${OPENID}&lang=zh_CN`
+} 
+
+export {appId, authUrl, atUrl, getWXUserInfoUrl};

common/http/http.api.js

@@ -1,114 +1,37 @@
-//活动管理
-let activityUrl = {
-	listUrl : '/vote-activity/activity/list',
-	detailUrl : 'vote-activity/activity/detail',
-	addPageViewUrl : '/vote-activity/activity/addpageview',
-}
-//作品管理
-let artworkUrl = {
-	detailUrl : '/vote-works/works/detail',
-	listUrl : '/vote-works/works/list',
-	saveUrl : '/vote-works/works/save',
-	searchUrl : '/vote-works/works/search',
-	getCountUrl : '/vote-works/works/getCount'
-}
-
-//投票者管理
-let voterUrl = {
-	detailUrl : '/vote-voter/voter/detail',
-	saveUrl :'/vote-voter/voter/save'
-}
-
-//投票管理
-let voteUrl = {
-	saveUrl : '/vote-records/records/save'
-}
-
-//礼物管理
-let giftUrl = {
-	listUrl : '/vote-present/present/list'
-}
-
-//小程序被封管理
-let appUrl = {
-	detailUrl : '/vote-second/second/detail',
+//微信支付
+let wxInfoUrl = {
+	getUserInfoUrl: '/wx/getUserInfo'
 }
 
-//投诉管理
-let complainUrl = {
-	saveUrl : '/vote-complain/complain/save',
+let activityUrl = {
+	adsListUrl: '/cyzh-ads/ads/list',
+	listUrl: '/cyzh-activity/activity/selectPageWithTag',
+	detailUrl: '/cyzh-activity/activity/detail',
+	rankListUrl: '/cyzh-userActivityStatistical/useractivitystatistical/rank'
 }
 
-//获取小程序码
-let getWxCodeUrl = {
-	getAccessTokenUrl : '/wx/getAccessToken',
-	getQrCodeUrl : '/getUnlimitCode'
+let userUrl = {
+	boostUrl: 'cyzh-activity/activity/getHitPersonDetail',
 }
-
-//微信登录
-let wxInfoUrl = {
-	getOpenIdUrl :'/blade-link/auth/getOpenid',
-}
-//微信支付
-let wxPayUrl = {
-	createOrder :'/pay/createOrder',
-	addOrder: "/vote-order/order/save"
-}
-
-
 // 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作，更多内容详见uView对拦截器的介绍部分：
 // https://uviewui.com/js/http.html#%E4%BD%95%E8%B0%93%E8%AF%B7%E6%B1%82%E6%8B%A6%E6%88%AA%EF%BC%9F
 const install = (Vue, vm) => {
+	let wxInfo = {
+		getUserInfo:(params = {}) => vm.$u.get(wxInfoUrl.getUserInfoUrl, params),
+	}
 	
 	let activity = {
+		getAdsList:(params = {}) => vm.$u.get(activityUrl.adsListUrl, params),
 		list:(params = {}) => vm.$u.get(activityUrl.listUrl, params),
 		detail:(params = {}) => vm.$u.get(activityUrl.detailUrl, params),
-		add:(params = {}) => vm.$u.post(activityUrl.addPageViewUrl, params),
-	}
-	
-	let artwork = {
-		detail:(params = {}) => vm.$u.get(artworkUrl.detailUrl, params),
-		list:(params = {}) => vm.$u.get(artworkUrl.listUrl, params),
-		save:(params = {}) => vm.$u.post(artworkUrl.saveUrl, params),
-		search:(params = {}) => vm.$u.get(artworkUrl.searchUrl, params),
-		getCount:(params = {}) => vm.$u.get(artworkUrl.getCountUrl, params),
+		rankList:(params = {}) => vm.$u.get(activityUrl.rankListUrl, params), 
 	}
 	
-	let voter = {
-		detail:(params = {}) => vm.$u.get(voterUrl.detailUrl, params),
-		save:(params = {}) => vm.$u.post(voterUrl.saveUrl, params),
-	}
-	
-	let vote = {
-		save:(params = {}) => vm.$u.post(voteUrl.saveUrl, params),
-	}
-	
-	let gift = {
-		list:(params = {}) => vm.$u.get(giftUrl.listUrl, params),
-	}
-	
-	let app = {
-		detail:(params = {}) => vm.$u.get(appUrl.detailUrl, params),
-	}
-	
-	let complain = {
-		save:(params = {}) => vm.$u.post(complainUrl.saveUrl, params),
-	}
-	
-	let getWxCode = {
-		getAccessToken:(params = {}) => vm.$u.get(getWxCodeUrl.getAccessTokenUrl, params),
-		getQrCode:(params = {}) => vm.$u.post(getWxCodeUrl.getQrCodeUrl, params),
-	}
-	
-	let wxInfo = {
-		getOpenId:(params = {}) => vm.$u.get(wxInfoUrl.getOpenIdUrl, params),
-	}
-	let wxPay = {
-		createOrder:(params = {}) => vm.$u.post(wxPayUrl.createOrder, params),
-		addOrder:(params = {}) => vm.$u.post(wxPayUrl.addOrder, params),
+	let user = {
+		boost:(params = {}) => vm.$u.get(userUrl.boostUrl, params),
 	}
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
-	vm.$u.api = {activity,artwork,voter,vote,gift,app,complain,getWxCode,wxInfo,wxPay};
+	vm.$u.api = {wxInfo, activity, user};
 }
 
 export default {

common/http/http.interceptor.js

@@ -1,13 +1,13 @@
- let baseUrl = 'https://vote.yitige.com/api/'
-   // let baseUrl = 'http://192.168.0.123:9090/'
-let tokenUrl = "https://vote.yitige.com/api/blade-auth/oauth/token?tenantId=000000&password=21232f297a57a5a743894a0e4a801fc3&username=admin"
+ let baseUrl = 'http://192.168.1.168:9612/'
+   // let baseUrl = 'http://gxcadmin.guosen-fumao.cn:1888/api'
+let tokenUrl = "http://192.168.1.168:9612/blade-auth/oauth/token?tenantId=000000&username=admin&password=21232f297a57a5a743894a0e4a801fc3&grant_type=password&scope=all&type=account"
 
 let myConfig={}
 
 const refreshToken = ()=>{
 	return new Promise((resolve,reject)=>{
 		uni.request({
-			url:tokenUrl,
+			url: tokenUrl,
 			method: "POST",
 			header:{
 				Authorization:"Basic c2FiZXI6c2FiZXJfc2VjcmV0"
@@ -68,7 +68,7 @@ Vue.prototype.$u.http.interceptor.response = (async (res) => {
 			return resolve(res.data);
 		} else if(res.code == 401) {
 			uni.showToast({
-				title: '授权已过期，请重新进入小程序',
+				title: '授权已过期，请重新进入',
 				icon: 'none',
 			})
 			return reject(res);

components/views/activity-view.vue

@@ -4,22 +4,22 @@
 			<search-bar :disabled="true"></search-bar>
 		</view>
 		<view class="padding-tb bg-white">
-			<u-swiper height="350" mode="none" :list="imgList" :effect3d="true" bg-color="#fff" interval="5000" @click="navByIcon('/pages/activity/activityDetail')"></u-swiper>
+			<u-image width="100%" height="350" :src="activity.cover" @click="navByIcon('/pages/activityList/activity/activityDetail', 0)"></u-image>
 		</view>
 		<view class="flex justify-around text-center padding-tb bg-white">
 			<block v-for="(item,index) in icons" :key="index">
-				<view @click="navByIcon(item.url)">
+				<view @click="navByIcon(item.url, index)">
 					<image :src="item.image" style="width: 80upx;height: 80upx;"></image>
 					<view class="margin-top-xs text-sm text-bold">{{item.name}}</view>
 				</view>
 			</block>
 		</view>
 		<view class="margin-top-sm bg-white flex justify-around align-end" style="height: 350upx;">
-			<view class="second text-center" @click="navWithParm">
+			<view class="second text-center" @click="navWithParm(rankList[1].userId)" v-if="!$u.test.isEmpty(rankList[1])">
 				<view class="margin-top-sm">
-					<u-avatar src="/static/avatar.png" size="120"></u-avatar>
+					<u-avatar :src="rankList[1].avatar" size="120"></u-avatar>
 				</view>
-				<view class="text-bold text-lg text-black">1230545</view>
+				<view class="text-bold text-lg text-black">{{rankList[1].totalHotValue}}</view>
 				<view class="flex justify-center">
 					<view class="hot-btn margin-top-xs">
 						<text class="cuIcon-hotfill padding-right-xs"></text>
@@ -27,11 +27,11 @@
 					</view>
 				</view>
 			</view>
-			<view class="first text-center" @click="navWithParm">
+			<view class="first text-center" @click="navWithParm(rankList[0].userId)" v-if="!$u.test.isEmpty(rankList[0])">
 				<view class="margin-top-sm">
-					<u-avatar src="/static/avatar.png" size="130"></u-avatar>
+					<u-avatar :src="rankList[0].avatar" size="130"></u-avatar>
 				</view>
-				<view class="margin-top-xs text-bold text-lg text-black">1230545</view>
+				<view class="margin-top-xs text-bold text-lg text-black">{{rankList[0].totalHotValue}}</view>
 				<view class="flex justify-center">
 					<view class="hot-btn margin-top-xs">
 						<text class="cuIcon-hotfill padding-right-xs"></text>
@@ -39,11 +39,11 @@
 					</view>
 				</view>
 			</view>
-			<view class="third text-center" @click="navWithParm">
+			<view class="third text-center" @click="navWithParm(rankList[2].userId)" v-if="!$u.test.isEmpty(rankList[2])">
 				<view class="margin-top-sm">
-					<u-avatar src="/static/avatar.png" size="120"></u-avatar>
+					<u-avatar :src="rankList[2].avatar" size="120"></u-avatar>
 				</view>
-				<view class="text-bold text-lg text-black">1230545</view>
+				<view class="text-bold text-lg text-black">{{rankList[2].totalHotValue}}</view>
 				<view class="flex justify-center">
 					<view class="hot-btn margin-top-xs">
 						<text class="cuIcon-hotfill padding-right-xs"></text>
@@ -52,16 +52,16 @@
 				</view>
 			</view>
 		</view>
-		<block v-for="(item, index) in 6" :key="index">
-			<view class="padding-sm flex justify-between align-center bg-white" @click="navWithParm">
+		<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.userId)">
 				<view class="flex justify-around align-center">
 					<view class="padding-right text-black text-bold">{{index + 4}}</view>
 					<view class="padding-right">
-						<u-avatar src="/static/avatar.png" size="130"></u-avatar>
+						<u-avatar :src="item.avatar" size="130"></u-avatar>
 					</view>
 					<view>
-						<view class="text-bold text-black">薛之谦</view>
-						<view class="margin-tb-xs">300 热力值</view>
+						<view class="text-bold text-black">{{item.name}}</view>
+						<view class="margin-tb-xs">{{item.totalHotValue}} 热力值</view>
 					</view>
 				</view>
 				<view class="padding-right">
@@ -72,7 +72,7 @@
 				</view>
 			</view>
 		</block>
-		<view class="text-center bg-white" style="line-height: 80upx;" @click="navByIcon('/pages/activity/hot')">
+		<view class="text-center bg-white" style="line-height: 80upx;" @click="navByIcon('/pages/activityList/activity/hot', 2)" v-if="!$u.test.isEmpty(rankList)">
 			<text class="text-bold text-black">全部歌手</text>
 			<text class="cuIcon-right"></text>
 		</view>
@@ -86,6 +86,10 @@
 			searchBar,
 		},
 		props: {
+			activityId: {
+				type: String,
+				default: ''
+			},
 			imgList: {
 				type: Array,
 				default() {
@@ -96,24 +100,47 @@
 		data() {
 			return {
 				icons: [
-					{image: '/static/song.png', name: '活动介绍', url: '/pages/activity/activityDetail'},
-					{image: '/static/signUp.png', name: '点击报名', url: '/pages/activity/signUp'},
-					{image: '/static/hot.png', name: '热度榜', url: '/pages/activity/hot'},
-					{image: '/static/activity.png', name: '我的奖金', url: '/pages/activity/awards'},
-					{image: '/static/more.png', name: '更多', url: '/pages/activity/songRank'},
+					{image: '/static/song.png', name: '活动介绍', url: '/pages/activityList/activity/activityDetail'},
+					{image: '/static/signUp.png', name: '点击报名', url: '/pages/activityList/activity/signUp'},
+					{image: '/static/hot.png', name: '热度榜', url: '/pages/activityList/activity/hot'},
+					{image: '/static/activity.png', name: '我的奖金', url: '/pages/activityList/activity/awards'},
+					{image: '/static/more.png', name: '更多', url: '/pages/activityList/activity/songRank'},
 				],
+				activity: {},
+				rankList: [],
 			}
 		},
+		mounted() {
+			this.getRankList();
+			this.getActivityDetail();
+		},
 		methods: {
-			navByIcon(url) {
+			getActivityDetail() {
+				this.$u.api.activity.detail({id: this.activityId}).then(res => {
+					this.activity = res;
+				})
+			},
+			getRankList() {
+				this.$u.api.activity.rankList({activityId: this.activityId}).then(res => {
+					this.rankList = res.records;
+				})
+			},
+			navByIcon(path, index) {
+				let url;
+				if (index == 0) { //图片 和 活动详情
+					url = path + "?poster=" + this.activity.poster; 
+				}
+				if (index == 1 || index == 2) { //报名 和 热榜
+					url = path + "?activityId=" + this.activityId;
+				}
 				uni.navigateTo({
 					url: url,
 				})
 			},
 			//跳转需要带惨方法
-			navWithParm() {
+			navWithParm(id) {
 				uni.navigateTo({
-					url: "/pages/activity/boost"
+					url: "/pages/activityList/activity/boost?activityId=" + this.activityId + "&userId=" + id,
 				})
 			},
 		}

components/views/mine-view.vue

@@ -4,7 +4,7 @@
 			<view class="flex justify-between align-center" style="height: 200upx;">
 				<view class="padding-left">
 					<view class="text-black text-bold text-xl">{{name}}</view>
-					<!-- <button @click="toAuth"> 授权</button>   获取用户授权 -->   
+					<button @click="toAuth">授权</button>  
 					<view class="flex align-center padding-top-sm">
 						<view>
 							<view class="text-black text-bold">205</view>
@@ -30,14 +30,14 @@
 				</view>
 			</view>
 			<view class="padding-lg flex justify-around align-center">
-				<view class="flex" @click="navByIcon('/pages/mine/pointsDetail')">
+				<view class="flex" @click="navByIcon('/pages/activityList/mine/pointsDetail')">
 					<image src="/static/icon-points.png" style="width: 80upx;height: 80upx;"></image>
 					<view class="padding-left-sm">
 						<view class="text-bold text-lg">积分明细</view>
 						<view class="text-gray">消费赚积分</view>
 					</view>
 				</view>
-				<view class="flex" @click="navByIcon('/pages/mine/boostDetail')">
+				<view class="flex" @click="navByIcon('/pages/activityList/mine/boostDetail')">
 					<image src="/static/icon-order.png" style="width: 80upx;height: 80upx;"></image>
 					<view class="padding-left-sm">
 						<view class="text-bold text-lg">热力明细</view>
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-	import {authUrl } from '../../common/conf/config.js'
+	import {authUrl } from '@/common/conf/config.js'
 	export default {
 		props: {
 
@@ -77,11 +77,11 @@
 				hotVaule: '205',
 				points: '886',
 				iconList: [
-					{name: '我的礼品', icon: '/static/icon-gift.png', width: '36upx', height: '33upx', url: '/pages/mine/myGift'},
-					{name: '我的音乐', icon: '/static/icon-music.png', width: '33upx', height: '32upx', url: '/pages/mine/myMusic'},
-					{name: '我的奖金', icon: '/static/icon-awards.png', width: '29upx', height: '38upx', url: '/pages/mine/myAwards'},
-					{name: '我的助力', icon: '/static/icon-history.png', width: '32upx', height: '32upx', url: '/pages/mine/myBoost'},
-					{name: '我的公益', icon: '/static/icon-welfare.png', width: '31upx', height: '31upx', url: '/pages/mine/myWelfare'},
+					{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'},
+					// {name: '我的奖金', icon: '/static/icon-awards.png', width: '29upx', height: '38upx', url: '/pages/activityList/mine/myAwards'},
+					{name: '我的助力', icon: '/static/icon-history.png', width: '32upx', height: '32upx', url: '/pages/activityList/mine/myBoost'},
+					{name: '我的公益', icon: '/static/icon-welfare.png', width: '31upx', height: '31upx', url: '/pages/activityList/mine/myWelfare'},
 					{name: '分割线', icon: '', width: '', height: '', url: ''},
 					{name: '花积分', icon: '/static/icon-mall.png', width: '30upx', height: '26upx', url: ''},
 					{name: '更多活动', icon: '/static/icon-activity.png', width: '26upx', height: '31upx', url: ''},
@@ -90,13 +90,13 @@
 			}
 		},
 		methods: {
-			toAuth(){
+			toAuth() {
 				 window.location.href = authUrl;
 			},
 			//跳转需要带参数
 			edit() {
 				uni.navigateTo({
-					url: '/pages/mine/edit'
+					url: '/pages/activityList/mine/edit'
 				})
 			},
 			navByIcon(url) {

main.js

@@ -11,4 +11,12 @@ App.mpType = 'app'
 const app = new Vue({
     ...App
 })
+// http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
+import httpInterceptor from '@/common/http/http.interceptor.js'
+Vue.use(httpInterceptor, app)
+
+// http接口API集中管理引入部分
+import httpApi from '@/common/http/http.api.js'
+Vue.use(httpApi, app)
+
 app.$mount()

pages.json

@@ -6,11 +6,11 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "活动列表"
+				"navigationBarTitleText": ""
 			}
 		}
 	    ,{
-            "path" : "pages/home/home",
+            "path" : "pages/activityList/home/home",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "活动详情"
@@ -18,7 +18,7 @@
             
         }
         ,{
-            "path" : "pages/activity/activityDetail",
+            "path" : "pages/activityList/activity/activityDetail",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "活动简介"
@@ -26,7 +26,7 @@
             
         }
         ,{
-            "path" : "pages/activity/signUp",
+            "path" : "pages/activityList/activity/signUp",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "报名登记"
@@ -34,7 +34,7 @@
             
         }
         ,{
-            "path" : "pages/mine/myMusic",
+            "path" : "pages/activityList/mine/myMusic",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "我的音乐"
@@ -42,7 +42,7 @@
             
         }
         ,{
-            "path" : "pages/mine/edit",
+            "path" : "pages/activityList/mine/edit",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "修改资料"
@@ -50,7 +50,7 @@
             
         }
 		,{
-		    "path" : "pages/activity/awards",
+		    "path" : "pages/activityList/activity/awards",
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": ""
@@ -58,7 +58,7 @@
 		    
 		}
         ,{
-            "path" : "pages/activity/boost",
+            "path" : "pages/activityList/activity/boost",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "打榜助力"
@@ -66,7 +66,7 @@
             
         }
         ,{
-            "path" : "pages/mine/myBoost",
+            "path" : "pages/activityList/mine/myBoost",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "我的助力"
@@ -74,7 +74,7 @@
             
         }
         ,{
-            "path" : "pages/activity/songRank",
+            "path" : "pages/activityList/activity/songRank",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": ""
@@ -82,7 +82,7 @@
             
         }
         ,{
-            "path" : "pages/mine/boostDetail",
+            "path" : "pages/activityList/mine/boostDetail",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "热力明细"
@@ -90,7 +90,7 @@
             
         }
         ,{
-            "path" : "pages/mine/pointsDetail",
+            "path" : "pages/activityList/mine/pointsDetail",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "积分明细"
@@ -98,7 +98,7 @@
             
         }
         ,{
-            "path" : "pages/mine/myWelfare",
+            "path" : "pages/activityList/mine/myWelfare",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "我的公益"
@@ -106,7 +106,7 @@
             
         }
         ,{
-            "path" : "pages/mine/myGift",
+            "path" : "pages/activityList/mine/myGift",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "我的礼品"
@@ -114,7 +114,7 @@
             
         }
         ,{
-            "path" : "pages/mine/introduction",
+            "path" : "pages/activityList/mine/introduction",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": ""
@@ -122,7 +122,7 @@
             
         }
         ,{
-            "path" : "pages/activity/hot",
+            "path" : "pages/activityList/activity/hot",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "热度榜"
@@ -130,7 +130,7 @@
             
         }
         ,{
-            "path" : "pages/mine/order/orderConfirm",
+            "path" : "pages/activityList/mine/order/orderConfirm",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "确认订单"
@@ -138,7 +138,7 @@
             
         }
         ,{
-            "path" : "pages/mine/order/address",
+            "path" : "pages/activityList/mine/order/address",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "添加收货地址"
@@ -146,11 +146,10 @@
             
         }
         ,{
-            "path" : "pages/webView/webView",
+            "path" : "pages/activityList/index",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+                "navigationBarTitleText": "活动列表"
             }
             
         }

pages/activity/activityDetail.vue → pages/activityList/activity/activityDetail.vue

@@ -8,9 +8,12 @@
 	export default {
 		data() {
 			return {
-				src: '/static/long.png'
+				src: '',
 			}
 		},
+		onLoad(options) {
+			this.src = options.poster;
+		},
 		methods: {
 			
 		}

pages/activity/boost.vue → pages/activityList/activity/boost.vue

@@ -1,16 +1,16 @@
 <template>
 	<view>
-		<view class="bg-img" style="background-image: url('/static/singerBg.png');height: 563upx;"></view>
+		<view class="bg-img" style="height: 563upx;" :style="{'backgroundImage':'url('+ boostDetail.cover +')'}">></view>
 		<view class="head">
-			<view class="title">为{{name}}打榜</view>
+			<view class="title">为{{boostDetail.nickName}}打榜</view>
 			<view class="flex justify-between align-center padding-lr">
 				<view class="flex align-center">
-					<u-avatar src="/static/avatar.png" size="120"></u-avatar>
+					<u-avatar :src="boostDetail.avatar" size="120"></u-avatar>
 					<view class="padding-left">
-						<view class="number">{{hotValue}}</view>
+						<view class="number">{{+boostDetail.hotValue}}</view>
 						<view class="tag">
 							<image src="/static/crown.png" style="width: 22upx;height: 19upx;margin-right: 10upx;"></image>
-							<view class="text-sm text-white">热力榜第1</view>
+							<view class="text-sm text-white">热力榜第{{boostDetail.sequence}}</view>
 						</view>
 					</view>
 				</view>
@@ -18,9 +18,9 @@
 					<button class="cu-btn round theme-bg-color text-white text-bold">
 						<text>打榜</text>
 						<text class="cuIcon-hot padding-lr-xs"></text>
-						<text>X1</text>
+						<text>X{{boostDetail.activityHotValue}}</text>
 					</button>
-					<view class="text-sm text-gray margin-top-xs">今日可打榜次数: 3</view>
+					<view class="text-sm text-gray margin-top-xs">今日可打榜次数: {{boostDetail.allowHitCount}}</view>
 				</view>
 			</view>
 		</view>
@@ -39,13 +39,13 @@
 		</view>
 		<view class="bg-white padding-sm">
 			<view class="flex justify-around">
-				<block v-for="(item,index) in present" :key="index">
+				<block v-for="(item,index) in boostDetail.presentList" :key="index">
 					<view class="text-center padding-top-xs" :class="current == index ? 'boder':''" @click="change(index)">
 						<image :src="item.icon" style="width: 80upx;height: 80upx;"></image>
-						<view class="text-sm margin-tb-xs">金额: {{item.price}}</view>
+						<view class="text-sm margin-tb-xs">金额: {{+item.price}}</view>
 						<view style="margin-bottom: 10upx;">
 							<text class="cuIcon-hotfill theme-color"></text>
-							<text style="font-size: 20upx;">{{item.tips}}</text>
+							<text style="font-size: 20upx;">{{+item.hotValue}}热力值/{{+item.pointsValue}}</text>
 						</view>
 					</view>
 				</block>
@@ -73,7 +73,7 @@
 			<view class="bg-img text-center" style="background-image: url('/static/dialogBgImg.png');height: 600rpx;">
 				<view style="height: 120upx;"></view>
 				<u-avatar src="/static/avatar.png" size="160"></u-avatar>
-				<view class="margin-top" style="font-size: 24upx;font-family: PingFang SC;font-weight: bold;color: #323035;">你将为{{name}}增加50热力值</view>
+				<view class="margin-top" style="font-size: 24upx;font-family: PingFang SC;font-weight: bold;color: #323035;">你将为{{boostDetail.nickName}}增加50热力值</view>
 				<view class="text-gray text-sm">公益勋章X1</view>
 				<view class="text-gray text-sm">立白助力礼包A</view>
 				<view class="text-gray text-sm">可得300积分，可用于国信商城兑换</view>
@@ -90,9 +90,8 @@
 		data() {
 			return {
 				current: 0,
-				name: '易烊千玺',
+				boostDetail: {},
 				dialogShow: false,
-				hotValue: '184056',
 				present: [
 					{icon: '/static/present1.png', price: 68, tips: '66热力值/388积分', name: ''},
 					{icon: '/static/present2.png', price: 168, tips: '66热力值/688积分', name: ''},
@@ -103,10 +102,17 @@
 				currentPresentSum: 0,
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			this.getBoostDetail(options.activityId, options.userId);
 			this.currentPresentSum = this.present[this.current].price;
 		},
 		methods: {
+			//获取助力详情
+			getBoostDetail(activityId, userId) {
+				this.$u.api.user.boost({activityId: activityId,receiverId: userId, senderId: null}).then(res => {
+					this.boostDetail = res;
+				})
+			},
 			change(index) {
 				this.currentPresentSum = 0;
 				this.count = 1;

pages/activity/hot.vue → pages/activityList/activity/hot.vue

@@ -4,6 +4,7 @@
 			<search-bar :disabled="true"></search-bar>
 		</view>
 		<block v-for="(item, index) in hotList" :key="index">
+			<u-line color="#e8e8e8"></u-line>
 			<view class="padding-sm flex justify-between align-center bg-white" @click="navWithParm">
 				<view class="flex justify-around align-center">
 					<view class="padding-right text-center text-black text-bold" style="width: 60upx;">{{index + 1}}</view>
@@ -12,7 +13,7 @@
 					</view>
 					<view>
 						<view class="text-bold text-black">{{item.name}}</view>
-						<view class="margin-tb-xs">{{item.hotValue}} 热力值</view>
+						<view class="margin-tb-xs">{{item.totalHotValue}} 热力值</view>
 					</view>
 				</view>
 				<view class="padding-right">
@@ -34,28 +35,25 @@
 		},
 		data() {
 			return {
-				hotList: [
-					{avatar: '/static/avatar.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar2.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar2.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar2.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar.png', name: '易烊千玺', hotValue: '300'},
-					{avatar: '/static/avatar2.png', name: '易烊千玺', hotValue: '300'}
-				]
+				hotList: [],
 			}
 		},
+		onLoad(options) {
+			this.getRankList(options.activityId);
+		},
 		onReachBottom() {
 			console.log("到底了")
 		},
 		methods: {
+			getRankList(id) {
+				this.$u.api.activity.rankList({activityId: id}).then(res => {
+					this.hotList = res.records;
+				})
+			},
 			//跳转需要带惨方法
 			navWithParm() {
 				uni.navigateTo({
-					url: "/pages/activity/boost"
+					url: "/pages/activityList/activity/boost"
 				})
 			}
 		}

pages/activity/signUp.vue → pages/activityList/activity/signUp.vue

@@ -10,9 +10,9 @@
 				<text class="text-black text-bold text-lg">基本信息</text>
 			</view>
 			<view class="padding-sm flex justify-around align-center">
-				<view class="tags" :class="current == 0 ? 'theme-bg-color text-white' : ''" @click="current = 0">男歌手</view>
-				<view class="tags" :class="current == 1 ? 'theme-bg-color text-white' : ''" @click="current = 1">女歌手</view>
-				<view class="tags" :class="current == 2 ? 'theme-bg-color text-white' : ''" @click="current = 2">组合</view>
+				<block v-for="(item, index) in classification" :key="index">
+					<view class="tags" :class="current == index ? 'theme-bg-color text-white' : ''" @click="current = index">{{item}}</view>
+				</block>
 			</view>
 			<view class="padding-sm">
 				<text class="text-black text-bold text-lg padding-left-sm">歌手名字</text>
@@ -50,15 +50,24 @@
 		data() {
 			return {
 				current: 0,
+				classification: [],
 				name: '',
 				introduction: '',
 				music: '',
 			}
 		},
+		onLoad(options) {
+			this.getActivityDetail(options.activityId);
+		},
 		methods: {
+			getActivityDetail(id) {
+				this.$u.api.activity.detail({id: id}).then(res => {
+					this.classification = res.classification.split(',');
+				})
+			},
 			navWithParam() {
 				uni.navigateTo({
-					url: '/pages/mine/introduction'
+					url: '/pages/activityList/mine/introduction'
 				})
 			}
 		}

pages/home/home.vue → pages/activityList/home/home.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!--活动页面-->
 		<view v-if="current == 0">
-			<activity-view :imgList="imgList"></activity-view>
+			<activity-view :imgList="imgList" :activityId="activityId"></activity-view>
 		</view>
 		<!--个人中心-->
 		<view v-if="current == 2">
@@ -16,16 +16,13 @@
 </template>
 
 <script>
-	import {getUrlParams} from '../../common/utils/utils.js';
-	import {atUrl,getWXUserInfoUrl } from '../../common/conf/config.js';
+	import {getUrlParams} from '@/common/utils/utils.js';
+	import {atUrl, getWXUserInfoUrl} from '@/common/conf/config.js';
 	import searchBar from "@/components/basic/search-bar.vue";
 	import bottomBar from "@/components/basic/bottom-bar.vue";
 	import activityView from "@/components/views/activity-view.vue";
 	import mineView from "@/components/views/mine-view.vue";
 	export default {
-		async onLoad(options) {
-			await this.authorization();
-		},
 		components: {
 			searchBar,
 			bottomBar,
@@ -34,6 +31,7 @@
 		},
 		data() {
 			return {
+				activityId: '',
 				current: 0,
 				imgList: [
 					{image: '/static/swiper1.png'},
@@ -42,12 +40,19 @@
 				],
 			}
 		},
+		async onLoad(options) {
+			this.activityId = options.activityId;
+			await this.authorization();
+		},
 		methods: {
-		 async authorization(){
-				let params =  getUrlParams(window.location.search);
-				if(typeof params.code != 'undefined'){
+			async authorization() {
+				let params = getUrlParams(window.location.search);
+				if (typeof params.code != 'undefined') {
 					this.current = 2;
-					console.log(params);
+					alert(JSON.parse(params))
+					this.$u.api.wxInfo({userCode: params.code}).then(res => {
+						alert(JSON.parse(res))
+					})
 				}
 			},
 			change(index) {

pages/activityList/index.vue

@@ -0,0 +1,131 @@
+<template>
+	<view>
+		<view class="bg-white" style="padding: 30upx; 30upx 0upx 30upx">
+			<u-swiper height="268" :list="imgList" name="url" bg-color="#fff" interval="5000"></u-swiper>
+		</view>
+		<view>
+			<search-bar :disabled="false" @onSearch="onSearch" placeholder="请输入活动名称"></search-bar>
+		</view>
+		<!-- <view class="padding-lr-sm bg-white flex flex-wrap" style="padding-bottom: 10upx;">
+			<block v-for="(item, index) in activityTags" :key="index">
+				<view class="activity-tag">{{item}}</view>
+			</block>
+		</view> -->
+		<block v-for="(item, index) in activityList" :key="index">
+			<view class="container" @click="navWithParm(item.id)">
+				<view class="flex align-center">
+					<view style="margin: 30upx 0 10upx 20upx;">
+						<image :src="item.cover" style="width: 234upx;height: 188upx;border-radius: 16upx;"></image>
+					</view>
+					<view class="padding-lr-sm">
+						<view class="flex">
+							<view style="width: 80%">
+								<view class="text-lg text-bold">{{item.name}}</view>
+								<view class="text-sm margin-tb-xs">{{item.beginTime.split(' ')[0]}} - {{item.endTime.split(' ')[0]}}</view>
+								<view class="text-sm text-cut-2" style="width: 330upx;height: 70upx;">
+									{{item.description}}
+								</view>
+							</view>
+							<view style="margin-top: 10upx;" v-if="item.activityStatus == 0">
+								<image src="/static/index/ing.png" style="width: 85upx;height: 73upx;"></image>
+							</view>
+							<view style="margin-top: 10upx;" v-if="item.activityStatus == 1">
+								<image src="/static/index/ing.png" style="width: 100upx;height: 86upx;"></image>
+							</view>
+							<view style="margin-top: 10upx;" v-if="item.activityStatus == 2">
+								<image src="/static/index/finish.png" style="width: 100upx;height: 86upx;"></image>
+							</view>
+						</view>
+						<!-- <view class="text-sm flex flex-wrap">
+							<block v-for="(item, index) in awardTags" :key="index">
+								<view class="award-tag">{{item}}</view>
+							</block>
+						</view> -->
+					</view>
+				</view>
+				<view class="flex justify-end padding-right-sm">
+					<block v-for="(item, index) in item.tags.split(',')" :key="index">
+						<view class="tag">{{item}}</view>
+					</block>
+				</view>
+				<view class="flex align-center justify-end text-sm" style="padding: 20upx 30upx 30upx ;">
+					<text class="cuIcon-hotfill text-orange"></text>
+					<view class="padding-left-xs">已有{{item.applyNum}}人报名</view>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import searchBar from "@/components/basic/search-bar.vue";
+	export default {
+		components: {searchBar},
+		data() {
+			return {
+				imgList: [],
+				activityList: [],
+				awardTags: ['1万RMB','点歌机','100000积分'],
+			}
+		},
+		onLoad() {
+			this.getAdsList();
+			this.getActivityList();
+		},
+		methods: {
+			navWithParm(id) {
+				uni.navigateTo({
+					url: "/pages/activityList/home/home?activityId=" + id
+				})
+			},
+			getAdsList() {
+				this.$u.api.activity.getAdsList().then(res => {
+					this.imgList = res.records;
+				});
+			},
+			getActivityList() {
+				this.$u.api.activity.list().then(res => {
+					this.activityList = res.records;
+				})
+			},
+			onSearch(item) {
+				console.log(item)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.activity-tag {
+		margin: 10upx;
+		padding: 0 10upx;
+		font-size: 24upx;
+		line-height: 40upx;
+		background-color: #efefef;
+		border-radius: 16upx;
+	}
+	.award-tag {
+		margin: 10upx;
+		padding: 0 10upx;
+		font-size: 20upx;
+		line-height: 40upx;
+		background-color: #fff0d9;
+		border-radius: 10upx;
+		color: #feac65;
+	}
+	.tag {
+		border-radius: 30upx;
+		border: #fd8678 1upx solid;
+		color: #fd8678;
+		background-color: #FFFFFF;
+		line-height: 40upx;
+		font-size: 20upx;
+		padding: 0 20upx;
+		margin: 0 8upx;
+	}
+	.container {
+		margin: 20upx;
+		background-color: #FFFFFF;
+		border-radius: 20upx;
+	}
+</style>

pages/mine/myGift.vue → pages/activityList/mine/myGift.vue

@@ -182,7 +182,7 @@
 			},
 			navTap() {
 				uni.navigateTo({
-					url: '/pages/mine/order/orderConfirm'
+					url: '/pages/activityList/mine/order/orderConfirm'
 				})
 			}
 		}

pages/mine/myMusic.vue → pages/activityList/mine/myMusic.vue

@@ -71,7 +71,7 @@
 		methods: {
 			onTap() {
 				uni.navigateTo({
-					url: "/pages/activity/signUp",
+					url: "/pages/activityList/activity/signUp",
 				})
 			}
 		}

pages/mine/order/orderConfirm.vue → pages/activityList/mine/order/orderConfirm.vue

@@ -89,7 +89,7 @@
 			},
 			navTap() {
 				uni.navigateTo({
-					url: "/pages/mine/order/address"
+					url: "/pages/activityList/mine/order/address"
 				})
 			}
 		}

pages/index/index.vue

@@ -1,117 +1,74 @@
 <template>
 	<view>
-		<view class="bg-white" style="padding: 30upx; 30upx 0upx 30upx">
-			<u-swiper height="268" :list="imgList" bg-color="#fff" interval="5000"></u-swiper>
-		</view>
-		<view>
-			<search-bar :disabled="false" @onSearch="onSearch" placeholder="请输入活动名称"></search-bar>
-		</view>
-		<view class="padding-lr-sm bg-white flex flex-wrap" style="padding-bottom: 10upx;">
-			<block v-for="(item, index) in activityTags" :key="index">
-				<view class="activity-tag">{{item}}</view>
-			</block>
-		</view>
-		<view class="container" @click="navWithParm">
-			<view class="flex align-center">
-				<view style="margin: 30upx 0 10upx 20upx;">
-					<image src="/static/index/huodong1.png" style="width: 234upx;height: 188upx;"></image>
-				</view>
-				<view class="padding-lr-sm">
-					<view class="flex">
-						<view style="width: 80%">
-							<view class="text-lg text-bold">音乐先锋榜</view>
-							<view class="text-sm margin-tb-xs">2021.07.01 - 2021.12.31</view>
-							<view class="text-sm text-cut-2">
-								简介: 面向中国及海外22岁以下的非专业音乐学习者,包括在中国生活学习的外国友人
-							</view>
-						</view>
-						<view style="margin-top: 10upx;">
-							<image src="/static/index/ing.png" style="width: 83upx;height: 73upx;"></image>
-						</view>
-					</view>
-					<!-- <view class="text-sm flex flex-wrap">
-						<block v-for="(item, index) in awardTags" :key="index">
-							<view class="award-tag">{{item}}</view>
-						</block>
-					</view> -->
+		<view class="bg-img flex align-center" style="background-image: url('/static/ldt/aolinpike.png');height: 395upx;"></view>
+		<view class="car-head">
+			<view class="flex">
+				<view class="avatar">
+					<u-avatar src="/static/avatar.png" size="110"></u-avatar>
 				</view>
+				<view class="name">赖德福|德芙值得信赖</view>
 			</view>
-			<view class="flex justify-end padding-right-sm">
-				<block v-for="(item, index) in tags" :key="index">
-					<view class="tag">{{item}}</view>
-				</block>
-			</view>
-			<view class="flex align-center justify-end text-sm" style="padding: 20upx 30upx 30upx ;">
-				<text class="cuIcon-hotfill text-orange"></text>
-				<view class="padding-left-xs">已有1.2万人报名</view>
+			<view class="flex justify-center text-center align-center">
+				<view style="width: 40%;">
+					<view class="text-bold" style="color: #ff9447;font-size: 32upx;">2000</view>
+					<view class="text-sm text-black text-bold">我的积分</view>
+				</view>
+				<view style="width: 40%;">
+					<view class="text-bold" style="color: #ff0101;font-size: 32upx;">+2000</view>
+					<view class="text-sm text-black text-bold">昨日收益</view>
+				</view>
 			</view>
 		</view>
+		<view class="flex justify-around text-center padding-tb bg-white">
+			<block v-for="(item,index) in icons" :key="index">
+				<view @click="navByIcon(item.url)">
+					<image :src="item.image" style="width: 80upx;height: 80upx;"></image>
+					<view class="margin-top-xs text-sm text-bold">{{item.name}}</view>
+				</view>
+			</block>
+		</view>
 	</view>
 </template>
 
 <script>
-	import searchBar from "@/components/basic/search-bar.vue";
 	export default {
-		components: {searchBar},
 		data() {
 			return {
-				imgList: [
-					{image: '/static/index/swiper.png'},
-					{image: '/static/index/swiper.png'},
-					{image: '/static/index/swiper.png'}
+				icons: [
+					{image: '/static/ldt/earnPoints.png', name: '赚积分', url: '/pages/activityList/index'},
+					{image: '/static/ldt/costPoints.png', name: '花积分', url: ''},
+					{image: '/static/ldt/exchangePoints.png', name: '换积分', url: ''},
 				],
-				activityTags: ['K歌之王','城市争霸','CF城市争霸赛', '主持人比赛'],
-				awardTags: ['1万RMB','点歌机','100000积分'],
-				tags: ['音乐','交友','竞技','全国','积分']
 			}
 		},
-		onLoad() {
-			console.log("路过");
-		},
 		methods: {
-			navWithParm() {
+			navByIcon(url) {
 				uni.navigateTo({
-					url: "/pages/home/home"
+					url: url
 				})
-			},
-			onSearch(item) {
-				console.log(item)
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.activity-tag {
-		margin: 10upx;
-		padding: 0 10upx;
-		font-size: 24upx;
-		line-height: 40upx;
-		background-color: #efefef;
-		border-radius: 16upx;
-	}
-	.award-tag {
-		margin: 10upx;
-		padding: 0 10upx;
-		font-size: 20upx;
-		line-height: 40upx;
-		background-color: #fff0d9;
-		border-radius: 10upx;
-		color: #feac65;
-	}
-	.tag {
-		border-radius: 30upx;
-		border: #fd8678 1upx solid;
-		color: #fd8678;
-		background-color: #FFFFFF;
-		line-height: 40upx;
-		font-size: 20upx;
-		padding: 0 20upx;
-		margin: 0 8upx;
-	}
-	.container {
-		margin: 20upx;
-		background-color: #FFFFFF;
-		border-radius: 20upx;
+	.car-head {
+		background-color: #ffffff;
+		margin: -60upx 30upx 30upx 30upx;
+		height: 180upx;
+		border-radius: 100upx;
+		box-shadow: 10upx 20upx 60upx #d8d8d8;
+		.avatar {
+			margin-top: -40upx;
+			padding-left: 40upx;
+			padding-right: 20upx;
+		}
+		.name {
+			padding-top: 10upx;
+			font-size: 26upx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #222222;
+		}
 	}
 </style>

pages/webView/webView.vue

@@ -1,25 +0,0 @@
-<template>
-	<view>
-		<web-view :src="src"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				src: ''
-			}
-		},
-		onLoad(options) {
-			this.src=options.src
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!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>