Merge remote-tracking branch 'origin/1.0.0_online' into 1.0.0_online

modules/common/base/base_controller.js

@@ -7,7 +7,7 @@
  */
 import crypto from "crypto";
 import Url from "url";
-import Moment from "moment";
+import Moment from 'moment-timezone';
 // import menuData from "../../../config/menu";
 
 class BaseController {

package.json

@@ -27,12 +27,13 @@
     "bluebird": "^3.5.0",
     "jszip": "^3.1.3",
     "log4js": "~2.3.3",
+    "lz-string": "^1.4.4",
+    "moment-timezone": "^0.5.27",
     "multiparty": "^4.1.3",
+    "node-schedule": "^1.3.0",
     "node-xlsx": "^0.11.2",
     "pdfkit": "^0.8.2",
-    "ueditor": "^1.2.3",
-    "node-schedule": "^1.3.0",
-    "lz-string": "^1.4.4"
+    "ueditor": "^1.2.3"
   },
   "scripts": {
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js"

web/users/views/user/index.html

@@ -117,8 +117,8 @@
                     <td><%= model.province[user.province] %></td>
                     <td><%= compilationMap[user.latest_used]?compilationMap[user.latest_used].name:""%></td>
                     <td><a onclick="getOnlineInfo('<%= user._doc.filter%>')" href="#time-detail" data-toggle="modal" data-target="#time-detail"><%= user._doc.online_times %></a></td>
-                    <td><%= moment(user.create_time).format('YYYY-MM-DD HH:mm:ss') %></td>
-                    <td><%= user.latest_login?moment(user.latest_login).format('YYYY-MM-DD HH:mm:ss'):"" %></td>
+                    <td><%= moment(user.create_time).tz("Asia/Shanghai").format('YYYY-MM-DD HH:mm:ss') %></td>
+                    <td><%= user.latest_login?moment(user.latest_login).tz("Asia/Shanghai").format('YYYY-MM-DD HH:mm:ss'):"" %></td>
                     <!--<td><a role="button" data-toggle="modal" data-target="#view" onclick='getUserInfo("<%= user._id.toString()%>")'>详细</a></td>-->
                     <% if (manager.superAdmin == 1) { %>
                     <td>