Commit b2946922 authored by Facius's avatar Facius

冒泡bug修复

parent ef7bc723
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
if (result && result.record) { if (result && result.record) {
vm.loaded = true; vm.loaded = true;
vm.needSettled = result.needSettled; vm.needSettled = result.needSettled;
vm.status = Number(result.record.status); vm.status = Number(result.record.status || '0');
// vm.status = 8 // vm.status = 8
} }
}; };
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<text class="label">电工工龄(年)</text> <text class="label">电工工龄(年)</text>
</view> </view>
<p :class="['u-flex-1 u-text-right area', {before: !baseInfo.working_age}]"> <p :class="['u-flex-1 u-text-right area', {before: !baseInfo.working_age}]">
{{ baseInfo.working_age ? workingAgeTxt : '去选择'}} {{ baseInfo.working_age !== '' ? workingAgeTxt : '去选择'}}
</p> </p>
<u-icon name="arrow-right" color="#2272FF" size="28"></u-icon> <u-icon name="arrow-right" color="#2272FF" size="28"></u-icon>
</view> </view>
...@@ -686,6 +686,8 @@ ...@@ -686,6 +686,8 @@
.address-textarea { .address-textarea {
font-size: 26rpx; font-size: 26rpx;
width: 100%;
height: 100%;
} }
.tip-text { .tip-text {
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
try { try {
var dataObject = JSON.parse(dataString); var dataObject = JSON.parse(dataString);
//do something //do something
var imageUrl = config.qiniuImageURLPrefix + '/' + dataObject.key; var imageUrl = config.qiniuImageURLPrefix + '/' + (dataObject.key || dataObject.src);
dataObject.imageURL = imageUrl; dataObject.imageURL = imageUrl;
if (success) { if (success) {
success(dataObject); success(dataObject);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment