刘晓艳 / informationPlatform · 提交

转到一个项目

作者 吴孟雨
提交 17e3323e83ddfc426ee1c294b9a2d6908d4ebc9e 1 个父辈 0c5d8b2e

优化心愿发布，优化登录

内嵌 并排对比
正在显示 3 个修改的文件 包含 177 行增加 和 165 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="6762183d-f259-4449-ac12-814b45d5f340" name="Default Changelist" comment="优化心愿进入主页，添加举报默认文字"> 4 + <list default="true" id="6762183d-f259-4449-ac12-814b45d5f340" name="Default Changelist" comment="优化心愿发布，优化登录">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/pages/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/pages/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/pages/wish/wish.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/wish/wish.js" afterDir="false" /> 7 + <change beforePath="$PROJECT_DIR$/pages/wish/release/release.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/wish/release/release.js" afterDir="false" />
8 </list> 8 </list>
9 <ignored path="$PROJECT_DIR$/.tmp/" /> 9 <ignored path="$PROJECT_DIR$/.tmp/" />
10 <ignored path="$PROJECT_DIR$/temp/" /> 10 <ignored path="$PROJECT_DIR$/temp/" />
@@ -19,40 +19,41 @@ @@ -19,40 +19,41 @@
19 <session id="-663576666"> 19 <session id="-663576666">
20 <usages-collector id="statistics.lifecycle.project"> 20 <usages-collector id="statistics.lifecycle.project">
21 <counts> 21 <counts>
22 - <entry key="project.closed" value="38" />  
23 - <entry key="project.open.time.0" value="8" />  
24 - <entry key="project.open.time.1" value="13" />  
25 - <entry key="project.open.time.10" value="4" /> 22 + <entry key="project.closed" value="45" />
  23 + <entry key="project.open.time.0" value="10" />
  24 + <entry key="project.open.time.1" value="14" />
  25 + <entry key="project.open.time.10" value="7" />
26 <entry key="project.open.time.11" value="3" /> 26 <entry key="project.open.time.11" value="3" />
  27 + <entry key="project.open.time.2" value="1" />
27 <entry key="project.open.time.7" value="1" /> 28 <entry key="project.open.time.7" value="1" />
28 <entry key="project.open.time.8" value="4" /> 29 <entry key="project.open.time.8" value="4" />
29 <entry key="project.open.time.9" value="6" /> 30 <entry key="project.open.time.9" value="6" />
30 - <entry key="project.opened" value="39" /> 31 + <entry key="project.opened" value="46" />
31 </counts> 32 </counts>
32 </usages-collector> 33 </usages-collector>
33 <usages-collector id="statistics.file.extensions.open"> 34 <usages-collector id="statistics.file.extensions.open">
34 <counts> 35 <counts>
35 - <entry key="js" value="176" /> 36 + <entry key="js" value="181" />
36 <entry key="json" value="48" /> 37 <entry key="json" value="48" />
37 <entry key="png" value="3" /> 38 <entry key="png" value="3" />
38 - <entry key="wxml" value="154" /> 39 + <entry key="wxml" value="158" />
39 <entry key="wxss" value="57" /> 40 <entry key="wxss" value="57" />
40 </counts> 41 </counts>
41 </usages-collector> 42 </usages-collector>
42 <usages-collector id="statistics.file.types.open"> 43 <usages-collector id="statistics.file.types.open">
43 <counts> 44 <counts>
44 <entry key="CSS" value="57" /> 45 <entry key="CSS" value="57" />
45 - <entry key="HTML" value="154" /> 46 + <entry key="HTML" value="158" />
46 <entry key="Image" value="3" /> 47 <entry key="Image" value="3" />
47 <entry key="JSON" value="48" /> 48 <entry key="JSON" value="48" />
48 - <entry key="JavaScript" value="176" /> 49 + <entry key="JavaScript" value="181" />
49 </counts> 50 </counts>
50 </usages-collector> 51 </usages-collector>
51 <usages-collector id="statistics.file.extensions.edit"> 52 <usages-collector id="statistics.file.extensions.edit">
52 <counts> 53 <counts>
53 - <entry key="js" value="12887" /> 54 + <entry key="js" value="13033" />
54 <entry key="json" value="177" /> 55 <entry key="json" value="177" />
55 - <entry key="txt" value="757" /> 56 + <entry key="txt" value="768" />
56 <entry key="wxml" value="3435" /> 57 <entry key="wxml" value="3435" />
57 <entry key="wxss" value="2014" /> 58 <entry key="wxss" value="2014" />
58 </counts> 59 </counts>
@@ -62,8 +63,8 @@ @@ -62,8 +63,8 @@
62 <entry key="CSS" value="2014" /> 63 <entry key="CSS" value="2014" />
63 <entry key="HTML" value="3435" /> 64 <entry key="HTML" value="3435" />
64 <entry key="JSON" value="177" /> 65 <entry key="JSON" value="177" />
65 - <entry key="JavaScript" value="12887" />  
66 - <entry key="PLAIN_TEXT" value="757" /> 66 + <entry key="JavaScript" value="13033" />
  67 + <entry key="PLAIN_TEXT" value="768" />
67 </counts> 68 </counts>
68 </usages-collector> 69 </usages-collector>
69 <usages-collector id="statistics.vcs.git.usages"> 70 <usages-collector id="statistics.vcs.git.usages">
@@ -75,61 +76,61 @@ @@ -75,61 +76,61 @@
75 </component> 76 </component>
76 <component name="FileEditorManager"> 77 <component name="FileEditorManager">
77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 78 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
78 - <file pinned="false" current-in-tab="false">  
79 - <entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml"> 79 + <file pinned="false" current-in-tab="true">
  80 + <entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
80 <provider selected="true" editor-type-id="text-editor"> 81 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="673">  
82 - <caret line="68" column="7" lean-forward="true" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" /> 82 + <state relative-caret-position="258">
  83 + <caret line="267" column="38" lean-forward="true" selection-start-line="267" selection-start-column="38" selection-end-line="267" selection-end-column="38" />
83 </state> 84 </state>
84 </provider> 85 </provider>
85 </entry> 86 </entry>
86 </file> 87 </file>
87 <file pinned="false" current-in-tab="false"> 88 <file pinned="false" current-in-tab="false">
88 - <entry file="file://$PROJECT_DIR$/pages/my/abouttUs/abouttUs.wxml"> 89 + <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">
89 <provider selected="true" editor-type-id="text-editor"> 90 <provider selected="true" editor-type-id="text-editor">
90 - <state relative-caret-position="22">  
91 - <caret line="1" selection-start-line="1" selection-end-line="2" /> 91 + <state relative-caret-position="528">
  92 + <caret line="24" column="54" selection-start-line="24" selection-start-column="45" selection-end-line="24" selection-end-column="54" />
92 </state> 93 </state>
93 </provider> 94 </provider>
94 </entry> 95 </entry>
95 </file> 96 </file>
96 <file pinned="false" current-in-tab="false"> 97 <file pinned="false" current-in-tab="false">
97 - <entry file="file://$PROJECT_DIR$/pages/my/abouttUs/abouttUs.js"> 98 + <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
98 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
99 - <state relative-caret-position="704">  
100 - <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" /> 100 + <state relative-caret-position="6688">
  101 + <caret line="304" column="51" lean-forward="true" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
101 </state> 102 </state>
102 </provider> 103 </provider>
103 </entry> 104 </entry>
104 </file> 105 </file>
105 <file pinned="false" current-in-tab="false"> 106 <file pinned="false" current-in-tab="false">
106 - <entry file="file://$PROJECT_DIR$/pages/report/report.js"> 107 + <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
107 <provider selected="true" editor-type-id="text-editor"> 108 <provider selected="true" editor-type-id="text-editor">
108 - <state relative-caret-position="528">  
109 - <caret line="24" column="26" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="26" /> 109 + <state relative-caret-position="829">
  110 + <caret line="252" column="22" lean-forward="true" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
110 </state> 111 </state>
111 </provider> 112 </provider>
112 </entry> 113 </entry>
113 </file> 114 </file>
114 <file pinned="false" current-in-tab="false"> 115 <file pinned="false" current-in-tab="false">
115 - <entry file="file://$PROJECT_DIR$/pages/wish/wish.js"> 116 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
116 <provider selected="true" editor-type-id="text-editor"> 117 <provider selected="true" editor-type-id="text-editor">
117 - <state relative-caret-position="279">  
118 - <caret line="58" column="18" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="18" /> 118 + <state relative-caret-position="660">
  119 + <caret line="30" column="61" lean-forward="true" selection-start-line="30" selection-start-column="61" selection-end-line="30" selection-end-column="61" />
119 </state> 120 </state>
120 </provider> 121 </provider>
121 </entry> 122 </entry>
122 </file> 123 </file>
123 <file pinned="false" current-in-tab="false"> 124 <file pinned="false" current-in-tab="false">
124 - <entry file="file://$PROJECT_DIR$/pages/start/start.wxml"> 125 + <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxml">
125 <provider selected="true" editor-type-id="text-editor" /> 126 <provider selected="true" editor-type-id="text-editor" />
126 </entry> 127 </entry>
127 </file> 128 </file>
128 - <file pinned="false" current-in-tab="true">  
129 - <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 129 + <file pinned="false" current-in-tab="false">
  130 + <entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxml">
130 <provider selected="true" editor-type-id="text-editor"> 131 <provider selected="true" editor-type-id="text-editor">
131 - <state relative-caret-position="550">  
132 - <caret line="37" column="36" lean-forward="true" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" /> 132 + <state relative-caret-position="1408">
  133 + <caret line="64" column="53" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="53" />
133 </state> 134 </state>
134 </provider> 135 </provider>
135 </entry> 136 </entry>
@@ -146,7 +147,7 @@ @@ -146,7 +147,7 @@
146 <file pinned="false" current-in-tab="false"> 147 <file pinned="false" current-in-tab="false">
147 <entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml"> 148 <entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml">
148 <provider selected="true" editor-type-id="text-editor"> 149 <provider selected="true" editor-type-id="text-editor">
149 - <state relative-caret-position="279"> 150 + <state relative-caret-position="418">
150 <caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" /> 151 <caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" />
151 </state> 152 </state>
152 </provider> 153 </provider>
@@ -165,11 +166,6 @@ @@ -165,11 +166,6 @@
165 </component> 166 </component>
166 <component name="FindInProjectRecents"> 167 <component name="FindInProjectRecents">
167 <findStrings> 168 <findStrings>
168 - <find>thumbnail</find>  
169 - <find>close-btn</find>  
170 - <find>@</find>  
171 - <find>上传</find>  
172 - <find>uoloadImg</find>  
173 <find>load</find> 169 <find>load</find>
174 <find>onloa</find> 170 <find>onloa</find>
175 <find>tabcurrent</find> 171 <find>tabcurrent</find>
@@ -195,6 +191,11 @@ @@ -195,6 +191,11 @@
195 <find>getOpenId</find> 191 <find>getOpenId</find>
196 <find>wishAllInfo</find> 192 <find>wishAllInfo</find>
197 <find>wishIndex</find> 193 <find>wishIndex</find>
  194 + <find>submitAnonymousPicker</find>
  195 + <find>transform</find>
  196 + <find>复制</find>
  197 + <find>previewImage</find>
  198 + <find>concat</find>
198 </findStrings> 199 </findStrings>
199 <dirStrings> 200 <dirStrings>
200 <dir>D:\info\informationPlatform\wxParse</dir> 201 <dir>D:\info\informationPlatform\wxParse</dir>
@@ -224,7 +225,6 @@ @@ -224,7 +225,6 @@
224 <option value="$PROJECT_DIR$/pages/my/messageDetail/messageDetail.wxss" /> 225 <option value="$PROJECT_DIR$/pages/my/messageDetail/messageDetail.wxss" />
225 <option value="$PROJECT_DIR$/pages/service/comment/comment.js" /> 226 <option value="$PROJECT_DIR$/pages/service/comment/comment.js" />
226 <option value="$PROJECT_DIR$/pages/my/mycollect/mycollect.wxml" /> 227 <option value="$PROJECT_DIR$/pages/my/mycollect/mycollect.wxml" />
227 - <option value="$PROJECT_DIR$/pages/wish/release/release.js" />  
228 <option value="$PROJECT_DIR$/pages/my/my.json" /> 228 <option value="$PROJECT_DIR$/pages/my/my.json" />
229 <option value="$PROJECT_DIR$/pages/service/myindex/myindex.wxml" /> 229 <option value="$PROJECT_DIR$/pages/service/myindex/myindex.wxml" />
230 <option value="$PROJECT_DIR$/pages/my/abouttUs/abouttUs.js" /> 230 <option value="$PROJECT_DIR$/pages/my/abouttUs/abouttUs.js" />
@@ -257,6 +257,7 @@ @@ -257,6 +257,7 @@
257 <option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js" /> 257 <option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js" />
258 <option value="$PROJECT_DIR$/pages/wish/wish.js" /> 258 <option value="$PROJECT_DIR$/pages/wish/wish.js" />
259 <option value="$PROJECT_DIR$/pages/start/start.js" /> 259 <option value="$PROJECT_DIR$/pages/start/start.js" />
  260 + <option value="$PROJECT_DIR$/pages/wish/release/release.js" />
260 </list> 261 </list>
261 </option> 262 </option>
262 </component> 263 </component>
@@ -267,8 +268,7 @@ @@ -267,8 +268,7 @@
267 <sorting>DEFINITION_ORDER</sorting> 268 <sorting>DEFINITION_ORDER</sorting>
268 </component> 269 </component>
269 <component name="ProjectFrameBounds" extendedState="6"> 270 <component name="ProjectFrameBounds" extendedState="6">
270 - <option name="x" value="-3" />  
271 - <option name="y" value="1" /> 271 + <option name="x" value="-8" />
272 <option name="width" value="1936" /> 272 <option name="width" value="1936" />
273 <option name="height" value="1047" /> 273 <option name="height" value="1047" />
274 </component> 274 </component>
@@ -277,6 +277,7 @@ @@ -277,6 +277,7 @@
277 <foldersAlwaysOnTop value="true" /> 277 <foldersAlwaysOnTop value="true" />
278 </navigator> 278 </navigator>
279 <panes> 279 <panes>
  280 + <pane id="Scope" />
280 <pane id="ProjectPane"> 281 <pane id="ProjectPane">
281 <subPane> 282 <subPane>
282 <expand> 283 <expand>
@@ -325,6 +326,20 @@ @@ -325,6 +326,20 @@
325 <item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" /> 326 <item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
326 <item name="informationPlatform" type="462c0819:PsiDirectoryNode" /> 327 <item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
327 <item name="pages" type="462c0819:PsiDirectoryNode" /> 328 <item name="pages" type="462c0819:PsiDirectoryNode" />
  329 + <item name="service" type="462c0819:PsiDirectoryNode" />
  330 + <item name="renting" type="462c0819:PsiDirectoryNode" />
  331 + </path>
  332 + <path>
  333 + <item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
  334 + <item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
  335 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  336 + <item name="service" type="462c0819:PsiDirectoryNode" />
  337 + <item name="rentingDetail" type="462c0819:PsiDirectoryNode" />
  338 + </path>
  339 + <path>
  340 + <item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
  341 + <item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
  342 + <item name="pages" type="462c0819:PsiDirectoryNode" />
328 <item name="start" type="462c0819:PsiDirectoryNode" /> 343 <item name="start" type="462c0819:PsiDirectoryNode" />
329 </path> 344 </path>
330 <path> 345 <path>
@@ -333,16 +348,22 @@ @@ -333,16 +348,22 @@
333 <item name="pages" type="462c0819:PsiDirectoryNode" /> 348 <item name="pages" type="462c0819:PsiDirectoryNode" />
334 <item name="wish" type="462c0819:PsiDirectoryNode" /> 349 <item name="wish" type="462c0819:PsiDirectoryNode" />
335 </path> 350 </path>
  351 + <path>
  352 + <item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
  353 + <item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
  354 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  355 + <item name="wish" type="462c0819:PsiDirectoryNode" />
  356 + <item name="release" type="462c0819:PsiDirectoryNode" />
  357 + </path>
336 </expand> 358 </expand>
337 <select /> 359 <select />
338 </subPane> 360 </subPane>
339 </pane> 361 </pane>
340 - <pane id="Scope" />  
341 </panes> 362 </panes>
342 </component> 363 </component>
343 <component name="PropertiesComponent"> 364 <component name="PropertiesComponent">
344 <property name="WebServerToolWindowFactoryState" value="false" /> 365 <property name="WebServerToolWindowFactoryState" value="false" />
345 - <property name="last_opened_file_path" value="D:/project/life" /> 366 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
346 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 367 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
347 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 368 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
348 <property name="settings.editor.selected.configurable" value="vcs.Git" /> 369 <property name="settings.editor.selected.configurable" value="vcs.Git" />
@@ -413,7 +434,14 @@ @@ -413,7 +434,14 @@
413 <workItem from="1543367095559" duration="1048000" /> 434 <workItem from="1543367095559" duration="1048000" />
414 <workItem from="1543376425554" duration="4241000" /> 435 <workItem from="1543376425554" duration="4241000" />
415 <workItem from="1543404062236" duration="83000" /> 436 <workItem from="1543404062236" duration="83000" />
416 - <workItem from="1543903183003" duration="3608000" /> 437 + <workItem from="1543903183003" duration="6220000" />
  438 + <workItem from="1544059371597" duration="3034000" />
  439 + <workItem from="1544166699910" duration="698000" />
  440 + <workItem from="1544254866619" duration="1525000" />
  441 + <workItem from="1544404348257" duration="300000" />
  442 + <workItem from="1544407443651" duration="1473000" />
  443 + <workItem from="1544430114191" duration="1753000" />
  444 + <workItem from="1544591532923" duration="684000" />
417 </task> 445 </task>
418 <task id="LOCAL-00001" summary="启动页"> 446 <task id="LOCAL-00001" summary="启动页">
419 <created>1537858583070</created> 447 <created>1537858583070</created>
@@ -741,7 +769,7 @@ @@ -741,7 +769,7 @@
741 <servers /> 769 <servers />
742 </component> 770 </component>
743 <component name="TimeTrackingManager"> 771 <component name="TimeTrackingManager">
744 - <option name="totallyTimeSpent" value="363637000" /> 772 + <option name="totallyTimeSpent" value="375716000" />
745 </component> 773 </component>
746 <component name="TodoView"> 774 <component name="TodoView">
747 <todo-panel id="selected-file"> 775 <todo-panel id="selected-file">
@@ -808,7 +836,6 @@ @@ -808,7 +836,6 @@
808 <option name="myLimit" value="2678400000" /> 836 <option name="myLimit" value="2678400000" />
809 </component> 837 </component>
810 <component name="VcsManagerConfiguration"> 838 <component name="VcsManagerConfiguration">
811 - <MESSAGE value="添加推荐列表点击量" />  
812 <MESSAGE value="修改appid" /> 839 <MESSAGE value="修改appid" />
813 <MESSAGE value="添加发布服务成功提示，优化三级分类tab样式，文章详情页添加预览图片功能，优化点击发布按钮弹框消失" /> 840 <MESSAGE value="添加发布服务成功提示，优化三级分类tab样式，文章详情页添加预览图片功能，优化点击发布按钮弹框消失" />
814 <MESSAGE value="合并冲突，修改匿名" /> 841 <MESSAGE value="合并冲突，修改匿名" />
@@ -833,12 +860,10 @@ @@ -833,12 +860,10 @@
833 <MESSAGE value="添加我的消息提示点" /> 860 <MESSAGE value="添加我的消息提示点" />
834 <MESSAGE value="添加举报页面，联系我们页面增加email显示，增加删除评论或回复功能，" /> 861 <MESSAGE value="添加举报页面，联系我们页面增加email显示，增加删除评论或回复功能，" />
835 <MESSAGE value="优化心愿进入主页，添加举报默认文字" /> 862 <MESSAGE value="优化心愿进入主页，添加举报默认文字" />
836 - <option name="LAST_COMMIT_MESSAGE" value="优化心愿进入主页，添加举报默认文字" /> 863 + <MESSAGE value="优化心愿发布，优化登录" />
  864 + <option name="LAST_COMMIT_MESSAGE" value="优化心愿发布，优化登录" />
837 </component> 865 </component>
838 <component name="editorHistoryManager"> 866 <component name="editorHistoryManager">
839 - <entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.json">  
840 - <provider selected="true" editor-type-id="text-editor" />  
841 - </entry>  
842 <entry file="file://$PROJECT_DIR$/pages/service/release/release.json"> 867 <entry file="file://$PROJECT_DIR$/pages/service/release/release.json">
843 <provider selected="true" editor-type-id="text-editor" /> 868 <provider selected="true" editor-type-id="text-editor" />
844 </entry> 869 </entry>
@@ -849,23 +874,9 @@ @@ -849,23 +874,9 @@
849 </state> 874 </state>
850 </provider> 875 </provider>
851 </entry> 876 </entry>
852 - <entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxml">  
853 - <provider selected="true" editor-type-id="text-editor">  
854 - <state relative-caret-position="264">  
855 - <caret line="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />  
856 - </state>  
857 - </provider>  
858 - </entry>  
859 <entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxss"> 877 <entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxss">
860 <provider selected="true" editor-type-id="text-editor" /> 878 <provider selected="true" editor-type-id="text-editor" />
861 </entry> 879 </entry>
862 - <entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">  
863 - <provider selected="true" editor-type-id="text-editor">  
864 - <state relative-caret-position="3212">  
865 - <caret line="217" column="24" selection-start-line="217" selection-start-column="24" selection-end-line="217" selection-end-column="24" />  
866 - </state>  
867 - </provider>  
868 - </entry>  
869 <entry file="file://$PROJECT_DIR$/images/img2.png"> 880 <entry file="file://$PROJECT_DIR$/images/img2.png">
870 <provider selected="true" editor-type-id="images" /> 881 <provider selected="true" editor-type-id="images" />
871 </entry> 882 </entry>
@@ -973,13 +984,6 @@ @@ -973,13 +984,6 @@
973 </state> 984 </state>
974 </provider> 985 </provider>
975 </entry> 986 </entry>
976 - <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">  
977 - <provider selected="true" editor-type-id="text-editor">  
978 - <state relative-caret-position="367">  
979 - <caret line="230" selection-start-line="230" selection-end-line="247" selection-end-column="13" />  
980 - </state>  
981 - </provider>  
982 - </entry>  
983 <entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.js"> 987 <entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.js">
984 <provider selected="true" editor-type-id="text-editor"> 988 <provider selected="true" editor-type-id="text-editor">
985 <state relative-caret-position="323"> 989 <state relative-caret-position="323">
@@ -994,13 +998,6 @@ @@ -994,13 +998,6 @@
994 </state> 998 </state>
995 </provider> 999 </provider>
996 </entry> 1000 </entry>
997 - <entry file="file://$PROJECT_DIR$/pages/my/messageDetail/messageDetail.wxml">  
998 - <provider selected="true" editor-type-id="text-editor">  
999 - <state relative-caret-position="555">  
1000 - <caret line="170" column="148" selection-start-line="170" selection-start-column="148" selection-end-line="170" selection-end-column="148" />  
1001 - </state>  
1002 - </provider>  
1003 - </entry>  
1004 <entry file="file://$PROJECT_DIR$/pages/service/myindex/myindex.json"> 1001 <entry file="file://$PROJECT_DIR$/pages/service/myindex/myindex.json">
1005 <provider selected="true" editor-type-id="text-editor" /> 1002 <provider selected="true" editor-type-id="text-editor" />
1006 </entry> 1003 </entry>
@@ -1042,20 +1039,6 @@ @@ -1042,20 +1039,6 @@
1042 </state> 1039 </state>
1043 </provider> 1040 </provider>
1044 </entry> 1041 </entry>
1045 - <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">  
1046 - <provider selected="true" editor-type-id="text-editor">  
1047 - <state relative-caret-position="2244">  
1048 - <caret line="102" column="18" selection-start-line="102" selection-start-column="18" selection-end-line="102" selection-end-column="18" />  
1049 - </state>  
1050 - </provider>  
1051 - </entry>  
1052 - <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">  
1053 - <provider selected="true" editor-type-id="text-editor">  
1054 - <state relative-caret-position="4554">  
1055 - <caret line="207" column="106" selection-start-line="207" selection-start-column="106" selection-end-line="207" selection-end-column="106" />  
1056 - </state>  
1057 - </provider>  
1058 - </entry>  
1059 <entry file="file://$PROJECT_DIR$/pages/consult/consult.js"> 1042 <entry file="file://$PROJECT_DIR$/pages/consult/consult.js">
1060 <provider selected="true" editor-type-id="text-editor"> 1043 <provider selected="true" editor-type-id="text-editor">
1061 <state relative-caret-position="3564"> 1044 <state relative-caret-position="3564">
@@ -1105,6 +1088,13 @@ @@ -1105,6 +1088,13 @@
1105 </state> 1088 </state>
1106 </provider> 1089 </provider>
1107 </entry> 1090 </entry>
  1091 + <entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml">
  1092 + <provider selected="true" editor-type-id="text-editor">
  1093 + <state relative-caret-position="1496">
  1094 + <caret line="68" column="7" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
  1095 + </state>
  1096 + </provider>
  1097 + </entry>
1108 <entry file="file://$PROJECT_DIR$/pages/report/report.js"> 1098 <entry file="file://$PROJECT_DIR$/pages/report/report.js">
1109 <provider selected="true" editor-type-id="text-editor"> 1099 <provider selected="true" editor-type-id="text-editor">
1110 <state relative-caret-position="528"> 1100 <state relative-caret-position="528">
@@ -1112,48 +1102,86 @@ @@ -1112,48 +1102,86 @@
1112 </state> 1102 </state>
1113 </provider> 1103 </provider>
1114 </entry> 1104 </entry>
1115 - <entry file="file://$PROJECT_DIR$/pages/report/report.wxml"> 1105 + <entry file="file://$PROJECT_DIR$/pages/wish/wish.js">
1116 <provider selected="true" editor-type-id="text-editor"> 1106 <provider selected="true" editor-type-id="text-editor">
1117 - <state relative-caret-position="66">  
1118 - <caret line="3" column="97" selection-start-line="3" selection-start-column="97" selection-end-line="3" selection-end-column="97" /> 1107 + <state relative-caret-position="1276">
  1108 + <caret line="58" column="18" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="18" />
1119 </state> 1109 </state>
1120 </provider> 1110 </provider>
1121 </entry> 1111 </entry>
1122 - <entry file="file://$PROJECT_DIR$/pages/my/mycollect/mycollect.js"> 1112 + <entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
  1113 + <provider selected="true" editor-type-id="text-editor" />
  1114 + </entry>
  1115 + <entry file="file://$PROJECT_DIR$/pages/my/messageDetail/messageDetail.wxml">
1123 <provider selected="true" editor-type-id="text-editor"> 1116 <provider selected="true" editor-type-id="text-editor">
1124 - <state relative-caret-position="660">  
1125 - <caret line="30" column="18" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="18" /> 1117 + <state relative-caret-position="308">
  1118 + <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
1126 </state> 1119 </state>
1127 </provider> 1120 </provider>
1128 </entry> 1121 </entry>
1129 - <entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml"> 1122 + <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">
  1123 + <provider selected="true" editor-type-id="text-editor">
  1124 + <state relative-caret-position="528">
  1125 + <caret line="24" column="54" selection-start-line="24" selection-start-column="45" selection-end-line="24" selection-end-column="54" />
  1126 + </state>
  1127 + </provider>
  1128 + </entry>
  1129 + <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
  1130 + <provider selected="true" editor-type-id="text-editor">
  1131 + <state relative-caret-position="6688">
  1132 + <caret line="304" column="51" lean-forward="true" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
  1133 + </state>
  1134 + </provider>
  1135 + </entry>
  1136 + <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxml">
  1137 + <provider selected="true" editor-type-id="text-editor" />
  1138 + </entry>
  1139 + <entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxml">
1130 <provider selected="true" editor-type-id="text-editor"> 1140 <provider selected="true" editor-type-id="text-editor">
1131 - <state relative-caret-position="673">  
1132 - <caret line="68" column="7" lean-forward="true" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" /> 1141 + <state relative-caret-position="1408">
  1142 + <caret line="64" column="53" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="53" />
  1143 + </state>
  1144 + </provider>
  1145 + </entry>
  1146 + <entry file="file://$PROJECT_DIR$/pages/report/report.wxml">
  1147 + <provider selected="true" editor-type-id="text-editor">
  1148 + <state relative-caret-position="66">
  1149 + <caret line="3" column="97" selection-start-line="3" selection-start-column="97" selection-end-line="3" selection-end-column="97" />
1133 </state> 1150 </state>
1134 </provider> 1151 </provider>
1135 </entry> 1152 </entry>
1136 <entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml"> 1153 <entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml">
1137 <provider selected="true" editor-type-id="text-editor"> 1154 <provider selected="true" editor-type-id="text-editor">
1138 - <state relative-caret-position="279"> 1155 + <state relative-caret-position="418">
1139 <caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" /> 1156 <caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" />
1140 </state> 1157 </state>
1141 </provider> 1158 </provider>
1142 </entry> 1159 </entry>
1143 - <entry file="file://$PROJECT_DIR$/pages/start/start.wxml">  
1144 - <provider selected="true" editor-type-id="text-editor" /> 1160 + <entry file="file://$PROJECT_DIR$/pages/my/mycollect/mycollect.js">
  1161 + <provider selected="true" editor-type-id="text-editor">
  1162 + <state relative-caret-position="660">
  1163 + <caret line="30" column="18" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="18" />
  1164 + </state>
  1165 + </provider>
1145 </entry> 1166 </entry>
1146 - <entry file="file://$PROJECT_DIR$/pages/wish/wish.js"> 1167 + <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
1147 <provider selected="true" editor-type-id="text-editor"> 1168 <provider selected="true" editor-type-id="text-editor">
1148 - <state relative-caret-position="279">  
1149 - <caret line="58" column="18" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="18" /> 1169 + <state relative-caret-position="829">
  1170 + <caret line="252" column="22" lean-forward="true" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
1150 </state> 1171 </state>
1151 </provider> 1172 </provider>
1152 </entry> 1173 </entry>
1153 <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 1174 <entry file="file://$PROJECT_DIR$/pages/start/start.js">
1154 <provider selected="true" editor-type-id="text-editor"> 1175 <provider selected="true" editor-type-id="text-editor">
1155 - <state relative-caret-position="550">  
1156 - <caret line="37" column="36" lean-forward="true" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" /> 1176 + <state relative-caret-position="660">
  1177 + <caret line="30" column="61" lean-forward="true" selection-start-line="30" selection-start-column="61" selection-end-line="30" selection-end-column="61" />
  1178 + </state>
  1179 + </provider>
  1180 + </entry>
  1181 + <entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
  1182 + <provider selected="true" editor-type-id="text-editor">
  1183 + <state relative-caret-position="258">
  1184 + <caret line="267" column="38" lean-forward="true" selection-start-line="267" selection-start-column="38" selection-end-line="267" selection-end-column="38" />
1157 </state> 1185 </state>
1158 </provider> 1186 </provider>
1159 </entry> 1187 </entry>
@@ -14,16 +14,10 @@ Page({ @@ -14,16 +14,10 @@ Page({
14 // 获取用户信息 14 // 获取用户信息
15 start(e) { 15 start(e) {
16 let that = this; 16 let that = this;
  17 + wx.checkSession({
  18 + success: function () {
17 // console.log(e,that.data.openid,that.data.session_key) 19 // console.log(e,that.data.openid,that.data.session_key)
18 let geturl = '/wxapp/public/login'; 20 let geturl = '/wxapp/public/login';
19 - // let url = '/wxapp/public/getSessionKey'  
20 - // wx.login({  
21 - // success: function (res) {  
22 - // console.log(res)  
23 - // app.post(url, {  
24 - // code: res.code  
25 - // }, {}).then((res) => {  
26 - // console.log('res',ret);  
27 let params = { 21 let params = {
28 encrypted_data: e.detail.encryptedData, 22 encrypted_data: e.detail.encryptedData,
29 iv: e.detail.iv, 23 iv: e.detail.iv,
@@ -32,6 +26,7 @@ Page({ @@ -32,6 +26,7 @@ Page({
32 openid: that.data.openid, 26 openid: that.data.openid,
33 session_key: that.data.session_key, 27 session_key: that.data.session_key,
34 } 28 }
  29 + if (that.data.openid && that.data.session_key) {
35 app.post(geturl, params).then((ret) => { 30 app.post(geturl, params).then((ret) => {
36 wx.setStorageSync('token', ret.token) 31 wx.setStorageSync('token', ret.token)
37 // console.log(ret); 32 // console.log(ret);
@@ -44,14 +39,14 @@ Page({ @@ -44,14 +39,14 @@ Page({
44 }) 39 })
45 } 40 }
46 }) 41 })
47 -  
48 - // })  
49 - // },  
50 - // fail: function (res) {  
51 - // },  
52 - // complete: function (res) {  
53 - // },  
54 - // }) 42 + }
  43 + },
  44 + fail: function () {
  45 + console.log('session_key 已经失效');
  46 + // session_key 已经失效，需要重新执行登录流程
  47 + self.getSession() //重新登录
  48 + }
  49 + })
55 50
56 }, 51 },
57 example() { 52 example() {
@@ -64,23 +59,19 @@ Page({ @@ -64,23 +59,19 @@ Page({
64 }).catch((err) => { 59 }).catch((err) => {
65 }) 60 })
66 }, 61 },
67 - /**  
68 - * 生命周期函数--监听页面加载  
69 - */  
70 - onLoad: function (options) {  
71 - let that = this  
72 - let url = '/wxapp/public/getSessionKey' 62 + getSession() {
  63 + let self = this;
  64 + let url = '/wxapp/public/getSessionKey';
73 wx.login({ 65 wx.login({
74 success: function (res) { 66 success: function (res) {
75 // console.log(res) 67 // console.log(res)
76 app.post(url, { 68 app.post(url, {
77 code: res.code 69 code: res.code
78 }, {}).then((ret) => { 70 }, {}).then((ret) => {
79 - // console.log('res',ret);  
80 - that.setData({ 71 + self.setData({
81 openid: ret.openid, 72 openid: ret.openid,
82 session_key: ret.session_key 73 session_key: ret.session_key
83 - }) 74 + });
84 }) 75 })
85 }, 76 },
86 fail: function (res) { 77 fail: function (res) {
@@ -89,28 +80,13 @@ Page({ @@ -89,28 +80,13 @@ Page({
89 }, 80 },
90 }) 81 })
91 }, 82 },
92 - // getOpenId(){  
93 - // let that = this  
94 - // let url = '/wxapp/public/getSessionKey'  
95 - // wx.login({  
96 - // success: function (res) {  
97 - // // console.log(res)  
98 - // app.post(url, {  
99 - // code: res.code  
100 - // }, {}).then((ret) => {  
101 - // // console.log('res',ret);  
102 - // that.setData({  
103 - // openid: ret.openid,  
104 - // session_key: ret.session_key  
105 - // })  
106 - // })  
107 - // },  
108 - // fail: function (res) {  
109 - // },  
110 - // complete: function (res) {  
111 - // },  
112 - // })  
113 - // }, 83 + /**
  84 + * 生命周期函数--监听页面加载
  85 + */
  86 + onLoad: function (options) {
  87 + let that = this;
  88 + that.getSession();
  89 + },
114 90
115 /** 91 /**
116 * 生命周期函数--监听页面初次渲染完成 92 * 生命周期函数--监听页面初次渲染完成
@@ -17,7 +17,8 @@ Page({ @@ -17,7 +17,8 @@ Page({
17 is_anonymous: [{id:1,name:'是'},{id:0,name:'否'}], 17 is_anonymous: [{id:1,name:'是'},{id:0,name:'否'}],
18 showAnonymous: false, 18 showAnonymous: false,
19 anonymousValue: [0,0,0], 19 anonymousValue: [0,0,0],
20 - repay: '' 20 + repay: '',
  21 + is_click: false,
21 }, 22 },
22 //文本输入 23 //文本输入
23 textContent(e) { 24 textContent(e) {
@@ -263,6 +264,9 @@ Page({ @@ -263,6 +264,9 @@ Page({
263 //提交发布心愿表单 264 //提交发布心愿表单
264 submitServiceForm() { 265 submitServiceForm() {
265 let self = this; 266 let self = this;
  267 + // console.log('is_click',self.data.is_click);
  268 + if(self.data.is_click) return;
  269 + self.setData({is_click: true});
266 if(self.data.textareavalue === '') { 270 if(self.data.textareavalue === '') {
267 wx.showToast({ 271 wx.showToast({
268 title: '请填写发布信息', 272 title: '请填写发布信息',
@@ -301,12 +305,16 @@ Page({ @@ -301,12 +305,16 @@ Page({
301 }; 305 };
302 app.post(url,params,header).then((res) => { 306 app.post(url,params,header).then((res) => {
303 // console.log('提交心愿表单', res); 307 // console.log('提交心愿表单', res);
304 - // self.setData({  
305 - // portal_three: res,  
306 - // });  
307 wx.showToast({title:'发布成功',icon: 'success'}); 308 wx.showToast({title:'发布成功',icon: 'success'});
308 // wx.hideToast({}); 309 // wx.hideToast({});
309 - wx.redirectTo({url: '/pages/wish/wish'}) 310 + wx.redirectTo({
  311 + url: '/pages/wish/wish',
  312 + success: function () {
  313 + self.setData({
  314 + is_click: false,
  315 + });
  316 + }
  317 + });
310 }) 318 })
311 } 319 }
312 }, 320 },