李志伟 3 vuotta sitten
vanhempi
commit
834177fc0d

+ 1
- 1
src/components/ShopUsed/style.less Näytä tiedosto

19
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
19
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
20
     border-radius: 12px;
20
     border-radius: 12px;
21
     padding: 20px;
21
     padding: 20px;
22
-    margin: 0 5px;
22
+    margin: 0 3px;
23
     .orderTop{
23
     .orderTop{
24
       display: flex;
24
       display: flex;
25
       .orderImg{
25
       .orderImg{

+ 1
- 3
src/shop/components/Sparead/spreadMoney.jsx Näytä tiedosto

19
   const [isyear, setYear] = useState(true)
19
   const [isyear, setYear] = useState(true)
20
   const [isMomth, setMonth] = useState(false)
20
   const [isMomth, setMonth] = useState(false)
21
 
21
 
22
-  const queryParams = useMemo(() => ({
23
-
24
-  }), [])
22
+  const queryParams = useMemo(() => ({}), [])
25
 
23
 
26
 
24
 
27
   const reqestAPI = getList(shopMoney?.acc?.accountId)
25
   const reqestAPI = getList(shopMoney?.acc?.accountId)

+ 9
- 6
src/shop/pages/spread/spreadIndex.jsx Näytä tiedosto

1
 import React, { useState, useEffect, useRef } from 'react'
1
 import React, { useState, useEffect, useRef } from 'react'
2
 import CustomNav from '@/components/CustomNav'
2
 import CustomNav from '@/components/CustomNav'
3
 import { useRouter } from '@tarojs/taro'
3
 import { useRouter } from '@tarojs/taro'
4
-import baozan from '@/assets/icons/housemantj/bgood.png'
5
-
6
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
4
+import { getShopList, getShopMoney, getVerifiedOrder } from '@/services/shopBoss'
7
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
5
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
8
-import SpinBox from "@/components/Spin/SpinBox";
9
 import withLayout from '@/layouts'
6
 import withLayout from '@/layouts'
10
 import {
7
 import {
11
   TPL_MESSAGE_SHOP_PAY_SUCCESS,
8
   TPL_MESSAGE_SHOP_PAY_SUCCESS,
23
 export default withLayout((props) => {
20
 export default withLayout((props) => {
24
   const { router, person } = props
21
   const { router, person } = props
25
   const { params } = useRouter()
22
   const { params } = useRouter()
26
-  const { tab,cardShop } = params || {}
23
+  const { tab,shopOrderId } = params || {}
27
   const [currentTab, setCurrentTab] = useState(0)
24
   const [currentTab, setCurrentTab] = useState(0)
28
   //顶部的商铺列表
25
   //顶部的商铺列表
29
   const [shopList, setShopList] = useState([])
26
   const [shopList, setShopList] = useState([])
30
   //当前商铺
27
   //当前商铺
31
   const [shop, setShop] = useState()
28
   const [shop, setShop] = useState()
29
+  // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
32
   const shopId = shop?.shopId
30
   const shopId = shop?.shopId
33
 
31
 
34
   
32
   
53
     getShopList().then((res) => {
51
     getShopList().then((res) => {
54
       const { shopList: list, shop: current } = res
52
       const { shopList: list, shop: current } = res
55
       setShopList(list)
53
       setShopList(list)
56
-      setShop(current)
54
+      if (shopOrderId) {
55
+        setShop(list.filter(x=>x.shopId==shopOrderId)[0])
56
+      }
57
+      else{
58
+        setShop(current)
59
+      }
57
     })
60
     })
58
   }, [])
61
   }, [])
59
 
62