Merge branch 'master' into feature/web-apm

@@ -646,7 +646,7 @@ exports.getTimeList = function(req, res, next) {
 };
 
 exports.addOrder = function(req, res, next) {
-    let uid = req.user.uid || req.query.uid;
+    let uid = req.user.uid;
     let params = {
         storeId: req.query.storeId,
         appointTime: req.query.appointTime,
@@ -670,6 +670,7 @@ exports.addOrder = function(req, res, next) {
 exports.delOrder = function(req, res, next) {
 
     let params = {
+        uid: req.user.uid,
         id: req.query.id,
         isFront: req.query.isFront || req.cookies.isFront
     };
@@ -737,6 +738,7 @@ exports.err = function(req, res) {
 exports.changeDate = function(req, res, next) {
 
     let params = {
+        uid: req.user.uid,
         id: req.query.id,
         storeId: req.query.storeId,
         appointTimeStr: req.query.appointTimeStr,

@@ -1449,6 +1449,7 @@ const cutter = (params) => {
 // 删除预约订单
 const delOrder = (params) => {
     return service.get('AppointmentController/frontCancelAppoint', {
+        uid: params.uid,
         id: params.id,
         isFront: params.isFront
     }).then(result => {
@@ -1462,6 +1463,7 @@ const changeDate = (params) => {
     let appointTimeStr = _originDay(params.appointTimeStr);
 
     return service.get('AppointmentController/updateFrontAppointTime', {
+        uid: params.uid,
         storeId: params.storeId,
         id: params.id,
         appointTimeStr: appointTimeStr,

 <div class="trend-c map-c share-map" id="no-download">
-	<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=55E5CFCa68831302cebe0acdd575c77d"></script>
-	<script type="text/javascript" src="http://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.js"></script>
+	<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=55E5CFCa68831302cebe0acdd575c77d"></script>
+	<script type="text/javascript" src="https://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.js"></script>
 	<div id="map"></div>
 </div>

@@ -96,6 +96,7 @@
     "jquery-lazyload": "^1.9.7",
     "nodemon": "^1.12.0",
     "opn": "^5.1.0",
+    "postcss": "^6.0.9",
     "postcss-assets": "^5.0.0",
     "postcss-calc": "^6.0.0",
     "postcss-center": "^1.0.0",

 var $ = require('yoho-jquery');
-var lazyLoad = require('plugin/lazyload');
+var lazyLoad = require('yoho-jquery-lazyload');
 var Swiper = require('yoho-swiper');
 var qs = require('yoho-qs');
 var yoho = require('../yoho-app');