Merge branch 'master' of http://git.ycjcjy.com/civilized_city/miniapp

src/app.config.js

@@ -15,13 +15,16 @@ export default defineAppConfig({
     'pages/message/list/index',
     'pages/index3/index',
     'pages/index4/index',
-    'pages/index5/index',
     'pages/reporting/index',
     'pages/reporting/detail/index',
     'pages/reset-password/index',
     'pages/check/list/index',
     'pages/check/loc/list/index',
     'pages/check/edit/index',
+    'pages/notice/index',
+    'pages/notice/edit/index',
+    'pages/my/index',
+    'pages/my/edit/index',
   ],
   window: {
     // backgroundColor: '#1A7565',

src/components/ScrollPage/style.module.less

@@ -1,11 +1,10 @@
 .box {
   display: flex;
+  height: calc(100%-100px);
   .page {
     flex: 1;
-    height: 100%;
   }
   .button {
-    flex: none;
     height: 100px;
   }
 }

src/layouts/TabBar.jsx

@@ -33,7 +33,7 @@ const notice = {
   label: '公告',
   icon: noticeIcon,
   activeIcon: noticeActiveIcon,
-  page: '/pages/index3/index'
+  page: '/pages/notice/index'
 }
 const issue = {
   name: 'issue',
@@ -54,7 +54,7 @@ const mine = {
   label: '我的',
   icon: mineIcon,
   activeIcon: mineActiveIcon,
-  page: '/pages/index5/index'
+  page: '/pages/my/index'
 }
 
 export default (props) => {
@@ -62,7 +62,7 @@ export default (props) => {
 
   const tabItems = React.useMemo(() => {
     if (!user) return [];
-    
+
     if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1 // 督察员
       || user.dutyList.indexOf(ROLE_MANAGER) > -1 // 管理员
     ) {

src/layouts/index.jsx

@@ -13,7 +13,7 @@ export default (props) => {
 
   const { person, user } = useModel('user');
 
-  const conatinerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
+  const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
 
   React.useEffect(() => {
     if (person && !user) {
@@ -30,7 +30,7 @@ export default (props) => {
     <View className={laySty['page-wrapper']}>
       <Notify id="vanNotify" />
       <NavLoading loading={loading} />
-      <View className={conatinerClass} style={style}>
+      <View className={containerClass} style={style}>
         {
           !person && (
             <View className={laySty.loading}>

src/pages/check/edit/index.jsx

@@ -63,17 +63,17 @@ export default (props) => {
   const onAnswerItemChange = (answerItem, quInfo) => {
     if (!answerItem) return;
 
-    const an = {...(answer || {})}
+    const an = { ...(answer || {}) }
     const answerItemList = an.answerItemList || []
 
     if ((answerItem.answerCode || answerItem.answer) &&
       answerItem.attachList?.length) {
-        // 说明这一题已经回答完毕
-        quInfo.finished = true
-      } else {
-        quInfo.finished = false
-      }
-    
+      // 说明这一题已经回答完毕
+      quInfo.finished = true
+    } else {
+      quInfo.finished = false
+    }
+
     // 更新问题列表中是否作答的标志位
     setQuList(quList.map(x => x.quId == quInfo.quId ? quInfo : x));
 
@@ -118,13 +118,13 @@ export default (props) => {
       setLoading(false);
       const t = setTimeout(() => {
         clearTimeout(t);
-        Taro.navigateBack({delta: 1});
-      }, 1000);      
+        Taro.navigateBack({ delta: 1 });
+      }, 1000);
     }).catch(() => {
       setLoading(false);
     });
   }
-  
+
   // 查询当前测评点位主记录
   React.useEffect(() => {
     if (id) {
@@ -137,7 +137,7 @@ export default (props) => {
       });
     }
   }, [id]);
-  
+
   // 查询当前测评调查问卷主记录
   React.useEffect(() => {
     if (checkId && typ == 'survey') {
@@ -156,7 +156,7 @@ export default (props) => {
     if (checkItemInfo?.itemId) {
       const { itemId } = checkItemInfo;
       setLoading(true);
-      
+
       preCheck(itemId, { noSuccesTip: true }).then((checkRes) => {
         if (checkRes.errorCode < 0) {
           setLoading(false);
@@ -164,11 +164,11 @@ export default (props) => {
             message: checkRes.message,
             type: 'warning',
           })
-  
-          Taro.navigateBack({delta: 1})
+
+          Taro.navigateBack({ delta: 1 })
           return;
         }
-  
+
         if (checkRes.errorCode > 0) {
           setReadonly(true);
           // Notify.show({
@@ -176,12 +176,12 @@ export default (props) => {
           //   type: 'warning',
           // })
         }
-        
+
         // 查询我的答案
         // getTaCheckItemAnswer(itemId).then(setAnswer);
     
         // 查询当前测评主记录的所有问题
-        getTaCheckItemQu({pageSize: 200, itemId}).then(res => {
+        getTaCheckItemQu({ pageSize: 200, itemId }).then(res => {
           setLoading(false);
           setQuList(res.records || []);
         }).catch(() => {
@@ -193,7 +193,7 @@ export default (props) => {
       });
     }
   }, [checkItemInfo]);
-  
+
   return (
     <Page loading={loading} roles={[ROLE_INSPECTOR]}>
       <VABC
@@ -207,42 +207,42 @@ export default (props) => {
           />
         )}
       >
-        <ScrollView scrollY style={{height: '100%'}}>
-        {
-          index == -1 && (
-            <LocForm
-              checkType={typ}
-              readonly={readonly}
-              checkItemInfo={checkItemInfo}
-              answer={answer}
-              onChange={setAnswer}
-              onLoadingChange={setLoading}
-            />
-          )
-        }
-        {
-          quList.map((x, inx) => {
-            const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
-
-            return (
-              index == inx && (
-                <Question
-                  key={x.quId}
-                  cursor={inx}
-                  readonly={readonly}
-                  quInfo={x}
-                  answerItem={answerItem}
-                  total={quList?.length}
-                  onChange={e => onAnswerItemChange(e, x)}
-                  onPrev={() => onIndexChange(null, -1)}
-                  onNext={() => onIndexChange(null, 1)}
-                  onLoadingChange={setLoading}
-                />
-              )
+        <ScrollView scrollY style={{ height: '100%' }}>
+          {
+            index == -1 && (
+              <LocForm
+                checkType={typ}
+                readonly={readonly}
+                checkItemInfo={checkItemInfo}
+                answer={answer}
+                onChange={setAnswer}
+                onLoadingChange={setLoading}
+              />
             )
-          })
-        }
-          
+          }
+          {
+            quList.map((x, inx) => {
+              const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
+
+              return (
+                index == inx && (
+                  <Question
+                    key={x.quId}
+                    cursor={inx}
+                    readonly={readonly}
+                    quInfo={x}
+                    answerItem={answerItem}
+                    total={quList?.length}
+                    onChange={e => onAnswerItemChange(e, x)}
+                    onPrev={() => onIndexChange(null, -1)}
+                    onNext={() => onIndexChange(null, 1)}
+                    onLoadingChange={setLoading}
+                  />
+                )
+              )
+            })
+          }
+
         </ScrollView>
       </VABC>
     </Page>

src/pages/index5/index.jsx

@@ -1,24 +0,0 @@
-import { Component } from 'react'
-import { View, Text } from '@tarojs/components'
-import './index.less'
-
-export default class Index extends Component {
-
-  componentWillMount () { }
-
-  componentDidMount () { }
-
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
-
-  render () {
-    return (
-      <View className='index'>
-        <Text>Hello world!</Text>
-      </View>
-    )
-  }
-}

src/pages/my/components/Notice.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { View, Image } from '@tarojs/components';
+import smallbell from '@/assets/icons/smallbell.png';
+import Taro from '@tarojs/taro';
+import style from './notice.module.less';
+
+export default (props) => {
+
+  const onClick = () => {
+    Taro.navigateTo({
+      url: `/pages/my/edit/index`
+    })
+  }
+
+  return (
+    <View className="wrapper-middle-box" onClick={onClick}>
+      <Image className="wrapper-middle-img" src={smallbell} />
+      <View className="wrapper-middle-text3">消息通知</View>
+    </View>
+  )
+}

src/pages/my/components/notice.module.less

@@ -0,0 +1,15 @@
+.wrapper-middle-box {
+  box-shadow: 0px 18px 22px 0px rgba(0, 0, 0, 0.06);
+  border-radius: 8px;
+  display: grid;
+  place-items: center;
+  margin-bottom: 20px;
+}
+.wrapper-middle-img {
+  width: 120px;
+  height: 120px;
+}
+.wrapper-middle-text3 {
+  font-size: 32px;
+  margin-bottom: 34px;
+}

src/pages/my/edit/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '消息通知'
+})

src/pages/my/edit/index.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import Page from '@/layouts/index';
+import { Cell, CellGroup } from '@antmjs/vantui'
+import { View, Image } from '@tarojs/components';
+import bell from '@/assets/icons/bell.png';
+import './index.less';
+
+export default (props) => {
+  return (
+    <Page>
+      <View className="news-card-wrapper">
+        <CellGroup>
+          <Cell
+            title="您的xxxx项目已完成,点击查看详情！"
+            isLink size="large"
+            renderIcon={(<>
+              <Image className="img-wrapper" src={bell} />
+            </>
+            )}
+          />
+        </CellGroup>
+      </View>
+    </Page>
+  )
+}

src/pages/my/edit/index.less

@@ -0,0 +1,11 @@
+.news-card-wrapper {
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+  box-shadow: 0px 9px 11px 0px rgba(0, 0, 0, 0.06);
+  border-radius: 8px;
+  .img-wrapper {
+    width: 32px;
+    height: 42px;
+    margin-right: 2vw;
+  }
+}

src/pages/my/index.jsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import Page from '@/layouts/index';
+import { View, Image } from '@tarojs/components';
+import headportrait from '@/assets/icons/headportrait.png';
+import peopleicon from '@/assets/icons/peopleicon.png';
+import { Card } from '@antmjs/vantui';
+import Notice from './components/Notice';
+import './index.less';
+
+export default (props) => {
+  return (
+    <Page tabBar="mine">
+      <View className="wrapper-header">
+        <View className="wrapper-header-circle">
+          <View className="wrapper-header-circle2" />
+        </View>
+        <View className="wrapper-header-box">
+          <Image className="wrapper-header-img" src={headportrait} />
+        </View>
+        <View className="wrapper-header-box2">
+          <View className="wrapper-header-text">昵称:Tomorrow</View>
+        </View>
+      </View>
+
+      <View className="wrapper-middle">
+        <View className="wrapper-middle-box">
+          <Image className="wrapper-middle-img" src={peopleicon} />
+          <View className="wrapper-middle-text">所在部门</View>
+          <View className="wrapper-middle-text2">县文明办</View>
+        </View>
+        <Notice />
+      </View>
+    </Page>
+  )
+}

src/pages/my/index.less

@@ -0,0 +1,77 @@
+.wrapper-header {
+  background: var(--main-bg-color);
+  border-radius: 0px 0px 120px 120px;
+  height: 359px;
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  .wrapper-header-circle {
+    position: relative;
+    opacity: 0.02;
+    border-radius: 50%;
+    background: #ffffff;
+    width: 298px;
+    height: 298px;
+    .wrapper-header-circle2 {
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      margin: auto;
+      width: 198px;
+      height: 198px;
+      background: #ffffff;
+      border-radius: 50%;
+    }
+  }
+  .wrapper-header-box {
+    position: relative;
+    .wrapper-header-img {
+      position: absolute;
+      top: -49px;
+      right: 88px;
+      width: 115px;
+      height: 109px;
+      border-radius: 50%;
+    }
+  }
+  .wrapper-header-box2 {
+    position: relative;
+    .wrapper-header-text {
+      position: absolute;
+      width: 249px;
+      right: 17px;
+      top: 79px;
+      font-size: 32px;
+      color: #fff;
+    }
+  }
+}
+
+.wrapper-middle {
+  padding: var(--main-space);
+  display: grid;
+  grid-template-columns: repeat(2, 335px);
+  grid-auto-rows: 335px;
+  grid-gap: var(--main-space);
+  .wrapper-middle-box {
+    box-shadow: 0px 18px 22px 0px rgba(0, 0, 0, 0.06);
+    border-radius: 8px;
+    display: grid;
+    place-items: center;
+    margin-bottom: 20px;
+  }
+  .wrapper-middle-img {
+    width: 120px;
+    height: 120px;
+  }
+  .wrapper-middle-text {
+    font-size: 32px;
+    margin-bottom: -38px;
+  }
+  .wrapper-middle-text2 {
+    font-size: 28px;
+    color: #757575;
+  }
+}

src/pages/notice/components/Card/index.jsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import { Cell, CellGroup } from '@antmjs/vantui';
+import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import style from './style.module.less';
+
+export default (props) => {
+
+  const onClick = () => {
+    Taro.navigateTo({
+      url: `/pages/notice/edit/index`
+    })
+  }
+
+  return (
+    <View className={style['notice-card-wrapper']}>
+      <CellGroup>
+        <Cell
+          title="关于2022年模拟测评报告"
+          isLink size="large"
+          style={{ color: 'var(--main-bg-color)' }}
+          onClick={() => onClick()}
+        />
+        <Cell
+          renderTitle={(<>
+            <View className={style['notice-card-title']}>日期： </View><View className={style['notice-card-title2']}>2022-12-06 12:00</View>
+          </>
+          )}
+        />
+      </CellGroup>
+    </View>
+  )
+}

src/pages/notice/components/Card/style.module.less

@@ -0,0 +1,15 @@
+.notice-card-wrapper {
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+  background: #ffffff;
+  box-shadow: 0px 18px 22px 1px rgba(0, 0, 0, 0.06);
+  border-radius: 8px;
+  overflow: hidden;
+  .notice-card-title {
+    font-weight: bold;
+    display: inline-block;
+  }
+  .notice-card-title2 {
+    display: inline-block;
+  }
+}

src/pages/notice/components/Details/index.jsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import { View } from '@tarojs/components';
+import style from './style.module.less';
+
+export default (props) => {
+  return (
+    <View className={style['notice-wrapper']} style={style}>
+      <View className={style['notice-hd']}>
+        【关于2022年模拟测评公告】
+        <View className={style['notice-hd2']}>2022-12-06 12:00</View>
+      </View>
+      <View className={style['notice-bd']}>
+
+      </View>
+      <View className={style['notice-ft']}>
+
+      </View>
+    </View>
+  )
+}

src/pages/notice/components/Details/style.module.less

@@ -0,0 +1,25 @@
+.notice-wrapper {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .notice-hd {
+    flex: none;
+    margin: var(--main-space);
+    font-weight: bold;
+    .notice-hd2 {
+      font-weight: 400;
+      margin-left: var(--main-space);
+    }
+  }
+
+  .notice-bd {
+    flex: 1;
+    overflow: hidden;
+    margin: var(--main-space);
+  }
+
+  .notice-ft {
+    flex: none;
+  }
+}

src/pages/notice/edit/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '详情'
+})

src/pages/notice/edit/index.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import Page from '@/layouts/index';
+import Details from '../components/Details/index';
+
+export default (props) => {
+  return (
+    <Page>
+      <Details />
+    </Page>
+  )
+}

src/pages/notice/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '公告'
+})

src/pages/notice/index.jsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import Page from '@/layouts/index';
+import Card from './components/Card/index';
+
+export default (props) => {
+
+  return (
+    <Page tabBar="notice">
+      <Card />
+    </Page>
+  )
+}