feats

src/app.config.js

@@ -11,6 +11,8 @@ export default {
     'pages/dogList/index',
     'pages/setDogInfo/index',
     'pages/dogCardDetail/index',
+    'pages/payPage/index',
+    'pages/ApplicationList/index',
   ],
   window: {
     backgroundTextStyle: 'light',

src/pages/ApplicationList/index.config.js

@@ -0,0 +1,11 @@
+export default {
+  navigationBarTitleText: '申请状态列表',
+  disableScroll: true,
+  navigationBarBackgroundColor: "#FBD804",
+  navigationBarTextStyle: "black",
+  backgroundColor: "#FBD804",
+  usingComponents: {
+
+  }
+
+}

src/pages/ApplicationList/index.jsx

@@ -0,0 +1,229 @@
+import { ScrollView, View, Image, Button } from '@tarojs/components'
+import Taro from '@tarojs/taro';
+import { useState } from 'react';
+import { useEffect } from 'react';
+import { getOrder } from '../../services/dogAPI';
+import './style.less'
+
+export default (props) => {
+  const id = Taro.getCurrentInstance().router.params.id;
+  const [orderInfo, setOrderInfo] = useState()
+
+  useEffect(() => {
+    if (id) {
+      getOrder(id).then((e) => {
+        console.log('e', e);
+        setOrderInfo(e)
+      })
+    }
+
+  }, [id])
+
+  const goSetDogLicense = () => {
+    Taro.navigateTo({
+      url: '/pages/setDogLicense/index'
+    })
+  }
+
+
+  return (
+    <ScrollView scrollY style={{ height: '100vh' }}>
+      <View className='ApplicationListBox'>
+        <View className='ApplicationListBox-CardBox'>
+
+          <View className='ApplicationListBox-CardBox-headerTop'>
+            狗狗姓名
+            <View className='ApplicationListBox-CardBox-headerTop-right'>
+              <View>我的二狗子</View>
+
+              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
+            </View>
+          </View>
+          {/* 状态
+
+待付款 
+审核中 > 驳回 点击去修改  /退款
+驳回原因
+
+待发卡
+已完成 
+
+        狗名字
+        时间
+        方式
+        状态
+        单号+快递公司
+*/}
+
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>申请时间</View>
+            <View>2022-05-06 12:36</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>审领方式</View>
+            <View>邮寄</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>状态</View>
+            <View>已完成</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>邮政快递</View>
+            <View>3200222000</View>
+          </View>
+        </View>
+
+      </View>
+      <View className='ApplicationListBox'>
+        <View className='ApplicationListBox-CardBox'>
+
+          <View className='ApplicationListBox-CardBox-headerTop'>
+            狗狗姓名
+            <View className='ApplicationListBox-CardBox-headerTop-right'>
+              <View>我的二狗子</View>
+
+              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
+            </View>
+          </View>
+          {/* 状态
+
+待付款 
+审核中 > 驳回 点击去修改  /退款
+驳回原因
+
+待发卡
+已完成 
+
+        狗名字
+        时间
+        方式
+        状态
+        单号+快递公司
+*/}
+
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>申请时间</View>
+            <View>2022-05-06 12:36</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>审领方式</View>
+            <View>邮寄</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>状态</View>
+            <View>已完成</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>邮政快递</View>
+            <View>3200222000</View>
+          </View>
+        </View>
+
+      </View>
+      <View className='ApplicationListBox'>
+        <View className='ApplicationListBox-CardBox'>
+
+          <View className='ApplicationListBox-CardBox-headerTop'>
+            狗狗姓名
+            <View className='ApplicationListBox-CardBox-headerTop-right'>
+              <View>我的二狗子</View>
+
+              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
+            </View>
+          </View>
+          {/* 状态
+
+待付款 
+审核中 > 驳回 点击去修改  /退款
+驳回原因
+
+待发卡
+已完成 
+
+        狗名字
+        时间
+        方式
+        状态
+        单号+快递公司
+*/}
+
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>申请时间</View>
+            <View>2022-05-06 12:36</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>审领方式</View>
+            <View>邮寄</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>状态</View>
+            <View>已完成</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>邮政快递</View>
+            <View>3200222000</View>
+          </View>
+        </View>
+
+      </View>
+      <View className='ApplicationListBox'>
+        <View className='ApplicationListBox-CardBox'>
+
+          <View className='ApplicationListBox-CardBox-headerTop'>
+            狗狗姓名
+            <View className='ApplicationListBox-CardBox-headerTop-right'>
+              <View>我的二狗子</View>
+
+              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
+            </View>
+          </View>
+          {/* 状态
+
+待付款 
+审核中 > 驳回 点击去修改  /退款
+驳回原因
+
+待发卡
+已完成 
+
+        狗名字
+        时间
+        方式
+        状态
+        单号+快递公司
+*/}
+
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>申请时间</View>
+            <View>2022-05-06 12:36</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>审领方式</View>
+            <View>邮寄</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>状态</View>
+            <View>已完成</View>
+          </View>
+          <View className='ApplicationListBox-CardBox-content'>
+            <View>邮政快递</View>
+            <View>3200222000</View>
+          </View>
+          <View>
+
+            <View className='ApplicationListBox-CardBox-refuse'>
+              <View>驳回原因</View>
+              <View>因地区政策原因，疫苗报告失效，请重新填写申请信息。</View>
+            </View>
+            <View style={{ margin: '0.5em 0 0.2em 0' }}>
+              <Button style={{ width: '135px', height: '35px', fontSize: '14px', backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} onClick={goSetDogLicense}>重新填写</Button>
+            </View>
+          </View>
+
+        </View>
+
+      </View>
+
+    </ScrollView>
+  )
+}

src/pages/ApplicationList/style.less

@@ -0,0 +1,72 @@
+// #858B9C
+.ApplicationListBox {
+  background-color: white;
+  padding: 30px 30px;
+  margin-top: 3vw;
+  // font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande",
+  //   "Lucida Sans", Arial, sans-serif;
+
+  &-CardBox {
+    width: 90%;
+    background-color: #f9fafb;
+    border-radius: 20px;
+
+    padding: 20px 20px;
+    margin: 0 auto;
+    &-headerTop {
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid rgba(219, 219, 219, 0.603);
+      padding-bottom: 30px;
+      justify-content: space-between;
+      // font-weight: 600;
+      font-size: 30px;
+
+      &-right {
+        display: flex;
+        flex-flow: row-reverse;
+        align-items: center;
+        color: #41485d;
+        > Image {
+          width: 45px;
+          height: 45px;
+          border-radius: 50%;
+          margin: 0 10px;
+        }
+      }
+    }
+
+    &-content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 20px auto;
+      // font-weight: 600;
+      font-size: 30px;
+      > View:nth-child(1) {
+        color: #858b9c;
+      }
+      > View:nth-child(2) {
+        color: #41485d;
+      }
+    }
+    &-refuse {
+      border-top: 1px solid rgba(219, 219, 219, 0.603);
+      display: flex;
+      font-size: 30px;
+      text-align: left;
+      margin-top: 30px;
+      padding-top: 15px;
+
+      > View:nth-child(1) {
+        width: 180px;
+        color: #858b9c;
+      }
+      > View:nth-child(2) {
+        color: #41485d;
+        font-size: 27px;
+        text-align: right;
+      }
+    }
+  }
+}

src/pages/NoticeInfo/index.jsx

@@ -1,24 +1,32 @@
 import { View, RichText, ScrollView } from '@tarojs/components'
+import Taro 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 [content, setContent] = useState()
+  useEffect(() => {
+    if (id) {
+      getNoticeInfo(id).then((res) => {
+        setContent(res)
+      })
+    }
+
+  }, [id])
+
+
+  const htmlSnip = content?.content.replace(/<\/p>/g, '</p><p style="height: 1em">&nbsp;</p>')
 
-  let htmlSnip=`<p style="text-align: center;"><strong>通知2士大夫敢死队</strong></p>
-  <p style="text-indent: 2em;" data-spm-anchor-id="C73544894212.P59511941341.0.i0">在今天举行的上海市新冠肺炎疫情防控新闻发布会上，相关部门介绍，全市高三、高二年级学生从6月6日，初三年级学生从6月13日起返校复学；中小学其他各年级学生继续居家在线学习至学期结束，学校可在学期结束前安排一次学生返校活动。有关部门将按照规范完成校园消杀，确保校园安全干净，为学校配备专门的核酸采样和检测力量，实施校园网格化管理等措施。</p>
-  <p style="text-indent: 2em;">上海复工复产加快推动，上海四家整车厂、中国船舶集团旗下的三大船企都实现复工复产。上海还将根据疫情防控形势，在6月推动工业、服务业和外资外贸企业等应复尽复。</p>
-  <p style="text-indent: 2em; text-align: right;">2022年5月26日</p>
-  <p style="text-indent: 2em; text-align: right;">南京防疫办公室</p>`
-  
-  htmlSnip = htmlSnip.replace(/<\/p>/g, '</p><p style="height: 1em">&nbsp;</p>')
-  
   return (
-    <ScrollView scrollY style={{height:'100vh'}}>
-    <View className='noticeInfo'>
-      <View className='title'>我是标题</View>
-      <View className='date'>2022-6-9 13:33</View>
-      <RichText nodes={htmlSnip}></RichText>
-    </View>
+    <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.jsx

@@ -47,8 +47,8 @@ export default (props) => {
                 <View className='content'>{applicationInfoDate?.petName}</View>
               </View>
               <View className='cell'>
-                <View className='lable'>毛色</View>：
-                <View className='content'>米白</View>
+                <View className='lable'>性别</View>：
+                <View className='content'>{applicationInfoDate?.petSex}</View>
               </View>
             </View>
             <View className='cardRight'>

src/pages/index/index.jsx

@@ -10,7 +10,7 @@ import withBasic from '@/layouts/withBasic'
 import MenuItem from './components/MenuItem'
 
 import './style.less'
-import { getNoticeList } from '../../services/dogAPI'
+import { getBanner, getNoticeList } from '../../services/dogAPI'
 
 const pt16 = {
   paddingTop: '16px'
@@ -25,7 +25,7 @@ const IndexPage = (props) => {
   const [totalApplyNum, setTotalApplyNum] = useState(0)
   const [noticeList, setNoticeList] = useState([])
   const [bannerList, setBannerList] = useState([])
-  
+
   useEffect(() => {
     getNoticeList({ pageSize: 5 }).then((res) => {
       console.log('res', res);
@@ -66,7 +66,7 @@ const IndexPage = (props) => {
                 subtitle='Registration application'
                 to='/pages/setDogLicense/index?type=first'
               >
-                <View>您有<Text>{ totalApplyNum }</Text>条办证申请记录</View>
+                <View>您有<Text>{totalApplyNum}</Text>条办证申请记录</View>
               </MenuItem>
             </View>
             <View class='weui-flex__item' style={ml16}>
@@ -76,7 +76,7 @@ const IndexPage = (props) => {
                 icon='certificate'
                 to='/pages/dogLicenseList/index'
               >
-                <View>您有<Text>{ cards ? cards.length : 0 }</Text>条办证申请记录</View>
+                <View>您有<Text>{cards ? cards.length : 0}</Text>条办证申请记录</View>
               </MenuItem>
             </View>
           </View>

src/pages/main/index.jsx

@@ -24,7 +24,8 @@ export default (props) => {
   }
   const goDogApplyList = () => {
     Taro.navigateTo({
-      // url: '/pages/setUser/index'
+      url: '/pages/ApplicationList/index'
+
     })
   }
   const goSetUser = (personId) => {

src/pages/noticeList/index.jsx

@@ -1,110 +1,96 @@
-import { ScrollView, View } from '@tarojs/components'
+import { ScrollView, View, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro';
+import more from '@/assets/more.png'
+import noticeIcon from '@/assets/noticeIcon.png'
 import './style.less'
 
 export default (props) => {
-  const onClick = () => { 
-    Taro.navigateTo({url:'/pages/noticeInfo/index'})
+  const onClick = () => {
+    Taro.navigateTo({ url: '/pages/noticeInfo/index' })
   }
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
       <View className='noticeList'>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知江苏省南京市江宁区南京南站</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
-          <View>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
-          </View>
-          <View className='iconfont icon-action' />
-        </View>
-        <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知江苏省南京市江宁区南京南站</View>
-            <View className='notice-item-time'>2022.05.26</View>
-          </View>
-          <View className='iconfont icon-action' />
-        </View>
-        <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
-          <View>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知江苏省南京市江宁区南京南站</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
-          <View>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
+          <View className='notice-item-body'>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
-        </View>
+          <Image className='action' src={more} mode='aspectFit' />
+        </View>      
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
           <View className='notice-item-body'>
-            <View className='notice-item-title'>这是我第一个通知江苏省南京市江宁区南京南站</View>
-            <View className='notice-item-time'>2022.05.26</View>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
+          <Image className='action' src={more} mode='aspectFit' />
         </View>
         <View className='notice-item-row' onClick={onClick}>
-          <View className='iconfont icon-notice' />
-          <View>
-            <View className='notice-item-title'>这是我第一个通知</View>
-            <View className='notice-item-time'>2022.05.26</View>
+          <Image className='notice' src={noticeIcon} mode='aspectFit' />
+          <View className='notice-item-body'>
+            <View className='notice-item-title'>望都人注意！禁养犬只名录正式出炉！快看你家狗狗能养吗</View>
+            <View className='notice-item-time'>2022.05.26 16:21</View>
           </View>
-          <View className='iconfont icon-action' />
-        </View>
+          <Image className='action' src={more} mode='aspectFit' />
+        </View>      
       </View>
     </ScrollView>
   )

src/pages/noticeList/style.less

@@ -1,36 +1,6 @@
 .noticeList{
   padding: 32px;
-  @font-face {
-    font-family: 'iconfont';  /* Project id 2904679 */
-    src: url('//at.alicdn.com/t/font_2904679_ix6j11q9hir.woff2?t=1653563318275') format('woff2'),
-      url('//at.alicdn.com/t/font_2904679_ix6j11q9hir.woff?t=1653563318275') format('woff'),
-      url('//at.alicdn.com/t/font_2904679_ix6j11q9hir.ttf?t=1653563318275') format('truetype');  }
-  .iconfont {
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  .icon-notice{
-    font-size: 80px;
-    width: 80px;
-    flex:none;
-    margin-right: 16px;
-    color: rgb(31 , 136, 217);
-  }
-  .icon-notice:before {
-    content: "\e60d";
-  }
-  .icon-action{
-    font-size: 40px;
-    width: 40px;
-    margin-left: 16px;
-    flex:none;
-  }
-  .icon-action:before {
-    content: "\e60e";
-  }
+  
   .notice-item-row {
     align-items: center;
     background-color: white;
@@ -40,35 +10,33 @@
     & + .notice-item-row {
       margin-top: 32px;
     } 
-    .notice-item-title {
-      width: calc(100vw - 280px);
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      font-weight: bold;
-    } 
-    .notice-item-time{
-      font-size: 0.5em;
-      margin-top: 8px;
-    }
-    .icon-notice{
-      font-size: 80px;
-      width: 80px;
+    .notice{
+      width: 64px;
       flex:none;
+      height: 64px;
       margin-right: 16px;
-      color: rgb(31 , 136, 217);
-    }
-    .icon-notice:before {
-      content: "\e60d";
+      margin-top: -48px;
     }
-    .icon-action{
-      font-size: 40px;
-      width: 40px;
+    .action{
+      width: 64px;
+      height: 64px;
       margin-left: 16px;
       flex:none;
     }
-    .icon-action:before {
-      content: "\e60e";
-    }  
+    .notice-item-body{
+      flex: 1;
+      .notice-item-title {
+        width: calc(100vw - 290px);
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        font-weight: bold;
+      } 
+      .notice-item-time{
+        font-size: 0.5em;
+        margin-top: 24px;
+        color: #969696;
+      }
+    }    
   } 
 }

src/pages/payPage/index.config.js

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

src/pages/payPage/index.jsx

@@ -0,0 +1,78 @@
+import { ScrollView, View, Button } from '@tarojs/components'
+import Taro from '@tarojs/taro';
+import { useState } from 'react';
+import { useEffect } from 'react';
+import { getOrder } from '../../services/dogAPI';
+import './style.less'
+
+export default (props) => {
+  const id = Taro.getCurrentInstance().router.params.id;
+  const [orderInfo, setOrderInfo] = useState()
+
+  useEffect(() => {
+    if (id) {
+      getOrder(id).then((e) => {
+        console.log('e', e);
+        setOrderInfo(e)
+      })
+    }
+
+  }, [id])
+
+  const pay = (params) => {
+    Taro.hideLoading()
+    console.log("🚀 ~ file: index.jsx ~ line 92 ~ requestPayment ~ params", params)
+    Taro.requestPayment({
+      // ...params,
+      // package: params.packageValue,
+      success: () => {
+        Taro.showToast({
+          title: "支付成功",
+          icon: "success",
+          duration: 1000,
+        }).then(() => {
+          setTimeout(() => {
+            Taro.reLaunch({
+              url: `/pages/index/index?tab=2`
+            })
+          }, 400)
+        })
+      },
+      fail: (e) => {
+        Taro.showToast({
+          title: "支付失败",
+          icon: "none",
+          duration: 2000,
+        });
+        Taro.reLaunch({
+          // url: `/pages/MineUserAll/AllOrder/index?tabJump=1`
+        })
+      },
+    })
+  }
+
+
+
+  return (
+    <ScrollView scrollY style={{ height: '100vh' }}>
+      <View className='payPageBox'>
+        <View className='payPageBox-payItemBox'>
+          <View className='payPageBox-payItemBox-left'></View>
+          <View className='payPageBox-payItemBox-content'>订单号： <View>32121321321</View></View>
+        </View>
+        <View className='payPageBox-payItemBox'>
+          <View className='payPageBox-payItemBox-leftText'>工本费： <View>20</View>元</View>
+        </View>
+        <View className='payPageBox-payItemBox'>
+          <View className='payPageBox-payItemBox-leftText'>快递费： <View>3221321</View>元</View>
+        </View>
+        <View className='payPageBox-payItemBox'>
+          <View className='payPageBox-payItemBox-leftText'>总金额： <View style={{ color: 'red' }}>20</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>
+    </ScrollView>
+  )
+}

src/pages/payPage/style.less

@@ -0,0 +1,40 @@
+.payPageBox {
+  width: 86%;
+  background-color: #fff;
+  border-radius: 20px;
+  margin: 10vw auto;
+  padding-bottom: 50px;
+  padding-top: 30px;
+  &-payItemBox {
+    padding: 8px 30px;
+    display: flex;
+    align-items: center;
+    &-left {
+      width: 10px;
+      height: 35px;
+      background-color: #fbd804;
+      margin-right: 20px;
+      border-radius: 10px;
+    }
+    &-content {
+      width: 70vw;
+      font-size: 28px;
+      display: flex;
+      color: #858585;
+      > View {
+        display: flex;
+        align-items: center;
+      }
+    }
+    &-leftText {
+      display: flex;
+      margin-left: 25px;
+      font-weight: 400;
+
+      > View {
+        font-weight: 600;
+        margin-right: 15px;
+      }
+    }
+  }
+}

src/pages/setDogLicense/index.jsx

@@ -1,35 +1,27 @@
 import { View, Button, Text, RadioGroup, Picker, Image, Input, Radio, Label, ScrollView } from '@tarojs/components'
 import Taro, { useDidShow } from '@tarojs/taro';
-import { useState, useEffect } from 'react';
+import { useState } from 'react';
 import Form from '@/components/Form';
 import AuthProfile from '@/components/Authorize/AuthProfile';
 
-import { addDogList, addlication, getDogCardList, getDogInfo } from '../../services/dogAPI';
+import { addDogList, addlication, getDogInfo } from '../../services/dogAPI';
 import { useModel } from '../../store';
 
 import './style.less'
+import { uploadFile } from '../../utils/request';
 
 export default (props) => {
-  const { dogs, person, setDogs } = useModel('userData')
+  const { dogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
 
-  const [dogDate, setDogDate] = useState({ petBirthday: '请选择生日', petSex: [], petType: [] })
-  const [imgUrl, setImgUrl] = useState({ img1: null, immunization: null })
-  const [showDialog, setShowDialog] = useState(false)
+  const [dogDate, setDogDate] = useState({ immunizationDate: '请选择日期', petBirthday: '请选择生日', petSex: [], petType: [] })
+  const [imgUrl, setImgUrl] = useState({ img1: null, immunizationImg: null })
   const [mainDog, setMainDog] = useState([])
   useDidShow(() => {
-    if (dogs.length == 0 || person.phone == null) {
-      console.log('不可以', dogs);
-      setShowDialog(true)
-
-    } else {
-
-      addDogList().then((res) => {
-        setMainDog(res.records)
-      })
-    }
-
-  }, [dogs, person])
+    addDogList().then((res) => {
+      setMainDog(res.records)
+    })
+  }, [])
 
   const getMainDogChange = (value) => {
     console.log("🚀 ~ file: index.jsx ~ line 34 ~ getMainDogChange ~ value", value)
@@ -40,7 +32,7 @@ export default (props) => {
       const sex = [{ value: e?.sex, text: e?.sex == 1 ? '雄' : '雌' }];
       const petType = [{ value: 0, name: e?.petType }];
 
-      setDogDate({ petBirthday: e?.birthday, petSex: sex, petType: petType })
+      setDogDate({ ...dogDate, petBirthday: e?.birthday, petSex: sex, petType: petType })
       setImgUrl({ ...imgUrl, img1: e.image })
       console.log('test', e);
 
@@ -60,32 +52,15 @@ export default (props) => {
         setDogDate({ ...dogDate, petBirthday: value })
         break;
       case 'petType':
-        setDogDate({ ...dogDate, petType: value })//value 01  text 文字
+        setDogDate({ ...dogDate, petType: value })
+        break;
+      case 'immunizationDate':
+        setDogDate({ ...dogDate, immunizationDate: value })
         break;
       default:
         break;
     }
   }
-  const handleDialog = () => {
-    console.log('handleDialog',);
-    if (dogs.length == 0 && person.phone == null) {
-      //如果 人 狗都没有维护，那么先维护人的。回到这个页面后，必定只有狗没维护 跳 狗
-
-      Taro.navigateTo({
-        url: '/pages/setUser/index'
-      })
-      setShowDialog(false)
-
-    } else {
-      Taro.navigateTo({
-        url: '/pages/setDogInfo/index'
-      })
-      setShowDialog(false)
-
-    }
-  }
-
-  const buttons = [{ text: '确定' }]
 
   const modeList = [
     {
@@ -100,7 +75,6 @@ export default (props) => {
   ]
 
   const addImage = (e) => {
-    console.log("🚀 ~ file: index.jsx ~ line 94 ~ addImage ~ e", e)
 
     if (e == 'img1') {
       Taro.chooseImage({
@@ -110,7 +84,12 @@ export default (props) => {
         success: function (res) {
           // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
           var tempFilePaths = res.tempFilePaths
-          setImgUrl({ ...imgUrl, img1: tempFilePaths[0] })
+          uploadFile(tempFilePaths[0]).then((res2) => {
+            console.log("🚀 ~ file: index.jsx ~ line 61 ~ uploadFile ~ res2", res2)
+            setImgUrl({ ...imgUrl, img1: res2 })
+
+
+          })
         },
         fail () {
           Taro.showToast({
@@ -129,7 +108,12 @@ export default (props) => {
         success: function (res) {
           // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
           var tempFilePaths = res.tempFilePaths
-          setImgUrl({ ...imgUrl, immunization: tempFilePaths[0] })
+          uploadFile(tempFilePaths[0]).then((res2) => {
+            console.log("🚀 ~ file: index.jsx ~ line 61 ~ uploadFile ~ res2", res2)
+            setImgUrl({ ...imgUrl, immunizationImg: res2 })
+
+
+          })
         },
         fail () {
           Taro.showToast({
@@ -141,8 +125,6 @@ export default (props) => {
       })
     }
 
-    console.log("🚀 ~ file: index.jsx ~ line 61 ~ addImage ~ tempFilePaths", imgUrl)
-
 
   }
   // ...dogDate,
@@ -154,11 +136,9 @@ export default (props) => {
         icon: 'none',
         duration: 1000
       })
-      setTimeout(() => {
-        Taro.navigateBack({
-          delta: 1
-        })
-      }, 600);
+      Taro.navigateTo({
+        url: `/pages/payPage/index?id=${res.applyId}`
+      })
     })
   }
 
@@ -170,11 +150,14 @@ export default (props) => {
       <View class='page' >
         <Form onSubmit={formSubmit} >
           <mp-form  >
-            <mp-cells title=''>
+            <mp-cells >
+              <mp-cell title='犬主姓名' extClass=''>
+                <View >{person?.nickName}</View>
+              </mp-cell>
               <mp-cell title='狗狗名称' extClass=''>
                 {/* <Input name='petName' placeholder='请输入狗狗名称' /> */}
                 <s-picker name='petName' rangeKey='name' rangeValue='value' range={mainDog} value={formData?.name} onChange={getMainDogChange} />
-                <View onClick={onDateChange}>asdasdsad</View>
+                <View onClick={onDateChange}>log打印</View>
                 {/* <Picker name='petSex' mode='selector' range={selector} onChange={(e) => { onDateChange('petSex', e.detail.value) }}>
                   <View className='picker'>
                     {dogDate.petSex}
@@ -182,22 +165,10 @@ export default (props) => {
                 </Picker> */}
               </mp-cell>
               <mp-cell title='狗狗性别' extClass=''>
-                <s-picker name='petSex' rangeKey='text' rangeValue='value' range={dogDate.petSex} value={dogDate?.petSex[0]?.text} />
-
-                {/* <Picker name='petSex' mode='selector' range={dogSex} onChange={(e) => { onDateChange('petSex', e.detail.value) }}>
-                  <View className='picker'>
-                    {dogDate.petSex}
-                  </View>
-                </Picker> */}
+                <s-picker name='petSex' rangeKey='text' rangeValue='value' range={dogDate.petSex} value={formData?.sex} />
               </mp-cell>
               <mp-cell title='犬种' extClass=''>
-                <s-picker name='petType' rangeKey='name' rangeValue='value' range={dogDate.petType} value={dogDate?.petType[0]?.name} />
-
-                {/* <Picker name='petType' mode='selector' range={dogType} rangeKey='text' onChange={(e) => { onDateChange('petType', e.detail.value) }}>
-                  <View className='picker'>
-                    {dogDate.petType}
-                  </View>
-                </Picker> */}
+                <s-picker name='petType' rangeKey='name' rangeValue='name' range={dogDate.petType} value={formData?.petType} />
               </mp-cell>
               <mp-cell title='生日' extClass=''>
                 <Picker name='petBirthday' mode='date' onChange={(e) => { onDateChange('petBirthday', e.detail.value) }}>
@@ -220,16 +191,26 @@ export default (props) => {
                 }
 
               </mp-cell>
+              <mp-cell title='最近免疫日期' extClass=''>
+                <Picker name='immunizationDate' mode='date' onChange={(e) => { onDateChange('immunizationDate', e.detail.value) }}>
+                  <View className='picker' style={!formData ? { "color": '#858585' } : {}}>
+                    {dogDate.immunizationDate}
+                  </View>
+                </Picker>
+              </mp-cell>
+              <mp-cell title='免疫证号' extClass=''>
+                <Input name='immunizationCode' placeholder='请输入免疫证号' />
+              </mp-cell>
               <mp-cell title='免疫证明' extClass=''>
                 {
-                  !imgUrl.immunization ?
-                    <View className='addImage' onClick={() => addImage('immunization')} >
+                  !imgUrl.immunizationImg ?
+                    <View className='addImage' onClick={() => addImage('immunizationImg')} >
                       <Text>+</Text>
                     </View>
                     :
-                    <Image className='dogImg1' name='immunization' src={imgUrl.immunization} onClick={() => addImage('immunization')} />
+                    <Image className='dogImg1' name='immunizationImg' src={imgUrl.immunizationImg} onClick={() => addImage('immunizationImg')} />
                 }
-                {/* <Input name='immunization' placeholder='请输入身份证号' type='idcard' /> */}
+                {/* <Input name='immunizationImg' placeholder='请输入身份证号' type='idcard' /> */}
               </mp-cell>
               <mp-cell title='详细地址' extClass=''>
                 <Input name='address' placeholder='请输入详细地址' />

src/pages/setUser/index.jsx

@@ -1,4 +1,4 @@
-import { View, Button, Text, Image, Slot, Input, ScrollView } from '@tarojs/components'
+import { View, Button, Slot, Input, ScrollView } from '@tarojs/components'
 import Taro from '@tarojs/taro';
 import { useEffect, useState } from 'react';
 import { setPersons } from '@/services/dogAPI';
@@ -20,7 +20,7 @@ const rules = {
 export default (props) => {
   const [showTopTips, setShowTopTips] = useState(false)
   const [errorMsg, setErrorMsg] = useState()
-  const { setPerson, person, setDogs } = useModel('userData')
+  const { setPerson, person } = useModel('userData')
   // const [imgUrl, setImgUrl] = useState()
   const [userInfo, setUserInfo] = useState({ cardImg1: null, sex: '请选择性别' })
   useEffect(() => {
@@ -71,34 +71,6 @@ export default (props) => {
     uploadFile(file.path).then(next)
   }
 
-  const handleSetUser = (type, value) => {
-    // console.log(e)
-    if (type == 'img') {
-      Taro.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有，在H5浏览器端支持使用 `user` 和 `environment`分别指定为前后摄像头
-        success: function (res) {
-          console.log('-------chooseImage----->', res)
-          // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
-          var tempFilePaths = res.tempFilePaths
-          uploadFile(tempFilePaths[0]).then((res2) => {
-            console.log("🚀 ~ file: index.jsx ~ line 61 ~ uploadFile ~ res2", res2)
-            setUserInfo({ ...userInfo, cardImg1: res2 })
-
-          })
-        },
-        fail () {
-          Taro.showToast({
-            title: '上传失败请重试',
-            icon: 'error',
-            duration: 1000
-          })
-        }
-      })
-    }
-  }
-
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
       <mp-toptips msg={errorMsg} type='error' show={showTopTips} onHide={() => setShowTopTips(false)}></mp-toptips>
@@ -125,14 +97,6 @@ export default (props) => {
               <mp-cell>
                 <Slot name='title'><FieldLabel required>身份证图片</FieldLabel></Slot>
                 <uploader name='cardImg1' value={person?.cardImg1} onFile={handleFile} />
-                {/* {
-                  !userInfo.cardImg1 ?
-                    <View className='addImage' onClick={(e) => handleSetUser('img', e.detail.value)} >
-                      <Text>+</Text>
-                    </View>
-                    :
-                    <Image className='userImg1' name='cardImg1' src={userInfo.cardImg1} onClick={(e) => handleSetUser('img', e.detail.value)} />
-                } */}
               </mp-cell>
             </mp-cells>
           </mp-form>
@@ -144,7 +108,3 @@ export default (props) => {
     </ScrollView >
   )
 }
-
-
-
-

src/services/dogAPI.js

@@ -117,8 +117,32 @@ export const getDogType = (id, data) => request(`/setting/dog_type`, { data, met
 export const getNoticeList = (id, data) => request(`/notice`, { data, method: 'GET' })
 
 /**
-* Banner 列表
+* 消息详情
 * @param {*} data
 * @returns
 */
-export const getBannerList = () => request(`/banner`)
+export const getNoticeInfo = (id, data) => request(`/notice/${id}`, { data, method: 'GET' })
+
+
+
+
+
+/**
+* banner列表
+* @param {*} data
+* @returns
+*/
+export const getBannerList = (id, data) => request(`/banner`, { data, method: 'GET' })
+
+
+
+
+/**
+* 生成订单
+* @param {*} data
+* @returns
+*/
+export const getOrder = (id, data) => request(`/order?applyId=${id}`, { data, method: 'POST' })
+
+
+