修改打卡

wumengyu
.idea/workspace.xml
pages/clock/clock.js
pages/index/activity-detail/activity-detail.wxss
pages/my/order-detail/order-detail.js
--- a/.idea/workspace.xml
查看文件 @2c73133
+++ b/.idea/workspace.xml
查看文件 @2c73133
@@ -3,6 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化选择场次">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/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/" />
@@ -17,32 +20,32 @@
     <session id="-381596063">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="29" />
-          <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="5" />
           <entry key="project.open.time.9" value="3" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.opened" value="33" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="js" value="178" />
+          <entry key="js" value="179" />
           <entry key="json" value="33" />
           <entry key="wxml" value="145" />
-          <entry key="wxss" value="56" />
+          <entry key="wxss" value="57" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CSS" value="56" />
+          <entry key="CSS" value="57" />
           <entry key="HTML" value="145" />
           <entry key="JSON" value="33" />
-          <entry key="JavaScript" value="178" />
+          <entry key="JavaScript" value="179" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
@@ -73,30 +76,26 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
+        <entry file="file://$PROJECT_DIR$/app.json">
           <provider selected="true" editor-type-id="text-editor">
-            <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 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/my/myProfile/myProfile.js">
+      <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="1430">
-              <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
+            <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="true">
-        <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>
+      <file pinned="false" current-in-tab="false">
+        <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">
@@ -162,7 +161,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>swiper</find>
       <find>兑换</find>
       <find>mode=&quot;date&quot;</find>
       <find>birth_date</find>
@@ -192,6 +190,7 @@
       <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>
@@ -278,10 +277,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="523" />
-    <option name="y" value="105" />
+    <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">
@@ -487,6 +486,8 @@
       <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>
@@ -611,10 +612,11 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="277425000" />
+    <option name="totallyTimeSpent" value="278851000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -688,13 +690,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="优化选择场次" />
   </component>
   <component name="editorHistoryManager">
-    <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">
@@ -936,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">
@@ -985,6 +973,13 @@
         </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">
@@ -1030,10 +1025,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app.json">
+    <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="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 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>
--- a/pages/clock/clock.js
查看文件 @2c73133
+++ b/pages/clock/clock.js
查看文件 @2c73133
@@ -116,7 +116,7 @@ Page({
                 };
                 app.post(url, params, header).then((res) => {
                     // console.log('打卡结果', res);
-                    if (+res.is_success) {
+                    if (res.data.is_success) {
                         this.setData({
                             punchState: false,
                             'state_data.is_showSuccessModal': true,
--- a/pages/index/activity-detail/activity-detail.wxss
查看文件 @2c73133
+++ b/pages/index/activity-detail/activity-detail.wxss
查看文件 @2c73133
@@ -18,7 +18,7 @@
 }
 .img_box {
     width: 100%;
-    height: 400rpx;
+    height: 300rpx;
 }
 .activity_img {
     width: 100%;
--- a/pages/my/order-detail/order-detail.js
查看文件 @2c73133
+++ b/pages/my/order-detail/order-detail.js
查看文件 @2c73133
@@ -41,6 +41,7 @@ Page({
             "XX-token": wx.getStorageSync('token')
         };
         let params = {
+            is_order_detail: 1,
             page: this.data.page_number,
         };
         app.post(url,params,header).then((res) => {