修改家庭成员信息增加审核流程

3 years ago · 20514863e6
7 changed files with 166 additions and 161 deletions
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@ -21,7 +21,7 @@ Page({
      }
    })
    let that = this
-    const versionNum = '1.2.33'
+    const versionNum = '1.2.34'
    api.getScanSwitch(versionNum).then(function (res) {
      console.log(res.data)
      let state = res.data ? res.data.scanFlag : '1'
--- a/epdc-resident-mp-yushan/project.config.json
+++ b/epdc-resident-mp-yushan/project.config.json
@ -1,95 +1,97 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": false,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": false,
-    "useApiHook": false,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "packOptions": {
+        "ignore": [],
+        "include": []
    },
-    "useIsolateContext": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.10.4",
-  "appid": "wx50ebeb95943868cd",
-  "projectname": "%E7%8E%B0%E4%BB%A3%E6%A6%86%E5%B1%B1-%E5%B1%85%E6%B0%91%E7%AB%AF",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": false,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": false,
+        "useApiHostProcess": false,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "useIsolateContext": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "ignoreUploadUnusedFiles": true,
+        "useStaticServer": true
    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": 0,
-          "name": "带参数二维码",
-          "pathName": "pages/index/index",
-          "query": "scene=1169158362718629889&inviteUserId=12345",
-          "scene": 1011
+    "compileType": "miniprogram",
+    "libVersion": "2.10.4",
+    "appid": "wx50ebeb95943868cd",
+    "projectname": "%E7%8E%B0%E4%BB%A3%E6%A6%86%E5%B1%B1-%E5%B1%85%E6%B0%91%E7%AB%AF",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {
+        "plugin": {
+            "list": []
        },
-        {
-          "id": 2,
-          "name": "网格长注册",
-          "pathName": "pages/index/index",
-          "query": "scene=gridLeader",
-          "scene": 1011
+        "game": {
+            "list": []
        },
-        {
-          "id": 3,
-          "name": "补全用户信息",
-          "pathName": "pages/complete/complete",
-          "query": "",
-          "scene": null
+        "gamePlugin": {
+            "list": []
        },
-        {
-          "name": "网格注册",
-          "pathName": "pages/formid/formid",
-          "query": "gid=1258691044142047233",
-          "scene": null
+        "miniprogram": {
+            "list": [
+                {
+                    "id": 0,
+                    "name": "带参数二维码",
+                    "pathName": "pages/index/index",
+                    "query": "scene=1169158362718629889&inviteUserId=12345",
+                    "scene": 1011
+                },
+                {
+                    "id": 2,
+                    "name": "网格长注册",
+                    "pathName": "pages/index/index",
+                    "query": "scene=gridLeader",
+                    "scene": 1011
+                },
+                {
+                    "id": 3,
+                    "name": "补全用户信息",
+                    "pathName": "pages/complete/complete",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "网格注册",
+                    "pathName": "pages/formid/formid",
+                    "query": "gid=1258691044142047233",
+                    "scene": null
+                }
+            ]
        }
-      ]
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
    }
-  }
 }
--- a/epdc-resident-mp-yushan/project.private.config.json
+++ b/epdc-resident-mp-yushan/project.private.config.json
@ -1,75 +1,64 @@
 {
-  "setting": {},
-  "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": 0,
-          "name": "带参数二维码",
-          "pathName": "pages/index/index",
-          "query": "scene=1288048536265261057&inviteUserId=12345",
-          "scene": 1011
-        },
-        {
-          "id": 2,
-          "name": "网格长注册",
-          "pathName": "pages/index/index",
-          "query": "scene=gridLeader",
-          "scene": 1011
-        },
-        {
-          "id": 3,
-          "name": "补全用户信息",
-          "pathName": "pages/complete/complete",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "网格注册",
-          "pathName": "pages/formid/formid",
-          "query": "gid=1258691044142047233",
-          "scene": null
-        },
-        {
-          "name": "pages/index/index",
-          "pathName": "pages/index/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "社会组织",
-          "pathName": "subpages/societyOrg/pages/orgList/orgList",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/toRegister/toRegister",
-          "pathName": "pages/toRegister/toRegister",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "网格队伍",
-          "pathName": "subpages/gridArmy/pages/index/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "行程上报",
-          "pathName": "subpages/extend/pages/epidemicControl/epidemicControl",
-          "query": "",
-          "scene": null
+    "setting": {},
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "带参数二维码",
+                    "pathName": "pages/index/index",
+                    "query": "scene=1288048536265261057&inviteUserId=12345",
+                    "scene": 1011
+                },
+                {
+                    "name": "网格长注册",
+                    "pathName": "pages/index/index",
+                    "query": "scene=gridLeader",
+                    "scene": 1011
+                },
+                {
+                    "name": "补全用户信息",
+                    "pathName": "pages/complete/complete",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "网格注册",
+                    "pathName": "pages/formid/formid",
+                    "query": "gid=1258691044142047233",
+                    "scene": null
+                },
+                {
+                    "name": "pages/index/index",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "社会组织",
+                    "pathName": "subpages/societyOrg/pages/orgList/orgList",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/toRegister/toRegister",
+                    "pathName": "pages/toRegister/toRegister",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "网格队伍",
+                    "pathName": "subpages/gridArmy/pages/index/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "行程上报",
+                    "pathName": "subpages/extend/pages/epidemicControl/epidemicControl",
+                    "query": "",
+                    "scene": null
+                }
+            ]
        }
-      ]
-    }
-  }
+    },
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
+++ b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
@ -273,6 +273,7 @@ Page({
    } else if (fmData.gender === '女') {
      fmData.gender = '0'
    }
+    fmData.needAudit = '1'
    this.setData({ fmData })
    wx.showLoading({
      title: "提交中",
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
+++ b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
@ -1,5 +1,13 @@
 <view class="g-bd">
  <view class="m-fm">
+    <view class="fm" wx:if="{{fmData.auditState == '2'}}">
+      <view class="fm-title">上次未通过原因</view>
+      <view class="item-list">
+        <view class="item">
+          {{fmData.auditReason}}
+        </view>
+      </view>
+    </view>
    <view class="fm">
      <view class="fm-title">基本信息</view>
      <view class="item-list">
@ -251,7 +259,8 @@
      <view class="btn" style="opacity: 1;" bind:tap="submit">确认提交</view>
    </view>
    <view class="edit" wx:if="{{pageType === 'look'}}">
-      <view class="editbtn" bindtap="editTap">编辑</view>
+      <view class="editbtn wait-state" wx:if="{{fmData.auditState == '0'}}">待审核</view>
+      <view class="editbtn" bindtap="editTap" wx:else>编辑</view>
    </view>
    <view class="edit-two" wx:if="{{pageType === 'edit'}}">
      <view class="editbtn" bindtap="closeEditTap">取消编辑</view>
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxss
+++ b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxss
@ -13,4 +13,7 @@
    font-weight:400;
    color:#fff;
    background-color: #0399d8;
+}
+.wait-state {
+    background-color: #a0a2a3 !important;
 }
--- a/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
@ -46,8 +46,9 @@
            <view class="table-col">{{ item.userName }}</view>
            <view class="table-col">{{ item.relation }}</view>
            <view class="table-col">{{ item.mobile }}</view>
+            <view class="table-col table-col-4" wx:if="{{item.auditType == '0' && item.auditState == '0'}}">待审核</view>
            <view class="table-col table-col-4" data-type="edit" data-id="{{item.idCard}}"
-            bind:tap="toFamilyInfo">查看</view>
+            bind:tap="toFamilyInfo" wx:else>查看</view>
          </view>
        </block>
        <view wx:else class="no-data">暂无成员</view>