合并分支 'heshupeng' 到 'master'

模板消息时间bug



查看合并请求 !388

@@ -198,7 +198,7 @@ class Store extends Backend
                         $send_data = array(
                             "first"  => '恭喜您，商户申请审核通过！',
                             "keyword1" => $row->store_name,
-                            "keyword2"  => date('Y-m-s',time()),
+                            "keyword2"  => date('Y-m-d',time()),
                             "remark" => ['点击进入商户后台','#FF0000'],
                         );
                         $openid = Db::name('third')->where('user_id',$row->user_id)->value('openid');

@@ -530,7 +530,7 @@ class Hot extends Api
             $send_data = array(
                 "first"  => '您有一条新的消息',
                 'keyword1' => $param['content'] ? $param['content'] : '【图片消息】',
-                "keyword2"  => date('Y-m-s H:i:s',time()),
+                "keyword2"  => date('Y-m-d H:i:s',time()),
                 "remark" => ['点击查看详情','#FF0000'],
             );
             $openid = Db::name('third')->where('user_id',$store['user_id'])->value('openid');

@@ -532,7 +532,7 @@ class House extends Api
                     "first"  => '您好，您有一个未处理的绑定小区申请！',
                     "keyword1" => $param['name'],
                     "keyword2"  => $param['phone'],
-                    "keyword3"  => date('Y年m月s日 H:i',time()),
+                    "keyword3"  => date('Y年m月d日 H:i',time()),
                     "remark" => ['请尽快处理！','#FF0000'],
                 );
                 $url = $this->request->root(true).'/admininfo.php/index/login';

@@ -432,7 +432,7 @@ class HouseAdmin extends Api
                 $send_data = array(
                     "first"  => '您绑定的社区【'.$house_name.'】发布了一条公告',
                     "keyword1" => $post['title'],
-                    "keyword2"  => date('Y-m-s H:i:s',time()),
+                    "keyword2"  => date('Y-m-d H:i:s',time()),
                     "keyword3"  => $post['content'],
                     "remark" => ['点击查看详情','#FF0000'],
                 );
@@ -882,7 +882,7 @@ class HouseAdmin extends Api
             $send_data = array(
                 "first"  => '您有一条新的消息',
                 'keyword1' => $content ? $content : '【图片消息】',
-                "keyword2"  => date('Y-m-s H:i:s',time()),
+                "keyword2"  => date('Y-m-d H:i:s',time()),
                 "remark" => ['点击查看详情','#FF0000'],
             );
             $openid = Db::name('third')->where('user_id',$msg['user_id'])->value('openid');

@@ -426,7 +426,7 @@ class HouseBoard extends Api
             $send_data = array(
                 "first"  => '您有一条新的消息',
                 'keyword1' => $param['content'] ? $param['content'] : '【图片消息】',
-                "keyword2"  => date('Y-m-s H:i:s',time()),
+                "keyword2"  => date('Y-m-d H:i:s',time()),
                 "remark" => ['点击查看详情','#FF0000'],
             );
             $openid = Db::name('third')->where('user_id',$param['house_user_id'])->value('openid');

@@ -780,7 +780,7 @@ class Store extends Api
                 "first"  => '您好，您有一个未处理的广告申请！',
                 "keyword1" => $store['name'],
                 "keyword2"  => $store['mobile'],
-                "keyword3"  => date('Y年m月s日 H:i',time()),
+                "keyword3"  => date('Y年m月d日 H:i',time()),
                 "remark" => ['请尽快处理！','#FF0000'],
             );
             $url = $this->request->root(true).'/admininfo.php/index/login';
@@ -1393,7 +1393,7 @@ class Store extends Api
             $send_data = array(
                 "first"  => '您有一条新的消息',
                 'keyword1' => $param['content'] ? $param['content'] : '【图片消息】',
-                "keyword2"  => date('Y-m-s H:i:s',time()),
+                "keyword2"  => date('Y-m-d H:i:s',time()),
                 "remark" => ['点击查看详情','#FF0000'],
             );
             $openid = Db::name('third')->where('user_id',$msg['user_id'])->value('openid');

@@ -713,7 +713,7 @@ class User extends Api
             $send_data = array(
                 "first"  => '您有一条新的消息',
                 'keyword1' => $param['content'] ? $param['content'] : '【图片消息】',
-                "keyword2"  => date('Y-m-s H:i:s',time()),
+                "keyword2"  => date('Y-m-d H:i:s',time()),
                 "remark" => ['点击查看详情','#FF0000'],
             );
             $openid = Db::name('third')->where('user_id',$msg['object_user_id'])->value('openid');

@@ -129,7 +129,7 @@ class Ajax extends Frontend
                     "first"  => '您好，您有一个未处理的商家申请！',
                     "keyword1" => $info['name'],
                     "keyword2"  => $info['mobile'],
-                    "keyword3"  => date('Y年m月s日 H:i',time()),
+                    "keyword3"  => date('Y年m月d日 H:i',time()),
                     "remark" => ['请尽快处理！','#FF0000'],
                 );
                 $url = $this->request->root(true).'/admininfo.php/index/login';