Silent 6 years ago
parent
commit
abe0f3c8b5

+ 7 - 7
app/Http/Controllers/WeChat/ApiController.php

xqd
@@ -367,13 +367,13 @@ class ApiController extends Controller
                 }
             }
         }
-        $today = $now->day;
-        for($i = 1; $i <= $today; ++$i) {
-            $tmp = $checkCardList->where('day', $i);
-            if($tmp->count() == 0) {
-                $checkCardList->push(collect(['month' => 'current', 'day' => $i, 'color' => '#f65556']));
-            }
-        }
+//        $today = $now->day;
+//        for($i = 1; $i <= $today; ++$i) {
+//            $tmp = $checkCardList->where('day', $i);
+//            if($tmp->count() == 0) {
+//                $checkCardList->push(collect(['month' => 'current', 'day' => $i, 'color' => '#f65556']));
+//            }
+//        }
 
         $thisMonthLearnTime = $this->getHumanTime($thisMonthLearnTime);
         $totalLearnTime = $this->getHumanTime($totalLearnTime);

+ 2 - 2
wechat/app.json

xqd xqd
@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/form/index",
     "pages/index/index",
     "pages/announce/announce",
     "pages/announce-detail/index",
@@ -13,7 +12,8 @@
     "pages/my-log/my-log",
     "pages/apply-leave/apply-leave",
     "pages/login/index",
-    "pages/bind-phone/index"
+    "pages/bind-phone/index",
+    "pages/form/index"
   ],
   "window": {
     "backgroundTextStyle": "light",

+ 1 - 0
wechat/pages/form/index.js

xqd
@@ -47,6 +47,7 @@ Page({
     } else {
       value.type = 'form';
     }
+    value.id = wx.getStorageSync('we_chat_user_id')
     if(data.text_1_need == 1 && !value.text_1) {
       wx.showToast({
         icon: 'none',

+ 1 - 1
wechat/pages/my-log/my-log.js

xqd
@@ -63,7 +63,7 @@ Page({
       },
       success: res => {
         if (res.data.status == 'success') {
-          console.log(res)
+          // console.log(res)
           this.setData({
             loged: res.data.checkCardList,
             thisMonthLearnTime: res.data.thisMonthLearnTime,

+ 1 - 0
wechat/pages/my-log/my-log.wxml

xqd
@@ -4,6 +4,7 @@
     days-color="{{loged}}"
     weeks-type="cn"
     show-more-days="true"
+    active-type="rounded"
   />
   <zan-cell-group>
     <zan-cell title="本月积累学习时长" value="{{ thisMonthLearnTime }}"> </zan-cell>