Merge remote-tracking branch 'origin/feature/couponCenter' into release/6.1

@@ -285,10 +285,10 @@ exports.floor = (params, isApp, appVersion) => {
     })();
     })();
 };
 };
 
 
-exports.status = (params, isApp) => {
+exports.status = (params) => {
     return Promise.coroutine(function*() {
     return Promise.coroutine(function*() {
         const resource = yield api.get('', Object.assign(params, {
         const resource = yield api.get('', Object.assign(params, {
-            method: 'app.promotion.queryCouponCenter'
+            method: 'app.promotion.couponStatus'
         }));
         }));
         const result = {
         const result = {
             code: resource.code,
             code: resource.code,
@@ -296,13 +296,12 @@ exports.status = (params, isApp) => {
         };
         };
 
 
         if (resource && resource.code === 200 && resource.data.length) {
         if (resource && resource.code === 200 && resource.data.length) {
-            resource.data.forEach(function(d) {
-                if (d.template_name === 'getCoupon') {
-                    if (d.data && d.data[0] && ['2', '3'].indexOf(d.data[0].status) > -1) {
-                        result.data.push(processFun.getCoupon(d.data, isApp));
-                    }
-                }
-
+            resource.data.forEach(function(val) {
+                result.data.push({
+                    hasNum: val.hasNum,
+                    couponId: crypto.encryption('yoho9646abcdefgh', String(val.couponId)),
+                    status: val.status
+                });
             });
             });
         }
         }
         return result;
         return result;

@@ -74,7 +74,7 @@
     "xml2js": "^0.4.19",
     "xml2js": "^0.4.19",
     "yoho-express-session": "^2.0.0",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "=0.3.4",
+    "yoho-node-lib": "=0.3.5",
     "yoho-zookeeper": "^1.0.8"
     "yoho-zookeeper": "^1.0.8"
   },
   },
   "devDependencies": {
   "devDependencies": {

@@ -18,6 +18,12 @@ function getUrlParam(name) {
     return window.queryString[name];
     return window.queryString[name];
 }
 }
 
 
+// 券显示状态
+function couponShow($parents, $sons) {
+    $parents.find('[class^=main-right-]').hide();
+    $parents.find(`.main-right-${$sons}`).show();
+}
+
 // 获取领券状态
 // 获取领券状态
 setTimeout(function() {
 setTimeout(function() {
     let req = '',
     let req = '',
@@ -43,28 +49,19 @@ setTimeout(function() {
             if (res.code === 200) {
             if (res.code === 200) {
                 let cates = res.data || [];
                 let cates = res.data || [];
 
 
-                cates.forEach(function(obj) {
-                    let e = document.getElementById(obj.couponID);
-
-                    if (!e) {
-                        return;
-                    }
-
-                    let child = e.children;
-
-                    if (!child.length) {
-                        return;
-                    }
-
-                    for (let i = 0; i < child.length; i++) {
-                        if (child[i].className.indexOf('receive') > -1) {
-                            child[i].classList.add('hidden');
-                        }
-
-                        if ((obj.isGeted && child[i].className.indexOf('use') > -1) ||
-                            (obj.isZero && child[i].className.indexOf('go') > -1)) {
-                            child[i].classList.remove('hidden');
-                        }
+                cates.forEach((obj) => {
+                    let e = document.getElementById(obj.couponId);
+                    let $e = $(e);
+                    let status = obj.status;
+
+                    switch (status) {
+                        case 1: couponShow($e, 'receive');
+                            break;
+                        case 2: couponShow($e, 'go');
+                            break;
+                        case 3: couponShow($e, 'use');
+                            break;
+                        default: couponShow($e, 'go');
                     }
                     }
                 });
                 });
             }
             }