diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js index 9442b91..89cb6d1 100644 --- 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' diff --git a/epdc-resident-mp-yushan/project.config.json b/epdc-resident-mp-yushan/project.config.json index 95844c1..dac41c9 100644 --- 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 } - } } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/project.private.config.json b/epdc-resident-mp-yushan/project.private.config.json index 2ff7cd8..c447c6a 100644 --- 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" } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js index b02faf7..8d760b3 100644 --- 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: "提交中", diff --git a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml index 968fd29..3a3dcab 100644 --- 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 @@ + + 上次未通过原因 + + + {{fmData.auditReason}} + + + 基本信息 @@ -251,7 +259,8 @@ 确认提交 - 编辑 + 待审核 + 编辑 取消编辑 diff --git a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxss b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxss index e3eb9d6..d3a048d 100644 --- 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; } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml b/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml index 711a83f..ede767b 100644 --- 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 @@ {{ item.userName }} {{ item.relation }} {{ item.mobile }} + 待审核 查看 + bind:tap="toFamilyInfo" wx:else>查看 暂无成员