From 9b5e3802ee6b58efd67b809c95251e880b4fd11a Mon Sep 17 00:00:00 2001 From: kk_888 <1422704179@qq.com> Date: Fri, 10 Dec 2021 09:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E7=94=9F=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/store.js | 9 + components/vSwiper.vue | 107 ++++++ config/index.js | 4 +- package-lock.json | 27 +- package.json | 2 +- pages.json | 10 +- pages/home/index.vue | 4 +- pages/life/articleDetail/index.vue | 49 +++ pages/life/index.vue | 551 ++++++++++++++++++++++++++--- pages/user/completeData/index.vue | 505 +++++++++++++------------- project.config.json | 68 ++++ static/images/act-address.png | Bin 0 -> 921 bytes static/images/act-time.png | Bin 0 -> 357 bytes static/images/gd1.png | Bin 0 -> 199704 bytes static/images/gd2.png | Bin 0 -> 310782 bytes static/images/gd3.png | Bin 0 -> 136394 bytes static/images/life-bg.png | Bin 0 -> 386066 bytes static/images/new-act.png | Bin 0 -> 4430 bytes static/images/new-bg.png | Bin 0 -> 81145 bytes static/images/rec-bg.png | Bin 0 -> 2668 bytes static/images/rec-bg2.png | Bin 0 -> 1554 bytes static/images/rec-headline.png | Bin 0 -> 4399 bytes static/images/rec-icon1.png | Bin 0 -> 1709 bytes static/images/rec-icon2.png | Bin 0 -> 2613 bytes static/images/rec-title.png | Bin 0 -> 4487 bytes static/images/yun.png | Bin 0 -> 3167 bytes 26 files changed, 1030 insertions(+), 306 deletions(-) create mode 100644 components/vSwiper.vue create mode 100644 pages/life/articleDetail/index.vue create mode 100644 project.config.json create mode 100644 static/images/act-address.png create mode 100644 static/images/act-time.png create mode 100644 static/images/gd1.png create mode 100644 static/images/gd2.png create mode 100644 static/images/gd3.png create mode 100644 static/images/life-bg.png create mode 100644 static/images/new-act.png create mode 100644 static/images/new-bg.png create mode 100644 static/images/rec-bg.png create mode 100644 static/images/rec-bg2.png create mode 100644 static/images/rec-headline.png create mode 100644 static/images/rec-icon1.png create mode 100644 static/images/rec-icon2.png create mode 100644 static/images/rec-title.png create mode 100644 static/images/yun.png diff --git a/api/store.js b/api/store.js index 05852b2..788beca 100644 --- a/api/store.js +++ b/api/store.js @@ -92,6 +92,15 @@ export function getProducts(q) { }); } +/* + * 文章列表 + * */ +export function getArticle(q) { + return request.get("/article/list", q, { + login: true + }); +} + /* * 商品详情 * */ diff --git a/components/vSwiper.vue b/components/vSwiper.vue new file mode 100644 index 0000000..a350292 --- /dev/null +++ b/components/vSwiper.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/config/index.js b/config/index.js index dbb5bee..8e1318a 100644 --- a/config/index.js +++ b/config/index.js @@ -1,8 +1,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.0.112:8092/api' +export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' // export const VUE_APP_API_URL = 'http://192.168.0.111:8092/api' -export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' +// export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/package-lock.json b/package-lock.json index 91a8cc8..eade2a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,31 @@ { + "name": "zhaoshangMiniApp-uniapp", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "dependencies": { + "async-validator": "^4.0.7", + "dayjs": "^1.10.7", + "uview-ui": "^1.8.4" + } + }, + "node_modules/async-validator": { + "version": "4.0.7", + "resolved": "https://registry.npmmirror.com/async-validator/download/async-validator-4.0.7.tgz?cache=0&sync_timestamp=1634529502627&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fasync-validator%2Fdownload%2Fasync-validator-4.0.7.tgz", + "integrity": "sha1-A0oP0hA6ay6/AQ2nUYO+wpkkev4=" + }, + "node_modules/dayjs": { + "version": "1.10.7", + "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz?cache=0&sync_timestamp=1631266519235&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.7.tgz", + "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==" + }, + "node_modules/uview-ui": { + "version": "1.8.4", + "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.4.tgz", + "integrity": "sha1-4yu/I3lCHTGQIuMk4ct7U4fTvUQ=" + } + }, "dependencies": { "async-validator": { "version": "4.0.7", diff --git a/package.json b/package.json index 07b57b1..db9b875 100644 --- a/package.json +++ b/package.json @@ -4,4 +4,4 @@ "dayjs": "^1.10.7", "uview-ui": "^1.8.4" } -} +} \ No newline at end of file diff --git a/pages.json b/pages.json index 3dda68e..22d244c 100644 --- a/pages.json +++ b/pages.json @@ -255,8 +255,9 @@ { "path": "pages/life/index", "style": { + "navigationStyle": "custom", "navigationBarTitleText": "生活", - "enablePullDownRefresh": true + "enablePullDownRefresh": true } }, { @@ -290,7 +291,12 @@ "navigationBarTitleText": "详情预览" } }, - + { + "path": "pages/life/articleDetail/index", + "style": { + "navigationBarTitleText": "资讯详情" + } + }, { "path": "pages/activity/index", "style": { diff --git a/pages/home/index.vue b/pages/home/index.vue index e65df47..d8cee09 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -96,7 +96,7 @@ 立即抢购 - + data-i --> @@ -114,7 +114,7 @@ {{item.cname}} {{item.detailedDescription}} 了解详情 - + diff --git a/pages/life/articleDetail/index.vue b/pages/life/articleDetail/index.vue new file mode 100644 index 0000000..94bee8c --- /dev/null +++ b/pages/life/articleDetail/index.vue @@ -0,0 +1,49 @@ + + + + + + diff --git a/pages/life/index.vue b/pages/life/index.vue index 8859db7..8efcdd9 100644 --- a/pages/life/index.vue +++ b/pages/life/index.vue @@ -1,6 +1,6 @@