miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 5c654f0d8e098b59a1a375d258fe3e5941331853 1 个父辈 35f8558e

优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载， 

购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑
内嵌 并排对比
正在显示 25 个修改的文件 包含 1336 行增加 和 925 行删除
<?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="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，">
<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/clock/clock.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.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/clock/punchAppeal/punchAppeal.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" 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/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/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/my.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wxParse/html2json.js" beforeDir="false" afterPath="$PROJECT_DIR$/wxParse/html2json.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/all-appointment/all-appointment.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" 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/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/myCard/myCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myCard/myCard.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -27,152 +41,145 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="16" />
<entry key="project.closed" value="18" />
<entry key="project.open.time.0" value="6" />
<entry key="project.open.time.1" value="7" />
<entry key="project.open.time.1" value="8" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.8" value="2" />
<entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="18" />
<entry key="project.opened" value="20" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="143" />
<entry key="js" value="163" />
<entry key="json" value="31" />
<entry key="wxml" value="112" />
<entry key="wxss" value="49" />
<entry key="wxml" value="129" />
<entry key="wxss" value="51" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="49" />
<entry key="HTML" value="112" />
<entry key="CSS" value="51" />
<entry key="HTML" value="129" />
<entry key="JSON" value="31" />
<entry key="JavaScript" value="143" />
<entry key="JavaScript" value="163" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="13513" />
<entry key="js" value="15129" />
<entry key="json" value="158" />
<entry key="txt" value="279" />
<entry key="wxml" value="3146" />
<entry key="wxss" value="1477" />
<entry key="txt" value="288" />
<entry key="wxml" value="3443" />
<entry key="wxss" value="1590" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="1477" />
<entry key="HTML" value="3146" />
<entry key="CSS" value="1590" />
<entry key="HTML" value="3443" />
<entry key="JSON" value="158" />
<entry key="JavaScript" value="13513" />
<entry key="PLAIN_TEXT" value="279" />
<entry key="JavaScript" value="15129" />
<entry key="PLAIN_TEXT" value="288" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
<counts>
<entry key="git.branch.merge" value="2" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="94" column="10" lean-forward="true" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<state relative-caret-position="773">
<caret line="159" column="10" lean-forward="true" selection-start-line="159" selection-start-column="10" selection-end-line="159" selection-end-column="10" />
<folding>
<element signature="e#1652#2617#0" />
<element signature="e#152#1691#0" />
<element signature="e#4857#8107#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="43" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="594">
<caret line="27" column="13" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1518">
<caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
<folding>
<element signature="e#152#1691#0" />
</folding>
<state relative-caret-position="74">
<caret line="63" column="34" lean-forward="true" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
<state relative-caret-position="1232">
<caret line="92" column="49" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
<state relative-caret-position="674">
<caret line="62" column="34" lean-forward="true" selection-start-line="62" selection-start-column="34" selection-end-line="62" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="102" column="57" lean-forward="true" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
<state relative-caret-position="509">
<caret line="134" column="31" lean-forward="true" selection-start-line="134" selection-start-column="31" selection-end-line="134" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<folding>
<element signature="e#1398#2534#0" />
<element signature="e#2559#3773#0" />
</folding>
<state relative-caret-position="740">
<caret line="57" column="63" lean-forward="true" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="63" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
<state relative-caret-position="-28">
<caret line="89" column="5" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="120" column="8" lean-forward="true" selection-start-line="120" selection-start-column="8" selection-end-line="130" selection-end-column="28" />
<state relative-caret-position="495">
<caret line="170" column="49" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="49" />
</state>
</provider>
</entry>
... ... @@ -181,55 +188,57 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>getSlideImage</find>
<find>punch</find>
<find>xxx</find>
<find>changeState</find>
<find>pay_success</find>
<find>getAppointmentList</find>
<find>modal</find>
<find>refreshBuyState</find>
<find>state_data</find>
<find>chooseChildren</find>
<find>session_info</find>
<find>getAppointmentInfo</find>
<find>swiperChange</find>
<find>wrap</find>
<find>cur</find>
<find>current</find>
<find>student_id</find>
<find>indexOf</find>
<find>new_itmes</find>
<find>请选择两个学员</find>
<find>has_more</find>
<find>changeState</find>
<find>picker</find>
<find>num</find>
<find>is_choose_student</find>
<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>
<find>recordList</find>
<find>打卡</find>
<find>test</find>
<find>postPosition</find>
<find>getExperiment</find>
<find>goPhoneCode</find>
<find>console.dir</find>
<find>city_index</find>
<find>sex_index</find>
<find>is_sex_change</find>
<find>template</find>
<find>is_birth_change</find>
<find>form</find>
<find>tabCharge</find>
<find>currentSwiper</find>
<find>listDetail</find>
<find>submit_btn</find>
<find>modal</find>
<find>is_bingding</find>
<find>getAppointmentList</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<favorite-branches>
<branch-storage>
<map>
<entry type="REMOTE">
<value>
<list>
<branch-info repo="$PROJECT_DIR$" source="origin/wumengyu" />
</list>
</value>
</entry>
</map>
</branch-storage>
</favorite-branches>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxss" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" />
<option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.js" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.json" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" />
<option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" />
<option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxss" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxml" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
... ... @@ -238,30 +247,21 @@
<option value="$PROJECT_DIR$/templates/templates.wxss" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" />
<option value="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss" />
<option value="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" />
<option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/my/my.js" />
<option value="$PROJECT_DIR$/pages/my/my.wxml" />
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" />
<option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" />
... ... @@ -269,7 +269,27 @@
<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/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/clock/punchAppeal/punchAppeal.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />
<option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" />
<option value="$PROJECT_DIR$/pages/my/myCard/myCard.js" />
<option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" />
<option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" />
<option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />
<option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" />
<option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" />
<option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
</list>
</option>
</component>
... ... @@ -290,7 +310,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -347,25 +366,95 @@
<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" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" 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="appointmentRecord" 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="groupBuy" 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="groupBuyDetail" 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="all-appointment" type="462c0819:PsiDirectoryNode" />
<item name="myCard" 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="my" type="462c0819:PsiDirectoryNode" />
<item name="shareGroupBuy" 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="takeGroupBuy" 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="SearchEverywhereHistoryKey" value="edit&#9;FILE&#9;file://D:/小程序/scienceCaptain/ScienceCaptain/pages/my/edit-student/edit-student.js" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../遛狗小程序" />
<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" />
... ... @@ -416,7 +505,9 @@
<workItem from="1544490574837" duration="15199000" />
<workItem from="1544579843898" duration="5821000" />
<workItem from="1544751555564" duration="3866000" />
<workItem from="1545014617044" duration="7283000" />
<workItem from="1545014617044" duration="13676000" />
<workItem from="1545095024314" duration="3201000" />
<workItem from="1545181336636" duration="25141000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -474,11 +565,18 @@
<option name="project" value="LOCAL" />
<updated>1544583498325</updated>
</task>
<option name="localTasksCounter" value="9" />
<task id="LOCAL-00009" summary="申诉详情，二次申诉">
<created>1545025106364</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1545025106365</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="197510000" />
<option name="totallyTimeSpent" value="232245000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -544,141 +642,130 @@
<MESSAGE value="申诉，打卡，编辑删除学员，更换手机号" />
<MESSAGE value="预约详情页接口，删除学员，添加formid" />
<MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
<option name="LAST_COMMIT_MESSAGE" value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
<MESSAGE value="申诉详情，二次申诉" />
<option name="LAST_COMMIT_MESSAGE" value="申诉详情，二次申诉" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="180" selection-end-column="11" />
<state relative-caret-position="1254">
<caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="22" selection-start-line="22" selection-end-line="23" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="594">
<caret line="27" column="51" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="60" selection-start-line="3" selection-start-column="60" selection-end-line="3" selection-end-column="60" />
<state relative-caret-position="352">
<caret line="16" column="6" lean-forward="true" selection-start-line="16" selection-start-column="6" selection-end-line="17" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="226" selection-start-line="226" selection-end-line="247" selection-end-column="4" />
<state relative-caret-position="22">
<caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="36" column="68" lean-forward="true" selection-start-line="36" selection-start-column="68" selection-end-line="36" selection-end-column="68" />
<state relative-caret-position="440">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
</state>
</provider>
</entry>
<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="-44">
<caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/wxParse/html2json.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.json">
<entry file="file://$PROJECT_DIR$/wxParse/htmlparser.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<entry file="file://$PROJECT_DIR$/wxParse/showdown.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
<state relative-caret-position="112">
<caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
<caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
<state relative-caret-position="704">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431">
<caret line="272" column="9" lean-forward="true" selection-start-line="272" selection-start-column="9" selection-end-line="272" selection-end-column="9" />
<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/my/my.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="96" column="64" lean-forward="true" selection-start-line="96" selection-start-column="64" selection-end-line="96" selection-end-column="64" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
<state relative-caret-position="484">
<caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
<state relative-caret-position="374">
<caret line="17" column="16" lean-forward="true" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.json">
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
<state relative-caret-position="550">
<caret line="25" column="14" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
<state relative-caret-position="374">
<caret line="17" column="63" lean-forward="true" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="63" />
<folding>
<element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
<state relative-caret-position="1584">
<caret line="72" column="3" selection-start-line="72" selection-start-column="3" selection-end-line="72" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1936">
<caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
<state relative-caret-position="176">
<caret line="8" column="60" lean-forward="true" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2112">
<caret line="164" column="19" selection-start-line="164" selection-start-column="8" selection-end-line="164" selection-end-column="19" />
<state relative-caret-position="411">
<caret line="137" column="47" selection-start-line="137" selection-start-column="47" selection-end-line="137" selection-end-column="47" />
<folding>
<element signature="e#76#1092#0" />
<element signature="e#4307#4566#0" />
<element signature="e#4595#5101#0" />
<element signature="e#5118#5452#0" />
<element signature="e#5495#5588#0" />
<element signature="e#5610#5695#0" />
... ... @@ -686,217 +773,247 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
<caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" />
<state relative-caret-position="157">
<caret line="79" column="40" lean-forward="true" selection-start-line="79" selection-start-column="40" selection-end-line="79" selection-end-column="40" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#3441#6499#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/project.config.json">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
<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/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" selection-end-line="11" />
<state relative-caret-position="1892">
<caret line="185" selection-start-line="185" selection-end-line="186" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
<state relative-caret-position="212">
<caret line="32" column="15" lean-forward="true" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1254">
<caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />
<state relative-caret-position="506">
<caret line="94" column="10" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="27" column="51" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
<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/index/activity-detail/activity-detail.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="6" lean-forward="true" selection-start-line="16" selection-start-column="6" selection-end-line="17" selection-end-column="67" />
<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" />
<folding>
<element signature="e#805#1273#0" />
<element signature="e#1303#1430#0" />
<element signature="e#1468#2604#0" />
<element signature="e#2629#3843#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<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="22">
<caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
<state relative-caret-position="264">
<caret line="21" column="37" lean-forward="true" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<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$/wxParse/html2json.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/wxParse/htmlparser.js">
<provider selected="true" editor-type-id="text-editor" />
<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">
<caret line="49" column="66" lean-forward="true" selection-start-line="49" selection-start-column="66" selection-end-line="49" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wxParse/showdown.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="112">
<caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
<state relative-caret-position="110">
<caret line="5" column="72" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
<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="704">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
<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/clock/punchAppeal/punchAppeal.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
<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 relative-caret-position="220">
<caret line="44" column="68" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js">
<provider selected="true" editor-type-id="text-editor" />
<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="641">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.json">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="356">
<caret line="135" column="8" lean-forward="true" selection-start-line="135" selection-start-column="8" selection-end-line="143" selection-end-column="9" />
<folding>
<element signature="e#436#575#0" />
<element signature="e#610#693#0" />
<element signature="e#724#1510#0" />
<element signature="e#1539#3054#0" />
<element signature="e#3694#3993#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
<state relative-caret-position="330">
<caret line="15" column="91" selection-start-line="15" selection-start-column="78" selection-end-line="15" selection-end-column="91" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.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="421">
<caret line="187" column="65" lean-forward="true" selection-start-line="187" selection-start-column="65" selection-end-line="187" selection-end-column="65" />
<state relative-caret-position="125">
<caret line="36" column="7" selection-start-line="36" selection-start-column="7" selection-end-line="37" selection-end-column="40" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#3441#6499#0" />
<element signature="e#6947#8019#0" />
<element signature="e#1630#5581#0" />
<element signature="e#6965#7419#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="16" lean-forward="true" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
<state relative-caret-position="440">
<caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="3" column="22" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
<state relative-caret-position="242">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="43" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="704">
<caret line="41" column="37" lean-forward="true" selection-start-line="41" selection-start-column="37" selection-end-line="41" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
<state relative-caret-position="132">
<caret line="6" column="30" lean-forward="true" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
<caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="94" column="10" lean-forward="true" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding>
<element signature="e#1652#2617#0" />
</folding>
<state relative-caret-position="495">
<caret line="170" column="49" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1518">
<caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
<folding>
<element signature="e#152#1691#0" />
</folding>
<state relative-caret-position="74">
<caret line="63" column="34" lean-forward="true" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
<state relative-caret-position="740">
<caret line="57" column="63" lean-forward="true" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="102" column="57" lean-forward="true" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
<state relative-caret-position="-28">
<caret line="89" column="5" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
<state relative-caret-position="594">
<caret line="27" column="13" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="120" column="8" lean-forward="true" selection-start-line="120" selection-start-column="8" selection-end-line="130" selection-end-column="28" />
<state relative-caret-position="509">
<caret line="134" column="31" lean-forward="true" selection-start-line="134" selection-start-column="31" selection-end-line="134" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1232">
<caret line="92" column="49" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<state relative-caret-position="674">
<caret line="62" column="34" lean-forward="true" selection-start-line="62" selection-start-column="34" selection-end-line="62" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="773">
<caret line="159" column="10" lean-forward="true" selection-start-line="159" selection-start-column="10" selection-end-line="159" selection-end-column="10" />
<folding>
<element signature="e#1398#2534#0" />
<element signature="e#2559#3773#0" />
<element signature="e#152#1691#0" />
<element signature="e#4857#8107#0" />
</folding>
</state>
</provider>
... ...
... ... @@ -156,7 +156,7 @@ Page({
this.setData({
test: res
});
this.punch();
// this.punch();
})
},
//打卡页面获取位置授权
... ... @@ -168,6 +168,7 @@ Page({
wx.getLocation({
type: 'wgs84',
success(res) {
self.setData({latitude:res.latitude,longitude:res.longitude});
let params = {
city: wx.getStorageSync('city'),
lat: res.latitude,//纬度
... ... @@ -243,6 +244,7 @@ Page({
if(wx.getStorageSync('city') !== '') {
self.setData({city: wx.getStorageSync('city')})
}
self.getExperiment();
},
/**
... ...
... ... @@ -27,9 +27,13 @@ Page({
return false
} else {
this.setData({
current: index
current: index,
has_more: true,
page_number:1,
examining:[]
});
if(index !== 0) {
console.log('aa');
this.getMyComplain(index)
}
}
... ...
... ... @@ -3,7 +3,7 @@
<view class="input-box">
<view class="name-box">
<text>姓 名：</text>
<input type="text" placeholder="张三" cursor="100" placeholder-class="placeholder-style"
<input type="text" placeholder="请输入姓名" cursor="100" placeholder-class="placeholder-style"
value="{{name}}" bindinput="inputName"/>
</view>
<picker bindchange="sexPickerChange" value="{{sex_index}}" range="{{sex}}">
... ...
... ... @@ -20,18 +20,15 @@ Page({
title:'恭喜您!',
content: '您已经预约成功!'
},
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}],
student_list: [],
is_choose: false,
num_arr: [],
session_info: {},
student_num: 0,
is_choose_student: false,
is_buy: true,
student_id:47,
is_buy: false,
choose_student_id:0,
// checked_student: [],
},
chooseChildren(e) {
console.log(e,e.detail);
... ... @@ -48,7 +45,7 @@ Page({
console.log('new_arr',new_arr);
var new_itmes = new_arr;
console.log('new_itmes', new_itmes);
if(that.data.student_num >=2) {//两个学员预约时
if(that.data.student_num >=2) { //两个学员预约时
console.log('两个学员');
if (index_arr.length > 2) {
//取出倒数两个值
... ... @@ -71,15 +68,40 @@ Page({
console.log('student_id', that.data.student_id);
} else {
//被选中少于两个，直接设置被选中
const checked_student = [];
for (var i = 0; i < index_arr.length; i++) {
var key = index_arr[i]
console.log('key', key);
new_itmes[key]['checked'] = true;
}
console.log('选一个时候new_itmes', new_itmes);
new_itmes.forEach((item) => {
if(item.checked) {
checked_student.push(item)
}
});
console.log('选择学员length', checked_student,checked_student.length);
if(checked_student.length>=2) {
const arr = [];
new_itmes.forEach((item) => {
if(item.checked) {
arr.push(item.id)
}
});
that.setData({student_id: arr.join(','),is_choose_student:true});
}else if(checked_student.length<2){
wx.showToast({title:'请选择两个学员!',icon:'none'});
that.setData({student_id: new_itmes[key].id,is_choose_student:true});
}
console.log('student_id', that.data.student_id);
}
}else if(that.data.student_num <2){//一个学员预约时
//存入
that.setData({
index_arr: index_arr,
// text: text,
student_list: new_itmes,
})
}else if(that.data.student_num <2){ //一个学员预约时
console.log('一个学员');
if (index_arr.length > 1) {
//取出倒数一个值
... ... @@ -117,23 +139,26 @@ Page({
console.log('333');
console.log('student_id', that.data.student_id);
}
//存入
that.setData({
index_arr: index_arr,
// text: text,
student_list: new_itmes,
})
}
//存入
that.setData({
index_arr: index_arr,
// text: text,
student_list: new_itmes,
})
},
//提交预约
formSubmit(e) {
console.log(e.detail);
console.log('预约学生人数',this.data.student_num,e.detail);
if(this.data.student_list.length === 0) {
wx.showToast({title: '请添加学员!',icon:'none'})
}else if(!this.data.is_choose_student) {
wx.showToast({title: '请选择学员!',icon:'none'})
}else {
}else if(this.data.student_num>=2 && ('' + this.data.student_id).indexOf(',') === -1) {
console.log('检验student_id',('' + this.data.student_id).indexOf(','));
wx.showToast({title:'请选择两个学员!',icon:'none'})
} else {
// this.setData({'modal_data.is_showModal': true})
let url = '/portal/Experiment/confirm_session_submit';
let header = {
... ... @@ -174,7 +199,7 @@ Page({
},
modalConfirm() {
this.setData({'state_data.is_showSuccessModal': false});
wx.navigateTo({url: '/pages/my/all-appointment/all-appointment?currentTab=' + 2})
wx.redirectTo({url: '/pages/my/all-appointment/all-appointment?currentTab=' + 2})
},
disableScroll() {},
addStudent() {
... ... @@ -215,37 +240,55 @@ Page({
//获取学员列表
getStudentList() {
const self = this;
self.setData({is_choose_student: true})
console.log('返回时的学生列表', self.data.student_list);
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);
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',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);
console.log('预约学生人数',this.data.student_num);
self.setData({is_choose_student: true});
console.log('返回时的学生列表预约信息自带的学员', self.data.student_list);
const buy_arr = [];
self.data.student_list.forEach((item) => {
buy_arr.push({ ...item, checked: false })
});//给每一项添加checked属性
console.log('buy_arr', buy_arr);
this.setData({
student_list: buy_arr,
// new_arr:buy_arr,
// session_info: res.session_info,
})
this.refreshBuyState();
// console.log('预约学生人数',this.data.student_num);
// self.setData({is_choose_student: true})
// console.log('返回时的学生列表预约信息自带的学员', self.data.student_list);
// let url = '/user/Student/student_list';
// let header = {
// "XX-token": wx.getStorageSync('token')
// };
// let params = {
// page: 2,
// };
// 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',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);
// this.refreshBuyState();
// res.list.forEach((item) => {
// if(item.time !== '') {
// self.data.student_list.forEach((item) => {
... ... @@ -255,21 +298,35 @@ Page({
// }
// })
// this.setData({student_list: res.list})
})
// })
},
//更新购买状态
refreshBuyState() {
console.log('更新购买状态---学生id',this.data.is_buy,this.data.student_id);
console.log('更新购买状态---学生id--人数',this.data.student_num,this.data.is_buy,this.data.choose_student_id);
if(this.data.is_buy) {
this.data.student_list.forEach((item) => {
item.checked = false;
if (item.id === this.data.student_id) {
console.log('item.id', item.id);
item.checked = true;
}
});
this.setData({student_list:this.data.student_list})
console.log('student_list',this.data.student_list);
if(this.data.student_num<2) {
this.data.student_list.forEach((item) => {
item.checked = false;
if (item.id === this.data.choose_student_id) {
console.log('item.id', item.id);
item.checked = true;
}
});
this.setData({student_list:this.data.student_list,is_choose_student:true})
console.log('student_list',this.data.student_list);
}else if(this.data.student_num>=2) {
console.log('购买完进入两个学员student_list',this.data.student_list);
this.data.student_list.forEach((item) => {
item.checked = false;
if (item.id === this.data.choose_student_id) {
console.log('item.id', item.id);
item.checked = true;
// total_student_num.push(item)
}
});
this.setData({student_list:this.data.student_list,is_choose_student:true,});
console.log('student_list',this.data.student_list);
}
}
},
/**
... ... @@ -301,9 +358,11 @@ Page({
onShow: function() {
console.log('show');
const self = this;
self.getStudentList();
self.setData({is_choose_student: false});
// self.getAppointmentInfo();//需解注释
self.getStudentList();
if(!self.data.is_buy) {
self.getAppointmentInfo();//需解注释
}
setTimeout(function() {
self.setData({
show: true
... ...
... ... @@ -3,153 +3,153 @@ const util = require('../../../utils/util.js');
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
cityList: [],
// city_index: 0,
currentCity: '北京市',
current_test_id: '',
is_change: false,
is_choose_session: 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
/**
* 页面的初始数据
*/
data: {
cityList: [],
// city_index: 0,
currentCity: '北京市',
current_test_id: '',
is_change: false,
is_choose_session: 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: '南锣鼓巷实验室'
}]
},
{
week: '周日',
date: '10月21日',
time: '15:00 — 16:30',
rest: 0
{
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}
]
},
{
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}
]
},
},
//选择城市
bindPickerChange: function(e) {
// console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({
city_index: e.detail.value,
is_change: true,
});
this.getChooseSession(this.data.cityList[e.detail.value])
},
//选择实验室
chooseTest(e) {
// console.log(e);
// console.log('实验',e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
const current_id = e.currentTarget.dataset.id;
// console.log(this.data.areaTest[0].lab_list[0].session_list[0].id);
this.setData({
currentTest: current,
current_test_id: current_id,
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
});
// console.log(util.formatTimeTwo(1543375800,'h:m'),'1543375800');
// console.log('areaTest',this.data.areaTest);
return this.data.areaTest.forEach((item,index) => {
// console.log(item.lab_list[current].id, current_id);
if(item.lab_list && (item.lab_list[current].id === current_id)) {
// console.log(current_id, item.lab_list[current].id,item.lab_list[current].description);
this.setData({
description: item.lab_list&&item.lab_list[current].description ? item.lab_list[current].description : '',
session_list: item.lab_list&&item.lab_list[current].session_list ? item.lab_list[current].session_list: '',
});
// return
}
});
// console.log(a);
// console.log(this.data.areaTest[current].lab_list[current].description);
},
//选择城市
bindPickerChange: function (e) {
// console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({
city_index: e.detail.value,
is_change: true,
});
this.getChooseSession(this.data.cityList[e.detail.value])
},
//选择实验室
chooseTest(e) {
// console.log(e);
// console.log('实验',e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
const current_id = e.currentTarget.dataset.id;
// console.log(this.data.areaTest[0].lab_list[0].session_list[0].id);
this.setData({
currentTest: current,
current_test_id: current_id,
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
});
// console.log(util.formatTimeTwo(1543375800,'h:m'),'1543375800');
// console.log('areaTest',this.data.areaTest);
return this.data.areaTest.forEach((item, index) => {
// console.log(item.lab_list[current].id, current_id);
if (item.lab_list && (item.lab_list[current].id === current_id)) {
// console.log(current_id, item.lab_list[current].id,item.lab_list[current].description);
this.setData({
description: item.lab_list && item.lab_list[current].description ? item.lab_list[current].description : '',
session_list: item.lab_list && item.lab_list[current].session_list ? item.lab_list[current].session_list : '',
});
// return
}
});
// console.log(a);
// console.log(this.data.areaTest[current].lab_list[current].description);
},
//选择场次
//选择场次
chooseTime(e) {
// console.log(e.currentTarget.dataset.index);
const current = e.currentTarget.dataset.index;
... ... @@ -161,200 +161,206 @@ Page({
current_session_id: current_id,
is_choose_session: true,
})
}else {
wx.showToast({title:'该场次名额不足!',icon:'none'})
} else {
wx.showToast({title: '该场次名额不足!', icon: 'none'})
}
},
//点击单人预约
singleAppointment() {
if(!this.data.is_choose_session || !this.data.is_choose_test) {
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
// })
},
//点击单人预约
singleAppointment() {
if (!this.data.is_choose_session || !this.data.is_choose_test) {
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
// })
},
//点击双人预约
doubleAppointment() {
if(!this.data.is_choose_session || !this.data.is_choose_test) {
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
// })
},
//提交
submit() {
if(this.data.is_choose_session && this.data.is_choose_test) {
let url = '/portal/Experiment/submit_session';
//点击双人预约
doubleAppointment() {
if (!this.data.is_choose_session || !this.data.is_choose_test) {
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
// })
},
//提交
submit() {
if (this.data.is_choose_session && this.data.is_choose_test) {
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'})
}
},
//获取城市列表
getCity() {
let url = '/portal/Experiment/cityList';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {}, header).then((res) => {
// console.log(res);
var city_list = [];
res.forEach((item, index) => {
city_list.push(item.city)
});
// console.log(city_list,res);
this.setData({
cityList: city_list,
// description: res.list[0].lab_list[0].description,//默认显示第一个实验室的描述
// session_list: res.list[0].lab_list[0].session_list//默认显示第一个实验室的实验时间
})
// console.log(this.data.this_week_test_info);
})
},
//获取预约城市、区、实验室、场次
getChooseSession(city) {
let url = '/portal/Experiment/choose_session';
let params = {
experiment_id: this.data.experiment_id,
session_id: this.data.current_session_id,
student_num: this.data.student_num,
city: city,
};
// 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'})
}
},
//获取城市列表
getCity() {
let url = '/portal/Experiment/cityList';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {},header).then((res) => {
// console.log(res);
var city_list = [];
res.forEach((item,index) => {
city_list.push(item.city)
});
// console.log(city_list,res);
this.setData({
cityList: city_list,
// description: res.list[0].lab_list[0].description,//默认显示第一个实验室的描述
// session_list: res.list[0].lab_list[0].session_list//默认显示第一个实验室的实验时间
})
// console.log(this.data.this_week_test_info);
})
},
//获取预约城市、区、实验室、场次
getChooseSession(city) {
let url = '/portal/Experiment/choose_session';
let params = {
experiment_id: this.data.experiment_id,
city: city,
};
let header = {
"XX-token": wx.getStorageSync('token')
};
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);
// 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 : '',//默认显示第一个实验室的描述
session_list: res.list[0].lab_list ? res.list[0].lab_list[0].session_list :''//默认显示第一个实验室的实验时间
})
// console.log(this.data.this_week_test_info);
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
const self = this;
console.log(options);
self.setData({experiment_id: +options.experiment_id});
if(wx.getStorageSync('city')) {
const city = wx.getStorageSync('city');
self.getChooseSession(city);
self.setData({currentCity: city})
}else {
const city = '北京市';
self.getChooseSession(city);
}
self.getCity();
// this.data.areaTest.forEach((v, i) => {
// Object.keys(v).forEach(v => {
// console.log(v) //取到了key
// console.log(this.data.areaTest[i][v]) //取到了值
// })
// })
// console.log(this.data.areaTest);
},
let header = {
"XX-token": wx.getStorageSync('token')
};
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);
// 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 : '',//默认显示第一个实验室的描述
session_list: res.list[0].lab_list ? res.list[0].lab_list[0].session_list : ''//默认显示第一个实验室的实验时间
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
})
// console.log(this.data.this_week_test_info);
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
const self = this;
console.log('load',options);
self.setData({experiment_id: +options.experiment_id});
},
// this.data.areaTest.forEach((v, i) => {
// Object.keys(v).forEach(v => {
// console.log(v) //取到了key
// console.log(this.data.areaTest[i][v]) //取到了值
// })
// })
// console.log(this.data.areaTest);
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
},
getData() {
const self = this;
if (wx.getStorageSync('city')) {
const city = wx.getStorageSync('city');
self.getChooseSession(city);
self.setData({currentCity: city})
} else {
const city = '北京市';
self.getChooseSession(city);
}
self.getCity();
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
const self = this;
console.log('show');
self.getData();
self.setData({show_submit_btn: false})
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
}
})
\ No newline at end of file
... ...
... ... @@ -68,7 +68,7 @@ Page({
//获取轮播图
getSlideImage() {
let params = {};
if(wx.setStorageSync('city') !== '') {
if(wx.getStorageSync('city') === '') {
params = {
city: '北京',
};
... ... @@ -208,7 +208,7 @@ Page({
longitude: res.longitude//经度
},
success: function (res) {
console.log(res);
console.log('获取城市',res.result.address_component.city);
self.setData({city: res.result.address_component.city});
wx.setStorageSync('city', res.result.address_component.city);
self.getSlideImage();
... ...
... ... @@ -13,7 +13,7 @@
</view>
<!--预约列表-->
<view class="list-box">
<view class="list-box" wx:if="{{orderList.length > 0}}">
<view class="order-box" bindtap="goDetail" wx:for="{{orderList}}" wx:key="index" data-index="{{index}}">
<view class="head">
... ...
... ... @@ -23,6 +23,10 @@ page {
-moz-box-sizing: border-box;
box-sizing: border-box;
background-color: #fff;
position: fixed;
top:0;
left:0;
z-index:10;
/* border-bottom: 1rpx solid #ebebeb; */
}
.tab-box view {
... ... @@ -33,6 +37,9 @@ page {
display: flex;
align-items: center;
justify-content: center;
margin:auto 0;
width:100%;
height: 100%;
}
.no-data-box text {
font-size: 36rpx;
... ... @@ -44,10 +51,13 @@ page {
}
.list-box {
width: 100%;
height: 100%;
padding: 22rpx 20rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
z-index:1;
margin-top:88rpx;
}
.order-box {
/* height: 274rpx; */
... ...
// pages/appointmentRecord/appointmentRecord.js
const app=getApp()
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
student_id:'',
page:1
},
/**
* 页面的初始数据
*/
data: {
student_id: '',
page_number: 1,
has_more: true,
record:[]
},
//获取预约记录
recordList() {
if(!this.data.has_more) return;
this.setData({has_more: false});
let url = '/user/Student/student_reservation_list';
let params = {
student_id: this.data.student_id,
page: this.data.page_number,
};
let header = {
"XX-Token": wx.getStorageSync('token')
};
app.post(url, params, header).then((res) => {
console.log(res);
if(res.this_page < res.total_page) {
this.setData({has_more: true});
}
this.setData({record:this.data.record.concat(res.list)})
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log('options', options);
this.setData({student_id: +options.student_id ? +options.student_id : ''});
this.recordList()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
if (this.data.has_more) {
this.data.page_number++;
this.getStudentList();
} else {
wx.showToast({
title: '没有更多数据了~',
icon: 'none'
});
}
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
recordList(){
let url ='/user/Student/student_reservation_list'
let params={
student_id:this.data.student_id,
page:this.data.page
}
let header={
"XX-Token":wx.getStorageSync('token')
}
app.post(url,params,header).then((res)=>{
console.log(res)
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.recordList()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
<!--pages/appointmentRecord/appointmentRecord.wxml-->
<view class='content_box'>
<view class='item_list'>
<view class='list_tab'>
<view class='list_tab_item'>预约记录</view>
<view class='list_tab_item'>时间</view>
<view class='item_list'>
<view class='list_tab title'>
<view class='list_tab_item'>预约记录</view>
<view class='list_tab_item'>时间</view>
</view>
<view class='list_tab list_content' wx:for="{{record}}" wx:key="index">
<view class='list_tab_item'>活动报名</view>
<view class='list_tab_item'>{{item.time}}</view>
</view>
</view>
<view class='list_tab list_content' wx:for='{{[1,2,3]}}' wx:key=''>
<view class='list_tab_item'>活动报名</view>
<view class='list_tab_item'>2018.10.10</view>
</view>
</view>
<view class="no-data" wx:if="{{record.length === 0}}">暂无记录</view>
</view>
\ No newline at end of file
... ...
/* pages/appointmentRecord/appointmentRecord.wxss */
/* 团购成交记录 */
page {
height: 100%;
}
.content_box {
height: 100%;
}
.no-data {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
color: #cccccc;
font-size: 30rpx;
margin: auto 0;
}
.title {
position: fixed;
top:0;
left:0;
z-index:10;
}
.list_tab {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
... ... @@ -38,6 +60,8 @@
.list_content {
border: 0;
padding: 15rpx 0;
z-index:1;
margin-top: 100rpx;
}
.list_content .list_tab_item {
... ...
... ... @@ -7,22 +7,24 @@ Page({
*/
data: {
card_info: {},
student_list: {},
student_list: [],
picker_list: {},
is_agree: true,
userlist: ['张三', '里斯'],
index: 0,
pay_success: false,
page_number: 1,
has_more: true,
},
//选择成员
changeStudent(e) {
if (this.data.student_list.length === 0) {
}
//选择成员
changeStudent(e) {
// if (this.data.student_list.length === 0) {
//
// }
this.setData({
index: e.detail.value,
})
});
},
//添加学员
addUser() {
... ... @@ -111,7 +113,7 @@ Page({
// beforePage.refreshStudent()
beforePage.data.is_buy = true;
console.log('学生id',this.data.student_list[this.data.index].id);
beforePage.student_id = this.data.student_list[this.data.index].id;
beforePage.data.choose_student_id = this.data.student_list[this.data.index].id;
beforePage.refreshBuyState()
}
}
... ... @@ -129,23 +131,43 @@ Page({
})
})
},
getMoreStudent() {
console.log('has_more',this.data.has_more);
if (this.data.has_more) {
this.data.page_number++;
this.getStudentList();
} else {
wx.showToast({
title: '没有更多数据了~',
icon: 'none'
});
}
},
//获取学员列表
getStudentList() {
if(!this.data.has_more) return;
this.setData({has_more: false});
let url = '/user/Student/student_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
page: 1,
page: this.data.page_number,
};
var list = [];
app.post(url,params,header).then((res) => {
console.log('学员列表',res);
res.list.forEach((item) => {
// console.log('学员列表',res);
if(res.this_page < res.total_page) {
this.setData({has_more: true});
this.getMoreStudent()
}
const concat_list = this.data.student_list.concat(res.list);
// console.log('concat_list',concat_list);
concat_list.forEach((item) => {
list.push(item.name)
});
console.log('list', list);
this.setData({student_list: res.list,picker_list: list})
// console.log('list', list);
this.setData({student_list: this.data.student_list.concat(res.list),picker_list:list});
})
},
//同意协议按钮
... ... @@ -177,6 +199,7 @@ Page({
*/
onShow: function() {
const self = this;
self.setData({has_more: true,student_list:[],page_number: 1});
self.getStudentList();
},
... ... @@ -206,7 +229,6 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
... ...
... ... @@ -118,7 +118,7 @@
this.wxPay(res.pay)
})
},
//发起团购
//团购配置人数价格
PayDetail() {
let url = '/portal/Group/group_option'
let params = {}
... ... @@ -132,9 +132,24 @@
})
})
},
//团购规则
getRule() {
let url = '/wxapp/public/arc_group'
let params = {}
let header = {
"XX-Token": wx.getStorageSync('token')
}
app.post(url, {}, {}).then((res) => {
console.log('团购规则',res)
this.setData({
rule: res
})
})
},
//发起团购支付
wxPay(data) {
if (this.data.is_agree){
const self = this;
if (self.data.is_agree){
wx.requestPayment({
'timeStamp': data.timeStamp,
'nonceStr': data.nonceStr,
... ... @@ -148,8 +163,12 @@
icon: 'success',
success: function () {
setTimeout(function () {
const params = {
rule: self.data.rule,
pay_info: self.data.pay_info,
}
wx.navigateTo({
url: '/pages/my/shareGroupBuy/shareGroupBuy',
url: '/pages/my/shareGroupBuy/shareGroupBuy?params=' + JSON.stringify(params),
})
}, 500)
}
... ... @@ -163,7 +182,7 @@
icon:'none'
})
}
},
... ...
... ... @@ -99,9 +99,10 @@
<view class='list_label'>长按兑换码即可复制</view>
</view>
</view>
<view class='list_tab list_content' wx:for='{{[1,2,3]}}' wx:key=''>
<view class='list_tab_item'>2018.10.10</view>
<view class='list_tab_item'>未兑换</view>
<view class='list_tab list_content' wx:for='{{recordList}}' wx:key=''>
<view class='list_tab_item' wx:if="{{item.group_status == 1}}">{{item.complete_time}}</view>
<view class='list_tab_item' wx:if="{{item.group_status == 0}}">{{item.over_time}}</view>
<view class='list_tab_item'>{{item.group_status == 1?'已完成':'未完成'}}</view>
<view class='list_tab_item'>
<text selectable='true' bindlongtap='copy'>{{chargenum}}</text>
</view>
... ... @@ -122,8 +123,8 @@
<view class='list_title_info'>
<view class='iconfont icon-zhongdian'> </view>
<view>
<view>团购规则说明</view>
<view class='content_info'>如果因为环境网络问题或者其他原因导致无法打卡，请上传照 片及文字申诉内容，证明您已到场并已经参与活动。</view>
<view>{{rule.title}}</view>
<view class='content_info'>{{rule.description}}</view>
</view>
</view>
<view class='service_box'>
... ...
... ... @@ -366,6 +366,7 @@ page {
align-items: center;
justify-content: center;
border-radius: 0;
margin:0;
}
.pay_btn::after {
... ...
... ... @@ -33,7 +33,6 @@ Page({
})
})
},
/**
* 生命周期函数--监听页面加载
*/
... ... @@ -89,7 +88,36 @@ Page({
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
onShareAppMessage: function () {
let that = this;
var id=wx.getStorageSync('id')
// 设置菜单中的转发按钮触发转发事件时的转发内容
var shareObj = {
title: '科学队长', // 默认是小程序的名称(可以写slogan等)
path: '/pages/my/takeGroupBuy/takeGroupBuy?id=' + id, // 默认是当前页面，必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
success: function (res) {
if (res.errMsg == 'shareAppMessage:ok') { }
},
fail: function () {
// 转发失败之后的回调
if (res.errMsg == 'shareAppMessage:fail cancel') {
// 用户取消转发
} else if (res.errMsg == 'shareAppMessage:fail') {
// 转发失败，其中 detail message 为详细失败信息
}
},
complete: function () {
// 转发结束之后的回调（转发成不成功都会执行）
}
}
// 来自页面内的按钮的转发
// if (option.from == 'button') {
// // 此处可以修改 shareObj 中的内容
// // shareObj.imageUrl = '/pages/shareimg/share.png'
// }　　 // 返回shareObj
return shareObj;
},
})
\ No newline at end of file
... ...
... ... @@ -2,103 +2,120 @@
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
imgsUrl: ['../../../images/aicon_09@2x.png', '../../../images/aicon_09@2x.png', '../../../images/aicon_09@2x.png'],
swipercurrent: 0,
},
//获取轮播当前页
swiperCharge(e) {
console.log(e)
this.setData({
swipercurrent: e.detail.current
})
},
myCardList(){
let url ='/user/Student/student_card'
let params={}
let header={
"XX-Token":wx.getStorageSync('token')
}
app.post(url,params,header).then((res)=>{
console.log(res)
})
},
//跳转预约记录
record() {
wx.navigateTo({
url: '../appointmentRecord/appointmentRecord',
})
},
//立即购买
buyCard() {
wx.navigateTo({
url: '../buyCard/buyCard',
})
},
//团购畅玩卡
groupBuy() {
wx.navigateTo({
url: '../groupBuy/groupBuy',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
this.myCardList()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
/**
* 页面的初始数据
*/
data: {
default_card:[],
imgsUrl: [],
swipercurrent: 0,
current_student: 0,
},
//获取轮播当前页
swiperCharge(e) {
console.log(e.detail.current)
this.setData({
swipercurrent: e.detail.current,
current_student: e.detail.current,
})
},
myCardList() {
let url = '/user/Student/student_card'
let params = {}
let header = {
"XX-Token": wx.getStorageSync('token')
}
app.post(url, params, header).then((res) => {
console.log(res);
this.setData({imgsUrl: res.list, service: res.service})
})
},
//畅玩卡说明
card() {
let url = '/wxapp/public/arc_card'
let params = {}
let header = {
"XX-Token": wx.getStorageSync('token')
}
app.post(url, {}, {}).then((res) => {
console.log('畅玩卡说明',res);
this.setData({service: res})
})
},
//跳转预约记录
record() {
wx.navigateTo({
url: '../appointmentRecord/appointmentRecord?student_id=' + this.data.imgsUrl[this.data.current_student].id,
})
},
//立即购买
buyCard() {
wx.navigateTo({
url: '../buyCard/buyCard',
})
},
//团购畅玩卡
groupBuy() {
wx.navigateTo({
url: '../groupBuy/groupBuy',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.myCardList();
this.card();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
<!--pages/myCard/myCard.wxml-->
<block>
<view class='banner_box'>
<swiper class='swiper_box' wx:key='' interval='2000' duration='500' current='{{swipercurrent}}' bindchange='swiperCharge'>
<swiper-item class="banner_img" wx:for='{{imgsUrl}}' wx:key=''>
<swiper class='swiper_box' interval='2000' duration='500' current='{{swipercurrent}}' bindchange='swiperCharge'>
<swiper-item class="banner_img" wx:for='{{imgsUrl || default_card}}' wx:key='index'>
<!-- <image class='swiper_img' src='{{item}}'> -->
<view class='img_top'>
<view class='logo_title'>畅玩卡</view>
<view>20180101-20190102</view>
<view class='logo_title' wx:if="{{imgsUrl.length>0}}">{{item.name}}的畅玩卡</view>
<view class='logo_title' wx:else>畅玩卡</view>
<view wx:if="{{imgsUrl.length>0}}">{{item.start_time}}至{{item.over_time}}</view>
<view wx:else>暂无购买畅玩卡</view>
</view>
<view class='img_info'>
<view class='info_title'>畅玩卡说明：</view>
<view>1.年卡只限本人使用年卡只限本人使用年卡只限本人使用年卡只限 本人使用年卡只限本人使用年卡只
</view>
<view>2.年卡只限本人使用年卡只限本人使用</view>
<view>3.年卡只限本人使用年卡只限本人使用年卡只限本人使用年本人使 用本人使用仅限</view>
<view class='info_title'>{{service.title}}：</view>
<view>{{service.description}}</view>
<!--<view>1.年卡只限本人使用年卡只限本人使用年卡只限本人使用年卡只限 本人使用年卡只限本人使用年卡只-->
<!--</view>-->
<!--<view>2.年卡只限本人使用年卡只限本人使用</view>-->
<!--<view>3.年卡只限本人使用年卡只限本人使用年卡只限本人使用年本人使 用本人使用仅限</view>-->
</view>
<!-- </image> -->
</swiper-item>
</swiper>
<view class='indicator_dots'>
<block wx:for='{{imgsUrl}}' wx:key=''>
<block wx:for='{{imgsUrl}}' wx:key='index'>
<view class="dot {{ index == swipercurrent ? 'dot_active':''}}"></view>
</block>
</view>
</view>
<view class='content_box'>
<view class='item_list' bindtap='record'>
<view class='item_list' bindtap='record' wx:if="{{imgsUrl.length>0}}">
<view class='list_title'>预约记录</view>
</view>
<view class='item_list' bindtap='buyCard'>
... ...
... ... @@ -21,6 +21,9 @@ page {
border-radius: 20rpx;
overflow: hidden;
background-image: url('http://science.w.bronet.cn/static/images/background.png');
background-repeat: no-repeat;
-webkit-background-size: 100%;
background-size: 100%;
position: relative;
}
... ...
... ... @@ -16,38 +16,45 @@ Page({
},
state_data: {
is_showSuccessModal: false,
icon: '../../../images/success.png',
title:'恭喜您!',
content: '您已经预约成功!'
},
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}],
student_list: [],
is_choose: false,
num_arr: [],
session_info: {},
student_num: 5,
student_num: 0,
is_choose_student: false,
is_buy: false,
choose_student_id:0,
// checked_student: [],
page_number: 1,
has_more: true,
},
//获取学员列表
getStudentList() {
if(!this.data.has_more) return;
this.setData({has_more: false});
let url = '/user/Student/student_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
page: 1,
page: this.data.page_number,
};
app.post(url,params,header).then((res) => {
console.log('学员列表',res);
if(res.this_page < res.total_page) {
this.setData({has_more: true});
}
// console.log('list', list);
var new_arr = [];
res.list.forEach((item) => {
new_arr.push({ ...item, checked: false })
});//给每一项添加checked属性
console.log(new_arr);
this.setData({student_list: new_arr})
this.setData({student_list:this.data.student_list.concat(new_arr)})
})
},
//选择学员(待确认可选)
... ... @@ -67,7 +74,7 @@ Page({
console.log('new_arr',new_arr);
var new_itmes = new_arr;
console.log('new_itmes', new_itmes);
if(that.data.detail.num >=2) {//两个学员预约时
if(that.data.detail.num >=2) { //两个学员预约时
console.log('两个学员');
if (index_arr.length > 2) {
//取出倒数两个值
... ... @@ -89,13 +96,32 @@ Page({
that.setData({student_id: id_arr.join(','),is_choose_student:true});
console.log('student_id', that.data.student_id);
} else {
const checked_student = [];
//被选中少于两个，直接设置被选中
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,is_choose_student:true});
console.log('选一个时候new_itmes', new_itmes);
new_itmes.forEach((item) => {
if(item.checked) {
checked_student.push(item)
}
});
console.log('选择学员length', checked_student,checked_student.length);
if(checked_student.length>=2) {
const arr = [];
new_itmes.forEach((item) => {
if(item.checked) {
arr.push(item.id)
}
});
that.setData({student_id: arr.join(','),is_choose_student:true});
}else if(checked_student.length<2){
wx.showToast({title:'请选择两个学员!',icon:'none'});
that.setData({student_id: new_itmes[key].id,is_choose_student:true});
}
console.log('student_id', that.data.student_id);
}
}else if(that.data.detail.num <2){//一个学员预约时
... ... @@ -150,12 +176,12 @@ Page({
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'})
wx.navigateTo({url: '/pages/my/buyCard/buyCard?from_appointment=' + true})
},
modalConfirm() {
this.setData({'state_data.is_showSuccessModal': false})
wx.redirectTo({url: '/pages/my/all-appointment/all-appointment?currentTab=' + 2})
},
disableScroll() {},
addStudent() {
... ... @@ -163,6 +189,7 @@ Page({
},
//获取预约详情
getAppointmentInfo() {
console.log('this.data.student_list', this.data.student_list);
let url = '/user/Reservation/reservation_detail';
let header = {
"XX-token": wx.getStorageSync('token')
... ... @@ -171,15 +198,45 @@ Page({
reservation_id: this.data.reservation_id,
};
app.post(url,params,header).then((res) => {
console.log('预约详情',res);
console.log('预约详情',res.info.status === 1);
this.setData({
detail: res.info,
});
if(this.data.detail.status === 1) {
if(this.data.detail.status === 1 && !this.data.is_buy) {
console.log('111111111111111');
this.getStudentList();
}
});
},
//更新购买状态
refreshBuyState() {
console.log('更新购买状态---学生id--人数',this.data.detail.num,this.data.is_buy,this.data.choose_student_id);
if(this.data.is_buy) {
if(this.data.detail.num<2) {
this.data.student_list.forEach((item) => {
item.checked = false;
if (item.id === this.data.choose_student_id) {
console.log('item.id', item.id);
item.checked = true;
}
});
this.setData({student_list:this.data.student_list,is_choose_student:true})
console.log('student_list',this.data.student_list);
}else if(this.data.detail.num>=2) {
console.log('购买完进入两个学员student_list',this.data.student_list);
this.data.student_list.forEach((item) => {
item.checked = false;
if (item.id === this.data.choose_student_id) {
console.log('item.id', item.id);
item.checked = true;
// total_student_num.push(item)
}
});
this.setData({student_list:this.data.student_list,is_choose_student:true,});
console.log('student_list',this.data.student_list);
}
}
},
//取消
clickCancel(e) {
console.log('取消',e);
... ... @@ -203,6 +260,9 @@ Page({
wx.showToast({title: '请添加学员!',icon:'none'})
}else if(!this.data.is_choose_student) {
wx.showToast({title: '请选择学员!',icon:'none'})
}else if(this.data.detail.num>=2 && ('' + this.data.student_id).indexOf(',') === -1) {
console.log('检验student_id',('' + this.data.student_id).indexOf(','));
wx.showToast({title:'请选择两个学员!',icon:'none'})
}else {
// this.setData({'modal_data.is_showModal': true})
let url = '/portal/Experiment/confirm_session_submit';
... ... @@ -251,9 +311,16 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
console.log('show');
console.log('show-buy',this.data.has_more,this.data.is_buy);
const self = this;
self.setData({is_choose_student: false});
self.getAppointmentInfo();
if(!self.data.is_buy) {
self.setData({has_more:true,page_number:1,student_list:[]});
self.getStudentList();
}else {
self.setData({is_choose_student: true});
}
setTimeout(function() {
self.setData({
show: true
... ... @@ -286,7 +353,15 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
if (this.data.has_more) {
this.data.page_number++;
this.getStudentList();
} else {
wx.showToast({
title: '没有更多数据了~',
icon: 'none'
});
}
},
/**
... ...
... ... @@ -42,7 +42,7 @@
<!--<image src="../../../images/choose_icon.png" wx:if="{{item.is_choose}}" class="check-icon"></image>-->
<!--</view>-->
<checkbox-group class="check-box" bindchange="{{detail.status === 1?'chooseChildren':''}}">
<label class="checkbox" wx:for="{{detail.status === 1?student_list:detail.reservation_student}}" wx:for-item="i" wx:key="index">
<label class="checkbox" wx:for="{{detail.status == 1?student_list:detail.reservation_student}}" wx:for-item="i" wx:key="index">
<view class="name {{i.checked?'change-color':''}}">{{i.name}}</view>
<checkbox wx:if="{{detail.status === 1}}" value="{{index}}" checked="{{i.checked}}" id="{{i.id}}" name="student_id" class="checkbox"/>
</label>
... ...
... ... @@ -16,7 +16,7 @@
}
.footer-box1, .footer-box2 {
width: 100%;
position: absolute;
position: fixed;
bottom: 0;
left: 0;
}
... ...
... ... @@ -12,7 +12,8 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log('options', options);
this.setData({params: options.params?JSON.parse(options.params):''})
},
/**
... ...
... ... @@ -2,19 +2,19 @@
<view class='banner_box'>
<view>
<text>团购人数：</text>
<text class='banner_num'>3人</text>
<text class='banner_num'>{{params.pay_info.num}}人</text>
</view>
<view>
<text>发布倒计时：</text>
<text class='banner_num'>3小时</text>
<text class='banner_num'>{{params.pay_info.time}}小时</text>
</view>
</view>
<view class='content_box'>
<view class='list_title_info'>
<view class='iconfont icon-zhongdian'> </view>
<view>
<view>团购规则说明</view>
<view class='content_info'>如果因为环境网络问题或者其他原因导致无法打卡，请上传照 片及文字申诉内容，证明您已到场并已经参与活动。</view>
<view>{{params.rule.title}}</view>
<view class='content_info'>{{params.rule.description}}</view>
</view>
</view>
<view class='service_box'>
... ... @@ -24,8 +24,8 @@
<!-- <text class='service_info' bindtap='serviceProtocol'>服务协议</text> -->
</view>
<view class='service_btn_box'>
<view>参与团购单价：¥188.00</view>
<button open-type='share' class='pay_btn' bindtap='goPay'>分享好友</button>
<view>参与团购单价：¥{{params.pay_info.price}}</view>
<button open-type='share' class='pay_btn'>分享好友</button>
</view>
</view>
... ...