Переглянути джерело

去日志,修复新链接里面type为空时候 页面不显示bug

eraser 4 роки тому
батько
коміт
9fdfb83278

+ 3 - 0
components/login/loginByPWD.vue

@@ -123,6 +123,9 @@
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null, null);
 							}
+							else{
+								mydata_userInfo.role = '学生';
+							}
 							userController.updateScore();
 							userController.updateUserInfo();
 							// MyRequest.SetUserType(mydata_userInfo.role, null, null);

+ 5 - 2
components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -462,7 +462,10 @@
 		margin-right: px2vw(50);
 	}
 
-	.right-title {}
+	.right-title {
+		margin-top: px2vw(40);
+		margin-bottom: px2vw(40);
+	}
 
 	.right-title-line {
 		width: px2vw(8);
@@ -480,7 +483,7 @@
 		font-size: px2vw(22);
 		color: #020202;
 		line-height: px2vw(46);
-		margin-top: px2vw(40);
+		// margin-top: px2vw(40);
 	}
 
 	.right-space {

+ 2 - 2
components/topMenu.vue

@@ -203,12 +203,12 @@
 			onClick_test() {
 				MyRequest.GetScore(function(res) {
 					let data = res.data;
-					console.log("请求成功", data);
+					// console.log("请求成功", data);
 					let scores = data.Scores;
 					scores[0].Score = 6;
 					MyRequest.SetupScore(scores, function(res) {
 						MyRequest.GetScore(function(res) {
-							console.log("请求成功2", res);
+							// console.log("请求成功2", res);
 						}, null);
 					}, null);
 				}, null);

+ 1 - 1
components/user/user.vue

@@ -223,7 +223,7 @@
 										let data = res.data;
 										//100成功
 										if (data.Code == 100) {
-											console.log("请求分数成功", res);
+											// console.log("请求分数成功", res);
 											 this.$refs.GRXXJL.updateLearnProgress(data.Scores);
 										}
 										//200失败

+ 1 - 1
components/user/userController.js

@@ -20,7 +20,7 @@ userController = {
 	updateScore: function() {
 		MyRequest.GetScore(function(res) {
 			userController.data_scores = res.data.Scores;
-			console.log("获取分数",res);
+			// console.log("获取分数",res);
 			// console.log("******", userController,userController.data_scores);
 		}, null);
 	},

+ 2 - 2
main.js

@@ -10,8 +10,8 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 
-// Vue.prototype.$Api="http://8.140.128.1:8085"
-Vue.prototype.$Api="http://39.105.166.141:8085"
+Vue.prototype.$Api="http://8.140.128.1:8085"
+// Vue.prototype.$Api="http://39.105.166.141:8085"
 Vue.prototype.$UserId="1e9c969f-8990-40f2-8a8c-ecbafc5720b2"
 
 const app = new Vue({

+ 2 - 2
myData.js

@@ -26,6 +26,6 @@ mydata_userInfo = {
 	"email":'',
 	"Position":''
 }
-mydata_api='http://39.105.166.141:8085'
-// mydata_api='http://8.140.128.1:8085'
+// mydata_api='http://39.105.166.141:8085'
+mydata_api='http://8.140.128.1:8085'
 

+ 3 - 3
pages/home.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="mybody bgclF8 df fdc">
-
 		<TopMenu ref="TopMenu" v-on:onTopSYClick="onTopSYClick" v-on:onTopQXZBClick="onTopQXZBClick"
 			v-on:onLoginClick="onLoginClick" v-on:onTopXXYSYClick="onTopXXYSYClick"
 			v-on:onTopMenuIconClick="onTopMenuIconClick" v-on:onClick_return="onClick_return"
@@ -37,7 +36,6 @@
 		</view>
 		<!-- 左侧导航栏永远保持在最上层 -->
 		<LeftMenu ref="LeftMenu" v-on:onLeftMenuClick="onLeftMenuClick"></LeftMenu>
-
 		<webview720 ref="webview720"></webview720>
 		<shutDownWebview ref="shutDownWebview" v-on:onHideWebview="onHideWebview" v-on:onClick_KSKC="onClick_KSKC"></shutDownWebview>
 	</view>
@@ -176,7 +174,9 @@
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null, null);
 							}
-
+							else{
+								mydata_userInfo.role = '学生';
+							}
 							userController.updateUserInfo();
 							userController.updateScore();
 

+ 3 - 3
request.js

@@ -8,8 +8,8 @@ MyRequest = {
 		console.log("i am request");
 	},
 	uniRquest: function(myurl, mydata, suc100, fail) {
-		console.log("请求url", mydata_api + myurl);
-		console.log("mydata", mydata);
+		// console.log("请求url", mydata_api + myurl);
+		// console.log("mydata", mydata);
 		uni.request({
 			header: {
 				'Content-Type': 'application/json;charset=UTF-8'
@@ -21,7 +21,7 @@ MyRequest = {
 			success: (res) => {
 				//100成功
 				if (res.data.Code == 100) {
-					console.log('suc100', res);
+					// console.log('suc100', res);
 					if (suc100) {
 						suc100(res);
 					}