Merge branch 'master' of http://121.40.237.253:3000/lijie/zhxy-desk

# Conflicts:
#	pages/studentRanked/studentRanked.vue

common/js/config.js

@@ -19,16 +19,16 @@ var config = {
 
 	// 版本号
 	version: '5.1.7',
-	schoolBaseData : {					//新田园环境数据
-		baseUrl : 'https://xty-api.wucits.com',
-		redirectUrl : 'https://xty-desk.wucits.com',
-		client_id: 'dingy04ejnszjr36475z',
-	},
-	// schoolBaseData : {					//瓯越环境数据
-	// 	baseUrl : 'http://oy-api.wucits.com',
-	// 	redirectUrl : 'http://oy-desk.wucits.com',
-	// 	client_id: 'dingfdc8wg6xrkm7rxa1',
+	// schoolBaseData : {					//新田园环境数据
+	// 	baseUrl : 'https://xty-api.wucits.com',
+	// 	redirectUrl : 'https://xty-desk.wucits.com',
+	// 	client_id: 'dingy04ejnszjr36475z',
 	// },
+	schoolBaseData : {					//瓯越环境数据
+		baseUrl : 'http://oy-api.wucits.com',
+		redirectUrl : 'http://oy-desk.wucits.com',
+		client_id: 'dingfdc8wg6xrkm7rxa1',
+	},
 
 };
 

pages/login/login.vue

@@ -21,8 +21,8 @@
 			}
 		},
 		mounted(){
-			// this.school_id=this.getUrlParam("school_id")
-			this.school_id=1
+			this.school_id=this.getUrlParam("school_id")
+			// this.school_id=1
 			
 			if(!this.school_id){
 				this.school_id=uni.getStorageSync("school_id")

pages/studentRanked/studentRanked.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="page">
         <view class="txt-white ui-flex-row ui-flex-align-center"
-            style="border-bottom: 4px solid #4472C4;padding-left: 40rpx;height: 54px;position: fixed;top:0;width: 750rpx;z-index: 10;backdrop-filter: blur(4px);"
+            style="border-bottom: 4px solid #4472C4;padding-left: 40rpx;height: 54px;width: 100%;z-index: 10;backdrop-filter: blur(4px);box-sizing: border-box;"
             :style="{'background-color': multiSelect ? '#4472c4' : ''}">
             <view class="ui-p ui-flex-row">
                 <text class="f40">{{chooseClassName}}</text>
@@ -11,9 +11,9 @@
                 </view>
             </view>
 
-            <view class="ui-p ui-flex ui-flex-1 ui-flex-align-center" style="justify-content: end;" v-if="multiSelect">
+            <view class="ui-p ui-flex ui-flex-1 ui-flex-align-center" style="justify-content: end;width: 450px;" v-if="multiSelect">
                 <view class="ui-mr30">
-                    <text class="f32" style="#9ccbff">请点击选则学生批量点评</text>
+                    <text class="f32" style="#9ccbff">请点击选择学生批量点评</text>
                 </view>
                 <view class="ui-flex" style="width: 250px;">
                     <el-button @click="setMulti(false)" plain text="取消选择" style="background-color: #0d4980;" class="ui-mr10">取消选择</el-button>
@@ -30,7 +30,7 @@
             <view class="platform-text txt-white">讲台</view>
             <view class="ranked-radio"></view>
         </view> -->
-        <Draggable class="ui-flex-row ui-flex-space-around" :disabled="!seatMove" forceFallback style="padding:140rpx 0 200rpx 0;" group="ii"
+        <Draggable class="ui-flex-row ui-flex-space-around" :disabled="!seatMove" forceFallback style="padding:20rpx 0 200rpx 0;" group="ii"
             @end="onMoveColumnEnd" @choose="activeList = []" v-model="list" :delay="500" animation="300">
             <view v-for="(column, index) in list" :key="index" class="ui-flex-column" :class="{
                         'ui-mrr' : !!(index%2),
@@ -150,7 +150,6 @@
         data() {
             return {
                 // show_classes: false,
-                id: 1,
                 list: [],
                 classesList: [],
                 chooseClassName: '',
@@ -192,9 +191,10 @@
                 }
             })
         },
-        mounted() {
-            this.id = this.teacher.selfclass.id
+		created() {
             this.getClassroomList();
+		},
+        mounted() {
         },
         methods: {
             debug() {
@@ -226,7 +226,6 @@
                 })
             },
             doChooseClass(val) {
-                // console.log(val);
                 uni.setStorage({
                     key: 'lastClasses',
                     data: val,