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

config/dev.js

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

project.tt.json

@@ -1,9 +0,0 @@
-{
-  "miniprogramRoot": "./",
-  "projectname": "miniapp",
-  "appid": "touristappid",
-  "setting": {
-    "es6": false,
-    "minified": false
-  }
-}

src/components/Spin/SpinBox.jsx

@@ -7,7 +7,7 @@ import './style.less'
 const Loading = (props) => {
   const { loading, size = '64rpx', ...leftProps } = props
 
-  const cls = ['loading-box', loading? 'active' : undefined].filter(Boolean).join(' ')
+  const cls = ['loading-box', loading ? 'active' : undefined].filter(Boolean).join(' ')
 
   return (
     <View className={cls}>

src/pages/index/tabs/Recommend.jsx

@@ -57,6 +57,7 @@ export default (props) => {
   }
 
 
+
   useEffect(() => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {

src/shop/components/Sparead/spreadMoney.jsx

@@ -53,48 +53,47 @@ export default (props) => {
 
   return (
     <view>
-      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
 
       <view style={{ padding: '0 15px 0 15px', height: '100%' }}>
-        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
+        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
 
-          <view className='storexx'>
+        <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 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>
+
+
+        <view className='title'>推广收入记录</view>
 
-          <view className='title'>推广收入记录</view>
-          <List
-            style={{ height: 'calc(100% - 145px)' }}
-            request={reqestAPI}
-            params={queryParams}
-            noData={<NoData />}
-            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
-          >
-          </List>
-        </scroll-view>
+        <List
+          style={{ height: 'calc(100% - 145px)' }}
+          request={reqestAPI}
+          params={queryParams}
+          noData={<NoData />}
+          render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
+        >
+        </List>
 
       </view>