8.25 实验室管理部分代码

src/store/index.js

@@ -2,8 +2,8 @@ import { createStore } from "vuex";
 
 
 export default createStore({
 export default createStore({
   state: {
   state: {
-    appid : "wx765a55464b308d13", // 公众号的AppID 2023-08-14 测试的
-    // appid : "wx977825b5a132b74d", // 公众号的AppID 正式的
+    // appid : "wx765a55464b308d13", // 公众号的AppID 2023-08-14 测试的
+    appid : "wx977825b5a132b74d", // 公众号的AppID 正式的
     imgUrl: "http://43.143.63.140",
     imgUrl: "http://43.143.63.140",
     studentId: "", //学生Id
     studentId: "", //学生Id
     studentName: "", //学生姓名
     studentName: "", //学生姓名

src/utils/axios.js

@@ -12,8 +12,8 @@ import router from "../router";
 import {getToken} from "@/utils/auth";
 import {getToken} from "@/utils/auth";
 import {tansParams} from "@/utils/common";
 import {tansParams} from "@/utils/common";
 
 
-// axios.defaults.baseURL = "/school";
-axios.defaults.baseURL = "/houduan";
+axios.defaults.baseURL = "/school";
+// axios.defaults.baseURL = "/houduan";
 
 
 // axios.defaults.baseURL = "/schoolnw";
 // axios.defaults.baseURL = "/schoolnw";
 // process.env.NODE_ENV == "development" ? "https://y32025c600.goho.co" : "//43.143.63.140:8095";
 // process.env.NODE_ENV == "development" ? "https://y32025c600.goho.co" : "//43.143.63.140:8095";
@@ -118,6 +118,8 @@ axios.interceptors.response.use(
             console.log(res.data);
             console.log(res.data);
             if(res.data.code == 2000){
             if(res.data.code == 2000){
                return res.data
                return res.data
+            }if(res.data.code == 3000){
+                return res.data
             }
             }
             // if (res.data.message) Toast.fail(res.data.message);
             // if (res.data.message) Toast.fail(res.data.message);
             if (res.data.code == 401) {
             if (res.data.code == 401) {

src/utils/scanCode.js

@@ -10,6 +10,7 @@ import router from "@/router/index.js"
 export function scanCodeFun(appId,type){
 export function scanCodeFun(appId,type){
     console.log('appId',appId)
     console.log('appId',appId)
     let url = location.href.split('#')[0] //获取当前域名
     let url = location.href.split('#')[0] //获取当前域名
+    // let url = location.origin
     let encode = ''
     let encode = ''
     console.log('location',location)
     console.log('location',location)
     getWxConfig(url).then(res=>{
     getWxConfig(url).then(res=>{

src/views/parent/InforCollection/apply.vue

@@ -517,12 +517,12 @@ import { Toast } from "vant";
 import axios from "axios";
 import axios from "axios";
 import { useStore } from "vuex";
 import { useStore } from "vuex";
 import { formatDatetime, formatDate } from "@/utils/time.js";
 import { formatDatetime, formatDate } from "@/utils/time.js";
-import {
-  storetyprelationshiptyp,
-  storetyppoliticstatus,
-  getregisttypeByvalue,
-  getstudentnaturetypeByvalue,
-} from "@/service/dir";
+// import {
+//   storetyprelationshiptyp,
+//   storetyppoliticstatus,
+//   getregisttypeByvalue,
+//   getstudentnaturetypeByvalue,
+// } from "@/service/dir";
 const store = useStore();
 const store = useStore();
 const router = useRouter();
 const router = useRouter();
 const route = useRoute();
 const route = useRoute();

src/views/teacher/schoolProperty/equipmentInfo.vue

@@ -57,6 +57,14 @@ const queryEncode = route.query.encode
 onMounted( async () => {
 onMounted( async () => {
   let result = await scanEquipmentInfo(queryEncode)
   let result = await scanEquipmentInfo(queryEncode)
   console.log('result',result)
   console.log('result',result)
+  if(result.code == 3000){
+    Dialog.alert({
+      title: '提示',
+      message: '该设备非完好状态，不可借用',
+    }).then(() => {
+      router.back();
+    });
+  }
   if(result.code == 200){
   if(result.code == 200){
     Object.assign(equipmentForm,result.data)
     Object.assign(equipmentForm,result.data)
     if(result.data.affiliationType == '1'){
     if(result.data.affiliationType == '1'){

src/views/teacher/schoolProperty/index.vue

@@ -88,7 +88,6 @@ const getCode =  () => {
   //     }
   //     }
   //   })
   //   })
   // }
   // }
-
 }
 }
 const toPage = (type) => {
 const toPage = (type) => {
   if(type == 0){
   if(type == 0){

unused-files.json

 [
 [
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/home.jpg",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/home.jpg",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/hqbx.png",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/index/hqbx.png",
+    "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/login/loginback.png",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/ttf/x.ttf",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/ttf/x.ttf",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/xxcjx.png",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/xxcjx.png",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/zbb.png",
     "/Users/ths/WebstormProjects/二中/公众号/zhxy/src/assets/zbb.png",