From 79ec56771b07a9c88a84e6eb61e2998f4de65a90 Mon Sep 17 00:00:00 2001 From: congzc Date: Fri, 22 Sep 2023 18:23:42 +0800 Subject: [PATCH] 3 --- index.html | 42 ++++++----- src/pages.json | 5 +- src/pages/chooseStyle/index.vue | 41 +++++++---- src/pages/createing/index.vue | 123 +++++++++++++++++++++++++++++++- src/pages/login/index.vue | 1 + src/style/my.scss | 17 ++++- 6 files changed, 195 insertions(+), 34 deletions(-) diff --git a/index.html b/index.html index fb81ddc..764a66b 100644 --- a/index.html +++ b/index.html @@ -1,20 +1,26 @@ - - - - - - - - -
- - - + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index d486d6b..5ef181b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -38,6 +38,9 @@ "navigationBarTitleText": "智像相册", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8", - "navigationStyle": "custom" + "navigationStyle": "custom", + "rpxCalcMaxDeviceWidth": 1080, + "rpxCalcBaseDeviceWidth": 1080, + "rpxCalcIncludeWidth": 1080 } } \ No newline at end of file diff --git a/src/pages/chooseStyle/index.vue b/src/pages/chooseStyle/index.vue index 6d360f7..aad7fd0 100644 --- a/src/pages/chooseStyle/index.vue +++ b/src/pages/chooseStyle/index.vue @@ -7,8 +7,8 @@ lineWidth="50" lineColor="#ff4f00" :itemStyle="{ width: '150rpx', height: '90rpx', padding: '0' }" - :activeStyle="{ color: '#ff4f00' }" - :inactiveStyle="{ color: '#fff' }" + :activeStyle="{ color: '#ff4f00', fontsize: '30rpx' }" + :inactiveStyle="{ color: '#fff', fontsize: '30rpx' }" @click="chooseTab" > @@ -69,7 +69,11 @@ {{ peopleNum(item.mouldType) }} - 暂无数据 + 暂无数据 @@ -186,15 +190,15 @@ function peopleNum(num) { //#region 点击图片 function createPhoto(item) { - if (item.mouldType == 1) { - uni.navigateTo({ - url: `/pages/closeStyle/goCreatePhoto?id=${item.id}`, - }); - } else { - uni.navigateTo({ - url: `/pages/closeStyle/multiplayer?id=${item.id}`, - }); - } + uni.navigateTo({ + url: `/pages/createing/index?id=${item.id}`, + }); + // if (item.mouldType == 1) { + // } else { + // uni.navigateTo({ + // url: `/pages/closeStyle/multiplayer?id=${item.id}`, + // }); + // } } //#endregion --------------------- @@ -208,7 +212,11 @@ function createPhoto(item) { .tabBox { position: relative; width: 100vw; + .u-tabs { + :deep(.u-tabs__wrapper__nav__item__text) { + font-size: 30rpx; + } // width: calc(100% - 100rpx); width: 100%; color: #fff !important; @@ -239,6 +247,15 @@ function createPhoto(item) { } } // +.u-popup { + :deep(.u-popup__content__close--top-right) { + top: 35rpx; + right: 35rpx; + } + :deep(.uicon-close) { + font-size: 30rpx !important; + } +} .popupBox { padding-bottom: 30rpx; .type { diff --git a/src/pages/createing/index.vue b/src/pages/createing/index.vue index cf175dd..869dae1 100644 --- a/src/pages/createing/index.vue +++ b/src/pages/createing/index.vue @@ -1,7 +1,126 @@ + - + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 88bb5b4..1c46297 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -29,6 +29,7 @@ function toChooseStyle() {