This commit is contained in:
SelfRidicule 2024-08-15 11:46:34 +08:00
parent cf3170e869
commit 7aef0a4170
4 changed files with 117 additions and 12 deletions

View File

@ -35,7 +35,17 @@ Page({
},
back() {
wx.navigateBack()
let currentPages = getCurrentPages();
console.log('currentPages' , currentPages);
// 大于一个页面就后退,否则直接跳转首页
if(currentPages.length > 1){
wx.navigateBack()
}else{
// 跳转首页
wx.reLaunch({
url: '/pages/index/index',
})
}
},
getDetail(id) {

View File

@ -196,9 +196,11 @@ Page({
})
},
jumpDetail() {
jumpDetail(e) {
console.log('jumpDetail' , e);
let obj = e.currentTarget.dataset.obj
wx.navigateTo({
url: '/pages/reportRepair/query/detail/detail',
url: `/pages/reportRepair/assign/detail/detail?id=${obj.id}`,
})
},
@ -293,7 +295,7 @@ Page({
onShareAppMessage(e) {
console.log('onShareAppMessage', e);
let _this = this;
let obj = e.currentTarget.dataset.obj
let obj = e.target.dataset.obj
//
let param = {
title: obj.repairName,

View File

@ -1,9 +1,9 @@
<view class="containerView public">
<van-tabs bind:click="tabClickSwitch" color="#4e96f8" border animated title-active-color="black" title-inactive-color="gray">
<van-tab title="全部">
<view class="itemView" wx:for="{{allOrder.dataList}}" wx:for-item="item" wx:key="*this" bind:tap="jumpDetail">
<view class="itemView" wx:for="{{allOrder.dataList}}" wx:for-item="item" wx:key="*this">
<view class="topTitle">{{item.repairName}}</view>
<view class="centerView">
<view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
<view class="showImg" style="background: no-repeat center/contain url({{IMG_NAME + item.visibleImg}});"></view>
<view class="rightView">
<view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
@ -14,7 +14,11 @@
<view class="bottomLine"></view>
<view class="bottomView">
<view class="status">{{item.statusName}}</view>
<view class="share" data-obj="{{item}}" bind:tap="onShareAppMessage">分享</view>
<view class="btnView">
<view class="btn">分享
<button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
</view>
</view>
</view>
</view>
<view class="loadAllLine" wx:if="{{allOrder.isDataAll}}">
@ -23,13 +27,80 @@
</van-tab>
<van-tab title="处理中">
<view class="itemView" wx:for="{{processOrder.dataList}}" wx:for-item="item" wx:key="*this">
<view class="topTitle">{{item.repairName}}</view>
<view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
<view class="showImg" style="background: no-repeat center/contain url({{IMG_NAME + item.visibleImg}});"></view>
<view class="rightView">
<view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
<view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
<view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
</view>
</view>
<view class="bottomLine"></view>
<view class="bottomView">
<view class="status">{{item.statusName}}</view>
<view class="btnView">
<view class="btn">分享
<button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
</view>
</view>
</view>
</view>
<view class="loadAllLine" wx:if="{{processOrder.isDataAll}}">
<van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
</view>
</van-tab>
<van-tab title="待评价">
<view class="itemView" wx:for="{{evalingOrder.dataList}}" wx:for-item="item" wx:key="*this">
<view class="topTitle">{{item.repairName}}</view>
<view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
<view class="showImg" style="background: no-repeat center/contain url({{IMG_NAME + item.visibleImg}});"></view>
<view class="rightView">
<view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
<view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
<view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
</view>
</view>
<view class="bottomLine"></view>
<view class="bottomView">
<view class="status">{{item.statusName}}</view>
<view class="btnView">
<view class="btn">分享
<button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
</view>
<view class="btn evaluate" data-obj="{{item}}" bind:tap="jumpDetail">评价</view>
</view>
</view>
</view>
<view class="loadAllLine" wx:if="{{evalingOrder.isDataAll}}">
<van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
</view>
</van-tab>
<van-tab title="已评价">
<view class="itemView" wx:for="{{evaledOrder.dataList}}" wx:for-item="item" wx:key="*this">
<view class="topTitle">{{item.repairName}}</view>
<view class="centerView" data-obj="{{item}}" bind:tap="jumpDetail">
<view class="showImg" style="background: no-repeat center/contain url({{IMG_NAME + item.visibleImg}});"></view>
<view class="rightView">
<view class="labelContent">类型: {{item.typeName + '/' + item.deviceName}}</view>
<view class="labelContent">地点: {{item.address + '/' + item.floor}}</view>
<view class="labelContent">门牌号: {{item.room ? item.room : ''}}</view>
</view>
</view>
<view class="bottomLine"></view>
<view class="bottomView">
<view class="status">{{item.statusName}}</view>
<view class="btnView">
<view class="btn">分享
<button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
</view>
</view>
</view>
</view>
<view class="loadAllLine" wx:if="{{evaledOrder.isDataAll}}">
<van-divider class="van-divider" customStyle="font-size: 26rpx;" contentPosition="center">数据已全部加载</van-divider>
</view>
</van-tab>
</van-tabs>

View File

@ -40,7 +40,7 @@
.itemView .centerView .rightView .labelContent {
line-height: 1;
margin-top: 10rpx;
margin-top: 18rpx;
overflow: hidden;
text-overflow: ellipsis;
@ -69,13 +69,35 @@
line-height: 1;
}
.bottomView .share {
.bottomView .btnView{
display: flex;
justify-content: center;
align-items: center;
}
.bottomView .btn {
position: relative;
border-radius: 6rpx;
font-size: 24rpx;
color: #ffffff;
padding: 10rpx 36rpx;
margin-left: 20rpx;
background: #409eff;
}
.bottomView .btn.evaluate {
background: #ff6600;
}
.bottomView .shareBtn {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
opacity: 0;
}
.loadAllLine {
margin-top: 80rpx;
}