合并

config/index.js

@@ -1,14 +1,8 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
-<<<<<<< HEAD
-// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api'
 export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api'
-// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api'
+// export const VUE_APP_API_URL = 'http://192.168.0.111:8088/api'
-=======
+// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api'
-// export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api'
-// export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api'
-export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api'
->>>>>>> 1521d49cdb4b0c5490ac953afbe9910a0a287c45
 //  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';

pages/course/detail.vue

@@ -262,7 +262,7 @@
 			console.log(this.detail.id)
 			return {
 				title: this.detail.courseName,
-				imageUrl:this.detail.imageArr[0],
+				imageUrl:this.detail.coverImg,
 				path: '/pages/course/detail?id=' + this.detail.id,
 			}
 		},
@@ -430,7 +430,7 @@
 					signType: 'MD5',
 					package:orderInfo.packageValue,
 				  success: success => {
-						if(this.detail.courseType == 1){  //直播课程弹出引导下载小程序
+						if(this.detail.courseType == 1){  //直播课程弹出引导下载app
 							this.showSignUp = true
 							this.getDetail()
 						} else{

pages/home/index.vue

@@ -104,7 +104,7 @@
 								<text>{{item.clockTimes}}</text>
 							</view>
 							<view class="study-content">
-								<view class="study-title">{{item.listName}}</view>
+								<view class="study-title line1">{{item.listName}}</view>
 								<view class="study-time acea-row-nowrap row-between-wrapper">
 									<view>{{setDate(item.listStartTime)}}开始</view>
 									<view>{{item.enterNum}}人已参与</view>