提交

config/api.js

@@ -1,6 +1,6 @@
 // const API_BASE = 'https://xinghuolanqiu.com/newApi'
-const API_BASE = 'http://192.168.1.126:30000'
-// const API_BASE = 'http://192.168.1.117:8089'
+// const API_BASE = 'http://192.168.1.126:30000'
+const API_BASE = 'http://192.168.1.117:8089'
 
 module.exports = {
 	//  微信授权登录
@@ -51,7 +51,8 @@ module.exports = {
 	stuRenewalCardList: API_BASE + '	/v2/sale/class/stuRenewalCardList',
 	// 班级详情->续费卡->确认
 	openRenewalCard: API_BASE + '	/v2/sale/class/openRenewalCard',
-	
+	//  班级详情-> 病假结束确认
+	leaveLessonsEndOk: API_BASE + '/v2/sale/class/leaveLessonsEndOk',
 	//  获取消息通知列表
 	getMessageList: API_BASE + '/v2/coach/message/getMessageList',
 	//  消息请假同意

pagesClass/classDetail.vue

@@ -37,9 +37,8 @@
 			</view>
 		</u-card>
 		<u-card :title="'事假(' + getStudentsNumber(2) + ')'" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
-			<u-grid :col="3" slot="body" :border="false">
+			<u-grid :col="3" slot="body" :border="false" v-if="classInfo.studentLeaveRecordList.length">
 				<u-grid-item v-for="(item, index) in classInfo.studentLeaveRecordList" :key="index" :custom-style="gridCustomStyle">
-				<!-- 	<view class="class-student-col" :class="item.agreeType == 1 ? 'student-active' : ''" @click="handleleaveClick(item.leaveRecordId)"> -->
 						<view class="class-student-col" @click="handleleaveClick(item)">
 						{{item.name}}
 						<u-icon :name="item.agreeType == 1 ?  'bookmark-fill' : 'bookmark'" :color="mainColor" size="48"></u-icon>
@@ -47,8 +46,18 @@
 				</u-grid-item>
 			</u-grid>
 		</u-card>
-		<u-card :title="'续费卡(' + getStudentsNumber(3) + ')'" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
-			<u-grid :col="3" slot="body" :border="false">
+		<u-card :title="'病假结束确认(' + getStudentsNumber(3) + ')'" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
+			<u-grid :col="3" slot="body" :border="false" v-if="classInfo.studentLeaveList.length">
+				<u-grid-item v-for="(item, index) in classInfo.studentLeaveList" :key="index" :custom-style="gridCustomStyle">
+						<view class="class-student-col" @click="handleOtherClick(item)">
+						{{item.name}}
+						<u-icon :name="item.agreeType == 1 ?  'bookmark-fill' : 'bookmark'" :color="mainColor" size="48"></u-icon>
+					</view>
+				</u-grid-item>
+			</u-grid>
+		</u-card>
+		<u-card :title="'续费卡(' + getStudentsNumber(4) + ')'" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
+			<u-grid :col="3" slot="body" :border="false"  v-if="classInfo.studentRenewList.length">
 				<u-grid-item v-for="(item, index) in classInfo.studentRenewList" :key="index" :custom-style="gridCustomStyle">
 					<view class="class-student-col" :class="item.state ? 'student-active' : ''" @click="handleVtCardClick(item)">
 						{{item.name}}
@@ -93,6 +102,12 @@
 				<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="handleAgreeClick">同意</u-button>
 			</view>
 		</u-popup>
+		<!-- 病假确认 -->
+		<u-modal v-model="leaveOtherShow" content="提示" show-cancel-button @confirm="handleEndClick">
+			<view style="text-align: center;margin: 10px 0;">
+				是否确认{{ studentName }}的病假结束?
+			</view>
+		</u-modal>
 		<!-- 续费卡 -->
 		<u-popup v-model="vtCardShow" mode="center" border-radius="30" width="600rpx">
 			<view class="common-title">续费卡</view>
@@ -131,6 +146,7 @@
 			return {
 				classId: '',
 				studentId: '',
+				studentName: '',
 				classInfo: {
 					name: '',
 					classStartDate: '',
@@ -163,6 +179,7 @@
 				},
 				leaveShow: false,
 				leaveForm: {},
+				leaveOtherShow: false,
 				vtCardShow: false,
 				vtCardId: '',
 				vtCardValue: '',
@@ -171,10 +188,11 @@
 		},
 		onLoad(options) {
 			this.classId = options.id
+		},
+		onShow() {
 			this.initialize()
 			this.getClassShow()
 		},
-		onReady() {},
 		onPullDownRefresh() {
 			this.initialize()
 			this.getClassShow()
@@ -268,9 +286,36 @@
 					case 2: 
 						return this.classInfo.studentLeaveRecordList.length
 					case 3:
+							return this.classInfo.studentLeaveList.length
+					case 4:
 						return this.classInfo.studentRenewList.length
 				}
 			},
+			handleOtherClick(item) {
+				this.studentId = item.id
+				this.studentName = item.name
+				this.leaveOtherShow = true
+			},
+			// 病假知晓
+			handleEndClick() {
+				NET.request(API.leaveLessonsEndOk,{
+					classId:parseInt(this.classId), studentId:parseInt(this.studentId)
+				},'POST').then(res=> {
+					if(res.status == 10000) {
+						this.$refs.uTips.show({
+							title: res.message,
+							type: 'success',
+						})
+						this.initialize()
+						this.getClassShow()
+					} else {
+						this.$refs.uTips.show({
+							title: res.message,
+							type: 'warning',
+						})
+					}
+				})
+			},
 			// 事假信息
 			handleleaveClick(item) {
 				if(agreeType == 1) return

pagesClass/courseForm.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<u-form :model="form" ref="form" label-width="140">
 			<u-form-item label="记录内容" prop="content" required>
-				<u-input v-model="form.content" placeholder="请输入记录内容" type="textarea" auto-height />
+				<u-input v-model="form.content" placeholder="请输入记录内容" type="text" />
 			</u-form-item>
 			<u-form-item label="上传附件" label-position="top">
 				<u-upload max-count="5" :multiple="false" :action="uploadUrl" :header="uploadHeader" @on-success="uploadSuccess"

pagesClass/updateClassForm.vue

@@ -238,10 +238,13 @@
 								title: '提交成功',
 								type: 'success',
 							})
+							// setTimeout(() => {
+							// 	uni.reLaunch({
+							// 		url: '/pagesClass/classList' 
+							// 	})
+							// }, 1000)
 							setTimeout(() => {
-								uni.reLaunch({
-									url: '/pagesClass/classList' 
-								})
+								uni.navigateBack({})
 							}, 1000)
 						}).catch(error => {
 							this.$refs.uTips.show({

pagesMain/studentInfo.vue

@@ -63,9 +63,9 @@
 			this.id = options.id
 			this.type = options.type
 			this.classId = options.classId
-			this.initialize()
 		},
 		onShow() {
+			this.initialize()
 			this.isOver = false
 			this.pageIndex = 1
 			this.tableList = []

unpackage/dist/dev/mp-weixin/app.json

@@ -1,80 +1,81 @@
 {
-  "pages": [
-    "pages/index/index",
-    "pages/news/index",
-    "pages/user/index",
-    "pages/login/index"
-  ],
-  "subPackages": [
-    {
-      "root": "pagesClass",
-      "pages": [
-        "extraLessonsForm",
-        "extraLessonsStudentList",
-        "classList",
-        "addClassForm",
-        "updateClassForm",
-        "classDetail",
-        "courseForm",
-        "signForm",
-        "signStudentList",
-        "timetable"
-      ]
+    "pages": [
+        "pages/index/index",
+        "pages/news/index",
+        "pages/user/index",
+        "pages/login/index"
+    ],
+    "subPackages": [
+        {
+            "root": "pagesClass",
+            "pages": [
+                "extraLessonsForm",
+                "extraLessonsStudentList",
+                "classList",
+                "addClassForm",
+                "updateClassForm",
+                "classDetail",
+                "courseForm",
+                "signForm",
+                "signStudentList",
+                "timetable"
+            ]
+        },
+        {
+            "root": "pagesMain",
+            "pages": [
+                "coachReply",
+                "evaluateList",
+                "evaluateDetail",
+                "extraLessonsList",
+                "leaveLessonsList",
+                "ratioRank",
+                "renewList",
+                "signList",
+                "studentInfo",
+                "communicateForm"
+            ]
+        }
+    ],
+    "window": {
+        "navigationStyle": "default",
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "星火纵横销售端",
+        "navigationBarBackgroundColor": "#ffffff",
+        "backgroundColor": "#F8F8F8"
     },
-    {
-      "root": "pagesMain",
-      "pages": [
-        "coachReply",
-        "evaluateList",
-        "evaluateDetail",
-        "extraLessonsList",
-        "leaveLessonsList",
-        "ratioRank",
-        "renewList",
-        "signList",
-        "studentInfo",
-        "communicateForm"
-      ]
-    }
-  ],
-  "window": {
-    "navigationStyle": "default",
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "星火纵横销售端",
-    "navigationBarBackgroundColor": "#ffffff",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "borderStyle": "black",
-    "backgroundColor": "#fff",
-    "color": "#9A9A9A",
-    "selectedColor": "#666666",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/images/icon-index.png",
-        "selectedIconPath": "static/images/icon-index-active.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/news/index",
-        "iconPath": "static/images/icon-news.png",
-        "selectedIconPath": "static/images/icon-news-active.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/user/index",
-        "iconPath": "static/images/icon-mine.png",
-        "selectedIconPath": "static/images/icon-mine-active.png",
-        "text": "个人"
-      }
-    ]
-  },
-  "runmode": "liberate",
-  "permission": {
-    "scope.userLocation": {
-      "desc": "获取当前区域定位以选取附近场馆"
-    }
-  },
-  "usingComponents": {}
+    "tabBar": {
+        "borderStyle": "black",
+        "backgroundColor": "#fff",
+        "color": "#9A9A9A",
+        "selectedColor": "#666666",
+        "list": [
+            {
+                "pagePath": "pages/index/index",
+                "iconPath": "static/images/icon-index.png",
+                "selectedIconPath": "static/images/icon-index-active.png",
+                "text": "首页"
+            },
+            {
+                "pagePath": "pages/news/index",
+                "iconPath": "static/images/icon-news.png",
+                "selectedIconPath": "static/images/icon-news-active.png",
+                "text": "消息"
+            },
+            {
+                "pagePath": "pages/user/index",
+                "iconPath": "static/images/icon-mine.png",
+                "selectedIconPath": "static/images/icon-mine-active.png",
+                "text": "个人"
+            }
+        ]
+    },
+    "runmode": "liberate",
+    "permission": {
+        "scope.userLocation": {
+            "desc": "获取当前区域定位以选取附近场馆"
+        }
+    },
+    "usingComponents": {},
+    "sitemapLocation": "sitemap.json"
 }

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -14359,8 +14359,8 @@ module.exports = {
 /***/ (function(module, exports) {
 
 // const API_BASE = 'https://xinghuolanqiu.com/newApi'
-var API_BASE = 'http://192.168.1.126:30000';
-// const API_BASE = 'http://192.168.1.117:8089'
+// const API_BASE = 'http://192.168.1.126:30000'
+var API_BASE = 'http://192.168.1.117:8089';
 
 module.exports = {
   //  微信授权登录
@@ -14411,7 +14411,8 @@ module.exports = {
   stuRenewalCardList: API_BASE + '	/v2/sale/class/stuRenewalCardList',
   // 班级详情->续费卡->确认
   openRenewalCard: API_BASE + '	/v2/sale/class/openRenewalCard',
-
+  //  班级详情-> 病假结束确认
+  leaveLessonsEndOk: API_BASE + '/v2/sale/class/leaveLessonsEndOk',
   //  获取消息通知列表
   getMessageList: API_BASE + '/v2/coach/message/getMessageList',
   //  消息请假同意

unpackage/dist/dev/mp-weixin/pagesClass/classDetail.js

@@ -130,6 +130,9 @@ try {
     uInput: function() {
       return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 365))
     },
+    uModal: function() {
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-modal/u-modal */ "uview-ui/components/u-modal/u-modal").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-modal/u-modal.vue */ 463))
+    },
     uRadioGroup: function() {
       return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 432))
     },
@@ -164,6 +167,7 @@ var render = function() {
   var m0 = _vm.getStudentsNumber(1)
   var m1 = _vm.getStudentsNumber(2)
   var m2 = _vm.getStudentsNumber(3)
+  var m3 = _vm.getStudentsNumber(4)
 
   if (!_vm._isMounted) {
     _vm.e0 = function($event) {
@@ -181,7 +185,8 @@ var render = function() {
       $root: {
         m0: m0,
         m1: m1,
-        m2: m2
+        m2: m2,
+        m3: m3
       }
     }
   )
@@ -319,6 +324,21 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -351,6 +371,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
     return {
       classId: '',
       studentId: '',
+      studentName: '',
       classInfo: {
         name: '',
         classStartDate: '',
@@ -383,6 +404,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
 
       leaveShow: false,
       leaveForm: {},
+      leaveOtherShow: false,
       vtCardShow: false,
       vtCardId: '',
       vtCardValue: '',
@@ -391,10 +413,11 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
   },
   onLoad: function onLoad(options) {
     this.classId = options.id;
+  },
+  onShow: function onShow() {
     this.initialize();
     this.getClassShow();
   },
-  onReady: function onReady() {},
   onPullDownRefresh: function onPullDownRefresh() {
     this.initialize();
     this.getClassShow();
@@ -488,20 +511,47 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
         case 2:
           return this.classInfo.studentLeaveRecordList.length;
         case 3:
+          return this.classInfo.studentLeaveList.length;
+        case 4:
           return this.classInfo.studentRenewList.length;}
 
     },
+    handleOtherClick: function handleOtherClick(item) {
+      this.studentId = item.id;
+      this.studentName = item.name;
+      this.leaveOtherShow = true;
+    },
+    // 病假知晓
+    handleEndClick: function handleEndClick() {var _this3 = this;
+      NET.request(API.leaveLessonsEndOk, {
+        classId: parseInt(this.classId), studentId: parseInt(this.studentId) },
+      'POST').then(function (res) {
+        if (res.status == 10000) {
+          _this3.$refs.uTips.show({
+            title: res.message,
+            type: 'success' });
+
+          _this3.initialize();
+          _this3.getClassShow();
+        } else {
+          _this3.$refs.uTips.show({
+            title: res.message,
+            type: 'warning' });
+
+        }
+      });
+    },
     // 事假信息
-    handleleaveClick: function handleleaveClick(item) {var _this3 = this;
+    handleleaveClick: function handleleaveClick(item) {var _this4 = this;
       if (agreeType == 1) return;
       NET.request(API.leaveLessonsInfo, {
         id: parseInt(item.leaveRecordId) },
       'POST').then(function (res) {
         if (res.status == 10000) {
-          _this3.leaveForm = _objectSpread({}, res.data);
-          _this3.leaveShow = true;
+          _this4.leaveForm = _objectSpread({}, res.data);
+          _this4.leaveShow = true;
         } else {
-          _this3.$refs.uTips.show({
+          _this4.$refs.uTips.show({
             title: res.message,
             type: 'warning' });
 
@@ -509,17 +559,17 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       });
     },
     //  事假信息->同意
-    handleAgreeClick: function handleAgreeClick() {var _this4 = this;
+    handleAgreeClick: function handleAgreeClick() {var _this5 = this;
       NET.request(API.leaveLessonsOk, {
         leaveId: parseInt(this.leaveForm.leaveId) },
       'POST').then(function (res) {
         if (res.status == 10000) {
-          _this4.leaveShow = false;
-          _this4.leaveForm = {};
-          _this4.initialize();
+          _this5.leaveShow = false;
+          _this5.leaveForm = {};
+          _this5.initialize();
         } else {
-          _this4.leaveShow = false;
-          _this4.$refs.uTips.show({
+          _this5.leaveShow = false;
+          _this5.$refs.uTips.show({
             title: res.message,
             type: 'warning' });
 
@@ -527,7 +577,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       });
     },
     //  续费卡列表
-    handleVtCardClick: function handleVtCardClick(item) {var _this5 = this;
+    handleVtCardClick: function handleVtCardClick(item) {var _this6 = this;
       this.studentId = parseInt(item.id);
       var data = {
         studentId: parseInt(this.studentId),
@@ -535,14 +585,14 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
 
       NET.request(API.stuRenewalCardList, data, 'POST').then(function (res) {
         if (res.status == 10000) {
-          _this5.vtCardList = res.data;
-          _this5.vtCardShow = true;
+          _this6.vtCardList = res.data;
+          _this6.vtCardShow = true;
         } else {
-          _this5.$refs.uTips.show({
+          _this6.$refs.uTips.show({
             title: res.message,
             type: 'warning' });
 
-          _this5.vtCardShow = false;
+          _this6.vtCardShow = false;
         }
       });
     },
@@ -552,7 +602,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       this.vtCardValue = cardName;
     },
     //  续费卡确认
-    handleAffirmClick: function handleAffirmClick() {var _this6 = this;
+    handleAffirmClick: function handleAffirmClick() {var _this7 = this;
       var data = {
         cardId: parseInt(this.vtCardId),
         studentId: parseInt(this.studentId),
@@ -560,28 +610,28 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
 
       NET.request(API.openRenewalCard, data, 'POST').then(function (res) {
         if (res.status == 10000) {
-          _this6.vtCardShow = false;
-          _this6.$refs.uTips.show({
+          _this7.vtCardShow = false;
+          _this7.$refs.uTips.show({
             title: res.message,
             type: 'success' });
 
-          _this6.initialize();
+          _this7.initialize();
         } else {
-          _this6.$refs.uTips.show({
+          _this7.$refs.uTips.show({
             title: res.message,
             type: 'warning' });
 
-          _this6.vtCardShow = false;
+          _this7.vtCardShow = false;
         }
       });
     },
     //  选择上传文件类型
-    selectUploadType: function selectUploadType(index) {var _this7 = this;
+    selectUploadType: function selectUploadType(index) {var _this8 = this;
       if (index == 0) {
         uni.chooseImage({
           count: 1,
           success: function success(res) {
-            _this7.uploadFile(res.tempFilePaths[0]);
+            _this8.uploadFile(res.tempFilePaths[0]);
           },
           fail: function fail(error) {
 
@@ -591,7 +641,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
         uni.chooseVideo({
           count: 1,
           success: function success(res) {
-            _this7.uploadFile(res.tempFilePath);
+            _this8.uploadFile(res.tempFilePath);
           },
           fail: function fail(error) {
 
@@ -615,35 +665,35 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
 
     },
     //  文件上传成功回调
-    uploadSuccess: function uploadSuccess(id) {var _this8 = this;
+    uploadSuccess: function uploadSuccess(id) {var _this9 = this;
       NET.request(API.insertClassShow, {
         fileId: [id],
         id: this.classId },
       'POST').then(function (res) {
-        _this8.getClassShow();
-        _this8.$refs.uTips.show({
+        _this9.getClassShow();
+        _this9.$refs.uTips.show({
           title: '班级近况发布成功',
           type: 'success' });
 
       }).catch(function (error) {
-        _this8.$refs.uTips.show({
+        _this9.$refs.uTips.show({
           title: error.message,
           type: 'warning' });
 
       });
     },
     //  删除班级近况
-    deleteClassShow: function deleteClassShow(site) {var _this9 = this;
+    deleteClassShow: function deleteClassShow(site) {var _this10 = this;
       NET.request(API.deleteClassShow, {
         id: site.id },
       'POST').then(function (res) {
-        _this9.getClassShow();
-        _this9.$refs.uTips.show({
+        _this10.getClassShow();
+        _this10.$refs.uTips.show({
           title: '删除成功',
           type: 'success' });
 
       }).catch(function (error) {
-        _this9.$refs.uTips.show({
+        _this10.$refs.uTips.show({
           title: error.message,
           type: 'warning' });
 

unpackage/dist/dev/mp-weixin/pagesClass/classDetail.json

@@ -12,6 +12,7 @@
     "u-form": "/uview-ui/components/u-form/u-form",
     "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
     "u-input": "/uview-ui/components/u-input/u-input",
+    "u-modal": "/uview-ui/components/u-modal/u-modal",
     "u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
     "u-radio": "/uview-ui/components/u-radio/u-radio",
     "u-top-tips": "/uview-ui/components/u-top-tips/u-top-tips"

unpackage/dist/dev/mp-weixin/pagesClass/courseForm.js

@@ -107,7 +107,7 @@ try {
       return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 365))
     },
     uUpload: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-upload/u-upload.vue */ 463))
+      return Promise.all(/*! import() | uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-upload/u-upload.vue */ 470))
     },
     uButton: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 316))

unpackage/dist/dev/mp-weixin/pagesClass/courseForm.wxml

@@ -1 +1 @@
-<view class="content data-v-1978bebc"><u-form vue-id="159f99ca-1" model="{{form}}" label-width="140" data-ref="form" class="data-v-1978bebc vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><u-form-item vue-id="{{('159f99ca-2')+','+('159f99ca-1')}}" label="记录内容" prop="content" required="{{true}}" class="data-v-1978bebc" bind:__l="__l" vue-slots="{{['default']}}"><u-input bind:input="__e" vue-id="{{('159f99ca-3')+','+('159f99ca-2')}}" placeholder="请输入记录内容" type="textarea" auto-height="{{true}}" value="{{form.content}}" data-event-opts="{{[['^input',[['__set_model',['$0','content','$event',[]],['form']]]]]}}" class="data-v-1978bebc" bind:__l="__l"></u-input></u-form-item><u-form-item vue-id="{{('159f99ca-4')+','+('159f99ca-1')}}" label="上传附件" label-position="top" class="data-v-1978bebc" bind:__l="__l" vue-slots="{{['default']}}"><u-upload vue-id="{{('159f99ca-5')+','+('159f99ca-4')}}" max-count="5" multiple="{{false}}" action="{{uploadUrl}}" header="{{uploadHeader}}" data-event-opts="{{[['^onSuccess',[['uploadSuccess']]],['^onError',[['uploadError']]],['^onRemove',[['uploadRemove']]]]}}" bind:onSuccess="__e" bind:onError="__e" bind:onRemove="__e" class="data-v-1978bebc" bind:__l="__l"></u-upload></u-form-item></u-form><view class="handle-fix-box data-v-1978bebc"><u-button vue-id="159f99ca-6" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" data-event-opts="{{[['^click',[['submitForm']]]]}}" bind:click="__e" class="data-v-1978bebc" bind:__l="__l" vue-slots="{{['default']}}">提交</u-button></view><u-top-tips vue-id="159f99ca-7" data-ref="uTips" class="data-v-1978bebc vue-ref" bind:__l="__l"></u-top-tips></view>
+<view class="content data-v-1978bebc"><u-form vue-id="159f99ca-1" model="{{form}}" label-width="140" data-ref="form" class="data-v-1978bebc vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><u-form-item vue-id="{{('159f99ca-2')+','+('159f99ca-1')}}" label="记录内容" prop="content" required="{{true}}" class="data-v-1978bebc" bind:__l="__l" vue-slots="{{['default']}}"><u-input bind:input="__e" vue-id="{{('159f99ca-3')+','+('159f99ca-2')}}" placeholder="请输入记录内容" type="text" value="{{form.content}}" data-event-opts="{{[['^input',[['__set_model',['$0','content','$event',[]],['form']]]]]}}" class="data-v-1978bebc" bind:__l="__l"></u-input></u-form-item><u-form-item vue-id="{{('159f99ca-4')+','+('159f99ca-1')}}" label="上传附件" label-position="top" class="data-v-1978bebc" bind:__l="__l" vue-slots="{{['default']}}"><u-upload vue-id="{{('159f99ca-5')+','+('159f99ca-4')}}" max-count="5" multiple="{{false}}" action="{{uploadUrl}}" header="{{uploadHeader}}" data-event-opts="{{[['^onSuccess',[['uploadSuccess']]],['^onError',[['uploadError']]],['^onRemove',[['uploadRemove']]]]}}" bind:onSuccess="__e" bind:onError="__e" bind:onRemove="__e" class="data-v-1978bebc" bind:__l="__l"></u-upload></u-form-item></u-form><view class="handle-fix-box data-v-1978bebc"><u-button vue-id="159f99ca-6" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" data-event-opts="{{[['^click',[['submitForm']]]]}}" bind:click="__e" class="data-v-1978bebc" bind:__l="__l" vue-slots="{{['default']}}">提交</u-button></view><u-top-tips vue-id="159f99ca-7" data-ref="uTips" class="data-v-1978bebc vue-ref" bind:__l="__l"></u-top-tips></view>

unpackage/dist/dev/mp-weixin/pagesClass/signForm.js

@@ -110,7 +110,7 @@ try {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-avatar/u-avatar */ "uview-ui/components/u-avatar/u-avatar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-avatar/u-avatar.vue */ 330))
     },
     uUpload: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-upload/u-upload.vue */ 463))
+      return Promise.all(/*! import() | uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-upload/u-upload.vue */ 470))
     },
     uIcon: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 344))

unpackage/dist/dev/mp-weixin/pagesClass/timetable.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uCalendar: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 470))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 477))
     },
     uTopTips: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 292))

unpackage/dist/dev/mp-weixin/pagesClass/updateClassForm.js

@@ -474,10 +474,13 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
               title: '提交成功',
               type: 'success' });
 
+            // setTimeout(() => {
+            // 	uni.reLaunch({
+            // 		url: '/pagesClass/classList' 
+            // 	})
+            // }, 1000)
             setTimeout(function () {
-              uni.reLaunch({
-                url: '/pagesClass/classList' });
-
+              uni.navigateBack({});
             }, 1000);
           }).catch(function (error) {
             _this.$refs.uTips.show({

unpackage/dist/dev/mp-weixin/pagesMain/evaluateDetail.js

@@ -101,7 +101,7 @@ try {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 285))
     },
     uRate: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 477))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 484))
     },
     uButton: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 316))

unpackage/dist/dev/mp-weixin/pagesMain/ratioRank.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uSubsection: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 484))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 491))
     },
     uIcon: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 344))
     },
     uLineProgress: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-line-progress/u-line-progress */ "uview-ui/components/u-line-progress/u-line-progress").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 491))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-line-progress/u-line-progress */ "uview-ui/components/u-line-progress/u-line-progress").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 498))
     },
     uCard: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 285))

unpackage/dist/dev/mp-weixin/pagesMain/renewList.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uSubsection: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 484))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 491))
     },
     uCard: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 285))

unpackage/dist/dev/mp-weixin/pagesMain/signList.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uSubsection: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 484))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 491))
     },
     uCard: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 285))

unpackage/dist/dev/mp-weixin/pagesMain/studentInfo.js

@@ -235,9 +235,9 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
     this.id = options.id;
     this.type = options.type;
     this.classId = options.classId;
-    this.initialize();
   },
   onShow: function onShow() {
+    this.initialize();
     this.isOver = false;
     this.pageIndex = 1;
     this.tableList = [];

unpackage/dist/dev/mp-weixin/project.config.json

@@ -30,7 +30,8 @@
             "outputPath": ""
         },
         "disableUseStrict": false,
-        "useCompilerPlugins": false
+        "useCompilerPlugins": false,
+        "minifyWXML": true
     },
     "compileType": "miniprogram",
     "libVersion": "2.24.1",

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -20,20 +20,6 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/user/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pagesClass/classDetail",
-                    "query": "id=1684",
-                    "launchMode": "default",
-                    "scene": null
                 }
             ]
         }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="{{['u-loading','data-v-2c9bf24a',mode=='circle'?'u-loading-circle':'u-loading-flower']}}" style="{{$root.s0}}"></view></block>

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.wxss

@@ -0,0 +1,79 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-loading-circle.data-v-2c9bf24a {
+  display: inline-flex;
+  vertical-align: middle;
+  width: 28rpx;
+  height: 28rpx;
+  background: 0 0;
+  border-radius: 50%;
+  border: 2px solid;
+  border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+  -webkit-animation: u-circle-data-v-2c9bf24a 1s linear infinite;
+          animation: u-circle-data-v-2c9bf24a 1s linear infinite;
+}
+.u-loading-flower.data-v-2c9bf24a {
+  width: 20px;
+  height: 20px;
+  display: inline-block;
+  vertical-align: middle;
+  -webkit-animation: a 1s steps(12) infinite;
+  animation: u-flower-data-v-2c9bf24a 1s steps(12) infinite;
+  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+  background-size: 100%;
+}
+@-webkit-keyframes u-flower-data-v-2c9bf24a {
+0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(1turn);
+    transform: rotate(1turn);
+}
+}
+@keyframes u-flower-data-v-2c9bf24a {
+0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(1turn);
+    transform: rotate(1turn);
+}
+}
+@-webkit-keyframes u-circle-data-v-2c9bf24a {
+0% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+

unpackage/dist/dev/mp-weixin/uview-ui/components/u-modal/u-modal.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-loading": "/uview-ui/components/u-loading/u-loading"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-modal/u-modal.wxss

@@ -0,0 +1,62 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-model.data-v-3626fcec {
+  height: auto;
+  overflow: hidden;
+  font-size: 32rpx;
+  background-color: #fff;
+}
+.u-model__btn--hover.data-v-3626fcec {
+  background-color: #e6e6e6;
+}
+.u-model__title.data-v-3626fcec {
+  padding-top: 48rpx;
+  font-weight: 500;
+  text-align: center;
+  color: #303133;
+}
+.u-model__content__message.data-v-3626fcec {
+  padding: 48rpx;
+  font-size: 30rpx;
+  text-align: center;
+  color: #606266;
+}
+.u-model__footer.data-v-3626fcec {
+  display: flex;
+  flex-direction: row;
+}
+.u-model__footer__button.data-v-3626fcec {
+  flex: 1;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 32rpx;
+  box-sizing: border-box;
+  cursor: pointer;
+  text-align: center;
+  border-radius: 4rpx;
+}
+

unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uMask: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-mask/u-mask */ "uview-ui/components/u-mask/u-mask").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-mask/u-mask.vue */ 498))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-mask/u-mask */ "uview-ui/components/u-mask/u-mask").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-mask/u-mask.vue */ 505))
     },
     uIcon: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 344))