From 0a790e07884e6049099f1c40dad772e6912324fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Fri, 12 Sep 2025 14:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A8=E8=88=AA=E8=AE=A9=E4=BF=AE=E6=94=B9im?=
 =?UTF-8?q?g=E7=BB=84=E4=BB=B6=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                               | 4 ++--
 src/components/image-preview/image-preview.vue | 2 +-
 src/pages/course/components/touchBtn.vue       | 4 ----
 src/pages/course/index.vue                     | 2 +-
 src/pages/login/login.vue                      | 6 +++---
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 64707e11..cb4f14c0 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
 # DEV
-#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # app入口
 #VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
@@ -20,7 +20,7 @@ ENV = 'development'
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.21:9786'
 
 
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 
 # dev
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index c767f559..e5e31246 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -2,7 +2,7 @@
 	<view v-bind="$attrs">
 		<image :src="imgUrlShow"  fit="cover" :mode="mode" @click="showDetail" style="width: 100%;height: 100%;"></image>
 		<!-- <uv-overlay :show="showModel" opacity=".6" @click="showModel = false"> -->
-		<uni-popup ref="PopupRef" class="popup">
+		<uni-popup ref="PopupRef" class="popup" mask-background-color="rgba(0,0,0,.9)">
 			<view class="overlay-box" @click="closePopup">
 				<image class="detail-img" :src="imgUrlShow" :mode="mode"></image>
 			</view>
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index a838b912..f62c2ddb 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -403,11 +403,7 @@
 		background-color: #fff;
 		padding: 25rpx 30rpx 0;
 		position: relative;
-<<<<<<< HEAD
-		z-index: 0;
-=======
 		z-index: v-bind(btnZindex);
->>>>>>> f86f24557b7e788fae333d20384f03331112cbd5
 		.touch-btn {
 			height: 92rpx;
 			box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, .06);
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index a8280b1b..1ad37b11 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -99,7 +99,7 @@
 							>
 								<!-- v-if="itemT.courseList.length>0 && " -->
 								<view class="left-color"></view>
-								{{item.label}}1
+								{{item.label}}
 							</view>
 							<CourseItem v-for="itemC in item.courseList" :itemInfo="itemC" :activeTag="activeTag" @clickItem="toCourseDetail(itemC)"/>
 							<view 
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index bb4e392b..ab9c9e59 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -56,10 +56,10 @@
 				<view class="ysxy_tip font_pf">
 					已阅读并同意
 
-					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=1')">《服务条款》</span>
+					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=1')">《用户隐私协议》</span>
 
-					与
-					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=2')">《隐私权政策》</span>
+					<!-- 与
+					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=2')">《隐私权政策》</span> -->
 				</view>
 			</view>
 		</view>