miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 b48af48187d502056773ea8d629de1d513a2664e 1 个父辈 86a6a94b

对接本周实验，往期实验，登录接口

内嵌 并排对比
正在显示 10 个修改的文件 包含 353 行增加 和 136 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="modal 模板">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="上传到远程wumengyu">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" 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/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/templates.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -18,40 +26,44 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="3" />
<entry key="project.open.time.0" value="3" />
<entry key="project.open.time.1" value="1" />
<entry key="project.opened" value="1" />
<entry key="project.opened" value="4" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="1" />
<entry key="json" value="1" />
<entry key="wxml" value="3" />
<entry key="wxss" value="3" />
<entry key="js" value="6" />
<entry key="json" value="4" />
<entry key="wxml" value="9" />
<entry key="wxss" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="3" />
<entry key="HTML" value="3" />
<entry key="JSON" value="1" />
<entry key="JavaScript" value="1" />
<entry key="CSS" value="5" />
<entry key="HTML" value="9" />
<entry key="JSON" value="4" />
<entry key="JavaScript" value="6" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="56" />
<entry key="txt" value="18" />
<entry key="wxml" value="108" />
<entry key="js" value="564" />
<entry key="json" value="27" />
<entry key="txt" value="36" />
<entry key="wxml" value="244" />
<entry key="wxss" value="21" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="21" />
<entry key="HTML" value="108" />
<entry key="JavaScript" value="56" />
<entry key="PLAIN_TEXT" value="18" />
<entry key="HTML" value="244" />
<entry key="JSON" value="27" />
<entry key="JavaScript" value="564" />
<entry key="PLAIN_TEXT" value="36" />
</counts>
</usages-collector>
</session>
... ... @@ -61,8 +73,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
<state relative-caret-position="880">
<caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
</state>
</provider>
</entry>
... ... @@ -70,17 +82,26 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" selection-start-line="1" selection-end-line="2" />
<state relative-caret-position="154">
<caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/project.config.json">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
<state relative-caret-position="506">
<caret line="98" column="64" selection-start-line="98" selection-start-column="64" selection-end-line="98" selection-end-column="64" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1018#1103#0" />
<element signature="e#1121#1191#0" />
<element signature="e#1219#1288#0" />
<element signature="e#1321#1468#0" />
<element signature="e#1499#1619#0" />
<element signature="e#1750#1766#0" />
</folding>
</state>
</provider>
</entry>
... ... @@ -88,56 +109,60 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
<state relative-caret-position="374">
<caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
<state relative-caret-position="198">
<caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
<state relative-caret-position="132">
<caret line="6" column="15" lean-forward="true" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />
</state>
</provider>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
<state relative-caret-position="550">
<caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="29" column="49" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
</leaf>
... ... @@ -145,6 +170,8 @@
<component name="FindInProjectRecents">
<findStrings>
<find>chooseYes</find>
<find>baseUrl</find>
<find>getUserInfo</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -153,11 +180,18 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<option value="$PROJECT_DIR$/templates/templates.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" />
<option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
</list>
</option>
</component>
... ... @@ -168,7 +202,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="y" value="22" />
<option name="x" value="-3" />
<option name="y" value="1" />
<option name="width" value="1936" />
<option name="height" value="1047" />
</component>
... ... @@ -177,6 +212,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -200,7 +236,20 @@
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="confirm-appointment-info" type="462c0819:PsiDirectoryNode" />
<item name="activity-detail" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="phone-code" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="start" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -211,12 +260,11 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="D:/公众号/福牌" />
<property name="last_opened_file_path" value="D:/project/life" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="project.propDebugger" />
... ... @@ -244,7 +292,10 @@
<option name="presentableId" value="Default" />
<updated>1542334789245</updated>
<workItem from="1542334792985" duration="236000" />
<workItem from="1542249556873" duration="5520000" />
<workItem from="1542249556873" duration="6568000" />
<workItem from="1542594514355" duration="2482000" />
<workItem from="1542676616270" duration="2495000" />
<workItem from="1543297125303" duration="4846000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -253,17 +304,24 @@
<option name="project" value="LOCAL" />
<updated>1542274356914</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="上传到远程wumengyu">
<created>1542275805566</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1542275805566</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5756000" />
<option name="totallyTimeSpent" value="16627000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
<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" />
... ... @@ -274,9 +332,9 @@
<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 active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.329718" />
<window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3275488" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.34273317" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -316,19 +374,13 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="modal 模板" />
<option name="LAST_COMMIT_MESSAGE" value="modal 模板" />
<MESSAGE value="上传到远程wumengyu" />
<option name="LAST_COMMIT_MESSAGE" value="上传到远程wumengyu" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json" />
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml" />
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss" />
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -341,37 +393,38 @@
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
<caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
<caret column="34" selection-start-column="34" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
<state relative-caret-position="550">
<caret line="25" column="28" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" selection-start-line="10" selection-end-line="12" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" selection-start-line="1" selection-end-line="2" />
<state relative-caret-position="924">
<caret line="42" selection-start-line="42" selection-end-line="59" selection-end-column="1" />
</state>
</provider>
</entry>
... ... @@ -382,24 +435,115 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1100">
<caret line="50" column="42" selection-start-line="50" selection-start-column="42" selection-end-line="50" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<state relative-caret-position="924">
<caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="47">
<caret line="58" column="67" lean-forward="true" selection-start-line="58" selection-start-column="67" selection-end-line="58" selection-end-column="67" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="29" column="49" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="880">
<caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
<state relative-caret-position="374">
<caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="98" column="64" selection-start-line="98" selection-start-column="64" selection-end-line="98" selection-end-column="64" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#1018#1103#0" />
<element signature="e#1121#1191#0" />
<element signature="e#1219#1288#0" />
<element signature="e#1321#1468#0" />
<element signature="e#1499#1619#0" />
<element signature="e#1750#1766#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="15" lean-forward="true" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />
<state relative-caret-position="198">
<caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
</state>
</provider>
</entry>
... ...
... ... @@ -53,7 +53,7 @@ App({
//init
let that = this;
let postData = data;
let baseUrl = 'http://informationxcx.w.bronet.cn/api';
let baseUrl = 'http://science.w.bronet.cn/api';
//网络请求
let header = {
'content-type': 'application/x-www-form-urlencoded'
... ...
{
"pages": [
"pages/start/start",
"pages/index/index",
"pages/index/confirm-appointment-info/confirm-appointment-info",
"pages/index/phone-code/phone-code",
... ... @@ -23,8 +24,7 @@
"pages/clock/punchAppealDetail2/punchAppealDetail2",
"pages/clock/punchAppealDetail/punchAppealDetail",
"pages/clock/punchAppeal/punchAppeal",
"pages/clock/clock",
"pages/start/start"
"pages/clock/clock"
],
"window": {
"backgroundTextStyle": "light",
... ...
// pages/index/activity-detail/activity-detail.js
const app = getApp();
Page({
/**
... ... @@ -6,16 +7,33 @@ Page({
*/
data: {
is_agree: true,
detail: {},
},
clickAgreeBtn() {
this.setData({is_agree: !this.data.is_agree});
console.log(this.data.is_agree);
},
getDetail() {
let url = '/portal/Experiment/detail';
let params = {
id: this.data.test_id,//当前实验的id
};
let headers= {
"XX-token": wx.getStorageSync('token')
};
app.post(url, params,headers).then((res) => {
console.log(res);
this.setData({detail: res})
// console.log(this.data.this_week_test_info);
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options);
this.setData({test_id: +options.id});
this.getDetail()
},
/**
... ...
... ... @@ -7,7 +7,7 @@
<view class="title">
<view class="line"></view>
<view class="test_detail">
<text>科学队长实验室：雷电的产生！</text>
<text>{{detail.name}}科学队长实验室：雷电的产生！</text>
<view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view>
</view>
</view>
... ...
... ... @@ -5,7 +5,7 @@ const app = getApp()
Page({
data: {
hasPhone: true,
imgUrls:[
imgUrls: [
{'url': '../../images/banner.jpg'},
{'url': '../../images/banner.jpg'},
{'url': '../../images/banner.jpg'},],
... ... @@ -13,19 +13,15 @@ Page({
interval: 2000, //间隔时间
duration: 500, //滑动时间
this_week_test_info: {
info: [
{time: '11月01号-11月07号',url: '../../images/test_img.jpg',},
{time: '11月08号-11月14号',url: '../../images/test_img.jpg'},
],
is_this_week: true,
ordered: false,
is_past: false,
},
past_test_info: {
info: [
{time: '10月01号-10月07号',url: '../../images/test_img.jpg',},
{time: '10月08号-10月14号',url: '../../images/test_img.jpg'},
{time: '10月15号-10月21号',url: '../../images/test_img.jpg'},
{time: '10月01号-10月07号', url: '../../images/test_img.jpg',},
{time: '10月08号-10月14号', url: '../../images/test_img.jpg'},
{time: '10月15号-10月21号', url: '../../images/test_img.jpg'},
],
is_this_week: false,
ordered: false,
... ... @@ -51,39 +47,77 @@ Page({
wx.navigateTo({url: './activity-detail/activity-detail'})
},
//前往预约
goAppointment (e) {
goAppointment(e) {
const current = e.currentTarget.dataset.index;
wx.navigateTo({url: './go-appointment/go-appointment'})
},
onLoad: function () {
if (app.globalData.userInfo) {
this.setData({
userInfo: app.globalData.userInfo,
hasUserInfo: true
})
} else if (this.data.canIUse){
// 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
// 所以此处加入 callback 以防止这种情况
app.userInfoReadyCallback = res => {
this.setData({
userInfo: res.userInfo,
hasUserInfo: true
//获取轮播图
getSlideImage() {
let url = '/portal/Index/index';
let params = {
city: this.data.city,
};
app.post(url, params).then((ret) => {
wx.setStorageSync('token', ret.token)
app.globalData.userInfo = ret.user_type
// console.log('userInfo',app.globalData.userInfo,ret);
if (ret.user_type == 2) {
wx.switchTab({
url: '/pages/index/index',
})
}
} else {
// 在没有 open-type=getUserInfo 版本的兼容处理
wx.getUserInfo({
success: res => {
app.globalData.userInfo = res.userInfo
this.setData({
userInfo: res.userInfo,
hasUserInfo: true
})
},
//获取本周实验
getTheWeekTest() {
let url = '/portal/Index/now';
app.post(url, {}).then((res) => {
console.log(res);
this.setData({this_week_test_info: res})
console.log(this.data.this_week_test_info);
})
},
//查看本周实验详情
goDetail() {
wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + this.data.this_week_test_info.id})
},
//获取往期实验
getPastWeekTest() {
let url = '/portal/Index/history';
let params = {
page: 1,
}
app.post(url, params,{}).then((res) => {
console.log(res);
this.setData({past_test_info: res})
// console.log(this.data.this_week_test_info);
})
},
//查看往期实验详情
goPastDetail(e) {
const id = e.currentTarget.dataset.id;
wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + id})
},
onLoad: function () {
this.getTheWeekTest();
this.getPastWeekTest();
wx.getLocation({
type: 'wgs84',
success: function(res) {
console.log(res);
let url = '/public/getAddressInfoByCoordinate';
let params = {
latitude: res.latitude,//纬度
longitude: res.longitude//经度
};
// app.post(url,params).then((res) => {
// // console.log('获取城市',res);
// self.setData({city: res.city})
// })
}
});
},
getUserInfo: function(e) {
getUserInfo: function (e) {
console.log(e)
app.globalData.userInfo = e.detail.userInfo
this.setData({
... ...
... ... @@ -34,7 +34,7 @@
<!--实验列表-->
<import src="/templates/templates.wxml" />
<view class="past_template">
<template is="experiment" data="{{...this_week_test_info}}"></template>
<template is="experiment" data="{{...past_test_info}}"></template>
<template is="this-experiment" data="{{this_week_test_info}}"></template>
<template is="past-experiment" data="{{...past_test_info}}"></template>
</view>
</view>
... ...
... ... @@ -55,11 +55,11 @@ Page({
let url = '/wxapp/public/getSessionKey'
wx.login({
success: function (res) {
// console.log(res)
console.log(res)
app.post(url, {
code: res.code
}, {}).then((ret) => {
// console.log('res',ret);
console.log('res',ret);
that.setData({
openid: ret.openid,
session_key: ret.session_key
... ...
... ... @@ -12,7 +12,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.4.0",
"appid": "wx48319d952ea4e37f",
"appid": "wxaab44bbcfc0e5bc5",
"projectname": "science",
"debugOptions": {
"hidedInDevtools": []
... ...
<template name="experiment">
<view class='experiment_box'>
<template name="this-experiment">
<view class='experiment_box' bindtap="goDetail">
<view class="title_box">
<view class="line"></view>
<text wx:if="{{is_this_week}}">本周实验</text>
<text wx:if="{{!is_this_week}}">往期实验</text>
<text>本周实验</text>
</view>
<view wx:for="{{info}}" wx:key="index" data-index="{{index}}" bindtap="goTestDetail">
<view>
<view class="test_box">
<view class="time">{{item.time}}</view>
<view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view>
<view class="img_box">
<image src="{{item.url}}"></image>
<image src="{{this_week_test_info.thumb}}"></image>
</view>
</view>
<view class="order_box">
<text wx:if="{{!ordered && !is_past}}" catchtap="goAppointment" data-index="{{index}}">前往预约</text>
<text wx:if="{{is_past}}">查看</text>
<text catchtap="goAppointment" data-index="{{index}}">前往预约</text>
<!--<text wx:if="{{is_past}}">查看</text>-->
</view>
</view>
</view>
</template>
<template name="past-experiment">
<view class='experiment_box' bindtap="goPastDetail">
<view class="title_box">
<view class="line"></view>
<text>往期实验</text>
</view>
<view wx:for="{{list}}" wx:key="index" data-id="{{item.id}}">
<view class="test_box">
<view class="time">{{item.start_time}} - {{item.end_time}}</view>
<view class="img_box">
<image src="{{item.thumb}}"></image>
</view>
</view>
<view class="order_box">
<!--<text wx:if="{{!ordered}}" catchtap="goAppointment" data-index="{{index}}">前往预约</text>-->
<text>查看</text>
</view>
</view>
</view>
... ...