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

src/components/CouponCard/Action/style.less

-
 .cpn-action {
   height: 100%;
   display: flex;
 .cpn-icon-action {
   & > view {
     & > image {
-      width: 36px;
-      height: 36px;
+      width: 46px;
+      height: 46px;
       display: block;
       margin: 0 auto;
     }
-  
+
     & > text {
       margin-top: 20px;
       display: inline-block;

src/hotel/components/shareCard/shareCard.jsx

 import React from 'react'
 import Popup from '@/components/Popup'
-import Taro from '@tarojs/taro'
-import { Input, Button, View, Picker, Label } from '@tarojs/components'
-import { shareRoom } from '@/services/landlord'
-import { useState } from 'react'
+import { Button, View } from '@tarojs/components'
 import './shareCard.less'
 
 

src/shop/pages/spread/spreadIndex.jsx

 import React, { useState, useEffect, useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
+import baozan from '@/assets/icons/housemantj/bgood.png'
+
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
 import SpinBox from "@/components/Spin/SpinBox";
 
   const handleTabChange = (e) => {
     const { index } = e.detail
-    index?setAmountType('commission'):setAmountType('order')
+    index ? setAmountType('commission') : setAmountType('order')
     setCurrentTab(index)
     //如果context有的话代表他滚动了   那么切换tab页就置顶
     if (listRef.current?.context) {
   return (
     <SpinBox loading={loading} className='page-index'>
       <view className='index-navbar'>
-        <CustomNav title={shop?.shopName} />
+        <CustomNav logo='none' title={shop?.shopName} />
       </view>
       <view className='index-container'>
         {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} />