Merge branch 'feature/catch' into 'master'

Feature/catch

添加catch、修改商品价格样式

See merge request !12

@@ -33,13 +33,13 @@ const fav = {
         if (tab === 'article') {
         if (tab === 'article') {
             favModel.getFavArticleData(uid, udid, page, 10).then(data => {
             favModel.getFavArticleData(uid, udid, page, 10).then(data => {
                 return res.json(data);
                 return res.json(data);
-            });
+            }).catch(next);
         } else if (tab === 'brand') {
         } else if (tab === 'brand') {
             const gender = '1,2,3';
             const gender = '1,2,3';
 
 
             favModel.getFavBrandData(uid, gender, page, 10).then(data => {
             favModel.getFavBrandData(uid, gender, page, 10).then(data => {
                 return res.json(data);
                 return res.json(data);
-            });
+            }).catch(next);
         } else {
         } else {
             favModel.getFavProductData(uid, page, 10).then(data => {
             favModel.getFavProductData(uid, page, 10).then(data => {
                 return res.json(data);
                 return res.json(data);

@@ -105,7 +105,7 @@ const refund = {
      * @param res
      * @param res
      * @returns {*|{read, write}}
      * @returns {*|{read, write}}
      */
      */
-    getRefundOrders(req, res) {
+    getRefundOrders(req, res, next) {
         const uid = req.user.uid;
         const uid = req.user.uid;
 
 
         if (!uid && req.xhr) {
         if (!uid && req.xhr) {
@@ -122,7 +122,7 @@ const refund = {
 
 
         refundModel.getRefundOrders(param).then(result => {
         refundModel.getRefundOrders(param).then(result => {
             return res.json(result);
             return res.json(result);
-        });
+        }).catch(next);
     },
     },
 
 
     /**
     /**
@@ -130,7 +130,7 @@ const refund = {
      * @param req
      * @param req
      * @param res
      * @param res
      */
      */
-    cancelApply(req, res) {
+    cancelApply(req, res, next) {
         const uid = req.user.uid;
         const uid = req.user.uid;
         const id = req.body.id;
         const id = req.body.id;
 
 
@@ -142,7 +142,7 @@ const refund = {
         }
         }
         refundModel.cancelRefundApply(uid, id).then(result => {
         refundModel.cancelRefundApply(uid, id).then(result => {
             return res.json(result);
             return res.json(result);
-        });
+        }).catch(next);
     }
     }
 };
 };
 
 

@@ -133,7 +133,7 @@
     }
     }
 
 
     .good-price {
     .good-price {
-        color: #b0b0b0;
+        color: #000;
         margin-right: 14px;
         margin-right: 14px;
         font-size: 24px;
         font-size: 24px;
 
 
@@ -143,10 +143,11 @@
 
 
         &.old-price {
         &.old-price {
             text-decoration: line-through;
             text-decoration: line-through;
+            color: #b0b0b0;
         }
         }
 
 
         &.sale-price {
         &.sale-price {
-            color: #d0021b;
+            color: #000;
         }
         }
     }
     }