miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 a05a0cfa95182e0a2dd56846467fe2ab7ae8c173 1 个父辈 c02d6369

申诉，打卡，编辑删除学员，更换手机号

内嵌 并排对比
正在显示 21 个修改的文件 包含 1294 行增加 和 724 行删除
<?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="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/app.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/clock.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxml" 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/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/my.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/my.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -34,44 +33,45 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="7" />
<entry key="project.closed" value="8" />
<entry key="project.open.time.0" value="5" />
<entry key="project.open.time.1" value="3" />
<entry key="project.opened" value="8" />
<entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="9" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="38" />
<entry key="json" value="14" />
<entry key="wxml" value="34" />
<entry key="wxss" value="13" />
<entry key="js" value="52" />
<entry key="json" value="18" />
<entry key="wxml" value="46" />
<entry key="wxss" value="15" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="13" />
<entry key="HTML" value="34" />
<entry key="JSON" value="14" />
<entry key="JavaScript" value="38" />
<entry key="CSS" value="15" />
<entry key="HTML" value="46" />
<entry key="JSON" value="18" />
<entry key="JavaScript" value="52" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="4356" />
<entry key="json" value="117" />
<entry key="txt" value="89" />
<entry key="wxml" value="973" />
<entry key="wxss" value="742" />
<entry key="js" value="7079" />
<entry key="json" value="119" />
<entry key="txt" value="144" />
<entry key="wxml" value="1482" />
<entry key="wxss" value="805" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="742" />
<entry key="HTML" value="973" />
<entry key="JSON" value="117" />
<entry key="JavaScript" value="4356" />
<entry key="PLAIN_TEXT" value="89" />
<entry key="CSS" value="805" />
<entry key="HTML" value="1482" />
<entry key="JSON" value="119" />
<entry key="JavaScript" value="7079" />
<entry key="PLAIN_TEXT" value="144" />
</counts>
</usages-collector>
</session>
... ... @@ -79,94 +79,86 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" />
<state relative-caret-position="30">
<caret line="10" column="34" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="41" column="16" lean-forward="true" selection-start-line="41" selection-start-column="16" selection-end-line="51" selection-end-column="18" />
<state relative-caret-position="654">
<caret line="99" column="61" lean-forward="true" selection-start-line="99" selection-start-column="61" selection-end-line="99" selection-end-column="61" />
</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$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="586">
<caret line="58" column="62" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="62" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="308">
<caret line="14" column="34" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="99" lean-forward="true" selection-start-line="13" selection-start-column="99" selection-end-line="13" selection-end-column="99" />
<state relative-caret-position="726">
<caret line="120" column="37" selection-start-line="120" selection-start-column="37" selection-end-line="120" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="39" column="6" lean-forward="true" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />
</state>
</provider>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364">
<caret line="62" selection-start-line="62" selection-end-line="62" />
<state relative-caret-position="256">
<caret line="127" column="11" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="806">
<caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
<state relative-caret-position="638">
<caret line="29" column="23" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" />
<state relative-caret-position="369">
<caret line="65" selection-start-line="65" selection-end-line="104" selection-end-column="6" />
<folding>
<element signature="e#1785#3272#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
<state relative-caret-position="330">
<caret line="15" column="25" lean-forward="true" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
</state>
</provider>
</entry>
... ... @@ -175,13 +167,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>show_submit_btn</find>
<find>current_test_id</find>
<find>experiment_id</find>
<find>chil</find>
<find>bindPickerChange</find>
<find>check-box</find>
<find>form</find>
<find>skin</find>
<find>verification_code</find>
<find>add</find>
... ... @@ -205,6 +190,13 @@
<find>@import</find>
<find>tips</find>
<find>changeStudent</find>
<find>getLocation</find>
<find>punchState</find>
<find>upload_item</find>
<find>tempFilePaths</find>
<find>is_bingding</find>
<find>punch</find>
<find>checkMobile</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -218,25 +210,20 @@
<option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" />
<option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml" />
<option value="$PROJECT_DIR$/pages/my/my.js" />
<option value="$PROJECT_DIR$/pages/my/protocol/protocol.js" />
<option value="$PROJECT_DIR$/pages/my/protocol/protocol.wxml" />
<option value="$PROJECT_DIR$/pages/my/my.wxml" />
<option value="$PROJECT_DIR$/pages/my/my.wxss" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/utils/util.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
<option value="$PROJECT_DIR$/project.config.json" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
<option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" />
... ... @@ -244,14 +231,30 @@
<option value="$PROJECT_DIR$/app.wxss" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.json" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
<option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" />
<option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
<option value="$PROJECT_DIR$/pages/my/my.wxml" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/my/my.js" />
<option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.json" />
<option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml" />
<option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.wxss" />
<option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.js" />
<option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" />
<option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" />
</list>
</option>
</component>
... ... @@ -272,6 +275,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -288,12 +292,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" />
</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>
... ... @@ -316,13 +314,6 @@
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="go-appointment" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="phone-code" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -336,21 +327,14 @@
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="all-appointment" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="buyCard" type="462c0819:PsiDirectoryNode" />
<item name="chargePhoneNum" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="charge" type="462c0819:PsiDirectoryNode" />
<item name="myProfile" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -379,12 +363,11 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="D:/project/life" />
<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" />
... ... @@ -425,7 +408,8 @@
<workItem from="1543403978629" duration="164000" />
<workItem from="1543975238201" duration="27150000" />
<workItem from="1544059385784" duration="3563000" />
<workItem from="1544062971616" duration="13337000" />
<workItem from="1544062971616" duration="25513000" />
<workItem from="1544145384377" duration="6854000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -455,11 +439,18 @@
<option name="project" value="LOCAL" />
<updated>1543978774318</updated>
</task>
<option name="localTasksCounter" value="5" />
<task id="LOCAL-00005" summary="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid">
<created>1544079539745</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1544079539745</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62671000" />
<option name="totallyTimeSpent" value="81701000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -521,357 +512,361 @@
<MESSAGE value="上传到远程wumengyu" />
<MESSAGE value="登录注册，绑定手机号，获取验证码，轮播图，本周实验，往期实验，立即预约，实验详情" />
<MESSAGE value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" />
<option name="LAST_COMMIT_MESSAGE" value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" />
<MESSAGE value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" />
<option name="LAST_COMMIT_MESSAGE" value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="34" selection-start-column="34" selection-end-column="34" />
<state relative-caret-position="286">
<caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxss">
<entry file="file://$PROJECT_DIR$/utils/qqmap-wx-jssdk.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="42" selection-start-line="42" selection-end-line="59" selection-end-column="1" />
<state relative-caret-position="22">
<caret line="1" column="110" lean-forward="true" selection-start-line="1" selection-start-column="110" selection-end-line="1" selection-end-column="110" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.json">
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
<state relative-caret-position="308">
<caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
<state relative-caret-position="462">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.json">
<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/buyCard/buyCard.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="15" lean-forward="true" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
<state relative-caret-position="22">
<caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="34" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
<state relative-caret-position="1254">
<caret line="57" column="43" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<state relative-caret-position="330">
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="7" lean-forward="true" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" />
<state relative-caret-position="1314">
<caret line="60" column="15" lean-forward="true" selection-start-line="60" selection-start-column="15" selection-end-line="60" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.js">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
<state relative-caret-position="852">
<caret line="227" selection-start-line="227" selection-end-line="245" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
<entry file="file://$PROJECT_DIR$/app.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<state relative-caret-position="1188">
<caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="33" lean-forward="true" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
<state relative-caret-position="533">
<caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
<state relative-caret-position="522">
<caret line="30" column="40" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/util.js">
<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="286">
<caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
<state relative-caret-position="674">
<caret line="35" column="64" selection-end-line="62" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/qqmap-wx-jssdk.min.js">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="110" lean-forward="true" selection-start-line="1" selection-start-column="110" selection-end-line="1" selection-end-column="110" />
<state>
<caret selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.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="1166">
<caret line="53" column="31" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
<state relative-caret-position="498">
<caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/project.config.json">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<state relative-caret-position="22">
<caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="137" column="38" lean-forward="true" selection-start-line="140" selection-start-column="4" selection-end-line="140" selection-end-column="12" />
<state relative-caret-position="806">
<caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<caret line="77" column="39" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="39" />
<state relative-caret-position="1364">
<caret line="62" selection-start-line="62" selection-end-line="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
<state relative-caret-position="88">
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="115" selection-start-line="11" selection-start-column="98" selection-end-line="11" selection-end-column="115" />
<state relative-caret-position="630">
<caret line="37" column="41" selection-start-line="37" selection-start-column="41" selection-end-line="37" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.json">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
<state relative-caret-position="499">
<caret line="104" column="15" selection-start-line="104" selection-start-column="15" selection-end-line="104" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1254">
<caret line="57" column="43" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="43" />
<state relative-caret-position="698">
<caret line="50" column="27" lean-forward="true" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="27" column="44" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="44" />
<state relative-caret-position="506">
<caret line="104" column="37" lean-forward="true" selection-start-line="104" selection-start-column="37" selection-end-line="104" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
<state relative-caret-position="66">
<caret line="3" column="45" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="107" column="26" lean-forward="true" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="26" />
<state relative-caret-position="1116">
<caret line="53" column="31" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
<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="330">
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
<state relative-caret-position="1496">
<caret line="68" column="61" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1314">
<caret line="60" column="15" lean-forward="true" selection-start-line="60" selection-start-column="15" selection-end-line="60" selection-end-column="15" />
<state relative-caret-position="836">
<caret line="38" column="47" selection-start-line="38" selection-start-column="47" selection-end-line="38" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="852">
<caret line="227" selection-start-line="227" selection-end-line="245" selection-end-column="8" />
<state relative-caret-position="2662">
<caret line="122" column="24" selection-start-line="122" selection-start-column="13" selection-end-line="122" selection-end-column="24" />
<folding>
<element signature="e#401#1280#0" />
<element signature="e#402#613#0" />
<element signature="e#621#832#0" />
<element signature="e#840#1052#0" />
<element signature="e#1060#1273#0" />
<element signature="e#1292#2413#0" />
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="144" column="16" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" />
<state relative-caret-position="4290">
<caret line="195" column="24" selection-start-line="195" selection-start-column="24" selection-end-line="195" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1188">
<caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
<state relative-caret-position="1870">
<caret line="118" selection-start-line="118" selection-end-line="136" selection-end-column="6" />
<folding>
<element signature="e#251#4820#1" expanded="true" />
<element signature="e#1497#2725#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="533">
<caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
<state relative-caret-position="66">
<caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/my.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="30" column="40" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="40" />
<state relative-caret-position="1738">
<caret line="79" selection-start-line="79" selection-end-line="89" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="674">
<caret line="35" column="64" selection-end-line="62" selection-end-column="7" />
<state relative-caret-position="66">
<caret line="3" column="76" selection-start-line="3" selection-start-column="76" selection-end-line="3" selection-end-column="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.json">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="19" lean-forward="true" selection-end-line="50" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.json">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="566">
<caret line="68" column="61" lean-forward="true" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" />
<state relative-caret-position="22">
<caret line="1" column="31" selection-start-line="1" selection-start-column="31" selection-end-line="1" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" />
<state relative-caret-position="22">
<caret line="1" column="76" selection-start-line="1" selection-start-column="76" selection-end-line="1" selection-end-column="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" />
<state relative-caret-position="154">
<caret line="90" column="28" lean-forward="true" selection-start-line="90" selection-start-column="28" selection-end-line="90" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
<state relative-caret-position="-30">
<caret line="15" column="69" selection-start-line="15" selection-start-column="69" selection-end-line="15" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
<provider selected="true" editor-type-id="text-editor" />
</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="806">
<caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
<state relative-caret-position="654">
<caret line="99" column="61" lean-forward="true" selection-start-line="99" selection-start-column="61" selection-end-line="99" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364">
<caret line="62" selection-start-line="62" selection-end-line="62" />
<state relative-caret-position="30">
<caret line="10" column="34" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
<state relative-caret-position="330">
<caret line="15" column="25" lean-forward="true" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="586">
<caret line="58" column="62" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="62" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="308">
<caret line="14" column="34" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="99" lean-forward="true" selection-start-line="13" selection-start-column="99" selection-end-line="13" selection-end-column="99" />
<state relative-caret-position="256">
<caret line="127" column="11" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="333">
<caret line="41" column="16" lean-forward="true" selection-start-line="41" selection-start-column="16" selection-end-line="51" selection-end-column="18" />
<state relative-caret-position="369">
<caret line="65" selection-start-line="65" selection-end-line="104" selection-end-column="6" />
<folding>
<element signature="e#1785#3272#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="23" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="39" column="6" lean-forward="true" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />
<state relative-caret-position="726">
<caret line="120" column="37" selection-start-line="120" selection-start-column="37" selection-end-line="120" selection-end-column="37" />
</state>
</provider>
</entry>
... ...
... ... @@ -26,7 +26,8 @@
"pages/clock/punchAppealDetail2/punchAppealDetail2",
"pages/clock/punchAppealDetail/punchAppealDetail",
"pages/clock/punchAppeal/punchAppeal",
"pages/clock/clock"
"pages/clock/clock",
"pages/my/edit-student/edit-student"
],
"window": {
"backgroundTextStyle": "light",
... ...
// pages/clock/clock.js
const app =getApp();
const app = getApp();
// 引入SDK核心类
var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js');
var getLocation = function (self) {//当第一次未授权时需要重新调用此接口
wx.getLocation({
type: 'wgs84',
success: function (res) {
console.log('再次授权结果', res);
self.setData({
latitude: res.latitude,
longitude: res.longitude
});
var latitude = res.latitude;
var longitude = res.longitude;
// 实例化API核心类
var demo = new QQMapWX({
key: 'CLVBZ-KHZKP-KWLDW-VDJTA-QVUST-XOBVO' // 必填
});
// 调用接口
demo.reverseGeocoder({
location: {
latitude: res.latitude,//纬度
longitude: res.longitude//经度
},
success: function (res) {
console.log('城市', res);
let params = {
city: res.result.address_component.city,
lat: latitude,//纬度
lng: longitude,//经度
};
self.postPosition(params);
},
fail: function (res) {
console.log(res);
},
complete: function (res) {
// console.log(res);
}
});
},
fail: function () {
wx.showToast({
title: '授权失败',
icon: 'none',
duration: 1000
})
}
})
}
Page({
/**
... ... @@ -9,12 +59,27 @@ Page({
*/
data: {
punchState: true,
address: '',
hasPhone: true,
test: {name: ''},
is_bingding: false,
},
//首次登录小程序，跳转到认证手机页面
goPhoneCode() {
wx.navigateTo({url: '/pages/index/phone-code/phone-code'})
wx.navigateTo({url: '/pages/index/phone-code/phone-code?from_clock=' + true})
},
//判断手机号是否绑定
checkMobile() {
let url = '/portal/Index/check_mobile';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {},header).then((res) => {
console.log(res);
if(res.is_binding) {
this.setData({is_bingding: true})
}else {
this.setData({is_bingding: false})
}
})
},
//打卡申诉
punchApply() {
... ... @@ -24,33 +89,24 @@ Page({
},
//打卡
punch() {
var that = this
wx.getLocation({
type: 'wgs84',
success: function (res) {
var latitude = res.latitude
var longitude = res.longitude
var speed = res.speed
var accuracy = res.accuracy
that.setData({
address: '天津市',
punchState: false
let url = '/portal/Experiment/user_sign';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
lab_id: this.data.test.id,//实验室id
lat: this.data.latitude,
lng: this.data.longitude,
};
app.post(url, params, header).then((res) => {
console.log('打卡结果',res);
if(res.is_success) {
this.setData({
punchState: false,
})
},
}
})
// wx.chooseLocation({
// success: function(res) {
// console.log(res)
// var latitude = res.latitude
// var longitude = res.longitude
// var address = res.address
// that.setData({
// address: address,
// punchState:false
// })
// },
// })
},
// 打卡页面获取用户所在实验室
postPosition(params) {
... ... @@ -58,20 +114,22 @@ Page({
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url,params,header).then((res) => {
console.log(res);
app.post(url, params, header).then((res) => {
console.log('获取用户所在实验室',res);
this.setData({
card_info: res
test: res
})
})
},
//打卡页面获取用户所在实验室
//打卡页面获取位置授权
getExperiment() {
console.log('实验室');
const self = this;
if(wx.getStorageSync('city')) {
if (wx.getStorageSync('city')) {//如果第一次授权过
console.log(111);
wx.getLocation({
type: 'wgs84',
success (res) {
success(res) {
let params = {
city: wx.getStorageSync('city'),
lat: res.latitude,//纬度
... ... @@ -80,42 +138,54 @@ Page({
self.postPosition(params);
}
});
}else {
//获取当前城市
wx.getLocation({
type: 'wgs84',
success: function(res) {
console.log(res);
// 实例化API核心类
var demo = new QQMapWX({
key: 'CLVBZ-KHZKP-KWLDW-VDJTA-QVUST-XOBVO' // 必填
});
// 调用接口
demo.reverseGeocoder({
location: {
latitude: res.latitude,//纬度
longitude: res.longitude//经度
},
success: function (res) {
console.log('城市',res);
let params = {
city: res.result.address_component.city,
// lat: res.latitude,//纬度
// lng: res.longitude,//经度
};
// self.postPosition(params);
},
fail: function (res) {
console.log(res);
},
complete: function (res) {
// console.log(res);
}
});
} else {//重新调起授权
console.log('获取当前城市');
wx.getSetting({
success: (res) => {
if (res.authSetting['scope.userLocation'] != undefined && res.authSetting['scope.userLocation'] != true) {//非初始化进入该页面,且未授权
wx.showModal({
title: '是否授权当前位置',
content: '需要获取您的地理位置，请确认授权，否则无法完成打卡',
success: function (res) {
if (res.cancel) {
self.setData({
isshowCIty: false
})
wx.showToast({
title: '授权失败',
icon: 'none',
duration: 1000
})
} else if (res.confirm) {
wx.openSetting({
success: function (dataAu) {
if (dataAu.authSetting["scope.userLocation"] == true) {
wx.showToast({
title: '授权成功',
icon: 'success',
duration: 1000
})
//再次授权，调用getLocationt的API
getLocation(self);
} else {
wx.showToast({
title: '授权失败',
icon: 'none',
duration: 1000
})
}
}
})
}
}
})
} else if (res.authSetting['scope.userLocation'] == undefined) {//初始化进入
getLocation(self);
} else { //授权后默认加载
// getLocation(self);
}
}
});
})
}
},
/**
... ... @@ -123,7 +193,7 @@ Page({
*/
onLoad: function (options) {
const self = this;
self.getExperiment();
self.checkMobile();
},
/**
... ... @@ -137,7 +207,8 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const self = this;
self.getExperiment();
},
/**
... ...
<!--pages/clock/clock.wxml-->
<view class='content_box'>
<!--蒙层-->
<view class="modal" wx:if="{{!hasPhone}}" bindtap="goPhoneCode"></view>
<view class="modal" wx:if="{{!is_bingding}}" bindtap="goPhoneCode"></view>
<view class='circle_large'>
<view class='circle_middle'>
<view class='circle_small'>
... ... @@ -10,7 +10,7 @@
</view>
</view>
</view>
<view class='punch_info' wx:if="{{address==''}}">当前：未获取</view>
<view class='punch_info' wx:else>当前：{{address}}</view>
<view class='punch_info' wx:if="{{test.name==''}}">当前：未获取</view>
<view class='punch_info' wx:else>当前：{{test.name}}</view>
<view class='punch_btn' bindtap='punchApply'>打卡申诉</view>
</view>
\ No newline at end of file
... ...
// pages/punchAppeal/punchAppeal.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
current: 0,
maxlength: 100,
minlength: 0,
currentnum: 0
},
//tab切换
tabCharge(e) {
var index = e.currentTarget.dataset.current
var current = this.data.current
if (index == current) {
return false
} else {
this.setData({
current: index
})
}
},
//申诉内容获取
appealContent(e) {
var textcontent = e.detail.value
var len = e.detail.cursor
var maxlength = this.data.maxlength
var minlength = this.data.minlength
if (len > maxlength) {
wx.showToast({
title: '超出最大限制',
icon: 'none'
})
return
} else {
this.setData({
currentnum: len
})
}
},
//上传图片
uploadImg() {
wx.chooseImage({
success: function(res) {
console.log(res)
const tempFilePaths = res.tempFilePaths
wx.uploadFile({
url: '',
filePath: 'tempFilePaths[0]',
name: 'file',
/**
* 页面的初始数据
*/
data: {
current: 0,
maxlength: 100,
minlength: 0,
currentnum: 0,
image: '',
image1: '',
image2: '',
textcontent: '',
},
//tab切换
tabCharge(e) {
var index = e.currentTarget.dataset.current
var current = this.data.current
if (index == current) {
return false
} else {
this.setData({
current: index
})
}
},
//申诉内容获取
appealContent(e) {
var textcontent = e.detail.value
var len = e.detail.cursor
var maxlength = this.data.maxlength
var minlength = this.data.minlength
if (len > maxlength) {
wx.showToast({
title: '超出最大限制',
icon: 'none'
})
return
} else {
this.setData({
currentnum: len,
textcontent: textcontent,
})
}
},
//上传图片
uploadImg(e) {
const current = +e.currentTarget.dataset.current;
const self = this;
self.chooseImage(current);
},
//选择图片
chooseImage(current) {
const self = this;
wx.chooseImage({
count: 1, //最多可以选择的图片总数
sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
// console.log(res);
const tempFilePaths = res.tempFilePaths;
if (current === 0) {
self.setData({image: tempFilePaths[0]});
} else if (current === 1) {
self.setData({image1: tempFilePaths[0]});
} else {
self.setData({image2: tempFilePaths[0]});
}
const images = [];
const new_images = [];
images.push(self.data.image,self.data.image1,self.data.image2);
images.map((item)=> {
if(item !== '') {
new_images.push(item)
}
});
self.setData({new_images: new_images.join(',')});
console.log('images',new_images.join(','));
},
})
},
//提交
submit() {
const self = this;
if(self.data.image === '' && self.data.image1 === '' && self.data.image2 === '') {
wx.showToast({title:'请上传申诉照片!',icon: 'none'})
}else if(self.data.textcontent === ''){
wx.showToast({title:'请填写申诉文字!',icon: 'none'})
}else {
let url = '/portal/Experiment/user_complain';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
images: this.data.new_images,//实验室id
description: this.data.textcontent,
};
app.post(url, params, header).then((res) => {
console.log('提交结果',res);
if(res.data.is_success) {
wx.showToast({
title:'申诉成功',
icon: 'success',
success:function () {
setTimeout(function () {
self.setData({current: 1})
},500)
}
})
}
})
}
},
//跳转申诉详情页
listDetail() {
wx.navigateTo({
url: '../punchAppealDetail/punchAppealDetail',
})
},
})
},
//跳转申诉详情页
listDetail() {
wx.navigateTo({
url: '../punchAppealDetail/punchAppealDetail',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
... ... @@ -16,22 +16,25 @@
<view class='hint_info'>注：最多可上传3张照片</view>
</view>
</view>
<view class='uoload_box'>
<view class='upload_item' bindtap='uploadImg'>
<text class='iconfont icon-jia'></text>
<view class='uoload_box' >
<view class='upload_item' data-current="0" bindtap='uploadImg'>
<text class='iconfont icon-jia' wx:if="{{image === ''}}"></text>
<image src="{{image}}" mode="aspectFill" wx:if="{{image !== ''}}"></image>
</view>
<view class='upload_item'>
<text class='iconfont icon-jia'></text>
<view class='upload_item' data-current="1" bindtap='uploadImg'>
<text class='iconfont icon-jia' wx:if="{{image1 === ''}}"></text>
<image src="{{image1}}" mode="aspectFill" wx:if="{{image1 !== ''}}"></image>
</view>
<view class='upload_item'>
<text class='iconfont icon-jia'></text>
<view class='upload_item' data-current="2" bindtap='uploadImg'>
<text class='iconfont icon-jia' wx:if="{{image2 === ''}}"></text>
<image src="{{image2}}" mode="aspectFill" wx:if="{{image2 !== ''}}"></image>
</view>
</view>
</view>
<view class='item_list'>
<view class='list_title'>申诉内容</view>
<view class='list_input'>
<textarea placeholder='请输入您的申诉内容...' bindinput='appealContent' placeholder-style='color:#C3C3C3'>
<textarea placeholder='请输入您的申诉内容...' bindinput='appealContent' placeholder-style='color:#C3C3C3' maxlength="100">
</textarea>
<view class='word_num'>{{currentnum}}/{{maxlength}}</view>
</view>
... ... @@ -40,7 +43,7 @@
<text>当前：xxx实验室</text>
</view>
<view class='null_box'></view>
<view class='submit_btn'>提 交</view>
<view class='submit_btn' bindtap="submit">提 交</view>
</view>
</view>
</block>
... ...
... ... @@ -100,6 +100,10 @@ page {
align-items: center;
justify-content: center;
}
.upload_item image {
width: 100%;
height: 100%;
}
.icon-jia {
font-size: 40rpx;
... ...
... ... @@ -52,7 +52,7 @@ Page({
},
//首次登录小程序，跳转到认证手机页面
goPhoneCode() {
wx.navigateTo({url: '/pages/index/phone-code/phone-code'})
wx.navigateTo({url: '/pages/index/phone-code/phone-code?from_index=' + true})
},
//点击购买畅玩卡
goBuyCard() {
... ... @@ -114,24 +114,12 @@ Page({
const id = e.currentTarget.dataset.id;
wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + id})
},
getUser() {
let url = '/user/Profile/getUserInfo';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {},header).then((res) => {
// console.log('个人信息结果',res);
// self.setData({past_test_info: res})
// console.log(self.data.this_week_test_info);
});
},
onLoad: function (options) {
const self = this;
console.log(options);
self.setData({is_bingding: +options.is_bingding?+options.is_bingding:''});
self.getTheWeekTest();
self.getPastWeekTest();
self.getUser();
self.checkMobile();
//获取当前城市
wx.getLocation({
... ...
... ... @@ -84,9 +84,20 @@ Page({
};
app.post(url, params,header).then((res) => {
console.log('绑定结果',res);
wx.switchTab({
url: '../../index/index?is_bingding?' + res.is_bingding
})
if(self.data.from_index) {
wx.switchTab({
url: '/pages/index/index?is_bingding?' + res.is_bingding
})
}else if(self.data.from_clock) {
wx.switchTab({
url: '/pages/clock/clock?is_bingding?' + res.is_bingding
})
}else if(self.data.from_my) {
wx.switchTab({
url: '/pages/my/my?is_bingding?' + res.is_bingding
})
}
// self.setData({past_test_info: res})
// console.log(self.data.this_week_test_info);
});
... ... @@ -97,6 +108,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
from_index: options.from_index?options.from_index:'',
from_clock: options.from_clock?options.from_clock:'',
from_my: options.from_my?options.from_my:'',
})
},
/**
... ...
// pages/my/all-appointment/all-appointment.js
const app =getApp();
Page({
/**
... ... @@ -19,21 +20,24 @@ Page({
this.setData({currentTab: current});
wx.setNavigationBarTitle({
title: this.data.tab[current]
})
});
this.getAppointmentList(current)
},
//获取预约列表
getAppointmentList() {
const self = this;
let url = '/user/Reservation/reservation_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
status: this.data.currentTab
status: self.data.currentTab,
page: 1,
};
// app.post(url, params,header).then((res) => {
// console.log('支付换参',res);
// this.wxPay(res.pay)
// })
app.post(url, params,header).then((res) => {
console.log('获取预约列表',res);
self.setData({orderList: res.list})
})
},
goDetail() {
wx.navigateTo({url: '../order-detail/order-detail?currentTab=' + this.data.currentTab})
... ... @@ -42,7 +46,10 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({currentTab: +options.currentTab})
console.log('options', options);
const self = this;
self.setData({currentTab: +options.currentTab});
self.getAppointmentList();
},
/**
... ...
... ... @@ -10,7 +10,7 @@
<view class="order-box" bindtap="goDetail" wx:for="{{orderList}}" wx:key="index">
<view class="head">
<text class="number">预约单号：{{item.num}}</text>
<text class="number">预约单号：{{item.reservation_sn}}</text>
<text class="appointment-state" wx:if="{{currentTab === 1}}" style="color: #FC5B63;">待确认</text>
<text class="appointment-state" wx:if="{{currentTab === 2}}">已预约</text>
<text class="appointment-state" wx:if="{{currentTab === 3}}" style="color: #464646;">已取消</text>
... ... @@ -32,7 +32,7 @@
<view class="right-bottom-box">
<view class="iconfont icon-shangwutubiao"></view>
<view class="date-box">
<view class="date">预约日期：{{item.date}}</view>
<view class="date">预约日期：{{item.time}}</view>
<view class="not_confirm" wx:if="{{currentTab === 1}}">
<view class="go-cancel">取消</view>
... ...
// pages/chargePhoneNum/chargePhoneNum.js
const app = getApp();
var interval = null //倒计时函数
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
/**
* 页面的初始数据
*/
data: {
time: '获取验证码', //倒计时
currentTime: 61,
new_phone: '',
old_phone:'',
old_verification_code: '',
new_verification_code: '',
},
phoneInput(e) {
this.setData({new_phone: e.detail.value})
},
codeInput(e) {
if(this.data.new_phone === '') {
this.setData({old_verification_code: e.detail.value})
}else {
this.setData({new_verification_code: e.detail.value})
}
},
//获取验证码
getCode: function (options) {
var that = this;
var currentTime = that.data.currentTime;
interval = setInterval(function () {
currentTime--;
that.setData({
time: currentTime + '秒'
})
if (currentTime <= 0) {
clearInterval(interval);
that.setData({
time: '重新发送',
currentTime: 61,
disabled: false
})
}
}, 1000);
if(this.data.new_phone === '') {
let url = '/user/Profile/getOldCode';
let params = {
mobile: that.data.old_phone,
};
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, params,header).then((res) => {
console.log('旧验证码',res);
that.setData({old_verification_code: res.code})
// console.log(this.data.this_week_test_info);
})
}else {
let url = '/user/Profile/getNewCode';
let params = {
mobile: that.data.new_phone,
time: app.nowDate(),
};
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, params,header).then((res) => {
console.log('新验证码',res);
that.setData({new_verification_code: res.code})
// console.log(this.data.this_week_test_info);
})
}
},
//获取验证码
getVerificationCode() {
var that = this;
if(that.data.new_phone !== '' || that.data.old_phone) {
that.getCode();
that.setData({
disabled: true
})
}else {
that.setData({
disabled: false
});
wx.showToast({title: '请输入手机号!',icon: 'none'})
}
},
//下一步/保存
save_btn() {
const self = this;
if(self.data.new_phone === '' || self.data.old_phone === '') {
wx.showToast({title: '请输入手机号!',icon: 'none'})
}else if(self.data.old_verification_code === '' || self.data.new_verification_code === '') {
wx.showToast({title: '请输入验证码!',icon: 'none'})
}else {
if(self.data.old_phone && self.data.new_phone === '') {
let url = '/user/Profile/checkOldMobile';
let params = {
mobile: self.data.old_phone,
verification_code: self.data.old_verification_code,
time: app.nowDate(),
};
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, params,header).then((res) => {
console.log('原手机号验证结果',res);
});
}else if(self.data.new_phone !== '' && self.data.new_verification_code !== '') {
let url = '/user/Profile/bindingNewMobile';
let params = {
mobile: self.data.new_phone,
verification_code: self.data.new_verification_code,
time: app.nowDate(),
};
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, params,header).then((res) => {
console.log('新手机号绑定结果',res);
});
}
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options);
this.setData({
old_phone: options.old_phone?options.old_phone:'',
old_phone_hidden: options.old_phone_hidden?options.old_phone_hidden:'',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
... ... @@ -9,9 +9,10 @@
<view class='list_box'>
<view class='item_list'>
<view class='info_box'>
<view>新手机号： </view>
<view wx:if="{{old_phone}}">原手机号：</view>
<view wx:if="{{new_phone !== ''}}">新手机号： </view>
<view class='list_input'>
<input placeholder='188****888' value=''></input>
<input placeholder='{{old_phone_hidden}}' value='{{new_phone}}' bindinput="phoneInput"/>
</view>
</view>
</view>
... ... @@ -19,11 +20,13 @@
<view class='info_box'>
<text>验证码： </text>
<view class='list_input'>
<input placeholder='输入验证码' value=''></input>
<input placeholder='输入验证码' value='{{old_verification_code}}' bindinput="codeInput" wx:if="{{new_phone === ''}}"/>
<input placeholder='输入验证码' value='{{new_verification_code}}' bindinput="codeInput" wx:if="{{new_phone !== ''}}"/>
</view>
</view>
<button class='get_code'>获取验证码</button>
<button class='get_code' disabled="{{disabled}}" data-id="2" bindtap="getVerificationCode">{{time}}</button>
</view>
</view>
<view class='save_btn'>保 存</view>
<view class='save_btn' wx:if="{{new_phone === ''}}">下一步</view>
<view class='save_btn' wx:if="{{new_phone !== ''}}">保 存</view>
</view>
\ No newline at end of file
... ...
// pages/index/confirm-appointment-info/add-student/add-student.js
const app = getApp();
const date = new Date();
const years = [];
const months = [];
const days = [];
for (let i = 1990; i <= date.getFullYear(); i++) {
years.push(i)
}
for (let i = 1; i <= 12; i++) {
months.push(i)
}
for (let i = 1; i <= 31; i++) {
days.push(i)
}
Page({
/**
* 页面的初始数据
*/
data: {
name: '',
sex: ['男','女'],
default_sex: {id: 1,name: '男'},
city: ['北京市', '天津市', '河北省'],
default_birth: '2008-11-11',
default_city: '北京市',
years: years,
year: date.getFullYear(),
months: months,
month: 2,
days: days,
day: 2,
value: [9999, 1, 1],
},
inputName(e) {
this.setData({
name: e.detail.value
});
},
//选择性别
sexPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({
sex_index: e.detail.value,
is_sex_change: true,
})
},
//选择生日
birthPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({
birth_date: e.detail.value,
is_birth_change: true,
})
// const val = e.detail.value;
// this.setData({
// year: this.data.years[val[0]],
// month: this.data.months[val[1]],
// day: this.data.days[val[2]]
// })
},
//选择城市
cityPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({
city_index: e.detail.value,
is_city_change: true,
})
},
//保存
clickSave() {
const self = this;
let url = '/user/Student/student_edit';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
id: self.data.current_student.id,
name: self.data.name || self.data.current_student.name,
sex: (self.data.sex[self.data.sex_index] === '男' ? 1 : 2) || (+self.data.current_student.sex === 1 ? 1 : 2),
birthday: self.data.birth_date || self.data.current_student.birthday,
city: self.data.city[self.data.city_index] || self.data.current_student.city,
};
app.post(url, params, header).then((res) => {
console.log('保存', res);
if (res.is_success) {
wx.showToast({
title: '编辑成功',
icon: 'success',
success: function () {
setTimeout(function () {
if (self.data.is_back) {
wx.navigateBack({delta: 1})
} else {
wx.navigateTo({
url: '../../../my/myProfile/myProfile',
})
}
}, 500)
}
})
}
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
console.log('options', options);
this.setData({
is_back: options.is_back?options.is_back:'',
current_student: options.current_student?JSON.parse(options.current_student):'',
});
if(options.current_student) {
const student = JSON.parse(options.current_student)
this.setData({
name: student.name,
// sex:
})
}
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
{
"navigationBarTitleText": "编辑学员"
}
\ No newline at end of file
... ...
<!--pages/index/confirm-appointment-info/add-student/add-student.wxml-->
<view class="content">
<view class="input-box">
<view class="name-box">
<text>姓 名：</text>
<input type="text" placeholder="{{current_student.name}}" cursor="100" placeholder-class="placeholder-style"
value="{{name}}" bindinput="inputName"/>
</view>
<picker bindchange="sexPickerChange" value="{{sex_index}}" range="{{sex}}">
<view class="select-box">
<view class="select-picker">
<view class="sex">性 别：</view>
<view class="picker" wx:if="{{is_sex_change}}">
{{sex[sex_index]}}
</view>
<view wx:else>{{current_student.sex === 1? '男':'女'}}</view>
</view>
<view class="iconfont icon-daosanjiao"></view>
</view>
</picker>
<picker bindchange="birthPickerChange" value="{{birth_date}}" mode="date">
<view class="select-box">
<view class="select-picker">
<view class="sex">生 日：</view>
<view class="picker" wx:if="{{is_birth_change}}">
{{birth_date}}
</view>
<view wx:else>{{current_student.birthday}}</view>
</view>
<view class="iconfont icon-daosanjiao"></view>
</view>
</picker>
<picker bindchange="cityPickerChange" value="{{city_index}}" range="{{city}}">
<view class="select-box">
<view class="select-picker">
<view class="sex">城 市：</view>
<view class="picker" wx:if="{{is_city_change}}">
{{city[city_index]}}
</view>
<view wx:else>{{current_student.city}}</view>
</view>
<view class="iconfont icon-daosanjiao"></view>
</view>
</picker>
</view>
<view class="save-btn" bindtap="clickSave">
<view class="save-box">
<text>保 存</text>
</view>
</view>
</view>
\ No newline at end of file
... ...
/* pages/my/edit-student/edit-student.wxss */
@import '../../index/confirm-appointment-info/add-student/add-student.wxss';
\ No newline at end of file
... ...
// pages/my/my.js
Page({
// pages/my/my.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
hasPhone: true,
is_bingding: false,
},
//首次登录小程序，跳转到认证手机页面
goPhoneCode() {
wx.navigateTo({url: '/pages/index/phone-code/phone-code'})
wx.navigateTo({url: '/pages/index/phone-code/phone-code?from_my=' + true})
},
//兑换
charge() {
wx.navigateTo({
url: '../my/charge/charge',
})
wx.navigateTo({
url: '../my/charge/charge',
})
},
//我的资料
myProfile(){
wx.navigateTo({
url: '../my/myProfile/myProfile',
})
myProfile() {
wx.navigateTo({
url: '../my/myProfile/myProfile',
})
},
//跳转我的预约
myAppointment() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 0,
})
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 0,
})
},
goNotConfirm() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 1,
})
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 1,
})
},
goAppointed() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 2,
})
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 2,
})
},
goCanceled() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 3,
})
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 3,
})
},
goEnded() {
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 4,
})
wx.navigateTo({
url: './all-appointment/all-appointment?currentTab=' + 4,
})
},
//我的唱完卡
myCard() {
wx.navigateTo({
url: 'myCard/myCard',
})
wx.navigateTo({
url: 'myCard/myCard',
})
},
//联系客服
contact() {
wx.navigateTo({
url: 'serviceWeChat/serviceWeChat',
})
wx.navigateTo({
url: 'serviceWeChat/serviceWeChat',
})
},
//判断手机号是否绑定
checkMobile() {
let url = '/portal/Index/check_mobile';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {},header).then((res) => {
console.log(res);
if(res.is_binding) {
this.setData({is_bingding: true})
}else {
this.setData({is_bingding: false})
}
})
},
//获取用户基本信息
getUser() {
let url = '/user/Profile/getUserInfo';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {}, header).then((res) => {
console.log('个人信息结果',res);
this.setData({personal_info: res.user})
});
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
const self = this;
self.getUser();
self.checkMobile();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
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
})
\ No newline at end of file
... ...
<!--pages/my/my.wxml-->
<view class='box'>
<!--蒙层-->
<view class="modal" wx:if="{{!hasPhone}}" bindtap="goPhoneCode"></view>
<view class="modal" wx:if="{{!is_bingding}}" bindtap="goPhoneCode"></view>
<view class='header_box '>
<view class='head_box'>
<view class='head_img'>
<image src='../../images/head.png'></image>
<image src='{{personal_info.avatar}}'></image>
</view>
<view>
<view>微信昵称</view>
<view class='phone_num'>139****0939</view>
<view>{{personal_info.user_nickname}}</view>
<view class='phone_num'>{{personal_info.mobile}}</view>
</view>
</view>
<view class='my_info_box' bindtap='myProfile'>
... ...
// pages/MyProfile/MyProfile.js
Page({
// pages/MyProfile/MyProfile.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
/**
* 页面的初始数据
*/
data: {},
},
//跟换手机号
chargePhoneNum() {
//更换手机号
chargePhoneNum() {
wx.navigateTo({
url: '../chargePhoneNum/chargePhoneNum',
url: '../chargePhoneNum/chargePhoneNum?old_phone=' +
this.data.personal_info.mobile +
'&old_phone_hidden=' + this.data.personal_info.hidden_mobile,
})
},
//添加学员
addUser() {
},
//添加学员
addUser() {
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
url: '../../index/confirm-appointment-info/add-student/add-student?is_back=' + true,
})
},
//编辑学员信息
editInfo() {
},
//编辑学员信息
editInfo(e) {
const current = e.currentTarget.dataset.index;
console.log(current,JSON.stringify(this.data.student_list[current]));
wx.navigateTo({
url: '../../index/confirm-appointment-info/add-student/add-student',
url: '../edit-student/edit-student?current_student=' +
JSON.stringify(this.data.student_list[current]) +
'&is_back=' + true,
})
},
},
//续卡
renewalInfo() {
//续卡
renewalInfo() {
wx.navigateTo({
url: '../myCard/myCard',
url: '../myCard/myCard',
})
},
},
//购卡
buyCard() {
//购卡
buyCard() {
wx.navigateTo({
url: '../myCard/myCard',
url: '../myCard/myCard',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
},
//删除学员
delStudent(e) {
const current = e.currentTarget.dataset.index;
let url = '/user/Student/student_delete';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
id: this.data.student_list[current].id,
};
app.post(url, params, header).then((res) => {
console.log('删除学员结果', res);
});
const arr = []
this.data.student_list.map((item) => {
if(item.id !== this.data.student_list[current].id) {
arr.push(item)
}
});
console.log('arr', arr);
this.setData({student_list: arr})
},
//获取用户基本信息
getUser() {
let url = '/user/Profile/getUserInfo';
let header = {
"XX-token": wx.getStorageSync('token')
};
app.post(url, {}, header).then((res) => {
console.log('个人信息结果', res);
this.setData({personal_info: res.user})
});
},
//获取学员列表
getStudentList() {
let url = '/user/Student/student_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
page: 1,
};
app.post(url,params,header).then((res) => {
console.log('学员列表',res);
// console.log('list', list);
this.setData({student_list: res.list})
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
const self = this;
self.getUser();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
const self = this;
self.getStudentList();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
... ... @@ -2,13 +2,13 @@
<view class='box'>
<view class='banner_box'>
<view class='head_img'>
<image src='../../../images/head.png'></image>
<image src='{{personal_info.avatar}}'></image>
</view>
<view>微信昵称</view>
<view>{{personal_info.user_nickname}}</view>
</view>
</view>
<view class='info_box'>
<view>手机号：188*****888</view>
<view>手机号：{{personal_info.mobile}}</view>
<view class='info_content' bindtap='chargePhoneNum'>更换手机号</view>
</view>
<view class='title_box'>
... ... @@ -20,36 +20,23 @@
</view>
<!-- 未绑定年卡，就需要显示为“购卡”；已有年卡就显示为“续卡” -->
<view class='box'>
<view class='list_item'>
<view class='list_item' wx:for="{{student_list}}" wx:key="index">
<view class='list_info'>
<text>姓名：男</text>
<text>性 别：男</text>
<text>姓名：{{item.name}}</text>
<text>性 别：{{item.sex === 1?'男':'女'}}</text>
</view>
<view class='list_info'>
<text>生日：2000.01.01</text>
<text>所在城市：北京</text>
<text>生日：{{item.birthday}}</text>
<text>所在城市：{{item.city}}</text>
</view>
<view class='list_label_box'>
<view class='label_item edit_btn' bindtap='editInfo'>编辑学员信息</view>
<view class='label_item renewal_btn' bindtap='renewalInfo'>续卡</view>
<view class='label_item' bindtap='delUser'>删除学员</view>
<view class='label_item edit_btn' bindtap='editInfo' data-index="{{index}}">编辑学员信息</view>
<view class='label_item renewal_btn' bindtap='renewalInfo' wx:if="{{item.is_end === 1}}">续卡</view>
<view class='label_item renewal_btn' bindtap='buyCard' wx:if="{{item.is_end === 2}}">购卡</view>
<view class='label_item' bindtap='delStudent' data-index="{{index}}">删除学员</view>
</view>
<view class='hint_info'>畅玩卡周期：2018.10.01-2019.10.01</view>
</view>
<view class='list_item'>
<view class='list_info'>
<text>姓名：男</text>
<text>性 别：男</text>
</view>
<view class='list_info'>
<text>生日：2000.01.01</text>
<text>所在城市：北京</text>
</view>
<view class='list_label_box'>
<view class='label_item edit_btn' bindtap='editInfo'>编辑学员信息</view>
<view class='label_item renewal_btn' bindtap='buyCard'>购卡</view>
<view class='label_item' bindtap='delUser'>删除学员</view>
</view>
<view class='hint_info'>无绑定畅玩卡</view>
<view class='hint_info' wx:if="{{item.is_end === 1}}">畅玩卡周期：{{item.time}}</view>
<view class='hint_info' wx:if="{{item.is_end === 2}}">无绑定畅玩卡</view>
</view>
</view>
\ No newline at end of file
... ...