miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 ff2648f837800f82b0844733cd86e145041fe72f 1 个父辈 5c654f0d

添加默认图，测试用

内嵌 并排对比
正在显示 7 个修改的文件 包含 204 行增加 和 271 行删除
<?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="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/clock/clock.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/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" />
<change beforePath="$PROJECT_DIR$/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -41,48 +22,48 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="18" />
<entry key="project.closed" value="20" />
<entry key="project.open.time.0" value="6" />
<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.2" value="3" />
<entry key="project.open.time.8" value="2" />
<entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="20" />
<entry key="project.open.time.9" value="2" />
<entry key="project.opened" value="22" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="163" />
<entry key="js" value="169" />
<entry key="json" value="31" />
<entry key="wxml" value="129" />
<entry key="wxml" value="133" />
<entry key="wxss" value="51" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="51" />
<entry key="HTML" value="129" />
<entry key="HTML" value="133" />
<entry key="JSON" value="31" />
<entry key="JavaScript" value="163" />
<entry key="JavaScript" value="169" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="15129" />
<entry key="js" value="15197" />
<entry key="json" value="158" />
<entry key="txt" value="288" />
<entry key="wxml" value="3443" />
<entry key="txt" value="436" />
<entry key="wxml" value="3633" />
<entry key="wxss" value="1590" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="1590" />
<entry key="HTML" value="3443" />
<entry key="HTML" value="3633" />
<entry key="JSON" value="158" />
<entry key="JavaScript" value="15129" />
<entry key="PLAIN_TEXT" value="288" />
<entry key="JavaScript" value="15197" />
<entry key="PLAIN_TEXT" value="436" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
... ... @@ -94,102 +75,107 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<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" />
<state relative-caret-position="2530">
<caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
<folding>
<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/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/my/shareGroupBuy/shareGroupBuy.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="792">
<caret line="36" column="50" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="3564">
<caret line="162" column="79" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="79" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/index.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 relative-caret-position="1694">
<caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state 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 relative-caret-position="418">
<caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#view#0;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#view#1;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#image#0;n#view#1;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<provider selected="true" editor-type-id="text-editor">
<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 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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="264">
<caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js">
<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="-28">
<caret line="89" column="5" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
<state relative-caret-position="7942">
<caret line="361" column="28" lean-forward="true" selection-start-line="361" selection-start-column="28" selection-end-line="361" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="1672">
<caret line="76" column="28" selection-start-line="76" selection-start-column="28" selection-end-line="76" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>getAppointmentList</find>
<find>modal</find>
<find>refreshBuyState</find>
<find>getAppointmentInfo</find>
<find>student_id</find>
... ... @@ -213,12 +199,17 @@
<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>recordList</find>
<find>page_number</find>
<find>delStudent</find>
</findStrings>
<dirStrings>
<dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
... ... @@ -239,7 +230,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/app.wxss" />
... ... @@ -261,7 +251,6 @@
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<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 +258,6 @@
<option value="$PROJECT_DIR$/pages/index/index.wxss" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
<option value="$PROJECT_DIR$/pages/my/my.wxss" />
<option value="$PROJECT_DIR$/pages/index/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" />
... ... @@ -289,7 +277,10 @@
<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/index/index.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
</list>
</option>
</component>
... ... @@ -332,27 +323,6 @@
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppeal" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppealDetail" 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="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppealDetail2" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -373,22 +343,7 @@
<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" />
... ... @@ -409,35 +364,14 @@
<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="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" />
<item name="myProfile" 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" />
<item name="protocol" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -507,7 +441,9 @@
<workItem from="1544751555564" duration="3866000" />
<workItem from="1545014617044" duration="13676000" />
<workItem from="1545095024314" duration="3201000" />
<workItem from="1545181336636" duration="25141000" />
<workItem from="1545181336636" duration="27359000" />
<workItem from="1545267535141" duration="7730000" />
<workItem from="1545354042642" duration="610000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -572,11 +508,18 @@
<option name="project" value="LOCAL" />
<updated>1545025106365</updated>
</task>
<option name="localTasksCounter" value="10" />
<task id="LOCAL-00010" summary="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑">
<created>1545209715916</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1545209715916</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="232245000" />
<option name="totallyTimeSpent" value="242803000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -595,7 +538,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.5791757" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.5780911" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -643,37 +586,10 @@
<MESSAGE value="预约详情页接口，删除学员，添加formid" />
<MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
<MESSAGE value="申诉详情，二次申诉" />
<option name="LAST_COMMIT_MESSAGE" value="申诉详情，二次申诉" />
<MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
<option name="LAST_COMMIT_MESSAGE" value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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/activity-detail/activity-detail.js">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
... ... @@ -739,9 +655,6 @@
<provider selected="true" editor-type-id="text-editor">
<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>
... ... @@ -752,35 +665,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="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="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#5118#5452#0" />
<element signature="e#5495#5588#0" />
<element signature="e#5610#5695#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<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>
... ... @@ -791,13 +679,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<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/clock/punchAppealDetail/punchAppealDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
... ... @@ -823,12 +704,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1731">
<caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
<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>
... ... @@ -874,27 +749,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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/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/my/buyCard/buyCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
... ... @@ -906,10 +760,6 @@
<provider selected="true" editor-type-id="text-editor">
<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="e#1630#5581#0" />
<element signature="e#6965#7419#0" />
</folding>
</state>
</provider>
</entry>
... ... @@ -951,69 +801,135 @@
<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">
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<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 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/shareGroupBuy/shareGroupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74">
<state relative-caret-position="1386">
<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/my/takeGroupBuy/takeGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2024">
<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="1364">
<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/my/groupBuy/groupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2332">
<caret line="106" column="73" selection-start-line="106" selection-start-column="73" selection-end-line="106" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="740">
<state relative-caret-position="1254">
<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/my/groupBuyDetail/groupBuyDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-28">
<state relative-caret-position="1958">
<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/shareGroupBuy/shareGroupBuy.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="154">
<caret line="24" column="22" lean-forward="true" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="2530">
<caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
<folding>
<element signature="e#152#1691#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.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 relative-caret-position="792">
<caret line="36" column="50" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="3564">
<caret line="162" column="79" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<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" />
<state relative-caret-position="1694">
<caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />
<folding>
<element signature="e#152#1691#0" />
<element signature="e#4857#8107#0" />
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7942">
<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/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1672">
<caret line="76" column="28" selection-start-line="76" selection-start-column="28" selection-end-line="76" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#view#0;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#view#1;n#view#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#image#0;n#view#1;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ...
... ... @@ -102,6 +102,7 @@ Page({
},
//打卡
punch() {
console.log('city', wx.getStorageSync('city'));
if(wx.getStorageSync('city') !== '') {
if (this.data.test.name !== '') {
let url = '/portal/Experiment/user_sign';
... ... @@ -153,10 +154,16 @@ Page({
};
app.post(url, params, header).then((res) => {
console.log('获取用户所在实验室', res);
this.setData({
test: res
});
// this.punch();
if(res === undefined) {
this.setData({
['test.name']: ''
});
}else {
this.setData({
test: res
});
// this.punch();
}
})
},
//打卡页面获取位置授权
... ...
... ... @@ -56,6 +56,11 @@ page {
padding: 80rpx;
box-sizing: border-box;
}
.circle_small text {
/* width:90rpx; */
/* height:90rpx; */
text-align: center;
}
.icon-dui{
font-size: 90rpx;
}
... ...
<!--pages/index/activity-detail/activity-detail.wxml-->
<view class="content">
<view class="head">
<view class="head" style="border-bottom: 20rpx solid #f2f2f2">
<view class="img_box">
<image src="{{detail.thumb}}" class="activity_img" mode="aspectFill"></image>
<!--<image src="{{detail.thumb}}" class="activity_img" mode="aspectFill"></image>-->
<image src="../../../images/test_img.jpg" class="activity_img" mode="aspectFill"></image>
</view>
<view class="title">
<view class="line"></view>
<view class="test_detail">
<text>{{detail.name}}</text>
<view class="describe">{{detail.description}}</view>
<text>科学队长实验室：雷电的产生！{{detail.name}}</text>
<view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。{{detail.description}}</view>
</view>
</view>
</view>
<view class="jiexi">解析长图
<view class="jiexi" style="margin-bottom: 150rpx">
<image src="../../../images/i.jpg" style="width:100%;height:100%;"></image>
<import src="/wxParse/wxParse.wxml"/>
<template is="wxParse" data="{{wxParseData:article.nodes}}"/>
</view>
... ...
... ... @@ -11,6 +11,7 @@ Page({
{'url': '../../images/banner.jpg'},
{'url': '../../images/banner.jpg'},
{'url': '../../images/banner.jpg'},],
imgs: [{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},],
cur: 0,
currentSwiper: 0,
autoplay: true, //是否自动轮播
... ...
... ... @@ -7,7 +7,7 @@
<view class="wrap">
<swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true"
bindchange="swiperChange" current="{{cur}}">
<block wx:for="{{imgUrls}}" wx:key="index">
<block wx:for="{{imgs}}" wx:key="index">
<swiper-item>
<navigator url="{{item.url}}" hover-class="navigator-hover">
<view class="index_top">
... ... @@ -18,7 +18,7 @@
</block>
</swiper>
<view class="dots">
<block wx:for="{{ imgUrls}}" wx:key="index" wx:for-index="idx">
<block wx:for="{{ imgs}}" wx:key="index" wx:for-index="idx">
<view class="dot{{idx == currentSwiper ? ' active' : ''}}"></view>
</block>
</view>
... ... @@ -53,7 +53,8 @@
<view class="test_box">
<view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view>
<view class="img_box">
<image src="{{this_week_test_info.thumb}}" mode="aspectFill"></image>
<!--<image src="{{this_week_test_info.thumb}}" mode="aspectFill"></image>-->
<image src="../../images/test_img.jpg" mode="aspectFill"></image>
</view>
</view>
<view class="order_box">
... ... @@ -73,7 +74,8 @@
<view class="test_box">
<view class="time">{{item.start_time}} - {{item.end_time}}</view>
<view class="img_box">
<image src="{{item.thumb}}" mode="aspectFill"></image>
<!--<image src="{{item.thumb}}" mode="aspectFill"></image>-->
<image src="../../images/test_img.jpg" mode="aspectFill"></image>
</view>
</view>
<view class="order_box">
... ...