From e8a54d02091da6674054d9c3c176ef012df3751e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 10:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/driverDetail.vue | 9 ++++-----
h5_meeting/pages/index/index.vue | 2 +-
h5_meeting/utils/service.js | 2 +-
h5_meeting/manifest.json | 44 ++++++++++++++++++++------------------------
4 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/admin/src/views/task/driverDetail.vue b/admin/src/views/task/driverDetail.vue
index 3833e48..2856745 100644
--- a/admin/src/views/task/driverDetail.vue
+++ b/admin/src/views/task/driverDetail.vue
@@ -78,12 +78,11 @@
<div v-if="item.checkInfo" class="remark">
{{ item.checkInfo }}
</div>
- <div v-if="item.approveType == 1" class="carbon">
+ <div v-if="item.approveType == 0 || item.type == 1 || item.approveType == 1" class="carbon">
<div class="carbon_item" v-for="child in item.approveList" :key="child.id">
- <img :src="child.faceImg
- ? child.faceImg
- : require('@/assets/avatar/man.png')
- "></img>
+ <img v-if="child.faceImg != null && child.faceImg != ''" :src="child.faceImg" class="avatar" alt="" />
+ <img v-if="child.faceImg == null || child.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"
+ alt="" />
<div class="text">{{ child.memberName }}</div>
</div>
</div>
diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index df57eb9..c727230 100644
--- a/h5_meeting/manifest.json
+++ b/h5_meeting/manifest.json
@@ -85,30 +85,26 @@
}
}
},
- "h5" : {
- "router" : {
- "mode" : "hash",
- "base" : "./"
- },
- // "base" : "/h5/"
- "devServer" : {
- "port" : 8090,
- "historyApiFallback" : true,
- "disableHostCheck" : true,
- "proxy" : {
- "/gateway_interface" : {
- // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
- // "target": "http://192.168.137.1:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- // "target" : "http://192.168.31.42:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- "target" : "http://10.50.250.178:8088", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- "changeOrigin" : true, // 鍏佽璺ㄥ煙
- "pathRewrite" : {
- "^/gateway_interface" : ""
- }
- }
- },
- "https" : false
- }
+ "h5": {
+ "router": {
+ "mode": "hash",
+ "base": "./"
+ },
+ "devServer": {
+ "port": 8091,
+ "historyApiFallback": true,
+ "disableHostCheck": true,
+ // "proxy": {
+ // "/gateway_interface": {
+ // "target" : "http://10.50.250.253:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ // "changeOrigin": true, // 鍏佽璺ㄥ煙
+ // "pathRewrite": {
+ // "^/gateway_interface": ""
+ // }
+ // }
+ // },
+ "https": false
+ }
},
/* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
"quickapp" : {},
diff --git a/h5_meeting/pages/index/index.vue b/h5_meeting/pages/index/index.vue
index 44a7607..6682e3c 100644
--- a/h5_meeting/pages/index/index.vue
+++ b/h5_meeting/pages/index/index.vue
@@ -191,7 +191,7 @@
}
.main_app {
width: 100%;
- min-height: 100vh;
+ height: 100vh;
position: relative;
font-size: 28rpx;
display: flex;
diff --git a/h5_meeting/utils/service.js b/h5_meeting/utils/service.js
index 69029d9..6d8ff54 100644
--- a/h5_meeting/utils/service.js
+++ b/h5_meeting/utils/service.js
@@ -14,7 +14,7 @@
})
const param = uni.getStorageSync('param') || {}
uni.request({
- url: param.baseUrl || baseUrl + options.url,
+ url: (param.baseUrl || baseUrl) + options.url,
data: options.data || {},
method: options.method || 'GET',
header: options.header || {
--
Gitblit v1.9.3