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

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'

epdc-resident-mp-yushan/project.config.json

@@ -1,7 +1,8 @@
 {
-  "description": "项目配置文件",
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "packOptions": {
-    "ignore": []
+        "ignore": [],
+        "include": []
     },
     "setting": {
         "urlCheck": false,
@@ -22,7 +23,7 @@
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
         "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": false,
+        "useMultiFrameRuntime": true,
         "useApiHook": false,
         "useApiHostProcess": false,
         "babelSetting": {
@@ -38,16 +39,13 @@
         "disableUseStrict": false,
         "showES6CompileOption": false,
         "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true
+        "ignoreUploadUnusedFiles": true,
+        "useStaticServer": 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": {
@@ -91,5 +89,9 @@
                 }
             ]
         }
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
 }

epdc-resident-mp-yushan/project.private.config.json

@@ -1,33 +1,21 @@
 {
     "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": "",
@@ -71,5 +59,6 @@
                 }
             ]
         }
-  }
+    },
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }

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: "提交中",

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>

epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxss

@@ -14,3 +14,6 @@
     color:#fff;
     background-color: #0399d8;
 }
+.wait-state {
+    background-color: #a0a2a3 !important;
+}

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>