1

pages/index/index.js

@@ -36,56 +36,7 @@ Page({
   },
 
   onReady() {
-    const rate = wx.getSystemInfoSync().screenWidth / 750,
-      context = wx.createCanvasContext('progressCanvas');
-    context.translate(375 * rate, 255 * rate);
-    this.data.progressCanvasContext = context;
-    this.data.progressCanvasRate = rate;
-    // 画进度条总长
-    context.setStrokeStyle('rgba(255, 255, 255, 0.4)');
-    context.setLineWidth(4 * rate);
-    context.setLineCap('round');
-    context.beginPath();
-    context.arc(0, 0, 245 * rate, 0.90625 * Math.PI, 2.09375 * Math.PI, false);
-    context.stroke();
-    // 画刻度
-    context.setStrokeStyle('#ffffff');
-    context.setLineWidth(4 * rate);
-    context.rotate(-0.09375 * Math.PI);
-    context.beginPath();
-    const keduLeft = -230 * rate,
-      keduRight = -220 * rate,
-      oneKedu = 0.03125 * Math.PI;
-    context.moveTo(keduLeft, 0);
-    context.lineTo(keduRight, 0);
-    context.stroke();
-    for (let i = 0; i < 38; i++) {
-      context.rotate(oneKedu);
-      context.beginPath();
-      context.moveTo(keduLeft, 0);
-      context.lineTo(keduRight, 0);
-      context.stroke();
-    }
-    // 画当前圆球
-    context.setFillStyle('#ffffff');
-    context.rotate(2.544);
-    context.arc(-245 * rate, 0, 7 * rate, 0, 2 * Math.PI, false);
-    context.fill();
-    // 画
-    context.draw(false, drawRes => {
-      if (drawRes.errMsg === 'drawCanvas:ok') {
-        wx.canvasToTempFilePath({
-          canvasId: 'progressCanvas',
-          success:(ImageRes) => {
-            this.setData({
-              progressCanvasImage: ImageRes.tempFilePath
-            });
-          }
-        });
-      } else {
-        // 重画
-      }
-    });
+    this.initCanvas();
   },
 
   getPageData() {
@@ -266,6 +217,8 @@ Page({
           },
           method: 'POST',
           success:(res) => {
+            wx.hideLoading();
+            if (res.data.code === 0) {
               this.data.isFirstReq = false;
               const resData = res.data.data;
               // 数据处理，结合!!两个数组!!判断是否显示打卡角标和状态
@@ -298,8 +251,14 @@ Page({
                 setData.currentSteps = (resData.step_data && resData.step_data[0]) ? resData.step_data[0].step : 0;
               }
               this.setData(setData);
-            wx.hideLoading();
               this.showToast();
+            } else {
+              wx.showToast({
+                title: '同步步数失败，请联系客服处理',
+                icon: 'none',
+                duration: 2000
+              });
+            }
           },
           fail: () => {
             wx.hideLoading();
@@ -616,6 +575,60 @@ Page({
     }
   },
 
+  // 初始化仪表盘
+  initCanvas() {
+    const rate = wx.getSystemInfoSync().screenWidth / 750,
+      context = wx.createCanvasContext('progressCanvas');
+    context.translate(375 * rate, 255 * rate);
+    this.data.progressCanvasContext = context;
+    this.data.progressCanvasRate = rate;
+    // 画进度条总长
+    context.setStrokeStyle('rgba(255, 255, 255, 0.4)');
+    context.setLineWidth(4 * rate);
+    context.setLineCap('round');
+    context.beginPath();
+    context.arc(0, 0, 245 * rate, 0.90625 * Math.PI, 2.09375 * Math.PI, false);
+    context.stroke();
+    // 画刻度
+    context.setStrokeStyle('#ffffff');
+    context.setLineWidth(4 * rate);
+    context.rotate(-0.09375 * Math.PI);
+    context.beginPath();
+    const keduLeft = -230 * rate,
+      keduRight = -220 * rate,
+      oneKedu = 0.03125 * Math.PI;
+    context.moveTo(keduLeft, 0);
+    context.lineTo(keduRight, 0);
+    context.stroke();
+    for (let i = 0; i < 38; i++) {
+      context.rotate(oneKedu);
+      context.beginPath();
+      context.moveTo(keduLeft, 0);
+      context.lineTo(keduRight, 0);
+      context.stroke();
+    }
+    // 画当前圆球
+    context.setFillStyle('#ffffff');
+    context.rotate(2.544);
+    context.arc(-245 * rate, 0, 7 * rate, 0, 2 * Math.PI, false);
+    context.fill();
+    // 画
+    context.draw(false, drawRes => {
+      if (drawRes.errMsg === 'drawCanvas:ok') {
+        wx.canvasToTempFilePath({
+          canvasId: 'progressCanvas',
+          success:(ImageRes) => {
+            this.setData({
+              progressCanvasImage: ImageRes.tempFilePath
+            });
+          }
+        });
+      } else {
+        // 重画
+      }
+    });
+  },
+
   // 暂留==================================================================
 
   // 通过code2session方式拿unionid