feats

project.config.json

@@ -1,6 +1,6 @@
 {
   "miniprogramRoot": "./dist",
-  "projectname": "civilized-miniapp",
+  "projectname": "文明霍山",
   "description": "文明城市小程序",
   "appid": "wx39d721c54a0a11c4",
   "setting": {

src/layouts/index.jsx

@@ -26,6 +26,12 @@ export default (props) => {
     }
   }, [person, user]);
 
+  Taro.useShareAppMessage(() => {
+    return {
+      title: '文明霍山'
+    };
+  });
+
   return (
     <View className={laySty['page-wrapper']}>
       <Notify id="vanNotify" />

src/pages/check/edit/components/AgePicker.jsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Popup, Picker } from '@antmjs/vantui';
+
+const columns = ['18-35岁', '36-55岁', '56—65岁'];
+export default (props) => {
+
+  const { show, onShowChange, value, onChange } = props;
+
+  const onConfirm = (e) => {
+    const val = e.detail.value;
+    onChange(val);
+    onShowChange(false);
+  }
+  
+  return (
+    <Popup position="bottom" show={show} onClose={() => onShowChange(false)}>
+      <Picker columns={columns} onConfirm={onConfirm} />
+    </Popup>
+  )
+}

src/pages/check/edit/components/LocForm.jsx

@@ -1,15 +1,17 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import { CellGroup, Cell, Field } from '@antmjs/vantui';
+import { CellGroup, Cell, Field, RadioGroup, Radio } from '@antmjs/vantui';
 import Map from '@/components/map';
 import { getTaCheckItemAnswer } from '@/services/tacheckitem';
 import mapIcon from '@/assets/icons/marker.png';
+import AgePicker from './AgePicker';
 
 export default (props) => {
   const { checkItemInfo, checkType, answer, readonly, onChange, onLoadingChange } = props;
 
   const [loc, setLoc] = React.useState();
+  const [showAgePicker, setShowAgePicker] = React.useState(false);
 
   const setLoading = (v) => {
     if (onLoadingChange) {
@@ -56,6 +58,36 @@ export default (props) => {
           onChange={e => setFieldChange('addr', e.detail)}
         />
       </CellGroup>
+      {
+        checkType == 'survey' && (
+          <CellGroup style={{marginTop: '20px'}}>
+            <Cell title="性别">
+              <View style={{textAlign: 'right'}}>
+                <RadioGroup
+                  direction="horizontal"
+                  value={answer?.sex}
+                  style={{display: 'inline-flex'}}
+                  onChange={(e) => setFieldChange('sex', e.detail)}
+                >
+                  <Radio name="1" checkedColor="var(--main-bg-color)">男</Radio>
+                  <Radio name="2" checkedColor="red">女</Radio>
+                </RadioGroup>
+              </View>
+            </Cell>
+            <Cell
+              title="年龄"
+              isLink
+              value={answer?.age}
+              onClick={() => setShowAgePicker(true)}
+            />
+            <AgePicker
+              show={showAgePicker}
+              onShowChange={setShowAgePicker}
+              onChange={(e) => setFieldChange('age', e)}
+            />
+          </CellGroup>
+        )
+      }
     </View>
   )
 }

src/pages/check/edit/components/Question.jsx

@@ -7,7 +7,7 @@ import { getTaCheckAnswerItem } from '@/services/tacheckansweritem';
 
 
 export default (props) => {
-  const { quInfo, answerItem, readonly, onChange, onLoadingChange } = props;
+  const { quInfo, answerItem, checkType, readonly, onChange, onLoadingChange } = props;
 
   const setLoading = (v) => {
     if (onLoadingChange) {
@@ -89,19 +89,23 @@ export default (props) => {
           }
         />
       </CellGroup>
-      <CellGroup style={{marginTop: '20px'}}>        
-        <Cell title="拍照或视频" border={false} />
-
-        <Cell
-          renderTitle={
-            <Uploader
-              disabled={readonly}
-              value={answerItem?.attachList}
-              onChange={e => setFieldChange('attachList',e)}
+      {
+        checkType != 'survey' && (
+          <CellGroup style={{marginTop: '20px'}}>        
+            <Cell title="拍照或视频" border={false} />
+    
+            <Cell
+              renderTitle={
+                <Uploader
+                  disabled={readonly}
+                  value={answerItem?.attachList}
+                  onChange={e => setFieldChange('attachList',e)}
+                />
+              }
             />
-          }
-        />
-      </CellGroup>
+          </CellGroup>
+        )
+      }
     </View>
   )
 }

src/pages/check/edit/index.jsx

@@ -17,6 +17,8 @@ import LocForm from './components/LocForm';
 import Question from './components/Question';
 import Footer from './components/Footer/index';
 
+const isNotEmpty = str => str !== undefined && str !== null && str.replace(/\s/g, '') !== '';
+
 export default (props) => {
 
   const router = Taro.useRouter();
@@ -31,9 +33,9 @@ export default (props) => {
 
   React.useMemo(() => {
     if (typ == 'loc') {
-      Taro.setNavigationBarTitle('实地测评');
+      Taro.setNavigationBarTitle({ title: '实地测评' });
     } else {
-      Taro.setNavigationBarTitle('调查问卷');
+      Taro.setNavigationBarTitle({ title: '调查问卷' });
     }
   }, [typ]);
 
@@ -66,8 +68,8 @@ export default (props) => {
     const an = { ...(answer || {}) }
     const answerItemList = an.answerItemList || []
 
-    if ((answerItem.answerCode || answerItem.answer) &&
-      answerItem.attachList?.length) {
+    if ((isNotEmpty(answerItem.answerCode) || isNotEmpty(answerItem.answer)) &&
+      (typ == 'loc' ? answerItem.attachList?.length : true)) {
       // 说明这一题已经回答完毕
       quInfo.finished = true
     } else {
@@ -228,6 +230,7 @@ export default (props) => {
                 index == inx && (
                   <Question
                     key={x.quId}
+                    checkType={typ}
                     cursor={inx}
                     readonly={readonly}
                     quInfo={x}

src/pages/check/loc/list/index.jsx

@@ -40,18 +40,20 @@ export default (props) => {
       <PowerList
         request={getTaCheckItem}
         params={params}
-        renderItem={item => (
-          <Cell
-            isLink
-            key={item.itemId}
-            title={item.name}
-            onClick={() => onClick(item)}
-          >
-            {
-              item.num <= item.answerNum ? <Tag color="var(--main-bg-color)">{`${item.answerNum}/${item.num}`}</Tag> : null
-            }
-          </Cell>
-        )}
+        renderItem={item => {
+          const color = item.answerNum >= item.num ? '#aeaeae' : 'var(--main-bg-color)';
+
+          return (
+            <Cell
+              isLink
+              key={item.itemId}
+              title={item.name}
+              onClick={() => onClick(item)}
+            >
+              <Tag color={color}>{`${item.answerNum}/${item.num}`}</Tag>
+            </Cell>
+          )
+        }}
         onLoadingChange={setLoading}
       />
     </Page>

src/pages/home/index.config.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line no-undef
 export default definePageConfig({
-  navigationBarTitleText: '首页'
+  navigationBarTitleText: '首页',
+  enableShareAppMessage: true,
 })

src/services/taorgissue.js

@@ -17,7 +17,7 @@ export const getTaOrgIssueById = (id) => request(`/api/taOrgIssue/${id}`);
 /*
  * 通过ISSUE_ID查询单条数据
  */
-export const getTaOrgIssueByIssueId = (issueId, orgId) => request(`/api/taIssue/${issueId}/orgIssue?orgId=${orgId}`);
+export const getTaOrgIssueByIssueId = (issueId, orgId = '') => request(`/api/taIssue/${issueId}/orgIssue?orgId=${orgId}`);
 
 /*
  * 更新数据