。

src/components/BossCard/index.jsx

@@ -79,7 +79,7 @@ export default (props) => {
             <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
             <view className='title-position-on'>
               <image className='title-position' src={position} />
-              <text className='title-position-image'>{city.areaPName}/ {city.areaName}</text>
+              <text className='title-position-image'>{city.areaName=='南京市'?city.areaName:city.areaPName+'/'+city.areaName}</text>
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
 
                 <image className='title-on' src={isSaved > 0 ? starOn : starOff} />

src/components/CompoentsOrder/complete/index.jsx

@@ -1,4 +1,4 @@
-import react, { useState, useEffect } from "react";
+import React, { useState, useEffect } from "react";
 import Taro from "@tarojs/taro";
 import { getOrderSub, getQrcode } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
@@ -6,17 +6,15 @@ import image from "@/assets/icons/ProCard/8kb.jpg";
 import food from "@/assets/icons/ProCard/food.png";
 import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
-
+import NoData from '@/components/NoData'
 import Evaluation from "@/assets/icons/UserCenter/Evaluation.png";
 import Null from "@/assets/icons/UserCenter/null_logo.png";
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
-
 import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
 import starOn from "@/assets/icons/GuideCheck/starOn.png";
 import starOff from "@/assets/icons/GuideCheck/starOff.png";
-import AlreadyUsed from "../AlreadyUsed";
-import "./style.less";
 import { useDidShow } from "@tarojs/taro";
+import "./style.less";
 
 const scoreList = new Array(5).fill(0);
 const score = "3.9";
@@ -120,6 +118,9 @@ export default (props) => {
       refresher-background="#fff"
       onscrolltolower={pageLoadMore}
     >
+      {
+        list.length == 0 ?
+          <NoData />:
       <view className="complete-boxs">
         {list.map((item, index) => {
           /* 待支付 */
@@ -398,6 +399,7 @@ export default (props) => {
 
         <view className="foot">已经到底了~</view>
       </view>
+        }
     </scroll-view>
   );
 };

src/components/List/index.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, {  useEffect, useRef, useState } from 'react';
 import { ScrollView } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
@@ -6,7 +6,7 @@ export default (props) => {
   const {
     render,
     request,
-    params,
+    params={},
     pageSize = 10,
     onError,
     onDataChange,
@@ -15,7 +15,7 @@ export default (props) => {
   } = props
 
   const loadingRef = useRef(false)
-  const [payload, setPayload] = useState({})
+  const [payload, setPayload] = useState(params)
   const [list, setList] = useState([])
   const pageRef = useRef({ current: 1, pages: 0 })
   const hasMore = pageRef.current.current < pageRef.current.pages

src/components/foodCards/foodCards.jsx

@@ -71,7 +71,7 @@ export default (props) => {
             </view>
             <view className='address'>
               <image className='dw' src={wz} />
-              <text className='wz'>{city.areaPName}/{city.areaName}</text>
+              <text className='wz'>{city.areaName=='南京市'?city.areaName:city.areaPName+'/'+city.areaName}</text>
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
                 <image className='star' src={isSaved > 0 ? ax : good}></image>
                 <text className='collection'>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
@@ -80,7 +80,7 @@ export default (props) => {
           </view>
         </view>
       </view>
-      <view className='fCright' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` }); }}>
+      <view className='fCright' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}`}); }}>
         <image src={pay} />
         <view>支付</view>
       </view>

src/hotel/components/Income/income.jsx

@@ -54,7 +54,7 @@ export default (props) => {
             <view className='sleft'>
               <view className='lword'>全年收入（税前）</view>
               <view className='yearMoney'>
-                <text>{isyear ? account?.amounts : '******'}</text>元
+                <text>{isyear ? account?.amounts/100 : '******'}</text>元
                 <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
               </view>
             </view>
@@ -62,7 +62,7 @@ export default (props) => {
             <view className='sright'>
               <view className='rword'>当月收入（税前）</view>
               <view className='monthMoney'>
-                <text>{isMomth ? account?.currentCharges : '******'}</text>元
+                <text>{isMomth ? account?.currentCharges/100 : '******'}</text>元
                 <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
               </view></view>
           </view>

src/pages/MineUserAll/AllOrder/index.jsx

@@ -51,20 +51,6 @@ export default withLayout((props) => {
     const { index } = e.detail
     setActiveTab(index)
   }
-
-  const abccc = () => [
-    Taro.getSystemInfo({
-      success: function (res) {
-        let clientHeight = res.windowHeight;
-        let clientWidth = res.windowWidth;
-        let ratio = 750 / clientWidth;
-        let Height = ratio * clientHeight;
-        setSwiperHeight(`height:${Height}rpx;`)
-      }
-    })
-  ]
-
-
   return (
     <view className='box-content'>
       <CustomNav title='我的订单' />

src/pages/MineUserAll/Collect/index.jsx

@@ -24,7 +24,7 @@ export default withLayout((props) => {
   return (
     <view className='box-content'>
       <CustomNav title='我的收藏' />
-      <view>
+      <view >
         {
           collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
         }

src/pages/index/tabs/Recommend.jsx

@@ -5,8 +5,8 @@ import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import List from '@/components/List';
 import { getIndexType, getResourceList } from '@/services/home'
-import NoData from '@/components/NoData'
 import Card from '../components/Card'
+import NoData from '@/components/NoData'
 import './less/Recommend.less'
 
 
@@ -24,6 +24,7 @@ export default (props) => {
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
   //切换上面的标签
   const handleTabChange = (e) => {
+    // Taro.pageScrollTo({ scrollTop: 0 })为什么不能置顶
     const { index } = e.detail
     setActiveTab(index)
     const tab = tabs[index].typeId
@@ -82,7 +83,7 @@ export default (props) => {
       >
         {
           alllist.length == 0 ?
-          <NoData />:
+            <NoData /> :
             <view className='waterfall'>
               {
                 alllist.map((item) => <Card key={item.resourceNo} item={item} />)