elink-star
/
epdc-resident-mp-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

release
ZhaoTongYao 3 years ago
parent
1fd2445d4c
commit
20514863e6
7 changed files with 166 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epdc-resident-mp-yushan/pages/toRegister/toRegister.js
  2. 174
      epdc-resident-mp-yushan/project.config.json
  3. 133
      epdc-resident-mp-yushan/project.private.config.json
  4. 1
      epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
  5. 11
      epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
  6. 3
      epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxss
  7. 3
      epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml

2
epdc-resident-mp-yushan/pages/toRegister/toRegister.js
View File

@ -21,7 +21,7 @@ Page({
} }
}) })
let that = this let that = this
const versionNum = '1.2.33' const versionNum = '1.2.34'
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data ? res.data.scanFlag : '1' let state = res.data ? res.data.scanFlag : '1'

174
epdc-resident-mp-yushan/project.config.json
View File

@ -1,95 +1,97 @@
{ {
"description": "项目配置文件", "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"packOptions": { "packOptions": {
"ignore": [] "ignore": [],
}, "include": []
"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": ""
}, },
"useIsolateContext": false, "setting": {
"userConfirmedBundleSwitch": false, "urlCheck": false,
"packNpmManually": false, "es6": true,
"packNpmRelationList": [], "enhance": false,
"minifyWXSS": true, "postcss": true,
"disableUseStrict": false, "preloadBackgroundData": false,
"showES6CompileOption": false, "minified": true,
"useCompilerPlugins": false, "newFeature": true,
"ignoreUploadUnusedFiles": true "coverView": true,
}, "nodeModules": false,
"compileType": "miniprogram", "autoAudits": false,
"libVersion": "2.10.4", "showShadowRootInWxmlPanel": true,
"appid": "wx50ebeb95943868cd", "scopeDataCheck": false,
"projectname": "%E7%8E%B0%E4%BB%A3%E6%A6%86%E5%B1%B1-%E5%B1%85%E6%B0%91%E7%AB%AF", "uglifyFileName": false,
"debugOptions": { "checkInvalidKey": true,
"hidedInDevtools": [] "checkSiteMap": true,
}, "uploadWithSourceMap": true,
"isGameTourist": false, "compileHotReLoad": false,
"simulatorType": "wechat", "lazyloadPlaceholderEnable": false,
"simulatorPluginLibVersion": {}, "useMultiFrameRuntime": true,
"condition": { "useApiHook": false,
"plugin": { "useApiHostProcess": false,
"list": [] "babelSetting": {
}, "ignore": [],
"game": { "disablePlugins": [],
"list": [] "outputPath": ""
}, },
"gamePlugin": { "useIsolateContext": false,
"list": [] "userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"disableUseStrict": false,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true,
"useStaticServer": true
}, },
"miniprogram": { "compileType": "miniprogram",
"list": [ "libVersion": "2.10.4",
{ "appid": "wx50ebeb95943868cd",
"id": 0, "projectname": "%E7%8E%B0%E4%BB%A3%E6%A6%86%E5%B1%B1-%E5%B1%85%E6%B0%91%E7%AB%AF",
"name": "带参数二维码", "simulatorType": "wechat",
"pathName": "pages/index/index", "simulatorPluginLibVersion": {},
"query": "scene=1169158362718629889&inviteUserId=12345", "condition": {
"scene": 1011 "plugin": {
"list": []
}, },
{ "game": {
"id": 2, "list": []
"name": "网格长注册",
"pathName": "pages/index/index",
"query": "scene=gridLeader",
"scene": 1011
}, },
{ "gamePlugin": {
"id": 3, "list": []
"name": "补全用户信息",
"pathName": "pages/complete/complete",
"query": "",
"scene": null
}, },
{ "miniprogram": {
"name": "网格注册", "list": [
"pathName": "pages/formid/formid", {
"query": "gid=1258691044142047233", "id": 0,
"scene": null "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
} }
}
} }

133
epdc-resident-mp-yushan/project.private.config.json
View File

@ -1,75 +1,64 @@
{ {
"setting": {}, "setting": {},
"condition": { "condition": {
"plugin": { "miniprogram": {
"list": [] "list": [
}, {
"game": { "name": "带参数二维码",
"list": [] "pathName": "pages/index/index",
}, "query": "scene=1288048536265261057&inviteUserId=12345",
"gamePlugin": { "scene": 1011
"list": [] },
}, {
"miniprogram": { "name": "网格长注册",
"list": [ "pathName": "pages/index/index",
{ "query": "scene=gridLeader",
"id": 0, "scene": 1011
"name": "带参数二维码", },
"pathName": "pages/index/index", {
"query": "scene=1288048536265261057&inviteUserId=12345", "name": "补全用户信息",
"scene": 1011 "pathName": "pages/complete/complete",
}, "query": "",
{ "scene": null
"id": 2, },
"name": "网格长注册", {
"pathName": "pages/index/index", "name": "网格注册",
"query": "scene=gridLeader", "pathName": "pages/formid/formid",
"scene": 1011 "query": "gid=1258691044142047233",
}, "scene": null
{ },
"id": 3, {
"name": "补全用户信息", "name": "pages/index/index",
"pathName": "pages/complete/complete", "pathName": "pages/index/index",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "网格注册", "name": "社会组织",
"pathName": "pages/formid/formid", "pathName": "subpages/societyOrg/pages/orgList/orgList",
"query": "gid=1258691044142047233", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "pages/index/index", "name": "pages/toRegister/toRegister",
"pathName": "pages/index/index", "pathName": "pages/toRegister/toRegister",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "社会组织", "name": "网格队伍",
"pathName": "subpages/societyOrg/pages/orgList/orgList", "pathName": "subpages/gridArmy/pages/index/index",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "pages/toRegister/toRegister", "name": "行程上报",
"pathName": "pages/toRegister/toRegister", "pathName": "subpages/extend/pages/epidemicControl/epidemicControl",
"query": "", "query": "",
"scene": null "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"
}
} }

1
epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
View File

@ -273,6 +273,7 @@ Page({
} else if (fmData.gender === '女') { } else if (fmData.gender === '女') {
fmData.gender = '0' fmData.gender = '0'
} }
fmData.needAudit = '1'
this.setData({ fmData }) this.setData({ fmData })
wx.showLoading({ wx.showLoading({
title: "提交中", title: "提交中",

11
epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
View File

@ -1,5 +1,13 @@
<view class="g-bd"> <view class="g-bd">
<view class="m-fm"> <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">
<view class="fm-title">基本信息</view> <view class="fm-title">基本信息</view>
<view class="item-list"> <view class="item-list">
@ -251,7 +259,8 @@
<view class="btn" style="opacity: 1;" bind:tap="submit">确认提交</view> <view class="btn" style="opacity: 1;" bind:tap="submit">确认提交</view>
</view> </view>
<view class="edit" wx:if="{{pageType === 'look'}}"> <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>
<view class="edit-two" wx:if="{{pageType === 'edit'}}"> <view class="edit-two" wx:if="{{pageType === 'edit'}}">
<view class="editbtn" bindtap="closeEditTap">取消编辑</view> <view class="editbtn" bindtap="closeEditTap">取消编辑</view>

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

@ -13,4 +13,7 @@
font-weight:400; font-weight:400;
color:#fff; color:#fff;
background-color: #0399d8; background-color: #0399d8;
}
.wait-state {
background-color: #a0a2a3 !important;
} }

3
epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
View File

@ -46,8 +46,9 @@
<view class="table-col">{{ item.userName }}</view> <view class="table-col">{{ item.userName }}</view>
<view class="table-col">{{ item.relation }}</view> <view class="table-col">{{ item.relation }}</view>
<view class="table-col">{{ item.mobile }}</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}}" <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> </view>
</block> </block>
<view wx:else class="no-data">暂无成员</view> <view wx:else class="no-data">暂无成员</view>

Write Preview
Loading…
Cancel
Save