From 6cee744ec19072326d6b3bf93ce0323b688751ae Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Sun, 7 Apr 2019 02:34:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=9A=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=8A=B5=E9=A2=86=E5=8F=96=E7=95=8C=E9=9D=A2=EF=BC=88=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/api/promotion.js                      | 10 +++++++---
 mobile-web/src/config/request.js                     | 12 ++++++++++--
 mobile-web/src/config/router.js                      |  7 +++++++
 mobile-web/src/page/coupon/fetch.vue                 |  9 +++++++++
 mobile-web/src/page/page/index.vue                   |  6 +++---
 .../controller/users/UsersBannerController.java      |  1 +
 6 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 mobile-web/src/page/coupon/fetch.vue

diff --git a/mobile-web/src/api/promotion.js b/mobile-web/src/api/promotion.js
index c44ea1106..4b74b1b7a 100644
--- a/mobile-web/src/api/promotion.js
+++ b/mobile-web/src/api/promotion.js
@@ -4,7 +4,7 @@ import request from "../config/request";
 
 export function getBannerList() {
   return request({
-    url: 'promotion-api/users/banner/list',
+    url: '/promotion-api/users/banner/list',
     method: 'get',
   });
 }
@@ -13,7 +13,11 @@ export function getBannerList() {
 
 export function getProductRecommendList() {
   return request({
-    url: 'promotion-api/users/product_recommend/list',
+    url: '/promotion-api/users/product_recommend/list',
     method: 'get',
   });
-}
\ No newline at end of file
+}
+
+// Coupon Template
+
+// Coupon Card
diff --git a/mobile-web/src/config/request.js b/mobile-web/src/config/request.js
index 55b4cdc30..29027aea4 100644
--- a/mobile-web/src/config/request.js
+++ b/mobile-web/src/config/request.js
@@ -15,6 +15,10 @@ const serviceRouter = function(requestUrl) {
         prefix: '/user-api',
         target: 'http://127.0.0.1:18082/user-api',
       },
+      '/promotion-api': {
+        prefix: '/promotion-api',
+        target: 'http://127.0.0.1:18085/promotion-api',
+      },
     };
 
     const configProd = {
@@ -26,6 +30,10 @@ const serviceRouter = function(requestUrl) {
         prefix: '/user-api',
         target: 'http://127.0.0.1:18082/user-api',
       },
+      '/promotion-api': {
+        prefix: '/promotion-api',
+        target: 'http://127.0.0.1:18085/promotion-api',
+      },
     };
 
     if (process.env.NODE_ENV == 'development') {
@@ -117,8 +125,8 @@ service.interceptors.request.use(
     const { target, prefix } = serviceRouter(config.url)
     let url = config.url = config.url.replace(`${prefix}`, target);
     // TODO 芋艿，这些 url 不用增加认证 token 。可能这么写，有点脏，后面看看咋优化下。
-    if (url.indexOf('user-api/users/passport/mobile/send_register_code') != -1
-      || url.indexOf('user-api/users/passport/mobile/register') != -1) {
+    if (url.indexOf('user-api/users/passport/mobile/send_register_code') !== -1
+      || url.indexOf('user-api/users/passport/mobile/register') !== -1) {
       return config;
     }
 
diff --git a/mobile-web/src/config/router.js b/mobile-web/src/config/router.js
index df0b54a61..f519f6f19 100644
--- a/mobile-web/src/config/router.js
+++ b/mobile-web/src/config/router.js
@@ -185,6 +185,13 @@ const routes = [
       title: '分类'
     }
   },
+  {
+    path: '/coupon/fetch',
+    component: () => import('../page/coupon/fetch'),
+    meta: {
+      title: '优惠劵领取'
+    }
+  }
 ];
 
 // add route path
diff --git a/mobile-web/src/page/coupon/fetch.vue b/mobile-web/src/page/coupon/fetch.vue
new file mode 100644
index 000000000..03165896a
--- /dev/null
+++ b/mobile-web/src/page/coupon/fetch.vue
@@ -0,0 +1,9 @@
+<template>
+    <van-cell-group>
+        <van-cell title="单元格" value="内容" />
+        <van-cell title="单元格" value="内容" label="描述信息" />
+    </van-cell-group>
+</template>
+
+<script>
+</script>
diff --git a/mobile-web/src/page/page/index.vue b/mobile-web/src/page/page/index.vue
index d50465234..75f2669a3 100644
--- a/mobile-web/src/page/page/index.vue
+++ b/mobile-web/src/page/page/index.vue
@@ -65,9 +65,9 @@ export default {
         }
     },
     created:function(){
-        GetPage().then(response=>{
-            this.page=response;
-        });
+        // GetPage().then(response=>{
+        //     this.page=response;
+        // });
     },
     mounted: function() {
       // 加载 Banner
diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java
index eb436bb4d..7a3f68164 100644
--- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java
+++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersBannerController.java
@@ -36,3 +36,4 @@ public class UsersBannerController {
     }
 
 }
+