bianjunhui пре 1 година
родитељ
комит
bcf889b38a
2 измењених фајлова са 3 додато и 2 уклоњено
  1. 2 1
      application/api/controller/Assms.php
  2. 1 1
      public/assets/js/backend/sms/log.js

+ 2 - 1
application/api/controller/Assms.php

@@ -64,7 +64,8 @@ class Assms extends Api
                 $data[$k]['status']=$datas['status'];
                 $data[$k]['mobile']=$datas['mobile'];
                 $data[$k]['addtime']=time();
-                $data[$k]['uptime']=time()+$v['sendtime'];
+                $data[$k]['uptime']=time();
+                $data[$k]['sendtime']=time()+$v['sendtime'];
                 $data[$k]['remarks']=$countryMobile;
                 $data[$k]['template_body']= $this->getMssage($v['template_body'],$name);
                 $data[$k]['template_name']= $v['name'];

+ 1 - 1
public/assets/js/backend/sms/log.js

@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'email', title: __('邮箱'), operate: 'LIKE'},
                         {field: 'quote_id', title: __('购物车ID')},
                         {field: 'addtime', title: __('添加时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'uptime', title: __('发送时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'sendtime', title: __('发送时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'status', title: __('Status'), searchList: {"1":__('待发送'),"2":__('发送中'),"3":__('已发送')}, formatter: Table.api.formatter.status},