5.31重庆bug修改完成

apis/http.js

@@ -5,23 +5,23 @@ class HttpConfig {
 	// #ifdef APP-PLUS
 	// baseUrl = "http://112.29.103.165:21624"
 	// baseUrl = "http://192.168.0.14:21624"
-	// baseUrl = "http://192.168.0.14:18866"
+	baseUrl = "http://192.168.0.14:18866"
 	// baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.9:8080"
 	// baseUrl = "http://10.40.92.52:28080"
-	baseUrl = "http://10.40.92.78:28080"
+	// baseUrl = "http://10.40.92.78:28080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"
 	// #endif
 	// 基地址
-	/* authPath = `${this.baseUrl}/dev-api/auth`
+	authPath = `${this.baseUrl}/dev-api/auth`
 	systemPath = `${this.baseUrl}/dev-api/system`
 	basePath = `${this.baseUrl}/dev-api/base`
-	materialPath = `${this.baseUrl}/dev-api/material` */
-	authPath = `${this.baseUrl}/auth`
+	materialPath = `${this.baseUrl}/dev-api/material`
+	/* authPath = `${this.baseUrl}/auth`
 	systemPath = `${this.baseUrl}/system`
 	basePath = `${this.baseUrl}/base`
-	materialPath = `${this.baseUrl}/material`
+	materialPath = `${this.baseUrl}/material` */
 	// 短链
 	serviceUrl = {
 		login: {

pages/fetchExam/fetchExam.vue

@@ -408,10 +408,12 @@ import { basePath } from '../../public'
 				}
 				switch (that.modalList.taskStatus) {
 					case 31:
-						that.examList.taskStatus = 99 
+						that.examList.taskStatus = 99
+						that.examList.leaseApplyInfoList[0].status = 2
 						break;
 					case 32:
 						that.examList.taskStatus = 100
+						that.examList.leaseApplyInfoList[0].status = 2
 						break;
 				}
 				that.modalList.leaseApplyInfoList[0].examineStatusId = that.examList.taskStatus

pages/testExam/testExam.vue

@@ -330,10 +330,10 @@
 					/* res.data.data.rows.forEach(item => {
 						if (item.taskStatus == 46) item.checked = false
 					}) */
-					for (let item of res.data.data.rows) {
+					for (let item of res.data.rows) {
 						if (item.taskStatus == 46) item.checked = false 
 					}
-					that.fetchMaterialList = res.data.data.rows
+					that.fetchMaterialList = res.data.rows
 					console.log(that.fetchMaterialList);
 				} else {
 					uni.showToast({

pages/testExam/testExamDetails.vue

@@ -237,6 +237,7 @@
 							title: res.data.msg,
 							success: () => {
 								that.closePopup()
+								that.closePopup1()
 								uni.navigateBack()
 							}
 						})
@@ -287,7 +288,9 @@
 						title: '请填写驳回原因！'
 					})
 				} else {
+					that.subObj.remark = that.rejectReason
 					console.log(that.subObj);
+					that.subInStore(that.subObj)
 				}
 			}
 		},

pages/workSpace/workSpace.vue

@@ -44,7 +44,7 @@
 	export default {
 		data() {
 			return {
-				companyName: uni.getStorageSync('companyName'),
+				companyName: '',
 				iptVal: '',
 				benchList: [
 					{
@@ -149,6 +149,17 @@
 					title: '敬请期待！'
 				})
 			}
+		},
+		onShow() {
+			let that = this
+			that.$api.index.fetchCompanyName({
+				ancestors: uni.getStorageSync('userInfo').sysUser.dept.ancestors
+			}).then(res => {
+				console.log(res);
+				if (res.data.code == 200) that.companyName = res.data.msg
+			}).catch(err => {
+				console.log(err);
+			})
 		}
 	}
 </script>