From 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 18:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
bicycle/pages/problemReporting/problemReporting.vue | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/bicycle/pages/problemReporting/problemReporting.vue b/bicycle/pages/problemReporting/problemReporting.vue
index 2e0949b..5436ca4 100644
--- a/bicycle/pages/problemReporting/problemReporting.vue
+++ b/bicycle/pages/problemReporting/problemReporting.vue
@@ -27,7 +27,9 @@
<view class="form_item_uplaod_list">
<image class="uploadImg" @click="uploadImg" src="@/static/icon/ic_upload@2x.png" mode="widthFix"></image>
<view class="form_item_uplaod_list_item" v-for="(item, index) in from.files" :key="index">
- <image class="img" :src="item.url" mode="widthFix"></image>
+ <view class="images">
+ <image class="img" :src="item.url" mode="widthFix"></image>
+ </view>
<image class="close" @click="dele(index)" src="@/static/icon/ic_clean@2x1.png" mode="widthFix"></image>
</view>
</view>
@@ -93,7 +95,8 @@
files: [],
info: '',
contacts: '',
- phone: ''
+ phone: '',
+ typeId: ''
},
problemList: []
};
@@ -117,7 +120,8 @@
this.$u.api.onlineBike()
.then(res => {
if (res.code === 200) {
- this.binkeId = res.data
+ this.binkeId = res.data.bikeCode
+ this.from.typeId = res.data.paramId
}
})
},
@@ -138,7 +142,8 @@
linkphone: this.from.phone,
longitude: this.from.longitude,
param: this.from.problemName,
- paramId: this.from.problemId
+ paramId: this.from.problemId,
+ typeId: this.from.typeId
}).then(res => {
if (res.code === 200) {
uni.showToast({ title: '涓婃姤鎴愬姛', icon: 'success', duration: 2000 });
@@ -432,6 +437,7 @@
image {
width: 40rpx;
height: 40rpx;
+ flex-shrink: 0;
}
}
}
@@ -489,7 +495,7 @@
.form_item_nr {
width: 100%;
display: flex;
- align-items: center;
+ align-items: flex-start;
justify-content: space-between;
margin-top: 16rpx;
@@ -499,9 +505,9 @@
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
}
image {
@@ -540,10 +546,17 @@
&:last-child {
margin-right: 0 !important;
}
-
- .img {
- width: 100%;
- height: 100%;
+
+ .images {
+ width: 150rpx;
+ height: 150rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ overflow: hidden;
+ .img {
+ height: 100%;
+ }
}
.close {
--
Gitblit v1.9.3