miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 8dbccca50f2be231adbcf0022b38c6b26c9a618e 2 个父辈 6e898ba5 c8d3e3cb

合并分支 'wumengyu' 到 'master' 

Wumengyu



查看合并请求 !7
内嵌 并排对比
正在显示 5 个修改的文件 包含 223 行增加 和 255 行删除
<?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="添加未购卡片">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/charge/charge.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/charge/charge.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/charge/charge.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/charge/charge.wxss" afterDir="false" />
</list>
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化预约" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
... ... @@ -21,49 +15,50 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="23" />
<entry key="project.closed" value="24" />
<entry key="project.open.time.0" value="6" />
<entry key="project.open.time.1" value="9" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.14" value="1" />
<entry key="project.open.time.2" value="3" />
<entry key="project.open.time.8" value="3" />
<entry key="project.open.time.9" value="2" />
<entry key="project.opened" value="25" />
<entry key="project.opened" value="26" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="172" />
<entry key="js" value="175" />
<entry key="json" value="31" />
<entry key="wxml" value="138" />
<entry key="wxss" value="54" />
<entry key="wxml" value="142" />
<entry key="wxss" value="55" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="54" />
<entry key="HTML" value="138" />
<entry key="CSS" value="55" />
<entry key="HTML" value="142" />
<entry key="JSON" value="31" />
<entry key="JavaScript" value="172" />
<entry key="JavaScript" value="175" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="15207" />
<entry key="js" value="15424" />
<entry key="json" value="158" />
<entry key="txt" value="451" />
<entry key="wxml" value="3774" />
<entry key="txt" value="488" />
<entry key="wxml" value="3781" />
<entry key="wxss" value="1627" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="1627" />
<entry key="HTML" value="3774" />
<entry key="HTML" value="3781" />
<entry key="JSON" value="158" />
<entry key="JavaScript" value="15207" />
<entry key="PLAIN_TEXT" value="451" />
<entry key="JavaScript" value="15424" />
<entry key="PLAIN_TEXT" value="488" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
... ... @@ -76,104 +71,102 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<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="531">
<caret line="106" column="11" lean-forward="true" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
<state relative-caret-position="990">
<caret line="45" column="71" selection-start-line="45" selection-start-column="71" selection-end-line="45" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="67" column="32" lean-forward="true" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
<state relative-caret-position="352">
<caret line="25" column="99" selection-start-line="25" selection-start-column="88" selection-end-line="25" selection-end-column="99" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
<state relative-caret-position="3072">
<caret line="246" column="40" lean-forward="true" selection-start-line="246" selection-start-column="40" selection-end-line="246" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="800">
<caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
<state relative-caret-position="528">
<caret line="39" column="29" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
<state relative-caret-position="102">
<caret line="89" column="16" lean-forward="true" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<state relative-caret-position="528">
<caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3454">
<caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
<state relative-caret-position="564">
<caret line="60" column="49" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="49" />
</state>
</provider>
</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/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7942">
<caret line="361" column="28" lean-forward="true" selection-start-line="361" selection-start-column="28" selection-end-line="361" selection-end-column="28" />
<state relative-caret-position="345">
<caret line="67" column="59" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1672">
<caret line="76" column="28" selection-start-line="76" selection-start-column="28" selection-end-line="76" selection-end-column="28" />
<state relative-caret-position="242">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3454">
<caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>reservation_id</find>
<find>currentTab</find>
<find>student_num</find>
<find>detail.num</find>
<find>state_data</find>
<find>student_list</find>
<find>buy</find>
<find>new_arr</find>
<find>getStudentList</find>
<find>from_appointment</find>
<find>page_num</find>
<find>id</find>
... ... @@ -195,6 +188,15 @@
<find>chargenum</find>
<find>redeem_code</find>
<find>picker-box</find>
<find>currentCity</find>
<find>city_index</find>
<find>currentTest</find>
<find>current_session_id</find>
<find>experiment_id</find>
<find>goAppointment</find>
<find>current_test_id</find>
<find>textarea</find>
<find>is_choose_test</find>
</findStrings>
<dirStrings>
<dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
... ... @@ -219,7 +221,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app.wxss" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
<option value="$PROJECT_DIR$/templates/templates.wxss" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
... ... @@ -235,7 +236,6 @@
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
... ... @@ -245,7 +245,6 @@
<option value="$PROJECT_DIR$/pages/index/index.wxss" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
<option value="$PROJECT_DIR$/pages/my/my.wxss" />
<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/clock/punchAppeal/punchAppeal.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
... ... @@ -258,7 +257,6 @@
<option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" />
<option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" />
<option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
... ... @@ -270,6 +268,10 @@
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
</list>
</option>
</component>
... ... @@ -280,8 +282,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="416" />
<option name="y" value="15" />
<option name="x" value="-258" />
<option name="y" value="16" />
<option name="width" value="1936" />
<option name="height" value="1047" />
</component>
... ... @@ -312,6 +314,13 @@
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppeal" 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>
... ... @@ -332,6 +341,13 @@
<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="go-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" />
</path>
<path>
... ... @@ -463,7 +479,8 @@
<workItem from="1545354042642" duration="5649000" />
<workItem from="1545441360042" duration="4461000" />
<workItem from="1545627102606" duration="3505000" />
<workItem from="1545700023575" duration="3152000" />
<workItem from="1545700023575" duration="5185000" />
<workItem from="1545726292000" duration="5146000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -549,17 +566,37 @@
<option name="project" value="LOCAL" />
<updated>1545382588706</updated>
</task>
<option name="localTasksCounter" value="13" />
<task id="LOCAL-00013" summary="修改预约记录样式，修改兑换picker点击范围">
<created>1545704797930</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1545704797930</updated>
</task>
<task id="LOCAL-00014" summary="去掉测试数据">
<created>1545705005648</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1545705005648</updated>
</task>
<task id="LOCAL-00015" summary="优化预约">
<created>1545734413573</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1545734413573</updated>
</task>
<option name="localTasksCounter" value="16" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="258960000" />
<option name="totallyTimeSpent" value="266139000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
<window_info 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" />
... ... @@ -572,7 +609,7 @@
<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" weight="0.329718" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.5759219" />
<window_info active="true" anchor="bottom" id="Version Control" order="10" visible="true" weight="0.5759219" />
<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" />
... ... @@ -623,7 +660,10 @@
<MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
<MESSAGE value="添加默认图，测试用" />
<MESSAGE value="添加未购卡片" />
<option name="LAST_COMMIT_MESSAGE" value="添加未购卡片" />
<MESSAGE value="修改预约记录样式，修改兑换picker点击范围" />
<MESSAGE value="去掉测试数据" />
<MESSAGE value="优化预约" />
<option name="LAST_COMMIT_MESSAGE" value="优化预约" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
... ... @@ -633,13 +673,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="143" column="11" selection-start-line="143" selection-start-column="1" selection-end-line="143" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -681,13 +714,6 @@
</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="520">
<caret line="61" column="63" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
... ... @@ -702,20 +728,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2244">
<caret line="102" column="57" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1731">
<caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
</state>
</provider>
</entry>
<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="264">
... ... @@ -723,13 +735,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="764">
<caret line="216" column="88" lean-forward="true" selection-start-line="216" selection-start-column="26" selection-end-line="216" selection-end-column="88" />
</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="478">
... ... @@ -744,13 +749,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="279">
<caret line="39" column="56" selection-start-line="39" selection-start-column="44" selection-end-line="39" selection-end-column="56" />
</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="220">
... ... @@ -849,13 +847,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />
</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="418">
... ... @@ -881,10 +872,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
<folding>
<element signature="n#view#0;n#view#0;n#block#0;n#!!top" />
<element signature="n#swiper#0;n#view#0;n#block#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
... ... @@ -902,16 +889,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</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="7942">
... ... @@ -929,41 +906,48 @@
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3454">
<caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="106" column="11" lean-forward="true" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
<state relative-caret-position="2332">
<caret line="106" column="11" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="67" column="32" lean-forward="true" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
<state relative-caret-position="1474">
<caret line="67" column="32" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<state relative-caret-position="352">
<caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
</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="800">
<state relative-caret-position="2596">
<caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="968">
<caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
</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="990">
<caret line="45" column="71" selection-start-line="45" selection-start-column="71" selection-end-line="45" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
... ... @@ -971,10 +955,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
<state relative-caret-position="3454">
<caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
</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="352">
<caret line="25" column="99" selection-start-line="25" selection-start-column="88" selection-end-line="25" selection-end-column="99" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="564">
<caret line="60" column="49" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="67" column="59" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3072">
<caret line="246" column="40" lean-forward="true" selection-start-line="246" selection-start-column="40" selection-end-line="246" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="39" column="29" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="89" column="16" lean-forward="true" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
</state>
</provider>
</entry>
... ...
... ... @@ -43,7 +43,7 @@
<!--</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}}{{i.checked}}</view>
<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>
... ...
... ... @@ -7,106 +7,20 @@ Page({
* 页面的初始数据
*/
data: {
currentTest:0,
cityList: [],
// city_index: 0,
currentCity: '北京市',
currentCity: '',
current_test_id: '',
is_change: false,
is_choose_session: false,
is_choose_test: false,
// is_choose_test: false,
description: '',
session_list: {},
show_submit_btn: false,
student_num: 0,
areaTest: [{
area: '朝阳区',
list: [{
id: 1,
name: '798实验室'
}, {
id: 2,
name: '木鱼湖实验室'
}, {
id: 3,
name: '南锣鼓巷实验室'
}]
},
{
area: '东城区',
list: [{
id: 4,
name: '798实验室'
}, {
id: 5,
name: '木鱼湖实验室'
}, {
id: 6,
name: '南锣鼓巷实验室'
}]
},
{
area: '西城区',
list: [{
id: 7,
name: '798实验室'
}, {
id: 11,
name: '木鱼湖实验室'
}, {
id: 8,
name: '南锣鼓巷实验室'
}]
},
{
area: '昌平区',
list: [{
id: 9,
name: '798实验室'
}, {
id: 12,
name: '木鱼湖实验室'
}, {
id: 10,
name: '南锣鼓巷实验室'
}]
},
],
test: {
title: '798实验室,本实验室分为三个阶段，第一阶段由家长和孩子共同完成，第二阶段由孩子独立完成。家长在旁边指导，第三阶段巴拉巴拉',
list: [{
week: '周六',
date: '10月20日',
time: '10:00 — 11:30',
rest: 6
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 0
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 6
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 0
},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},
// {week:'周六',date: '10月20日',time:'10:00 — 11:30',rest: 6}
]
},
areaTest: [],
test: {},
},
//选择城市
... ... @@ -115,8 +29,10 @@ Page({
this.setData({
city_index: e.detail.value,
is_change: true,
currentTest:0,
});
this.getChooseSession(this.data.cityList[e.detail.value])
this.getChooseSession(this.data.cityList[e.detail.value]);
wx.setStorageSync('choose-city',this.data.cityList[e.detail.value])
},
//选择实验室
chooseTest(e) {
... ... @@ -128,7 +44,7 @@ Page({
this.setData({
currentTest: current,
current_test_id: current_id,
is_choose_test: true,
// is_choose_test: true,
// current_session_id: this.data.areaTest[current].lab_list ? this.data.areaTest[current].lab_list[0].session_list[0].id : '',
// description: this.data.areaTest[current].lab_list[current].description
});
... ... @@ -168,8 +84,8 @@ Page({
//点击单人预约
singleAppointment() {
if (!this.data.is_choose_session || !this.data.is_choose_test) {
wx.showToast({title: '请选择实验和场次!', icon: 'none'})
if (!this.data.is_choose_session) {
wx.showToast({title: '请选择实验场次!', icon: 'none'})
} else {
this.setData({
show_submit_btn: true,
... ... @@ -183,8 +99,8 @@ Page({
//点击双人预约
doubleAppointment() {
if (!this.data.is_choose_session || !this.data.is_choose_test) {
wx.showToast({title: '请选择实验和场次!', icon: 'none'})
if (!this.data.is_choose_session) {
wx.showToast({title: '请选择实验场次!', icon: 'none'})
} else {
this.setData({
show_submit_btn: true,
... ... @@ -197,7 +113,7 @@ Page({
},
//提交
submit() {
if (this.data.is_choose_session && this.data.is_choose_test) {
if (this.data.is_choose_session) {
let url = '/portal/Experiment/submit_session';
let header = {
"XX-token": wx.getStorageSync('token')
... ... @@ -234,6 +150,10 @@ Page({
// console.log(res);
var city_list = [];
res.forEach((item, index) => {
if(item.city == wx.getStorageSync('city')){
console.log('item.city', item.city, wx.getStorageSync('city'));
this.setData({city_index:index})
}
city_list.push(item.city)
});
// console.log(city_list,res);
... ... @@ -275,6 +195,7 @@ Page({
this.setData({
areaTest: res.list,
student_num: res.student_num,
current_test_id: res.list[0].lab_list[0].id,
// 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 : '',//默认显示第一个实验室的描述
... ... @@ -289,7 +210,7 @@ Page({
*/
onLoad: function (options) {
const self = this;
console.log('load',options);
console.log('load-experiment_id',options);
self.setData({experiment_id: +options.experiment_id});
// this.data.areaTest.forEach((v, i) => {
... ... @@ -309,11 +230,20 @@ Page({
},
getData() {
const self = this;
if (wx.getStorageSync('city')) {
if ((wx.getStorageSync('city') === wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
const city = wx.getStorageSync('city');
// console.log('city',city);
self.getChooseSession(city);
// console.log(self.data.currentCity);
self.setData({currentCity: city})
} else {
// console.log(self.data.currentCity);
}else if((wx.getStorageSync('city') !== wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
const city = wx.getStorageSync('choose-city');
self.getChooseSession(city);
self.setData({currentCity: city})
} else if(wx.getStorageSync('city') === ''){
// console.log('aaa');
const city = '北京市';
self.getChooseSession(city);
}
... ...
... ... @@ -22,7 +22,8 @@
<block wx:for="{{item.lab_list}}" wx:key="index">
<view class="list-item" bindtap="chooseTest" data-index="{{index}}"
data-id="{{item.id}}">
<image src="../../../images/blue_line.png" wx:if="{{current_test_id === item.id}}"
<!--wx:if="{{current_test_id === item.id}}"-->
<image src="../../../images/blue_line.png" wx:if="{{currentTest === index && current_test_id === item.id}}"
class="blue-line"></image>
<view class="test {{current_test_id === item.id?'change-color':''}}">{{item.name}}</view>
</view>
... ...
... ... @@ -64,6 +64,7 @@ Page({
//前往预约
goAppointment(e) {
const id = e.currentTarget.dataset.id;
console.log('实验室id', id);
wx.navigateTo({url: './go-appointment/go-appointment?experiment_id=' + id})
},
//获取轮播图
... ...