Ver código fonte

Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

李志伟 3 anos atrás
pai
commit
c48c925692

+ 3
- 4
src/components/CouponCard/Action/style.less Ver arquivo

@@ -1,4 +1,3 @@
1
-
2 1
 .cpn-action {
3 2
   height: 100%;
4 3
   display: flex;
@@ -13,12 +12,12 @@
13 12
 .cpn-icon-action {
14 13
   & > view {
15 14
     & > image {
16
-      width: 36px;
17
-      height: 36px;
15
+      width: 46px;
16
+      height: 46px;
18 17
       display: block;
19 18
       margin: 0 auto;
20 19
     }
21
-  
20
+
22 21
     & > text {
23 22
       margin-top: 20px;
24 23
       display: inline-block;

+ 1
- 4
src/hotel/components/shareCard/shareCard.jsx Ver arquivo

@@ -1,9 +1,6 @@
1 1
 import React from 'react'
2 2
 import Popup from '@/components/Popup'
3
-import Taro from '@tarojs/taro'
4
-import { Input, Button, View, Picker, Label } from '@tarojs/components'
5
-import { shareRoom } from '@/services/landlord'
6
-import { useState } from 'react'
3
+import { Button, View } from '@tarojs/components'
7 4
 import './shareCard.less'
8 5
 
9 6
 

+ 4
- 2
src/shop/pages/spread/spreadIndex.jsx Ver arquivo

@@ -1,6 +1,8 @@
1 1
 import React, { useState, useEffect, useRef } from 'react'
2 2
 import CustomNav from '@/components/CustomNav'
3 3
 import { useRouter } from '@tarojs/taro'
4
+import baozan from '@/assets/icons/housemantj/bgood.png'
5
+
4 6
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
5 7
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
6 8
 import SpinBox from "@/components/Spin/SpinBox";
@@ -36,7 +38,7 @@ export default withLayout((props) => {
36 38
 
37 39
   const handleTabChange = (e) => {
38 40
     const { index } = e.detail
39
-    index?setAmountType('commission'):setAmountType('order')
41
+    index ? setAmountType('commission') : setAmountType('order')
40 42
     setCurrentTab(index)
41 43
     //如果context有的话代表他滚动了   那么切换tab页就置顶
42 44
     if (listRef.current?.context) {
@@ -105,7 +107,7 @@ export default withLayout((props) => {
105 107
   return (
106 108
     <SpinBox loading={loading} className='page-index'>
107 109
       <view className='index-navbar'>
108
-        <CustomNav title={shop?.shopName} />
110
+        <CustomNav logo='none' title={shop?.shopName} />
109 111
       </view>
110 112
       <view className='index-container'>
111 113
         {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} />