修复代码合并报错

common/config.js

@@ -1,10 +1,10 @@
-// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
-// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-api.hnsiyao.cn"; //后台服务域名
+const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
+const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
+const ROOTPATH2 = "https://dj-api.hnsiyao.cn"; //后台服务域名
 
-const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
-const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://video.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
+// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
+// const ROOTPATH2 = "https://video.hnsiyao.cn"; //后台服务域名
 
 module.exports = {
 	APIHOST: ROOTPATH,

me/choujiang/choujiang.vue

@@ -149,7 +149,7 @@
 		methods: {
 			toRed(){
 				uni.navigateTo({
-					url: '/me/balance/index'
+					url: '/me/invite/cashDetail'
 				})
 				
 			},

me/detail/detail.nvue

@@ -382,8 +382,8 @@
 					'width': '750rpx',
 				},
 				isShowVideo: '',
-				noBuyVideoIndex:null
-				playFlag: false,
+				noBuyVideoIndex:null,
+				playFlag: false
 			};
 		},
 		onUnload() {
@@ -508,16 +508,6 @@
 			}
 		},
 		methods: {
-			onDone(index) {
-				const prize = this.prizeList[index]
-				uni.showModal({
-					title: prize.id == 'thanks' ? '很遗憾' : '恭喜您',
-					content: (prize.id !== 'thanks' ? `获得` : '') + prize.name
-				})
-			},
-			onClick() {
-				// 奖品的索引
-				this.$refs.dialer.run(5)
 			//播放时的回掉
 			videoPlay(videoId,courseDetailsId) {
 				this.courseDetailsId = courseDetailsId