From 33cff0fb8199a87112547806b11c9874da51adf4 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Wed, 27 Jan 2021 11:04:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
=?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=8E=B7=E5=8F=96=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/CouponPop.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/CouponPop.vue b/components/CouponPop.vue
index 1fe65d4..83ed731 100644
--- a/components/CouponPop.vue
+++ b/components/CouponPop.vue
@@ -14,16 +14,16 @@
>
￥
- {{ item.coupon_price }}
+ {{ item.couponPrice }}
- 购物满{{ item.use_min_price }}元可用
+ 购物满{{ item.useMinPrice }}元可用
不限时
- {{ item.start_time }}-{{ item.end_time }}
+ {{ item.startTime }}-{{ item.endTime }}
{{ !item.is_use ? "立即领取" : "已领取" }}
From 38160460cf111791ee7d2f9ebebd22275a7931c1 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Wed, 27 Jan 2021 11:07:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/CouponPop.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/CouponPop.vue b/components/CouponPop.vue
index 83ed731..cee117c 100644
--- a/components/CouponPop.vue
+++ b/components/CouponPop.vue
@@ -24,7 +24,7 @@
{{ !item.is_use ? "立即领取" : "已领取" }}
+ >{{ !item.isUse ? "立即领取" : "已领取" }}
From 504e476e3075788234dba1cc32da9cb6d017a401 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Tue, 2 Feb 2021 20:38:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E4=BF=AE?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/public.js | 8 +
config/index.js | 3 +-
package-lock.json | 19 +
package.json | 2 +-
pages/home/index.vue | 861 +++++++++++++++++++++----------------------
5 files changed, 449 insertions(+), 444 deletions(-)
diff --git a/api/public.js b/api/public.js
index b34f64b..b4bde62 100644
--- a/api/public.js
+++ b/api/public.js
@@ -8,6 +8,14 @@ export function getHomeData() {
return request.get("index", {}, { login: false });
}
+/**
+ * 首页
+ * @returns {*}
+ */
+export function getCanvas() {
+ return request.get("/getCanvas?terminal=3", {}, { login: false });
+}
+
/**
* 文章 轮播列表
* @returns {*}
diff --git a/config/index.js b/config/index.js
index 8629e6a..ade4699 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,7 +2,8 @@
// 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 = 'http://192.168.31.223:8008/api';
- export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
+ export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
+ // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
diff --git a/package-lock.json b/package-lock.json
index 4acba4f..a1f2da4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -287,6 +287,11 @@
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
},
+ "mutation-observer": {
+ "version": "1.0.3",
+ "resolved": "http://192.168.1.56:8081/repository/npm-public/mutation-observer/-/mutation-observer-1.0.3.tgz",
+ "integrity": "sha1-QukiKxAbyoLlup1aes9KFMDyY9A="
+ },
"normalize-url": {
"version": "4.5.0",
"resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-4.5.0.tgz?cache=0&sync_timestamp=1596373090568&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.0.tgz",
@@ -399,6 +404,11 @@
"resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-1.0.0.tgz",
"integrity": "sha1-zgqgwvPfat+FLvtASng+d8BHV3E="
},
+ "transitionEnd": {
+ "version": "1.0.2",
+ "resolved": "http://192.168.1.56:8081/repository/npm-public/transitionEnd/-/transitionEnd-1.0.2.tgz",
+ "integrity": "sha1-GRTbW0Wn79w0oBr2koWjppOHFjM="
+ },
"url-parse-lax": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/url-parse-lax/download/url-parse-lax-3.0.0.tgz",
@@ -407,6 +417,15 @@
"prepend-http": "^2.0.0"
}
},
+ "vconsole": {
+ "version": "3.4.0",
+ "resolved": "http://192.168.1.56:8081/repository/npm-public/vconsole/-/vconsole-3.4.0.tgz",
+ "integrity": "sha1-LPL/qobNerc2mXoitj0FYnxqtWc=",
+ "requires": {
+ "mutation-observer": "^1.0.3",
+ "transitionEnd": "^1.0.2"
+ }
+ },
"vue": {
"version": "2.6.12",
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz",
diff --git a/package.json b/package.json
index 7db4ceb..297db34 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
"jweixin-module": "^1.6.0",
"miniapp-color-thief": "^1.0.5",
"vue-ydui": "^1.2.6",
- "vconsole": "^3.3.4",
+ "vconsole": "^3.3.4",
"wechat-jssdk": "^5.0.4"
},
"devDependencies": {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index ebe34dc..556b47e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,470 +1,447 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ "YSHOP商城" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ item.componentContent.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .nav-title {
+ margin-left: 20rpx;
+ line-height: 40px;
+ }
+
From 41a2882fd393b7d55800c106a27be945b1446040 Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Wed, 3 Feb 2021 21:01:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9adv=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/Adv.vue | 46 +++++++++++++++++++++++---------------------
pages/home/index.vue | 2 +-
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/components/Adv.vue b/components/Adv.vue
index d3d8146..37d777f 100644
--- a/components/Adv.vue
+++ b/components/Adv.vue
@@ -2,55 +2,55 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
@@ -63,14 +63,16 @@ export default {
return {};
},
props: {
- detail: {}
+ detail: Object
},
computed: {},
created() {},
methods: {
// 路由跳转
jump(path) {
- this.$tools.routerTo(path);
+ if (item.uniapp_url) {
+ this.$yrouter.push(path)
+ }
}
}
};
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 556b47e..7c16011 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -25,7 +25,7 @@
-
+