刘晓艳 / informationPlatform · 提交

转到一个项目

作者 刘晓艳
提交 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9 2 个父辈 22120464 ad986359

合并分支 'wumengyu' 到 'master' 

Wumengyu



查看合并请求 !36
内嵌 并排对比
正在显示 1 个修改的文件 包含 55 行增加 和 42 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6762183d-f259-4449-ac12-814b45d5f340" name="Default Changelist" comment="优化心愿发布，优化登录">
<list default="true" id="6762183d-f259-4449-ac12-814b45d5f340" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/wish/release/release.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/wish/release/release.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -33,7 +31,7 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="181" />
<entry key="js" value="182" />
<entry key="json" value="48" />
<entry key="png" value="3" />
<entry key="wxml" value="158" />
... ... @@ -46,7 +44,7 @@
<entry key="HTML" value="158" />
<entry key="Image" value="3" />
<entry key="JSON" value="48" />
<entry key="JavaScript" value="181" />
<entry key="JavaScript" value="182" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
... ... @@ -73,23 +71,31 @@
</counts>
</usages-collector>
</session>
<session id="1061351587">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.open.time.1" value="1" />
<entry key="project.opened" value="1" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="267" column="38" lean-forward="true" selection-start-line="267" selection-start-column="38" selection-end-line="267" selection-end-column="38" />
<state relative-caret-position="704">
<caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="24" column="54" selection-start-line="24" selection-start-column="45" selection-end-line="24" selection-end-column="54" />
<state relative-caret-position="278">
<caret line="154" column="17" selection-start-line="154" selection-start-column="17" selection-end-line="154" selection-end-column="17" />
</state>
</provider>
</entry>
... ... @@ -98,7 +104,7 @@
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6688">
<caret line="304" column="51" lean-forward="true" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
<caret line="304" column="51" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
</state>
</provider>
</entry>
... ... @@ -106,17 +112,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="829">
<caret line="252" column="22" lean-forward="true" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
<state relative-caret-position="5544">
<caret line="252" column="22" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="61" lean-forward="true" selection-start-line="30" selection-start-column="61" selection-end-line="30" selection-end-column="61" />
<state relative-caret-position="-616">
<caret line="20" column="30" lean-forward="true" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
</state>
</provider>
</entry>
... ... @@ -166,7 +172,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>load</find>
<find>onloa</find>
<find>tabcurrent</find>
<find>bubble</find>
... ... @@ -196,6 +201,7 @@
<find>复制</find>
<find>previewImage</find>
<find>concat</find>
<find>repay</find>
</findStrings>
<dirStrings>
<dir>D:\info\informationPlatform\wxParse</dir>
... ... @@ -441,7 +447,8 @@
<workItem from="1544404348257" duration="300000" />
<workItem from="1544407443651" duration="1473000" />
<workItem from="1544430114191" duration="1753000" />
<workItem from="1544591532923" duration="684000" />
<workItem from="1544591532923" duration="2605000" />
<workItem from="1544594357457" duration="613000" />
</task>
<task id="LOCAL-00001" summary="启动页">
<created>1537858583070</created>
... ... @@ -765,11 +772,18 @@
<option name="project" value="LOCAL" />
<updated>1542962602008</updated>
</task>
<option name="localTasksCounter" value="47" />
<task id="LOCAL-00047" summary="优化心愿发布，优化登录">
<created>1544592264175</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1544592264175</updated>
</task>
<option name="localTasksCounter" value="48" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="375716000" />
<option name="totallyTimeSpent" value="378250000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -782,7 +796,6 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4989154" visible="true" weight="0.14752372" />
<window_info id="Structure" order="1" sideWeight="0.5010846" side_tool="true" weight="0.14805058" />
... ... @@ -1060,13 +1073,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3256">
<caret line="149" column="22" selection-start-line="149" selection-start-column="22" selection-end-line="149" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2860">
... ... @@ -1126,10 +1132,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
<caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6688">
<caret line="304" column="51" lean-forward="true" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
<caret line="304" column="51" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5544">
<caret line="252" column="22" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
</state>
</provider>
</entry>
... ... @@ -1164,24 +1184,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="829">
<caret line="252" column="22" lean-forward="true" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
<state relative-caret-position="278">
<caret line="154" column="17" selection-start-line="154" selection-start-column="17" selection-end-line="154" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="61" lean-forward="true" selection-start-line="30" selection-start-column="61" selection-end-line="30" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="267" column="38" lean-forward="true" selection-start-line="267" selection-start-column="38" selection-end-line="267" selection-end-column="38" />
<state relative-caret-position="-616">
<caret line="20" column="30" lean-forward="true" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
</state>
</provider>
</entry>
... ...