miniprogram / volunteer · 提交

转到一个项目

作者 liaolinfeng
提交 caabc91611f18eb111b4a468c6d6114ed28c1399 1 个父辈 743e5d86

开发完成

内嵌 并排对比
正在显示 32 个修改的文件 包含 1316 行增加 和 162 行删除
@@ -12,6 +12,18 @@ @@ -12,6 +12,18 @@
12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13 <option name="LAST_RESOLUTION" value="IGNORE" /> 13 <option name="LAST_RESOLUTION" value="IGNORE" />
14 </component> 14 </component>
  15 + <component name="FindInProjectRecents">
  16 + <findStrings>
  17 + <find>http://volunteer.w.bronet.cn</find>
  18 + </findStrings>
  19 + <replaceStrings>
  20 + <replace />
  21 + <replace>https://volunteer.cnpu.org</replace>
  22 + </replaceStrings>
  23 + <dirStrings>
  24 + <dir>E:\wxproject\03志愿者小程序效果图\volunteer\zhiyuanzhe\pages</dir>
  25 + </dirStrings>
  26 + </component>
15 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> 27 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
16 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> 28 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
17 <component name="JsGulpfileManager"> 29 <component name="JsGulpfileManager">
@@ -21,15 +33,39 @@ @@ -21,15 +33,39 @@
21 <component name="NodePackageJsonFileManager"> 33 <component name="NodePackageJsonFileManager">
22 <packageJsonPaths /> 34 <packageJsonPaths />
23 </component> 35 </component>
24 - <component name="ProjectFrameBounds" extendedState="7"> 36 + <component name="ProjectFrameBounds" extendedState="6">
25 <option name="x" value="121" /> 37 <option name="x" value="121" />
26 <option name="y" value="19" /> 38 <option name="y" value="19" />
27 <option name="width" value="1400" /> 39 <option name="width" value="1400" />
28 <option name="height" value="1000" /> 40 <option name="height" value="1000" />
29 </component> 41 </component>
  42 + <component name="ProjectView">
  43 + <navigator proportions="" version="1">
  44 + <foldersAlwaysOnTop value="true" />
  45 + </navigator>
  46 + <panes>
  47 + <pane id="ProjectPane">
  48 + <subPane>
  49 + <expand>
  50 + <path>
  51 + <item name="zhiyuanzhe" type="b2602c69:ProjectViewProjectNode" />
  52 + <item name="zhiyuanzhe" type="462c0819:PsiDirectoryNode" />
  53 + </path>
  54 + <path>
  55 + <item name="zhiyuanzhe" type="b2602c69:ProjectViewProjectNode" />
  56 + <item name="zhiyuanzhe" type="462c0819:PsiDirectoryNode" />
  57 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  58 + </path>
  59 + </expand>
  60 + <select />
  61 + </subPane>
  62 + </pane>
  63 + <pane id="Scope" />
  64 + </panes>
  65 + </component>
30 <component name="PropertiesComponent"> 66 <component name="PropertiesComponent">
31 <property name="WebServerToolWindowFactoryState" value="false" /> 67 <property name="WebServerToolWindowFactoryState" value="false" />
32 - <property name="last_opened_file_path" value="E:/project/trusteeship" /> 68 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
33 <property name="node.js.detected.package.prettier" value="true" /> 69 <property name="node.js.detected.package.prettier" value="true" />
34 <property name="node.js.path.for.package.prettier" value="project" /> 70 <property name="node.js.path.for.package.prettier" value="project" />
35 <property name="node.js.selected.package.prettier" value="" /> 71 <property name="node.js.selected.package.prettier" value="" />
@@ -60,30 +96,31 @@ @@ -60,30 +96,31 @@
60 <option name="presentableId" value="Default" /> 96 <option name="presentableId" value="Default" />
61 <updated>1546648168340</updated> 97 <updated>1546648168340</updated>
62 <workItem from="1546648170160" duration="644000" /> 98 <workItem from="1546648170160" duration="644000" />
  99 + <workItem from="1547097879598" duration="899000" />
  100 + <workItem from="1547268145045" duration="628000" />
63 </task> 101 </task>
64 <servers /> 102 <servers />
65 </component> 103 </component>
66 <component name="TimeTrackingManager"> 104 <component name="TimeTrackingManager">
67 - <option name="totallyTimeSpent" value="644000" /> 105 + <option name="totallyTimeSpent" value="2171000" />
68 </component> 106 </component>
69 <component name="ToolWindowManager"> 107 <component name="ToolWindowManager">
70 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />  
71 - <editor active="true" /> 108 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
72 <layout> 109 <layout>
73 - <window_info content_ui="combo" id="Project" order="0" weight="0.25" /> 110 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973656" />
74 <window_info anchor="bottom" id="TODO" order="6" /> 111 <window_info anchor="bottom" id="TODO" order="6" />
75 - <window_info anchor="bottom" id="Docker" show_stripe_button="false" />  
76 - <window_info anchor="bottom" id="Event Log" side_tool="true" />  
77 - <window_info anchor="bottom" id="Version Control" show_stripe_button="false" /> 112 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  113 + <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
  114 + <window_info anchor="bottom" id="Find" order="1" />
  115 + <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
78 <window_info anchor="bottom" id="Run" order="2" /> 116 <window_info anchor="bottom" id="Run" order="2" />
79 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 117 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
80 - <window_info anchor="bottom" id="Terminal" />  
81 - <window_info id="Favorites" side_tool="true" /> 118 + <window_info anchor="bottom" id="Terminal" order="7" />
  119 + <window_info id="Favorites" order="2" side_tool="true" />
82 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 120 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
83 - <window_info anchor="bottom" id="Find" order="1" />  
84 - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />  
85 - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />  
86 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 121 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  122 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  123 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
87 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 124 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
88 <window_info anchor="bottom" id="Message" order="0" /> 125 <window_info anchor="bottom" id="Message" order="0" />
89 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 126 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -19,7 +19,7 @@ App({ @@ -19,7 +19,7 @@ App({
19 var promise = new Promise((resolve, reject) => { 19 var promise = new Promise((resolve, reject) => {
20 let that = this; 20 let that = this;
21 let postData = data; 21 let postData = data;
22 - let baseUrl = 'http://volunteer.w.bronet.cn/api/'; 22 + let baseUrl = 'https://volunteer.cnpu.org/api/';
23 //网络请求 23 //网络请求
24 let header = { 24 let header = {
25 'content-type': 'application/x-www-form-urlencoded' 25 'content-type': 'application/x-www-form-urlencoded'
1 { 1 {
2 "pages": [ 2 "pages": [
3 - "pages/start/start",  
4 "pages/index/index", 3 "pages/index/index",
  4 + "pages/start/start",
5 "pages/my/my", 5 "pages/my/my",
6 "pages/more/more", 6 "pages/more/more",
7 "pages/admin/admin", 7 "pages/admin/admin",
8 "pages/apply/apply", 8 "pages/apply/apply",
9 "pages/img_txt/img_txt", 9 "pages/img_txt/img_txt",
10 - "pages/result/result" 10 + "pages/result/result",
  11 + "pages/close_apply/close_apply"
11 ], 12 ],
12 "window": { 13 "window": {
13 "backgroundTextStyle": "light", 14 "backgroundTextStyle": "light",
@@ -12,37 +12,73 @@ @@ -12,37 +12,73 @@
12 height: 16rpx; 12 height: 16rpx;
13 background: #F0F0F0; 13 background: #F0F0F0;
14 } 14 }
15 - 15 +.wxParse-img{
  16 + width: 100% !important;
  17 +}
  18 +.wxParse-strong{
  19 + font-weight: bold !important;
  20 +}
16 @font-face {font-family: "iconfont"; 21 @font-face {font-family: "iconfont";
17 - src: url('//at.alicdn.com/t/font_993764_m7evnd0l8pf.eot?t=1546393889667'); /* IE9*/  
18 - src: url('//at.alicdn.com/t/font_993764_m7evnd0l8pf.eot?t=1546393889667#iefix') format('embedded-opentype'), /* IE6-IE8 */  
19 - url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAkIAAsAAAAADPwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFY8eEkhY21hcAAAAYAAAACaAAACGDU5aPxnbHlmAAACHAAABIEAAAXAzBw75mhlYWQAAAagAAAAMQAAADYU0bg/aGhlYQAABtQAAAAeAAAAJAjtBJhobXR4AAAG9AAAABUAAAAoKQ7//2xvY2EAAAcMAAAAFgAAABYG/AWebWF4cAAAByQAAAAdAAAAIAEcAJRuYW1lAAAHRAAAAUUAAAJtPlT+fXBvc3QAAAiMAAAAeQAAAJ8w1lf+eJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2BkkWacwMDKwMHUyXSGgYGhH0IzvmYwYuRgYGBiYGVmwAoC0lxTGByeMT0XYW7438AQw9zA0AAUZgTJAQDnoAwVeJzlkTEOwjAMRX/S0hKUAaFO7dyNk3EGLtGFiblH+z1G+Y4zVHAEbL1E+YqdyB/ACUAj7qIFwhsBFi+poegNLkVv8dD5hquUyMjEzIkzF67bsO9A1caj9hVB9Z5DTSDirN6dfmIvJvS61v1U/l/ksj7rKdl8HdieHM0OzI75x9HRPMHJMY85O+Y1F8f85epY/21w0H8A7ystrgAAeJxlVF1MHFUUvufe2VmGhVn2hx3Y3RnYXXYG3BZk2Nntst1lUXgQQVnQSvgrlqQUFdCm1gJa6IsW6hN9qDwpLz41YGqCL33ARKNJSYyaJhJj0gdjNaZPTWpMuoNndpIGdbJzzp17zz33u9/5zhJK8GF79C9SS1oJiUdjraDlIY02lVZAEsGpQJwPSAo4IzifSmqtYOCgvMb2sj01v3i5UxW0tzEY7psGfoKvuW+qzmrYnOVKZ8UflCpH6wl6pq9vmsIJ4drNp1qm+ovFKgHY3HB2vEm9/acvBG99X7H6ha+6vlKaPDk8x3Dp5CQhQMjh7+w2qyM+QhyaDUwPSHnosJFRUtjep+zqbPZcPH4uO3uV0f1tqXPzwdLsGm1PJNrp2uzSg03rilauPdbICsSLuXhnKyTTAqjJVDogQcDvhBv+cEOzBBnzG6m5IeyH85J0zAc00S1BFrJSd4KCz/ywrlBn5zpklFESwI9UOqVqoIoQkARAq6ehC1L0bwCeqzI/dmthcEPO/EoEWXXDJFAO3gAqKi54QQRFdZt3ze9EVamGIQoOwmHuK+yQrRAX8ROZqHgCT5wBIqVIWiWAuFN6wM9L/xtQcmDe43loPDiARp4375lBWdM6VfUhuoymPQyXHVvBpYMjoaVboGJUpwr/8aTi8PBw1eFmq4gjR54jL5NpskCWyQeIKdAAChKDdfBgISJYGw8WBxWCd0/HI1HejVzEIrjmwRhLOR6MiUXVNrwCs8tnF7SsMKksOeeT+WSepqNIDy3PQ8y6ZBasazoxB1YNFeDn2dUqThHalGWlGaBZeUxsD0NKm6BwVZAw74ZaBJmJgrmd6acwkOFIZgDQLwsiVYSWz+Y3GNuYX0B7fX59l+N219csu5YrUlrM5YagtsWQu2c6pNGld3qBXij9tCp6veK/DSuA6xU5hieXdmTNQkCLCvqofMoFBaV+RKiE/kxpxz6aFhFKZcVIvWJ+zjYWbATz1599cvb67o51dpFCMScbLYFCz8WlsfqnZwojFyEK3pAXfyV8wRqX2xc18yv7koWJQJpIM3Yx8i9DxEAiI6qhptJ2QyO1fquRa/3OSG3EgS9bLUE4zq5A/HnzkRP8wWQX0JXTp1dolxH0Oc1H9JNSkB1//OP78XBvbzg+5/GGdZ88U5i6zNjlqcKM4tXDXs/QTY+Fw4E4fma/sSYSRN1qpIMkUSlqAqzWRSm4IRblJQ8f6IjoKc2TAlsAdtE9R3SgsT3NeDPo0oOmGWqvlM8bFnMG/dbyZnB0kdLFUdvmigAWWZal76k9dU0ATXU9/YaZTQ70G/C1YYbYpTE7eOwSgzMwmM8NUjqYyw9CmTs0n7IE/v8lSIZYHabZUFDUhgelFkHGmITSi7ZZmj4Cmlls5kFTNav92dv6jdHNOxx996x5P6brMfp6TO+cEGXNPR4fPr64xdjW4tIWg9D+M8ccNTUclxoRqpmLGr2DwN356MKtFsBNr8V0QF/6Y9ytyeJEMIi77L2tL0FfxYtOh1BT8aoLKr0iIf8AkqIiPQAAAHicY2BkYGAAYpaODv94fpuvDNwsDCBwI8hKEUb///+/gZWfuQHI5WBgAokCAA61CjwAAAB4nGNgZGBgbvjfwBDDyvcfCFj5GYAiKIALAKNfBo4AAHicY2FgYGDBgln5/v9H5gMAH18CNgAAAAAAAAAATgB0AJoAyAEOAeICJgKAAuAAAHicY2BkYGDgYuhg4GAAASYwjwtI/gfzGQAXWAGxAAAAeJxlj01OwzAQhV/6B6QSqqhgh+QFYgEo/RGrblhUavdddN+mTpsqiSPHrdQDcB6OwAk4AtyAO/BIJ5s2lsffvHljTwDc4Acejt8t95E9XDI7cg0XuBeuU38QbpBfhJto41W4Rf1N2MczpsJtdGF5g9e4YvaEd2EPHXwI13CNT+E69S/hBvlbuIk7/Aq30PHqwj7mXle4jUcv9sdWL5xeqeVBxaHJIpM5v4KZXu+Sha3S6pxrW8QmU4OgX0lTnWlb3VPs10PnIhVZk6oJqzpJjMqt2erQBRvn8lGvF4kehCblWGP+tsYCjnEFhSUOjDFCGGSIyujoO1Vm9K+xQ8Jee1Y9zed0WxTU/3OFAQL0z1xTurLSeTpPgT1fG1J1dCtuy56UNJFezUkSskJe1rZUQuoBNmVXjhF6XNGJPyhnSP8ACVpuyAAAAHicbcrRDoIwDIXhFsXBDCY+ik9EmrG01djFwRLg6Z16659zdz5o4JeH/3ls8IBHbPGEDjvs0eMZhhxtK2SrUtpLS7qqXTUkG+sWiWNWlqWrt/GWyjBF44l0lmgSXaBnzHTrORnvUon7wrtegtCD7MNeagzwBlAoJ0EAAAA=') format('woff'),  
20 - url('//at.alicdn.com/t/font_993764_m7evnd0l8pf.ttf?t=1546393889667') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/  
21 - url('//at.alicdn.com/t/font_993764_m7evnd0l8pf.svg?t=1546393889667#iconfont') format('svg'); /* iOS 4.1- */ 22 + src: url('//at.alicdn.com/t/font_993764_h8nvryxiew7.eot?t=1546995651844'); /* IE9 */
  23 + src: url('//at.alicdn.com/t/font_993764_h8nvryxiew7.eot?t=1546995651844#iefix') format('embedded-opentype'), /* IE6-IE8 */
  24 + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
  25 + url('//at.alicdn.com/t/font_993764_h8nvryxiew7.woff?t=1546995651844') format('woff'),
  26 + url('//at.alicdn.com/t/font_993764_h8nvryxiew7.ttf?t=1546995651844') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
  27 + url('//at.alicdn.com/t/font_993764_h8nvryxiew7.svg?t=1546995651844#iconfont') format('svg'); /* iOS 4.1- */
22 } 28 }
23 29
24 .iconfont { 30 .iconfont {
25 - font-family:"iconfont" !important;  
26 - font-size:16px;  
27 - font-style:normal; 31 + font-family: "iconfont" !important;
  32 + font-size: 16px;
  33 + font-style: normal;
28 -webkit-font-smoothing: antialiased; 34 -webkit-font-smoothing: antialiased;
29 -moz-osx-font-smoothing: grayscale; 35 -moz-osx-font-smoothing: grayscale;
30 } 36 }
31 37
32 -.icon-renyuanxiaozu:before { content: "\e691"; } 38 +.icon-renyuanxiaozu:before {
  39 + content: "\e691";
  40 +}
  41 +
  42 +.icon-guanbi:before {
  43 + content: "\e612";
  44 +}
  45 +
  46 +.icon-aixin:before {
  47 + content: "\e602";
  48 +}
  49 +
  50 +.icon-icon_on_the_right:before {
  51 + content: "\e625";
  52 +}
33 53
34 -.icon-aixin:before { content: "\e602"; } 54 +.icon-xiangyou:before {
  55 + content: "\e60c";
  56 +}
35 57
36 -.icon-icon_on_the_right:before { content: "\e625"; } 58 +.icon-guanbi1:before {
  59 + content: "\e61c";
  60 +}
37 61
38 -.icon-xiangyou:before { content: "\e60c"; } 62 +.icon-dengdaishenhe:before {
  63 + content: "\e61b";
  64 +}
39 65
40 -.icon-dengdaishenhe:before { content: "\e61b"; } 66 +.icon-camera1:before {
  67 + content: "\e61a";
  68 +}
41 69
42 -.icon-camera1:before { content: "\e61a"; } 70 +.icon-gongzhang:before {
  71 + content: "\e714";
  72 +}
43 73
44 -.icon-gongzhang:before { content: "\e714"; } 74 +.icon-xiangji:before {
  75 + content: "\e609";
  76 +}
45 77
46 -.icon-xiangji:before { content: "\e609"; } 78 +.icon-lianximaijia:before {
  79 + content: "\e60d";
  80 +}
47 81
48 -.icon-chakanshenqing:before { content: "\e6a6"; }  
  82 +.icon-chakanshenqing:before {
  83 + content: "\e6a6";
  84 +}
@@ -2,15 +2,15 @@ @@ -2,15 +2,15 @@
2 <scroll-view scroll-y='true' bindscrolltolower='getdatalist' style='height:{{scroll_height}}rpx'> 2 <scroll-view scroll-y='true' bindscrolltolower='getdatalist' style='height:{{scroll_height}}rpx'>
3 <block wx:for='{{datalist}}' wx:key> 3 <block wx:for='{{datalist}}' wx:key>
4 <view class='adminitem'> 4 <view class='adminitem'>
5 - <view class='admin_left'> 5 + <navigator class='admin_left' url='/pages/close_apply/close_apply?id={{item.user_id}}' hover-class="none">
6 <view class='admin_img'> 6 <view class='admin_img'>
7 - <image src='{{item.photo?item.photo:"http://volunteer.w.bronet.cn/imgs/wode_02@2x.png"}}'></image> 7 + <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}'></image>
8 </view> 8 </view>
9 <view class='admin_txt'> 9 <view class='admin_txt'>
10 <view class='admin_txttitle'>{{item.nane}}</view> 10 <view class='admin_txttitle'>{{item.nane}}</view>
11 <view>{{item.duty}}</view> 11 <view>{{item.duty}}</view>
12 </view> 12 </view>
13 - </view> 13 + </navigator>
14 <view class='admin_rigth'> 14 <view class='admin_rigth'>
15 <view class='admin_buttom {{item.status=="3"?"admin_active":""}}' id='{{item.id}}' data-idi='{{item.status}}' data-status='3' data-index='{{index}}' bindtap='update_status'>不通过</view> 15 <view class='admin_buttom {{item.status=="3"?"admin_active":""}}' id='{{item.id}}' data-idi='{{item.status}}' data-status='3' data-index='{{index}}' bindtap='update_status'>不通过</view>
16 <view class='admin_buttom {{item.status !="3"?"admin_active":""}}' id='{{item.id}}' data-status='2' data-index='{{index}}' bindtap='update_status'>通过</view> 16 <view class='admin_buttom {{item.status !="3"?"admin_active":""}}' id='{{item.id}}' data-status='2' data-index='{{index}}' bindtap='update_status'>通过</view>
@@ -6,11 +6,18 @@ Page({ @@ -6,11 +6,18 @@ Page({
6 * 页面的初始数据 6 * 页面的初始数据
7 */ 7 */
8 data: { 8 data: {
  9 + //
  10 + ifempower:true,//是否授权
  11 + showapply:false,
  12 + provincearr:[],
  13 + cityarr:[],
  14 + countryarr:[],
  15 + confirmvalarr:[0,0,0],
  16 + valarr:[0,0,0],
9 photo: '', 17 photo: '',
10 name: '', 18 name: '',
11 enddata:'', 19 enddata:'',
12 arraysex: ['男', '女'], 20 arraysex: ['男', '女'],
13 - region:['天津市','天津市','西青区'],  
14 sex: '', 21 sex: '',
15 birthday: '', //生日 22 birthday: '', //生日
16 nation: '', //民族 23 nation: '', //民族
@@ -19,7 +26,7 @@ Page({ @@ -19,7 +26,7 @@ Page({
19 "土族", "达斡尔族", "仫佬族", "羌族", "布朗族", "撒拉族", "毛南族", "仡佬族", "锡伯族", "阿昌族", "普米族", "塔吉克族", "怒族", "乌孜别克族", 26 "土族", "达斡尔族", "仫佬族", "羌族", "布朗族", "撒拉族", "毛南族", "仡佬族", "锡伯族", "阿昌族", "普米族", "塔吉克族", "怒族", "乌孜别克族",
20 "俄罗斯族", "鄂温克族", "德昂族", "保安族", "裕固族", "京族", "塔塔尔族", "独龙族", "鄂伦春族", "赫哲族", "门巴族", "珞巴族", "基诺族" 27 "俄罗斯族", "鄂温克族", "德昂族", "保安族", "裕固族", "京族", "塔塔尔族", "独龙族", "鄂伦春族", "赫哲族", "门巴族", "珞巴族", "基诺族"
21 ], 28 ],
22 - 29 +
23 politics: '', //政治面貌 30 politics: '', //政治面貌
24 politicsarr: ['共青团员', '中共预备党员', '中共党员', '群众', '无党派人士', '其他'], // 31 politicsarr: ['共青团员', '中共预备党员', '中共党员', '群众', '无党派人士', '其他'], //
25 education: '', //学历 32 education: '', //学历
@@ -30,7 +37,6 @@ Page({ @@ -30,7 +37,6 @@ Page({
30 postcode: '', //邮编 37 postcode: '', //邮编
31 school: '', // 38 school: '', //
32 card_number: '', //身份证号码 39 card_number: '', //身份证号码
33 - fixed_phone: '', //固定电话  
34 move_phone: '', // 40 move_phone: '', //
35 email: '', // 41 email: '', //
36 urgency_phone: '', // 42 urgency_phone: '', //
@@ -43,32 +49,33 @@ Page({ @@ -43,32 +49,33 @@ Page({
43 typearr: ['医院志愿者', '社会志愿者', '办事处志愿者'], 49 typearr: ['医院志愿者', '社会志愿者', '办事处志愿者'],
44 apply_nav: 0, //0为履历1，1为履历2，2为履历3， 50 apply_nav: 0, //0为履历1，1为履历2，2为履历3，
45 record: [{ 51 record: [{
46 - start_time: '',  
47 - end_time: '',  
48 - unit: '',  
49 - duty: '',  
50 - name: '',  
51 - phone: '' 52 + record_start_time: '',
  53 + record_end_time: '',
  54 + record_unit: '',
  55 + record_duty: '',
  56 + record_name: '',
  57 + record_phone: ''
52 }, 58 },
53 { 59 {
54 - start_time: '',  
55 - end_time: '',  
56 - unit: '',  
57 - duty: '',  
58 - name: '',  
59 - phone: '' 60 + record_start_time: '',
  61 + record_end_time: '',
  62 + record_unit: '',
  63 + record_duty: '',
  64 + record_name: '',
  65 + record_phone: ''
60 }, 66 },
61 { 67 {
62 - start_time: '',  
63 - end_time: '',  
64 - unit: '',  
65 - duty: '',  
66 - name: '',  
67 - phone: '' 68 + record_start_time: '',
  69 + record_end_time: '',
  70 + record_unit: '',
  71 + record_duty: '',
  72 + record_name: '',
  73 + record_phone: ''
68 } 74 }
69 ], 75 ],
70 front_card: '', //身份证正面照 76 front_card: '', //身份证正面照
71 - reverse_card: '' //身份证反面照 77 + reverse_card: '', //身份证反面照
  78 + id:'',//用户id,
72 }, 79 },
73 setname(e) { 80 setname(e) {
74 this.setData({ 81 this.setData({
@@ -125,11 +132,7 @@ Page({ @@ -125,11 +132,7 @@ Page({
125 sex: parseInt(e.detail.value) + 1 132 sex: parseInt(e.detail.value) + 1
126 }) 133 })
127 }, 134 },
128 - setfixed_phone(e) {  
129 - this.setData({  
130 - fixed_phone: e.detail.value  
131 - })  
132 - }, 135 +
133 setmove_phone(e) { 136 setmove_phone(e) {
134 this.setData({ 137 this.setData({
135 move_phone: e.detail.value 138 move_phone: e.detail.value
@@ -167,6 +170,205 @@ Page({ @@ -167,6 +170,205 @@ Page({
167 type: parseInt(e.detail.value) +1 170 type: parseInt(e.detail.value) +1
168 }) 171 })
169 }, 172 },
  173 + start(e) {
  174 + let that = this;
  175 + let tem = e.currentTarget.dataset.tem;
  176 + app.globalData.userInfo = e.detail.userInfo;
  177 + wx.login({
  178 + success: function (s) {
  179 + let url = 'wxapp/public/getSessionKey';
  180 + if (s.code) {
  181 + var code = s.code;
  182 + var param = {
  183 + code: code
  184 + }
  185 + app.post(url, param).then((res) => {
  186 + that.login(res.openid, res.session_key, e.detail.encryptedData, e.detail.iv,tem);
  187 + }).catch((errMsg) => {
  188 + console.log(errMsg);
  189 + })
  190 + }
  191 + }
  192 + });
  193 + },
  194 + login(openid, session_key, encrypted_data, iv,tem) {
  195 + let that = this;
  196 + let param = {
  197 + openid: openid,
  198 + session_key: session_key,
  199 + encrypted_data: encrypted_data,
  200 + iv: iv
  201 + }
  202 + let url = 'wxapp/public/login';
  203 + app.post(url, param).then((res) => {
  204 + wx.setStorageSync('token', res.token);
  205 + that.setData({
  206 + ifempower:true
  207 + })
  208 + that.uploadImage(tem);
  209 + }).catch((errMsg) => {
  210 + console.log(errMsg);
  211 + })
  212 + },
  213 +
  214 + //选择省市区
  215 + getarea(){
  216 + let that=this;
  217 + let url ='index/area/index';
  218 + app.post(url,{}).then((res)=>{
  219 + let country = res.country;
  220 + let tem = {
  221 + id: 0,
  222 + city_id: res.country[0].city_id,
  223 + country_id: 0,
  224 + country_name: ''
  225 + }
  226 + country.push(tem);
  227 + let temcountry = country.reverse();
  228 + let cityarr = res.city;
  229 + let countryarr = res.country;
  230 + let provincearr = res.province;
  231 + that.setData({
  232 + cityarr: cityarr,
  233 + countryarr: temcountry,
  234 + provincearr: provincearr
  235 + })
  236 + if (that.data.is_submit==undefined){
  237 + that.setData({
  238 + ifempower:false
  239 + })
  240 +
  241 + }else if (that.data.is_submit=='1'){
  242 + that.getdatalist();
  243 + }
  244 +
  245 + }).catch((err)=>{
  246 + console.log(err)
  247 + })
  248 + },
  249 + //切换省份获取市和区/县
  250 + get_city(province_id=0){
  251 + let that=this;
  252 + let url ='index/area/get_city';
  253 + let params={
  254 + 'province_id': province_id
  255 + }
  256 + app.post(url, params).then((res)=>{
  257 + console.log('切换省份获取市和区/县',res);
  258 + let country = res.country;
  259 + let tem = {
  260 + id: 0,
  261 + city_id: res.country[0].city_id,
  262 + country_id: 0,
  263 + country_name: ' '
  264 + }
  265 + country.push(tem);
  266 + let temcountry = country.reverse();
  267 + that.setData({
  268 + cityarr: res.city,
  269 + countryarr: temcountry
  270 + })
  271 + }).catch((err)=>{
  272 + console.log(err)
  273 + })
  274 + },
  275 + //切换市获取区/县
  276 + get_country(city_id=0){
  277 + let that=this;
  278 + let url ='index/area/get_country';
  279 + let params={
  280 + 'city_id': city_id
  281 + }
  282 + app.post(url, params).then((res) => {
  283 + console.log('切换市获取区/县', res);
  284 + let country = res.country;
  285 + let tem={
  286 + id:0,
  287 + city_id: res.country[0].city_id,
  288 + country_id:0,
  289 + country_name:' '
  290 + }
  291 + country.push(tem);
  292 + let temcountry = country.reverse();
  293 + that.setData({
  294 + countryarr: temcountry
  295 + })
  296 + }).catch((err) => {
  297 + console.log(err)
  298 + })
  299 + },
  300 + bindChange: function (e) {
  301 + let that=this;
  302 + let valarr = that.data.valarr;
  303 + let provincearr = that.data.provincearr;
  304 + let cityarr = that.data.cityarr;
  305 + const val = e.detail.value;
  306 + if (valarr[0] != val[0] ){//改变省
  307 + let i = val[0];
  308 + that.get_city(provincearr[i].province_id);
  309 + valarr[0] = val[0];
  310 + valarr[1] = 0;
  311 + valarr[2] = 0;
  312 + that.setData({
  313 + valarr: valarr
  314 + })
  315 + } else if (valarr[1] != val[1]){//改变市
  316 + let j = val[1];
  317 + that.get_country(cityarr[j].city_id);
  318 + valarr[1] = val[1];
  319 + valarr[2] = 0;
  320 + that.setData({
  321 + valarr: valarr
  322 + })
  323 + }else {//改变区
  324 + valarr[2] = val[2];
  325 + that.setData({
  326 + valarr: valarr
  327 + })
  328 + }
  329 + },
  330 + //取消地区选择
  331 + setno(){
  332 + let that=this;
  333 + that.setData({
  334 + valarr: that.data.confirmvalarr,
  335 + showapply: false
  336 + })
  337 + },
  338 + //确定选择区域
  339 + setyes(){
  340 + let that=this;
  341 + let valarr = that.data.valarr;
  342 + let i = valarr[0];
  343 + let j = valarr[1];
  344 + let k = valarr[2];
  345 + let provincearr = that.data.provincearr;
  346 + let cityarr = that.data.cityarr;
  347 + let countryarr = that.data.countryarr;
  348 + that.setData({
  349 + confirmvalarr: valarr,
  350 + province: provincearr[i].province_name,
  351 + city: cityarr[j].city_name,
  352 + county: countryarr[k].country_name,
  353 + address: provincearr[i].province_name + cityarr[j].city_name + countryarr[k].country_name,
  354 + showapply:false
  355 + })
  356 + },
  357 +
  358 + setshowapply(){
  359 + let that=this;
  360 + that.setData({
  361 + showapply:true
  362 + })
  363 + },
  364 + setshowapply_no() {
  365 + let that = this;
  366 + that.setData({
  367 + showapply: false
  368 + })
  369 + },
  370 + void_fun(){
  371 + },
170 bindRegionChange(e){ 372 bindRegionChange(e){
171 let that=this; 373 let that=this;
172 console.log(e); 374 console.log(e);
@@ -178,24 +380,11 @@ Page({ @@ -178,24 +380,11 @@ Page({
178 address: e.detail.value[0] + e.detail.value[1] + e.detail.value[2] 380 address: e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
179 }) 381 })
180 }, 382 },
181 - chooseaddress() {  
182 - let that = this;  
183 - // wx.chooseAddress({  
184 - // success: function(res) {  
185 - // that.setData({  
186 - // province: res.provinceName,  
187 - // city: res.cityName,  
188 - // county: res.countyName,  
189 - // address: res.provinceName + res.cityName + res.countyName + res.detailInfo  
190 - // })  
191 - // }  
192 - // })  
193 - },  
194 bindstartChange(e) { 383 bindstartChange(e) {
195 let that = this; 384 let that = this;
196 let apply_nav = parseInt(that.data.apply_nav); 385 let apply_nav = parseInt(that.data.apply_nav);
197 let record = that.data.record; 386 let record = that.data.record;
198 - record[apply_nav].start_time = e.detail.value; 387 + record[apply_nav].record_start_time = e.detail.value;
199 that.setData({ 388 that.setData({
200 record: record 389 record: record
201 }) 390 })
@@ -204,7 +393,7 @@ Page({ @@ -204,7 +393,7 @@ Page({
204 let that = this; 393 let that = this;
205 let apply_nav = that.data.apply_nav; 394 let apply_nav = that.data.apply_nav;
206 let record = that.data.record; 395 let record = that.data.record;
207 - record[apply_nav].end_time = e.detail.value; 396 + record[apply_nav].record_end_time = e.detail.value;
208 that.setData({ 397 that.setData({
209 record: record 398 record: record
210 }) 399 })
@@ -213,7 +402,7 @@ Page({ @@ -213,7 +402,7 @@ Page({
213 let that = this; 402 let that = this;
214 let apply_nav = that.data.apply_nav; 403 let apply_nav = that.data.apply_nav;
215 let record = that.data.record; 404 let record = that.data.record;
216 - record[apply_nav].unit = e.detail.value; 405 + record[apply_nav].record_unit = e.detail.value;
217 that.setData({ 406 that.setData({
218 record: record 407 record: record
219 }) 408 })
@@ -222,7 +411,7 @@ Page({ @@ -222,7 +411,7 @@ Page({
222 let that = this; 411 let that = this;
223 let apply_nav = that.data.apply_nav; 412 let apply_nav = that.data.apply_nav;
224 let record = that.data.record; 413 let record = that.data.record;
225 - record[apply_nav].name = e.detail.value; 414 + record[apply_nav].record_name = e.detail.value;
226 that.setData({ 415 that.setData({
227 record: record 416 record: record
228 }) 417 })
@@ -231,7 +420,7 @@ Page({ @@ -231,7 +420,7 @@ Page({
231 let that = this; 420 let that = this;
232 let apply_nav = that.data.apply_nav; 421 let apply_nav = that.data.apply_nav;
233 let record = that.data.record; 422 let record = that.data.record;
234 - record[apply_nav].duty = e.detail.value; 423 + record[apply_nav].record_duty = e.detail.value;
235 that.setData({ 424 that.setData({
236 record: record 425 record: record
237 }) 426 })
@@ -240,14 +429,19 @@ Page({ @@ -240,14 +429,19 @@ Page({
240 let that = this; 429 let that = this;
241 let apply_nav = that.data.apply_nav; 430 let apply_nav = that.data.apply_nav;
242 let record = that.data.record; 431 let record = that.data.record;
243 - record[apply_nav].phone = e.detail.value; 432 + record[apply_nav].record_phone = e.detail.value;
244 that.setData({ 433 that.setData({
245 record: record 434 record: record
246 }) 435 })
247 }, 436 },
248 - //上传头像1为头像，2为省份证正面，3为省份证反面  
249 - uploadImages(e) { 437 + uploadImages(e){
  438 + let that=this;
250 let tem = e.currentTarget.dataset.tem; 439 let tem = e.currentTarget.dataset.tem;
  440 + that.uploadImage(tem);
  441 +
  442 + },
  443 + //上传头像1为头像，2为省份证正面，3为省份证反面
  444 + uploadImage(tem) {
251 let that = this; 445 let that = this;
252 wx.chooseImage({ 446 wx.chooseImage({
253 count: 1, 447 count: 1,
@@ -258,7 +452,7 @@ Page({ @@ -258,7 +452,7 @@ Page({
258 'XX-Token': wx.getStorageSync('token'), 452 'XX-Token': wx.getStorageSync('token'),
259 'XX-Device-Type': '' 453 'XX-Device-Type': ''
260 } 454 }
261 - let url = 'http://volunteer.w.bronet.cn/api/user/upload/one'; 455 + let url = 'https://volunteer.cnpu.org/api/user/upload/one';
262 wx.uploadFile({ 456 wx.uploadFile({
263 url: url, //仅为示例，非真实的接口地址 457 url: url, //仅为示例，非真实的接口地址
264 filePath: tempFilePaths[0], 458 filePath: tempFilePaths[0],
@@ -300,7 +494,6 @@ Page({ @@ -300,7 +494,6 @@ Page({
300 submit() { 494 submit() {
301 let that = this; 495 let that = this;
302 let err=''; 496 let err='';
303 -  
304 //匹配中国邮政编码 497 //匹配中国邮政编码
305 // var AuglyTest_PostalCode = /^[0-9]\\d{5}$/; 498 // var AuglyTest_PostalCode = /^[0-9]\\d{5}$/;
306 //匹配身份证 499 //匹配身份证
@@ -341,10 +534,6 @@ Page({ @@ -341,10 +534,6 @@ Page({
341 err = '请输入您的身份证号!'; 534 err = '请输入您的身份证号!';
342 } else if (!AuglyTest_ID.test(that.data.card_number)){ 535 } else if (!AuglyTest_ID.test(that.data.card_number)){
343 err = '请输入正确的身份证号!'; 536 err = '请输入正确的身份证号!';
344 - }else if (that.data.fixed_phone==''){  
345 - err = '请输入您的固定电话!';  
346 - } else if (!AuglyTest_tel.test(that.data.fixed_phone)){  
347 - err = '请输入正确的固定电话!';  
348 }else if (that.data.move_phone==''){ 537 }else if (that.data.move_phone==''){
349 err = '请输入您的移动电话!'; 538 err = '请输入您的移动电话!';
350 } else if (!AuglyTest_phone.test(that.data.move_phone)){ 539 } else if (!AuglyTest_phone.test(that.data.move_phone)){
@@ -378,12 +567,12 @@ Page({ @@ -378,12 +567,12 @@ Page({
378 let record_name = []; 567 let record_name = [];
379 let record_phone = []; 568 let record_phone = [];
380 for (let obj of record) { 569 for (let obj of record) {
381 - record_start_time.push(obj.start_time);  
382 - record_end_time.push(obj.end_time);  
383 - record_unit.push(obj.unit);  
384 - record_duty.push(obj.duty);  
385 - record_name.push(obj.name);  
386 - record_phone.push(obj.phone); 570 + record_start_time.push(obj.record_start_time);
  571 + record_end_time.push(obj.record_end_time);
  572 + record_unit.push(obj.record_unit);
  573 + record_duty.push(obj.record_duty);
  574 + record_name.push(obj.record_name);
  575 + record_phone.push(obj.record_phone);
387 } 576 }
388 let url = 'index/member_center/submit_form'; 577 let url = 'index/member_center/submit_form';
389 let head = { 578 let head = {
@@ -401,7 +590,7 @@ Page({ @@ -401,7 +590,7 @@ Page({
401 addr: that.data.addr, 590 addr: that.data.addr,
402 school: that.data.school, 591 school: that.data.school,
403 card_number: that.data.card_number, 592 card_number: that.data.card_number,
404 - fixed_phone: that.data.fixed_phone, 593 +
405 move_phone: that.data.move_phone, 594 move_phone: that.data.move_phone,
406 postcode: that.data.postcode, 595 postcode: that.data.postcode,
407 email: that.data.email, 596 email: that.data.email,
@@ -428,6 +617,7 @@ Page({ @@ -428,6 +617,7 @@ Page({
428 icon: 'none', 617 icon: 'none',
429 duration: 2000 618 duration: 2000
430 }) 619 })
  620 +
431 setTimeout(function(){ 621 setTimeout(function(){
432 wx.switchTab({ 622 wx.switchTab({
433 url: '/pages/my/my' 623 url: '/pages/my/my'
@@ -444,15 +634,83 @@ Page({ @@ -444,15 +634,83 @@ Page({
444 }) 634 })
445 } 635 }
446 }, 636 },
  637 + getdatalist(){
  638 + let that=this;
  639 + let url ='/index/member_center/edit';
  640 + let params={
  641 + 'id':that.data.id
  642 + };
  643 + let head={
  644 + 'XX-Token':wx.getStorageSync('token')
  645 + }
  646 + app.post(url, params, head).then((res)=>{
  647 + let provincearr = that.data.provincearr;
  648 + let cityarr = that.data.cityarr;
  649 + let countryarr = that.data.countryarr;
  650 + let val=[0,0,0];
  651 + for (let i=0; i<provincearr.length;i++ ){
  652 + if (provincearr[i].province_name == res.province){
  653 + val[0]=i;
  654 + }
  655 + }
  656 + for (let i = 0; i < cityarr.length; i++) {
  657 + if (cityarr[i].city_name == res.city) {
  658 + val[1] = i;
  659 + }
  660 + }
  661 + for (let i = 0; i < countryarr.length; i++) {
  662 + if (countryarr[i].country_name == res.county) {
  663 + val[2] = i;
  664 + }
  665 + }
  666 + that.setData({
  667 + valarr: val,
  668 + confirmvalarr: val,
  669 + addr: res.addr,
  670 + address: res.address,
  671 + birthday: res.birthday,
  672 + card_number: res.card_number,
  673 + city: res.city,
  674 + county: res.county,
  675 + duty: res.duty,
  676 + education: res.education,
  677 + email: res.email,
  678 + front_card: res.front_card,
  679 + move_phone: res.move_phone,
  680 + name: res.name,
  681 + nation: res.nation,
  682 + photo: res.photo,
  683 + politics: res.politics,
  684 + postcode:res.postcode,
  685 + province: res.province,
  686 + qq: res.qq,
  687 + record: res.record,
  688 + reverse_card: res.reverse_card,
  689 + school: res.school,
  690 + sex: res.sex,
  691 + unit: res.unit,
  692 + urgency_phone: res.urgency_phone,
  693 + type: res.type
  694 + })
  695 + }).catch((err)=>{
  696 + console.log(err)
  697 + })
  698 + },
447 /** 699 /**
448 * 生命周期函数--监听页面加载 700 * 生命周期函数--监听页面加载
449 */ 701 */
450 onLoad: function(options) { 702 onLoad: function(options) {
  703 + let that=this;
  704 + that.setData({
  705 + is_submit: options.is_submit,
  706 + id: options.id
  707 + })
451 let now = new Date(); 708 let now = new Date();
452 let time = now.getFullYear() + "-" + ((now.getMonth() + 1) < 10 ? "0" : "") + (now.getMonth() + 1) + "-" + (now.getDate() < 10 ? "0" : "") + now.getDate(); 709 let time = now.getFullYear() + "-" + ((now.getMonth() + 1) < 10 ? "0" : "") + (now.getMonth() + 1) + "-" + (now.getDate() < 10 ? "0" : "") + now.getDate();
453 this.setData({ 710 this.setData({
454 enddata: time 711 enddata: time
455 }) 712 })
  713 + that.getarea();
456 }, 714 },
457 715
458 /** 716 /**
@@ -467,12 +725,15 @@ Page({ @@ -467,12 +725,15 @@ Page({
467 */ 725 */
468 onShow: function() { 726 onShow: function() {
469 727
  728 +
470 }, 729 },
471 730
472 /** 731 /**
473 * 生命周期函数--监听页面隐藏 732 * 生命周期函数--监听页面隐藏
474 */ 733 */
475 onHide: function() { 734 onHide: function() {
  735 +
  736 +
476 737
477 }, 738 },
478 739
@@ -480,7 +741,7 @@ Page({ @@ -480,7 +741,7 @@ Page({
480 * 生命周期函数--监听页面卸载 741 * 生命周期函数--监听页面卸载
481 */ 742 */
482 onUnload: function() { 743 onUnload: function() {
483 - 744 +
484 }, 745 },
485 746
486 /** 747 /**
1 <!--pages/apply/apply.wxml--> 1 <!--pages/apply/apply.wxml-->
2 -<view class='upimg' bindtap='uploadImages' data-tem='1'>  
3 -<image src='{{photo}}' wx:if='{{photo}}'></image>  
4 - <view class='iconfont icon-xiangji' wx:if='{{photo==""}}'></view> 2 +<view class='upimg' bindtap='{{ifempower?"uploadImages":""}}' data-tem='1'>
  3 +<button open-type='getUserInfo' bindgetuserinfo='start' class='inofbtn' if='{{!ifempower}}' data-tem='1'></button>
  4 + <image src='{{photo}}' wx:if='{{photo}}'></image>
  5 + <view class='iconfont icon-xiangji' wx:if='{{!photo}}' ></view>
5 </view> 6 </view>
6 <view class='apply_item'> 7 <view class='apply_item'>
7 <view>姓名</view> 8 <view>姓名</view>
8 <view class='apply_item_input'> 9 <view class='apply_item_input'>
9 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setname'></input> 10 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setname' value='{{name}}' ></input>
10 </view> 11 </view>
11 </view> 12 </view>
12 <picker bindchange="bindsex" range="{{arraysex}}"> 13 <picker bindchange="bindsex" range="{{arraysex}}">
@@ -57,78 +58,80 @@ @@ -57,78 +58,80 @@
57 <view class='apply_item'> 58 <view class='apply_item'>
58 <view>工作单位</view> 59 <view>工作单位</view>
59 <view class='apply_item_input'> 60 <view class='apply_item_input'>
60 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setunit'></input> 61 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setunit' value='{{unit}}'></input>
61 </view> 62 </view>
62 </view> 63 </view>
63 <view class='apply_item'> 64 <view class='apply_item'>
64 <view>职务</view> 65 <view>职务</view>
65 <view class='apply_item_input'> 66 <view class='apply_item_input'>
66 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setduty'></input> 67 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setduty' value='{{duty}}'></input>
67 </view> 68 </view>
68 </view> 69 </view>
69 <view class='apply_item'> 70 <view class='apply_item'>
70 <view>通讯地址</view> 71 <view>通讯地址</view>
71 <view class='apply_item_input'> 72 <view class='apply_item_input'>
72 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setaddr'></input> 73 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setaddr' value='{{addr}}'></input>
73 </view> 74 </view>
74 </view> 75 </view>
75 <view class='apply_item'> 76 <view class='apply_item'>
76 <view>邮编</view> 77 <view>邮编</view>
77 <view class='apply_item_input'> 78 <view class='apply_item_input'>
78 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setpostcode'></input> 79 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setpostcode' value='{{postcode}}'></input>
79 </view> 80 </view>
80 </view> 81 </view>
81 <view class='apply_item'> 82 <view class='apply_item'>
82 <view>就读/毕业院校</view> 83 <view>就读/毕业院校</view>
83 <view class='apply_item_input'> 84 <view class='apply_item_input'>
84 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setschool'></input> 85 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setschool' value='{{school}}'></input>
85 </view> 86 </view>
86 </view> 87 </view>
87 <view class='apply_item'> 88 <view class='apply_item'>
88 <view>身份证号</view> 89 <view>身份证号</view>
89 <view class='apply_item_input'> 90 <view class='apply_item_input'>
90 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setcard_number'></input> 91 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setcard_number' value='{{card_number}}'></input>
91 </view> 92 </view>
92 </view> 93 </view>
93 -<view class='apply_item'> 94 +<!-- <view class='apply_item'>
94 <view>固定电话</view> 95 <view>固定电话</view>
95 <view class='apply_item_input'> 96 <view class='apply_item_input'>
96 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setfixed_phone'></input> 97 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setfixed_phone' value='{{fixed_phone}}'></input>
97 </view> 98 </view>
98 -</view> 99 +</view> -->
99 <view class='apply_item'> 100 <view class='apply_item'>
100 <view>移动电话</view> 101 <view>移动电话</view>
101 <view class='apply_item_input'> 102 <view class='apply_item_input'>
102 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setmove_phone'></input> 103 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setmove_phone' value='{{move_phone}}'></input>
103 </view> 104 </view>
104 </view> 105 </view>
105 <view class='apply_item'> 106 <view class='apply_item'>
106 <view>电子邮箱</view> 107 <view>电子邮箱</view>
107 <view class='apply_item_input'> 108 <view class='apply_item_input'>
108 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setemail'></input> 109 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setemail' value='{{email}}'></input>
109 </view> 110 </view>
110 </view> 111 </view>
111 <view class='apply_item big_item'> 112 <view class='apply_item big_item'>
112 <view>紧急联系人及电话</view> 113 <view>紧急联系人及电话</view>
113 <view class='apply_item_input'> 114 <view class='apply_item_input'>
114 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='seturgency_phone'></input> 115 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='seturgency_phone' value='{{urgency_phone}}'></input>
115 </view> 116 </view>
116 </view> 117 </view>
117 <view class='apply_item'> 118 <view class='apply_item'>
118 <view>QQ号码</view> 119 <view>QQ号码</view>
119 <view class='apply_item_input'> 120 <view class='apply_item_input'>
120 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setqq'></input> 121 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setqq' value='{{qq}}'></input>
121 </view> 122 </view>
122 </view> 123 </view>
123 -<picker mode ='region' bindchange='bindRegionChange' value="{{region}}">  
124 - <view class='apply_item' > 124 +
  125 + <view class='apply_item' bindtap='setshowapply'>
125 <view>服务区域</view> 126 <view>服务区域</view>
126 <view class='apply_item_input'> 127 <view class='apply_item_input'>
127 <view class='iconfont icon-xiangyou'></view> 128 <view class='iconfont icon-xiangyou'></view>
128 <view class='apply_itemtxt {{address?"color333":""}}'>{{address?address:'请选择'}}</view> 129 <view class='apply_itemtxt {{address?"color333":""}}'>{{address?address:'请选择'}}</view>
129 </view> 130 </view>
130 </view> 131 </view>
131 - </picker> 132 +
  133 +
  134 +
132 <picker range='{{typearr}}' bindchange="bindtypeChange"> 135 <picker range='{{typearr}}' bindchange="bindtypeChange">
133 <view class='apply_item'> 136 <view class='apply_item'>
134 <view>志愿类别</view> 137 <view>志愿类别</view>
@@ -151,7 +154,7 @@ @@ -151,7 +154,7 @@
151 <view>开始时间</view> 154 <view>开始时间</view>
152 <view class='apply_item_input'> 155 <view class='apply_item_input'>
153 <view class='iconfont icon-xiangyou'></view> 156 <view class='iconfont icon-xiangyou'></view>
154 - <view class='apply_itemtxt {{record[apply_nav].start_time?"color333":""}}'>{{record[apply_nav].start_time?record[apply_nav].start_time:'请选择'}}</view> 157 + <view class='apply_itemtxt {{record[apply_nav].record_start_time?"color333":""}}'>{{record[apply_nav].record_start_time?record[apply_nav].record_start_time:'请选择'}}</view>
155 </view> 158 </view>
156 </view> 159 </view>
157 </picker> 160 </picker>
@@ -160,32 +163,32 @@ @@ -160,32 +163,32 @@
160 <view>结束时间</view> 163 <view>结束时间</view>
161 <view class='apply_item_input'> 164 <view class='apply_item_input'>
162 <view class='iconfont icon-xiangyou'></view> 165 <view class='iconfont icon-xiangyou'></view>
163 - <view class='apply_itemtxt {{record[apply_nav].end_time?"color333":""}}'>{{record[apply_nav].end_time?record[apply_nav].end_time:'请选择'}}</view> 166 + <view class='apply_itemtxt {{record[apply_nav].record_end_time?"color333":""}}'>{{record[apply_nav].record_end_time?record[apply_nav].record_end_time:'请选择'}}</view>
164 </view> 167 </view>
165 </view> 168 </view>
166 </picker> 169 </picker>
167 <view class='apply_item'> 170 <view class='apply_item'>
168 <view>单位名称</view> 171 <view>单位名称</view>
169 <view class='apply_item_input'> 172 <view class='apply_item_input'>
170 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].unit}}' bindinput='setrecordunit'></input> 173 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_unit}}' bindinput='setrecordunit'></input>
171 </view> 174 </view>
172 </view> 175 </view>
173 <view class='apply_item'> 176 <view class='apply_item'>
174 <view>职务</view> 177 <view>职务</view>
175 <view class='apply_item_input'> 178 <view class='apply_item_input'>
176 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].duty}}' bindinput='setrecordduty'></input> 179 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_duty}}' bindinput='setrecordduty'></input>
177 </view> 180 </view>
178 </view> 181 </view>
179 <view class='apply_item'> 182 <view class='apply_item'>
180 <view>证明人</view> 183 <view>证明人</view>
181 <view class='apply_item_input'> 184 <view class='apply_item_input'>
182 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].name}}' bindinput='setrecordname'></input> 185 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_name}}' bindinput='setrecordname'></input>
183 </view> 186 </view>
184 </view> 187 </view>
185 <view class='apply_item'> 188 <view class='apply_item'>
186 <view>证明人电话</view> 189 <view>证明人电话</view>
187 <view class='apply_item_input'> 190 <view class='apply_item_input'>
188 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].phone}}' bindinput='setrecordphone'></input> 191 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_phone}}' bindinput='setrecordphone'></input>
189 </view> 192 </view>
190 </view> 193 </view>
191 </view> 194 </view>
@@ -198,7 +201,7 @@ @@ -198,7 +201,7 @@
198 </view> 201 </view>
199 <view>上传身份证正面</view> 202 <view>上传身份证正面</view>
200 </view> 203 </view>
201 - <image src='{{front_card?front_card:"http://volunteer.w.bronet.cn/imgs/renzhengxinxi_fanmian_bg@2x.png"}}'></image> 204 + <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}'></image>
202 </view> 205 </view>
203 <view class='apply_idimg' bindtap='uploadImages' data-tem='3'> 206 <view class='apply_idimg' bindtap='uploadImages' data-tem='3'>
204 <view class='apply_idimgmain' wx:if='{{!reverse_card}}' > 207 <view class='apply_idimgmain' wx:if='{{!reverse_card}}' >
@@ -207,7 +210,7 @@ @@ -207,7 +210,7 @@
207 </view> 210 </view>
208 <view>上传身份证反面</view> 211 <view>上传身份证反面</view>
209 </view> 212 </view>
210 - <image src='{{reverse_card?reverse_card:"http://volunteer.w.bronet.cn/imgs/renzhengxinxi_zhengmian_bg@2x.png"}}'></image> 213 + <image src='{{reverse_card?reverse_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_zhengmian_bg@2x.png"}}'></image>
211 </view> 214 </view>
212 </view> 215 </view>
213 <view class='apply_bottomtitle'>志愿者申请书 216 <view class='apply_bottomtitle'>志愿者申请书
@@ -216,4 +219,29 @@ @@ -216,4 +219,29 @@
216 为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。 219 为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。
217 本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。 220 本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
218 </view> 221 </view>
219 - <view class='apply_btn' bindtap='submit'>提交</view>  
  222 + <view class='apply_btn' bindtap='submit' >
  223 +
  224 + 提交
  225 + </view>
  226 +
  227 + <!-- 服务区域 -->
  228 + <view class='apply_vold' wx:if='{{showapply}}' >
  229 + <view class='pickerview'>
  230 + <picker-view indicator-style="height: 40px;" class='pickerview_top' value="{{confirmvalarr}}" bindchange="bindChange">
  231 + <view class='iconfont icon-guanbi1' catchtap='setshowapply_no'></view>
  232 + <picker-view-column>
  233 + <view wx:for="{{provincearr}}" wx:key style="line-height: 40px" class='column_view'>{{ item.province_name}}</view>
  234 + </picker-view-column>
  235 + <picker-view-column>
  236 + <view wx:for="{{cityarr}}" wx:key style="line-height: 40px" class='column_view'>{{item.city_name}}</view>
  237 + </picker-view-column>
  238 + <picker-view-column>
  239 + <view wx:for="{{countryarr}}" wx:key style="line-height: 40px" class='column_view'>{{item.country_name}}</view>
  240 + </picker-view-column>
  241 + </picker-view>
  242 + <view class='apply_vold_btn'>
  243 + <view class='applybtn' catchtap='setno'>取消</view>
  244 + <view class='applybtn yes_applybtn' catchtap='setyes'>确定</view>
  245 + </view>
  246 + </view>
  247 + </view>
@@ -160,6 +160,7 @@ z-index:10; @@ -160,6 +160,7 @@ z-index:10;
160 line-height: 50rpx; 160 line-height: 50rpx;
161 } 161 }
162 .apply_btn{ 162 .apply_btn{
  163 + position: relative;
163 margin: 0 32rpx 32rpx 32rpx; 164 margin: 0 32rpx 32rpx 32rpx;
164 height: 88rpx; 165 height: 88rpx;
165 line-height: 88rpx; 166 line-height: 88rpx;
@@ -176,4 +177,79 @@ z-index:10; @@ -176,4 +177,79 @@ z-index:10;
176 } 177 }
177 .color333{ 178 .color333{
178 color:#333; 179 color:#333;
  180 +}
  181 +.apply_vold{
  182 +
  183 + position: fixed;
  184 + top:0;
  185 + left:0;
  186 + width:100%;
  187 + height: 100%;
  188 + background: rgba(0,0,0,0.2);
  189 + z-index: 10;
  190 + display: flex;
  191 + /* display: none; */
  192 + justify-content: center;
  193 + align-items: center;
  194 +}
  195 +.pickerview{
  196 + position: relative;
  197 + background: #fff;
  198 + width:100%;
  199 + margin: 0 auto;
  200 + overflow: hidden;
  201 +}
  202 +.pickerview .icon-guanbi1{
  203 + position: absolute;
  204 + font-weight: bold;
  205 + font-size: 40rpx;
  206 + top:20rpx;
  207 + right: 50rpx;
  208 + color:#333;
  209 + z-index:100;
  210 +}
  211 +.pickerview_top{
  212 + width:100%;
  213 + padding:0 30rpx;
  214 + height: 400rpx;
  215 +}
  216 +.apply_vold_btn{
  217 + display: flex;
  218 + align-items: center;
  219 + justify-content: space-between;
  220 +}
  221 +.applybtn{
  222 + position: relative;
  223 + border:1rpx solid #f6f6f6;
  224 + color:#333;
  225 + font-size: 40rpx;
  226 + height: 80rpx;
  227 + width:50%;
  228 + display: flex;
  229 + align-items: center;
  230 + justify-content: center;
  231 +}
  232 +.inofbtn{
  233 + position: absolute;
  234 + top:0;
  235 + left:0;
  236 +
  237 + width:100%;
  238 + height: 100%;
  239 + z-index:10;
  240 + opacity: 0;
  241 +
  242 +}
  243 +.applybtn:active{
  244 + opacity: 0.7;
  245 +}
  246 +.yes_applybtn{
  247 + background-color: #04be02;
  248 + color:#fff;
  249 + border:1rpx solid #04be02;
  250 +}
  251 +.column_view{
  252 + display: flex;
  253 + justify-content: center;
  254 + align-items: center;
179 } 255 }
  1 +// pages/close_apply/close_apply.js
  2 +const app = getApp();
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + //
  10 + showapply: false,
  11 + provincearr: [],
  12 + cityarr: [],
  13 + countryarr: [],
  14 + confirmvalarr: [0, 0, 0],
  15 + valarr: [0, 0, 0],
  16 + photo: '',
  17 + name: '',
  18 + enddata: '',
  19 + arraysex: ['男', '女'],
  20 + sex: '',
  21 + birthday: '', //生日
  22 + nation: '', //民族
  23 + nationarr: ["汉族", "蒙古族", "回族", "藏族", "维吾尔族", "苗族", "彝族", "壮族", "布依族", "朝鲜族", "满族", "侗族", "瑶族", "白族", "土家族",
  24 + "哈尼族", "哈萨克族", "傣族", "黎族", "傈僳族", "佤族", "畲族", "高山族", "拉祜族", "水族", "东乡族", "纳西族", "景颇族", "柯尔克孜族",
  25 + "土族", "达斡尔族", "仫佬族", "羌族", "布朗族", "撒拉族", "毛南族", "仡佬族", "锡伯族", "阿昌族", "普米族", "塔吉克族", "怒族", "乌孜别克族",
  26 + "俄罗斯族", "鄂温克族", "德昂族", "保安族", "裕固族", "京族", "塔塔尔族", "独龙族", "鄂伦春族", "赫哲族", "门巴族", "珞巴族", "基诺族"
  27 + ],
  28 +
  29 + politics: '', //政治面貌
  30 + politicsarr: ['共青团员', '中共预备党员', '中共党员', '群众', '无党派人士', '其他'], //
  31 + education: '', //学历
  32 + educationarr: ['小学', '中学', '专科', '本科', '硕士研究生', '博士研究生', '其他'], //
  33 + unit: '', //工作单位
  34 + duty: '', //职务
  35 + addr: '', //通讯地址,
  36 + postcode: '', //邮编
  37 + school: '', //
  38 + card_number: '', //身份证号码
  39 + fixed_phone: '', //固定电话
  40 + move_phone: '', //
  41 + email: '', //
  42 + urgency_phone: '', //
  43 + qq: '',
  44 + province: '',
  45 + city: '',
  46 + county: '',
  47 + address: '', //详细地址,
  48 + type: '', //1医院志愿者，2社会志愿者，3办事处志愿者
  49 + typearr: ['医院志愿者', '社会志愿者', '办事处志愿者'],
  50 + apply_nav: 0, //0为履历1，1为履历2，2为履历3，
  51 + record: [{
  52 + record_start_time: '',
  53 + record_end_time: '',
  54 + record_unit: '',
  55 + record_duty: '',
  56 + record_name: '',
  57 + record_phone: ''
  58 + },
  59 + {
  60 + record_start_time: '',
  61 + record_end_time: '',
  62 + record_unit: '',
  63 + record_duty: '',
  64 + record_name: '',
  65 + record_phone: ''
  66 + },
  67 + {
  68 + record_start_time: '',
  69 + record_end_time: '',
  70 + record_unit: '',
  71 + record_duty: '',
  72 + record_name: '',
  73 + record_phone: ''
  74 + }
  75 + ],
  76 + front_card: '', //身份证正面照
  77 + reverse_card: '', //身份证反面照
  78 + id: '',//用户id,
  79 +
  80 + },
  81 +
  82 + getdatalist() {
  83 + let that = this;
  84 + let url = '/index/member_center/edit';
  85 + let params = {
  86 + 'id': that.data.id
  87 + };
  88 + let head = {
  89 + 'XX-Token': wx.getStorageSync('token')
  90 + }
  91 + app.post(url, params, head).then((res) => {
  92 + let provincearr = that.data.provincearr;
  93 + let cityarr = that.data.cityarr;
  94 + let countryarr = that.data.countryarr;
  95 + let val = [0, 0, 0];
  96 + for (let i = 0; i < provincearr.length; i++) {
  97 + if (provincearr[i].province_name == res.province) {
  98 + val[0] = i;
  99 + }
  100 + }
  101 + for (let i = 0; i < cityarr.length; i++) {
  102 + if (cityarr[i].city_name == res.city) {
  103 + val[1] = i;
  104 + }
  105 + }
  106 + for (let i = 0; i < countryarr.length; i++) {
  107 + if (countryarr[i].country_name == res.county) {
  108 + val[2] = i;
  109 + }
  110 + }
  111 + that.setData({
  112 + valarr: val,
  113 + confirmvalarr: val,
  114 + addr: res.addr,
  115 + address: res.address,
  116 + birthday: res.birthday,
  117 + card_number: res.card_number,
  118 + city: res.city,
  119 + county: res.county,
  120 + duty: res.duty,
  121 + education: res.education,
  122 + email: res.email,
  123 + fixed_phone: res.fixed_phone,
  124 + front_card: res.front_card,
  125 + move_phone: res.move_phone,
  126 + name: res.name,
  127 + nation: res.nation,
  128 + photo: res.photo,
  129 + politics: res.politics,
  130 + postcode: res.postcode,
  131 + province: res.province,
  132 + qq: res.qq,
  133 + record: res.record,
  134 + reverse_card: res.reverse_card,
  135 + school: res.school,
  136 + sex: res.sex,
  137 + unit: res.unit,
  138 + urgency_phone: res.urgency_phone,
  139 + type: res.type
  140 + })
  141 + }).catch((err) => {
  142 + console.log(err)
  143 + })
  144 + },
  145 + /**
  146 + * 生命周期函数--监听页面加载
  147 + */
  148 + onLoad: function (options) {
  149 + let that = this;
  150 + that.setData({
  151 + id: options.id
  152 + })
  153 + that.getdatalist();
  154 +
  155 +
  156 + },
  157 +
  158 + /**
  159 + * 生命周期函数--监听页面初次渲染完成
  160 + */
  161 + onReady: function () {
  162 +
  163 + },
  164 +
  165 + /**
  166 + * 生命周期函数--监听页面显示
  167 + */
  168 + onShow: function () {
  169 +
  170 + },
  171 +
  172 + /**
  173 + * 生命周期函数--监听页面隐藏
  174 + */
  175 + onHide: function () {
  176 +
  177 + },
  178 +
  179 + /**
  180 + * 生命周期函数--监听页面卸载
  181 + */
  182 + onUnload: function () {
  183 +
  184 + },
  185 +
  186 + /**
  187 + * 页面相关事件处理函数--监听用户下拉动作
  188 + */
  189 + onPullDownRefresh: function () {
  190 +
  191 + },
  192 +
  193 + /**
  194 + * 页面上拉触底事件的处理函数
  195 + */
  196 + onReachBottom: function () {
  197 +
  198 + },
  199 +
  200 + /**
  201 + * 用户点击右上角分享
  202 + */
  203 + onShareAppMessage: function () {
  204 +
  205 + }
  206 +})
  1 +<!--pages/close_apply/close_apply.wxml-->
  2 +<view class='upimg' >
  3 +<image src='{{photo}}' wx:if='{{photo}}'></image>
  4 + <view class='iconfont icon-xiangji' wx:if='{{photo==""}}' ></view>
  5 +</view>
  6 +<view class='apply_item'>
  7 + <view>姓名</view>
  8 + <view class='apply_item_input'>
  9 + {{name}}
  10 + <!-- <input placeholder='未填写' placeholder-class='input_p' bindinput='setname' value='{{}}' ></input> -->
  11 + </view>
  12 +</view>
  13 +
  14 + <view class='apply_item'>
  15 + <view >姓别</view>
  16 + <view class='apply_item_input'>
  17 + <view class='iconfont icon-xiangyou'></view>
  18 + <view class='apply_itemtxt {{arraysex[sex-1]?"color333":""}}'>{{arraysex[sex-1]?arraysex[sex-1]:'请选择'}}</view>
  19 + </view>
  20 + </view>
  21 +
  22 +
  23 + <view class='apply_item'>
  24 + <view>出生日期</view>
  25 + <view class='apply_item_input'>
  26 + <view class='iconfont icon-xiangyou'></view>
  27 + <view class='apply_itemtxt {{birthday?"color333":""}}'>{{birthday?birthday:'请选择'}}</view>
  28 + </view>
  29 + </view>
  30 +
  31 +
  32 + <view class='apply_item' >
  33 + <view>民族</view>
  34 + <view class='apply_item_input'>
  35 + <view class='iconfont icon-xiangyou'></view>
  36 + <view class='apply_itemtxt {{nation?"color333":""}}'>{{nation?nation:'请选择'}}</view>
  37 + </view>
  38 + </view>
  39 +
  40 +
  41 + <view class='apply_item'>
  42 + <view>学历</view>
  43 + <view class='apply_item_input'>
  44 + <view class='iconfont icon-xiangyou'></view>
  45 + <view class='apply_itemtxt {{education?"color333":""}}'>{{education?education:'请选择'}}</view>
  46 + </view>
  47 + </view>
  48 +
  49 +
  50 + <view class='apply_item'>
  51 + <view>政治面貌</view>
  52 + <view class='apply_item_input'>
  53 + <view class='iconfont icon-xiangyou'></view>
  54 + <view class='apply_itemtxt {{politics?"color333":""}} '>{{politics?politics:'请选择'}}</view>
  55 + </view>
  56 + </view>
  57 +
  58 +<view class='apply_item'>
  59 + <view>工作单位</view>
  60 + <view class='apply_item_input'>
  61 + {{unit}}
  62 +
  63 + </view>
  64 +</view>
  65 +<view class='apply_item'>
  66 + <view>职务</view>
  67 + <view class='apply_item_input'>
  68 + {{duty}}
  69 +
  70 + </view>
  71 +</view>
  72 +<view class='apply_item'>
  73 + <view>通讯地址</view>
  74 + <view class='apply_item_input'>
  75 + {{addr}}
  76 +
  77 + </view>
  78 +</view>
  79 +<view class='apply_item'>
  80 + <view>邮编</view>
  81 + <view class='apply_item_input'>
  82 + {{postcode}}
  83 +
  84 + </view>
  85 +</view>
  86 +<view class='apply_item'>
  87 + <view>就读/毕业院校</view>
  88 + <view class='apply_item_input'>
  89 + {{school}}
  90 +
  91 + </view>
  92 +</view>
  93 +<view class='apply_item'>
  94 + <view>身份证号</view>
  95 + <view class='apply_item_input'>
  96 + {{card_number}}
  97 +
  98 + </view>
  99 +</view>
  100 +<view class='apply_item'>
  101 + <view>固定电话</view>
  102 + <view class='apply_item_input'>
  103 + {{fixed_phone}}
  104 +
  105 + </view>
  106 +</view>
  107 +<view class='apply_item'>
  108 + <view>移动电话</view>
  109 + <view class='apply_item_input'>
  110 + {{move_phone}}
  111 +
  112 + </view>
  113 +</view>
  114 +<view class='apply_item'>
  115 + <view>电子邮箱</view>
  116 + <view class='apply_item_input'>
  117 + {{email}}
  118 + </view>
  119 +</view>
  120 +<view class='apply_item big_item'>
  121 + <view>紧急联系人及电话</view>
  122 + <view class='apply_item_input'>
  123 + {{urgency_phone}}
  124 +
  125 + </view>
  126 +</view>
  127 +<view class='apply_item'>
  128 + <view>QQ号码</view>
  129 + <view class='apply_item_input'>
  130 + {{qq}}
  131 +
  132 + </view>
  133 +</view>
  134 +
  135 + <view class='apply_item' >
  136 + <view>服务区域</view>
  137 + <view class='apply_item_input'>
  138 + <view class='iconfont icon-xiangyou'></view>
  139 + <view class='apply_itemtxt {{address?"color333":""}}'>{{address?address:'请选择'}}</view>
  140 + </view>
  141 + </view>
  142 +
  143 +
  144 +
  145 +
  146 + <view class='apply_item'>
  147 + <view>志愿类别</view>
  148 + <view class='apply_item_input'>
  149 + <view class='iconfont icon-xiangyou'></view>
  150 + <view class='apply_itemtxt {{typearr[type-1]?"color333":""}}'>{{typearr[type-1]?typearr[type-1]:'请选择'}}</view>
  151 + </view>
  152 + </view>
  153 +
  154 +
  155 +
  156 +<view class='apply_nav'>
  157 + <view class='apply_cell {{apply_nav==0?"apply_active":""}}' data-apply_nav='0' bindtap='setapply_nav'>个人履历1</view>
  158 + <view class='apply_cell {{apply_nav==1?"apply_active":""}}' data-apply_nav='1' bindtap='setapply_nav'>个人履历2</view>
  159 + <view class='apply_cell {{apply_nav==2?"apply_active":""}}' data-apply_nav='2' bindtap='setapply_nav'>个人履历3</view>
  160 +</view>
  161 +<view class='navbox'>
  162 + <picker mode='date' bindchange="bindstartChange">
  163 + <view class='apply_item'>
  164 + <view>开始时间</view>
  165 + <view class='apply_item_input'>
  166 + <view class='iconfont icon-xiangyou'></view>
  167 + <view class='apply_itemtxt {{record[apply_nav].record_start_time?"color333":""}}'>{{record[apply_nav].record_start_time?record[apply_nav].record_start_time:'请选择'}}</view>
  168 + </view>
  169 + </view>
  170 +</picker>
  171 +<picker mode='date' bindchange="bindendChange">
  172 + <view class='apply_item'>
  173 + <view>结束时间</view>
  174 + <view class='apply_item_input'>
  175 + <view class='iconfont icon-xiangyou'></view>
  176 + <view class='apply_itemtxt {{record[apply_nav].record_end_time?"color333":""}}'>{{record[apply_nav].record_end_time?record[apply_nav].record_end_time:'请选择'}}</view>
  177 + </view>
  178 + </view>
  179 +</picker>
  180 + <view class='apply_item'>
  181 + <view>单位名称</view>
  182 + <view class='apply_item_input'>
  183 + {{record[apply_nav].record_unit}}
  184 +
  185 + </view>
  186 + </view>
  187 + <view class='apply_item'>
  188 + <view>职务</view>
  189 + <view class='apply_item_input'>
  190 + {{record[apply_nav].record_duty}}
  191 + </view>
  192 + </view>
  193 + <view class='apply_item'>
  194 + <view>证明人</view>
  195 + <view class='apply_item_input'>
  196 + {{record[apply_nav].record_name}}
  197 +
  198 + </view>
  199 + </view>
  200 + <view class='apply_item'>
  201 + <view>证明人电话</view>
  202 + <view class='apply_item_input'>
  203 + {{record[apply_nav].record_phone}}
  204 +
  205 + </view>
  206 + </view>
  207 +</view>
  208 +<view class='apply_title'>上传身份证照片</view>
  209 +<view class='apply_idbox'>
  210 + <view class='apply_idimg' data-tem='2'>
  211 + <view class='apply_idimgmain' wx:if='{{!front_card}}' >
  212 + <view class='apply_idupimg'>
  213 + <text class='iconfont icon-camera1'></text>
  214 + </view>
  215 + <view>上传身份证正面</view>
  216 + </view>
  217 + <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}'></image>
  218 + </view>
  219 + <view class='apply_idimg' data-tem='3'>
  220 + <view class='apply_idimgmain' wx:if='{{!reverse_card}}' >
  221 + <view class='apply_idupimg'>
  222 + <text class='iconfont icon-camera1'></text>
  223 + </view>
  224 + <view>上传身份证反面</view>
  225 + </view>
  226 + <image src='{{reverse_card?reverse_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_zhengmian_bg@2x.png"}}'></image>
  227 + </view>
  228 +</view>
  229 +<view class='apply_bottomtitle'>志愿者申请书
  230 +</view>
  231 +<view class='apply_bottom'>
  232 + 为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。
  233 + 本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
  234 + </view>
  235 +
  236 +
  1 +/* pages/close_apply/close_apply.wxss */
  2 +@import '/pages/apply/apply.wxss'
1 // pages/img_txt/img_txt.js 1 // pages/img_txt/img_txt.js
2 const app=getApp(); 2 const app=getApp();
3 var wxParse = require('../../wxParse/wxParse.js'); 3 var wxParse = require('../../wxParse/wxParse.js');
4 -//wxParse.wxParse('content', 'html', res.content, that, 5); 4 +
5 Page({ 5 Page({
6 6
7 /** 7 /**
@@ -23,9 +23,12 @@ Page({ @@ -23,9 +23,12 @@ Page({
23 params = { 23 params = {
24 id: that.data.id 24 id: that.data.id
25 } 25 }
26 - }else{ 26 + } else if (that.data.status == '2'){
27 url = 'index/member_center/about'; 27 url = 'index/member_center/about';
28 params = {}; 28 params = {};
  29 + } else if (that.data.status == '3'){
  30 + url = 'index/member_center/contact';
  31 + params = {};
29 } 32 }
30 app.post(url, params,head).then((res)=>{ 33 app.post(url, params,head).then((res)=>{
31 console.log(res.content); 34 console.log(res.content);
@@ -48,7 +51,6 @@ Page({ @@ -48,7 +51,6 @@ Page({
48 id: options.id, 51 id: options.id,
49 status: options.status 52 status: options.status
50 }) 53 })
51 -  
52 wx.setNavigationBarTitle({ 54 wx.setNavigationBarTitle({
53 title: '活动详情' 55 title: '活动详情'
54 }) 56 })
@@ -61,6 +63,14 @@ Page({ @@ -61,6 +63,14 @@ Page({
61 title: '关于我们' 63 title: '关于我们'
62 }) 64 })
63 that.getdatalist(); 65 that.getdatalist();
  66 + } else if (options.status == '3'){
  67 + that.setData({
  68 + status: options.status
  69 + })
  70 + wx.setNavigationBarTitle({
  71 + title: '联系我们'
  72 + })
  73 + that.getdatalist();
64 } 74 }
65 75
66 76
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 <view class='text_title'>{{datalist.activity_name}}</view> 6 <view class='text_title'>{{datalist.activity_name}}</view>
7 <view class='text_time' wx:if='{{status=="1"}}'>{{datalist.time}}</view> 7 <view class='text_time' wx:if='{{status=="1"}}'>{{datalist.time}}</view>
8 <view class='text_content'> 8 <view class='text_content'>
  9 +<!-- <rich-text nodes="{{datalist.content}}" bindtap="tap"></rich-text> -->
9 <import src="../../wxParse/wxParse.wxml" /> 10 <import src="../../wxParse/wxParse.wxml" />
10 <template is='wxParse' data='{{wxParseData:content.nodes}}' /> 11 <template is='wxParse' data='{{wxParseData:content.nodes}}' />
11 </view> 12 </view>
@@ -19,10 +19,10 @@ @@ -19,10 +19,10 @@
19 padding:24rpx 0 10rpx 0; 19 padding:24rpx 0 10rpx 0;
20 } 20 }
21 .text_content{ 21 .text_content{
22 - text-indent: 50rpx; 22 + /* text-indent: 50rpx; */
23 /* color:#666666; 23 /* color:#666666;
24 font-size:26rpx; */ 24 font-size:26rpx; */
25 - line-height: 46rpx; 25 + /* line-height: 46rpx; */
26 } 26 }
27 .text_time{ 27 .text_time{
28 color:#999; 28 color:#999;
@@ -22,7 +22,6 @@ Page({ @@ -22,7 +22,6 @@ Page({
22 activity_pageNum:4 22 activity_pageNum:4
23 } 23 }
24 app.post(url, params, head).then((res)=>{ 24 app.post(url, params, head).then((res)=>{
25 -  
26 let activity = res.activity; 25 let activity = res.activity;
27 let tem = []; 26 let tem = [];
28 let temactivity = []; 27 let temactivity = [];
@@ -51,6 +50,47 @@ Page({ @@ -51,6 +50,47 @@ Page({
51 console.log(err) 50 console.log(err)
52 }) 51 })
53 }, 52 },
  53 + //判断是否登陆
  54 + get_token(){
  55 +let that=this;
  56 + wx.login({
  57 + success: function (s) {
  58 + let url = 'wxapp/public/getSessionKey';
  59 + if (s.code) {
  60 + var code = s.code;
  61 + var param = {
  62 + code: code
  63 + }
  64 + app.post(url, param).then((res) => {
  65 + let url ='wxapp/public/get_token';
  66 + let params={
  67 + openid: res.openid
  68 + }
  69 + app.post(url, params).then((res)=>{
  70 + console.log(res);
  71 + if(res.data){
  72 + wx.setStorageSync('token', res.data);
  73 + that.setData({
  74 + datalist: [],
  75 + activity_page: 0,
  76 + activity: []
  77 + })
  78 + that.getdatalist();
  79 + }else{
  80 + wx.redirectTo({
  81 + url: '/pages/start/start'
  82 + })
  83 + }
  84 + }).catch((err)=>{
  85 + console.log(err);
  86 + })
  87 + }).catch((errMsg) => {
  88 + console.log(errMsg);
  89 + })
  90 + }
  91 + }
  92 + });
  93 + },
54 /** 94 /**
55 * 生命周期函数--监听页面加载 95 * 生命周期函数--监听页面加载
56 */ 96 */
@@ -58,8 +98,9 @@ Page({ @@ -58,8 +98,9 @@ Page({
58 let windowHeight = wx.getSystemInfoSync().windowHeight;// 屏幕的高度 98 let windowHeight = wx.getSystemInfoSync().windowHeight;// 屏幕的高度
59 let windowWidth = wx.getSystemInfoSync().windowWidth // 屏幕的宽度 99 let windowWidth = wx.getSystemInfoSync().windowWidth // 屏幕的宽度
60 this.setData({ 100 this.setData({
61 - scroll_height: windowHeight * 750 / windowWidth-570 101 + scroll_height: windowHeight * 750 / windowWidth
62 }) 102 })
  103 +
63 }, 104 },
64 105
65 /** 106 /**
@@ -73,13 +114,10 @@ Page({ @@ -73,13 +114,10 @@ Page({
73 * 生命周期函数--监听页面显示 114 * 生命周期函数--监听页面显示
74 */ 115 */
75 onShow: function () { 116 onShow: function () {
76 - let that=this;  
77 - that.setData({  
78 - datalist: [],  
79 - activity_page: 0,  
80 - activity: []  
81 - })  
82 - that.getdatalist(); 117 + let that = this;
  118 +
  119 + that.get_token();
  120 +
83 }, 121 },
84 122
85 /** 123 /**
1 <!--index.wxml--> 1 <!--index.wxml-->
  2 +<scroll-view scroll-y='true' bindscrolltolower='getdatalist' style='height:{{scroll_height}}rpx'>
2 <swiper indicator-dots="true" autoplay="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image"> 3 <swiper indicator-dots="true" autoplay="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
3 - <navigator wx:for="{{datalist.slide}}" wx:key hover-class="none" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' > 4 + <navigator wx:for="{{datalist.slide}}" wx:key hover-class="none" url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1' >
4 <swiper-item> 5 <swiper-item>
5 <image src="{{item.image}}" /> 6 <image src="{{item.image}}" />
6 </swiper-item> 7 </swiper-item>
@@ -15,7 +16,7 @@ @@ -15,7 +16,7 @@
15 <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key id='{{item.id}}'> 16 <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key id='{{item.id}}'>
16 <view class='cell_top'> 17 <view class='cell_top'>
17 <view class='cellimg'> 18 <view class='cellimg'>
18 - <image src='{{item.photo?item.photo:"http://volunteer.w.bronet.cn/imgs/wode_02@2x.png"}}'></image> 19 + <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}'></image>
19 </view> 20 </view>
20 <view>{{item.name}}</view> 21 <view>{{item.name}}</view>
21 </view> 22 </view>
@@ -26,7 +27,7 @@ @@ -26,7 +27,7 @@
26 <view class='vold_line'></view> 27 <view class='vold_line'></view>
27 <view class='index_newbox'> 28 <view class='index_newbox'>
28 <view class='title activity_title'>活动快讯</view> 29 <view class='title activity_title'>活动快讯</view>
29 - <scroll-view scroll-y='true' bindscrolltolower='getdatalist' style='height:{{scroll_height}}rpx'> 30 + <view>
30 <view class='new_box' wx:for='{{activity}}' wx:key > 31 <view class='new_box' wx:for='{{activity}}' wx:key >
31 <navigator class='new_cell' wx:for='{{item}}' wx:key url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none"> 32 <navigator class='new_cell' wx:for='{{item}}' wx:key url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
32 <view class='new_cellmain'> 33 <view class='new_cellmain'>
@@ -38,5 +39,6 @@ @@ -38,5 +39,6 @@
38 </view> 39 </view>
39 </navigator> 40 </navigator>
40 </view> 41 </view>
41 - </scroll-view>  
42 -</view>  
  42 + </view>
  43 +</view>
  44 +</scroll-view>
@@ -96,6 +96,7 @@ padding:0 32rpx; @@ -96,6 +96,7 @@ padding:0 32rpx;
96 display: flex; 96 display: flex;
97 align-items: center; 97 align-items: center;
98 justify-content: center; 98 justify-content: center;
  99 + overflow: hidden;
99 } 100 }
100 101
101 .new_img image{ 102 .new_img image{
  1 +// pages/mao/mao.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 + navList: ['navList1', 'navList2','navList3']
  9 + },
  10 + getStatus(e) {
  11 + this.setData({ status: e.currentTarget.dataset.index })
  12 + },
  13 +
  14 + /**
  15 + * 生命周期函数--监听页面加载
  16 + */
  17 + onLoad: function (options) {
  18 +
  19 + },
  20 +
  21 + /**
  22 + * 生命周期函数--监听页面初次渲染完成
  23 + */
  24 + onReady: function () {
  25 +
  26 + },
  27 +
  28 + /**
  29 + * 生命周期函数--监听页面显示
  30 + */
  31 + onShow: function () {
  32 +
  33 + },
  34 +
  35 + /**
  36 + * 生命周期函数--监听页面隐藏
  37 + */
  38 + onHide: function () {
  39 +
  40 + },
  41 +
  42 + /**
  43 + * 生命周期函数--监听页面卸载
  44 + */
  45 + onUnload: function () {
  46 +
  47 + },
  48 +
  49 + /**
  50 + * 页面相关事件处理函数--监听用户下拉动作
  51 + */
  52 + onPullDownRefresh: function () {
  53 +
  54 + },
  55 +
  56 + /**
  57 + * 页面上拉触底事件的处理函数
  58 + */
  59 + onReachBottom: function () {
  60 +
  61 + },
  62 +
  63 + /**
  64 + * 用户点击右上角分享
  65 + */
  66 + onShareAppMessage: function () {
  67 +
  68 + }
  69 +})
  1 +<!--pages/mao/mao.wxml-->
  2 +<scroll-view class="tui-city-scroll" scroll-x="true" scroll-into-view="NAV{{status}}" scroll-with-animation="true">
  3 + <text bindtap="getStatus" id="NAV{{index}}" class="tui-nav-li {{index === status ? 'tui-nav-active' : ''}}" data-index="{{index}}" wx:for="{{navList}}" wx:key="">{{item}}</text>
  4 +</scroll-view>
  5 +<view class="tui-fixed-y">
  6 + <scroll-view class="tui-city-scroll-y" scroll-y="true" scroll-into-view="NAV{{status}}" scroll-with-animation="true">
  7 + <view wx:for="{{navList}}" wx:key="">
  8 + <view id="NAV{{index}}" class="tui-list-head">{{item}}</view>
  9 + <view class="tui-list-li">{{item}} 列表 {{index}}</view>
  10 + </view>
  11 + </scroll-view>
  12 +</view>
  1 +/* pages/mao/mao.wxss */
  2 +.tui-fixed-x{
  3 + width: 100%;
  4 + position: fixed;
  5 + top: 0;
  6 + left: 0;
  7 +}
  8 +.tui-city-scroll{
  9 + height: 220rpx;
  10 + line-height: 80rpx;
  11 + width: 100%;
  12 + white-space: nowrap;
  13 +}
  14 +.tui-city-scroll text{
  15 + height: 120rpx;
  16 + line-height: 80rpx;
  17 + width: 100%;
  18 + white-space: nowrap;
  19 +}
  20 +.tui-nav-li{
  21 + font-size: 33rpx;
  22 + padding: 0 10rpx;
  23 +}
  24 +.tui-nav-li:first-child{padding-left: 16rpx;}
  25 +.tui-nav-li:last-child{padding-right: 16rpx;}
  26 +.tui-nav-active{
  27 + color: red;
  28 + border-bottom: 3rpx solid red;
  29 +}
  30 +
  31 +.tui-fixed-y{
  32 + width: 100%;
  33 + height: calc(100% - 80rpx);
  34 + position: fixed;
  35 + bottom: 0;
  36 + left: 0;
  37 +}
  38 +.tui-city-scroll-y{
  39 + padding: 0 20rpx;
  40 + height: 100%;
  41 + box-sizing: border-box;
  42 +}
  43 +.tui-list-head{
  44 + height: 50px;
  45 + line-height: 50px;
  46 + text-align: center;
  47 + font-size: 30rpx;
  48 + color: blue;
  49 +}
  50 +.tui-list-li{
  51 + height: 400px;
  52 + padding: 10rpx;
  53 + color: #fff;
  54 + font-size: 50rpx;
  55 + background-color: #2EB3FF;
  56 +}
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <view class='volunteercell' wx:for='{{item}}' wx:key > 5 <view class='volunteercell' wx:for='{{item}}' wx:key >
6 <view class='cell_top'> 6 <view class='cell_top'>
7 <view class='cellimg'> 7 <view class='cellimg'>
8 - <image src='{{item.photo?item.photo:"http://volunteer.w.bronet.cn/imgs/wode_02@2x.png"}}'></image> 8 + <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}'></image>
9 </view> 9 </view>
10 <view>{{item.name}}</view> 10 <view>{{item.name}}</view>
11 </view> 11 </view>
1 <!--pages/my/my.wxml--> 1 <!--pages/my/my.wxml-->
2 <view class='my_head'> 2 <view class='my_head'>
3 - <image src='http://volunteer.w.bronet.cn/imgs/gerenzhongxin_bg@2x.png'></image> 3 + <image src='https://volunteer.cnpu.org/imgs/gerenzhongxin_bg@2x.png'></image>
4 <view class='my_headitem'> 4 <view class='my_headitem'>
5 <view class='my_headitemimg'> 5 <view class='my_headitemimg'>
6 <image src='{{datalist.avatar}}'></image> 6 <image src='{{datalist.avatar}}'></image>
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </view> 9 </view>
10 </view> 10 </view>
11 <view class='my_itembox'> 11 <view class='my_itembox'>
12 - <navigator class='my_item' url='/pages/apply/apply' hover-class="none" wx:if='{{datalist.is_submit=="0"}}'> 12 + <navigator class='my_item' url='/pages/apply/apply?id={{datalist.id}}&is_submit={{datalist.is_submit}}' hover-class="none" >
13 <view class='my_itemletf'> 13 <view class='my_itemletf'>
14 <view class='iconfont icon-aixin'></view>成为志愿者 14 <view class='iconfont icon-aixin'></view>成为志愿者
15 </view> 15 </view>
@@ -21,6 +21,12 @@ @@ -21,6 +21,12 @@
21 </view> 21 </view>
22 <view class='iconfont icon-xiangyou'></view> 22 <view class='iconfont icon-xiangyou'></view>
23 </navigator> 23 </navigator>
  24 + <navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=3'>
  25 + <view class='my_itemletf'>
  26 + <view class='iconfont icon-lianximaijia'></view>联系我们
  27 + </view>
  28 + <view class='iconfont icon-xiangyou'></view>
  29 + </navigator>
24 <navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=2'> 30 <navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=2'>
25 <view class='my_itemletf'> 31 <view class='my_itemletf'>
26 <view class='iconfont icon-renyuanxiaozu'></view>关于我们 32 <view class='iconfont icon-renyuanxiaozu'></view>关于我们
1 <!--pages/result/result.wxml--> 1 <!--pages/result/result.wxml-->
2 <view wx:if='{{datalist==""}}'> 2 <view wx:if='{{datalist==""}}'>
3 <view class='resultimg'> 3 <view class='resultimg'>
4 - <image src='http://volunteer.w.bronet.cn/imgs/dengdaishenhe@2x.png'></image> 4 + <image src='https://volunteer.cnpu.org/imgs/dengdaishenhe@2x.png'></image>
5 </view> 5 </view>
6 <view class='result_txt'>待提交</view> 6 <view class='result_txt'>待提交</view>
7 <navigator class='start_btn' url='/pages/apply/apply' hover-class="none">成为志愿者</navigator> 7 <navigator class='start_btn' url='/pages/apply/apply' hover-class="none">成为志愿者</navigator>
@@ -9,19 +9,19 @@ @@ -9,19 +9,19 @@
9 <view wx:else> 9 <view wx:else>
10 <view wx:if='{{datalist.status=="3"}}'> 10 <view wx:if='{{datalist.status=="3"}}'>
11 <view class='resultimg'> 11 <view class='resultimg'>
12 - <image src='http://volunteer.w.bronet.cn/imgs/kulian@2x.png'></image> 12 + <image src='https://volunteer.cnpu.org/imgs/kulian@2x.png'></image>
13 </view> 13 </view>
14 <view class='result_txt'>审核未通过</view> 14 <view class='result_txt'>审核未通过</view>
15 </view> 15 </view>
16 <view wx:elif='{{datalist.status=="2"}}'> 16 <view wx:elif='{{datalist.status=="2"}}'>
17 <view class='resultimg'> 17 <view class='resultimg'>
18 - <image src='http://volunteer.w.bronet.cn/imgs/tongguo@2x.png'></image> 18 + <image src='https://volunteer.cnpu.org/imgs/tongguo@2x.png'></image>
19 </view> 19 </view>
20 <view class='result_txt'>审核已通过</view> 20 <view class='result_txt'>审核已通过</view>
21 </view> 21 </view>
22 <view wx:else> 22 <view wx:else>
23 <view class='resultimg'> 23 <view class='resultimg'>
24 - <image src='http://volunteer.w.bronet.cn/imgs/dengdaishenhe@2x.png'></image> 24 + <image src='https://volunteer.cnpu.org/imgs/dengdaishenhe@2x.png'></image>
25 </view> 25 </view>
26 <view class='result_txt'>待审核</view> 26 <view class='result_txt'>待审核</view>
27 </view> 27 </view>
@@ -28,7 +28,7 @@ Page({ @@ -28,7 +28,7 @@ Page({
28 console.log(errMsg); 28 console.log(errMsg);
29 }) 29 })
30 } 30 }
31 - } 31 + }
32 }); 32 });
33 }, 33 },
34 login(openid, session_key, encrypted_data, iv) { 34 login(openid, session_key, encrypted_data, iv) {
1 <!--pages/start/start.wxml--> 1 <!--pages/start/start.wxml-->
2 <view class='start'> 2 <view class='start'>
  3 +<view class='start_main'>
  4 +<view class='start_mainimg'>
  5 +<image src='../../imgs/renwu@2x.png'></image>
  6 +</view>
  7 +<view class='start_bigtxt'>白求恩志愿者服务队</view>
  8 +<view class='start_minitxt'>Bethune Volunteer Service Team</view>
  9 +</view>
3 <button class='start_btn' open-type='getUserInfo' bindgetuserinfo='start'>立即开启</button> 10 <button class='start_btn' open-type='getUserInfo' bindgetuserinfo='start'>立即开启</button>
4 -<image src='http://volunteer.w.bronet.cn/imgs/qidongye_bg@2x.png'></image> 11 +<image src='../../imgs/qidongye_bg@2x.png'></image>
5 </view> 12 </view>
@@ -7,12 +7,49 @@ @@ -7,12 +7,49 @@
7 width:100%; 7 width:100%;
8 height: 100%; 8 height: 100%;
9 z-index:10; 9 z-index:10;
  10 + display: flex;
  11 + align-items: center;
  12 + justify-content: center;
  13 + flex-direction: column;
10 } 14 }
11 .start image{ 15 .start image{
12 width:100%; 16 width:100%;
13 height: 100%; 17 height: 100%;
14 display: block; 18 display: block;
15 } 19 }
  20 +.start_main{
  21 + position: absolute;
  22 + width:100%;
  23 + top:12%;
  24 + left:50%;
  25 + transform: translateX(-50%);
  26 +}
  27 +.start_bigtxt{
  28 + margin: 50rpx 0 12rpx 0;
  29 + color:rgba(33,174,89,1);
  30 + font-weight: bold;
  31 + font-size:44rpx;
  32 + text-align: center;
  33 +}
  34 +.start_minitxt{
  35 + color:rgba(33,174,89,0.5);
  36 + font-size:30rpx;
  37 + text-align: center;
  38 + font-weight: bold;
  39 +}
  40 +.start_mainimg{
  41 + margin: 0 auto;
  42 + display: flex;
  43 + align-items: center;
  44 + justify-content: center;
  45 + width:256rpx;
  46 + height: 360rpx;
  47 +}
  48 +.start_mainimg image{
  49 + width:100%;
  50 + height: 100%;
  51 + display: block;
  52 +}
16 .start_btn{ 53 .start_btn{
17 position: absolute; 54 position: absolute;
18 bottom:28%; 55 bottom:28%;
@@ -24,7 +61,7 @@ @@ -24,7 +61,7 @@
24 color:#21AE59; 61 color:#21AE59;
25 font-size:34rpx; 62 font-size:34rpx;
26 font-weight: bold; 63 font-weight: bold;
27 - border:1rpx solid #21AE59; 64 + border:1rpx solid rgba(33,174,89,0.9);
28 z-index:20rpx; 65 z-index:20rpx;
29 display: flex; 66 display: flex;
30 align-items: center; 67 align-items: center;
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 "ignore": [] 4 "ignore": []
5 }, 5 },
6 "setting": { 6 "setting": {
7 - "urlCheck": false, 7 + "urlCheck": true,
8 "es6": true, 8 "es6": true,
9 "postcss": true, 9 "postcss": true,
10 "minified": true, 10 "minified": true,
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 }, 12 },
13 "compileType": "miniprogram", 13 "compileType": "miniprogram",
14 "libVersion": "2.4.3", 14 "libVersion": "2.4.3",
15 - "appid": "wx6149ccc056174103",  
16 - "projectname": "zhiyuanzhe", 15 + "appid": "wx7a3bf4e0796c070a",
  16 + "projectname": "zhiyuanzhe1",
17 "debugOptions": { 17 "debugOptions": {
18 "hidedInDevtools": [] 18 "hidedInDevtools": []
19 }, 19 },
@@ -51,10 +51,40 @@ @@ -51,10 +51,40 @@
51 "query": "" 51 "query": ""
52 }, 52 },
53 { 53 {
54 - "id": -1, 54 + "id": 2,
55 "name": "apply", 55 "name": "apply",
56 "pathName": "pages/apply/apply", 56 "pathName": "pages/apply/apply",
57 "query": "" 57 "query": ""
  58 + },
  59 + {
  60 + "id": -1,
  61 + "name": "index",
  62 + "pathName": "pages/close_apply/close_apply",
  63 + "query": "id=2"
  64 + },
  65 + {
  66 + "id": -1,
  67 + "name": "mao",
  68 + "pathName": "pages/mao/mao",
  69 + "query": ""
  70 + },
  71 + {
  72 + "id": -1,
  73 + "name": "start",
  74 + "pathName": "pages/start/start",
  75 + "query": ""
  76 + },
  77 + {
  78 + "id": -1,
  79 + "name": "my",
  80 + "pathName": "pages/my/my",
  81 + "query": ""
  82 + },
  83 + {
  84 + "id": -1,
  85 + "name": "o_my",
  86 + "pathName": "pages/start/start",
  87 + "query": ""
58 } 88 }
59 ] 89 ]
60 } 90 }