From 2edd0a731722cd136f751ce626af88001b8f66d3 Mon Sep 17 00:00:00 2001 From: gao1021514 <1328969651@qq.com> Date: Sat, 28 May 2022 23:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=89=BA=E6=9C=AF=E5=AE=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=A8=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8E=A5=E5=8F=A3=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E9=83=A8=E5=88=86icon=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/creator.js | 51 ++++- api/index.js | 9 + pages.json | 14 +- pages/index/index.vue | 54 +++++- static/collect-select.png | Bin 0 -> 5506 bytes static/collect.png | Bin 0 -> 5194 bytes static/collectLength.png | Bin 0 -> 8401 bytes static/download-select.png | Bin 0 -> 5069 bytes static/download.png | Bin 0 -> 3999 bytes static/hot-not.png | Bin 0 -> 9667 bytes static/hot-yes.png | Bin 0 -> 10282 bytes static/imgLength.png | Bin 0 -> 5610 bytes static/index-default.png | Bin 0 -> 4773 bytes static/index-default.svg | 2 - static/index-select.png | Bin 0 -> 5007 bytes static/index-select.svg | 2 - static/jiantou-right.png | Bin 0 -> 2711 bytes static/like-select.png | Bin 0 -> 7988 bytes static/like.png | Bin 0 -> 5985 bytes static/likeLength.png | Bin 0 -> 7665 bytes static/mine-default.png | Bin 0 -> 6896 bytes static/mine-default.svg | 2 - static/mine-select.png | Bin 0 -> 7411 bytes static/mine-select.svg | 2 - static/share.png | Bin 0 -> 7689 bytes static/theme-default.png | Bin 0 -> 7159 bytes static/theme-default.svg | 2 - static/theme-select.png | Bin 0 -> 7703 bytes static/theme-select.svg | 2 - unpackage/dist/dev/mp-toutiao/app.json | 14 +- unpackage/dist/dev/mp-toutiao/common/main.js | 2 +- .../dist/dev/mp-toutiao/common/vendor.js | 176 ++++++++++++------ .../dev/mp-toutiao/pages/creator/creator.js | 41 ++-- .../dev/mp-toutiao/pages/creator/creator.ttml | 2 +- .../dev/mp-toutiao/pages/creator/creator.ttss | 41 +++- .../dev/mp-toutiao/pages/creator/imgDetail.js | 174 +++++++++++++++-- .../mp-toutiao/pages/creator/imgDetail.ttml | 2 +- .../mp-toutiao/pages/creator/imgDetail.ttss | 14 +- .../mp-toutiao/pages/creator/userDetail.js | 4 +- .../dev/mp-toutiao/pages/index/choiceness.js | 4 +- .../dist/dev/mp-toutiao/pages/index/index.js | 48 ++++- .../pages/userInfo/contactUs/contactUs.js | 24 +-- .../userInfo/myCollection/myCollection.js | 120 ++++++------ .../pages/userInfo/question/question.js | 24 +-- .../pages/userInfo/setting/setting.js | 24 +-- .../dev/mp-toutiao/pages/userInfo/userInfo.js | 170 ++++++++--------- .../dev/mp-toutiao/static/collect-select.png | Bin 0 -> 5506 bytes .../dist/dev/mp-toutiao/static/collect.png | Bin 0 -> 5194 bytes .../dev/mp-toutiao/static/collectLength.png | Bin 0 -> 8401 bytes .../dev/mp-toutiao/static/download-select.png | Bin 0 -> 5069 bytes .../dist/dev/mp-toutiao/static/download.png | Bin 0 -> 3999 bytes .../dist/dev/mp-toutiao/static/hot-not.png | Bin 0 -> 9667 bytes .../dist/dev/mp-toutiao/static/hot-yes.png | Bin 0 -> 10282 bytes .../dist/dev/mp-toutiao/static/imgLength.png | Bin 0 -> 5610 bytes .../dev/mp-toutiao/static/index-default.png | Bin 0 -> 4773 bytes .../dev/mp-toutiao/static/index-default.svg | 2 - .../dev/mp-toutiao/static/index-select.png | Bin 0 -> 5007 bytes .../dev/mp-toutiao/static/index-select.svg | 2 - .../dev/mp-toutiao/static/jiantou-right.png | Bin 0 -> 2711 bytes .../dev/mp-toutiao/static/like-select.png | Bin 0 -> 7988 bytes unpackage/dist/dev/mp-toutiao/static/like.png | Bin 0 -> 5985 bytes .../dist/dev/mp-toutiao/static/likeLength.png | Bin 0 -> 7665 bytes .../dev/mp-toutiao/static/mine-default.png | Bin 0 -> 6896 bytes .../dev/mp-toutiao/static/mine-default.svg | 2 - .../dev/mp-toutiao/static/mine-select.png | Bin 0 -> 7411 bytes .../dev/mp-toutiao/static/mine-select.svg | 2 - .../dist/dev/mp-toutiao/static/share.png | Bin 0 -> 7689 bytes .../dev/mp-toutiao/static/theme-default.png | Bin 0 -> 7159 bytes .../dev/mp-toutiao/static/theme-default.svg | 2 - .../dev/mp-toutiao/static/theme-select.png | Bin 0 -> 7703 bytes .../dev/mp-toutiao/static/theme-select.svg | 2 - .../dist/dev/mp-toutiao/static/收藏.png | Bin 0 -> 5194 bytes .../dev/mp-toutiao/static/收藏选中.png | Bin 0 -> 5506 bytes .../components/uni-badge/uni-badge.js | 30 +-- .../components/uni-icons/uni-icons.js | 32 ++-- .../components/uni-list-item/uni-list-item.js | 34 ++-- .../uni-list/components/uni-list/uni-list.js | 30 +-- .../uni-search-bar/uni-search-bar.js | 34 ++-- .../uni-segmented-control.js | 30 +-- utils/request.js | 4 - 80 files changed, 797 insertions(+), 433 deletions(-) create mode 100644 static/collect-select.png create mode 100644 static/collect.png create mode 100644 static/collectLength.png create mode 100644 static/download-select.png create mode 100644 static/download.png create mode 100644 static/hot-not.png create mode 100644 static/hot-yes.png create mode 100644 static/imgLength.png create mode 100644 static/index-default.png delete mode 100644 static/index-default.svg create mode 100644 static/index-select.png delete mode 100644 static/index-select.svg create mode 100644 static/jiantou-right.png create mode 100644 static/like-select.png create mode 100644 static/like.png create mode 100644 static/likeLength.png create mode 100644 static/mine-default.png delete mode 100644 static/mine-default.svg create mode 100644 static/mine-select.png delete mode 100644 static/mine-select.svg create mode 100644 static/share.png create mode 100644 static/theme-default.png delete mode 100644 static/theme-default.svg create mode 100644 static/theme-select.png delete mode 100644 static/theme-select.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/collect-select.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/collect.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/collectLength.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/download-select.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/download.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/hot-not.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/hot-yes.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/imgLength.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/index-default.png delete mode 100644 unpackage/dist/dev/mp-toutiao/static/index-default.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/index-select.png delete mode 100644 unpackage/dist/dev/mp-toutiao/static/index-select.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/jiantou-right.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/like-select.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/like.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/likeLength.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/mine-default.png delete mode 100644 unpackage/dist/dev/mp-toutiao/static/mine-default.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/mine-select.png delete mode 100644 unpackage/dist/dev/mp-toutiao/static/mine-select.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/share.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/theme-default.png delete mode 100644 unpackage/dist/dev/mp-toutiao/static/theme-default.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/theme-select.png delete mode 100644 unpackage/dist/dev/mp-toutiao/static/theme-select.svg create mode 100644 unpackage/dist/dev/mp-toutiao/static/收藏.png create mode 100644 unpackage/dist/dev/mp-toutiao/static/收藏选中.png diff --git a/api/creator.js b/api/creator.js index 694d8a3..ed336ad 100644 --- a/api/creator.js +++ b/api/creator.js @@ -8,7 +8,6 @@ export function getBannerList() { return request({ url: `${serviceTitle}/img/mini/tiktok/listBanner`, method: 'get' - }) } //获取小程序用户图片列表 @@ -18,10 +17,58 @@ export function getUserImgList() { method: 'get' }) } -//获取图片详情 +// 获取图片详情 export function detailsTiktokImg(data) { return request({ url: `${serviceTitle}/img/mini/tiktok/detailsTiktokImg/${data}`, method: 'get' }) } +// 查询是否点赞过 +export function judgeTiktokLike(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/judgeTiktokLike`, + method: 'post', + data + }) +} +// 查询是否收藏过 +export function judgeTiktokCollect(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/judgeTiktokCollect`, + method: 'post', + data + }) +} +// 点赞 +export function tiktokLike(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/tiktokLike`, + method: 'post', + data + }) +} +// 取消点赞 +export function tiktokUnLike(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/tiktokUnLike`, + method: 'post', + data + }) +} +// 收藏 +export function tiktokCollect(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/tiktokCollect`, + method: 'post', + data + }) +} +// 取消收藏 +export function tiktokUnCollect(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/tiktokUnCollect`, + method: 'post', + data + }) +} \ No newline at end of file diff --git a/api/index.js b/api/index.js index 96614e5..2409b06 100644 --- a/api/index.js +++ b/api/index.js @@ -27,3 +27,12 @@ export function tiktokUserDetails(data) { }) } +// 用户授权登录 +export function loginTiktok(data) { + return request({ + url: `${serviceTitle}/img/mini/tiktok/loginTiktok`, + method: 'post', + data + }) +} + diff --git a/pages.json b/pages.json index 5c3cb7c..e661d62 100644 --- a/pages.json +++ b/pages.json @@ -79,25 +79,25 @@ //底部跳转tab "tabBar": { "color": "#7A7E83", - "selectedColor": "#007AFF", + "selectedColor": "#1296DB", "borderStyle": "black", "backgroundColor": "#F8F8F8", "list": [{ "pagePath": "pages/index/index", - "iconPath": "static/index-default.svg", - "selectedIconPath": "static/index-select.svg", + "iconPath": "static/index-default.png", + "selectedIconPath": "static/index-select.png", "text": "首页" }, { "pagePath": "pages/creator/creator", - "iconPath": "static/theme-default.svg", - "selectedIconPath": "static/theme-select.svg", + "iconPath": "static/theme-default.png", + "selectedIconPath": "static/theme-select.png", "text": "艺术家" }, { "pagePath": "pages/userInfo/userInfo", - "iconPath": "static/mine-default.svg", - "selectedIconPath": "static/mine-select.svg", + "iconPath": "static/mine-default.png", + "selectedIconPath": "static/mine-select.png", "text": "我的" } ] diff --git a/pages/index/index.vue b/pages/index/index.vue index 161c2fe..0428585 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -32,7 +32,9 @@