feats

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -15,7 +15,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { showCutover, maskClosable, item, onClose } = props
+  const { showCutover, maskClosable, item, onClose, onFinish } = props
   const scoreList = new Array(5).fill(0)
 
   const ButtonCancel = () => {
@@ -32,6 +32,7 @@ export default (props) => {
     else {
       saveEvaluate(evaluate.targetType, evaluate.targetId, evaluate).then((res) => {
         console.log(res)
+        onFinish()
       })
       onClose()
     }

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -28,8 +28,6 @@ export default (props) => {
     }
   }
 
-
-
   //核销
   const onWriteOff = (item) => {
     Taro.scanCode({

src/components/CompoentsOrder/complete/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import Taro, { useDidShow, AtSwipeAction } from "@tarojs/taro";
 import { getOrderSub, deleteOrder } from "@/services/payOrder";
+import { View } from "@tarojs/components";
 import NoData from '@/components/NoData'
 import SpinBox from "@/components/Spin/SpinBox";
 
@@ -8,9 +9,6 @@ import ico_delete from '../../../assets/icons/ProCard/ico_delete.png'
 import AlreadyUsed from "../AlreadyUsed";
 import OrderCard from '../OrderCard'
 import "./style.less";
-import { View } from "@tarojs/components";
-
-
 
 const dict = {
   0: { status: 0, isVerified: 0 },
@@ -22,28 +20,25 @@ export default (props) => {
   const { type } = props;
   const [list, setList] = useState([]);
   const [IsPull, setPull] = useState(false);
-  const [pageNum, setNumber] = useState(1);
+  const [pageNum, setNumber] = useState({ pageNum: 1 });
   const [HasNextPage, setHasNextPage] = useState(true);
   const [loading, setLoading] = useState(false)
 
   useDidShow(() => {
-    setNumber(1)
+    setNumber({ pageNum: 1 })
   })
 
   useEffect(() => {
     if (pageNum) {
       getList();
     }
-
   }, [pageNum]);
 
-
-
   const getList = () => {
     setLoading(true)
     setHasNextPage(false);
     getOrderSub({
-      pageNum,
+      ...pageNum,
       pageSize: 10,
       isVerified: '',
       ...(type !== undefined ? dict[type] : null),
@@ -63,7 +58,8 @@ export default (props) => {
   const pageLoadMore = () => {
     // 页面上拉加载更多
     if (HasNextPage) {
-      setNumber(pageNum + 1);
+      const num = pageNum.pageNum + 1
+      setNumber({ pageNum: num });
     }
   };
 
@@ -76,7 +72,7 @@ export default (props) => {
   useEffect(() => {
     // 下拉刷新触发
     if (IsPull) {
-      if (pageNum === 1) {
+      if (pageNum.pageNum === 1) {
         getList();
       } else {
         setNumber(1);
@@ -98,13 +94,14 @@ export default (props) => {
     })
   }
 
-  const button = [{
-    extClass: 'test-button',
-    src: ico_delete
-  }]
+  const handleFinishEvaluate = () => {
+    // 触发页面刷新
+    setNumber({ pageNum: 1 })
+    setShowCutover(false)
+  }
 
   return (
-    <View style={{ height: 'calc(100% - 46px)' }}>
+    <SpinBox loading={loading} style={{ height: 'calc(100% - 46px)' }}>
       <scroll-view
         scrollY
         style={{ height: '100%' }}
@@ -114,41 +111,30 @@ export default (props) => {
           list.length == 0 ?
             <NoData /> :
             <view className='complete-boxs'>
-              <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} item={ite} />
+              <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} onFinish={handleFinishEvaluate} item={ite} />
               {list.map((item, index) => {
                 /* 待支付 */
                 if (item.status === 0) {
                   return (
-                    <SpinBox loading={loading} className='index-container' >
-
-                      <view key={`${type}-${item.orderId}`}  >
-                        <OrderCard item={item} handeDelete={slideButtonTap} />
-                      </view>
-                    </SpinBox>
+                    <view key={`${type}-${item.orderId}`}  >
+                      <OrderCard item={item} handeDelete={slideButtonTap} />
+                    </view>
                   );
                 }
                 /* 已使用 */
                 else if (item.isVerified == 1) {
                   return (
-                    <SpinBox loading={loading} className='index-container' >
-
-                      <view key={`${type}-${item.orderId}`}>
-                        <OrderCard item={item} setShowCutover={setShowCutover} show={show} />
-                      </view>
-                    </SpinBox>
-
+                    <view key={`${type}-${item.orderId}`}>
+                      <OrderCard item={item} setShowCutover={setShowCutover} show={show} />
+                    </view>
                   );
                 }
                 /* 待核销 */
                 else {
                   return (
-                    <SpinBox loading={loading} className='index-container' >
-
-                      <view key={`${type}-${item.orderId}`}>
-                        <OrderCard item={item} />
-                      </view>
-                    </SpinBox>
-
+                    <view key={`${type}-${item.orderId}`}>
+                      <OrderCard item={item} />
+                    </view>
                   );
                 }
               })}
@@ -156,6 +142,6 @@ export default (props) => {
             </view>
         }
       </scroll-view>
-    </View>
+    </SpinBox>
   )
 };

src/pages/PayOrder/index.jsx

@@ -1,9 +1,10 @@
+import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
 import Taro, { useDidShow } from "@tarojs/taro";
 import { getPackageDetail } from "@/services/home";
 import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
-import { useState, useEffect } from "react";
 import formatPrice from "@/utils/formatPrice";
+import usePrevious from "@/utils/hooks/usePrevious";
 import { Button, Radio, View } from "@tarojs/components";
 import InputNumber from "@/components/InputNumber";
 import AuthPage from '@/components/AuthPage'
@@ -26,6 +27,8 @@ export default withLayout((props) => {
   const [BuyNumber, setBuyNumber] = useState(1);
   const [detail, setDetail] = useState({});
   const [showDialog, setShowDialog] = useState(false);
+  // 监控金额变化
+  const preActPrice = usePrevious(totalPrice?.actualPrice || 0)
 
   const ShowMoldeOn = (e) => {
     if (packageId) {
@@ -84,7 +87,10 @@ export default withLayout((props) => {
 
   const onShowPay = (e) => {
     if (agreement) {
-      if (payInfo) {
+      const actPrice = totalPrice?.actualPrice || 0
+      const isOrderChanged = actPrice !== preActPrice
+
+      if (payInfo && !isOrderChanged) {
         requestPayment(payInfo);
         return;
       }

src/pages/search/search.jsx

@@ -29,7 +29,7 @@ export default withLayout((props) => {
                 <CustomNav title='搜索' />
             </view>
 
-            <SearchBar placeholder='请输入景区/城市搜索' onBlur={onSearch} />
+            <SearchBar placeholder='搜索景点/店铺' onBlur={onSearch} />
 
             <view className='content'>
                 <view className='hotSearch'>热门搜索</view>

src/pages/searchResult/searchResult.jsx

@@ -70,7 +70,7 @@ export default withLayout((props) => {
       </view>
       <view className='index-container'>
         <view className='search'>
-          <input className='searchInput' placeholder='请输入景区/城市搜索' disabled onClick={onSearch} />
+          <input className='searchInput' placeholder='搜索景点/店铺' disabled onClick={onSearch} />
           <image className='searchicon' src={iconsearch} />
           <view className='lineSearch'></view>
         </view><view className='index-tabs'>

src/utils/formatTime.js

@@ -1,5 +1,17 @@
-export default function formatTimes(date, fmt) {
-  var date = new Date(date);
+
+function getDateByStr(dtStr) {
+  if (!dtStr) return undefined;
+
+  const t = dtStr.split(/[-T :]/);
+  return new Date(t[0], t[1]-1, t[2], t[3] || 0, t[4] || 0, t[5] || 0)
+}
+
+export default function formatTimes(dt, fmt) {
+  if (!dt) return dt;
+
+  // 解决苹果手机不能正常初始化的问题
+  const date = typeof dt === 'string' ? getDateByStr(dt) : new Date(dt);
+
   var o = {
     "M+": date.getMonth() + 1, //月份
     "d+": date.getDate(), //日

src/utils/hooks/usePrevious.js

@@ -0,0 +1,9 @@
+import { useEffect, useRef } from "react";
+
+export default function usePrevious(value) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = value;
+  });
+  return ref.current;
+}