miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 202e91fbe87b18f3a386acdfd9cc540348ff84c1 1 个父辈 cbfe605b

申诉详情，二次申诉

内嵌 并排对比
正在显示 11 个修改的文件 包含 462 行增加 和 370 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化打卡，由每次进入打卡页面弹框授权改为点击一键打卡再弹框授权">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" 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.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/clock.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss" 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/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/index/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxss" 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/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" 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/myProfile/myProfile.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/templates.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/my.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wxParse/html2json.js" beforeDir="false" afterPath="$PROJECT_DIR$/wxParse/html2json.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -44,47 +27,47 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="14" />
<entry key="project.open.time.0" value="5" />
<entry key="project.open.time.1" value="6" />
<entry key="project.closed" value="16" />
<entry key="project.open.time.0" value="6" />
<entry key="project.open.time.1" value="7" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.8" value="2" />
<entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="16" />
<entry key="project.opened" value="18" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="131" />
<entry key="json" value="30" />
<entry key="wxml" value="103" />
<entry key="wxss" value="43" />
<entry key="js" value="143" />
<entry key="json" value="31" />
<entry key="wxml" value="112" />
<entry key="wxss" value="49" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="43" />
<entry key="HTML" value="103" />
<entry key="JSON" value="30" />
<entry key="JavaScript" value="131" />
<entry key="CSS" value="49" />
<entry key="HTML" value="112" />
<entry key="JSON" value="31" />
<entry key="JavaScript" value="143" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="12969" />
<entry key="js" value="13513" />
<entry key="json" value="158" />
<entry key="txt" value="231" />
<entry key="wxml" value="2873" />
<entry key="wxss" value="1439" />
<entry key="txt" value="279" />
<entry key="wxml" value="3146" />
<entry key="wxss" value="1477" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="1439" />
<entry key="HTML" value="2873" />
<entry key="CSS" value="1477" />
<entry key="HTML" value="3146" />
<entry key="JSON" value="158" />
<entry key="JavaScript" value="12969" />
<entry key="PLAIN_TEXT" value="231" />
<entry key="JavaScript" value="13513" />
<entry key="PLAIN_TEXT" value="279" />
</counts>
</usages-collector>
</session>
... ... @@ -92,100 +75,104 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="968">
<caret line="44" selection-start-line="44" selection-end-line="47" selection-end-column="6" />
<state relative-caret-position="506">
<caret line="94" column="10" lean-forward="true" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#3441#6499#0" />
<element signature="e#6947#8019#0" />
<element signature="e#1652#2617#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
<state relative-caret-position="154">
<caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="69" selection-start-line="3" selection-start-column="58" selection-end-line="3" selection-end-column="69" />
<caret line="3" column="43" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" selection-start-line="9" selection-end-line="18" selection-end-column="1" />
<state relative-caret-position="1518">
<caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
<folding>
<element signature="e#152#1691#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.js">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="55" column="59" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" />
<folding>
<element signature="e#76#1092#0" />
<element signature="e#4307#4566#0" />
<element signature="e#4595#5101#0" />
<element signature="e#5118#5452#0" />
<element signature="e#5495#5588#0" />
<element signature="e#5610#5695#0" />
</folding>
<state relative-caret-position="455">
<caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
<caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" />
<state relative-caret-position="550">
<caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/project.config.json">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
<state relative-caret-position="558">
<caret line="102" column="57" lean-forward="true" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor" />
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<folding>
<element signature="e#1398#2534#0" />
<element signature="e#2559#3773#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/start/start.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" selection-end-line="11" />
<state relative-caret-position="22">
<caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="9" selection-end-column="24" />
<state relative-caret-position="462">
<caret line="120" column="8" lean-forward="true" selection-start-line="120" selection-start-column="8" selection-end-line="130" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -194,18 +181,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>changeTab</find>
<find>previewImage</find>
<find>listDetail</find>
<find>test</find>
<find>postPosition</find>
<find>page</find>
<find>city_list</find>
<find>is_this_week</find>
<find>ordered</find>
<find>is_past</find>
<find>now</find>
<find>info</find>
<find>getSlideImage</find>
<find>punch</find>
<find>xxx</find>
... ... @@ -216,14 +191,26 @@
<find>chooseChildren</find>
<find>session_info</find>
<find>getAppointmentInfo</find>
<find>is_bingding</find>
<find>swiperChange</find>
<find>currentSwiper</find>
<find>wrap</find>
<find>cur</find>
<find>current</find>
<find>getExperiment</find>
<find>goPhoneCode</find>
<find>console.dir</find>
<find>city_index</find>
<find>sex_index</find>
<find>is_sex_change</find>
<find>template</find>
<find>is_birth_change</find>
<find>form</find>
<find>tabCharge</find>
<find>currentSwiper</find>
<find>listDetail</find>
<find>submit_btn</find>
<find>modal</find>
<find>is_bingding</find>
<find>getAppointmentList</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -232,8 +219,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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/chargePhoneNum/chargePhoneNum.json" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" />
<option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxss" />
... ... @@ -264,25 +249,27 @@
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxss" />
<option value="$PROJECT_DIR$/pages/my/my.js" />
<option value="$PROJECT_DIR$/pages/my/my.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
<option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" />
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.js" />
<option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
<option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/app.json" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/pages/index/index.wxml" />
<option value="$PROJECT_DIR$/pages/index/index.js" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" />
<option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" />
<option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" />
<option value="$PROJECT_DIR$/pages/index/index.wxss" />
<option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
<option value="$PROJECT_DIR$/pages/my/my.wxss" />
<option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
</list>
</option>
</component>
... ... @@ -293,7 +280,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="x" value="-3" />
<option name="y" value="1" />
<option name="width" value="1936" />
<option name="height" value="1047" />
</component>
... ... @@ -319,30 +307,54 @@
<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="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="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppeal" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppealDetail" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="clock" type="462c0819:PsiDirectoryNode" />
<item name="punchAppealDetail2" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="phone-code" 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="start" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="activity-detail" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="utils" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="all-appointment" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
... ... @@ -351,8 +363,9 @@
</panes>
</component>
<component name="PropertiesComponent">
<property name="SearchEverywhereHistoryKey" value="edit&#9;FILE&#9;file://D:/小程序/scienceCaptain/ScienceCaptain/pages/my/edit-student/edit-student.js" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../遛狗小程序" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="project.propDebugger" />
... ... @@ -401,7 +414,9 @@
<workItem from="1544430037915" duration="11000" />
<workItem from="1544430133354" duration="7787000" />
<workItem from="1544490574837" duration="15199000" />
<workItem from="1544579843898" duration="2170000" />
<workItem from="1544579843898" duration="5821000" />
<workItem from="1544751555564" duration="3866000" />
<workItem from="1545014617044" duration="7283000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -452,11 +467,18 @@
<option name="project" value="LOCAL" />
<updated>1544255230736</updated>
</task>
<option name="localTasksCounter" value="8" />
<task id="LOCAL-00008" summary="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，">
<created>1544583498325</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1544583498325</updated>
</task>
<option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="182710000" />
<option name="totallyTimeSpent" value="197510000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -475,7 +497,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.5796316" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.5791757" />
<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" />
... ... @@ -521,368 +543,360 @@
<MESSAGE value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" />
<MESSAGE value="申诉，打卡，编辑删除学员，更换手机号" />
<MESSAGE value="预约详情页接口，删除学员，添加formid" />
<option name="LAST_COMMIT_MESSAGE" value="预约详情页接口，删除学员，添加formid" />
<MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
<option name="LAST_COMMIT_MESSAGE" value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-140">
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
<state relative-caret-position="396">
<caret line="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="180" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/charge/charge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="59" column="30" lean-forward="true" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="173" column="48" lean-forward="true" selection-start-line="173" selection-start-column="48" selection-end-line="173" selection-end-column="48" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="377">
<caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" />
<state relative-caret-position="462">
<caret line="22" selection-start-line="22" selection-end-line="23" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="180" column="29" selection-start-line="180" selection-start-column="29" selection-end-line="180" selection-end-column="29" />
<state relative-caret-position="66">
<caret line="3" column="60" selection-start-line="3" selection-start-column="60" selection-end-line="3" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
<state relative-caret-position="276">
<caret line="226" selection-start-line="226" selection-end-line="247" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
<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="302">
<caret line="67" column="15" lean-forward="true" selection-start-line="67" selection-start-column="15" selection-end-line="67" selection-end-column="15" />
<state relative-caret-position="462">
<caret line="36" column="68" lean-forward="true" selection-start-line="36" selection-start-column="68" selection-end-line="36" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<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="500">
<caret line="154" column="21" selection-start-line="154" selection-start-column="21" selection-end-line="154" selection-end-column="21" />
<state relative-caret-position="-44">
<caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="51" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/index/index.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1518">
<caret line="69" column="58" selection-start-line="69" selection-start-column="58" selection-end-line="69" selection-end-column="58" />
<state relative-caret-position="88">
<caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.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="396">
<caret line="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="180" selection-end-column="11" />
<state relative-caret-position="1012">
<caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml">
<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="484">
<caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
<state relative-caret-position="431">
<caret line="272" column="9" lean-forward="true" selection-start-line="272" selection-start-column="9" selection-end-line="272" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js">
<entry file="file://$PROJECT_DIR$/pages/my/my.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="22" selection-start-line="22" selection-end-line="23" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="594">
<caret line="96" column="64" lean-forward="true" selection-start-line="96" selection-start-column="64" selection-end-line="96" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="60" selection-start-line="3" selection-start-column="60" selection-end-line="3" selection-end-column="60" />
<state relative-caret-position="132">
<caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<state relative-caret-position="432">
<caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
<state relative-caret-position="44">
<caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1100">
<caret line="116" column="76" lean-forward="true" selection-start-line="116" selection-start-column="76" selection-end-line="116" selection-end-column="76" />
<state relative-caret-position="176">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="226" selection-start-line="226" selection-end-line="247" selection-end-column="4" />
<state relative-caret-position="638">
<caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="36" column="68" lean-forward="true" selection-start-line="36" selection-start-column="68" selection-end-line="36" selection-end-column="68" />
<state relative-caret-position="1936">
<caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-44">
<caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
<state relative-caret-position="2112">
<caret line="164" column="19" selection-start-line="164" selection-start-column="8" selection-end-line="164" selection-end-column="19" />
<folding>
<element signature="e#76#1092#0" />
<element signature="e#4307#4566#0" />
<element signature="e#4595#5101#0" />
<element signature="e#5118#5452#0" />
<element signature="e#5495#5588#0" />
<element signature="e#5610#5695#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="99" selection-start-line="99" selection-end-line="100" />
<state relative-caret-position="1804">
<caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="34" column="42" lean-forward="true" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" />
<state relative-caret-position="748">
<caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-140">
<caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
<state relative-caret-position="242">
<caret line="11" selection-end-line="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2156">
<caret line="126" column="21" lean-forward="true" selection-start-line="126" selection-start-column="21" selection-end-line="126" selection-end-column="21" />
<state relative-caret-position="594">
<caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="36" column="37" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
<state relative-caret-position="1254">
<caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
<caret line="32" column="14" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
<state relative-caret-position="594">
<caret line="27" column="51" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
<state relative-caret-position="352">
<caret line="16" column="6" lean-forward="true" selection-start-line="16" selection-start-column="6" selection-end-line="17" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="58" selection-start-line="1" selection-start-column="58" selection-end-line="1" selection-end-column="58" />
<folding>
<element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
</folding>
<caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
<caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
<state relative-caret-position="440">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<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="431">
<caret line="272" column="9" lean-forward="true" selection-start-line="272" selection-start-column="9" selection-end-line="272" selection-end-column="9" />
<state relative-caret-position="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/my/my.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="96" column="64" lean-forward="true" selection-start-line="96" selection-start-column="64" selection-end-line="96" selection-end-column="64" />
<state relative-caret-position="704">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
<state relative-caret-position="270">
<caret line="143" column="11" selection-start-line="143" selection-start-column="1" selection-end-line="143" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="158" column="25" lean-forward="true" selection-start-line="158" selection-start-column="25" selection-end-line="158" selection-end-column="25" />
<folding>
<element signature="e#152#1691#0" />
</folding>
<state relative-caret-position="484">
<caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
<state relative-caret-position="421">
<caret line="187" column="65" lean-forward="true" selection-start-line="187" selection-start-column="65" selection-end-line="187" selection-end-column="65" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#3441#6499#0" />
<element signature="e#6947#8019#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.json">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
<state relative-caret-position="374">
<caret line="17" column="16" lean-forward="true" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
<state relative-caret-position="33">
<caret line="3" column="22" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
<state relative-caret-position="66">
<caret line="3" column="43" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
<caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" />
<state relative-caret-position="455">
<caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/project.config.json">
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
<state relative-caret-position="550">
<caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" selection-end-line="11" />
<state relative-caret-position="506">
<caret line="94" column="10" lean-forward="true" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding>
<element signature="e#1652#2617#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="9" selection-end-column="24" />
<state relative-caret-position="1518">
<caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
<folding>
<element signature="e#152#1691#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
<state relative-caret-position="154">
<caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" selection-start-line="9" selection-end-line="18" selection-end-column="1" />
<state relative-caret-position="558">
<caret line="102" column="57" lean-forward="true" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.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="66">
<caret line="3" column="69" selection-start-line="3" selection-start-column="58" selection-end-line="3" selection-end-column="69" />
<state relative-caret-position="22">
<caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="968">
<caret line="44" selection-start-line="44" selection-end-line="47" selection-end-column="6" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#3441#6499#0" />
<element signature="e#6947#8019#0" />
</folding>
<state relative-caret-position="462">
<caret line="120" column="8" lean-forward="true" selection-start-line="120" selection-start-column="8" selection-end-line="130" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="55" column="59" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" />
<state relative-caret-position="608">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<folding>
<element signature="e#76#1092#0" />
<element signature="e#4307#4566#0" />
<element signature="e#4595#5101#0" />
<element signature="e#5118#5452#0" />
<element signature="e#5495#5588#0" />
<element signature="e#5610#5695#0" />
<element signature="e#1398#2534#0" />
<element signature="e#2559#3773#0" />
</folding>
</state>
</provider>
... ...
... ... @@ -28,8 +28,8 @@ page {
position: absolute;
left: 0;
top: 0;
background-color: #000000;
opacity: 0.8;
background-color: transparent;
/*opacity: 0.8;*/
z-index: 10;
}
.circle_large, .circle_middle, .circle_small {
... ...
... ... @@ -14,17 +14,24 @@ Page({
image1: '',
image2: '',
textcontent: '',
has_more: true,
page_number: 1,
examining:[],
},
//tab切换
tabCharge(e) {
var index = e.currentTarget.dataset.current
var index = +e.currentTarget.dataset.current
var current = this.data.current
console.log('index', index);
if (index == current) {
return false
} else {
this.setData({
current: index
})
});
if(index !== 0) {
this.getMyComplain(index)
}
}
},
//申诉内容获取
... ... @@ -83,7 +90,7 @@ Page({
})
},
//提交
submit() {
submit(e) {
const self = this;
if(self.data.image === '' && self.data.image1 === '' && self.data.image2 === '') {
wx.showToast({title:'请上传申诉照片!',icon: 'none'})
... ... @@ -97,6 +104,7 @@ Page({
let params = {
images: this.data.new_images,//实验室id
description: this.data.textcontent,
formId: e.detail.formId,
};
app.post(url, params, header).then((res) => {
console.log('提交结果',res);
... ... @@ -114,13 +122,36 @@ Page({
})
}
},
//我的申诉
getMyComplain(current) {
if(!this.data.has_more) return;
this.setData({has_more: false});
let url = '/portal/Experiment/user_complain_list';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
status: current,//（1，审核中、2，已通过、3，未通过)
page: this.data.page_number,
};
app.post(url, params, header).then((res) => {
console.log('我的申诉',res);
if(res.this_page < res.total_page) {
this.setData({has_more: true});
}
this.setData({examining: this.data.examining.concat(res.list)});
console.log(this.data.examining);
})
},
//查看原因跳转申诉详情页
listDetail(e) {
const current = +e.currentTarget.dataset.index;
console.log(121);
const id = +e.currentTarget.dataset.id;
console.log('current',current);
wx.navigateTo({
url: '../punchAppealDetail/punchAppealDetail?status=' + current
+ '&test_name=' + this.data.test_name,
+ '&test_name=' + this.data.test_name +
'&id=' + id,
})
},
/**
... ... @@ -128,7 +159,7 @@ Page({
*/
onLoad: function (options) {
console.log('options', options);
this.setData({test_name: options.test_name?options.test_name:'',})
this.setData({test_name: options.test_name?options.test_name:'',});
},
/**
... ... @@ -170,7 +201,17 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
const self = this;
if(self.data.has_more) {
self.data.page_number ++;
self.getMyComplain();
}else {
wx.showToast({
title: '没有更多数据了~',
icon: 'none'
});
}
console.log('上拉加载');
},
/**
... ...
... ... @@ -6,6 +6,7 @@
<view class="tab_item {{current==3?'tab_active':''}}" data-current='3' bindtap='tabCharge'>未通过</view>
</view>
<block wx:if='{{current==0}}'>
<form bindsubmit="submit" bindreset="formReset" report-submit="true">
<view class='content_box'>
<view class='item_list'>
<view class='list_title_info'>
... ... @@ -43,20 +44,21 @@
<text>当前：{{test_name || '未获取'}}</text>
</view>
<view class='null_box'></view>
<view class='submit_btn' bindtap="submit">提 交</view>
<button class='submit_btn' form-type="submit">提 交</button>
</view>
</view>
</form>
</block>
<block wx:elif='{{current==1}}'>
<view class='review_box'>
<view class='review_item' bindtap='listDetail' data-index="{{1}}">
<view>提交时间：2018.10.21</view>
<view class='review_item' bindtap='listDetail' data-index="{{index}}" wx:for="{{examining}}" wx:key="index" data-id="{{item.id}}">
<view>提交时间：{{item.create_time}}</view>
<view class='review_content_box'>
<view class='review_img'>
<image src='../../../images/img1.png'></image>
<image src='{{item.images[0]}}'></image>
</view>
<view class='review_content'>
<view class='review_info'>卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦</view>
<view class='review_info'>{{item.description}}</view>
<view class='review_btn'>
<view class='cancle_btn'>取消申诉</view>
<view class='review_state'>审核中</view>
... ... @@ -68,14 +70,14 @@
</block>
<block wx:elif='{{current==2}}'>
<view class='review_box'>
<view class='review_item' bindtap='listDetail' data-index="{{2}}">
<view>提交时间：2018.10.21</view>
<view class='review_item' bindtap='listDetail' data-index="{{index}}" wx:for="{{examining}}" wx:key="index" data-id="{{item.id}}">
<view>提交时间：{{item.create_time}}</view>
<view class='review_content_box'>
<view class='review_img'>
<image src='../../../images/img1.png'></image>
<image src='{{item.images[0]}}'></image>
</view>
<view class='review_content'>
<view class='review_info'>卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦</view>
<view class='review_info'>{{item.description}}</view>
<view class='review_btn'>
<view class='cancle_btn' style='border:1rpx solid #fff'></view>
<view class='review_state'>
... ... @@ -89,14 +91,14 @@
</block>
<block wx:elif='{{current==3}}'>
<view class='review_box'>
<view class='review_item' bindtap='listDetail' data-index="{{3}}">
<view>提交时间：2018.10.21</view>
<view class='review_item' bindtap='listDetail' data-index="{{index}}" wx:for="{{examining}}" wx:key="index" data-id="{{item.id}}">
<view>提交时间：{{item.create_time}}</view>
<view class='review_content_box'>
<view class='review_img'>
<image src='../../../images/img1.png'></image>
<image src='{{item.images[0]}}'></image>
</view>
<view class='review_content'>
<view class='review_info'>卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦</view>
<view class='review_info'>{{item.description}}</view>
<view class='review_btn'>
<view class='cancle_btn view_btn'>查看原因</view>
<view class='review_state state3'>未通过</view>
... ... @@ -106,3 +108,6 @@
</view>
</view>
</block>
<view class="no-data" wx:if="{{examining.length === 0}}">
<text>暂无数据</text>
</view>
\ No newline at end of file
... ...
... ... @@ -154,6 +154,9 @@ page {
bottom: 0;
left: 0;
}
.submit_btn::after {
border: 0;
}
.null_box {
width: 100%;
... ... @@ -241,3 +244,9 @@ page {
.icon-dui{
color: #FC5B63;
}
.no-data {
text-align:center;
font-size:30rpx;
margin:360rpx 0;
color:#666666;
}
... ...
... ... @@ -9,15 +9,15 @@ Page({
status: 1,//1:审核中，2：已通过，3：未通过
reason: '网络不好',
id: 1,
image:['http://www.ccfao.gov.cn/zwgk/xxgkml/dtxx/201808/W020180801562481131566.jpg','http://www.ccfao.gov.cn/zwgk/xxgkml/dtxx/201808/W020180801562481131566.jpg'],
image: [],
},
//补充提交申诉
againSubmit() {
againSubmit(e) {
const self = this;
console.log(self.data.image.join(','));
if(self.data.image.length === 0) {
wx.showToast({title:'请上传申诉照片!',icon: 'none'})
}else {
if (self.data.image.length === 0) {
wx.showToast({title: '请上传申诉照片!', icon: 'none'})
} else {
let url = '/portal/Experiment/user_complain_second';
let header = {
"XX-token": wx.getStorageSync('token')
... ... @@ -26,25 +26,27 @@ Page({
id: self.data.id,//申诉id
images: self.data.image.join(','),
description: this.data.reason,
formId: e.detail.formId,
};
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)
// }
// })
// }
console.log('补充提交结果', res);
if (res.is_success) {
wx.showToast({
title: '二次申诉成功',
icon: 'success',
success: function () {
setTimeout(function () {
wx.navigateBack({
delta: 1,
})
// self.setData({image: '',image1: '',imag2: '',current: 1})
}, 500)
}
// wx.navigateTo({
// url: '../punchAppealDetail2/punchAppealDetail2',
// })
})
}
})
}
},
//上传图片
uploadImg(e) {
... ... @@ -52,7 +54,7 @@ Page({
console.log(current);
const self = this;
// self.setData({current:current})
if(self.data.status === 3) {
if (self.data.status === 3) {
wx.chooseImage({
count: 1, //最多可以选择的图片总数
sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
... ... @@ -60,7 +62,7 @@ Page({
success: function (res) {
console.log(res.tempFilePaths[0]);
const tempFilePaths = res.tempFilePaths[0];
self.setData({[`image[${current}]`]:tempFilePaths});
self.setData({[`image[${current}]`]: tempFilePaths});
// if() {
//
// }
... ... @@ -76,16 +78,20 @@ Page({
},
//获取申诉详情
getAppealInfo() {
let url = '/portal/Experiment/user_complain';
let url = '/portal/Experiment/user_complain_detail';
let header = {
"XX-token": wx.getStorageSync('token')
};
let params = {
// images: this.data.new_images,//实验室id
// description: this.data.textcontent,
id: this.data.id,//申诉id
};
app.post(url, params, header).then((res) => {
console.log('申诉详情',res);
console.log('申诉详情', res);
if (res.info.status === 4 || res.info.status === 5 || res.info.status === 6) {
this.setData({detail: res.info, image: res.info.re_images})
} else {
this.setData({detail: res.info, image: res.info.images})
}
})
},
/**
... ... @@ -93,12 +99,13 @@ Page({
*/
onLoad: function (options) {
const self = this;
self.getAppealInfo();
console.log('options', options);
self.setData({
status: +options.status?+options.status:'',
test_name: options.test_name?options.test_name:'',
})
status: +options.status ? +options.status : '',
test_name: options.test_name ? options.test_name : '',
id: +options.id ? +options.id : '',
});
self.getAppealInfo();
},
/**
... ...
<!--pages/punchAppealDetail/punchAppealDetail.wxml-->
<view class='content_box'>
<form bindsubmit="againSubmit" bindreset="formReset" report-submit="true">
<view class='content_box'>
<view class='item_list'>
<view class='uoload_box' wx:if="{{image.length > 0}}">
<view class='upload_item' bindtap='uploadImg' data-current="0">
... ... @@ -16,25 +17,40 @@
</view>
</view>
</view>
<view class='item_list'>
<view class='item_list' wx:if="{{detail.status !== 4 && detail.status !== 5 && detail.status !== 6 }}">
<view class='list_title'>申诉理由</view>
<view class='list_input'>
<view>{{detail.description}}</view>
<view class='word_num'>{{detail.create_time}}</view>
</view>
</view>
<view class='item_list' wx:if="{{detail.status === 4 || detail.status === 5 || detail.status === 6 }}">
<view class='list_title'>申诉理由</view>
<view class='list_input'>
<view>{{reason}}</view>
<view class='word_num'>2018.10.10</view>
<view>{{detail.re_description}}</view>
<view class='word_num'>{{detail.create_time}}</view>
</view>
</view>
<view class='item_list' wx:if="{{status === 3}}">
<view class='item_list' wx:if="{{detail.status === 3}}">
<view class='list_title'>未通过原因</view>
<view class='list_input'>
<view>朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳</view>
<view class='word_num'>2018.10.10</view>
<view>{{detail.reason}}</view>
<view class='word_num'>{{detail.handle_time}}</view>
</view>
</view>
<view wx:if="{{status !== 3}}" class="current-test">
<view class='item_list' wx:if="{{detail.status === 6}}">
<view class='list_title'>未通过原因</view>
<view class='list_input'>
<view>{{detail.re_reason}}</view>
<view class='word_num'>{{detail.handle_time}}</view>
</view>
</view>
<view wx:if="{{detail.status !== 3 && detail.status !== 6}}" class="current-test">
<text class="circle"></text>
<text>当前：{{test_name || '未获取'}}</text>
</view>
<view class='null_box' wx:if="{{status === 3}}"></view>
<view class='submit_btn' bindtap='againSubmit' wx:if="{{status === 3}}">补充提交</view>
</view>
<view class='null_box' wx:if="{{detail.status === 3}}"></view>
<button class='submit_btn' form-type='submit' wx:if="{{detail.status === 3}}">补充提交</button>
</view>
</form>
... ...
... ... @@ -37,9 +37,9 @@ Page({
})
},
swiperChange: function (e) { //切换轮播图
console.log(e, e.detail.current, this.data.currentSwiper, this.data.cur)
// console.log(e, e.detail.current, this.data.currentSwiper, this.data.cur)
this.setData({
// currentSwiper: e.detail.current,
currentSwiper: e.detail.current,
})
},
//首次登录小程序，跳转到认证手机页面
... ...
... ... @@ -13,8 +13,8 @@ page {
position: absolute;
left: 0;
top: 0;
background-color: #000000;
opacity: 0.8;
background-color: transparent;
/*opacity: 0.8;*/
z-index: 10;
}
... ...
... ... @@ -21,8 +21,8 @@
position: absolute;
left: 0;
top: 0;
background-color: #000000;
opacity: 0.8;
background-color: transparent;
/*opacity: 0.8;*/
z-index: 10;
}
.icon-bianji2{
... ...
... ... @@ -116,7 +116,7 @@ function html2json(html, bindName) {
// has multi attibutes
// make it array of attribute
if (name == 'style') {
console.dir(value);
// console.dir(value);
// value = value.join("")
node.styleStr = value;
}
... ...