1

jiuyi2/api/mine.js

@@ -354,16 +354,6 @@ const mine = {
 	},
 
 	/**
-<<<<<<< HEAD
-	 * 解锁他人评论
-	 * @param {Object} param
-	 */
-	unlockComment(param) {
-		return util.request({
-			url: `/video/comment/unlockOthersComment`,
-			data: param,
-			method: 'POST',
-=======
 	* 查看已绑定的银行卡列表
 	* @param {Object} param
 	*/
@@ -374,21 +364,9 @@ const mine = {
 			query: param.query,
 			method: 'GET',
 			load: true,
->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d
 		})
 	},
-
 	/**
-<<<<<<< HEAD
-	 * 拉黑
-	 * @param {Object} param
-	 */
-	blockUser(param) {
-		return util.request({
-			url: `/video/statistics/block`,
-			data: param,
-			method: 'POST',
-=======
 	 * 添加银行卡
 	 * @param {Object} param
 	 */
@@ -412,7 +390,30 @@ const mine = {
 			path: param.path,
 			method: 'DELETE',
 			load: true,
->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d
+		})
+	},
+
+	/**
+	 * 拉黑
+	 * @param {Object} param
+	 */
+	blockUser(param) {
+		return util.request({
+			url: `/video/statistics/block`,
+			data: param,
+			method: 'POST',
+		})
+	},
+	
+	/**
+	 * 解锁他人评论
+	 * @param {Object} param
+	 */
+	unlockComment(param) {
+		return util.request({
+			url: `/video/comment/unlockOthersComment`,
+			data: param,
+			method: 'POST',
 		})
 	},
 }

jiuyi2/common/js/config.js

@@ -6,13 +6,9 @@ const config = {
 	// host: 'h5api',
 	// #endif
 	// #ifndef H5
-<<<<<<< HEAD
 	// host: 'http://91f.xyz:8080',
 	// host: 'https://1a880cd5.r24.cpolar.top/',
 	host: 'http://aere2w.natappfree.cc',
-=======
-	host: 'http://91f.xyz:8080',
->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d
 	// #endif
 	// 支付方式配置
 	payType: {

jiuyi2/pages/index/videoHome.vue

@@ -420,8 +420,8 @@ function toCommentsList() {
 			</view>
 
 			<!-- 列表 -->
-			<view class="list mtb20 plr20 c111 f24 bfff br10">
-				<view class="item rows ptb25" v-if="0">
+			<view class="list mtb20 plr20 c111 f24 bfff br10" v-if="0">
+				<view class="item rows ptb25">
 					<view class="key">设置备注</view>
 					<view class="inputBox tac">
 						<input class="c111 f24" type="text" placeholder="请输入备注" />

jiuyi2/pages/mine/myComment.vue

@@ -35,7 +35,6 @@ const userinfo = computed(() => {
 	return store.state.userinfo
 })
 
-<<<<<<< HEAD
 onLoad((option) => {
 	if (option.userId) {
 		uni.setNavigationBarTitle({
@@ -44,9 +43,17 @@ onLoad((option) => {
 		getList(option.userId)
 	} else {
 		getList()
-=======
-	onLoad(() => {
-		getLst()
+	}
+})
+
+onReachBottom(() => {
+	// 获取更多列表
+	getMoreVideoList()
+})
+
+onPullDownRefresh(() => {
+	// 刷新
+	refreshVideoList()
 })
 
 // 重载视频列表
@@ -90,20 +97,9 @@ onLoad((option) => {
 	}).finally(() => {
 		uni.stopPullDownRefresh()
 	})
->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d
 }
 
-})
 
-onReachBottom(() => {
-	// 获取更多列表
-	getMoreVideoList()
-})
-
-onPullDownRefresh(() => {
-	// 刷新
-	refreshVideoList()
-})
 
 // 重载视频列表
 function refreshVideoList() {

jiuyi2/vite.config.js

@@ -3,13 +3,9 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-<<<<<<< HEAD
 // let target = 'http://91f.xyz:8080'
 // let target = 'https://1a880cd5.r24.cpolar.top/'
 let target = 'http://aere2w.natappfree.cc'
-=======
-let target = 'http://91f.xyz:8080'
->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d
 
 export default defineConfig({
 	plugins: [uni()],