Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mobile-web/src/api/promotion.js
#	mobile-web/src/config/request.js

mobile-web/src/api/promotion.js

@@ -15,5 +15,45 @@ export function getProductRecommendList() {
   return request({
     url: '/promotion-api/users/product_recommend/list',
     method: 'get',
+    params: {
+      id,
+    }
+  });
+}
+
+// Coupon Template
+
+export function getCouponTemplate(id) {
+  return request({
+    url: '/promotion-api/users/coupon/template/get',
+    method: 'get',
+    params: {
+      id,
+    }
+  });
+}
+
+export function doAddCouponCard(templateId) {
+  return request({
+    url: '/promotion-api/users/coupon/card/add',
+    method: 'post',
+    params: {
+      templateId,
+    }
+  });
+}
+
+
+// Coupon Card
+
+export function getCouponPage(status, pageNo, pageSize) {
+  return request({
+    url: '/promotion-api/users/coupon/card/page',
+    method: 'get',
+    params: {
+      status,
+      pageNo,
+      pageSize
+    }
   });
 }