From c8890163c9144557673c46dca7b08fe242507cd4 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Mon, 22 Apr 2024 13:18:44 +0800
Subject: [PATCH] =?UTF-8?q?4.22=E9=87=8D=E5=BA=86=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/http.js | 14 +-
.../backMaterialReceive.vue | 2 +-
pages/fetchExam/fetchExam.vue | 157 +++++----------
.../fetchMaterialOutStore.vue | 17 +-
pages/qrcodeBindPage/qrcodeBindPage.vue | 1 +
pages/qrcodeBinding/qrcodeBinding.vue | 2 +-
unpackage/dist/dev/app-plus/app-service.js | 167 +++++++++-------
unpackage/dist/dev/app-plus/app-view.js | 188 ++++++++++--------
8 files changed, 263 insertions(+), 285 deletions(-)
diff --git a/apis/http.js b/apis/http.js
index 0361dec..ac7b3e2 100644
--- a/apis/http.js
+++ b/apis/http.js
@@ -4,23 +4,23 @@ class HttpConfig {
// #endif
// #ifdef APP-PLUS
// baseUrl = "http://112.29.103.165:21624"
- // baseUrl = "http://192.168.0.14:21624"
+ baseUrl = "http://192.168.0.14:21624"
// baseUrl = "http://112.29.103.165:21626"
// baseUrl = "http://172.20.10.3:8080"
- // baseUrl = "http://10.40.92.13:8080"
- baseUrl = "http://10.40.92.52:28080"
+ // baseUrl = "http://10.40.92.8:8080"
+ // baseUrl = "http://10.40.92.52:28080"
// baseUrl = "http://10.40.92.81:8080"
// 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: {
diff --git a/pages/backMaterialReceive/backMaterialReceive.vue b/pages/backMaterialReceive/backMaterialReceive.vue
index f03d8ae..cb35316 100644
--- a/pages/backMaterialReceive/backMaterialReceive.vue
+++ b/pages/backMaterialReceive/backMaterialReceive.vue
@@ -282,7 +282,7 @@ import { basePath } from '../../public'
}
.search-bar{
width: 95%;
- margin: 40rpx auto;
+ margin: 20rpx auto;
}
.single-fetch{
width: 95%;
diff --git a/pages/fetchExam/fetchExam.vue b/pages/fetchExam/fetchExam.vue
index 6f692ad..20bdc93 100644
--- a/pages/fetchExam/fetchExam.vue
+++ b/pages/fetchExam/fetchExam.vue
@@ -14,7 +14,7 @@
-->
- {{ fetch.createBy.slice(0, 1) }}
+ {{ fetch.createBy == null ? '' : fetch.createBy.slice(0, 1) }}
{{ fetch.createBy }}
@@ -74,7 +74,7 @@
@@ -208,7 +208,7 @@
是否通过审批?
通过
- 驳回
+ 驳回