吴孟雨 / science-captain-new · 提交

转到一个项目

作者 吴孟雨
提交 4133b5b66df4e7f57a5420ca10c685ccc47b9844 1 个父辈 d43f221d

暂存

内嵌 并排对比
正在显示 1 个修改的文件 包含 68 行增加 和 70 行删除
... ... @@ -4,23 +4,7 @@
<bookmark url="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml" line="9" />
</component>
<component name="ChangeListManager">
<list default="true" id="75f2dbf1-3658-44f1-8934-8f4aa7a66688" 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$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/app.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/clock0.png" beforeDir="false" afterPath="$PROJECT_DIR$/images/clock0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/clock1.png" beforeDir="false" afterPath="$PROJECT_DIR$/images/clock1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/home0.png" beforeDir="false" afterPath="$PROJECT_DIR$/images/home0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/home1.png" beforeDir="false" afterPath="$PROJECT_DIR$/images/home1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/my0.png" beforeDir="false" afterPath="$PROJECT_DIR$/images/my0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/my1.png" beforeDir="false" afterPath="$PROJECT_DIR$/images/my1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/start/start.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/templates.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/templates.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxss" afterDir="false" />
</list>
<list default="true" id="75f2dbf1-3658-44f1-8934-8f4aa7a66688" name="Default Changelist" comment="" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
... ... @@ -36,9 +20,9 @@
<counts>
<entry key="project.closed" value="5" />
<entry key="project.open.time.0" value="1" />
<entry key="project.open.time.1" value="3" />
<entry key="project.open.time.1" value="4" />
<entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="5" />
<entry key="project.opened" value="6" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -61,7 +45,7 @@
<counts>
<entry key="js" value="2355" />
<entry key="json" value="154" />
<entry key="txt" value="24" />
<entry key="txt" value="65" />
<entry key="wxml" value="5042" />
<entry key="wxss" value="4653" />
</counts>
... ... @@ -72,18 +56,23 @@
<entry key="HTML" value="5042" />
<entry key="JSON" value="154" />
<entry key="JavaScript" value="2355" />
<entry key="PLAIN_TEXT" value="24" />
<entry key="PLAIN_TEXT" value="65" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
<counts>
<entry key="git.branch.delete.remote" value="1" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
<state relative-caret-position="418">
<caret line="19" column="4" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
</state>
</provider>
</entry>
... ... @@ -106,7 +95,7 @@
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
<caret line="17" column="34" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
</state>
</provider>
</entry>
... ... @@ -115,7 +104,7 @@
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
<caret line="29" column="4" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
</state>
</provider>
</entry>
... ... @@ -123,7 +112,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2126">
<state relative-caret-position="4554">
<caret line="207" column="24" selection-start-line="207" selection-start-column="24" selection-end-line="207" selection-end-column="24" />
</state>
</provider>
... ... @@ -132,7 +121,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-646">
<state relative-caret-position="66">
<caret line="3" column="44" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="44" />
</state>
</provider>
... ... @@ -141,13 +130,13 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="499">
<state relative-caret-position="4576">
<caret line="208" column="1" lean-forward="true" selection-start-line="208" selection-start-column="1" selection-end-line="208" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
... ... @@ -260,6 +249,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -307,7 +297,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -350,6 +339,7 @@
<workItem from="1542004536961" duration="13976000" />
<workItem from="1542070847192" duration="22854000" />
<workItem from="1542157184394" duration="7717000" />
<workItem from="1542244331008" duration="1636000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1541813802326</created>
... ... @@ -365,17 +355,24 @@
<option name="project" value="LOCAL" />
<updated>1541821930184</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="活动页详情，确认预约页，添加学员页，去预约手机认证页，全部预约页">
<created>1542244504677</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1542244504677</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="79250000" />
<option name="totallyTimeSpent" value="80886000" />
</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" visible="true" weight="0.1743941" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1743941" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -386,7 +383,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" />
<window_info active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.3177874" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
... ... @@ -429,7 +426,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="first commit" />
<MESSAGE value="首页静态页，启动页" />
<option name="LAST_COMMIT_MESSAGE" value="首页静态页，启动页" />
<MESSAGE value="活动页详情，确认预约页，添加学员页，去预约手机认证页，全部预约页" />
<option name="LAST_COMMIT_MESSAGE" value="活动页详情，确认预约页，添加学员页，去预约手机认证页，全部预约页" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/start/start.json">
... ... @@ -650,23 +648,49 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="24" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#text#1;n#view#0;n#view#0;n#view#1;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#text#3;n#view#0;n#view#0;n#view#1;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#text#4;n#view#0;n#view#0;n#view#1;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="34" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="4" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2126">
<state relative-caret-position="4554">
<caret line="207" column="24" selection-start-line="207" selection-start-column="24" selection-end-line="207" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-646">
<state relative-caret-position="66">
<caret line="3" column="44" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="499">
<state relative-caret-position="4576">
<caret line="208" column="1" lean-forward="true" selection-start-line="208" selection-start-column="1" selection-end-line="208" selection-end-column="1" />
</state>
</provider>
... ... @@ -685,43 +709,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
<state relative-caret-position="396">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="24" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#text#1;n#view#0;n#view#0;n#view#1;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#text#3;n#view#0;n#view#0;n#view#1;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#text#4;n#view#0;n#view#0;n#view#1;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
<state relative-caret-position="418">
<caret line="19" column="4" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
</state>
</provider>
</entry>
... ...