miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 c02d636934906b6c56ba6cfdf982714c52ff55ca 1 个父辈 3da39bf5

确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid

内嵌 并排对比
正在显示 22 个修改的文件 包含 1544 行增加 和 492 行删除
<?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="上传到远程wumengyu">
<change afterPath="$PROJECT_DIR$/utils/qqmap-wx-jssdk.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/html2json.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/htmlparser.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/showdown.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/wxDiscode.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/wxParse.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/wxParse.wxml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wxParse/wxParse.wxss" afterDir="false" />
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市">
<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$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" 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$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.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/index/phone-code/phone-code.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
... ... @@ -31,44 +34,44 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="5" />
<entry key="project.open.time.0" value="4" />
<entry key="project.open.time.1" value="2" />
<entry key="project.opened" value="6" />
<entry key="project.closed" value="7" />
<entry key="project.open.time.0" value="5" />
<entry key="project.open.time.1" value="3" />
<entry key="project.opened" value="8" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="24" />
<entry key="json" value="7" />
<entry key="wxml" value="21" />
<entry key="wxss" value="7" />
<entry key="js" value="38" />
<entry key="json" value="14" />
<entry key="wxml" value="34" />
<entry key="wxss" value="13" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="7" />
<entry key="HTML" value="21" />
<entry key="JSON" value="7" />
<entry key="JavaScript" value="24" />
<entry key="CSS" value="13" />
<entry key="HTML" value="34" />
<entry key="JSON" value="14" />
<entry key="JavaScript" value="38" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="696" />
<entry key="json" value="27" />
<entry key="txt" value="36" />
<entry key="wxml" value="257" />
<entry key="wxss" value="21" />
<entry key="js" value="4356" />
<entry key="json" value="117" />
<entry key="txt" value="89" />
<entry key="wxml" value="973" />
<entry key="wxss" value="742" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="21" />
<entry key="HTML" value="257" />
<entry key="JSON" value="27" />
<entry key="JavaScript" value="696" />
<entry key="PLAIN_TEXT" value="36" />
<entry key="CSS" value="742" />
<entry key="HTML" value="973" />
<entry key="JSON" value="117" />
<entry key="JavaScript" value="4356" />
<entry key="PLAIN_TEXT" value="89" />
</counts>
</usages-collector>
</session>
... ... @@ -76,101 +79,94 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="87" column="75" selection-start-line="87" selection-start-column="75" selection-end-line="87" selection-end-column="75" />
<state relative-caret-position="498">
<caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1518">
<caret line="152" column="39" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" />
<folding>
<element signature="e#380#591#0" />
<element signature="e#599#810#0" />
<element signature="e#818#1030#0" />
<element signature="e#1038#1251#0" />
<element signature="e#1270#2391#0" />
</folding>
<state relative-caret-position="333">
<caret line="41" column="16" lean-forward="true" selection-start-line="41" selection-start-column="16" selection-end-line="51" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<state relative-caret-position="586">
<caret line="58" column="62" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="62" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="137" column="38" lean-forward="true" selection-start-line="140" selection-start-column="4" selection-end-line="140" selection-end-column="12" />
<state relative-caret-position="286">
<caret line="13" column="99" lean-forward="true" selection-start-line="13" selection-start-column="99" selection-end-line="13" selection-end-column="99" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.json">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<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 relative-caret-position="660">
<caret line="39" column="6" lean-forward="true" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />
</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/my/order-detail/order-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<state relative-caret-position="1364">
<caret line="62" selection-start-line="62" selection-end-line="62" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="707">
<caret line="176" selection-start-line="176" selection-end-line="176" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="88">
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
<state relative-caret-position="806">
<caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<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="176">
<caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
<state relative-caret-position="308">
<caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
<state relative-caret-position="22">
<caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
</state>
</provider>
</entry>
... ... @@ -179,15 +175,36 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>chooseYes</find>
<find>baseUrl</find>
<find>getUserInfo</find>
<find>current_session_id</find>
<find>currentId</find>
<find>goAppointment</find>
<find>has</find>
<find>currentCity</find>
<find>hasPhone</find>
<find>show_submit_btn</find>
<find>current_test_id</find>
<find>experiment_id</find>
<find>chil</find>
<find>bindPickerChange</find>
<find>check-box</find>
<find>form</find>
<find>skin</find>
<find>verification_code</find>
<find>add</find>
<find>formSubmit</find>
<find>is_showModal</find>
<find>navigateBack</find>
<find>购买畅玩卡</find>
<find>chooseNo</find>
<find>input_style</find>
<find>confirmPay</find>
<find>goBuyCard</find>
<find>QQMapWX</find>
<find>picker</find>
<find>添加</find>
<find>addStudent</find>
<find>from</find>
<find>icon-xuanze1</find>
<find>list_input</find>
<find>icon-xuanzhong</find>
<find>pay_success</find>
<find>@import</find>
<find>tips</find>
<find>changeStudent</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -197,13 +214,9 @@
<option name="CHANGED_PATHS">
<list>
<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.wxml" />
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<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" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml" />
<option value="$PROJECT_DIR$/pages/my/my.js" />
<option value="$PROJECT_DIR$/pages/my/protocol/protocol.js" />
... ... @@ -213,15 +226,32 @@
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/utils/util.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
<option value="$PROJECT_DIR$/project.config.json" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" />
<option value="$PROJECT_DIR$/app.wxss" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.json" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" />
</list>
</option>
</component>
... ... @@ -242,7 +272,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -259,7 +288,28 @@
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="clock" 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" />
</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="confirm-appointment-info" 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="confirm-appointment-info" type="462c0819:PsiDirectoryNode" />
<item name="add-student" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -285,22 +335,56 @@
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="all-appointment" 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="my" type="462c0819:PsiDirectoryNode" />
<item name="buyCard" 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="my" type="462c0819:PsiDirectoryNode" />
<item name="charge" 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="my" type="462c0819:PsiDirectoryNode" />
<item name="order-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="start" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="utils" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<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" />
... ... @@ -339,7 +423,9 @@
<workItem from="1542676616270" duration="2495000" />
<workItem from="1543297125303" duration="4846000" />
<workItem from="1543403978629" duration="164000" />
<workItem from="1543975238201" duration="2598000" />
<workItem from="1543975238201" duration="27150000" />
<workItem from="1544059385784" duration="3563000" />
<workItem from="1544062971616" duration="13337000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -362,11 +448,18 @@
<option name="project" value="LOCAL" />
<updated>1543402188113</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市">
<created>1543978774317</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1543978774318</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="21219000" />
<option name="totallyTimeSpent" value="62671000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -384,8 +477,8 @@
<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="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.22017354" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.5802603" />
<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" />
... ... @@ -427,21 +520,13 @@
<MESSAGE value="modal 模板" />
<MESSAGE value="上传到远程wumengyu" />
<MESSAGE value="登录注册，绑定手机号，获取验证码，轮播图，本周实验，往期实验，立即预约，实验详情" />
<option name="LAST_COMMIT_MESSAGE" value="登录注册，绑定手机号，获取验证码，轮播图，本周实验，往期实验，立即预约，实验详情" />
<MESSAGE value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" />
<option name="LAST_COMMIT_MESSAGE" value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" />
</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$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -456,20 +541,6 @@
</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="462">
<caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
</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="852">
<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/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -542,20 +613,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-286">
<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/clock/clock.js">
<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/clock/clock.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
... ... @@ -563,13 +620,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
... ... @@ -584,17 +634,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="902">
<caret line="41" column="33" selection-start-line="41" selection-start-column="33" selection-end-line="41" selection-end-column="33" />
<state relative-caret-position="1166">
<caret line="53" column="31" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1166">
<caret line="53" column="31" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
<state relative-caret-position="308">
<caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
</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="462">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
</state>
</provider>
</entry>
... ... @@ -605,78 +662,218 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.json">
<provider selected="true" editor-type-id="text-editor" />
</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="440">
<caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<state relative-caret-position="1694">
<caret line="77" column="39" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/project.config.json">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<state relative-caret-position="396">
<caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
</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="506">
<caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
<state relative-caret-position="242">
<caret line="11" column="115" selection-start-line="11" selection-start-column="98" selection-end-line="11" selection-end-column="115" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="87" column="75" selection-start-line="87" selection-start-column="75" selection-end-line="87" selection-end-column="75" />
<state relative-caret-position="22">
<caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1254">
<caret line="57" column="43" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
<state relative-caret-position="396">
<caret line="27" column="44" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<state relative-caret-position="220">
<caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="107" column="26" lean-forward="true" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
</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="176">
<caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
<state relative-caret-position="1314">
<caret line="60" column="15" lean-forward="true" selection-start-line="60" selection-start-column="15" selection-end-line="60" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="707">
<caret line="176" selection-start-line="176" selection-end-line="176" />
<state relative-caret-position="852">
<caret line="227" selection-start-line="227" selection-end-line="245" selection-end-column="8" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#401#1280#0" />
<element signature="e#402#613#0" />
<element signature="e#621#832#0" />
<element signature="e#840#1052#0" />
<element signature="e#1060#1273#0" />
<element signature="e#1292#2413#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1518">
<caret line="152" column="39" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" />
<state relative-caret-position="333">
<caret line="144" column="16" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1188">
<caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
<folding>
<element signature="e#380#591#0" />
<element signature="e#599#810#0" />
<element signature="e#818#1030#0" />
<element signature="e#1038#1251#0" />
<element signature="e#1270#2391#0" />
<element signature="e#251#4820#1" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="533">
<caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="30" column="40" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="40" />
</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="674">
<caret line="35" column="64" selection-end-line="62" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.json">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="2" selection-end-column="1" />
</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="566">
<caret line="68" column="61" lean-forward="true" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" />
</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="308">
<caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="806">
<caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364">
<caret line="62" selection-start-line="62" selection-end-line="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="586">
<caret line="58" column="62" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="62" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</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="286">
<caret line="13" column="99" lean-forward="true" selection-start-line="13" selection-start-column="99" selection-end-line="13" selection-end-column="99" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="41" column="16" lean-forward="true" selection-start-line="41" selection-start-column="16" selection-end-line="51" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="39" column="6" lean-forward="true" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -2,18 +2,19 @@
"pages": [
"pages/start/start",
"pages/index/index",
"pages/my/order-detail/order-detail",
"pages/my/buyCard/buyCard",
"pages/index/confirm-appointment-info/confirm-appointment-info",
"pages/index/confirm-appointment-info/add-student/add-student",
"pages/index/phone-code/phone-code",
"pages/index/activity-detail/activity-detail",
"pages/index/go-appointment/go-appointment",
"pages/index/confirm-appointment-info/add-student/add-student",
"pages/my/myProfile/myProfile",
"pages/my/serviceWeChat/serviceWeChat",
"pages/my/chargePhoneNum/chargePhoneNum",
"pages/my/myCard/myCard",
"pages/my/groupBuyDetail/groupBuyDetail",
"pages/my/groupBuyDetail2/groupBuyDetail2",
"pages/my/buyCard/buyCard",
"pages/my/protocol/protocol",
"pages/my/groupBupShare/groupBupShare",
"pages/my/charge/charge",
... ...
@font-face {
font-family: 'iconfont'; /* project id 912375 */
src: url('//at.alicdn.com/t/font_912375_canfpux7i3.eot');
src: url('//at.alicdn.com/t/font_912375_canfpux7i3.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_912375_canfpux7i3.woff') format('woff'),
url('//at.alicdn.com/t/font_912375_canfpux7i3.ttf') format('truetype'),
url('//at.alicdn.com/t/font_912375_canfpux7i3.svg#iconfont') format('svg');
@font-face {font-family: "iconfont";
src: url('//at.alicdn.com/t/font_912375_2nxkwkclpei.eot?t=1542606508745'); /* IE9*/
src: url('//at.alicdn.com/t/font_912375_2nxkwkclpei.eot?t=1542606508745#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAA04AAsAAAAAEwAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFY8nkoNY21hcAAAAYAAAADyAAACzLcE7olnbHlmAAACdAAACAkAAAqAfjE9G2hlYWQAAAqAAAAAMQAAADYURiNVaGhlYQAACrQAAAAgAAAAJAjVBfRobXR4AAAK1AAAACEAAABQU6//2GxvY2EAAAr4AAAAKgAAACocwBombWF4cAAACyQAAAAfAAAAIAEjAJJuYW1lAAALRAAAAUUAAAJtPlT+fXBvc3QAAAyMAAAAqgAAAPPBV59GeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk0WecwMDKwMHUyXSGgYGhH0IzvmYwYuRgYGBiYGVmwAoC0lxTGByeMTw/wtzwv4EhhnkFwwqgMCNIDgD+Ig0neJzlkkFOAkEQRd8MM4A4OiNsIDHEGGNceAwWcAEuwz3YssKTcAJXnuDPBdzj7y4WxkQvYHVeJ11V6a6uX0ANDMyrqaD4oCDZu71F9g+YZH/Fm8/3dPY0KlWr00JLrbTRVjvtdewP/el8BqFKreY5uv4Z/dUK3/7AI0885/XybaXohFtu/PqQsatpmdJwx8gVzbj2T64onTb844X/Yk3ePy+nWVIkSJrqQtJVZeDOWrPAPUZ1kGZDbeC+oy6wAmgepLnRIiDlLgPrg1ZBqkjrwJqhTWD10DYg3b0Lcs37wNqiY5DmtT8E1pv+FFB+AePHV+kAAHicZVYNbBTHFZ43c7d76/v/2V2f73d9vl0Ml/v17eJAzNkXhwQH2YY2xC4NppETFJU/lRBCm8agxhAUKW1ooypuwI0a9SchQW6lpqJIKFKDlP4LCfETlUqhJRKoqkrVFAUPfXNXEFVPp7czb+a9ee/N994bwgi5dZVNMJWYZCt5gRDIdctFsKQ2qRehW5LDlhmgGdD0NNQGwEKmqklyt1kCcwD54T67qqWgJqehajtWrd5nO7amqzU5plXt+6Dyv4x6a0cNGfm6WR8AJw16TNZ028EjA4B7mIdqEU++qxNJIhaCpUMFKHcOLvUlLsie5PrVRze4oVde9fKqdcnf+5lu+Hao2QgAeCNepNEQzVIAX9gXC7LWSLBjIZqhPNMBzWp1iDIt5AY62bx/gibgTz49hcKCKKNGoWDwMyWN9g6mz8nuzgR9deecUfhk0/MslfxdIKOBdzscDKpq8IZL8fkU1xNBFY/oOuBSvF7F9VgoBuCPP+Py+Hwe13hIhY7k7mGtC8+kQ9WAD0Kq1pwEmGzmVhL8UYz/KZZkDeIjKkZf+K9XEmBjkFkRRGRjEiV75ln2s3/n2PyefKWyplJhDTb/7IMreRYuDow8O89fgMqaanVNhTChlP2G9RAP6jMIyUvdZksLQ6Kj+hxGuU8Bs1sGSdONAaDlmGNZzpKvRO/NA417VslJgL/xN4xHu/kbmcIg/WWjsC+KG5Y48GO1Nx05PDJyOJLmm+iXli9fPNK/FmAtAfRjhv2D7SBeQqIa0W3imMSSCHVD8uxZSLnd/OOzZ/ll2HOWf+x2QwqZSUnil0lLdr/Lw2aIRYgCLchhIBBtei3cIqbt1NIghxF9TovYJvsL/1qk2FeK8OdSkkzT3f0w5LwJUtf+uEzfdJrQb6SZJMEHcDgai0X51mzFp6Qo/9Aeo/BgF7qY7OLv0TEbbJpSfBURNuGDi6AdXqITmxA3eoB+oDcSYRg6tAXPLkJU6i6BLAK7CiwR3Qw4A5CmUhB0LUbJBX4JPTQuXAAD3b50YeGWJN1aaNFaYElwbi5opQJzc4GUheOOeFdEljuQOXO3DOpgC7elkC4+Ebgj0hbvkOVIV1wIWm0cHWNn2PqW7QQkIt++BISR1c6yAFBymt9A2+TTp0HGc26cPnbF7f7rO4JeYesF464NN19zXcEll+vKsXeutO4Jg3SVbhSnRRVQ4SpcpV9Y/IR2tu7wIPuU7RH3D0Y4FzZUI1wLG+xTvnmBb4ajC3AUzsPR/86EKjfKzLvTbKpls0GWkuUoaykgK6Ar4ACLYUUZgFYRYmkYgD5TQAO5thi5pdayZeN6ANzpCh/nY2V4l4+X4Ti8W+Fj+zSrYGlQeqAEtDRcwj/lJ4qrS8UHSvSbNNZb7I3R9oeVUFrIjPPxilAhyM90U8d/rlSi2zFtUKrYzX+eK4FQkdPEotaibQz/gr3NHhIYzpuSnHesfFrAwiqCjGB2m1YbQbbjxrzTbIHh6WwzwTdhzfpusplZGu/smixk0oxvSZnVIYCham8a5iGbLUzEteSRsBy7KHuvxVyRrsllyzo7Iyu7r6lil9irf2SsiGjJZfdMtON6is2wMsmRZaRCGmQUDRSm1Gt1Q62pachQNShSTM2pRj1X7zNLtI7w6DYtR2cDUBW12VDRYKlltmQC7hN5p+ktSqfKq++FHYtkBzRXlhuN1oyRHc37yo2sN1VK+crlKR9+vfzv6EK/mat3xgfiiSF4nU/R/nxPXW9P/5AtT6E8apgqZ8tj5fZ0rD1tHPdFo75sFrL+aNQ/32j0NOPhNTKY8fCTix82GvlmZ3saeZL8X/7m0OdW5sqtLI7elb/WXWNKzoOBdejS+fP8EtYL4/z0LKWz02168qbbffNki7KZuzehEL9+Z9v07Jnb25AKW1y3zt161LWE/Qht6SR10kRrzB5ZorrmcuyIHKBF6tg9uhZBsMSw1GHwi4Cg6DMRLWrbOhyL/imwnoKYVmPnJvnsrz94bXQS9uLnUOnk9YvfTpbH4KHjbx/kXw9lgmZGG3pkSMvmg5nQsip9anT0KVo5FNTUrKoF6WohekfDT3Z+K7vxV9d2vvWN4bX8vTkl0qOoD6+rVtc9rCo9ESX++eroFkq3jFY/90w4cMIfifhP+KPCN4H1j9h1dg+J4KSqgxbDXoLV0BHFGxvKSKADZhWF7/Um1A7Yxl+RXZ4wK3TwvR1JQdSEF7bCNk805r1TB9ifsQ7kiENWIl7XINPAewpjEAzRAXMGXpnoBYboAKKfqeEAYPFdBSDKLyaUjDBFEQeLsGPpONAxmCXR51h18aXmBLb7QdgnmjR/vowZM1ihu6rD+Djw0Y2L3wNgX4b5UCH0eAggzDf/S4n44KWoXjh+39Ng7zJ2LXWxadbBpuhEk87cv5GiHAxXF2cqQ0AHK3BIvAX47qFJIG6P/E84Egw+HlA7I3zzNpfLr/wxX/rihleeBmdXFjUpdJqxdhy5azdbLSo29mkLMITY3dAd2wHxYMKeB7+NOlF+ORoF1dEX9H6NVlVbjUIMuxoUNEdTXeGXwzRK1SiNgbpcu12nX6cbCF5XPoDvOFOotqtYVMVLQKZVRfV6Ywr/gT+R98MwDAd6Ev63FB8FnwceExP+U1jrT/QEbt/3DPuM7UckE2hVNAsrXKuhyO03BLLo7PA49Xxn+3M/dMFYc/ZUj3dFjXXVVnh7TsE288VHtr/qod//6vj+fP79A7URSkdqB94n/wFKyy9/AAAAeJxjYGRgYADi3893M8bz23xl4GZhAIEbEvlrYPT/G/8jWOWYVwC5HAxMIFEAXJYMawAAAHicY2BkYGBu+N/AEMPW/v/G/xuscgxAERQgAgCpvQbTeJxjYWBgYEHGjEDMhiYGxGzt6GL/b8DYrIoIcQBNCwLaAAAAAAAAAADAAOgBJAFCAYYB5AIWAiQCPgKkAuoDZgOsBBoEQgS+BOoFEgVAAAB4nGNgZGBgEGFoY2BlAAEmIOYCQgaG/2A+AwAX7wG2AHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nG2Oyw7CIBREmT6grW+tiT/Rhf4RFQo0BjSV9PH10rozzuLczZnJJRH5piD/UyJCjAQpKBgy5CiwwhobbLHDHgcccUKJM6HCcNsaJoxVvTSsDVdxdxk9t9XdPccf0E47P0r68oPhjg1Bm+S1ENx18w53cUA+aWfVvJw10gbRqm2nA3v/9nWQqnwpzhZtjey0pw232htWL+/cYuFNGooPnvROSEI+Kpg90QAA') format('woff'),
url('//at.alicdn.com/t/font_912375_2nxkwkclpei.ttf?t=1542606508745') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('//at.alicdn.com/t/font_912375_2nxkwkclpei.svg?t=1542606508745#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
... ... @@ -27,6 +27,8 @@
.icon-quxiao:before { content: "\e60f"; }
.icon-xuanze1:before { content: "\e649"; }
.icon-daosanjiao:before { content: "\e610"; }
.icon-jia:before { content: "\e79f"; }
... ... @@ -47,4 +49,6 @@
.icon-dui:before { content: "\e648"; }
.icon-xiala:before { content: "\e61e"; }
.icon-wode:before { content: "\e67b"; }
... ...
// pages/clock/clock.js
const app =getApp();
// 引入SDK核心类
var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js');
Page({
/**
* 页面的初始数据
*/
data: {
punchState: true,
address: '',
hasPhone: true,
},
//首次登录小程序，跳转到认证手机页面
goPhoneCode() {
wx.navigateTo({url: '/pages/index/phone-code/phone-code'})
},
//打卡申诉
punchApply() {
wx.navigateTo({
url: 'punchAppeal/punchAppeal',
})
},
//打卡
punch() {
var that = this
wx.getLocation({
type: 'wgs84',
success: function(res) {
var latitude = res.latitude
var longitude = res.longitude
var speed = res.speed
var accuracy = res.accuracy
that.setData({
address: '天津市',
punchState: false
/**
* 页面的初始数据
*/
data: {
punchState: true,
address: '',
hasPhone: true,
},
//首次登录小程序，跳转到认证手机页面
goPhoneCode() {
wx.navigateTo({url: '/pages/index/phone-code/phone-code'})
},
//打卡申诉
punchApply() {
wx.navigateTo({
url: 'punchAppeal/punchAppeal',
})
},
})
// wx.chooseLocation({
// success: function(res) {
// console.log(res)
// var latitude = res.latitude
// var longitude = res.longitude
// var address = res.address
// that.setData({
// address: address,
// punchState:false
// })
// },
// })
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
},
//打卡
punch() {
var that = this
wx.getLocation({
type: 'wgs84',
success: function (res) {
var latitude = res.latitude
var longitude = res.longitude
var speed = res.speed
var accuracy = res.accuracy
that.setData({
address: '天津市',
punchState: false
})
},
})
// wx.chooseLocation({
// success: function(res) {
// console.log(res)
// var latitude = res.latitude
// var longitude = res.longitude
// var address = res.address
// that.setData({
// address: address,
// punchState:false
// })
// },
// })
},
// 打卡页面获取用户所在实验室
postPosition(params) {
let url = '/portal/Experiment/user_session';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url,params,header).then((res) => {
console.log(res);
this.setData({
card_info: res
})
})
},
//打卡页面获取用户所在实验室
getExperiment() {
const self = this;
if(wx.getStorageSync('city')) {
wx.getLocation({
type: 'wgs84',
success (res) {
let params = {
city: wx.getStorageSync('city'),
lat: res.latitude,//纬度
lng: res.longitude,//经度
};
self.postPosition(params);
}
});
}else {
//获取当前城市
wx.getLocation({
type: 'wgs84',
success: function(res) {
console.log(res);
// 实例化API核心类
var demo = new QQMapWX({
key: 'CLVBZ-KHZKP-KWLDW-VDJTA-QVUST-XOBVO' // 必填
});
// 调用接口
demo.reverseGeocoder({
location: {
latitude: res.latitude,//纬度
longitude: res.longitude//经度
},
success: function (res) {
console.log('城市',res);
let params = {
city: res.result.address_component.city,
// lat: res.latitude,//纬度
// lng: res.longitude,//经度
};
// self.postPosition(params);
},
fail: function (res) {
console.log(res);
},
complete: function (res) {
// console.log(res);
}
});
}
});
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
const self = this;
self.getExperiment();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
// pages/index/confirm-appointment-info/add-student/add-student.js
const date = new Date()
const years = []
const months = []
const days = []
const app = getApp();
const date = new Date();
const years = [];
const months = [];
const days = [];
for (let i = 1990; i <= date.getFullYear(); i++) {
years.push(i)
... ... @@ -23,8 +24,11 @@ Page({
*/
data: {
name: '',
sex: ['男', '女'],
sex: ['男','女'],
default_sex: {id: 1,name: '男'},
city: ['北京市', '天津市', '河北省'],
default_birth: '2008-11-11',
default_city: '北京市',
years: years,
year: date.getFullYear(),
months: months,
... ... @@ -76,16 +80,35 @@ Page({
icon: 'none'
})
} else {
wx.navigateTo({
url: '../../../my/myProfile/myProfile',
})
let url = '/user/Student/student_add';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
name: this.data.name,
sex: this.data.default_sex || this.data.sex[this.data.sex_index] === '男'? 1: 2,
birthday: this.data.birth_date || this.data.default_birth,
city: this.data.city[this.data.city_index] || this.data.default_city,
};
app.post(url,params,header).then((res) => {
console.log('保存',res);
if(res.is_success) {
if(this.data.is_back) {
wx.navigateBack({delta: 1})
}else {
wx.navigateTo({
url: '../../../my/myProfile/myProfile',
})
}
}
})
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
this.setData({is_back: options.is_back?options.is_back:''})
},
/**
... ...
... ... @@ -13,7 +13,7 @@
<view class="picker" wx:if="{{is_sex_change}}">
{{sex[sex_index]}}
</view>
<view wx:else>男</view>
<view wx:else>{{default_sex.name}}</view>
</view>
<view class="iconfont icon-daosanjiao"></view>
</view>
... ... @@ -25,7 +25,7 @@
<view class="picker" wx:if="{{is_birth_change}}">
{{birth_date}}
</view>
<view wx:else>2008-11-11</view>
<view wx:else>{{default_birth}}</view>
</view>
<view class="iconfont icon-daosanjiao"></view>
</view>
... ... @@ -37,7 +37,7 @@
<view class="picker" wx:if="{{is_city_change}}">
{{city[city_index]}}
</view>
<view wx:else>北京市</view>
<view wx:else>{{default_city}}</view>
</view>
<view class="iconfont icon-daosanjiao"></view>
</view>
... ...
// pages/index/confirm-appointment-info/confirm-appointment-info.js
const app = getApp();
Page({
/**
... ... @@ -13,50 +14,206 @@ Page({
state_data: {
is_showSuccessModal: false,
},
children: [{name:'张三',is_choose: true},
{name:'李思思', is_choose: false},
{name:'迪丽热巴-迪力木拉提',is_choose: false}],
student_list: [{id:1,name:'张三',checked: false},
{id:2,name:'李思思', checked: false},
{id:3,name:'王五', checked: false},
{id:4,name:'赵柳', checked: false},
{id:5,name:'迪丽热巴-迪力木拉提',checked: false}],
is_choose: false,
num_arr: [],
session_info: {},
student_num: 5,
},
chooseChildren(e) {
const current = e.currentTarget.dataset.index;
this.setData({
currentChild: current,
[`children[${current}].is_choose`]: !this.data.children[current].is_choose
console.log(e.detail);
// const current = e.currentTarget.dataset.index;
const that = this;
var index_arr = e.detail.value;
console.log(index_arr)
//新建数组全部设置为没被选中
var new_arr = [];
that.data.student_list.forEach((item) => {
new_arr.push({ ...item, checked: false })
});//给每一项添加checked属性
console.log('new_arr',new_arr);
var new_itmes = new_arr;
console.log('new_itmes', new_itmes);
if(that.data.student_num >=2) {//两个学员预约时
console.log('两个学员');
if (index_arr.length > 2) {
//取出倒数两个值
var key1 = index_arr[index_arr.length - 1];
var key2 = index_arr[index_arr.length - 2];
// var key3 = skin[skin.length - 3];
// console.log(key1, key2, key3);
console.log(key1, key2);
console.log(new_itmes[key1]['checked'],new_itmes[key1].id,new_itmes[key2].id);
//设置最后两个值为选中状态
new_itmes[key1]['checked'] = true
new_itmes[key2]['checked'] = true
// new_itmes[key3 - 1]['checked'] = 'true'
//删除被选中的第一个值
index_arr.splice(0, 1);
console.log('skin',index_arr);
const id_arr = [];
id_arr.push(new_itmes[key1].id,new_itmes[key2].id);
that.setData({student_id: id_arr.join(',')})
console.log('student_id', that.data.student_id);
} else {
//被选中少于两个，直接设置被选中
for (var i = 0; i < index_arr.length; i++) {
var key = index_arr[i]
console.log('key', key);
new_itmes[key]['checked'] = true
}
that.setData({student_id: new_itmes[key].id})
console.log('student_id', that.data.student_id);
}
}else if(that.data.student_num <2){//一个学员预约时
console.log('一个学员');
if (index_arr.length > 1) {
//取出倒数一个值
var key1 = index_arr[index_arr.length - 1];
// var key2 = skin[skin.length - 2];
// var key3 = skin[skin.length - 3];
// console.log(key1, key2, key3);
console.log(key1);
console.log(new_itmes[key1]['checked'],new_itmes[key1].id);
//设置最后一个值为选中状态
new_itmes[key1]['checked'] = true
// new_itmes[key2]['checked'] = true
// new_itmes[key3 - 1]['checked'] = 'true'
//删除被选中的第一个值
index_arr.splice(0, 1);
console.log('skin',index_arr);
that.setData({student_id: new_itmes[key1].id})
console.log('student_id', that.data.student_id);
} else {
//被选中少于1个，直接设置被选中
for (var i = 0; i < index_arr.length; i++) {
var key = index_arr[i]
console.log('key', key);
new_itmes[key]['checked'] = true
}
that.setData({student_id: new_itmes[key].id})
console.log('student_id', that.data.student_id);
}
}
//存入
that.setData({
index_arr: index_arr,
// text: text,
student_list: new_itmes,
})
},
submit() {
formSubmit(e) {
console.log(e.detail);
this.setData({'modal_data.is_showModal': true})
// if(this.data.student_list.length === 0) {
// wx.showToast({title: '请添加学员!',icon:'none'})
// }else {
// // this.setData({'modal_data.is_showModal': true})
// let url = '/portal/Experiment/confirm_session_submit';
// let header = {
// "XX-token": wx.getStorageSync('token')
// };
// let params = {
// _type: 2,
// formId: e.detail.formId,
// experiment_id: this.data.experiment_id,
// session_id: this.data.session_id,
// reservation_id: this.data.reservation_id,
// students: this.data.student_id,
// };
// app.post(url,params,header).then((res) => {
// console.log('提交预约信息',res);
// })
// }
},
chooseNo(e) {
this.setData({
'modal_data.currentBtn': e.currentTarget.dataset.index,
'modal_data.is_showModal': false
});
wx.switchTab({url: '/pages/index/index'})
// wx.switchTab({url: '/pages/index/index'})
wx.navigateBack({delta: 1})
},
chooseYes(e) {
this.setData({
'modal_data.currentBtn': e.currentTarget.dataset.index,
'modal_data.is_showModal': false,
'state_data.is_showSuccessModal': true
})
});
wx.navigateTo({url: '/pages/my/buyCard/buyCard'})
},
modalConfirm() {
this.setData({'state_data.is_showSuccessModal': false})
},
disableScroll() {},
addStudent() {
wx.navigateTo({url: './add-student/add-student'})
wx.navigateTo({url: './add-student/add-student?is_back=' + true})
},
//获取预约信息
getAppointmentInfo() {
let url = '/portal/Experiment/confirm_session';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
experiment_id: this.data.experiment_id,
session_id: this.data.session_id,
reservation_id: this.data.reservation_id,
};
app.post(url,params,header).then((res) => {
console.log('预约信息',res);
var arr = [];
for (let i in res.list) {
arr.push(res.list[i]); //属性
//arr.push(obj[i]); //值
}//对象转数组
console.log('arr',arr);
var new_arr = [];
arr.forEach((item) => {
new_arr.push({ ...item, checked: false })
});//给每一项添加checked属性
console.log(new_arr);
this.setData({
student_list: new_arr,
new_arr:new_arr,
session_info: res.session_info,
})
console.log('student_list', this.data.student_list);
})
},
//获取学员列表
// getStudentList() {
// let url = '/user/Student/student_list';
// let header = {
// "XX-token": wx.getStorageSync('token')
// };
// let params = {
// page: 1,
// };
// app.post(url,params,header).then((res) => {
// console.log('学员列表',res);
// this.setData({student_list: res.list})
// })
// },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
const self =this;
console.log('load');
console.log(options);
self.setData({
experiment_id: +options.experiment_id?+options.experiment_id:'',
session_id: +options.session_id?+options.session_id:'',
reservation_id: +options.reservation_id?+options.reservation_id:'',
// student_num: +options.student_num?+options.student_num:'',
});
},
/**
... ... @@ -70,8 +227,12 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
const self = this;
setTimeout(function() {
console.log('show');
const self = this;
// self.getStudentList();
self.getAppointmentInfo();
setTimeout(function() {
self.setData({
show: true
})
... ...
... ... @@ -9,7 +9,7 @@
<view class="time">
<view class="line"></view>
<text>预约时间 : </text>
<text class="date-time">2018年10月10号 10:00-11:30</text>
<text class="date-time">{{session_info.time}}</text>
</view>
<view class="address">
... ... @@ -19,7 +19,7 @@
</view>
<view class="address-detail">
<!--<text>-->
朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳区读书馆内朝阳区万寿路5号楼马兰大厦B座301念读书万寿路5号楼马兰大厦B座301念读书
{{session_info.address}}
<!--</text>-->
</view>
</view>
... ... @@ -35,18 +35,26 @@
</view>
<image src="../../../images/add_btn.png" bindtap="addStudent"></image>
</view>
<view class="name-box">
<view class="check-box" wx:for="{{children}}" wx:key="index" bindtap="chooseChildren" data-index="{{index}}">
<view class="name {{item.is_choose?'change-color':''}}">{{item.name}}</view>
<image src="../../../images/choose_icon.png" wx:if="{{item.is_choose}}" class="check-icon"></image>
<form bindsubmit="formSubmit" bindreset="formReset" report-submit="true">
<view class="name-box">
<!--<view class="check-box" wx:for="{{student_list}}" wx:key="index" bindtap="chooseChildren" data-index="{{index}}">-->
<!--<view class="name {{item.is_choose?'change-color':''}}">{{item.name}}</view>-->
<!--<image src="../../../images/choose_icon.png" wx:if="{{item.is_choose}}" class="check-icon"></image>-->
<!--</view>-->
<checkbox-group class="check-box" bindchange="chooseChildren">
<label class="checkbox" wx:for="{{student_list}}" wx:for-item="i" wx:key="index">
<view class="name {{i.checked?'change-color':''}}">{{i.name}}</view>
<checkbox value="{{index}}" checked="{{i.checked}}" id="{{i.id}}" name="student_id" class="checkbox"/>
</label>
</checkbox-group>
</view>
</view>
<view class="footer">
<view class="confirm_btn" bindtap="submit">
<text>确认预约</text>
</view>
<view class="confirm_btn" form-type="submit" bindtap="formSubmit">
<text>确认预约</text>
</view>
</view>
</form>
<import src="/templates/templates.wxml" />
<template is="modal" data="{{...modal_data}}"></template>
<template is="state-modal" data="{{...state_data}}"></template>
... ...
... ... @@ -74,6 +74,7 @@ page {
}
.address-detail {
width:100%;
padding: 0 40rpx 50rpx 50rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
... ... @@ -115,8 +116,26 @@ page {
.check-box {
width: 50%;
display: flex;
flex-direction: column;
justify-content: space-between;
/*margin-bottom: 42rpx;*/
}
.checkbox {
display: flex;
/*align-items: center;*/
justify-content: space-between;
margin-bottom: 42rpx;
margin-bottom: 21rpx;
}
checkbox .wx-checkbox-input {
border: none;
color: #ffffff;
}
checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: none;
}
/*选中后的对勾样式*/
checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
color: #3FA9F5;
}
.check-icon {
width: 30rpx;
... ...
... ... @@ -16,7 +16,8 @@ Page({
description: '',
session_list: {},
show_submit_btn: false,
areaTest: [{
student_num: 0,
areaTest: [{
area: '朝阳区',
list: [{
id: 1,
... ... @@ -114,7 +115,7 @@ Page({
city_index: e.detail.value,
is_change: true,
});
// this.getChooseSession(this.data.cityList[e.detail.value])
this.getChooseSession(this.data.cityList[e.detail.value])
},
//选择实验室
chooseTest(e) {
... ... @@ -148,43 +149,76 @@ Page({
},
//选择场次
chooseTime(e) {
// console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
const current_id = e.currentTarget.dataset.id;
this.setData({
currentTime: current,
current_session_id: current_id,
is_choose: true,
})
},
chooseTime(e) {
// console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
const current_id = e.currentTarget.dataset.id;
const current_surplus_num = e.currentTarget.dataset.surplus_num;
if (current_surplus_num > 0) {
this.setData({
currentTime: current,
current_session_id: current_id,
is_choose: true,
})
}else {
wx.showToast({title:'该场次名额不足!',icon:'none'})
}
},
//点击单人预约
singleAppointment() {
// this.setData({
// show_submit_btn: true
if(!this.data.is_choose) {
wx.showToast({title: '请选择实验和场次!',icon: 'none'})
}else {
this.setData({
show_submit_btn: true,
student_num: 1,
})
}
// wx.navigateTo({
// url: '/pages/index/confirm-appointment-info/confirm-appointment-info?num=' + 1
// })
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info?num=' + 1
})
},
//点击双人预约
doubleAppointment() {
// this.setData({
// show_submit_btn: true
if(!this.data.is_choose) {
wx.showToast({title: '请选择实验和场次!',icon: 'none'})
}else {
this.setData({
show_submit_btn: true,
student_num: 2,
})
}
// wx.navigateTo({
// url: '/pages/index/confirm-appointment-info/confirm-appointment-info?num=' + 2
// })
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info?num=' + 2
})
},
//提交
submit() {
if(this.data.is_choose) {
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info?experiment_id=' + this.data.current_test_id
+ '&session_id=' + this.data.current_session_id
})
let url = '/portal/Experiment/submit_session';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
experiment_id: this.data.experiment_id,
session_id: this.data.current_session_id,
student_num: this.data.student_num,
};
// wx.navigateTo({
// url: '/pages/index/confirm-appointment-info/confirm-appointment-info?experiment_id=' + this.data.experiment_id
// + '&session_id=' + this.data.current_session_id + '&student_num=' + this.data.student_num
// })
app.post(url,params,header).then((res) => {
console.log(res);
wx.navigateTo({
url: '/pages/index/confirm-appointment-info/confirm-appointment-info?experiment_id=' + this.data.experiment_id
+ '&session_id=' + this.data.current_session_id
+ '&reservation_id=' + res.reservation_id
+ '&student_num' + this.data.student_num
})
});
}else {
wx.showToast({title: '请选择场次!',icon: 'none'})
}
... ... @@ -223,22 +257,23 @@ Page({
};
app.post(url, params,header).then((res) => {
console.log(res,res.list);
res.list.forEach((item,index) => {
if(item.lab_list) {
item.lab_list.forEach((i,k) => {
if(i.session_list) {
i.session_list.forEach((j,b) => {
j.start_time = util.formatTimeTwo(j.start_time, 'h:m');
j.end_time = util.formatTimeTwo(j.end_time, 'h:m');
})
}
})
}
});
console.log(res,res.list);
// res.list.forEach((item,index) => {
// if(item.lab_list) {
// item.lab_list.forEach((i,k) => {
// if(i.session_list) {
// i.session_list.forEach((j,b) => {
// j.start_time = util.formatTimeTwo(j.start_time, 'h:m');
// j.end_time = util.formatTimeTwo(j.end_time, 'h:m');
// })
// }
// })
// }
// });
// console.log(res,res.list);
// console.log(res.list[0].lab_list[0].id);
this.setData({
areaTest: res.list,
student_num: res.student_num,
// current_test_id: res.list[0].lab_list ? res.list[0].lab_list[0].id : '',//默认实验室id
// current_session_id: res.list[0].lab_list ? res.list[0].lab_list[0].session_list[0].id : '',//默认场次id
description: res.list[0].lab_list ? res.list[0].lab_list[0].description : '',//默认显示第一个实验室的描述
... ... @@ -253,7 +288,8 @@ Page({
*/
onLoad: function(options) {
const self = this;
self.setData({experiment_id: +options.experiment_id});
console.log(options);
self.setData({experiment_id: +options.experiment_id});
if(wx.getStorageSync('city')) {
const city = wx.getStorageSync('city');
self.getChooseSession(city);
... ...
... ... @@ -38,14 +38,15 @@
{{description}}
</scroll-view>
<scroll-view class="time-list-box" scroll-y>
<view wx:for="{{session_list}}" wx:key="index" class="time-list" bindtap="chooseTime" data-index="{{index}}" data-id="{{item.id}}">
<view wx:for="{{session_list}}" wx:key="index" class="time-list" bindtap="chooseTime"
data-index="{{index}}" data-id="{{item.id}}" data-surplus_num="{{item.surplus_num}}">
<image src="../../../images/blue_line.png" wx:if="{{current_session_id === item.id}}"
class="blue-line"></image>
<view class="right-content {{item.rest === 0? 'change-gray':''}}">
<view class="right-content {{item.surplus_num === 0? 'change-gray':''}}">
<view class="{{current_session_id === item.id? 'change-color':''}}">{{item.weekday}} {{item.date}}</view>
<view class="bottom-time-box">
<text class="time {{current_session_id === item.id? 'change-color':''}}">{{item.time}}</text>
<text class="rest {{item.rest === 0? 'change-gray':''}}">剩余: {{item.surplus_num}}</text>
<text class="rest {{item.surplus_num === 0? 'change-gray':''}}">剩余: {{item.surplus_num}}</text>
</view>
</view>
</view>
... ... @@ -54,14 +55,17 @@
</view>
<view class="footer">
<!--<view class="confirm_btn" bindtap="submit" wx:if="{{show_submit_btn}}">-->
<view class="confirm_btn" bindtap="submit">
<view class="confirm_btn" bindtap="submit" wx:if="{{!show_submit_btn && student_num<2}}">
<!--<view class="confirm_btn" bindtap="submit">-->
<text>提 交</text>
</view>
<view class="appointment-box" wx:if="{{!show_submit_btn && student_num>=2}}">
<text class="single" bindtap="singleAppointment">单人预约</text>
<text class="double" bindtap="doubleAppointment">双人预约</text>
</view>
<view class="confirm_btn" bindtap="submit" wx:if="{{show_submit_btn}}">
<!--<view class="confirm_btn" bindtap="submit">-->
<text>提 交</text>
</view>
<!--<view class="appointment-box" wx:else>-->
<!--<text class="single" bindtap="singleAppointment">单人预约</text>-->
<!--<text class="double" bindtap="doubleAppointment">双人预约</text>-->
<!--</view>-->
<!--<view>提 交</view>-->
</view>
</view>
... ...
... ... @@ -56,7 +56,7 @@ Page({
},
//点击购买畅玩卡
goBuyCard() {
wx.navigateTo({url: './activity-detail/activity-detail'})
wx.navigateTo({url: '/pages/my/buyCard/buyCard?is_back=' + true})
},
//点击进入活动详情
goTestDetail(e) {
... ...
... ... @@ -7,6 +7,12 @@ Page({
data: {
tab: ['全部', '待确认', '已预约', '已取消', '已结束'],
currentTab: 0,
orderList: [
{address:'北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座',date:'2018.09.02 10:00-11:30',num: '000120180208'},
{address:'北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座',date:'2018.09.02 10:00-11:30',num: '000120180208'},
{address:'北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座',date:'2018.09.02 10:00-11:30',num: '000120180208'},
{address:'北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座',date:'2018.09.02 10:00-11:30',num: '000120180208'},
]
},
changeTab(e) {
const current = e.currentTarget.dataset.index;
... ... @@ -15,11 +21,28 @@ Page({
title: this.data.tab[current]
})
},
//获取预约列表
getAppointmentList() {
let url = '/user/Reservation/reservation_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
status: this.data.currentTab
};
// app.post(url, params,header).then((res) => {
// console.log('支付换参',res);
// this.wxPay(res.pay)
// })
},
goDetail() {
wx.navigateTo({url: '../order-detail/order-detail?currentTab=' + this.data.currentTab})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({currentTab: +options.currentTab})
this.setData({currentTab: +options.currentTab})
},
/**
... ... @@ -33,7 +56,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
console.log('show',this.data.currentTab)
console.log('show', this.data.currentTab)
},
/**
... ...
... ... @@ -7,10 +7,10 @@
<!--预约列表-->
<view class="list-box">
<view class="order-box">
<view class="order-box" bindtap="goDetail" wx:for="{{orderList}}" wx:key="index">
<view class="head">
<text class="number">预约单号：000120180208</text>
<text class="number">预约单号：{{item.num}}</text>
<text class="appointment-state" wx:if="{{currentTab === 1}}" style="color: #FC5B63;">待确认</text>
<text class="appointment-state" wx:if="{{currentTab === 2}}">已预约</text>
<text class="appointment-state" wx:if="{{currentTab === 3}}" style="color: #464646;">已取消</text>
... ... @@ -26,13 +26,13 @@
<view class="right-box">
<view class="right-top-box">
<view class="iconfont icon-dingwei"></view>
<view class="address">北京市朝阳区万寿路马兰大厦B座北京市朝阳区万寿路马兰大厦B座</view>
<view class="address">{{item.address}}</view>
</view>
<view class="right-bottom-box">
<view class="iconfont icon-shangwutubiao"></view>
<view class="date-box">
<view class="date">预约日期：2018.09.02 10:00-11:30</view>
<view class="date">预约日期：{{item.date}}</view>
<view class="not_confirm" wx:if="{{currentTab === 1}}">
<view class="go-cancel">取消</view>
... ...
// pages/buyCard/buyCard.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
userlist: ['张三', '里斯'],
index: -1,
pay_success: false,
},
//选择成员
userList(e) {
this.setData({
index: e.detail.value
})
},
//添加学员
addUser() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
})
},
//服务协议
serviceProtocol() {
wx.navigateTo({
url: '../protocol/protocol',
})
},
//确认支付
confirmPay() {
this.setData({pay_success: true});
this.changeState();
wx.navigateBack({
delta: 1
})
},
//更新上一页面的购买状态
changeState() {
var pages = getCurrentPages();
if(pages.length > 1) {
var beforePage = pages[pages.length - 2]//获取上一页面实例
if(this.data.pay_success) {
beforePage.refreshModal()
}
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 页面的初始数据
*/
data: {
card_info: {},
student_list: {},
picker_list: {},
is_agree: true,
userlist: ['张三', '里斯'],
index: -1,
pay_success: false,
},
//选择成员
changeStudent(e) {
if(this.data.student_list.length === 0) {
}
this.setData({
index: e.detail.value,
})
},
//添加学员
addUser() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student?is_back=' + true,
})
},
//服务协议
serviceProtocol() {
wx.navigateTo({
url: '../protocol/protocol',
})
},
//确认支付
confirmPay() {
if(this.data.index !== -1) {
if(this.data.is_agree) {
let url = '/portal/Order/order_add';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
id: this.data.student_list[this.data.index].id
};
app.post(url, params,header).then((res) => {
console.log('支付换参',res);
this.wxPay(res.pay)
})
}else {
wx.showToast({title:'请同意协议!',icon:'none'})
}
}else {
wx.showToast({title:'请绑定学员!',icon:'none'})
}
},
//微信支付
wxPay(data) {
const self = this;
wx.requestPayment({
'timeStamp': data.timeStamp,
'nonceStr': data.nonceStr,
'package': data.package,
'signType': data.signType,
'paySign': data.paySign,
'success': function(res) {
console.log('支付成功',res);
wx.showToast({
title: '支付成功',
icon: 'success',
success: function () {
setTimeout(function () {
if(self.data.is_back) {//如果从首页购买的，成功后返回首页
wx.navigateBack({delta: 1})
}else {//否则进入预约订单详情页
wx.redirectTo({
url: '/pages/my/order-detail/order-detail'
})
}
// self.setData({
// ifshowmold: true,
// })
},500)
}
});
},
'fail': function(res) {
// console.log('支付失败', res);
}
})
},
//更新上一页面的购买状态
changeState() {
var pages = getCurrentPages();
if (pages.length > 1) {
var beforePage = pages[pages.length - 2]//获取上一页面实例
if (this.data.pay_success) {
beforePage.refreshModal()
}
}
},
//畅玩卡说明
getArcCard() {
let url = '/wxapp/public/arc_card';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {},header).then((res) => {
console.log(res);
this.setData({
card_info: res
})
})
},
//获取学员列表
getStudentList() {
let url = '/user/Student/student_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
page: 1,
};
var list = [];
app.post(url,params,header).then((res) => {
console.log('学员列表',res);
res.list.forEach((item) => {
list.push(item.name)
});
console.log('list', list);
this.setData({student_list: res.list,picker_list: list})
})
},
//同意协议按钮
agree() {
this.setData({is_agree: !this.data.is_agree})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log('options',options);
const self =this;
self.getArcCard();
self.setData({is_back: options.is_back?options.is_back:''})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
const self =this;
self.getStudentList();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
}
})
\ No newline at end of file
... ...
<!--pages/buyCard/buyCard.wxml-->
<view class='long_img'>这是一个可以滑动的长图</view>
<view class='long_img'>
<view class="title">{{card_info.title}}</view>
<!--<view class="bg"></view>-->
<view class="image">
<image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1544071979008&di=b42f6a2bbd46902841d0c060ac144d15&imgtype=jpg&src=http%3A%2F%2Fimg1.imgtn.bdimg.com%2Fit%2Fu%3D3708452181%2C3226163538%26fm%3D214%26gp%3D0.jpg" mode="aspectFill"></image>
</view>
</view>
<view class='service_box'>
<view class='add_person_box'>
<view class='list_input'>
<view>绑定学员：</view>
<picker value='{{index}}' range='{{userlist}}' bindchange='userList'>
<view class="tips" wx:if="{{student_list.length === 0}}">点击右侧添加学员</view>
<picker value='{{index}}' range='{{picker_list}}' bindchange="changeStudent" wx:else>
<block wx:if='{{index==-1}}'>
<input placeholder='点击右侧添加学员' placeholder-class='input_style' disabled='true'></input>
<input placeholder='点击右侧添加学员' placeholder-class='input_style' disabled='true'/>
</block>
<block wx:else>
<text>{{userlist[index]}}</text>
<block wx:else class="text">
<text>{{picker_list[index]}}</text>
</block>
</picker>
<view class='iconfont icon-daosanjiao'></view>
... ... @@ -19,13 +26,14 @@
<text>添加学员</text>
</view>
</view>
<view class='service_info_box'>
<text class='iconfont icon-xuanzhong'></text>
<view class='service_info_box' bindtap="agree">
<text class='iconfont icon-xuanze1' wx:if="{{!is_agree}}"></text>
<text class='iconfont icon-xuanzhong' wx:if="{{is_agree}}"></text>
<text>我已阅读并同意畅玩卡</text>
<text class='service_info' bindtap='serviceProtocol'>服务协议</text>
<text class='service_info' catchtap='serviceProtocol'>服务协议</text>
</view>
<view class='service_btn_box'>
<view>需支付：¥288.00</view>
<view>需支付：¥{{card_info.price}}</view>
<view class='pay_btn' bindtap='confirmPay'>确定</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -4,6 +4,53 @@
.long_img{
width: 100%;
min-height: 1500rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.long_img .title {
color: #666666;
font-size: 30rpx;
margin: 32rpx;
}
.bg {
width: 90%;
flex: 1;
background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1544071979008&di=b42f6a2bbd46902841d0c060ac144d15&imgtype=jpg&src=http%3A%2F%2Fimg1.imgtn.bdimg.com%2Fit%2Fu%3D3708452181%2C3226163538%26fm%3D214%26gp%3D0.jpg');
-webkit-background-size: cover;
background-size: cover;
}
.long_img .image {
width: 100%;
min-height: 1500rpx;
overflow-y: scroll;
display: -webkit-box;
-webkit-overflow-scrolling: touch;
}
.long_img image {
width: 100%;
min-height: 1500rpx;
flex:1;
}
.list_input {
height: 50rpx;
line-height: 50rpx;
}
.list_input picker, .tips {
width: 65%;
}
.list_input picker input, .list_input picker .text{
height: 50rpx;
font-size: 32rpx;
}
.tips {
font-size: 32rpx;
height: 50rpx;
color: #cccccc;
}
.icon-xuanze1 {
font-size:24rpx;
margin-right:18rpx;
}
.add_person_box {
display: flex;
... ...
// pages/index/confirm-appointment-info/confirm-appointment-info.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
show: false,
modal_data: {
is_showModal: false,
currentBtn: null,
},
state_data: {
is_showSuccessModal: false,
},
student_list: [{id:1,name:'张三',checked: false},
{id:2,name:'李思思', checked: false},
{id:3,name:'王五', checked: false},
{id:4,name:'赵柳', checked: false},
{id:5,name:'迪丽热巴-迪力木拉提',checked: false}],
is_choose: false,
num_arr: [],
session_info: {},
student_num: 5,
},
formSubmit(e) {
console.log(e.detail);
this.setData({'modal_data.is_showModal': true})
// if(this.data.student_list.length === 0) {
// wx.showToast({title: '请添加学员!',icon:'none'})
// }else {
// // this.setData({'modal_data.is_showModal': true})
// let url = '/portal/Experiment/confirm_session_submit';
// let header = {
// "XX-token": wx.getStorageSync('token')
// };
// let params = {
// _type: 2,
// formId: e.detail.formId,
// experiment_id: this.data.experiment_id,
// session_id: this.data.session_id,
// reservation_id: this.data.reservation_id,
// students: this.data.student_id,
// };
// app.post(url,params,header).then((res) => {
// console.log('提交预约信息',res);
// })
// }
},
chooseNo(e) {
this.setData({
'modal_data.currentBtn': e.currentTarget.dataset.index,
'modal_data.is_showModal': false
});
// wx.switchTab({url: '/pages/index/index'})
wx.navigateBack({delta: 1})
},
chooseYes(e) {
this.setData({
'modal_data.currentBtn': e.currentTarget.dataset.index,
'modal_data.is_showModal': false,
'state_data.is_showSuccessModal': true
});
wx.navigateTo({url: '/pages/my/buyCard/buyCard'})
},
modalConfirm() {
this.setData({'state_data.is_showSuccessModal': false})
},
disableScroll() {},
addStudent() {
wx.navigateTo({url: './add-student/add-student?is_back=' + true})
},
//获取预约信息
getAppointmentInfo() {
let url = '/portal/Experiment/confirm_session';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
experiment_id: this.data.experiment_id,
session_id: this.data.session_id,
reservation_id: this.data.reservation_id,
};
app.post(url,params,header).then((res) => {
console.log('预约信息',res);
var arr = [];
for (let i in res.list) {
arr.push(res.list[i]); //属性
//arr.push(obj[i]); //值
}//对象转数组
console.log('arr',arr);
var new_arr = [];
arr.forEach((item) => {
new_arr.push({ ...item, checked: false })
});//给每一项添加checked属性
console.log(new_arr);
this.setData({
student_list: new_arr,
new_arr:new_arr,
session_info: res.session_info,
})
console.log('student_list', this.data.student_list);
})
},
//获取学员列表
// getStudentList() {
// let url = '/user/Student/student_list';
// let header = {
// "XX-token": wx.getStorageSync('token')
// };
// let params = {
// page: 1,
// };
// app.post(url,params,header).then((res) => {
// console.log('学员列表',res);
// this.setData({student_list: res.list})
// })
// },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
const self =this;
console.log('load');
console.log(options);
self.setData({
currentTab: +options.currentTab?+options.currentTab:'',
});
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
console.log('show');
const self = this;
// self.getStudentList();
self.getAppointmentInfo();
setTimeout(function() {
self.setData({
show: true
})
}, 500)
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
{
"navigationBarTitleText": "预约单详情"
}
\ No newline at end of file
... ...
<!--pages/index/confirm-appointment-info/confirm-appointment-info.wxml-->
<view class="content">
<view class="tips {{show?'active':''}}" wx:if="{{currentTab === 1}}">
<!--<view>-->
<view class="iconfont icon-jinggao"></view>
<text>请在15分钟内确认预约，超时系统将自动取消！</text>
<!--</view>-->
</view>
<view class="time">
<view class="line"></view>
<text>预约时间 : </text>
<text class="date-time">{{session_info.time}}</text>
</view>
<view class="address">
<view class="time">
<view class="line"></view>
<text>预约地址 :</text>
</view>
<view class="address-detail">
<!--<text>-->
{{session_info.address}}
<!--</text>-->
</view>
</view>
<view class="phone-num">
<view class="line"></view>
<text>预约电话 :</text>
<text class="phone">188****8888</text>
</view>
<view class="children-name">
<view class="left-name">
<view class="line"></view>
<text>学员姓名</text>
</view>
<image src="../../../images/add_btn.png" bindtap="addStudent"></image>
</view>
<form bindsubmit="formSubmit" bindreset="formReset" report-submit="true">
<view class="name-box">
<!--<view class="check-box" wx:for="{{student_list}}" wx:key="index" bindtap="chooseChildren" data-index="{{index}}">-->
<!--<view class="name {{item.is_choose?'change-color':''}}">{{item.name}}</view>-->
<!--<image src="../../../images/choose_icon.png" wx:if="{{item.is_choose}}" class="check-icon"></image>-->
<!--</view>-->
<checkbox-group class="check-box" bindchange="chooseChildren">
<label class="checkbox" wx:for="{{student_list}}" wx:for-item="i" wx:key="index">
<view class="name {{i.checked?'change-color':''}}">{{i.name}}</view>
<checkbox value="{{index}}" checked="{{i.checked}}" id="{{i.id}}" name="student_id" class="checkbox"/>
</label>
</checkbox-group>
</view>
<!--待确认-->
<view class="footer-box1" wx:if="{{currentTab === 1}}">
<view class="one_box" form-type="submit" bindtap="formSubmit">
<!--<view class="cancel_box" form-type="submit" bindtap="formSubmit">-->
<view class="cancel">取消</view>
<view class="confirm"><text class="text">确认</text></view>
</view>
</view>
<!--已预约-->
<view class="footer-box" wx:if="{{currentTab === 2}}">
<view class="cancel_box" form-type="submit" bindtap="formSubmit">
<text>注：活动开始前 x 小时可取消预约</text>
<view class="cancel_btn"><text class="text">取消预约</text></view>
</view>
</view>
<!--已取消-->
<view class="footer-box2" wx:if="{{currentTab === 3}}">
<view class="two_box" form-type="submit" bindtap="formSubmit">
<view>预约已取消</view>
</view>
</view>
<!--已结束-->
<view class="footer-box2" wx:if="{{currentTab === 4}}">
<view class="two_box" form-type="submit" bindtap="formSubmit">
<view>预约已结束</view>
</view>
</view>
</form>
<import src="/templates/templates.wxml" />
<template is="modal" data="{{...modal_data}}"></template>
<template is="state-modal" data="{{...state_data}}"></template>
</view>
\ No newline at end of file
... ...
/* pages/my/order-detail/order-detail.wxss */
@import '../../index/confirm-appointment-info/confirm-appointment-info.wxss';
.footer-box {
width: 100%;
/* height: 50rpx; */
/* line-height: 50rpx; */
background-color: #FFFC5A63;
position: absolute;
bottom: 0;
left: 0;
z-index: 3;
padding: 0 20rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.footer-box1, .footer-box2 {
width: 100%;
position: absolute;
bottom: 0;
left: 0;
}
.one_box {
display: flex;
align-items: center;
justify-content: space-between;
}
.one_box .cancel, .one_box .confirm{
width: 50%;
height: 94rpx;
color: #ffffff;
font-size: 36rpx;
display: flex;
align-items: center;
justify-content: center;
}
.one_box .cancel {
background-color: #FC5B63;
}
.one_box .confirm {
background-color: #3FA9F5;
}
.cancel_box {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
line-height: 50rpx;
}
.cancel_box text {
color: #FC5A63;
font-size: 20rpx;
}
.cancel_btn {
background-color: #FC5B63;
border-radius: 10rpx;
height: 40rpx;
display: flex;
align-items: center;
/* padding: 10rpx; */
}
.cancel_btn .text {
color: #ffffff;
font-size: 24rpx;
margin: 0 10rpx;
}
.two_box {
background-color: #3FA9F5;
color: #ffffff;
font-size: 36rpx;
height: 94rpx;
display: flex;
align-items: center;
justify-content: center;
}
\ No newline at end of file
... ...
... ... @@ -12,7 +12,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.4.0",
"appid": "wxaab44bbcfc0e5bc5",
"appid": "wx267cf208ca289769",
"projectname": "science",
"debugOptions": {
"hidedInDevtools": []
... ...