静态页面

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

@@ -1,4 +1,6 @@
 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'
@@ -7,6 +9,7 @@ import './index.less'
 
 export default function Item (props) {
 
+  const { user } = useModel('user')
   const { Data } = props
 
   // 随便一条
@@ -30,9 +33,9 @@ export default function Item (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

@@ -17,9 +17,9 @@ const menuGroup = [
     { 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/BaoXiuFeiYong/index.jsx

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