Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp

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

 import React, { useState } from 'react'
+import { PERSON_TYPE } from '@/utils/constants'
+import { useModel } from '@/store'
 import Taro from '@tarojs/taro'
 import toolclass from '@/utils/toolclass.js'
 import '@/assets/css/reset.less'
 
 export default function Item (props) {
 
+  const { user } = useModel('user')
   const { Data } = props
 
   // 随便一条
         <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>
+        <view className='flex-item'><text>{Data.ticketTitle}</text></view>
         {
-          Data.status === '3' && <view className="Name-action" onClick={props.onAction}>完成</view>    
+          Data.status - 0 === 3 && user && user.personType === PERSON_TYPE.LIFE_CONSULTANT && <view className="Name-action" onClick={props.onAction}>完成</view>    
         }
       </view>
       <view className='Detail flex-h'>

src/pages/WoDe/index.jsx

     { icon: 'iconrenzheng1', name: '业主认证', id: 1, router: '/pages/WoDe/WoDeRenZheng/index' },
     { 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' },
     // { 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: 'iconfuwu1', name: '业主报修', id: 4, router: '/pages/WoDe/YeZhuBaoXiu/index' },
   ],
   [
     { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },

src/pages/WuYe/BaoXiuDetail/index.jsx

   const [ShowPingJiaPopup, setShowPingJiaPopup] = useState(false)
   const [StarIndex, setStarIndex] = useState(0)
   const [Comment, setComment] = useState(null)
+  const [ReplyContent, setReplyContent] = useState(null)
   const [DataLock, setDataLock] = useState(false)
+  const [ShowReplyPopup, setShowReplyPopup] = useState(false)
+  const [CurrentReplyId, setCurrentReplyId] = useState(null)
 
   Taro.useShareAppMessage(() => {
     return getShareObject({
     Init()
   }, [])
 
+  useEffect(() => {
+    if (CurrentReplyId !== null) {
+      setReplyContent(null)
+      setShowReplyPopup(true)
+    }
+  }, [CurrentReplyId])
+
   const Init = () => {
     request({ ...apis.getGongDanDetail, args: { orgId: user.orgId }, params: { ticketId: CurrnetBaoXiuId } }).then((res) => { // 获取工单详情
       setDetailInfo(res)
     }
   }
 
+  const ReplyChange = (e) => {
+    setReplyContent(e.detail.value)
+  }
+
   const CommentChange = (e) => {
     setComment(e.detail.value)
   }
 
+  const ToReply = () => {
+    if (DataLock) return
+    setDataLock(true)
+    request({ ...apis.ReplyTicket, args: { orgId: user.orgId }, data: { ticketId: CurrnetBaoXiuId, content: ReplyContent, ticketRecordCommentId: CurrentReplyId } }).then((res) => { // 获取工单详情
+      Taro.showToast({ title: '回复成功', icon: 'none' })
+      Init()
+      setDataLock(false)
+      setShowReplyPopup(false)
+    }).catch((res) => {
+      Taro.showToast({ title: res, icon: 'none' })
+      setDataLock(false)
+    })
+  }
+
   const ToPingJia = () => {
     if (DataLock) return
     setDataLock(true)
     })
   }
 
+  const StepClick = (item) => {
+    return () => {
+      if (DetailInfo.status - 0 < 4) {
+        setCurrentReplyId(item.id)
+      }
+    }
+  }
+
   return (
     <Page>
       <view className='BaoXiuDetail'>
                 {
                   DetailInfo !== null && DetailInfo.ticketRecordList !== null &&
                   DetailInfo.ticketRecordList.map((item, index) => (
-                    <view className='StepList' key={`StepList-${index}`}>
+                    <view className='StepList' key={`StepList-${index}`} onClick={StepClick(item)}>
                       <view className='Title flex-h'>
                         <text className='flex-item Red'>{item.ticketStatusName}</text>
                         <text>{toolclass.FormatDate(item.createDate)}</text>
                       </view>
                       <view className='Text'>{item.content}</view>
+                      {
+                        item.ticketRecordCommentList.map((subItem, subIndex) => (
+                          <view className='ReplyList' key={`Reply-${subIndex}`}>
+                            <view className='flex-h'>
+                              <view>
+                                <text>{subItem.userName}</text>
+                              </view>
+                              <view className='flex-item'>
+                                <text>回复：</text>
+                              </view>
+                              <view>
+                                <text>{toolclass.FormatDate(subItem.createDate)}</text>
+                              </view>
+                            </view>
+                            <view className='ReplyContent'>
+                              <text>{subItem.content}</text>
+                            </view>
+                          </view>
+                        ))
+                      }
                       {/* <view className='Text'>您的报修正在分配物业处理人员，若长时间无人处理，请联系物业。<text className='Blue'>物业电话薄</text><text className='Blue iconfont iconjiantouright'></text></view> */}
                       {/* <view className='ImgList'>
                       <view></view>
           {/* 更多操作 */}
           <view className='BottomBtn active'>
             {
-              DetailInfo !== null && DetailInfo.status - 0 === 4 &&
+              DetailInfo !== null && DetailInfo.status - 0 === 4 && user && user.personType !== PERSON_TYPE.LIFE_CONSULTANT &&
               <text onClick={() => { setShowPingJiaPopup(true) }}>评价</text>
             }
           </view>
           </view>
         </view>
 
+        <SlidePopup Close={() => { setShowReplyPopup(false) }} Show={ShowReplyPopup}>
+          <view className='ReplyPopup'>
+            <Textarea placeholder='请输入您的回复' onInput={ReplyChange} value={ReplyContent}></Textarea>
+            <text className='Btn' onClick={ToReply}>回复</text>
+          </view>
+        </SlidePopup>
+
         <SlidePopup Close={() => { setShowPingJiaPopup(false) }} Show={ShowPingJiaPopup}>
           <view className='PinJiaPopup'>
             <text className='Title'>请对此次服务进行评分</text>

src/pages/WuYe/BaoXiuDetail/index.less

               }
             }
 
+            >.ReplyList {
+              margin-top: 20px;
+
+              >.flex-h {
+                align-items: center;
+
+                >view {
+                  margin-left: 10px;
+                  &:first-child {
+                    margin-left: 0;
+                    >text {
+                      color: #14DC05;
+                    }
+                  }
+
+                  >text {
+                    font-size: 24px;
+                    color: #666;
+                    line-height: 40px;
+                  }
+                }
+              }
+
+              >.ReplyContent {
+                >text {
+                  font-size: 24px;
+                  color: #333;
+                  line-height: 40px;
+                }
+              }
+            }
+
             >.ImgList {
               font-size: 0;
 
       }
     }
   }
-  .PinJiaPopup {
+
+  .PinJiaPopup,
+  .ReplyPopup {
     padding: 0 30px;
     position: relative;
     overflow: hidden;
+
     >.Title {
       display: block;
       font-size: 26px;
       color: #666;
       line-height: 40px;
     }
+
     textarea {
       font-size: 26px;
       line-height: 40px;
       border: 2px solid rgba(0, 0, 0, 0.08);
       margin-top: 60px;
     }
+
     >.StarLine {
       font-size: 0;
       white-space: nowrap;
       text-align: center;
       margin-top: 20px;
+
       text {
         display: inline-block;
         vertical-align: middle;
         font-size: 40px;
         color: #666;
         margin-left: 20px;
+
         &:first-child {
           margin-left: 0;
         }
+
         &.active {
           color: #fcdc1e;
         }
       }
     }
+
     >.Btn {
       font-size: 28px;
       line-height: 80px;

src/pages/WuYe/BaoXiuFeiYong/index.jsx

       success: res => {
         if (res.confirm) {
           WechatPay([BillInfo.id - 0]).then(() => {
+            setShowPopup(false)
             Taro.showToast({
               title: '缴费成功',
               icon: 'success'

src/utils/api.js

 const prefix = `${HOST}/api/wx`
 
 const $api = {
+  ReplyTicket: { // 工单回复
+    method: 'post',
+    url: `${prefix}/ticket/reply/:orgId`
+  },
   PostGongDanPingJia: { // 工单评价
     method: 'post',
     url: `${prefix}/accessTicket/:orgId`