From b13c161ad4f0b4686473559b1b98eb61938bd9e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 20:39:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_app
---
pages/securityStaff/information.vue | 14 +++++++-------
pages/dispatch/imgissue.vue | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pages/dispatch/imgissue.vue b/pages/dispatch/imgissue.vue
index ddd8e04..c5444ff 100644
--- a/pages/dispatch/imgissue.vue
+++ b/pages/dispatch/imgissue.vue
@@ -179,7 +179,7 @@
for (var i = 0; i < tempFilePath.length; i++) {
uni.uploadFile({
// url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
- url: 'http://192.168.0.108:81/blade-resource/oss/endpoint/put-file-app',
+ url: this.$store.state.piAPI+ '/blade-resource/oss/endpoint/put-file-app',
filePath: tempFilePath[i],
name: 'file',
formData: {
diff --git a/pages/securityStaff/information.vue b/pages/securityStaff/information.vue
index 92ac067..eecb301 100644
--- a/pages/securityStaff/information.vue
+++ b/pages/securityStaff/information.vue
@@ -49,24 +49,24 @@
</view>
</view>
<u-popup class="certificates" v-model="showi" mode="bottom" border-radius="10">
- <view class="certificatesnj">
+ <view class="certificatesnj" >
- <view class="titleonce">
+ <view class="titleonce" >
保安员证
</view>
<view class="once">
姓名： <view class="o-once"> {{datalist.realName}}</view>
</view>
<view class="once">
- 性别：<view class="o-once"> {{datalist.cardid}}</view>
+ 性别：<view class="o-once"> {{datalist.sex == 1 ? '男' : '女'}}</view>
</view>
<view class="once">
编号：<view class="o-once"> {{datalist.baoanzheng}}</view>
</view>
- <view class="once" style="margin-bottom: 1rem;">
- 发证机关：<view class="o-once" style="margin-right: 1rem;"> {{datalist.fzobj}}</view>
- 发证日期：<view class="o-once">{{datalist.fztime}}</view>
+ <view class="once" style="margin-bottom: 1rem; display: flex;">
+ <view style='flex: 1'>发证机关：<view class="o-once"> {{datalist.fzobj}}</view></view>
+ <view style='flex: 1'>发证日期：<view class="o-once">{{datalist.fztime}}</view></view>
</view>
<u-image class="img" width="150rpx" height="150rpx" :src="datalist.avatar">
<view slot="error" style="font-size: 1rem;">暂无图片</view>
@@ -269,7 +269,7 @@
.o-once {
display: inline-block;
- font-size: 0.86rem;
+ font-size: 0.72rem;
font-weight: 600;
}
}
--
Gitblit v1.9.3