miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘朕
提交 bde6d140502e022fd24091c24021b12e0cbaf851 2 个父辈 b693328e 2c731335

Merge branch 'wumengyu' of http://114.215.101.231:8099/miniprogram/ScienceCaptain into wumengyu 

# Conflicts:
#	pages/clock/clock.js
内嵌 并排对比
正在显示 5 个修改的文件 包含 149 行增加 和 131 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化登录出现参数错误问题">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化选择场次">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -18,39 +20,39 @@
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="26" />
<entry key="project.open.time.0" value="6" />
<entry key="project.closed" value="31" />
<entry key="project.open.time.0" value="7" />
<entry key="project.open.time.1" value="11" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.10" value="2" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.14" value="1" />
<entry key="project.open.time.2" value="3" />
<entry key="project.open.time.8" value="3" />
<entry key="project.open.time.8" value="5" />
<entry key="project.open.time.9" value="3" />
<entry key="project.opened" value="29" />
<entry key="project.opened" value="33" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="177" />
<entry key="json" value="32" />
<entry key="wxml" value="143" />
<entry key="wxss" value="55" />
<entry key="js" value="179" />
<entry key="json" value="33" />
<entry key="wxml" value="145" />
<entry key="wxss" value="57" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="55" />
<entry key="HTML" value="143" />
<entry key="JSON" value="32" />
<entry key="JavaScript" value="177" />
<entry key="CSS" value="57" />
<entry key="HTML" value="145" />
<entry key="JSON" value="33" />
<entry key="JavaScript" value="179" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="15528" />
<entry key="json" value="158" />
<entry key="txt" value="502" />
<entry key="txt" value="508" />
<entry key="wxml" value="3781" />
<entry key="wxss" value="1627" />
</counts>
... ... @@ -61,7 +63,7 @@
<entry key="HTML" value="3781" />
<entry key="JSON" value="158" />
<entry key="JavaScript" value="15528" />
<entry key="PLAIN_TEXT" value="502" />
<entry key="PLAIN_TEXT" value="508" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
... ... @@ -73,73 +75,66 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<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="154">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
<state relative-caret-position="396">
<caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" />
<state relative-caret-position="356">
<caret line="121" column="42" selection-start-line="121" selection-start-column="42" selection-end-line="121" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json">
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3586">
<caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
<state relative-caret-position="946">
<caret line="43" column="32" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="32" />
</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$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="499">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
<state relative-caret-position="3982">
<caret line="181" column="1" selection-start-line="145" selection-end-line="181" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
<state relative-caret-position="506">
<caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1320">
<caret line="60" column="40" lean-forward="true" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="40" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.js">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1452">
<caret line="67" column="23" lean-forward="true" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
<state relative-caret-position="924">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
</state>
</provider>
</entry>
... ... @@ -166,20 +161,10 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>id</find>
<find>打卡</find>
<find>test</find>
<find>postPosition</find>
<find>getExperiment</find>
<find>recordList</find>
<find>page_number</find>
<find>delStudent</find>
<find>swiper</find>
<find>兑换</find>
<find>mode=&quot;date&quot;</find>
<find>birth_date</find>
<find>default_birth</find>
<find>删除</find>
<find>wxparse</find>
<find>copy</find>
<find>chargenum</find>
... ... @@ -196,9 +181,20 @@
<find>is_choose_test</find>
<find>app/public/getSessionKey</find>
<find>login</find>
<find>chooseTest</find>
<find>background</find>
<find>disableScroll</find>
<find>maxlength</find>
<find>modal</find>
<find>删除</find>
<find>modal_data</find>
<find>state-modal</find>
<find>modal_box</find>
<find>getExperiment</find>
</findStrings>
<dirStrings>
<dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
<dir>D:\小程序\scienceCaptain\ScienceCaptain</dir>
</dirStrings>
</component>
<component name="Git.Settings">
... ... @@ -281,10 +277,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="576" />
<option name="y" value="1" />
<option name="x" value="-129" />
<option name="y" value="109" />
<option name="width" value="1936" />
<option name="height" value="1056" />
<option name="height" value="929" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -409,6 +405,11 @@
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="utils" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
... ... @@ -482,7 +483,11 @@
<workItem from="1545726292000" duration="5146000" />
<workItem from="1550217990354" duration="2213000" />
<workItem from="1550537830511" duration="1208000" />
<workItem from="1550623390588" duration="858000" />
<workItem from="1550623390588" duration="5445000" />
<workItem from="1550709960596" duration="2176000" />
<workItem from="1550796004174" duration="244000" />
<workItem from="1550905359680" duration="1308000" />
<workItem from="1551141819511" duration="118000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
... ... @@ -596,11 +601,18 @@
<option name="project" value="LOCAL" />
<updated>1550218989460</updated>
</task>
<option name="localTasksCounter" value="17" />
<task id="LOCAL-00017" summary="优化选择场次">
<created>1550624335404</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1550624335404</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="270418000" />
<option name="totallyTimeSpent" value="278851000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -674,33 +686,10 @@
<MESSAGE value="去掉测试数据" />
<MESSAGE value="优化预约" />
<MESSAGE value="优化登录出现参数错误问题" />
<option name="LAST_COMMIT_MESSAGE" value="优化登录出现参数错误问题" />
<MESSAGE value="优化选择场次" />
<option name="LAST_COMMIT_MESSAGE" value="优化选择场次" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/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="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/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="16" lean-forward="true" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="14" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
... ... @@ -827,20 +816,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="36" column="50" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3564">
<caret line="162" column="79" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
... ... @@ -956,13 +931,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3586">
<caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
... ... @@ -981,36 +949,54 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1452">
<caret line="67" column="23" lean-forward="true" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<state relative-caret-position="418">
<caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3454">
<caret line="158" column="2" lean-forward="true" selection-start-line="158" selection-start-column="2" selection-end-line="158" selection-end-column="2" />
<state relative-caret-position="1276">
<caret line="58" column="44" selection-start-line="58" selection-start-column="35" selection-end-line="58" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="499">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
<state relative-caret-position="1430">
<caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="946">
<caret line="43" column="32" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3982">
<caret line="181" column="1" selection-start-line="145" selection-end-line="181" selection-end-column="1" />
</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="176">
<state relative-caret-position="506">
<caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" />
</state>
</provider>
... ... @@ -1018,10 +1004,34 @@
<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/index/go-appointment/go-appointment.js">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3454">
<caret line="158" column="2" lean-forward="true" selection-start-line="158" selection-start-column="2" selection-end-line="158" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
<state relative-caret-position="356">
<caret line="121" column="42" selection-start-line="121" selection-start-column="42" selection-end-line="121" selection-end-column="42" />
</state>
</provider>
</entry>
... ...
... ... @@ -115,9 +115,8 @@ Page({
lng: this.data.longitude,
};
app.post(url, params, header).then((res) => {
console.log('打卡结果', res);
if (res.data.is_success) {
this.setData({
// console.log('打卡结果', res);
if (res.data.is_success) { this.setData({
punchState: false,
'state_data.is_showSuccessModal': true,
})
... ...
... ... @@ -5,6 +5,8 @@
display: flex;
flex-direction: column;
justify-content: space-between;
/* padding: 32rpx; */
/* box-sizing: border-box; */
}
.head {
width: 100%;
... ... @@ -16,7 +18,7 @@
}
.img_box {
width: 100%;
height: 400rpx;
height: 300rpx;
}
.activity_img {
width: 100%;
... ...
... ... @@ -36,7 +36,7 @@
"list": []
},
"miniprogram": {
"current": 4,
"current": 5,
"list": [
{
"id": -1,
... ... @@ -67,6 +67,13 @@
"name": "参与团购",
"pathName": "pages/my/takeGroupBuy/takeGroupBuy",
"query": "group_id=90"
},
{
"id": -1,
"name": "aa",
"pathName": "pages/index/activity-detail/activity-detail",
"query": "id=12",
"scene": null
}
]
}
... ...
... ... @@ -18,7 +18,7 @@
</template>
<template name="wxParseImg">
<image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;"
<image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style=""
/>
</template>
... ...