Merge branch 'dev-0120' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tra-app",
-  "version": "0.0.1",
+  "version": "0.0.7",
   "description": "",
   "overrides": {
     "rollup": "4.14.3"

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "tra-app",
     "appid" : "__UNI__EDE0E52",
     "description" : "",
-    "versionName" : "0.0.6",
-    "versionCode" : 6,
+    "versionName" : "0.0.8",
+    "versionCode" : 8,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/course/components/touchBtn.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="talk-btns" ref="talkBtnRef">
-		<view class="touch-btn" @touchstart="getRecordPermission" @touchend="hideOverlayTalking" @touchmove="handleMove"
-			@touchcancel="hideOverlayTalking" v-if="!keyboardIsShow">
+		<!---->
+		<view class="touch-btn" @touchstart="getRecordPermission"  @touchend="hideOverlayTalking"  @touchmove="handleMove"
+			@touchcancel="hideOverlayTalking" v-if="!keyboardIsShow" >
 			按住说话
 		</view>
 		<view class="touch-btn" v-if="keyboardIsShow">
@@ -40,7 +41,7 @@
 					<view class="send-btn" @click="sendText()">发送</view>
 				</view>
 				<view class="btns-box" v-else>
-					<view :class="['close-btn', isOutLeft ? 'is-out' : '']">
+					<view :class="['close-btn', isOutLeft ? 'is-out' : '']" @click="closeModel()">
 						<image class="btn-box" v-if="!isOutLeft" src="/src/static/images/course/cancel.png" mode="heightFix">
 						</image>
 						<image class="btn-box" v-else src="/src/static/images/course/cancel-active.png" mode="heightFix"></image>
@@ -621,6 +622,7 @@
 		return oldText
 	}
 	const changeBtn = () => {
+		console.log('取消按钮');
 		if (props.isDisabled) return;
 		keyboardIsShow.value = !keyboardIsShow.value;
 		answerValue.value = '';

src/pages/course/study.vue

@@ -5,7 +5,6 @@
     <view class="course-study-body" v-show="step === 1">
       <view class="seek-setting">
         <view class="inline-block" @click="showChangeSeekModelNow">{{ chooseRate }}倍</view>
-        <!-- <image src="@/static/images/course/setting.png" alt="" class="image-icon" @click.stop="showChangeBgModelNow"></image> -->
       </view>
       <view class="body-title">
         <uv-icon class="arrow-icon" name="arrow-left" @click="backRouter()" />

src/pages/login/login.vue

@@ -162,7 +162,6 @@
 					}
 				})
 				.catch((res) => {
-					
 					common.hideLoading();
 					if (res.rtnCode === '1001') {
 						common.msg('账号或密码错误，如忘记密码，请去统一身份认证平台修改。');
@@ -196,14 +195,36 @@
 			}
 		});
 	});
-	// 跳进了登录页，禁止返回操作
-	onBackPress(() => back_state.value);
+	const lastBackTime = ref(0);
+	// 跳进了登录页，返回操作细化
+	onBackPress(({ from }) => {
+		// #ifdef APP-PLUS
+		if (from === 'backbutton') {
+			//点击按钮返回
+			const now = new Date().getTime();
+			// 判断是否在2秒内双击了返回键
+			if (now - lastBackTime.value < 2000) {
+				// 双击返回：退出App（uniapp 官方推荐的退出方式）
+				plus.runtime.quit(); // 仅App端有效，H5端无此API
+				return true; // 阻止默认返回行为
+			} else {
+				// 单次点击：提示用户再按一次退出，不返回首页
+				plus.nativeUI.toast('再按一次退出应用', {
+					duration: 'short' // 系统短时长（约2秒），和系统提示一致
+				});
+				// 更新第一次点击的时间戳
+				lastBackTime.value = now;
+				return true;
+			}
+		}
+		// #endif
+		return back_state.value;
+	});
 </script>
 
 <style lang="scss" scoped>
 	.fl2 {
 		flex: 2;
-	
 	}
 	.fl8 {
 		flex: 4;
@@ -211,7 +232,7 @@
 	.ime-div {
 		height: v-bind(imeHeight);
 		width: 100%;
-		transition: height .2s ease;
+		transition: height 0.2s ease;
 	}
 	.bottom_login_div {
 		padding: 0 58rpx;

src/pages/me/index.vue

@@ -42,7 +42,12 @@
 										mode="heightFix"
 										alt="当前徽章"
 									></image-preview>
-									<image v-else src="@/static/images/me/default_rank.png" class="img_100" mode="heightFix"/>
+									<image
+										v-else
+										src="@/static/images/me/default_rank.png"
+										class="img_100"
+										mode="heightFix"
+									/>
 								</view>
 							</view>
 							<view class="fl1"></view>
@@ -199,8 +204,11 @@
 	const socketStore = useSocketStore();
 	const badgeNumRef = ref(null);
 	const currentPointsRef = ref(null);
+	const ENV = import.meta.env;
 	const gotoTestPage = () => {
-		common.navigateTo('/pages/test/index');
+		if (['development', 'sit', 'uat'].includes(ENV.MODE)) {
+			common.navigateTo('/pages/test/index');
+		}
 	};
 	const user_info = reactive({
 		userName: '',
@@ -314,13 +322,10 @@
 		Object.assign(user_info, getUserInfo());
 		statistics_data['get_statistics_data'](); // 获取统计数据
 		// 获取今日是否签到消息
-		initCheckInStatus(({isSigned, checkInDays, popUpStatus}) => {
+		initCheckInStatus(({ isSigned, checkInDays, popUpStatus }) => {
 			user_info.checkInToday = isSigned ? 1 : 2;
 			user_info.checkInDays = checkInDays;
 		});
-		
-		
-		
 	});
 	onHide(() => {
 		checkInRef.value && checkInRef.value.close();