Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

components/zhuapaiConfirm/zhuapai.vue

@@ -170,19 +170,19 @@
 </script>
 
 <style lang="scss">
-	// .zhuapai-drop-container {
-	// 	width: 160rpx;height: 300rpx;margin: 0;padding: 0;z-index: 10;position: absolute;right: 0;top: 30%;overflow: hidden;
-	// 	.phone-camera-box-zhuapai{
-	// 		width: 100%;height: 200rpx;position: absolute;overflow: hidden;
-	// 		.uni-video-container{background-color: transparent;}
-	// 		.hidden-video{transform: translateY(500rpx);}
-	// 	}
-	// 	.video-view-box{/*width:100%;-height: 200rpx;*/position: absolute;}
-	// 	.shiti-video-hidden-btn,.shiti-video-show-btn{
-	// 		background-color: red;width: 50rpx;height: 50rpx;display: block;position: absolute;bottom:50px;}
-	// }
+	.zhuapai-drop-container {
+		width: 160rpx;height: 300rpx;margin: 0;padding: 0;z-index: 10;position: absolute;right: 0;top: 30%;overflow: hidden;
+		.phone-camera-box-zhuapai{
+			width: 100%;height: 200rpx;position: absolute;overflow: hidden;
+			.uni-video-container{background-color: transparent;}
+			.hidden-video{transform: translateY(500rpx);}
+		}
+		.video-view-box{width:100%;-height: 200rpx;position: absolute;}
+		.shiti-video-hidden-btn,.shiti-video-show-btn{
+			background-color: red;width: 50rpx;height: 50rpx;display: block;position: absolute;bottom:50px;}
+	}
 	
-	.dropContainer {
+/* 	.dropContainer {
 		height: 200rpx;
 	}
 	
@@ -232,5 +232,5 @@
 			z-index: -10;
 		}
 	}
-	}
+	} */
 </style>

config.js

@@ -5,7 +5,7 @@ export default   {
   // 应用信息
   appInfo: {
     // 应用名称
-    name: "麦塔",
+    name: "北京诚祥",
     // 应用版本
     version: "1.0.0",
     // 应用logo

pages.json

@@ -162,7 +162,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "麦塔软件",
+		"navigationBarTitleText": "北京诚祥",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		//禁止滑动返回

pages/Login/components/loginBox.vue

@@ -116,7 +116,7 @@
 		// 客户端
 		// #ifdef H5
 		uni.navigateTo({
-			url: `/pages/client/Kecheng/list`
+			url: `/pages/client/ShowYe/shouye`
 		})
 		// #endif
 		

pages/client/Chengji/list.vue

@@ -42,12 +42,12 @@
 			</scroll-view>
 
 		<!-- 页面底端 -->
-		<customTabbarAdminVue></customTabbarAdminVue>
+		<customTabbarClientVue></customTabbarClientVue>
 	</view>
 </template>
 
 <script setup>
-	import customTabbarAdminVue from "@/components/custom-tabbar/custom-tabbar-admin.vue";
+	import customTabbarClientVue from "@/components/custom-tabbar/custom-tabbar-client.vue";
 	import {
 		ref,
 		reactive

pages/client/Kaoshi/exam.vue

@@ -234,7 +234,7 @@
 	// 考试得分相关 start
 	function handleScoreConfirm() {
 		uni.redirectTo({
-			url: '/pages/client/Score/list'
+			url: '/pages/client/Chengji/list'
 		})
 	}
 	
@@ -345,6 +345,11 @@
 			replyList: []
 		};
 		console.log(questionData.value)
+		
+		uni.showLoading({
+			title: '加载中'
+		})
+		
 		questionData.value.forEach(dl => {
 			dl.qas.forEach(st => {
 				const opt = {
@@ -361,6 +366,8 @@
 				// 清空缓存
 				removeCacheKs(data.operId);
 			}
+		}).catch(err => {
+			uni.hideLoading()
 		})
 	}