wesmiler

public/static/weixin/js/shop-apply.js

@@ -2,7 +2,7 @@ var app = new Vue({
     el: '#app',
     data: {
         submitStatus: false,
-        shopInfo: {status: 1, address: ''},
+        shopInfo: {status: 1, address: '', service_time: '08:00~22:00'},
         // 会员信息
         memberInfo: {},
         // 提交状态
@@ -97,6 +97,7 @@ var app = new Vue({
                         shopInfo = sessionStorage.getItem('shopInfo');
                         _this.shopInfo = shopInfo? JSON.parse(shopInfo) : {};
                     }
+                    _this.shopInfo.service_time = typeof(_this.shopInfo.service_time) != 'undefined'? _this.shopInfo.service_time : '08:00~22:00';
                 } else if (res.code == 'login') {
                     login(res.data.url);
                 }

vendor/thinkcmf/cmf-app/src/weixin/controller/NewsController.php

@@ -49,7 +49,7 @@ class NewsController extends HomeBaseController
             ->toArray();
 
         foreach($dataList as &$item){
-            $item['time'] = isset($item['created_at'])? getFormatTime($item['created_at']) : '';
+            $item['time'] = isset($item['created_at'])? getFormatTime($item['created_at'], 'Y-m-d') : '';
             $item['user_nickname'] = !empty($item['user_nickname'])? formatNickname($item['user_nickname']) : '用户XXXXXX';
             $item['user_login'] = !empty($item['user_login'])? formatName($item['user_login']) : '用户XXXXXX';
         }

vendor/thinkcmf/cmf/src/common.php

@@ -2475,10 +2475,11 @@ function str_to_arr($string)
  * @param $ptdate
  * @return false|string
  */
-function getFormatTime($ptdate)
+function getFormatTime($ptdate, $dateFormat='')
 {
     $ptime = strtotime($ptdate);
     $etime = time() - $ptime;
+    $dateFormat = $dateFormat? $dateFormat : 'Y-m-d H:i';
     switch ($etime) {
         case $etime <= 60:
             $msg = '刚刚';
@@ -2493,7 +2494,7 @@ function getFormatTime($ptdate)
             $msg = date('Ymd', $ptime) + 1 == date('Ymd', time()) ? '昨天 ' . date('H点', $ptime) : '前天 ' . date('H点', $ptime);
             break;
         case $etime > 2 * 24 * 60 * 60 && $etime <= 12 * 30 * 24 * 60 * 60:
-            $msg = date('Y', $ptime) == date('Y', time()) ? date('m月d日', $ptime) : date('Y-m-d H:i', $ptime);
+            $msg = date('Y', $ptime) == date('Y', time()) ? date('m月d日', $ptime) : date($dateFormat, $ptime);
 //            $msg = date('Y',$ptime)==date('Y',time()) ? date('m-d H:i',$ptime) : date('Y-m-d H:i',$ptime);
             break;
         default: