李志伟 3 年之前
父節點
當前提交
193d956400

二進制
src/assets/icons/UserCenter/binding.png 查看文件


+ 70
- 0
src/components/ToggleRole/index.jsx 查看文件

1
+import { useState, useEffect } from 'react'
2
+import binded from '@/assets/icons/UserCenter/binding.png'
3
+import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
4
+import './style.less'
5
+
6
+import SpinBox from "@/components/Spin/SpinBox";
7
+
8
+import touristON from '@/assets/icons/UserCenter/touristON.png'
9
+import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
10
+import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
11
+import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
12
+import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
13
+import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
14
+
15
+import Popup from '@/components/Popup'
16
+import { useModel } from '@/store'
17
+
18
+export default (props) => {
19
+  const { role, isBind } = props
20
+  const [showCutover, setShowCutover] = useState(false)
21
+
22
+  const ShowMoldeOn = () => {
23
+    setShowCutover(true)
24
+  }
25
+  const onClose = () => {
26
+    setShowCutover(false)
27
+  }
28
+  const { getRole, loading } = useModel('person')
29
+
30
+  const goToPerson = () => {
31
+    getRole('normal')
32
+    onClose()
33
+  }
34
+  const goToHotel = () => {
35
+    getRole('hotel')
36
+    onClose()
37
+  }
38
+  const goToShop = () => {
39
+    getRole('shop')
40
+    onClose()
41
+  }
42
+  return (
43
+    <>
44
+      <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
45
+        <SpinBox loading={loading}>
46
+          <view className='User-box-sths' >
47
+            <view className='User-box-selectUser'>请选择身份:</view>
48
+            <view className='User-box-tourist' onClick={goToPerson}>
49
+              <image className='Ubs-tourist-image' src={role === 'normal' ? touristON : touristOFF} />
50
+              <text className='Ubs-tourist-text'>我是用户</text>
51
+            </view>
52
+            <view className='User-box-hotelBoss' onClick={goToHotel}>
53
+              <image className='Ubs-hotelBoss-image' src={role === 'hotel' ? hotelBossON : hotelBossOFF} />
54
+              <text className='Ubs-hotelBoss-text'>我是房东</text>
55
+            </view>
56
+            <view className='User-box-shopBoss' onClick={goToShop}>
57
+              <image className='Ubs-shopBoss-image' src={role === 'shop' ? shopBossON : shopBossOFF} />
58
+              <text className='Ubs-shopBoss-text'>我是商铺</text>
59
+            </view>
60
+          </view>
61
+        </SpinBox>
62
+      </Popup >
63
+
64
+      <view onClick={ShowMoldeOn} className='User-info-cutover'>
65
+        <image className='User-info-cutover-image' src={cutoverUser} />
66
+        <image src={binded} className='User-info-cutover-image2' style={{ display: isBind ? '' : 'none' }} />
67
+      </view>
68
+    </>
69
+  )
70
+}

src/components/toggleRole/ToggleRole.less → src/components/ToggleRole/style.less 查看文件

1
+.User-info-cutover {
2
+  width:36px;
3
+  height: 36px;
4
+  position: relative;
5
+  .User-info-cutover-image {
6
+    width: 36px;
7
+    height: 36px;
8
+  }
9
+  .User-info-cutover-image2 {
10
+    width: 21px;
11
+    height: 14px;
12
+    position: absolute;
13
+    right: -10px;
14
+    bottom: -14px;
15
+  }
16
+}
1
 .User-box-sths {
17
 .User-box-sths {
2
   display: flex;
18
   display: flex;
3
   margin: 40px 0 60px 0;
19
   margin: 40px 0 60px 0;
51
       color: #202020;
67
       color: #202020;
52
     }
68
     }
53
   }
69
   }
54
-}
70
+}

+ 0
- 57
src/components/toggleRole/ToggleRole.jsx 查看文件

1
-import { useState, useEffect } from 'react';
2
-import SpinBox from "@/components/Spin/SpinBox";
3
-
4
-import touristON from '@/assets/icons/UserCenter/touristON.png'
5
-import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
6
-import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
7
-import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
8
-import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
9
-import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
10
-
11
-import Popup from '@/components/Popup'
12
-import './ToggleRole.less'
13
-import { useModel } from '@/store'
14
-
15
-
16
-export default (props) => {
17
-  const { showCutover, onClose, maskClosable, role } = props
18
-  const { getRole, loading } = useModel('person')
19
-  // const [loading, setLoading] = useState(false)
20
-
21
-  const goToPerson = () => {
22
-    getRole('normal')
23
-  }
24
-  const goToHotel = () => {
25
-    getRole('hotel')
26
-
27
-  }
28
-  const goToShop = () => {
29
-    getRole('shop')
30
-  }
31
-  return (
32
-
33
-    <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose}>
34
-      <SpinBox loading={loading}>
35
-        <view className='User-box-sths' >
36
-          <view className='User-box-selectUser'>请选择身份:</view>
37
-          <view className='User-box-tourist' onClick={goToPerson}>
38
-            <image className='Ubs-tourist-image' src={role === 'normal' ? touristON : touristOFF} />
39
-            <text className='Ubs-tourist-text'>我是用户</text>
40
-          </view>
41
-          <view className='User-box-hotelBoss' onClick={goToHotel}>
42
-            <image className='Ubs-hotelBoss-image' src={role === 'hotel' ? hotelBossON : hotelBossOFF} />
43
-            <text className='Ubs-hotelBoss-text'>我是房东</text>
44
-          </view>
45
-          <view className='User-box-shopBoss' onClick={goToShop}>
46
-            <image className='Ubs-shopBoss-image' src={role === 'shop' ? shopBossON : shopBossOFF} />
47
-            <text className='Ubs-shopBoss-text'>我是商铺</text>
48
-          </view>
49
-        </view>
50
-      </SpinBox>
51
-
52
-
53
-    </Popup >
54
-
55
-
56
-  )
57
-}

+ 4
- 13
src/hotel/components/HouseManage/houseManage.jsx 查看文件

8
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
8
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
9
 import { getRoomList,deleteRoom,copyRoom } from '@/services/landlord'
9
 import { getRoomList,deleteRoom,copyRoom } from '@/services/landlord'
10
 import Spin3 from '@/components/Spin/Spin3';
10
 import Spin3 from '@/components/Spin/Spin3';
11
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
12
-import ToggleRole from '@/components/toggleRole/ToggleRole'
13
 import List from '@/components/List';
11
 import List from '@/components/List';
14
 import Picker from '@/components/Picker'
12
 import Picker from '@/components/Picker'
15
 import SearchBar from '@/components/SearchBar'
13
 import SearchBar from '@/components/SearchBar'
16
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
14
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
17
 import ShareCard from '../shareCard/shareCard'
15
 import ShareCard from '../shareCard/shareCard'
16
+import ToggleRole from '@/components/ToggleRole'
18
 import './houseManage.less'
17
 import './houseManage.less'
19
 
18
 
20
 
19
 
21
 export default React.forwardRef((props, ref) => {
20
 export default React.forwardRef((props, ref) => {
22
-  const { hotel, hotelList, onHotelChange } = props
21
+  const { hotel, hotelList, onHotelChange,isBind } = props
23
   const [detail, setDetail] = useState([])
22
   const [detail, setDetail] = useState([])
24
   const [search, setSearch] = useState()
23
   const [search, setSearch] = useState()
25
 
24
 
155
       setDetail([...detail.slice(0, copy), res, ...detail.slice(copy)])
154
       setDetail([...detail.slice(0, copy), res, ...detail.slice(copy)])
156
     })
155
     })
157
   }
156
   }
158
-  const [showCutover3, setShowCutover3] = useState(false)
159
-  const ShowMoldeOn3 = () => {
160
-    setShowCutover3(true)
161
-  }
162
-  const onClose3 = () => {
163
-    setShowCutover3(false)
164
-  }
165
   return (
157
   return (
166
     <View style={{ padding: '0 30rpx', height: '100%', display: 'flex', flexDirection: 'column' }}>
158
     <View style={{ padding: '0 30rpx', height: '100%', display: 'flex', flexDirection: 'column' }}>
167
       <View style={{ flex: 'none' }}>
159
       <View style={{ flex: 'none' }}>
168
         <Spin3 show={loading} />
160
         <Spin3 show={loading} />
169
-        <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
170
       </View>
161
       </View>
171
       <View style={{ flex: 'none' }}>
162
       <View style={{ flex: 'none' }}>
172
         <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
163
         <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
173
-        <view onClick={ShowMoldeOn3} className='User-info-cutover'>
174
-          <image className='User-info-cutover-image' src={cutoverUser} />
164
+        <view className='User-info-cutover-normal'>
165
+            <ToggleRole role='hotel' isBind={isBind}/>
175
         </view>
166
         </view>
176
       </View>
167
       </View>
177
       <View style={{ flex: 'none' }}>
168
       <View style={{ flex: 'none' }}>

+ 3
- 7
src/hotel/components/HouseManage/houseManage.less 查看文件

4
   color: #202020;
4
   color: #202020;
5
   text-align: center;
5
   text-align: center;
6
 }
6
 }
7
-
8
-.User-info-cutover{
7
+.User-info-cutover-normal
8
+{
9
   position: absolute;
9
   position: absolute;
10
-  top: 0;
11
   right: 60px;
10
   right: 60px;
12
-  .User-info-cutover-image{
13
-    width: 36px;
14
-    height: 36px;
15
-  }
11
+  top: 0;
16
 }
12
 }
17
 
13
 
18
 .houseCard{
14
 .houseCard{

+ 3
- 1
src/hotel/pages/landlord/landlord.jsx 查看文件

16
   const { router, person } = props
16
   const { router, person } = props
17
   const { params } = useRouter()
17
   const { params } = useRouter()
18
   const { tab } = params || {}
18
   const { tab } = params || {}
19
+  const isBind=person.mpOpenid
20
+
19
 
21
 
20
   const [hotelList, setHotelList] = useState([])
22
   const [hotelList, setHotelList] = useState([])
21
   const {hotel, setHotel} = useModel('hotel')
23
   const {hotel, setHotel} = useModel('hotel')
69
       </view>
71
       </view>
70
       <view className='index-container'>
72
       <view className='index-container'>
71
         {currentTab === 1 && <Income hotel={hotel} account={account} />}
73
         {currentTab === 1 && <Income hotel={hotel} account={account} />}
72
-        {hotel?.hotelId ? currentTab === 0 && <HouseManage hotelList={hotelList} hotel={hotel} onHotelChange={handleHotelChange} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
74
+        {hotel?.hotelId ? currentTab === 0 && <HouseManage isBind={isBind} hotelList={hotelList} hotel={hotel} onHotelChange={handleHotelChange} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
73
       </view>
75
       </view>
74
       <view className='index-tabbar'>
76
       <view className='index-tabbar'>
75
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
77
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>

+ 4
- 15
src/pages/index/tabs/Mine.jsx 查看文件

12
 import collect from '@/assets/icons/UserCenter/collect.png'
12
 import collect from '@/assets/icons/UserCenter/collect.png'
13
 import Rules from '@/assets/icons/UserCenter/Rules.png'
13
 import Rules from '@/assets/icons/UserCenter/Rules.png'
14
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
14
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
15
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
16
 import { getMineOrder } from '@/services/payOrder' //创建订单
15
 import { getMineOrder } from '@/services/payOrder' //创建订单
17
-import ToggleRole from '@/components/toggleRole/ToggleRole'
16
+import ToggleRole from '@/components/ToggleRole'
18
 import { useModel } from '@/store'
17
 import { useModel } from '@/store'
19
 import './MineCss/style.less'
18
 import './MineCss/style.less'
20
 
19
 
24
 export default (props) => {
23
 export default (props) => {
25
   const { person, isDidShow, router } = props
24
   const { person, isDidShow, router } = props
26
   const { getAvatar, sessionKey } = useModel('person')
25
   const { getAvatar, sessionKey } = useModel('person')
27
-  const [showCutover, setShowCutover] = useState(false)
28
   const hasAvatar = !!person.avatar
26
   const hasAvatar = !!person.avatar
29
   const [orderNum, setOrderNum] = useState([])
27
   const [orderNum, setOrderNum] = useState([])
30
-
31
-
32
-  const ShowMoldeOn = () => {
33
-    setShowCutover(true)
34
-  }
35
-  const onClose = () => {
36
-    setShowCutover(false)
37
-  }
28
+  const isBind=person.mpOpenid
38
 
29
 
39
   useEffect(() => {
30
   useEffect(() => {
40
     getMineOrder().then(res => setOrderNum(res))
31
     getMineOrder().then(res => setOrderNum(res))
105
   return !person.phone ? <AuthPage /> : (
96
   return !person.phone ? <AuthPage /> : (
106
     <scroll-view scrollY style='height: 100%;' >
97
     <scroll-view scrollY style='height: 100%;' >
107
       <view className='User-box'>
98
       <view className='User-box'>
108
-        {/* 身份切换 */}
109
-        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='normal' />
110
         <view className='User-info'>
99
         <view className='User-info'>
111
           <view className='User-photos-box'>
100
           <view className='User-photos-box'>
112
             <image src={person.avatar || DefaultImage} className='User-photos' />
101
             <image src={person.avatar || DefaultImage} className='User-photos' />
117
             <image className='User-sex' src={person.sex === 1 ? boy : girl} />
106
             <image className='User-sex' src={person.sex === 1 ? boy : girl} />
118
           </view>
107
           </view>
119
           {/* 切换身份 */}
108
           {/* 切换身份 */}
120
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
121
-            <image className='User-info-cutover-image' src={cutoverUser} />
109
+          <view className='User-info-cutover-normal'>
110
+            <ToggleRole role='normal' isBind={isBind}/>
122
           </view>
111
           </view>
123
         </view>
112
         </view>
124
         <view>
113
         <view>

+ 4
- 13
src/pages/index/tabs/MineCss/style.less 查看文件

95
         top: -100px;
95
         top: -100px;
96
       }
96
       }
97
       .User-phone {
97
       .User-phone {
98
-        // height: 20px;
99
         font-size: 30px;
98
         font-size: 30px;
100
         font-weight: 400;
99
         font-weight: 400;
101
         color: #202020;
100
         color: #202020;
102
         line-height: 48px;
101
         line-height: 48px;
103
       }
102
       }
104
     }
103
     }
105
-    .User-info-cutover {
106
-      width: 62px;
107
-      height: 62px;
108
-      align-items: center;
109
-      display: flex;
110
-      position: relative;
111
-      left: 8em;
112
-      .User-info-cutover-image {
113
-        width: 36px;
114
-        height: 36px;
115
-        margin: 0 auto;
116
-      }
104
+    .User-info-cutover-normal
105
+    {
106
+      position: absolute;
107
+      right: 60px;      
117
     }
108
     }
118
   }
109
   }
119
 
110
 

+ 5
- 31
src/shop/components/ShopKeeper/shopKeeper.jsx 查看文件

9
 import NoData from '@/components/NoData'
9
 import NoData from '@/components/NoData'
10
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
10
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
11
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
11
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
12
-import ToggleRole from '@/components/toggleRole/ToggleRole'
13
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
12
+import ToggleRole from '@/components/ToggleRole'
14
 import './shopKeeper.less'
13
 import './shopKeeper.less'
15
 
14
 
16
 
15
 
17
 export default (props) => {
16
 export default (props) => {
18
-  const { shopList, shop, onHotelChange, verifiedOrder, shopMoney, onVarified } = props
17
+  const { shopList, shop, onHotelChange, verifiedOrder, shopMoney, isBind } = props
19
   const { params } = useRouter()
18
   const { params } = useRouter()
20
   const { tabJump } = params || {}
19
   const { tabJump } = params || {}
21
 
20
 
28
     phone: phonea || '',
27
     phone: phonea || '',
29
   }), [phonea, shop?.shopId, isVerifieda])
28
   }), [phonea, shop?.shopId, isVerifieda])
30
 
29
 
31
-
32
-  // 获取资源表信息
33
-  const [alllist, setAllList] = useState([])
34
-
35
   const [isyear, setYear] = useState(true)
30
   const [isyear, setYear] = useState(true)
36
   const [isMomth, setMonth] = useState(false)
31
   const [isMomth, setMonth] = useState(false)
37
   const [refres, setRefres] = useState(true)
32
   const [refres, setRefres] = useState(true)
75
     }
70
     }
76
   }, [tabJump])
71
   }, [tabJump])
77
 
72
 
78
-
79
-
80
-
81
-
82
-
83
   const handleTabChange = (e) => {
73
   const handleTabChange = (e) => {
84
     const { index } = e.detail
74
     const { index } = e.detail
85
     setActiveTab(index)
75
     setActiveTab(index)
97
       title: '已核销订单',
87
       title: '已核销订单',
98
     },
88
     },
99
   ]
89
   ]
100
-
101
-  //给父组件传val
102
-  const handleVarified = () => {
103
-    onVarified()
104
-  }
105
-
106
-  const [showCutover, setShowCutover] = useState(false)
107
-  const ShowMoldeOn = () => {
108
-    setShowCutover(true)
109
-  }
110
-  const onClose = () => {
111
-    setShowCutover(false)
112
-  }
113
   return (
90
   return (
114
     <view style={{height:'100%'}}>
91
     <view style={{height:'100%'}}>
115
-      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
116
       <view style={{ padding: '0 15px 0 15px', height: '100%',display:'flex' ,flexDirection:'column' }}>
92
       <view style={{ padding: '0 15px 0 15px', height: '100%',display:'flex' ,flexDirection:'column' }}>
117
         <view className='storexx' style={{flex:'none'}}>
93
         <view className='storexx' style={{flex:'none'}}>
118
-          <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
119
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
120
-            <image className='User-info-cutover-image' src={cutoverUser} />
94
+          <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>          
95
+          <view className='User-info-cutover-normal'>
96
+            <ToggleRole role='shop' isBind={isBind}/>
121
           </view>
97
           </view>
122
           <view className='tip'>(计算收入以核销为准)</view>
98
           <view className='tip'>(计算收入以核销为准)</view>
123
           <view className='money'>
99
           <view className='money'>
160
                 style={{ height: '100%' }}
136
                 style={{ height: '100%' }}
161
                 request={getVerifiedOrder}
137
                 request={getVerifiedOrder}
162
                 params={queryParams}
138
                 params={queryParams}
163
-                onDataChange={setAllList}
164
                 refresherEnabled={refres}
139
                 refresherEnabled={refres}
165
                 refresOff={refresOff}
140
                 refresOff={refresOff}
166
                 noData={<NoData />}
141
                 noData={<NoData />}
177
                 request={getVerifiedOrder}
152
                 request={getVerifiedOrder}
178
                 params={queryParams}
153
                 params={queryParams}
179
                 refresherEnabled={refres}
154
                 refresherEnabled={refres}
180
-                onDataChange={setAllList}
181
                 refresOff={refresOff}
155
                 refresOff={refresOff}
182
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
156
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
183
               >
157
               >

+ 4
- 26
src/shop/components/Sparead/spreadMoney.jsx 查看文件

6
 import ShopCommission from '@/components/ShopCommission'
6
 import ShopCommission from '@/components/ShopCommission'
7
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
7
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
8
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
8
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
9
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
10
 import NoData from '@/components/NoData'
9
 import NoData from '@/components/NoData'
11
-import ToggleRole from '@/components/toggleRole/ToggleRole'
10
+import ToggleRole from '@/components/ToggleRole'
12
 import './spreadMoney.less'
11
 import './spreadMoney.less'
13
-import { View } from '@tarojs/components';
14
 
12
 
15
 const getList = (id) => (params) => getAccount(id, params)
13
 const getList = (id) => (params) => getAccount(id, params)
16
 
14
 
17
 export default (props) => {
15
 export default (props) => {
18
-  const { shopList, shop, onHotelChange, shopMoney } = props
19
-  const [showCutover, setShowCutover] = useState(false)
16
+  const { shopList, shop, onHotelChange, shopMoney, isBind } = props
20
   const [isyear, setYear] = useState(true)
17
   const [isyear, setYear] = useState(true)
21
   const [isMomth, setMonth] = useState(false)
18
   const [isMomth, setMonth] = useState(false)
22
-
23
   const queryParams = useMemo(() => ({}), [onHotelChange])
19
   const queryParams = useMemo(() => ({}), [onHotelChange])
24
-
25
-
26
   const reqestAPI = getList(shopMoney?.acc?.accountId)
20
   const reqestAPI = getList(shopMoney?.acc?.accountId)
27
 
21
 
28
-
29
-
30
-
31
   //小眼睛开关
22
   //小眼睛开关
32
   const handleYear = () => {
23
   const handleYear = () => {
33
     isyear ? setYear(false) : setYear(true)
24
     isyear ? setYear(false) : setYear(true)
40
   const handleHotelChange = (shopId, current) => {
31
   const handleHotelChange = (shopId, current) => {
41
     onHotelChange(current)
32
     onHotelChange(current)
42
   }
33
   }
43
-
44
-
45
-
46
-  const ShowMoldeOn = () => {
47
-    setShowCutover(true)
48
-  }
49
-  const onClose = () => {
50
-    setShowCutover(false)
51
-  }
52
-
53
   return (
34
   return (
54
     <view style={{ padding: '0 15px 0 15px', height: '100%', display: 'flex', flexDirection: 'column' }}>
35
     <view style={{ padding: '0 15px 0 15px', height: '100%', display: 'flex', flexDirection: 'column' }}>
55
-      <View style={{ flex: 'none' }}>
56
-        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
57
-      </View>
58
       <view className='storexx' style={{ flex: 'none' }}>
36
       <view className='storexx' style={{ flex: 'none' }}>
59
         <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
37
         <view className='storeName'>店名:<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
60
-        <view onClick={ShowMoldeOn} className='User-info-cutover'>
61
-          <image className='User-info-cutover-image' src={cutoverUser} />
38
+        <view className='User-info-cutover-normal'>
39
+          <ToggleRole role='shop' isBind={isBind} />
62
         </view>
40
         </view>
63
         <view className='tip'>(计算收入以核销为准)</view>
41
         <view className='tip'>(计算收入以核销为准)</view>
64
         <view className='money'>
42
         <view className='money'>

+ 1
- 5
src/shop/components/Sparead/spreadMoney.less 查看文件

68
     color: #202020;
68
     color: #202020;
69
     margin-bottom: 27px;
69
     margin-bottom: 27px;
70
   }
70
   }
71
-  .User-info-cutover {
71
+  .User-info-cutover-normal{
72
     position: absolute;
72
     position: absolute;
73
     top: 60px;
73
     top: 60px;
74
     right: 60px;
74
     right: 60px;
75
-    .User-info-cutover-image {
76
-      width: 36px;
77
-      height: 36px;
78
-    }
79
   }
75
   }
80
   .tip {
76
   .tip {
81
     height: 23px;
77
     height: 23px;

+ 4
- 8
src/shop/pages/spread/spreadIndex.jsx 查看文件

28
   const [shop, setShop] = useState()
28
   const [shop, setShop] = useState()
29
   // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
29
   // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
30
   const shopId = shop?.shopId
30
   const shopId = shop?.shopId
31
+  const isBind=person.mpOpenid
32
+
31
 
33
 
32
 
34
 
33
   const [amountType, setAmountType] = useState('order')
35
   const [amountType, setAmountType] = useState('order')
66
     setVerifiedOrder(e.records)
68
     setVerifiedOrder(e.records)
67
   }
69
   }
68
 
70
 
69
-
70
-  const onVarified = () => {
71
-    setisVerified(1)
72
-  }
73
-
74
-
75
   const onVarifiedTwo = () => {
71
   const onVarifiedTwo = () => {
76
     setisVerified(0)
72
     setisVerified(0)
77
   }
73
   }
112
         <CustomNav logo='none' title={shop?.shopName} />
108
         <CustomNav logo='none' title={shop?.shopName} />
113
       </view>
109
       </view>
114
       <view className='index-container'>
110
       <view className='index-container'>
115
-        {currentTab === 0 && <ShopKeeper isVerified={isVerified} shopId={shopId} amountType={amountType} setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
111
+        {currentTab === 0 && <ShopKeeper isBind={isBind} isVerified={isVerified} shopId={shopId} amountType={amountType} setVer={setVer} onVarifiedTwo={onVarifiedTwo} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
116
         }
112
         }
117
-        {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
113
+        {currentTab === 1 && <Sparead isBind={isBind} shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
118
       </view>
114
       </view>
119
       <view className='index-tabbar'>
115
       <view className='index-tabbar'>
120
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
116
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>