Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2022-03-15 15:41:00 +08:00
2 changed files with 11 additions and 7 deletions

View File

@@ -9,7 +9,6 @@
{{ data.name }} {{ data.name }}
<span class="tags" v-if="data.menuLevel3Name">{{ data.menuLevel3Name }}</span> <span class="tags" v-if="data.menuLevel3Name">{{ data.menuLevel3Name }}</span>
</span> </span>
</div> </div>
<div class="walk-item" v-if="data.reality"> <div class="walk-item" v-if="data.reality">
@@ -24,7 +23,7 @@
<div class="walk-item"> <div class="walk-item">
<span>走访时间</span> <span>走访时间</span>
<span>{{ data.createTime }}</span> <span>{{ data.visitTime }}</span>
</div> </div>
</div> </div>
@@ -85,6 +84,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
uni-page-body {
height: 100%;
}
.detail { .detail {
height: 100%; height: 100%;
background: #fff; background: #fff;
@@ -108,7 +110,7 @@ export default {
padding: 0 12px; padding: 0 12px;
height: 40px; height: 40px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #FFFFFF; border: 1px solid #ffffff;
margin-left: 16px; margin-left: 16px;
} }
} }

View File

@@ -9,7 +9,6 @@
{{ data.name }} {{ data.name }}
<span class="tags">{{ $dict.getLabel('appSpecialTypeFive', data.applicationId) }}</span> <span class="tags">{{ $dict.getLabel('appSpecialTypeFive', data.applicationId) }}</span>
</span> </span>
</div> </div>
<div class="walk-item" v-if="data.reality"> <div class="walk-item" v-if="data.reality">
@@ -19,12 +18,12 @@
<div class="walk-item"> <div class="walk-item">
<span>走访人员</span> <span>走访人员</span>
<span><AiOpenData v-if="data.createUserName" type="userName" :openid="data.createUserName" style="display:inline-block;" /></span> <span><AiOpenData v-if="data.createUserName" type="userName" :openid="data.createUserName" style="display: inline-block" /></span>
</div> </div>
<div class="walk-item"> <div class="walk-item">
<span>走访时间</span> <span>走访时间</span>
<span>{{ data.createTime }}</span> <span>{{ data.visitTime }}</span>
</div> </div>
</div> </div>
@@ -85,6 +84,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
uni-page-body {
height: 100%;
}
.detail { .detail {
height: 100%; height: 100%;
background: #fff; background: #fff;
@@ -108,7 +110,7 @@ export default {
padding: 0 12px; padding: 0 12px;
height: 40px; height: 40px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #FFFFFF; border: 1px solid #ffffff;
margin-left: 16px; margin-left: 16px;
} }
} }