Merge remote-tracking branch 'origin/dev' into dev

tjty-app/pages_home/tjty_home_page/tjty_home_page.vue

@@ -64,7 +64,7 @@
 				<view class="home_activity_item" v-for="(item1,index1) in activityList" :key="index1"
 					@click="goActDetil(item1)">
 					<view class="activity_image">
-						<image class="image" :src="'https://www.aiwanyundong.com/api/' + item1.bannerImage"></image>
+						<image class="image" :src="'https://www.aiwanyundong.com/stage-api' + item1.bannerImage"></image>
 					</view>
 					<view class="activity-body">
 						<view class="activity_image_title">
@@ -83,7 +83,7 @@
 				<view class="home_exercise_item" v-for="(item,index) in exerciseList" :key="index">
 					<view class="ima">
 						<image style="width: 116px;height:116px;border-radius:16px "
-							:src="'https://www.aiwanyundong.com/api/' + item.image"></image>
+							:src="'https://www.aiwanyundong.com/stage-api' + item.image"></image>
 					</view>
 					<view style="width: 66%;">
 						<view style="height: 80px;">
@@ -149,8 +149,8 @@
 	import {
 		listExercise,
 		listActivityStart,
-		listExerciseHaveToken,
-		listActivityStartHaveToken
+		// listExerciseHaveToken,
+		// listActivityStartHaveToken
 	} from "@/api/homePage.js";
 	import {
 		getToken
@@ -215,6 +215,7 @@
 			getActivityList() {
 				listActivityStart().then(res => {
 					this.activityList = [...this.activityList, ...res.data] || []
+					console.log(res.data);
 				}).catch(err => {
 
 				})