From 2c7812d078dfdd20b7fcc9c50b84915f692f8642 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Wed, 2 Sep 2020 19:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E4=B8=BA?=
=?UTF-8?q?=E4=BD=A0=E6=8E=A8=E8=8D=90=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/PromotionGood.vue | 136 +++++++++++++++++++++++++++++++----
config/index.js | 4 +-
pages/home/index.vue | 94 ++----------------------
3 files changed, 128 insertions(+), 106 deletions(-)
diff --git a/components/PromotionGood.vue b/components/PromotionGood.vue
index 7880adb..e0bf637 100644
--- a/components/PromotionGood.vue
+++ b/components/PromotionGood.vue
@@ -1,20 +1,22 @@
-
-
-
- {{ item.storeName }}
-
-
- 促销价: ¥
- {{ item.price }}
-
-
-
- 日常价:¥{{ item.otPrice }}
- 仅剩:{{ item.stock }}{{ item.unitName }}
-
-
+
+
+
+
+
+ {{ item.storeName }}
+ {{ item.storeName }}
+
+
+ {{ item.activity_type === 'groupon' ? item.price : item.otPrice }}
+ 仅剩:{{ item.stock }}{{ item.unitName }}
+
+
+
+
+
@@ -34,3 +36,107 @@ export default {
}
};
+
+
diff --git a/config/index.js b/config/index.js
index 48454f6..555847f 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,5 +1,5 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
-// export const VUE_APP_API_URL = 'https://h5api.dayouqiantu.cn/api';
+// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static';
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d4a4daf..babe06d 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -37,91 +37,7 @@
-
-
-
-
-
-
-
- 热门榜单
-
-
- 更多
-
-
-
-
-
-
-
-
-
-
- {{ item.storeName }}
- ¥{{ item.price }}
-
-
-
-
-
-
-
-
-
-
- 精品推荐
-
-
-
- 更多
-
-
-
-
-
-
-
-
-
-
-
- 首发新品
-
-
-
- 更多
-
-
-
-
-
-
-
-
-
-
- {{ item.storeName }}
- ¥{{ item.price }}
-
-
-
-
-
-
-
-
-
-
- 猜你喜欢
-
-
-
-
-
+
@@ -129,7 +45,6 @@