From 6ac84f695d8f0e4f647bf82d719a1eed24e4d7dc Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 23 十一月 2023 14:07:29 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
sz_app/pages/spotCheck/deviceSpot.vue | 2 +-
sz_app/pages/homeIndex/index.vue | 2 +-
sz_app/pages/ductpieceIndex/index.vue | 2 +-
sz_app/pages/loginIndex/index.vue | 4 ++--
sz_app/pages/reinforcIndex/index.vue | 2 +-
web/src/components/uploadPhoto.vue | 3 ++-
sz_app/pages/spotCheck/spotDetail.vue | 2 +-
sz_app/api/http.js | 2 +-
sz_app/manifest.json | 2 +-
9 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/sz_app/api/http.js b/sz_app/api/http.js
index 69f9a09..276a098 100644
--- a/sz_app/api/http.js
+++ b/sz_app/api/http.js
@@ -1,7 +1,7 @@
function Request() {}
// export const baseUrl = 'https://pipe.thhy-tj.com/api';
// export const baseUrl = 'http://192.168.0.170:8880';
-export const baseUrl = 'http://111.30.93.212:8089/suapi';
+export const baseUrl = 'https://szpipe.thhy-tj.com/suapi';
Request.prototype = {
post: function(url, params) {
return new Promise(function(resolve, reject) {
diff --git a/sz_app/manifest.json b/sz_app/manifest.json
index 06963e0..8c7d46d 100644
--- a/sz_app/manifest.json
+++ b/sz_app/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "智慧管片",
+ "name" : "苏州智慧管片",
"appid" : "__UNI__D1E1AF0",
"description" : "",
"versionName" : "1.1.1",
diff --git a/sz_app/pages/ductpieceIndex/index.vue b/sz_app/pages/ductpieceIndex/index.vue
index b859482..366783c 100644
--- a/sz_app/pages/ductpieceIndex/index.vue
+++ b/sz_app/pages/ductpieceIndex/index.vue
@@ -435,7 +435,7 @@
status: 'success',
message: '',
data: data.data,
- url: `http://filemanage.thhy-tj.com:8888/${data.data}`
+ url: `https://szpipe.thhy-tj.com/${data.data}`
})
},
fail: (error) => {
diff --git a/sz_app/pages/homeIndex/index.vue b/sz_app/pages/homeIndex/index.vue
index bd7de73..72b17cd 100644
--- a/sz_app/pages/homeIndex/index.vue
+++ b/sz_app/pages/homeIndex/index.vue
@@ -44,7 +44,7 @@
const menuData = JSON.parse(uni.getStorageSync('menuData')) || [];
this.homeTabList = menuData.map(item => {
console.log(item.menuIcon);
- item.menuIcon = `http://filemanage.thhy-tj.com:8888/${item.menuIcon}`
+ item.menuIcon = `https://szpipe.thhy-tj.com/${item.menuIcon}`
return item;
})
},
diff --git a/sz_app/pages/loginIndex/index.vue b/sz_app/pages/loginIndex/index.vue
index 86b9da2..c93788c 100644
--- a/sz_app/pages/loginIndex/index.vue
+++ b/sz_app/pages/loginIndex/index.vue
@@ -64,8 +64,8 @@
data() {
return {
formLogin: {
- username: '15010128058',
- password: '123456'
+ username: '',
+ password: ''
},
rulesLogin: {
username: [{
diff --git a/sz_app/pages/reinforcIndex/index.vue b/sz_app/pages/reinforcIndex/index.vue
index 09f2a20..0162d18 100644
--- a/sz_app/pages/reinforcIndex/index.vue
+++ b/sz_app/pages/reinforcIndex/index.vue
@@ -448,7 +448,7 @@
status: 'success',
message: '',
data: data.data,
- url: `http://filemanage.thhy-tj.com:8888/${data.data}`
+ url: `https://szpipe.thhy-tj.com/${data.data}`
})
},
fail: (error) => {
diff --git a/sz_app/pages/spotCheck/deviceSpot.vue b/sz_app/pages/spotCheck/deviceSpot.vue
index 1676e43..baa2b35 100644
--- a/sz_app/pages/spotCheck/deviceSpot.vue
+++ b/sz_app/pages/spotCheck/deviceSpot.vue
@@ -193,7 +193,7 @@
status: 'success',
message: '',
data: data.data,
- url: `http://filemanage.thhy-tj.com:8888/suapi/${data.data}`
+ url: `https://szpipe.thhy-tj.com/suapi/${data.data}`
})
},
fail: (error) => {
diff --git a/sz_app/pages/spotCheck/spotDetail.vue b/sz_app/pages/spotCheck/spotDetail.vue
index ebc4210..0b40b3a 100644
--- a/sz_app/pages/spotCheck/spotDetail.vue
+++ b/sz_app/pages/spotCheck/spotDetail.vue
@@ -93,7 +93,7 @@
<u-image
v-for="item in formData.fileList"
:key="item.id"
- :src="`http://filemanage.thhy-tj.com:8888${item.file}`"
+ :src="`https://szpipe.thhy-tj.com${item.file}`"
width="100px"
height="100px"
radius="4">
diff --git a/web/src/components/uploadPhoto.vue b/web/src/components/uploadPhoto.vue
index 69c2bcc..4c539ae 100644
--- a/web/src/components/uploadPhoto.vue
+++ b/web/src/components/uploadPhoto.vue
@@ -111,7 +111,8 @@
this.$message.warning("仅能上传一张人脸图像！");
return false;
}
- if (file.size > (1024)) {
+ console.log(file.size,'size???')
+ if (file.size > (1024 * 1024)) {
this.$message.warning("请上传小于1m的照片！！！");
return false;
}
--
Gitblit v1.9.3