Silent 6 年之前
父节点
当前提交
29ed36652d
共有 3 个文件被更改,包括 11 次插入5 次删除
  1. 3 1
      app/Http/Controllers/WeChat/ApiController.php
  2. 7 3
      wechat/pages/apply-leave/apply-leave.js
  3. 1 1
      wechat/pages/rate/rate.js

+ 3 - 1
app/Http/Controllers/WeChat/ApiController.php

xqd
@@ -271,7 +271,9 @@ class ApiController extends Controller
         if(empty($share_text) || empty($share_text->value)) {
             return response()->json(['status' => 'fail', 'info' => '找不到分享的文字!']);
         }
-        $text = str_replace_array('{days}', [$items->count() + 1], $share_text->value);
+        $now = Carbon::now()->toDateString();
+        $count = $items->contains($now) ? $items->count() : $items->count() + 1;
+        $text = str_replace_array('{days}', [$count], $share_text->value);
         $share_text_pos = Setting::where('key', 'share_text_pos')->first();
         if(empty($share_text_pos) || empty($share_text_pos->value) || count($pos = explode(',', $share_text_pos->value)) < 2) {
             return response()->json(['status' => 'fail', 'info' => '分享文字位置错误或未设置!']);

+ 7 - 3
wechat/pages/apply-leave/apply-leave.js

xqd
@@ -50,10 +50,14 @@ Page({
       },
       success: res => {
         if(res.data.status == 'success') {
-          wx.showToast({
+          wx.showModal({
             title: '请假成功',
-            icon: 'none',
-            duration: 800
+            content: '请假成功',
+            success: function (res) {
+              wx.switchTab({
+                url: '/pages/userinfo/userinfo',
+              })
+            }
           })
         } else {
           wx.showToast({

+ 1 - 1
wechat/pages/rate/rate.js

xqd
@@ -23,7 +23,7 @@ Page({
       },
       method: 'GET',
       success: res => {
-        console.log(res.data)
+        // console.log(res.data)
         that.setData({
           is_new: res.data.is_new,
           titles: res.data.titles,