Change setting

src/components/Button/index.jsx

@@ -0,0 +1,17 @@
+import Taro from '@tarojs/taro';
+import { View, SwiperItem, Button } from '@tarojs/components';
+import './style.less'
+
+export default (props) => {
+  const { disabled, marginTop, marginButtom, title, onClick, width } = props;
+
+  return (
+    <View slot='button' style={{ margin: `${marginTop || '4'}em 0 ${marginButtom || '2'}em 0` }}>
+      <Button onClick={onClick || ''} disabled={disabled || false} style={{ backgroundColor: !disabled ? '#fbd804' : '#858585', width: `${width || ''}vw`, borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' formType='submit'>{title || '确定'}</Button>
+    </View>
+  )
+}
+
+
+
+

src/pages/ApplicationList/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '申请列表',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/ApplicationList/index.jsx

@@ -6,7 +6,6 @@ import AppliCard from './components/AppliCard';
 import './style.less'
 
 export default (props) => {
-  const id = Taro.getCurrentInstance().router.params.id;
   const [applionList, setApplionList] = useState([])
   const [applionLoading, setApplionLoading] = useState(false)
 
@@ -47,7 +46,7 @@ export default (props) => {
 
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       {
         applionLoading ? <mp-loading extClass="page-loading-circle" type="circle" show={applionLoading} /> :
 
@@ -70,6 +69,6 @@ export default (props) => {
         申请驳回，费用将原路退回支付账户！
       </View>
 
-    </ScrollView>
+    </>
   )
 }

src/pages/LicenseInfo/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '证件详情',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/NoticeInfo/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '公告详情',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/NoticeInfo/index.jsx

@@ -1,12 +1,13 @@
 import { View, RichText, ScrollView } from '@tarojs/components'
-import Taro from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import { useEffect, useState } from 'react'
 import { getNoticeInfo } from '../../services/dogAPI'
 
 import './style.less'
 
 export default (props) => {
-  const id = Taro.getCurrentInstance().router.params.id;
+  const value = useRouter();
+  const { id } = value.params
   const [content, setContent] = useState()
   useEffect(() => {
     if (id) {
@@ -21,13 +22,13 @@ export default (props) => {
   const htmlSnip = content?.content.replace(/<\/p>/g, '</p><p style="height: 1em">&nbsp;</p>')
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       <View className='noticeInfo'>
         <View className='title'>{content?.title}</View>
         <View className='date'>{content?.createDate}</View>
         <RichText nodes={htmlSnip}></RichText>
       </View>
-    </ScrollView>
+    </>
   )
 }
 

src/pages/dogCardDetail/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '犬证详情',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/dogCardDetail/index.jsx

@@ -30,7 +30,7 @@ const CardDetailPage = (props) => {
 
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       <View className='dogCardDetail'>
         <View className='card'>
           <View className='title'>电&nbsp;&nbsp;&nbsp;子&nbsp;&nbsp;&nbsp;版&nbsp;&nbsp;&nbsp;犬&nbsp;&nbsp;&nbsp;证</View>
@@ -89,7 +89,7 @@ const CardDetailPage = (props) => {
           </View>
         </View >
       </View >
-    </ScrollView >
+    </>
   )
 }
 

src/pages/dogLicenseList/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '证件列表',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/dogLicenseList/index.jsx

@@ -45,7 +45,7 @@ export default (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       {
         dogCardList.map((item, index) => {
           return (
@@ -53,7 +53,7 @@ export default (props) => {
           )
         })
       }
-    </ScrollView>
+    </>
   )
 }
 

src/pages/dogList/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '我的狗狗',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/dogList/index.jsx

@@ -1,7 +1,8 @@
-import { View, ScrollView, Image, Button } from '@tarojs/components'
+import { View, ScrollView, Image } from '@tarojs/components'
 import Taro, { useDidShow } from '@tarojs/taro';
 import ViewIcon from '../../components/ViewIcon';
 import { useEffect, useState } from 'react';
+import Button from '../../components/Button';
 import './style.less'
 import { addDogList } from '../../services/dogAPI';
 import { useModel } from '../../store';
@@ -51,7 +52,7 @@ export default (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       {
         dogs.map((item, index) => {
           return (
@@ -59,11 +60,8 @@ export default (props) => {
           )
         })
       }
-
-      <View slot='button' style={{ margin: '4em 0 2em 0' }} onClick={() => goLicenseInfo()}>
-        <Button style={{ width: '50vw', backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} formType='submit'>+ 添加狗狗</Button>
-      </View>
-    </ScrollView>
+      <Button title='+ 添加狗狗' width='50' onClick={() => goLicenseInfo()} />
+    </>
   )
 }
 

src/pages/index/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '码上办证',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/index/index.jsx

@@ -49,10 +49,7 @@ const IndexPage = (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{
-      height: '100vh'
-    }}
-    >
+    <>
       <View className='index-page-box'>
         <View style={{ padding: '16px', boxSizing: 'border-box' }}>
           <Banner list={bannerList} />
@@ -119,7 +116,7 @@ const IndexPage = (props) => {
 
         </View>
       </View>
-    </ScrollView>
+    </>
   )
 }
 

src/pages/main/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '个人中心',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/noticeList/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: "公告列表",
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/noticeList/index.jsx

@@ -9,7 +9,7 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/noticeInfo/index' })
   }
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       <View className='noticeList'>
         <View className='notice-item-row' onClick={onClick}>
           <Image className='notice' src={noticeIcon} mode='aspectFit' />
@@ -74,7 +74,7 @@ export default (props) => {
             <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
           <Image className='action' src={more} mode='aspectFit' />
-        </View>      
+        </View>
         <View className='notice-item-row' onClick={onClick}>
           <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
@@ -90,8 +90,8 @@ export default (props) => {
             <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
           <Image className='action' src={more} mode='aspectFit' />
-        </View>      
+        </View>
       </View>
-    </ScrollView>
+    </>
   )
 }

src/pages/payPage/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '订单确认',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/payPage/index.jsx

@@ -1,11 +1,13 @@
-import { ScrollView, View, Button } from '@tarojs/components'
-import Taro, { reLaunch } from '@tarojs/taro';
+import { ScrollView, View } from '@tarojs/components'
+import Taro, { reLaunch, useRouter } from '@tarojs/taro';
 import { useState, useEffect } from 'react';
 import { getOrder } from '@/services/dogAPI';
+import Button from '../../components/Button';
 import './style.less'
 
 export default (props) => {
-  const id = Taro.getCurrentInstance().router.params.id;
+  const value = useRouter();
+  const { id } = value.params
   const [orderInfo, setOrderInfo] = useState()
   const [payLoading, setPayLoading] = useState(false)
   useEffect(() => {
@@ -53,7 +55,7 @@ export default (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       {
         payLoading ? <mp-loading extClass="page-loading-circle" type="circle" show={payLoading} /> :
           <>
@@ -75,12 +77,10 @@ export default (props) => {
                 <View className='payPageBox-payItemBox-leftText'>总金额： <View style={{ color: 'red' }}>{orderInfo?.order?.charges / 100}</View>元</View>
               </View>
             </View>
-            <View slot='button' style={{ margin: '4em 0 2em 0' }}>
-              <Button style={{ backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} onClick={pay}>支付</Button>
-            </View>
+            <Button title='支付' onClick={pay} />
           </>
       }
 
-    </ScrollView>
+    </>
   )
 }

src/pages/setDogInfo/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '狗狗信息',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/setDogInfo/index.jsx

@@ -1,4 +1,4 @@
-import { View, Button, Picker, Input, ScrollView } from '@tarojs/components'
+import { View, Picker, Input, ScrollView } from '@tarojs/components'
 import Taro, { useRouter } from '@tarojs/taro';
 import { useState, useEffect } from 'react';
 import Form from '@/components/Form';
@@ -6,6 +6,7 @@ import FormItem from '@/components/Form/FormItem'
 import { addDogInfo, getDogInfo, getDogType, setDogInfo } from '@/services/dogAPI';
 import { useModel } from '@/store'
 import { handleFile } from '@/utils/request';
+import Button from '../../components/Button';
 import './style.less'
 
 const rules = {
@@ -94,7 +95,7 @@ export default (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       <View class='page' >
         <Form rules={rules} onSubmit={formSubmit}>
           <FormItem title='狗狗名称' required>
@@ -122,11 +123,9 @@ export default (props) => {
           <FormItem title='狗狗照片' required>
             <uploader name='image' value={formData?.image} onFile={handleFile} />
           </FormItem>
-          <View slot='button' style={{ margin: '4em 0 2em 0' }}>
-            <Button style={{ backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} formType='submit'>确定</Button>
-          </View>
+          <Button title='添加' />
         </Form>
       </View>
-    </ScrollView >
+    </>
   )
 }

src/pages/setDogLicense/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '办证申请',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/setDogLicense/index.jsx

@@ -1,4 +1,4 @@
-import { View, Button, Text, RadioGroup, Picker, Image, Input, Radio, Label, ScrollView, Slot } from '@tarojs/components'
+import { View, Text, RadioGroup, Picker, Image, Input, Radio, Label, ScrollView, Slot } from '@tarojs/components'
 import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import { useEffect, useState } from 'react';
 import Form from '@/components/Form';
@@ -7,6 +7,7 @@ import AuthProfile from '@/components/Authorize/AuthProfile';
 import { addDogList, addlication, getDogInfo } from '@/services/dogAPI';
 import { handleFile } from '@/utils/request';
 import { useModel } from '@/store';
+import Button from '../../components/Button';
 
 import './style.less'
 import { getCardLicenseInfo } from '../../services/dogAPI';
@@ -14,7 +15,8 @@ import { getCardLicenseInfo } from '../../services/dogAPI';
 export default (props) => {
   const { dogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
-  const routerPetId = Taro.getCurrentInstance().router.params.petId;
+  const value = useRouter();
+  const { petId } = value.params
 
   const [dogDate, setDogDate] = useState({ immunizationDate: null, petBirthday: null, petSex: [], petType: [] })
   const [mainDog, setMainDog] = useState([])
@@ -195,7 +197,7 @@ export default (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }} >
+    <>
       <AuthProfile />
       <View class='page' >
         <Form onSubmit={formSubmit} rules={rules} >
@@ -294,12 +296,10 @@ export default (props) => {
 
             </mp-cells>
           </mp-form>
-          <View slot='button' style={{ margin: '4em 0 2em 0' }}>
-            <Button disabled={dogStatus} style={{ backgroundColor: !dogStatus ? '#fbd804' : '#858585', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} formType='submit'>确定</Button>
-          </View>
+          <Button disabled={dogStatus} title='确定' />
         </Form>
       </View>
-    </ScrollView >
+    </>
   )
 }
 

src/pages/setUser/index.config.js

@@ -1,6 +1,6 @@
 export default {
   navigationBarTitleText: '犬主信息',
-  disableScroll: true,
+  disableScroll: false,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",

src/pages/setUser/index.jsx

@@ -60,7 +60,7 @@ export default (props) => {
   }
 
   return (
-    <ScrollView scrollY style={{ height: '100vh' }}>
+    <>
       <View class='page' >
         <Form rules={rules} onSubmit={formSubmit}>
           <FormItem title='姓名' required>
@@ -83,6 +83,6 @@ export default (props) => {
           </View>
         </Form>
       </View>
-    </ScrollView >
+    </>
   )
 }