miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 6e898ba50b9aefec317e1142916f599036a0b32d 2 个父辈 bda59fc5 96772064

合并分支 'wumengyu' 到 'master' 

Wumengyu



查看合并请求 !6
内嵌 并排对比
正在显示 7 个修改的文件 包含 242 行增加 和 174 行删除
<?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="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑">
<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.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.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/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/charge/charge.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/charge/charge.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/charge/charge.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/charge/charge.wxss" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -22,48 +21,49 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="20" />
<entry key="project.closed" value="23" />
<entry key="project.open.time.0" value="6" />
<entry key="project.open.time.1" value="8" />
<entry key="project.open.time.1" value="9" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.2" value="3" />
<entry key="project.open.time.8" value="2" />
<entry key="project.open.time.8" value="3" />
<entry key="project.open.time.9" value="2" />
<entry key="project.opened" value="22" />
<entry key="project.opened" value="25" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="169" />
<entry key="js" value="172" />
<entry key="json" value="31" />
<entry key="wxml" value="133" />
<entry key="wxss" value="51" />
<entry key="wxml" value="138" />
<entry key="wxss" value="54" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="51" />
<entry key="HTML" value="133" />
<entry key="CSS" value="54" />
<entry key="HTML" value="138" />
<entry key="JSON" value="31" />
<entry key="JavaScript" value="169" />
<entry key="JavaScript" value="172" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="15197" />
<entry key="js" value="15207" />
<entry key="json" value="158" />
<entry key="txt" value="436" />
<entry key="wxml" value="3633" />
<entry key="wxss" value="1590" />
<entry key="txt" value="451" />
<entry key="wxml" value="3774" />
<entry key="wxss" value="1627" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="1590" />
<entry key="HTML" value="3633" />
<entry key="CSS" value="1627" />
<entry key="HTML" value="3774" />
<entry key="JSON" value="158" />
<entry key="JavaScript" value="15197" />
<entry key="PLAIN_TEXT" value="436" />
<entry key="JavaScript" value="15207" />
<entry key="PLAIN_TEXT" value="451" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
... ... @@ -76,75 +76,64 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="531">
<caret line="106" column="11" lean-forward="true" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="292">
<caret line="67" column="32" lean-forward="true" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="319">
<caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />
<state relative-caret-position="800">
<caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<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 relative-caret-position="176">
<caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.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="242">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="3454">
<caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
</state>
</provider>
</entry>
... ... @@ -176,17 +165,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>refreshBuyState</find>
<find>getAppointmentInfo</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>
... ... @@ -206,6 +184,17 @@
<find>recordList</find>
<find>page_number</find>
<find>delStudent</find>
<find>swiper</find>
<find>兑换</find>
<find>mode=&quot;date&quot;</find>
<find>birth_date</find>
<find>default_birth</find>
<find>删除</find>
<find>wxparse</find>
<find>copy</find>
<find>chargenum</find>
<find>redeem_code</find>
<find>picker-box</find>
</findStrings>
<dirStrings>
<dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
... ... @@ -230,8 +219,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
<option value="$PROJECT_DIR$/templates/templates.wxss" />
... ... @@ -267,20 +254,22 @@
<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/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" />
<option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" />
<option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" />
<option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" />
<option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxml" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />
<option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />
</list>
</option>
</component>
... ... @@ -291,8 +280,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-3" />
<option name="y" value="1" />
<option name="x" value="416" />
<option name="y" value="15" />
<option name="width" value="1936" />
<option name="height" value="1047" />
</component>
... ... @@ -350,6 +339,13 @@
<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>
... ... @@ -357,6 +353,20 @@
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="charge" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="edit-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" />
<item name="groupBuy" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -364,6 +374,13 @@
<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="myProfile" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -443,7 +460,10 @@
<workItem from="1545095024314" duration="3201000" />
<workItem from="1545181336636" duration="27359000" />
<workItem from="1545267535141" duration="7730000" />
<workItem from="1545354042642" duration="610000" />
<workItem from="1545354042642" duration="5649000" />
<workItem from="1545441360042" duration="4461000" />
<workItem from="1545627102606" duration="3505000" />
<workItem from="1545700023575" duration="3152000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -515,14 +535,28 @@
<option name="project" value="LOCAL" />
<updated>1545209715916</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="添加默认图，测试用">
<created>1545356541300</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1545356541300</updated>
</task>
<task id="LOCAL-00012" summary="添加未购卡片">
<created>1545382588706</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1545382588706</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="242803000" />
<option name="totallyTimeSpent" value="258960000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
... ... @@ -538,7 +572,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.5780911" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.5759219" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -587,29 +621,11 @@
<MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
<MESSAGE value="申诉详情，二次申诉" />
<MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
<option name="LAST_COMMIT_MESSAGE" value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
<MESSAGE value="添加默认图，测试用" />
<MESSAGE value="添加未购卡片" />
<option name="LAST_COMMIT_MESSAGE" value="添加未购卡片" />
</component>
<component name="editorHistoryManager">
<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">
<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$/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>
<entry file="file://$PROJECT_DIR$/wxParse/showdown.js">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
... ... @@ -665,13 +681,6 @@
</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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
... ... @@ -763,13 +772,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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/my/appointmentRecord/appointmentRecord.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
... ... @@ -784,23 +786,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<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/myCard/myCard.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<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/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
... ... @@ -829,13 +814,6 @@
</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="1254">
... ... @@ -850,20 +828,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<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>
... ... @@ -888,6 +856,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
</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">
... ... @@ -895,6 +877,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
<folding>
<element signature="n#view#0;n#view#0;n#block#0;n#!!top" />
<element signature="n#swiper#0;n#view#0;n#block#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<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="65" lean-forward="true" selection-start-line="27" selection-start-column="65" selection-end-line="27" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" selection-start-line="29" selection-end-line="30" />
</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">
... ... @@ -922,15 +929,52 @@
<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">
<entry file="file://$PROJECT_DIR$/app.js">
<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 relative-caret-position="3454">
<caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="106" column="11" lean-forward="true" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="67" column="32" lean-forward="true" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="800">
<caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
</state>
</provider>
</entry>
... ...
... ... @@ -5,9 +5,11 @@
<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 class="box">
<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>
<view class="no-data" wx:if="{{record.length === 0}}">暂无记录</view>
... ...
... ... @@ -23,6 +23,9 @@ page {
left:0;
z-index:10;
}
.box {
margin-top: 100rpx;
}
.list_tab {
width: 100%;
display: flex;
... ... @@ -61,7 +64,6 @@ page {
border: 0;
padding: 15rpx 0;
z-index:1;
margin-top: 100rpx;
}
.list_content .list_tab_item {
... ...
... ... @@ -14,14 +14,16 @@
<view class='list_input'>
<view>绑定学员：</view>
<picker value='{{index}}' range='{{picker_list}}' bindchange='changePicker'>
<block wx:if='{{picker_list.length === 0}}'>
<input placeholder='点击右侧添加学员' placeholder-class='input_style' disabled='true'/>
</block>
<block wx:else>
<text>{{picker_list[index]}}</text>
</block>
<view class="picker-box">
<block wx:if='{{picker_list.length === 0}}'>
<input placeholder='点击右侧添加学员' placeholder-class='input_style' disabled='true'/>
</block>
<block wx:else>
<text>{{picker_list[index]}}</text>
</block>
<view class='iconfont icon-daosanjiao'></view>
</view>
</picker>
<view class='iconfont icon-daosanjiao'></view>
</view>
<view class='add_box' bindtap='addUser'>
<text class='iconfont icon-jia'></text>
... ...
... ... @@ -112,4 +112,9 @@ page {
}
.service_btn_box::after {
border: 0;
}
.picker-box {
display: flex;
align-items: center;
justify-content: space-between;
}
\ No newline at end of file
... ...
<!--pages/myCard/myCard.wxml-->
<block>
<view class='banner_box'>
<swiper class='swiper_box' interval='2000' duration='500' current='{{swipercurrent}}' bindchange='swiperCharge'>
<!--未购买畅玩卡-->
<view class="default-card" wx:if="{{imgsUrl.length === 0}}">
<view class="banner_img">
<view class='img_top'>
<view class='logo_title'>畅玩卡</view>
</view>
<view class='img_info'>
<view class='info_title'>{{service.title}}：</view>
<view>{{service.description}}</view>
</view>
</view>
</view>
<!--已购买畅玩卡-->
<swiper wx:if="{{imgsUrl.length > 0}}" 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'>
... ... @@ -21,7 +34,7 @@
<!-- </image> -->
</swiper-item>
</swiper>
<view class='indicator_dots'>
<view wx:if="{{imgsUrl.length > 0}}" class='indicator_dots'>
<block wx:for='{{imgsUrl}}' wx:key='index'>
<view class="dot {{ index == swipercurrent ? 'dot_active':''}}"></view>
</block>
... ...
... ... @@ -8,7 +8,7 @@ page {
position: relative;
}
.swiper_box {
.swiper_box, .default-card {
width: 100%;
height: 430rpx;
padding: 30rpx;
... ... @@ -20,7 +20,7 @@ page {
height: 370rpx;
border-radius: 20rpx;
overflow: hidden;
background-image: url('http://science.w.bronet.cn/static/images/background.png');
background-image: url('http://science.w.bronet.cn/static/images/card.png');
background-repeat: no-repeat;
-webkit-background-size: 100%;
background-size: 100%;
... ...