Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

.env.development

@@ -7,7 +7,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
 
 
 

src/components/points-and-badge/check-in.vue

@@ -1,5 +1,4 @@
 <template>
-	<view class="">
 		<uni-popup ref="popup">
 			<view class="popup-content" @touchmove.stop>
 				<view class="fl1"></view>
@@ -69,7 +68,7 @@
 				<view class="fl1"></view>
 			</view>
 		</uni-popup>
-	</view>
+	
 </template>
 
 <script setup>
@@ -348,12 +347,13 @@
 		 * 80rpx 切换盒子高度 
 		 */
 		height: calc(100% - 26rpx - 68rpx - 128rpx - 16rpx - 92rpx - 80rpx - 8rpx);
+		min-height: 130rpx;
 	}
 	.switch-div {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		height: 60rpx;
+		height: 8%;
 		margin: 10rpx 30%;
 		.back_div {
 			.back-icon {
@@ -472,10 +472,12 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding: 40rpx 0;
+		padding: calc(10rpx + 3%) 0;
+		padding: 20rpx 0;
 	}
 	.max-div {
-		width: 80vw;
+		width: 600rpx;
+		// width: 80vw;
 		background-color: #fefbfa;
 		border-radius: 38rpx;
 		position: relative;

src/components/points-and-badge/points.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="">
+	<view>
 		<uni-popup ref="popup">
 			<view class="popup-content" @touchmove.stop>
 				<view class="fl1"></view>
@@ -177,6 +177,7 @@
 		flex-direction: column;
 		align-items: center;
 		padding: 40rpx 0;
+		
 	}
 	.max-div {
 		width: 80vw;
@@ -187,5 +188,6 @@
 		overflow: hidden;
 		margin-top: var(--status-bar-height);
 		margin-bottom: 120rpx;
+		overflow: auto;
 	}
 </style>

src/pages.json

@@ -605,7 +605,9 @@
             "titleView": false,
             "bounce": "none",
             "softinputNavBar": "none"
-        }
+        },
+		"rpxCalcMaxDeviceWidth": 600,
+		"rpxCalcBaseDeviceWidth": 375
     },
     "uniIdRouter": {}
 }

src/pages/pointsAndRank/badge.vue

@@ -303,12 +303,11 @@
 
 			.badge-img-title {
 				margin-top: 10rpx;
-				// white-space: nowrap;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				font-weight: 500;
 				font-size: 30rpx;
-				line-height: 20px;
+				line-height: 40rpx;
 				text-align: center;
 				font-style: normal;
 				color: #e2d1cc;

src/pages/sparring/talkVideo.nvue

@@ -24,7 +24,6 @@
 <script setup>
 	import { ref, reactive, onMounted, onUnmounted, computed, getCurrentInstance, nextTick, toRaw } from 'vue';
 	import { onShow, onLoad, onUnload, onBackPress, onReady } from '@dcloudio/uni-app';
-	// import imagePreviewNvue from '@/components/image-preview/image-preview-nvue.vue';
 	import { get_base_url } from '@/api/request.js';
 	import { getToken } from '@/common/common.js';
 	import { ProtocolCodec, MessageType } from './js/ProtocolCodec';