Merge branch 'release/5.5.1' into gray

@@ -385,10 +385,10 @@ const order = (params) => {
  * @param params
  * @param params
  */
  */
 const getOrders = (params) => {
 const getOrders = (params) => {
-    let finalResult = [];
+    let finalResult = Promise.resolve([]);
 
 
     if (!params.uid) {
     if (!params.uid) {
-        return Promise.resolve({});
+        return Promise.resolve([]);
     }
     }
     return _getOrderData(params).then(result => {
     return _getOrderData(params).then(result => {
         if (result.data && result.data.page_total && params.page <= result.data.page_total && result.data.order_list) {
         if (result.data && result.data.page_total && params.page <= result.data.page_total && result.data.order_list) {

@@ -28,32 +28,32 @@ module.exports = () => {
 
 
         if (/^\/help\/limitcodeIntro/.test(req.url)) {
         if (/^\/help\/limitcodeIntro/.test(req.url)) {
             // 什么是限购码 兼容PHP的url
             // 什么是限购码 兼容PHP的url
-            req.url = `/service/limitcodeIntro`;
+            req.url = '/service/limitcodeIntro';
         }
         }
 
 
         if (/^\/help\/limitcodeColSize/.test(req.url)) {
         if (/^\/help\/limitcodeColSize/.test(req.url)) {
             // 选择限购码颜色和尺寸 兼容PHP的url
             // 选择限购码颜色和尺寸 兼容PHP的url
-            req.url = `/service/limitcodeColSize`;
+            req.url = '/service/limitcodeColSize';
         }
         }
 
 
         if (/^\/help\/limitcodeHelp/.test(req.url)) {
         if (/^\/help\/limitcodeHelp/.test(req.url)) {
             // 如何获得限购码 兼容PHP的url
             // 如何获得限购码 兼容PHP的url
-            req.url = `/service/limitcodeHelp`;
+            req.url = '/service/limitcodeHelp';
         }
         }
 
 
         if (/^\/help\/shareorder\.html/.test(req.url)) {
         if (/^\/help\/shareorder\.html/.test(req.url)) {
             // 晒单 兼容PHP的url
             // 晒单 兼容PHP的url
-            req.url = `/service/shareorder`;
+            req.url = '/service/shareorder';
         }
         }
 
 
         if (/^\/index\/systemUpdate/.test(req.url)) {
         if (/^\/index\/systemUpdate/.test(req.url)) {
             // 升级公告 兼容PHP的url
             // 升级公告 兼容PHP的url
-            req.url = `/service/systemUpdate`;
+            req.url = '/service/systemUpdate';
         }
         }
 
 
         if (/^\/coupon\/couponSend/.test(req.url)) {
         if (/^\/coupon\/couponSend/.test(req.url)) {
             // 获取优惠券 兼容php的url
             // 获取优惠券 兼容php的url
-            req.url = `/activity/couponSend`;
+            req.url = '/activity/couponSend';
         }
         }
 
 
         next();
         next();

@@ -2,10 +2,10 @@ require('activity/promotion/promotion.page.css');
 
 
 let $ = require('yoho-jquery');
 let $ = require('yoho-jquery');
 let tip = require('plugin/tip');
 let tip = require('plugin/tip');
-
+let AsideSlider = require('./aslider');
 let dialog = require('plugin/dialog');
 let dialog = require('plugin/dialog');
 
 
-; //eslint-disable-line
+let asideSlider = new AsideSlider(); //eslint-disable-line
 
 
 let province,
 let province,
     school;
     school;

@@ -130,7 +130,7 @@ function getOrders(option) {
         success: function(data) {
         success: function(data) {
             let num;
             let num;
 
 
-            if (data !== '') {
+            if (data.length > 0) {
 
 
                 order.page = opt.page;
                 order.page = opt.page;
 
 

@@ -74,15 +74,15 @@ const getAppPath = () => {
 
 
 if (canOpenApp()) {
 if (canOpenApp()) {
     setTimeout(function() {
     setTimeout(function() {
-        if (window._yas && window._yas.sendCustomInfo) {
-            window._yas.sendCustomInfo({
-                op: 'YB_H5_AWAKE_APP',
-                param: JSON.stringify({
-                    PAGE_NAME: encodeURIComponent(document.title),
-                    PAGE_URL: encodeURIComponent(location.href)
-                })
-            }, true);
-        }
+        // if (window._yas && window._yas.sendCustomInfo) {
+        //     window._yas.sendCustomInfo({
+        //         op: 'YB_H5_AWAKE_APP',
+        //         param: JSON.stringify({
+        //             PAGE_NAME: encodeURIComponent(document.title),
+        //             PAGE_URL: encodeURIComponent(location.href)
+        //         })
+        //     }, true);
+        // }
 
 
         if (window._hmt && window._hmt.push) {
         if (window._hmt && window._hmt.push) {
             window._hmt.push(['_trackEvent', 'H5唤起APP', isiOS ? 'Apple' : 'Android', document.title, location.href]);
             window._hmt.push(['_trackEvent', 'H5唤起APP', isiOS ? 'Apple' : 'Android', document.title, location.href]);

@@ -70,12 +70,15 @@ $('.res-c').on('click', 'a', function() {
     }
     }
 
 
     if (window._yas && window._yas.sendCustomInfo) {
     if (window._yas && window._yas.sendCustomInfo) {
-        window._yas.sendCustomInfo({
-            I_INDEX: index,
-            F_URL: encodeURIComponent(url),
-            F_NAME: name,
-            F_INDEX: pIndex,
-            F_ID: id
+        window._yas.sendCustomInfo && window._yas.sendCustomInfo({
+            op: 'YB_MY_BANNER_C',
+            param: JSON.stringify({
+                I_INDEX: index,
+                F_URL: encodeURIComponent(url),
+                F_NAME: name,
+                F_INDEX: pIndex,
+                F_ID: id
+            })
         }, true);
         }, true);
     }
     }
 });
 });