Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/custom-tabbar/custom-tabbar.vue

@@ -77,7 +77,9 @@
 			},
 
 			switchTab(path, index) {
-				this.currentTab = index;
+				if (path !== '/pages/game/index') {
+					this.currentTab = index;
+				}
 				if (getUserIdentity() == 'Visitor') {
 					if (path === '/pages/game/index') {
 						this.$refs.youkeDialogRef.handleShow();
@@ -108,7 +110,6 @@
 
 			this.currentTab  =this.currentTabNumber
 		}
-
 	}
 </script>
 

components/questionJiexi/questionJiexi.vue

@@ -192,7 +192,7 @@
 								},
 								{
 								          "name": "timeDisplay",
-								          "align": "tl",
+								          "align": "tr",
 								          "x": 10,
 								          "y": 5
 								        }

pages/study/lookShipin.vue

@@ -409,7 +409,7 @@
 								},
 								{
 									"name": "timeDisplay",
-									"align": "tl",
+									"align": "tr",
 									"x": 10,
 									"y": 5
 								}