Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/const/project_setting.js

@@ -9,11 +9,11 @@
  */
 // 重新发送通知设置
 const notice_setting = {
-    fixed: 6, // 固定间隔
+    fixed: 12, // 固定间隔
     activity: { // 活动间隔
-        first: 6,
+        first: 12,
         second: 6,
-        later: 6,
+        later: 3,
     },
     mode: 'fixed', // 默认模式
     shield_times: { // 屏蔽时间段

app/view/setting/user_permission_modal.ejs

@@ -279,12 +279,17 @@
                     _self.val(6);
                     return;
                 }
-                rate = _.round(rate);
+                // 如果是小数，自动转成整数
+                if (rate.toString().indexOf('.') !== -1) {
+                    toastr.warning('请输入1-24之前的整数值');
+                }
+                rate = parseInt(rate);
                 if(rate < 1 || rate > 24) {
                     toastr.error('请输入1-24之前的整数值');
                     _self.val(6);
                     return;
                 }
+                _self.val(rate);
             }, 500);
         });
         $('#set_wx_button').click(function () {