【feat】【v3】

1.页面逻辑优化

src/pages/statData.vue

@@ -10,19 +10,19 @@
     <!-- 积分变动 -->
     <view class="charts-box">
       <qiun-data-charts type="line" :opts="chartOpts" :chartData="chartsData.pointsLineVO" :canvas2d="true"
-        :loadingType="chatLoadingType" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj1" />
+        :loadingType="chatLoadingType" :ontouch="true" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj1" />
     </view>
 
     <!-- 任务完成数 -->
     <view class="charts-box">
       <qiun-data-charts type="line" :opts="chartOpts" :chartData="chartsData.taskLineVO" :canvas2d="true"
-        :loadingType="chatLoadingType" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj2" />
+        :loadingType="chatLoadingType" :ontouch="true" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj2" />
     </view>
 
     <!-- 新用户数，特权用户专属 -->
-    <view class="charts-box">
+    <view class="charts-box" v-if="chartsData.userLineVO">
       <qiun-data-charts type="line" :opts="chartOpts" :chartData="chartsData.userLineVO" :canvas2d="true"
-        :loadingType="chatLoadingType" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj3" />
+        :loadingType="chatLoadingType" :ontouch="true" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj3" />
     </view>
   </view>
 
@@ -38,9 +38,9 @@
               <span v-if="piTaskHistory.punchInResult == PUNCH_IN_RESULT.DONE"> 完成打卡</span>
               <span v-else> 未完成打卡</span>
               <span v-if="piTaskHistory.punchInMethod == PUNCH_IN_METHOD.COUNT">，打卡{{ piTaskHistory.countTrack
-                }}次</span>
+              }}次</span>
               <span v-if="piTaskHistory.punchInMethod == PUNCH_IN_METHOD.TIMING">，打卡时长{{ piTaskHistory.timeTrack
-                }}</span>
+              }}</span>
             </template>
           </uni-list-item>
         </uni-list>
@@ -98,7 +98,9 @@ const chartOpts = ref({
   xAxis: {
     disableGrid: true,
     scrollShow: true,
-    itemCount: 1
+    itemCount: 7,
+    scrollAlign: 'right',
+    rotateLabel: true
   },
   yAxis: {
     gridType: "dash",
@@ -119,7 +121,7 @@ const chartOpts = ref({
 const chartsData = ref({
   pointsLineVO: {},
   taskLineVO: {},
-  userLineVO: {}
+  userLineVO: null
 });
 
 // 方法
@@ -157,7 +159,7 @@ const loadStatPointsData = async () => {
  */
 const loadStatNewUserData = async () => {
   let res = await statApi.queryStatNewUserLine();
-  chartsData.value.userLineVO = res ? res : {};
+  chartsData.value.userLineVO = res ? res : null;
 }
 
 /**
@@ -209,7 +211,7 @@ onPullDownRefresh(() => {
 .charts-box {
   padding: 16rpx 16rpx;
   width: 100%;
-  height: 400rpx;
+  height: 450rpx;
 }
 
 .log-box {

src/pages/task/taskDetail.vue

@@ -77,7 +77,7 @@
 
   <view class="charts-box">
     <qiun-data-charts type="line" :opts="chartOpts" :chartData="statData.lineVO" :canvas2d="true"
-      :loadingType="chatLoadingType" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj" />
+      :loadingType="chatLoadingType" :ontouch="true" canvasId="mbnxeAGxItOvNjxrYfKUKyifYeNyjLGj" />
   </view>
 
   <uni-section title="打卡日志" padding="16px" type="line">

src/pages/task/taskEdit.vue

@@ -633,26 +633,28 @@ const deleteContinueTaskExt = (id) => {
 /**
  * 保存打卡任务
  */
-const saveTask = () => {
-  taskForm.value.validate(['id']).then(() => {
-    return punchInApi.saveTask(taskFormData.value)
-  }).then(datt => {
-    uni.showToast({
-      title: '保存成功',
-      icon: 'success',
-      duration: 2000
-    });
-    setTimeout(() => {
-      uni.navigateBack();
-    }, 2000);
-  }).catch(err => {
-    console.log('表单错误信息：', err);
+const saveTask = async () => {
+  try {
+    await taskForm.value.validate(['id']);
+  } catch (e) {
     uni.showModal({
       title: "保存失败",
       content: "请检查表单项是否已正确填写",
       showCancel: false
     });
+    return;
+  }
+
+  await punchInApi.saveTask(taskFormData.value);
+
+  uni.showToast({
+    title: '保存成功',
+    icon: 'success',
+    duration: 2000
   });
+  setTimeout(() => {
+    uni.navigateBack();
+  }, 2000);
 }
 
 /**

src/pages/taskList.vue

@@ -34,7 +34,8 @@
               <view class="detail-box" style="background-color: #D43030;"
                 v-if="punchInRecord.punchInResult == 'UNDONE'">
               </view>
-              <view class="detail-box" v-if="punchInRecord.punchInResult == 'FUTURE'">
+              <view class="detail-box"
+                v-if="punchInRecord.punchInResult == 'FUTURE' || punchInRecord.punchInResult == 'TODAY_UNKNOWN'">
               </view>
             </view>
           </view>