1

miniprogram/app.json

@@ -76,14 +76,13 @@
     "pages/reportRepair/index/index",
     "pages/reportRepair/report/report",
     "pages/reportRepair/query/record/record",
-    "pages/reportRepair/query/detail/detail",
-    "pages/reportRepair/query/evaluate/evaluate",
     "pages/reportRepair/assign/record/record",
     "pages/reportRepair/assign/detail/detail",
     "pages/reportRepair/assign/feedback/feedback",
     "pages/reportRepair/assign/affirm/affirm",
     "pages/reportRepair/assign/again/again",
     "pages/reportRepair/assign/nullify/nullify",
+    "pages/reportRepair/assign/evaluate/evaluate",
     "pages/reportRepair/repair/index/index",
     "pages/reportRepair/repair/case/case"
   ],

miniprogram/pages/reportRepair/assign/detail/detail.js

@@ -1,5 +1,8 @@
 const app = getApp()
 
+import {
+    checkIsImg
+} from "../../../../utils/util.js"
 
 import {
     getDetailRq,
@@ -36,11 +39,11 @@ Page({
 
     back() {
         let currentPages = getCurrentPages();
-        console.log('currentPages' , currentPages);
+        console.log('currentPages', currentPages);
         // 大于一个页面就后退，否则直接跳转首页
-        if(currentPages.length > 1){
+        if (currentPages.length > 1) {
             wx.navigateBack()
-        }else{
+        } else {
             // 跳转首页
             wx.reLaunch({
                 url: '/pages/index/index',
@@ -85,6 +88,13 @@ Page({
                     })
                 }
             }
+            // 第一张图片
+            let firstImg = files.repair.find(item => checkIsImg(item.url))
+            if (firstImg) {
+                detail.visibleImg = firstImg.url
+            } else {
+                detail.visibleImg = app.IMG_NAME + '/profile/static/repair/index/noneImg.png'
+            }
 
             _this.setData({
                 detail,
@@ -163,6 +173,14 @@ Page({
         })
     },
 
+    // 评价
+    jumpEvaluate() {
+        let _this = this
+        wx.navigateTo({
+            url: `/pages/reportRepair/assign/evaluate/evaluate?id=${_this.data.id}`,
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
@@ -209,6 +227,16 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
-
+        console.log('onShareAppMessage');
+        let _this = this;
+        let obj = _this.data.detail
+        //
+        let param = {
+            title: obj.repairName,
+            path: `/pages/reportRepair/assign/detail/detail?id=${obj.id}`,
+            imageUrl: obj.visibleImg,
+        }
+        console.log('onShareAppMessage', param);
+        return param;
     }
 })

miniprogram/pages/reportRepair/assign/detail/detail.wxml

@@ -133,10 +133,14 @@
     </view>
 
     <view class="bottomFixView">
-        <view class="btn" bind:tap="jumpAgain" wx:if="{{detail.status == 3}}">重新派单</view>
+        <view class="btn red" bind:tap="jumpInvalid">无效申请</view>
-        <view class="btn red" bind:tap="jumpInvalid" wx:if="{{detail.status == 1}}">无效申请</view>
+        <view class="btn" bind:tap="jumpAffirm">确认损坏</view>
-        <view class="btn" bind:tap="jumpAffirm" wx:if="{{detail.status == 1}}">确认损坏</view>
+        <view class="btn" bind:tap="jumpFeedback">提交反馈</view>
-        <view class="btn" bind:tap="jumpFeedback" wx:if="{{detail.status == 1}}">提交反馈</view>
+        <view class="btn" bind:tap="jumpAgain">重新派单</view>
+        <view class="btn">分享
+            <button catch class="shareBtn" open-type="share" data-obj="{{item}}">转发</button>
+        </view>
+        <view class="btn red" bind:tap="jumpEvaluate">评价</view>
     </view>
 
 </view>

miniprogram/pages/reportRepair/assign/detail/detail.wxss

@@ -228,17 +228,31 @@
 }
 
 .bottomFixView .btn {
+    position: relative;
     box-sizing: border-box;
     border-radius: 6rpx;
     margin-right: 30rpx;
     margin-bottom: 30rpx;
-    padding: 20rpx 36rpx;
+    width: 200rpx;
+    height: 80rpx;
 
-    background: #579ff8;
+    line-height: 80rpx;
+    text-align: center;
     font-size: 28rpx;
     color: white;
+
+    background: #579ff8;
 }
 
 .bottomFixView .btn.red {
     background: #ee6f21;
 }
+
+.bottomFixView .shareBtn {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+}

miniprogram/pages/reportRepair/query/detail/detail.js

@@ -1,77 +0,0 @@
-const app = getApp()
-
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        IMG_NAME: app.IMG_NAME,
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    back(){
-        wx.navigateBack()
-    },
-
-    jumpEvaluate(){
-        wx.navigateTo({
-          url: '/pages/reportRepair/query/evaluate/evaluate',
-        })
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

miniprogram/pages/reportRepair/query/detail/detail.json

@@ -1,6 +0,0 @@
-{
-    "navigationStyle": "custom",
-    "usingComponents": {
-        "van-icon": "@vant/weapp/icon/index"
-    }
-}

miniprogram/pages/reportRepair/query/detail/detail.wxml

@@ -1,85 +0,0 @@
-<view class="containerView public">
-
-    <view class="topHead">
-        <view class="navigatorView">
-            <view class="backView" bind:tap="back">
-                <van-icon name="arrow-left" color="#ffffff"  size="30rpx"/>
-                <view class="label">返回</view>
-            </view>
-            <view class="title">详情</view>
-        </view>
-
-        <view class="contentView">
-            <view class="label1">处理完成</view>
-            <view class="label2">您的报修工单已经处理完成</view>
-        </view>
-    </view>
-
-    <view class="mainView">
-        <view class="statusView">
-            <view class="view1">
-                <view class="label">处理完成:</view>
-                <view class="name">王帅</view>
-                <view class="tag">工单流转</view>
-            </view>
-            <view class="time">2024-10-10 12:12:00</view>
-            <view class="leftImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/index/banner/1.jpg'}});"></view>
-        </view>
-
-        <view class="reportView">
-            <view class="topTitle">报修信息</view>
-            <view class="selfLine"></view>
-            <view class="itemView">
-                <view class="label">设备名称</view>
-                <view class="content">320828282828320828282828320828282828320828282828v</view>
-            </view>
-            <view class="itemView">
-                <view class="label">设备地址</view>
-                <view class="content">302会议室</view>
-            </view>
-            <view class="itemView">
-                <view class="label">维修描述</view>
-                <view class="content">电脑蓝屏</view>
-            </view>
-            <view class="itemView">
-                <view class="label">损坏凭证</view>
-                <view class="content">
-                    <view wx:for="{{10}}" class="imgView" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/index/banner/1.jpg'}});"></view>
-                </view>
-            </view>
-            <view class="itemView">
-                <view class="label">报修人</view>
-                <view class="content">13652025563</view>
-            </view>
-            <view class="itemView">
-                <view class="label">报修时间</view>
-                <view class="content">2024-06-10 23:59:59</view>
-            </view>
-        </view>
-
-        <view class="reportView">
-            <view class="topTitle">维修反馈</view>
-            <view class="selfLine"></view>
-            <view class="itemView">
-                <view class="label">维修人</view>
-                <view class="content">王强</view>
-            </view>
-            <view class="itemView">
-                <view class="label">维修说明</view>
-                <view class="content">已更换部件，维修完成</view>
-            </view>
-            <view class="itemView">
-                <view class="label">维修凭证</view>
-                <view class="content">
-                    <view wx:for="{{3}}" class="imgView" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/index/banner/1.jpg'}});"></view>
-                </view>
-            </view>
-        </view>
-    </view>
-
-    <view class="bottomFixView">
-        <view class="contactBtn">联系维修人员</view>
-        <view class="evaluateBtn" bind:tap="jumpEvaluate">评价</view>
-    </view>
-
-</view>

miniprogram/pages/reportRepair/query/detail/detail.wxss

@@ -1,213 +0,0 @@
-.containerView.public {
-    background: none;
-}
-
-.elHidden {
-    visibility: hidden;
-}
-
-.selfLine {
-    height: 2rpx;
-    background: rgb(126, 126, 126, 0.2);
-}
-
-.topHead {
-    position: relative;
-    height: 400rpx;
-    background: #2b2d3d;
-}
-
-.topHead .navigatorView {
-    position: absolute;
-    left: 0;
-    top: 120rpx;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 30rpx;
-
-}
-
-.topHead .navigatorView .backView {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-}
-
-.topHead .navigatorView .backView .label {
-    color: white;
-    font-size: 28rpx;
-    line-height: 1;
-    margin-left: 8rpx;
-}
-
-.topHead .navigatorView .title {
-    position: absolute;
-    top: 14rpx;
-    left: 50%;
-    transform: translateX(-50%);
-
-    font-size: 32rpx;
-    color: #FFFFFF;
-    line-height: 1rpx;
-}
-
-.topHead .contentView {
-    position: absolute;
-    left: 30rpx;
-    bottom: 80rpx;
-}
-
-.topHead .contentView .label1 {
-    font-size: 28rpx;
-    color: white;
-    line-height: 1;
-}
-
-.topHead .contentView .label2 {
-    font-size: 24rpx;
-    color: white;
-    line-height: 1;
-    margin-top: 20rpx;
-}
-
-.mainView {
-    position: relative;
-    box-sizing: border-box;
-
-    margin: -20rpx 20rpx 20rpx;
-    z-index: 999;
-}
-
-.mainView .statusView {
-    box-sizing: border-box;
-    padding: 30rpx 20rpx 40rpx 100rpx;
-    background: white;
-    border-radius: 8rpx;
-    line-height: 1;
-}
-
-.mainView .statusView .view1 {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-}
-
-.mainView .statusView .view1 .label {
-    font-size: 28rpx;
-    font-weight: bold;
-}
-
-.mainView .statusView .view1 .name {
-    font-size: 28rpx;
-    margin-left: 20rpx;
-}
-
-.mainView .statusView .view1 .tag {
-    margin-left: auto;
-    font-size: 24rpx;
-    color: gray;
-}
-
-.mainView .statusView .time {
-    margin-top: 20rpx;
-}
-
-.mainView .statusView .leftImg {
-    position: absolute;
-    top: 26rpx;
-    left: 20rpx;
-
-    width: 60rpx;
-    height: 60rpx;
-    border-radius: 8rpx;
-}
-
-.mainView .reportView {
-    margin-top: 20rpx;
-    padding-bottom: 60rpx;
-
-    border-radius: 8rpx;
-    background: white;
-}
-
-.mainView .reportView .topTitle {
-    padding: 30rpx;
-    font-size: 28rpx;
-    font-weight: bold;
-}
-
-.mainView .reportView .itemView {
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    margin-top: 30rpx;
-    padding: 0 30rpx;
-
-}
-
-.mainView .reportView .itemView .label{
-    flex-shrink: 0;
-    width: 200rpx;
-    font-size: 30rpx;
-    color: gray;
-}
-
-.mainView .reportView .itemView .content{
-    font-size: 30rpx;
-    word-break: break-all;
-}
-
-.mainView .reportView .itemView .content .imgView{
-    width: 100rpx;
-    height: 100rpx;
-    margin-right: 10rpx;
-    margin-bottom: 10rpx;
-    display: inline-block;
-    vertical-align: middle;
-}
-
-.bottomFixView{
-    position: fixed;
-    z-index: 999;
-    left: 0;
-    bottom: 0;
-    height: 140rpx;
-    width: 100vw;
-    border-top: 1rpx solid rgb(126, 126, 126, 0.2);
-    background: white;
-
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-}
-
-.bottomFixView .evaluateBtn{
-    box-sizing: border-box;
-    border-radius: 6rpx;
-    width: 160rpx;
-    height: 70rpx;
-    margin-right: 30rpx;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background: #579ff8;
-    font-size: 30rpx;
-    color: white;
-}
-
-.bottomFixView .contactBtn{
-    box-sizing: border-box;
-    border-radius: 6rpx;
-    border: 2rpx solid rgb(126, 126, 126, 0.2);
-    width: 220rpx;
-    height: 70rpx;
-    margin-right: 30rpx;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background: white;
-    font-size: 28rpx;
-    color: gray;
-}