.

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2.njyunzhi.com"',
+    HOST: '"https://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx06a7372d48d56843",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/hotel/components/Income/income.less

@@ -163,5 +163,5 @@
   color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding: 40px 0 100px 0;
+  padding: 40px 0;
 }

src/pages/MineUserAll/Collect/style.less

@@ -4,7 +4,7 @@
     font-size: 28px;
     color: #C0C8D3;
     text-align: center;
-    padding:40px 0 50px 0;
+    padding:40px 0;
     background-color: #F8F8F8;
   } 
 }

src/pages/details/foodDetails/foodDetails.less

@@ -138,6 +138,6 @@
   color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding: 40px 0 68px 0;
+  padding: 40px 0;
   background-color: #f8f8f8;
 }

src/pages/details/mjDetails/sceneryDetails.less

@@ -126,6 +126,6 @@
   color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding: 40px 0 60px 0;
+  padding: 40px 0;
   background-color: #f8f8f8;
 }

src/pages/index/tabs/less/Recommend.less

@@ -32,7 +32,7 @@
   font-size: 28px;
   color: #C0C8D3;
   text-align: center;
-  padding:40px 0 50px 0;
+  padding:40px 0;
   background-color: #F8F8F8;
 } 
 .index-tabs {

src/pages/searchResult/searchResult.less

@@ -38,7 +38,7 @@
   font-size: 28px;
   color: #C0C8D3;
   text-align: center;
-  padding:40px 0 50px 0;
+  padding:40px 0;
   background-color: #F8F8F8;
 } 
 .index-tabs {

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -111,12 +111,10 @@ export default (props) => {
     setShowCutover(false)
   }
   return (
-    <view>
-      <view>
-      </view>
+    <view style={{height:'100%'}}>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
-      <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
-        <view className='storexx'>
+      <view style={{ padding: '0 15px 0 15px', height: '100%',display:'flex' ,flexDirection:'column' }}>
+        <view className='storexx' style={{flex:'none'}}>
           <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
           <view onClick={ShowMoldeOn} className='User-info-cutover'>
             <image className='User-info-cutover-image' src={cutoverUser} />
@@ -140,10 +138,10 @@ export default (props) => {
               </view></view>
           </view>
         </view>
-        <view className='search'>
+        <view className='search' style={{flex:'none'}}>
           <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={handelSearch} />
         </view>
-        <view className='index-tabs'>
+        <view className='index-tabs' style={{flex:'none'}}>
           <mp-tabs
             tabClass='tabs-Unselected'
             swiperClass='tabs-swiper'
@@ -155,11 +153,9 @@ export default (props) => {
           >
           </mp-tabs>
         </view>
-        <view  >
+        <view style={{flex:1,overflow:'hidden'}}>
           {/* 未核销 */}
           {activeTab === 0 &&
-            <view style={{ height: '45vh' }}>
-
               <List
                 style={{ height: '100%' }}
                 request={getVerifiedOrder}
@@ -172,12 +168,9 @@ export default (props) => {
                   <ShopUnused key={(index)} item={item} />}
               >
               </List>
-            </view>
-
           }
           {/* 已核销 */}
           {activeTab === 1 &&
-            <view style={{ height: '45vh' }}>
               <List
                 style={{ height: '100%' }}
                 noData={<NoData />}
@@ -186,12 +179,9 @@ export default (props) => {
                 refresherEnabled={refres}
                 onDataChange={setAllList}
                 refresOff={refresOff}
-
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
               >
               </List>
-            </view>
-
           }
         </view>
       </view>

src/shop/components/ShopKeeper/shopKeeper.less

@@ -76,11 +76,3 @@
     border-bottom: 5px solid black;
   }
 }
-
-.botton {
-  font-size: 28px;
-  color: #c0c8d3;
-  line-height: 34px;
-  text-align: center;
-  padding: 10px 0 40px 0;
-}

src/shop/components/Sparead/spreadMoney.jsx

@@ -10,6 +10,7 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import NoData from '@/components/NoData'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import './spreadMoney.less'
+import { View } from '@tarojs/components';
 
 const getList = (id) => (params) => getAccount(id, params)
 
@@ -50,50 +51,45 @@ export default (props) => {
   }
 
   return (
-    <view>
-
-      <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
+    <view style={{ padding: '0 15px 0 15px', height: '100%', display: 'flex', flexDirection: 'column' }}>
+      <View style={{ flex: 'none' }}>
         <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
-
-        <view className='storexx'>
-
-          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
-          <view onClick={ShowMoldeOn} className='User-info-cutover'>
-            <image className='User-info-cutover-image' src={cutoverUser} />
-          </view>
-          <view className='tip'>（计算收入以核销为准）</view>
-          <view className='money'>
-            <view className='sleft'>
-              <view className='lword'>全年推广收入（税前）</view>
-              <view className='yearMoney'>
-                <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
-                <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
-              </view>
+      </View>
+      <view className='storexx' style={{ flex: 'none' }}>
+        <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
+        <view onClick={ShowMoldeOn} className='User-info-cutover'>
+          <image className='User-info-cutover-image' src={cutoverUser} />
+        </view>
+        <view className='tip'>（计算收入以核销为准）</view>
+        <view className='money'>
+          <view className='sleft'>
+            <view className='lword'>全年推广收入（税前）</view>
+            <view className='yearMoney'>
+              <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
+              <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
             </view>
-            <view className='line' />
-            <view className='sright'>
-              <view className='rword'>当月推广收入（税前）</view>
-              <view className='monthMoney'>
-                <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
-                <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
-              </view></view>
           </view>
+          <view className='line' />
+          <view className='sright'>
+            <view className='rword'>当月推广收入（税前）</view>
+            <view className='monthMoney'>
+              <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
+              <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+            </view></view>
         </view>
-
-        <view className='title'>推广收入记录</view>
-        <view style={{ height: '50vh' }}>
-
-          <List
-            style={{ height: '100%' }}
-            request={reqestAPI}
-            params={queryParams}
-            noData={<NoData />}
-            refresherEnabled
-            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
-          >
-          </List>
-        </view>
       </view>
-    </view >
+      <view className='title' style={{ flex: 'none' }}>推广收入记录</view>
+      <view style={{ flex: 1, overflow: 'hidden' }}>
+        <List
+          style={{ height: '100%' }}
+          request={reqestAPI}
+          params={queryParams}
+          noData={<NoData />}
+          refresherEnabled
+          render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
+        >
+        </List>
+      </view>
+    </view>
   )
 }

src/shop/components/Sparead/spreadMoney.less

@@ -157,5 +157,5 @@
   color: #c0c8d3;
   line-height: 34px;
   text-align: center;
-  padding: 40px 0 100px 0;
+  padding: 40px 0;
 }

src/shop/pages/spread/spreadIndex.config.js

@@ -2,7 +2,6 @@ export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
   disableScroll: true,
-  enablePullDownRefresh: true,
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-tabs": "../../../components/tabs/index",