From 4b78c8b6dd236bc816e01bfff0221f32e99cc22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?=
<1518079521@qq.com>
Date: Wed, 4 Dec 2024 14:37:20 +0800
Subject: [PATCH] up
---
.../src/addon/components/diy/group/index.vue | 6 +-
.../addon/components/diy/group/useDiyGroup.ts | 3 +
uni-app/src/app/api/member.ts | 7 +
.../app/components/diy/active-cube/index.vue | 13 +-
.../components/diy/carousel-search/index.vue | 62 +++++++--
.../app/components/diy/graphic-nav/index.vue | 128 +++++++++---------
.../app/components/diy/image-ads/index.vue | 46 +++----
.../app/components/diy/member-level/index.vue | 84 ++++++------
.../app/components/diy/picture-show/index.vue | 2 +-
uni-app/src/app/pages/auth/index.vue | 5 +-
uni-app/src/app/pages/member/address.vue | 8 +-
uni-app/src/app/pages/member/balance.vue | 34 ++++-
.../components/select-date/select-date.vue | 7 +-
.../components/share-poster/share-poster.vue | 28 ++--
.../src/components/top-tabbar/top-tabbar.vue | 45 ++++--
uni-app/src/hooks/useDiy.ts | 7 +-
uni-app/src/hooks/useLocation.ts | 70 ++++------
uni-app/src/hooks/useShare.ts | 41 +++---
uni-app/src/locale/zh-Hans.json | 97 +------------
uni-app/src/stores/system.ts | 41 +++---
uni-app/src/styles/official-iconfont.css | 46 ++++++-
uni-app/src/utils/common.ts | 14 +-
uni-app/src/utils/interceptor.ts | 27 ++--
uni-app/src/utils/request.ts | 7 +-
uni-app/src/utils/topTabbar.ts | 3 +-
25 files changed, 433 insertions(+), 398 deletions(-)
diff --git a/uni-app/src/addon/components/diy/group/index.vue b/uni-app/src/addon/components/diy/group/index.vue
index ef12ab9e9..00ce92e25 100644
--- a/uni-app/src/addon/components/diy/group/index.vue
+++ b/uni-app/src/addon/components/diy/group/index.vue
@@ -49,9 +49,9 @@
-
-
-
+
+
+
diff --git a/uni-app/src/addon/components/diy/group/useDiyGroup.ts b/uni-app/src/addon/components/diy/group/useDiyGroup.ts
index efc1fae26..e2a5230bf 100644
--- a/uni-app/src/addon/components/diy/group/useDiyGroup.ts
+++ b/uni-app/src/addon/components/diy/group/useDiyGroup.ts
@@ -34,6 +34,9 @@ export function useDiyGroup(params: any = {}) {
} else {
obj['draggable-element'] = true;
}
+ if(component.componentName == 'ImageAds'){
+ obj['overflow-hidden'] = true
+ }
return obj;
}
diff --git a/uni-app/src/app/api/member.ts b/uni-app/src/app/api/member.ts
index 26e6169fa..02f008c3c 100644
--- a/uni-app/src/app/api/member.ts
+++ b/uni-app/src/app/api/member.ts
@@ -249,4 +249,11 @@ export function getMemberAccountPointcount() {
*/
export function getTaskPoint() {
return request.get(`task/point`)
+}
+
+/**
+ * 充值配置
+ */
+export function rechargeConfig() {
+ return request.get('recharge/config')
}
\ No newline at end of file
diff --git a/uni-app/src/app/components/diy/active-cube/index.vue b/uni-app/src/app/components/diy/active-cube/index.vue
index 9eca35d3f..624969a44 100644
--- a/uni-app/src/app/components/diy/active-cube/index.vue
+++ b/uni-app/src/app/components/diy/active-cube/index.vue
@@ -37,7 +37,7 @@
-
+
{{ item.title.text }}
{{ item.subTitle.text }}
@@ -55,7 +55,7 @@
-
+
{{ item.title.text }}
{{ item.subTitle.text }}
@@ -75,7 +75,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -205,6 +205,11 @@
}else{
style += `background:${data.listFrame.startColor || data.listFrame.endColor};`;
}
+ if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+ if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+ if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+ if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+ style += 'overflow: hidden';
return style;
}
diff --git a/uni-app/src/app/components/diy/carousel-search/index.vue b/uni-app/src/app/components/diy/carousel-search/index.vue
index c69e9fd03..c5749b12a 100644
--- a/uni-app/src/app/components/diy/carousel-search/index.vue
+++ b/uni-app/src/app/components/diy/carousel-search/index.vue
@@ -29,14 +29,14 @@
{{diyComponent.search.subTitle.text}}
-
+
- {{systemStore.currShippingAddress.city}}
+ {{systemStore.diyAddressInfo.city}}
- {{systemStore.currShippingAddress.community}}
+ {{systemStore.diyAddressInfo.community}}
- {{ systemStore.defaultPositionAddress }}
+ {{ systemStore.defaultPositionAddress }}
{{isShowSearchPlaceholder ? diyComponent.search.text : ''}}
@@ -77,7 +77,7 @@
- 1 ? true : false;
+ isShowDots = computed(() => {
+ return diyComponent.value?.swiper?.list?.length > 1;
+ });
// #endif
// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
@@ -406,7 +432,7 @@
const refresh = ()=> {
setModuleLocation();
// 刷新定位
- locationVal.refreshLocationFn();
+ locationVal.refresh();
changeData({ source : 'home' },-1)
diyComponent.value.swiper.list.forEach((item : any) => {
@@ -474,7 +500,7 @@
// #ifdef H5
isShowDots.value = true;
// #endif
-
+
// #ifdef MP-WEIXIN
isShowDots.value = false;
// #endif
@@ -511,6 +537,12 @@
-webkit-transform: scale(2) translateY(15%);
transform: scale(2) translateY(15%);
}
+ &.no-filter{
+ uni-image, image{
+ -webkit-filter: blur(0);
+ filter: blur(0);
+ }
+ }
.bg-img-box{
position: absolute;
top: 0;
diff --git a/uni-app/src/app/components/diy/graphic-nav/index.vue b/uni-app/src/app/components/diy/graphic-nav/index.vue
index 7a4769dc3..342f53855 100644
--- a/uni-app/src/app/components/diy/graphic-nav/index.vue
+++ b/uni-app/src/app/components/diy/graphic-nav/index.vue
@@ -81,39 +81,37 @@
-
+
-
-
-
+
+
-
-
-
-
-
- {{ item.label.text }}
-
-
-
- {{ item.title }}
+
+
+
+
+
+ {{ item.label.text }}
-
-
-
+
+ {{ item.title }}
+
+
+
+
@@ -222,45 +220,9 @@
return style;
});
- // 多行，单行滑动样式
- const horizontalSingleSlideStyle = computed(()=>{
- let style = {width: ""};
- let widthStr = 100 / diyComponent.value.rowCount; // 表示每项宽度
- let itemLen = (parseInt(diyComponent.value.list.length / (diyComponent.value.rowCount*2))*diyComponent.value.rowCount) + (diyComponent.value.list.length%(diyComponent.value.rowCount*2)); // 表示展示几列
- let marginLen = diyComponent.value.margin.both*4
- style.width = `calc(${widthStr * itemLen}vw - ${marginLen}rpx)`;
- return style;
- })
-
- const horizontalSingleSlideBoxStyle = (index: any)=>{
- let style = {width: ""};
- let widthStr = 100 / diyComponent.value.rowCount; // 表示每项宽度
- let marginLen = diyComponent.value.margin.both * 4 / diyComponent.value.rowCount;
- if(parseInt(diyComponent.value.list.length / (diyComponent.value.rowCount*2)) >= (index+1)){
- style.width = `calc(${widthStr * diyComponent.value.rowCount}vw - ${marginLen*diyComponent.value.rowCount}rpx)`;
- }else{
- let len = diyComponent.value.list.length%(diyComponent.value.rowCount*2);
- if(len > diyComponent.value.rowCount){ // 满足了一行，但没有满足于一页
- style.width = `calc(${widthStr * diyComponent.value.rowCount}vw - ${marginLen*diyComponent.value.rowCount}rpx)`;
- }else{
- style.width = `calc(${widthStr * len}vw - ${marginLen * len}rpx)`; // 未满足了一行
- }
- }
- return style;
- }
-
const horizontalSingleSlideItemStyle = (index: any)=>{
let style = {width: ""};
- if(parseInt(diyComponent.value.list.length / (diyComponent.value.rowCount*2)) >= (index+1)){
- style.width = `${100 / diyComponent.value.rowCount}%`;
- }else{
- let len = diyComponent.value.list.length%(diyComponent.value.rowCount*2);
- if(len > diyComponent.value.rowCount){ // 满足了一行，但没有满足于一页
- style.width = `${100 / diyComponent.value.rowCount}%`;
- }else{
- style.width = `${100 / len}%`; // 未满足了一行
- }
- }
+ style.width = `${100 / diyComponent.value.rowCount}%`;
return style;
}
@@ -332,6 +294,35 @@
}).exec();
})
}
+ // 获取滑动行数
+ const getSlideRowNum = ()=>{
+ let num = 1;
+ if(diyComponent.value.pageCount == 2){
+ num = diyComponent.value.list.length > diyComponent.value.rowCount ? 2 : 1;
+ }
+ return num;
+ }
+ const isShowslideTemp = (index, numItem) => {
+ let result = true;
+ let indent = index+1;
+ if(diyComponent.value.pageCount == 2){
+ let num = Math.ceil(diyComponent.value.list.length / diyComponent.value.rowCount)
+ for(let i = 1; i <= num; i++){
+ if(numItem == 1 && (i % 2) != 0){
+ if(indent > ((i-1)*diyComponent.value.rowCount) && indent <= (i*diyComponent.value.rowCount)){
+ return true;
+ }
+ }
+ if(numItem == 2 && (i % 2) == 0){
+ if(indent > ((i-1)*diyComponent.value.rowCount) && indent <= (i*diyComponent.value.rowCount)){
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
\ No newline at end of file
+
diff --git a/uni-app/src/components/top-tabbar/top-tabbar.vue b/uni-app/src/components/top-tabbar/top-tabbar.vue
index a109d7d34..c20b7a48a 100644
--- a/uni-app/src/components/top-tabbar/top-tabbar.vue
+++ b/uni-app/src/components/top-tabbar/top-tabbar.vue
@@ -33,9 +33,9 @@
- {{ systemStore.currShippingAddress.community }}
- {{ systemStore.defaultPositionAddress }}
-
+ {{ systemStore.diyAddressInfo.community }}
+ {{ systemStore.defaultPositionAddress }}
+
@@ -47,7 +47,7 @@