diff --git a/src/components/XButton.vue b/src/components/XButton.vue new file mode 100644 index 0000000..aa403b5 --- /dev/null +++ b/src/components/XButton.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/components/XImage.vue b/src/components/XImage.vue index aa6f89d..4b3613e 100644 --- a/src/components/XImage.vue +++ b/src/components/XImage.vue @@ -1,24 +1,85 @@ diff --git a/src/components/XLink.vue b/src/components/XLink.vue index a392a69..5c041ec 100644 --- a/src/components/XLink.vue +++ b/src/components/XLink.vue @@ -1,13 +1,24 @@ - diff --git a/src/components/XNoticeBar.vue b/src/components/XNoticeBar.vue index a13d154..e3d51d3 100644 --- a/src/components/XNoticeBar.vue +++ b/src/components/XNoticeBar.vue @@ -1,6 +1,29 @@ diff --git a/src/pages.json b/src/pages.json index 64cd5ef..28f5dcd 100644 --- a/src/pages.json +++ b/src/pages.json @@ -72,6 +72,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/downloadMaterials/index", + "style": { + "navigationBarTitleText": "领取素材", + "navigationStyle": "custom" + } + }, { "path": "pages/comingSoon/index", "style": { diff --git a/src/pages/downloadMaterials/index.vue b/src/pages/downloadMaterials/index.vue new file mode 100644 index 0000000..6fe1569 --- /dev/null +++ b/src/pages/downloadMaterials/index.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/pages/taskDetails/components/CollectMaterials.vue b/src/pages/taskDetails/components/CollectMaterials.vue index 4270f3f..6a83502 100644 --- a/src/pages/taskDetails/components/CollectMaterials.vue +++ b/src/pages/taskDetails/components/CollectMaterials.vue @@ -1,11 +1,130 @@ diff --git a/src/pages/taskDetails/components/MyBackfill.vue b/src/pages/taskDetails/components/MyBackfill.vue index f1d705a..073b566 100644 --- a/src/pages/taskDetails/components/MyBackfill.vue +++ b/src/pages/taskDetails/components/MyBackfill.vue @@ -4,6 +4,7 @@ diff --git a/src/pages/taskDetails/components/TaskDetails.vue b/src/pages/taskDetails/components/TaskDetails.vue index 7c8c779..1aba673 100644 --- a/src/pages/taskDetails/components/TaskDetails.vue +++ b/src/pages/taskDetails/components/TaskDetails.vue @@ -28,9 +28,9 @@ import XImage from "../../../components/XImage.vue"; 素材案例: - - - + + + diff --git a/src/pages/taskDetails/index.vue b/src/pages/taskDetails/index.vue index 8ac6f16..d6cddab 100644 --- a/src/pages/taskDetails/index.vue +++ b/src/pages/taskDetails/index.vue @@ -93,7 +93,7 @@ onMounted(() => { @change="({index})=>currentTabs=index"> - + @@ -176,6 +281,16 @@ page { background-color: #6AA1FF; } +.block-extend { + color: rgb(255, 125, 0); + font-size: 20rpx; + font-weight: 400; + letter-spacing: 0; + text-align: left; + margin-top: -8rpx; + margin-bottom: 24rpx; +} + .block { display: flex; gap: 20rpx; diff --git a/src/scss/global.scss b/src/scss/global.scss index 184d092..421ca7b 100644 --- a/src/scss/global.scss +++ b/src/scss/global.scss @@ -6,7 +6,7 @@ $primary-color: #2D5CF6; } .tui-btn { - border-radius: 12rpx !important; + border-radius: 10rpx !important; } .tui-primary-outline { @@ -47,3 +47,15 @@ $primary-color: #2D5CF6; .nowrap { white-space: nowrap; } + +.test-22r { + font-size: 22rpx; +} + +.test-24r { + font-size: 24rpx; +} + +.test-28r { + font-size: 28rpx; +} diff --git a/src/scss/index.scss b/src/scss/index.scss index 912bf46..542a812 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -1,7 +1,6 @@ -Page { - --primary-color: #2D5CF6; -} page { background-color: #F2F3F5; font-family: PingFang SC; + --primary-color: #165DFF; + --warning-color: #FF7900; } diff --git a/src/scss/thorui.config.js b/src/scss/thorui.config.js index c480db3..bfafe4f 100644 --- a/src/scss/thorui.config.js +++ b/src/scss/thorui.config.js @@ -6,7 +6,7 @@ //组件内主色配置 const color = { - primary: '#2D5CF6', + primary: '#165DFF', success: '#07c160', warning: '#ff7900', danger: '#EB0909', diff --git a/src/static/icons/info.png b/src/static/icons/info.png new file mode 100644 index 0000000..da533d1 Binary files /dev/null and b/src/static/icons/info.png differ diff --git a/src/static/icons/rout-back.png b/src/static/icons/rout-back.png new file mode 100644 index 0000000..f79c868 Binary files /dev/null and b/src/static/icons/rout-back.png differ diff --git a/src/static/icons/ysq.png b/src/static/icons/ysq.png new file mode 100644 index 0000000..7ebeb6a Binary files /dev/null and b/src/static/icons/ysq.png differ diff --git a/src/static/images/Avatar.png b/src/static/images/Avatar.png new file mode 100644 index 0000000..c66fc11 Binary files /dev/null and b/src/static/images/Avatar.png differ diff --git a/src/static/images/test.png b/src/static/images/test.png new file mode 100644 index 0000000..cdb07ce Binary files /dev/null and b/src/static/images/test.png differ diff --git a/src/utils/uils.js b/src/utils/uils.js index d4bd7ca..f6c97c1 100644 --- a/src/utils/uils.js +++ b/src/utils/uils.js @@ -23,3 +23,32 @@ export const toPage = (url) => { export const backPage = () => { window.history.back(); } + +export const copy = (context) => { + try { + navigator.clipboard.writeText(context) + .then(() => { + showToast('已复制'); + }) + .catch(() => { + showToast('复制失败'); + }); + } catch (e) { + showToast('复制失败'); + } +} + +export const download = (urls) => { + const promises = urls.map((url, index) => new Promise((resolve, reject) => { + const iframe = document.createElement('iframe'); + iframe.src = url; + iframe.style.display = 'none'; + document.body.appendChild(iframe); + resolve(true); + })); + Promise.all(promises).then(res => { + console.log(res); + }).catch(err => { + console.log(err); + }); +}