flx

src/components/ShopUnused/index.jsx

@@ -4,6 +4,8 @@ import formatTimes from '@/utils/formatTime'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import ms from '@/assets/icons/housemantj/ms3.jpg'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
+import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+
 import './style.less'
 
 
@@ -12,9 +14,11 @@ export default (props) => {
 
 
 
-  useEffect(() => {
+  // useEffect(() => {
+  //   getVerifiedOrder({ phone: '18082043755' }).then((res) => {
 
-  }, [])
+  //   })
+  // }, [])
 
   return (
     <view className='orderCard'>

src/components/ShopUsed/index.jsx

@@ -29,15 +29,13 @@ export default (props) => {
   }
 
 
-  useEffect(() => {
 
-  }, [])
 
   return (
     <View className='orderCard'>
       <View style={{ overflow: 'hidden' }}>
         <View className='orderId'>订单编号：{item.orderId}</View>
-        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss')}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss') || ''}</View>
       </View>
       <View className='order'>
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
@@ -47,7 +45,10 @@ export default (props) => {
         </View>
         <View className='line' />
         <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
-          <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button> </View>
+          {
+            !item.isConfirmVerified && <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button>
+          }
+        </View>
       </View>
     </View>
   )

src/pages/index/tabs/Mine.jsx

@@ -31,7 +31,6 @@ export default (props) => {
   const hasAvatar = !!person.avatar
   const [orderNum, setOrderNum] = useState([])
 
-  console.log('--------DefaultImage-----', DefaultImage)
 
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -46,7 +45,6 @@ export default (props) => {
   }, [])
 
 
-
   // 通过getUserProfile获取微信用户信息
   const handleGetUserProfile = () => {
     if (hasAvatar) return;
@@ -135,12 +133,12 @@ export default (props) => {
             <view className='buy-list-Paybox' onClick={handleTobePaid} >
               <image className='buy-list-PayLogo' src={awaitPay} />
               <view className='buy-list-goPay'>待支付</view>
-              <view className='buy-list-OrderNumber'>{orderNum?.unPayNum}笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unPayNum || '0'}笔订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleTobeWritten} >
               <image className='buy-list-PayLogo' src={ToShop} />
               <view className='buy-list-goPay'>待核销</view>
-              <view className='buy-list-OrderNumber'>{orderNum?.unVerifiedNum}个订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unVerifiedNum || '0'}个订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleAllOrder} >
               <image className='buy-list-PayLogo' src={AllOrder} />
@@ -150,7 +148,7 @@ export default (props) => {
             <view className='buy-list-Paybox ' onClick={handleRefund} >
               <image className='buy-list-PayLogo' src={Refund} />
               <view className='buy-list-goPay'>退款/售后</view>
-              <view className='buy-list-OrderNumber'>{orderNum?.refundNum}笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.refundNum || '0'}笔订单</view>
             </view>
           </view>
           <view className='Badge-box'>

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -6,11 +6,14 @@ import Popup from '@/components/Popup'
 import ShopUsed from '@/components/ShopUsed' //已核销
 import ShopUnused from '@/components/ShopUnused' //未核销
 import SearchBar from '@/components/SearchBar'
+import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import ms from '@/assets/icons/housemantj/ms3.jpg'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
+
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import touristON from '@/assets/icons/UserCenter/touristON.png'
 import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
@@ -19,11 +22,10 @@ import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
 import './shopKeeper.less'
-import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, onVarified, onVarifiedTwo } = props
+  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, onVarified, onVarifiedTwo, setVer } = props
   const shopId = shop?.shopId
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
@@ -71,6 +73,11 @@ export default (props) => {
     },
   ]
 
+  const [vale, setVale] = useState('')
+
+  const phoneVale = () => {
+
+  }
 
   const handleVarified = () => {
     onVarified()
@@ -78,7 +85,29 @@ export default (props) => {
 
 
   const onSearch = (e) => {
-    console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
+    const val = e.detail.value
+    if (val !== '') {
+      getVerifiedOrder({
+        phone: val,
+        pageNum: 1,
+        pageSize: 10,
+
+      }).then((res) => {
+        setVer(res)
+
+      })
+    } else {
+      getVerifiedOrder({
+        shopId: shopId,
+        pageNum: 1,
+        pageSize: 10,
+
+      }).then((res) => {
+        setVer(res)
+
+      })
+    }
+
   }
 
   const [showCutover, setShowCutover] = useState(false)
@@ -135,10 +164,6 @@ export default (props) => {
             >
             </mp-tabs>
           </view>
-          {
-            verifiedOrder.map
-
-          }
           <view>
             {/* 未核销 */}
             {activeTab === 0 &&

src/shop/pages/spread/spreadIndex.jsx

@@ -47,6 +47,15 @@ export default withLayout((props) => {
   }, [])
 
 
+  // 搜索核销手机号
+  const setVer = (e) => {
+    setVerifiedOrder(e.records)
+
+
+
+  }
+
+
   //未核销订单列表
   useEffect(() => {
     getVerifiedOrder({
@@ -107,7 +116,7 @@ export default withLayout((props) => {
     <view className='page-index'>
       <CustomNav title={shop?.shopName} />
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
+        {currentTab === 0 && <ShopKeeper setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }
         {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>