feats

src/pages.js

@@ -129,6 +129,15 @@ const Property = [
       eventType: 'property',
     }
   },
+  {
+    name: '物业-业主报修',
+    page: 'pages/WoDe/YeZhuBaoXiu/index',
+    auth: ['avatar', 'phone', 'yezhu'],
+    track: {
+      event: 'detail',
+      eventType: 'property',
+    }
+  },
 ]
 
 const Activity = [

src/pages/WoDe/YeZhuBaoXiu/components/Item/index.jsx

@@ -0,0 +1,53 @@
+import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
+import toolclass from '@/utils/toolclass.js'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function Item (props) {
+
+  const { Data } = props
+
+  // 随便一条
+  const verifyInfo = Data.userVerifyList[0] || {}
+  const ownerInfo = `业主信息: ${verifyInfo.ownerName} ${verifyInfo.phone}`
+  const roomInfo = `${verifyInfo.phaseName} ${verifyInfo.buildingName} ${verifyInfo.unitName} ${verifyInfo.roomNoName}`
+
+  const handleClick = () => {
+    if (verifyInfo.phone) {
+      Taro.makePhoneCall({
+        phoneNumber: verifyInfo.phone
+      })
+    }
+  }
+
+  return (
+    <view className='YeZhuBaoXiuItem'>
+      <view className='Title flex-h'>
+        <text className='iconfont icongonggongquyu'></text>
+        <text className='flex-item'>{Data.repairName}问题</text>
+        <text className='Time'>{toolclass.FormatDate(Data.createDate)}</text>
+      </view>
+      <view className='Name flex-h'>
+        <view style={{flex: 1}}><text className='flex-item'>{Data.ticketTitle}</text></view>
+        {
+          Data.status === '3' && <view className="Name-action" onClick={props.onAction}>完成</view>    
+        }
+      </view>
+      <view className='Detail flex-h'>
+        <view className='Line'><view></view></view>
+        <view className='flex-item' onClick={handleClick}>
+          <view className='flex-h'>
+            <view className='flex-item'><text>{Data.ticketStatusName}</text></view>
+            <view className='Time'><text>{toolclass.FormatDate(Data.ticketRecordDate)}</text></view>
+          </view>
+          <view className='Desc'>
+            <rich-text nodes={`${ownerInfo}<br />${roomInfo}`}></rich-text>
+          </view>
+          {/* <view className='Desc'>您的报修已经分配给物业处理人员<text className='Name'>郭培军</text>处理，联系方式<text className='Phone'>18266666666</text></view> */}
+        </view>
+      </view>
+    </view>
+  )
+}

src/pages/WoDe/YeZhuBaoXiu/components/Item/index.less

@@ -0,0 +1,144 @@
+.YeZhuBaoXiuItem {
+  position: relative;
+  background: #fff;
+  padding: 0 30px;
+
+  >.Title {
+    align-items: center;
+    padding-top: 10px;
+    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+
+    >text {
+      font-size: 24px;
+      color: #999;
+      line-height: 88px;
+      margin-left: 10px;
+
+      &:first-child {
+        margin-left: 0;
+        font-size: 34px;
+        color: #F35844;
+      }
+
+      &.flex-item {
+        font-size: 24px;
+        font-weight: bold;
+        color: #333;
+        white-space: nowrap;
+      }
+    }
+  }
+
+  >.Name {
+    align-items: center;
+    margin-top: 20px;
+    display: flex;
+
+    .Name-action {
+      color: #F35844;
+      width: 128rpx;
+      flex: none;
+      border: 1px solid #F35844;
+      text-align: center;
+      border-radius: 8rpx;
+    }
+
+    >text {
+      font-size: 30px;
+      font-weight: bold;
+      line-height: 60px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      &.iconfont {
+        font-size: 40px;
+        color: #F35844;
+        margin-left: 20px;
+        font-weight: normal;
+      }
+    }
+  }
+
+  >.Detail {
+    position: relative;
+    margin-top: 40px;
+    padding-bottom: 30px;
+
+    >.Line {
+      width: 50px;
+      position: relative;
+      overflow: visible;
+      border-left: 2px dashed #F35844;
+
+      >view {
+        width: 14px;
+        height: 14px;
+        background: #F35844;
+        border-radius: 100%;
+        position: absolute;
+        left: -8px;
+        top: 30px;
+      }
+    }
+
+    >.flex-item {
+      position: relative;
+      overflow: visible;
+      background: rgba(243, 88, 68, 0.08);
+      padding: 20px;
+
+      &::after {
+        content: '';
+        width: 0;
+        height: 0;
+        display: block;
+        position: absolute;
+        left: -40px;
+        top: 16px;
+        border-color: transparent rgba(243, 88, 68, 0.08) transparent transparent;
+        border-style: solid dashed solid solid;
+        border-width: 20px;
+      }
+
+      >.flex-h {
+        align-items: center;
+
+        view {
+          text {
+            font-size: 24px;
+            color: #999;
+            line-height: 40px;
+          }
+
+          &:first-child {
+            text {
+              color: #F35844;
+            }
+          }
+        }
+      }
+
+      >.Desc {
+        font-size: 24px;
+        line-height: 40px;
+        color: #333;
+        margin-top: 10px;
+
+        >text {
+          &.Name {
+            color: #F35844;
+            font-size: 24px;
+            line-height: 40px;
+          }
+
+          &.Phone {
+            color: #14DC05;
+            font-size: 24px;
+            line-height: 40px;
+          }
+        }
+      }
+    }
+  }
+}

src/pages/WoDe/YeZhuBaoXiu/index.jsx

@@ -1,8 +1,10 @@
 import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh'
-import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem'
 import { useModel } from '@/store'
 import Page from '@/layouts'
+import Item from './components/Item'
+import request, { apis } from '@/utils/request'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -26,6 +28,23 @@ export default function WoDeGongDan () {
     setPageList(PageList.concat(e))
   }
 
+  const handleItemAction = item => {
+    Taro.showModal({
+      title: '提示',
+      content: '确认结束当前工单?',
+      success: res => {
+        if (res.confirm) {
+          request({...apis.endTicket, data:{ticketId: item.id}}).then(x => {
+            Taro.showToast({
+              title: '结单成功',
+              icon: 'success'
+            })
+          })
+        }
+      }
+    })
+  }
+
   return (
     <Page>
       <view className='WoDeGongDan'>
@@ -34,7 +53,7 @@ export default function WoDeGongDan () {
             {
               PageList.map((item, index) => (
                 <view className='ListItem' key={`ActivityItem-${index}`}>
-                  <WuYeBaoXiuItem Data={item}></WuYeBaoXiuItem>
+                  <Item Data={item} onAction={() => handleItemAction(item)}></Item>
                 </view>
               ))
             }

src/pages/WoDe/index.jsx

@@ -18,8 +18,8 @@ const menuGroup = [
     { icon: 'iconjifenguize', name: '积分明细', id: 2, router: '/pages/FuLi/JiFenMingXi/index' },
     { icon: 'iconjiaofei', name: '物业缴费', id: 3, router: '/pages/WoDe/WoDeJiaoFei/index' },
     { icon: 'iconfuwu1', name: '物业报修', id: 4, router: '/pages/WoDe/WoDeGongDan/index' },
-    // { icon: 'iconfuwu1', name: '业主工单', id: 4, router: '/pages/WoDe/WoDeGongDan/index', personTypes: [PERSON_TYPE.LIFE_CONSULTANT] },
-    { icon: 'iconfuwu1', name: '业主报修', id: 4, router: '/pages/WoDe/WoDeGongDan/index' },
+    // { icon: 'iconfuwu1', name: '业主工单', id: 4, router: '/pages/WoDe/YeZhuBaoXiu/index', personTypes: [PERSON_TYPE.LIFE_CONSULTANT] },
+    { icon: 'iconfuwu1', name: '业主报修', id: 4, router: '/pages/WoDe/YeZhuBaoXiu/index' },
   ],
   [
     { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },

src/utils/api.js

@@ -138,6 +138,12 @@ const $api = {
     method: 'get',
     url: `${prefix}/ticket/schedule/:orgId`
   },
+
+  endTicket: {  // 管家结束工单
+    method: 'post',
+    url: `${prefix}/endTicket`
+  },
+
   getWuYePhone: { // 获取物业电话
     method: 'get',
     url: `${prefix}/tels`