静态页面

src/components/WuYeBaoXiu/index.jsx

@@ -17,7 +17,6 @@ export default function WuYeBaoXiu () {
   const [IsEmpty, setIsEmpty] = useState(false)
 
   Taro.useDidShow(() => {
-    GetBanner()
   })
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
@@ -30,6 +29,7 @@ export default function WuYeBaoXiu () {
   }
 
   const Refresh = (e) => { // 下拉刷新
+    GetBanner()
     if (e.length > 0) {
       setIsEmpty(false)
       setPageList(e)

src/components/WuYeBaoXiuItem/index.jsx

@@ -22,7 +22,7 @@ export default function WuYeBaoXiuItem (props) {
       </view>
       <view className='Name flex-h'>
         <text className='flex-item' onClick={ItemClick}>{Data.ticketTitle}</text>
-        <text className='iconfont iconbianji' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/XiuGaiBaoXiu/index?id=${Data.id}` }) }}></text>
+        <text className='iconfont iconbianji' style={{display: Data.status - 0 === 0 ? 'block' : 'none'}} onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/XiuGaiBaoXiu/index?id=${Data.id}` }) }}></text>
       </view>
       <view className='Detail flex-h' onClick={ItemClick}>
         <view className='Line'><view></view></view>

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import Taro, { Current } from '@tarojs/taro'
-import { RichText } from '@tarojs/components'
+import { RichText, Input } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import Page from '@/layouts'
@@ -20,6 +20,8 @@ export default function HuoDongDetail () {
   const [CanJoin, setCanJoin] = useState(null)
   const [JoinBtnText, setJoinBtnText] = useState(null)
   const [JoinBtnStatus, setJoinBtnStatus] = useState(false)
+  const [ShowJoinNumPopup, setShowJoinNumPopup] = useState(false)
+  const [JoinNum, setJoinNum] = useState(null)
   const [ShowGetUserPhoneLayer, setShowGetUserPhoneLayer] = useState(false)
   const [CurrnetHuoDongId] = useState(Current.router.params.id) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
@@ -88,32 +90,25 @@ export default function HuoDongDetail () {
     }
   }
 
-  const ToJoin = () => { // 去报名
-    if (DataLock || ActivityDetail === null || !JoinBtnStatus) return
-    setDataLock(true)
-    if (JoinBtnText === '去签到') {
-      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}` })
+  const ConfirmToJoin = () => {
+    if (JoinNum === null || JoinNum - 0 < 1) {
+      Taro.showToast({ title: '请填入参加活动人数', icon: 'none' })
+      setDataLock(false)
     } else {
-      const { personId, phone, nickname, orgId } = user
-      const { dynamicId } = ActivityDetail
-      if (!phone) { // 未授权手机号，唤起授权手机号弹窗
-        setShowGetUserPhoneLayer(true)
-        setDataLock(false)
-        return false
-      }
       let Data = {
         phone,
         personId,
         dynamicId,
         name: nickname,
         orgId,
-        attendNum: 1,
+        attendNum: JoinNum - 0 || 1,
         sharePerson: null,
         sharePersonName: null,
         sharePersonType: null
       }
       request({ ...apis.JoinActivity, data: { ...Data } }).then(() => {
         setHasJoin(true)
+        setShowJoinNumPopup(false)
         setDataLock(false)
       }).catch((res) => {
         Taro.showToast({ title: res, icon: 'none' })
@@ -122,6 +117,27 @@ export default function HuoDongDetail () {
     }
   }
 
+  const ToJoin = () => { // 去报名
+    if (DataLock || ActivityDetail === null || !JoinBtnStatus) return
+    setDataLock(true)
+    if (JoinBtnText === '去签到') {
+      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}` })
+    } else {
+      const { personId, phone, nickname, orgId } = user
+      const { dynamicId } = ActivityDetail
+      if (!phone) { // 未授权手机号，唤起授权手机号弹窗
+        setShowGetUserPhoneLayer(true)
+        setDataLock(false)
+        return false
+      }
+      setShowJoinNumPopup(true)
+    }
+  }
+
+  const JoinNumChange = (e) => {
+    setJoinNum(e.detail.value)
+  }
+
   const showError = err => {
     Taro.showModal({
       title: '错误',
@@ -175,6 +191,27 @@ export default function HuoDongDetail () {
 
           </view>
         }
+        <view className={ShowJoinNumPopup ? 'JoinNumLayer active' : 'JoinNumLayer'}>
+          <view className='centerLabel'>
+            <text>温馨提示</text>
+            <view className='flex-h Form'>
+              <view>
+                <text>参数人数：</text>
+              </view>
+              <view className='flex-item'>
+                <Input placeholder='请输入活动参加人数' onInput={JoinNumChange} value={JoinNum}></Input>
+              </view>
+            </view>
+            <view className='flex-h Bottom'>
+              <view className='flex-item'>
+                <text onClick={() => { setShowJoinNumPopup(false) }}>取消</text>
+              </view>
+              <view className='flex-item'>
+                <text onClick={ConfirmToJoin}>确定</text>
+              </view>
+            </view>
+          </view>
+        </view>
       </view>
     </Page>
   )

src/pages/HuoDong/HuoDongDetail/index.less

@@ -123,4 +123,74 @@
       }
     }
   }
+  .JoinNumLayer {
+    width: 100%;
+    position: fixed;
+    z-index: 1000;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    display: none;
+    background: rgba(0, 0, 0, 0.7);
+    &.active {
+      display: block;
+    }
+    >view {
+      width: 80%;
+      background: #fff;
+      border-radius: 12px;
+      overflow: hidden;
+      >text {
+        display: block;
+        font-size: 28px;
+        color: #333;
+        line-height: 40px;
+        margin-top: 20px;
+        text-align: center;
+      }
+      >.Form {
+        align-items: center;
+        margin-top: 20px;
+        padding: 30px;
+        >view {
+          &:first-child {
+            margin-right: 20px;
+            >text {
+              font-size: 26px;
+              color: #333;
+              line-height: 40px;
+              text-indent: 30px;
+              display: block;
+            }
+          }
+          &.flex-item {
+            >input {
+              font-size: 26px;
+              color: #333;
+              line-height: 40px;
+              height: 40px;
+            }
+          }
+        }
+      }
+      >.Bottom {
+        align-items: center;
+        border-top: 2px solid rgba(0, 0, 0, 0.08);
+        margin-top: 20px;
+        >view {
+          &:first-child {
+            border-right: 2px solid rgba(0, 0, 0, 0.08);
+          }
+          >text {
+            width: 100%;
+            display: block;
+            text-align: center;
+            font-size: 26px;
+            color: #666;
+            line-height: 80px;
+          }
+        }
+      }
+    }
+  }
 }

src/pages/WoDe/TuiJianErWeiMa/index.config.js

@@ -1,4 +1,5 @@
 export default {
   navigationStyle: 'custom',
-  navigationBarTextStyle: 'white'
+  navigationBarTextStyle: 'white',
+  enableShareAppMessage: true
 }

src/pages/WoDe/TuiJianErWeiMa/index.jsx

@@ -3,6 +3,7 @@ import Taro from '@tarojs/taro'
 import CustomHeader from '@/components/CustomHeader/index'
 import { getQrCodeImage, getCardQrParam } from '@/utils/qrcode'
 import Page from '@/layouts'
+import { getShareObject } from '@/utils/share.js'
 import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
@@ -13,6 +14,14 @@ export default function TuiJianErWeiMa () {
   const { user } = useModel('user')
   const [QrCodeImg, setQrCodeImg] = useState(null)
 
+  Taro.useShareAppMessage(() => {
+    return getShareObject({
+      title: '推荐二维码',
+      id: user.personId,
+      image: QrCodeImg
+    }, user)
+  })
+
   useEffect(() => {
     if (QrCodeImg === null) {
       // const page = Taro.Current.router.path
@@ -26,7 +35,7 @@ export default function TuiJianErWeiMa () {
       <view className='TuiJianErWeiMa'>
         <CustomHeader IsFixed={true} BgColor='none' Title='推荐二维码'></CustomHeader>
         <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img2.jpg'></image>
-        <image mode='widthFix' className='QrCodeImg centerLabel' src={QrCodeImg}></image>
+        <image mode='widthFix' className='QrCodeImg' src={QrCodeImg}></image>
       </view>
     </Page>
   )

src/pages/WoDe/TuiJianErWeiMa/index.less

@@ -16,6 +16,11 @@
       z-index: 2;
       width: 50%;
       height: auto;
+      display: block;
+      left: 50%;
+      transform: translateX(-50%);
+      -webkit-transform: translateX(-50%);
+      bottom: 150px;
     }
   }
 }

src/pages/WuYe/BaoXiuDetail/index.jsx

@@ -17,6 +17,8 @@ export default function BaoXiuDetail () {
   const [DetailInfo, setDetailInfo] = useState(null)
   const [PhoneList, setPhoneList] = useState([])
   const [ShowPopup, setShowPopup] = useState(false)
+  const [ShowPingJiaPopup, setShowPingJiaPopup] = useState(false)
+  const [StarIndex, setStarIndex] = useState(0)
 
   Taro.useShareAppMessage(() => {
     return getShareObject({
@@ -39,6 +41,12 @@ export default function BaoXiuDetail () {
     })
   }
 
+  const SelectStar = (index) => {
+    return () => {
+      setStarIndex(index)
+    }
+  }
+
   return (
     <Page>
       <view className='BaoXiuDetail'>
@@ -101,12 +109,31 @@ export default function BaoXiuDetail () {
             }
           </view>
 
+          {/* 更多操作 */}
+          <view className='BottomBtn active'>
+            <text onClick={() => { setShowPingJiaPopup(true) }}>评价</text>
+          </view>
+
           {/* 更多操作 */}
           <view className='BottomBtn'>
             <text onClick={() => { setShowPopup(true) }}>与物业沟通</text>
           </view>
         </view>
 
+        <SlidePopup Close={() => { setShowPingJiaPopup(false) }} Show={ShowPingJiaPopup}>
+          <view className='PinJiaPopup'>
+            <text className='Title'>请对此次服务进行评分</text>
+            <view className='StarLine'>
+              {
+                ['', '', '', '', ''].map((item, index) => (
+                  <text className={index > StarIndex ? 'iconfont iconxingxing' : 'iconfont iconxingxing active'} key={`Star-${index}`} onClick={SelectStar(index)}></text>
+                ))
+              }
+            </view>
+            <text className='Btn'>提交</text>
+          </view>
+        </SlidePopup>
+
         <SlidePopup Close={() => { setShowPopup(false) }} Show={ShowPopup}>
           <view className='LianXiPopup'>
             <text>联系物业</text>

src/pages/WuYe/BaoXiuDetail/index.less

@@ -249,4 +249,44 @@
       }
     }
   }
+  .PinJiaPopup {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+    >.Title {
+      display: block;
+      font-size: 26px;
+      color: #666;
+      line-height: 40px;
+    }
+    >.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;
+      display: block;
+      text-align: center;
+      background: #F35844;
+      color: #fff;
+      margin-top: 60px;
+      border-radius: 80px;
+    }
+  }
 }

src/pages/WuYe/ShengHuoGuanJia/components/Card.jsx

@@ -32,7 +32,16 @@ export default props => {
           <LR title='管家姓名'>{data.userName || ''}</LR>
           <LR title='联系方式'>{data.phone || ''}</LR>
           <LR title='管家说明'>{data.description || ''}</LR>
-          <LR title='综合评价'><Stars value={4} editable /></LR>
+          <LR title='综合评价'>
+            {
+              data.averageScore !== null &&
+              <Stars value={data.averageScore - 0} editable />
+            }
+            {
+              data.averageScore === null &&
+              <text>暂无评分</text>
+            }
+          </LR>
         </view>
       </view>
       <view className='gj-card-footer'>

src/pages/WuYe/ShengHuoGuanJia/components/Star.jsx

@@ -12,5 +12,5 @@ export default props => {
     }
   }
 
-  return <text className={clsName} style={props.style} onClick={handleClick}>&#9733;</text>
+  return <text className='iconfont iconxingxing' style='display: inline-block; vertical-align: middle; font-size: 36rpx; color: #fcdc1e;' onClick={handleClick}></text>
 }

src/pages/WuYe/ShengHuoGuanJia/components/style.less

@@ -90,6 +90,8 @@
 .gj-star {
   color: #333;
   display: inline-block;
+  font-size: 0;
+  white-space: nowrap;
 
   &.gj-star-active {
     color: #F35844;