up

uni-app/src/app/api/member.ts

@@ -250,3 +250,10 @@ export function getMemberAccountPointcount() {
 export function getTaskPoint() {
 	return request.get(`task/point`)
 }
+
+/**
+ * 充值配置
+ */
+export function rechargeConfig() {
+	return request.get('recharge/config')
+}

uni-app/src/app/api/verify.ts

@@ -24,8 +24,8 @@ export function getCheckVerifier() {
 /**
  * 获取核销信息
  */
-export function getVerifierInfo(code: string) {
+export function getVerifierInfo(params: Record<string, any>) {
-    return request.get(`get_verify_by_code/${ code }`)
+    return request.get(`get_verify_by_code`,params)
 }
 
 /**

uni-app/src/app/components/diy/active-cube/index.vue

@@ -37,7 +37,7 @@
 
 				<view class="bd flex flex-wrap justify-between">
 					<template v-for="item in diyComponent.list" :key="item.id">
-						<view v-if="diyComponent.blockStyle.value == 'style-1'" @click="diyStore.toRedirect(item.link)" class="item flex justify-between px-[20rpx] py-[30rpx] bg-white mt-[20rpx] rounded-[var(--rounded-mid)]" :style="commonTempCss(item)">
+						<view v-if="diyComponent.blockStyle.value == 'style-1'" @click="diyStore.toRedirect(item.link)" class="item flex justify-between px-[20rpx] py-[30rpx] bg-white mt-[20rpx]" :style="commonTempCss(item)">
 							<view class="flex-1 flex items-baseline flex-col">
 								<view class="text-[28rpx] pb-[10rpx] text-[#333]" :style="{ fontWeight : diyComponent.blockStyle.fontWeight }">{{ item.title.text }}</view>
 								<view class="text-[22rpx] text-[#999] pb-[30rpx]">{{ item.subTitle.text }}</view>
@@ -55,7 +55,7 @@
 							</view>
 						</view>
 						
-						<view v-if="diyComponent.blockStyle.value == 'style-2'" @click="diyStore.toRedirect(item.link)" class="item h-[150rpx] flex justify-between p-[20rpx] bg-white mt-[20rpx] rounded-[var(--rounded-mid)]" :style="commonTempCss(item)">
+						<view v-if="diyComponent.blockStyle.value == 'style-2'" @click="diyStore.toRedirect(item.link)" class="item h-[150rpx] flex justify-between p-[20rpx] bg-white mt-[20rpx]" :style="commonTempCss(item)">
 							<view class="flex-1 flex items-baseline flex-col">
 								<view class="text-[26rpx] mt-[10rpx] pb-[16rpx]" :style="{ fontWeight : diyComponent.blockStyle.fontWeight }">{{ item.title.text }}</view>
 								<view class="text-[22rpx] text-gray-500 pb-[26rpx]">{{ item.subTitle.text }}</view>
@@ -75,7 +75,7 @@
 				</view>
 				<scroll-view :scroll-x="true" class="whitespace-nowrap" :id="'warpStyle3-'+diyComponent.id" v-if="diyComponent.blockStyle.value == 'style-3'">
 					<view v-for="(item,index) in diyComponent.list" :key="item.id" class="inline-flex">
-						<view :id="'item'+index+diyComponent.id" @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center justify-between p-[10rpx] bg-white mt-[20rpx] w-[157rpx] h-[200rpx] rounded-[var(--rounded-mid)] box-border" :style="itemStyle3 + commonTempCss(item)"  :class="{'!mr-[0rpx]': index+1 === diyComponent.list.length}">
+						<view :id="'item'+index+diyComponent.id" @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center justify-between p-[10rpx] bg-white mt-[20rpx] w-[157rpx] h-[200rpx] box-border" :style="itemStyle3 + commonTempCss(item)"  :class="{'!mr-[0rpx]': index+1 === diyComponent.list.length}">
 							<view class="w-[141rpx] h-[141rpx] rounded-[var(--rounded-small)] overflow-hidden" v-if="item.imageUrl">
 								<image class="w-[141rpx] h-[141rpx]" :src="img(item.imageUrl)" mode="aspectFit" />
 							</view>
@@ -91,7 +91,7 @@
 				
 				<scroll-view scroll-x="true" class="whitespace-nowrap" :id="'warpStyle4-'+diyComponent.id" v-if="diyComponent.blockStyle.value == 'style-4'">
 					<view v-for="(item,index) in diyComponent.list" :key="item.id" class="inline-flex">
-						<view :id="'item'+index+diyComponent.id" @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center justify-between p-[4rpx] bg-[#F93D02] mt-[20rpx] rounded-[var(--rounded-mid)] box-border" :class="{'!mr-[0rpx]': index+1 === diyComponent.list.length}" :style="commonTempCss(item) + itemStyle4">
+						<view :id="'item'+index+diyComponent.id" @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center justify-between p-[4rpx] bg-[#F93D02] mt-[20rpx] box-border" :class="{'!mr-[0rpx]': index+1 === diyComponent.list.length}" :style="commonTempCss(item) + itemStyle4">
 							<view class="w-[149rpx] h-[149rpx] box-border px-[18rpx] pt-[16rpx] pb-[6rpx] bg-[#fff] flex flex-col items-center rounded-[var(--rounded-small)]">
 								<view class="w-[112rpx] h-[102rpx]" v-if="item.imageUrl">
 									<image class="w-[112rpx] h-[102rpx]" :src="img(item.imageUrl)" mode="aspectFit" />
@@ -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;
 	}
 	

uni-app/src/app/components/diy/carousel-search/index.vue

@@ -146,6 +146,7 @@
     import {useLocation} from '@/hooks/useLocation'
 	import useSystemStore from '@/stores/system';
 	const systemStore = useSystemStore();
+	const systemInfo = uni.getSystemInfoSync();
 
 	const instance = getCurrentInstance();
 	const props = defineProps(['component', 'index', 'pullDownRefreshCount', 'global', 'scrollBool']);
@@ -210,19 +211,28 @@
 	const fixedStyle = computed(()=>{
 		var style = '';
 		if(diyComponent.value.swiper.swiperStyle == 'style-3'){
-			style += 'position: absolute;z-index: 10;left: 0;right: 0;';
+			style += 'position: absolute;z-index: 99;left: 0;right: 0;';
 		}
-        if (diyStore.mode == 'decorate') return style;
 
         // #ifdef H5
 		if(props.global.topStatusBar.isShow && props.global.topStatusBar.style == 'style-4') {
             style += 'top:' + diyStore.topTabarHeight + 'px;';
         }
+		if(diyComponent.value.swiper.swiperStyle == 'style-3'){
+			// h5,上移的像素，采取的是平均值
+			if (systemInfo.platform === 'ios') {
+			    style += 'top: 55px;';
+			}else{
+				style += 'top: 44.5px;';
+			}
+		}
         // #endif
 		
+		if (diyStore.mode == 'decorate') return style;
+
         if(diyComponent.value.positionWay == 'fixed') {
 			if (props.scrollBool != undefined && props.scrollBool != -1) {
-				style += 'position: fixed;z-index: 10;left: 0;right: 0;';
+				style += 'position: fixed;z-index: 99;top: 0;left: 0;right: 0;';
 			}
 
             // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
@@ -232,6 +242,15 @@
 			}
             // #endif
 			
+			if (props.scrollBool == 1 || props.scrollBool == 2) {
+				// #ifdef H5
+				if(props.global.topStatusBar.isShow && props.global.topStatusBar.style == 'style-4') {
+					style += 'top:' + diyStore.topTabarHeight + 'px;';
+				}
+				// #endif
+			}
+			
+
 			fixedStyleBg.value = false;
             if (props.scrollBool == 1) {
 				let str = diyComponent.value.fixedBgColor || "";
@@ -252,8 +271,13 @@
 	const carouselSwiperStyle = ()=> {
 		let style = "";
 		if(diyComponent.value.swiper.swiperStyle == 'style-3'){
-			// #ifdef MP
+			// #ifdef H5
-			style = 'padding-top:' + menuButtonInfo.top + 'px;';
+			// h5,上移的像素，采取的是平均值
+			if (systemInfo.platform === 'ios') {
+			    style = 'margin-top: -55px;';
+			}else{
+				style = 'margin-top: -44.5px;';
+			}
 			// #endif
 		}
 	    return style;
@@ -384,7 +408,9 @@
         }
 		// 判断让轮播指示器是否出现
 		// #ifdef H5
-		isShowDots.value = diyComponent.value.swiper.list.length > 1 ? true : false;
+		isShowDots = computed(() => {
+			return diyComponent.value?.swiper?.list?.length > 1;
+		});
 		// #endif
 
         // 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
@@ -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;

uni-app/src/app/components/diy/image-ads/index.vue

@@ -1,7 +1,6 @@
 <template>
 	<view :style="warpCss">
-		<view :style="maskLayer"></view>
+		<view class="diy-image-ads" :style="imageAdsTempStyle()">
-		<view class="diy-image-ads">
 			<view v-if="diyComponent.list.length == 1" class="leading-0 overflow-hidden" :style="swiperWarpCss">
 				<view @click="diyStore.toRedirect(diyComponent.list[0].link)">
 					<image v-if="diyComponent.list[0].imageUrl" :src="img(diyComponent.list[0].imageUrl)" :style="{height: imgHeight}" mode="heightFix" class="!w-full" :show-menu-by-longpress="true"/>
@@ -30,6 +29,7 @@
     import { img } from '@/utils/common';
 
 	const props = defineProps(['component', 'index', 'pullDownRefreshCount']);
+	const systemInfo = uni.getSystemInfoSync();
 
 	const diyStore = useDiyStore();
 
@@ -41,6 +41,27 @@
 		}
 	})
 	
+	// 兼容通屏样式
+	const imageAdsTempStyle = ()=> {
+		let style = "";
+		if(diyComponent.value.isSameScreen && props.index == 0){
+			// #ifdef H5
+			// h5,上移的像素，采取的是平均值
+			if (systemInfo.platform === 'ios') {
+			    style = 'margin-top: -55px;';
+			}else{
+			    style = 'margin-top: -44.5px;';
+			}
+			// #endif
+			
+			// #ifdef MP
+			// 图文导航开启沉浸式且导航栏开启时，导航栏不占位
+			uni.setStorageSync('imageAdsSameScreen', true);
+			// #endif
+		}
+	    return style;
+	}
+
 	const warpCss = computed(() => {
 		var style = '';
         style += 'position:relative;';
@@ -65,23 +86,6 @@
 		return style;
 	})
 
-    // 背景图加遮罩层
-    const maskLayer = computed(()=>{
-        var style = '';
-        if(diyComponent.value.componentBgUrl) {
-            style += 'position:absolute;top:0;width:100%;';
-            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
-            style += `height:${height.value}px;`;
-
-            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
-            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
-            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
-            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
-        }
-
-        return style;
-    });
-
 	watch(
 		() => props.pullDownRefreshCount,
 		(newValue, oldValue) => {
@@ -114,9 +118,6 @@
 		}
 	});
 
-    const instance = getCurrentInstance();
-    const height = ref(0)
-
 	const refresh = () => {
 		// 装修模式下设置默认图
 		if (diyStore.mode == 'decorate') {
@@ -126,13 +127,9 @@
 					item.imgHeight = 330;
 				}
 			});
+		}else{
+			uni.removeStorageSync('imageAdsSameScreen');
 		}
-        nextTick(() => {
-            const query = uni.createSelectorQuery().in(instance);
-            query.select('.diy-image-ads').boundingClientRect((data: any) => {
-                height.value = data.height;
-            }).exec();
-        })
 	}
 </script>
 

uni-app/src/app/components/diy/member-level/index.vue

@@ -23,7 +23,7 @@
 				<text class="iconfont iconxiayibu1 ml-[4rpx] -mb-[2rpx] !text-[14rpx] text-[#333]"></text>
 			</view>
 		</view>
-		<view v-if="diyComponent.style == 'style-3'" class="rounded-[var(--rounded-big)] style-bg-3 py-[var(--pad-top-m)] px-[var(--pad-sidebar-m)]">
+		<view v-if="diyComponent.style == 'style-3'" class="style-bg-3 py-[var(--pad-top-m)] px-[var(--pad-sidebar-m)]">
 			<view class="flex items-center justify-between style-border-3 mb-[30rpx] pb-[40rpx]">
 				<view class="flex flex-col flex-1">
 					<view class="flex items-center justify-between">
@@ -74,7 +74,7 @@
 				<image :src="img('static/resource/images/diy/member/style4_arrow.png')" mode="aspectFit" class="w-[26rpx] h-[26rpx] pt-[2rpx]" />
 			</view>
 		</view>
-		<view v-if="diyComponent.style == 'style-5'" class="rounded-[var(--rounded-big)] style-5" :style="{'backgroundImage': 'url('+img('static/resource/images/diy/member/style5_bg.jpg')+')'}">
+		<view v-if="diyComponent.style == 'style-5'" class="style-5" :style="{'backgroundImage': 'url('+img('static/resource/images/diy/member/style5_bg.jpg')+')'}">
 			<view class="content-head pt-[16rpx] pb-[10rpx] px-[24rpx] flex items-center justify-between">
 				<view class="flex items-center">
 					<image :src="img('static/resource/images/diy/member/style5_vip.png')" mode="aspectFit" class="w-[40rpx] h-[40rpx]" />
@@ -171,7 +171,7 @@
 
 	})
 	const getMemberLevelFn = (list:any)=> {
-			if(!list||!list.length) return false;
+		if (!list || !list.length) return false;
 		let isSet = false;
 		// 刚进来处理会员等级数据
 		if (info.value && list && list.length) {
@@ -188,7 +188,7 @@
 					}
 				}
 
-                    if (item.growth > info.value.growth && !isSet) {
+				if (item.growth > info.value.growth && item.level_id != info.value.member_level && !isSet) {
 					afterCurrIndex.value = index;
 					isSet = true;
 				}
@@ -196,14 +196,14 @@
 		}
 
 		if (info.value.member_level) {
-                if(afterCurrIndex.value == -1){
+			if (afterCurrIndex.value == -1) {
 				afterCurrIndex.value = list.length - 1;
 			}
 
 			if (list[afterCurrIndex.value] && list[afterCurrIndex.value].growth) {
 				upgradeGrowth.value = list[afterCurrIndex.value].growth - info.value.growth;
 			}
-            }else{
+		} else {
 			// 当前会员没有会员等级，则展示会员等级中的最后一个等级
 			info.value.member_level_name = list[0].level_name;
 			upgradeGrowth.value = list[0].growth - info.value.growth;

uni-app/src/app/components/diy/picture-show/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="warpCss" class="flex justify-between">
+	<view :style="warpCss" class="flex justify-between overflow-hidden">
 		<view class="p-[20rpx] box-border overflow-hidden" :style="moduleOneCss">
 			<view class="flex items-center pb-[30rpx] pt-[6rpx]" v-if="diyComponent.moduleOne.head.textImg || diyComponent.moduleOne.head.subText">
 				<image class="h-[28rpx]" v-if="diyComponent.moduleOne.head.textImg" :src="img(diyComponent.moduleOne.head.textImg)" mode="heightFix"></image>

uni-app/src/app/pages/auth/index.vue

@@ -68,11 +68,10 @@
 					<view v-else-if="!loginConfig.is_mobile && loginConfig.is_username" class="w-full flex items-center justify-center">
 						<button class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[#fff] !border-[var(--primary-color)] border-solid border-[2rpx] text-[26rpx] rounded-[44rpx] leading-[84rpx] !text-[var(--primary-color)]" @click="redirect({ url: '/app/pages/auth/login',param:{type:'username'}})">{{t('accountLogin')}}</button>
 					</view>
-
 					<view v-if="loginConfig.agreement_show" class="w-full flex items-center justify-center mt-[28rpx]">
 						<view  class="flex items-center justify-center mt-[28rpx] py-[10rpx]" @click.stop="agreeChange">
 							<u-checkbox-group @change="agreeChange">
-								<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="24rpx" :customStyle="{ 'marginTop': '4rpx' }" />
+								<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="26rpx" :customStyle="{ 'marginTop': '5rpx !important' }" />
 							</u-checkbox-group>
 							<view class="text-[24rpx] text-[var(--text-color-light6)] flex items-center flex-wrap">
 								<text>{{ t('agreeTips') }}</text>

uni-app/src/app/pages/member/address.vue

@@ -12,13 +12,13 @@
                             <view class="mt-[16rpx] text-[26rpx] line-feed text-[var(--text-color-light9)] leading-[1.4]">{{ item.full_address }}</view>
                         </view>
                         <view class="flex justify-between pt-[26rpx]">
-                            <view class="flex items-center text-[28rpx] leading-none" @click.stop="setDefault(index)">
+                            <view class="flex items-center text-[26rpx] leading-none" @click.stop="setDefault(index)">
-                                <text class="iconfont !text-[28rpx] mr-[10rpx]" :class="{ 'iconduigou text-primary': item.is_default, 'iconcheckbox_nol': !item.is_default }"></text>
+                                <text class="iconfont !text-[26rpx] mr-[10rpx]" :class="{ 'iconduigou text-primary': item.is_default, 'iconcheckbox_nol': !item.is_default }"></text>
                                 设为默认
                             </view>
                             <view class="flex">
-                                <view class="text-[28rpx]" @click.stop="editAddressFn(item.id)"><text class="nc-iconfont nc-icon-xiugaiV6xx shrink-0 text-[28rpx] mr-[4rpx]"></text>编辑</view>
+                                <view class="text-[26rpx]" @click.stop="editAddressFn(item.id)"><text class="nc-iconfont nc-icon-xiugaiV6xx shrink-0 text-[26rpx] mr-[4rpx]"></text>编辑</view>
-                                <view @click.stop="deleteAddressFn(index)" class="ml-[40rpx] text-[28rpx]"><text class="nc-iconfont nc-icon-shanchu-yuangaizhiV6xx shrink-0 text-[28rpx] mr-[4rpx]"></text>删除</view>
+                                <view @click.stop="deleteAddressFn(index)" class="ml-[40rpx] text-[26rpx]"><text class="nc-iconfont nc-icon-shanchu-yuangaizhiV6xx shrink-0 text-[26rpx] mr-[4rpx]"></text>删除</view>
                             </view>
                         </view>
                     </view>

uni-app/src/app/pages/member/balance.vue

@@ -21,10 +21,9 @@
 							<text class="text-[36rpx] font-500 price-font">{{ moneyFormat(memberStore.info?.money).split('.')[1] }}</text>
 						</view>
 					</view>
-					<view class="mt-[60rpx] flex justify-around" v-if="Object.keys(cashOutConfigObj).length && (systemStore.siteAddons.includes('recharge') || cashOutConfigObj.is_open == 1)">
+					<view class="mt-[60rpx] flex justify-around" v-if="Object.keys(cashOutConfigObj).length && (systemStore.siteAddons.includes('recharge') || cashOutConfigObj.is_open == 1 || rechargeConfigObj.is_use == 1)">
 						<block v-if="systemStore.siteAddons.includes('recharge')">
-							<button v-if="cashOutConfigObj.is_open != 1" class="!w-[340rpx] h-[70rpx] font-500 rounded-full  text-[26rpx]  primary-btn-bg  !text-[#fff] flex-center !m-0"  hover-class="none" shape="circle" @click="redirect({url: '/addon/recharge/pages/recharge'})">充值</button>
+							<button v-if="rechargeConfigObj.is_use == 1" class="w-[250rpx] h-[70rpx] rounded-[40rpx] text-[26rpx] font-500 !bg-[#fff] !text-[var(--primary-color)] flex-center !m-0 border-[2rpx] border-[var(--primary-color)] border-solid box-border"  hover-class="none" shape="circle" @click="redirect({url: '/addon/recharge/pages/recharge'})">充值</button>
-							<button  v-else class="w-[250rpx] h-[70rpx] rounded-[40rpx] text-[26rpx] font-500 !bg-[#fff] !text-[var(--primary-color)] flex-center !m-0 border-[2rpx] border-[var(--primary-color)] border-solid box-border"  hover-class="none" shape="circle" @click="redirect({url: '/addon/recharge/pages/recharge'})">充值</button>
 						</block>
 						<view v-if="cashOutConfigObj.is_open == 1" :class="{'!w-[340rpx]': !systemStore.siteAddons.includes('recharge')}" class="text-center w-[250rpx] h-[70rpx] rounded-[40rpx] text-[26rpx] !text-[#fff] flex-center font-500 !m-0"
 						style="background: linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C;" @click="applyCashOut">{{t('cashOut')}}</view>
@@ -70,10 +69,10 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, reactive,computed } from 'vue'
+	import { ref, reactive,computed ,watch} from 'vue'
 	import { t } from '@/locale'
 	import { moneyFormat, redirect, img,pxToRpx } from '@/utils/common';
-	import { cashOutConfig,getBalanceListAll } from '@/app/api/member';
+	import { cashOutConfig,getBalanceListAll,rechargeConfig} from '@/app/api/member';
 	import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
 	import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
 	import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
@@ -93,6 +92,23 @@
     /********* 自定义头部 - end ***********/
 
 	const cashOutConfigObj: any = reactive({})
+	const rechargeConfigObj: any = reactive({})
+	// 监听 siteAddons 变化
+	watch(
+	  () => systemStore.siteAddons,
+	  (newAddons, oldAddons) => {
+	    if (newAddons !== oldAddons) {
+	      systemStore.siteAddons = newAddons
+		  if(systemStore.siteAddons.includes('recharge')) {
+		  	rechargeConfig().then((res: any) => {
+		  		for (let key in res.data) {
+		  			rechargeConfigObj[key] = res.data[key];
+		  		}
+		  	})
+		  }
+	    }
+	  }
+	);
 	onShow(() => {
         cashOutConfig().then((res: any) => {
             for (let key in res.data) {
@@ -100,7 +116,15 @@
             }
 
         })
+		if(systemStore.siteAddons.includes('recharge')) {
+			rechargeConfig().then((res: any) => {
+				for (let key in res.data) {
+					rechargeConfigObj[key] = res.data[key];
+				}
 			})
+		}
+    })
+
 
 	// 获取系统状态栏的高度
 	let menuButtonInfo: any = {};
@@ -118,17 +142,17 @@
 	})
 
 	const mescrollTop = computed(()=>{
-		if(Object.keys(cashOutConfigObj).length && (systemStore.siteAddons.includes('recharge') || cashOutConfigObj.is_open == 1)){
+		if((cashOutConfigObj.is_open == 1 || rechargeConfigObj.is_use == 1)){
 			if(Object.keys(menuButtonInfo).length){
-				return (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +pxToRpx(8)+708)+'rpx'
+				return (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +pxToRpx(8)+700)+'rpx'
 			}else{
-				return '708rpx'
+				return '718rpx'
 			}
 		}else {
 			if(Object.keys(menuButtonInfo).length){
-				return (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +pxToRpx(8)+590.39)+'rpx'
+				return (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +pxToRpx(8)+632)+'rpx'
 			}else{
-				return '590.39rpx'
+				return '650rpx'
 			}
 		}
 	})

uni-app/src/app/pages/verify/index.vue

@@ -164,7 +164,7 @@
 		if(isLoading) return false;
 		isLoading = true;
 
-		getVerifierInfo(verify_code.value).then((res:any) =>{
+		getVerifierInfo({ code : verify_code.value }).then((res:any) =>{
 			isLoading = false;
 			redirect({ url: '/app/pages/verify/verify', param: { code: verify_code.value} })
 		}).catch(() => {

uni-app/src/app/pages/verify/verify.vue

@@ -118,7 +118,7 @@
 	const verifyInfo = ref({})
 	const getVerifierInfoFn = ()=>{
 		loading.value = true;
-		getVerifierInfo(code.value).then((res:any) =>{
+		getVerifierInfo({ code : code.value }).then((res:any) =>{
 			verifyInfo.value = res.data;
 			loading.value = false;
 		}).catch(() => {

uni-app/src/components/select-date/select-date.vue

@@ -1,7 +1,8 @@
 <template>
     <u-popup :show="show" @close="show = false" mode="bottom" :round="10"  zIndex="10090">
-        <view class="popup-common">
+        <view class="popup-common relative">
 			<view class="title">选择时间</view>
+            <view class="absolute  top-[36rpx] right-[36rpx] text-[24rpx] text-[var(--text-color-light6)] leading-[30rpx] z-10" @click="clearDate">清除</view>
             <view class="px-[var(--popup-sidebar-m)] mb-[20rpx] mt-[10rpx]">
                 <view class="flex items-center justify-between mb-[30rpx]">
                     <view class="w-[160rpx] h-[66rpx] box-border flex-center rounded-[33rpx] bg-[var(--temp-bg)] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[var(--temp-bg)]"  v-for="(item,index) in curselectDate" :key="'a'+index" :class="{'text-primary !border-[var(--primary-color)] !bg-[rgba(239,0,12,0.04)]': currentValue.type == item.type}"  @click="loadDateFn(item)">{{item.name}}</view> 
@@ -177,6 +178,10 @@ const reset = () =>{
     dateList.nowDate = [init().nowDateStart,init().nowDateEnd]
 }
 
+const clearDate = () =>{
+    emits('confirm',[])
+    show.value = false
+}
 defineExpose({
     show
 })

uni-app/src/components/share-poster/share-poster.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 分享弹窗 -->
 	<view @touchmove.prevent.stop class="share-popup">
-	    <u-popup :show="sharePopupShow" type="bottom" @close="sharePopuClose" overlayOpacity="0.8">
+	    <u-popup :show="sharePopupShow" type="bottom" @close="sharePopupClose" overlayOpacity="0.8">
 	        <view @touchmove.prevent.stop>
 				<view class="poster-img-wrap" :style="{'top': shareTop}">
 					<image v-if="isPosterAnimation" class="poster-animation" :src="img('addon/shop/poster_animation.gif')" mode="aspectFit"></image>
@@ -33,7 +33,7 @@
 					</view>
 					<!-- #endif -->
 				</view>
-				<view class="share-footer" @click="sharePopuClose"><text>取消分享</text></view>
+				<view class="share-footer" @click="sharePopupClose"><text>取消分享</text></view>
 	        </view>
 	    </u-popup>
 		<u-popup :show="show" mode="center" :round="10" :closeable="true"  @close="show = false" :safe-area-inset-bottom="false">
@@ -79,6 +79,8 @@ const props = defineProps({
     }
 })
 
+const emits = defineEmits(['close'])
+
 const sharePopupShow = ref(false);
 
 // 复制
@@ -136,7 +138,7 @@ const goodsPosterShowFn = () => {
 			isPosterImg.value = true;
 		}
 	}).catch(() => {
-		sharePopuClose();
+		sharePopupClose();
 	})
 }
 const show = ref(false);
@@ -199,10 +201,12 @@ shareTop.value = menuButtonInfo.top + menuButtonInfo.height + 'px';
 // #endif
 /************ 获取微信头部-end ****************/
 
-const sharePopuClose = ()=>{
+const sharePopupClose = ()=>{
 	sharePopupShow.value = false;
 	isPosterAnimation.value = false;
 	isPosterImg.value = false;
+	console.log('sharePopupClose 取消分享');
+	emits('close');
 }
 
 defineExpose({

uni-app/src/hooks/useDiy.ts

@@ -43,8 +43,11 @@ export function useDiy(params: any = {}) {
             if (data.value.global.pageStartBgColor && data.value.global.pageEndBgColor) style += `background:linear-gradient(${ data.value.global.pageGradientAngle },${ data.value.global.pageStartBgColor },${ data.value.global.pageEndBgColor });`;
             else style += 'background-color:' + data.value.global.pageStartBgColor + ';';
         }
-
+		if(data.value.global.bottomTabBarSwitch){
 			style += 'min-height:calc(100vh - 50px);';
+		}else{
+			style += 'min-height:calc(100vh);';
+		}
         if (data.value.global.bgUrl) {
             style += `background-image:url('${ img(data.value.global.bgUrl) }');`;
         }

uni-app/src/hooks/useShare.ts

@@ -61,7 +61,9 @@ export const useShare = () => {
         }
         // #endif
 
-        if (options && options.wechat && options.weapp) {
+        if (options && Object.keys(options).length) {
+
+            if (options.wechat) {
 
                 // #ifdef H5
                 wechatOptions.title = options.wechat.title || ''
@@ -72,15 +74,20 @@ export const useShare = () => {
                 // useSystemStore().shareCallback = options.wechat.callback || null;
                 wechatShare()
                 // #endif
+            }
+
+            if (options.weapp) {
 
                 // #ifdef MP-WEIXIN
                 weappOptions.title = options.weapp.title || ''
                 if (options.weapp.path) weappOptions.path = options.weapp.path
                 weappOptions.imageUrl = options.weapp.url ? img(options.weapp.url) : ''
                 useSystemStore().shareCallback = options.weapp.callback || null;
+                uni.setStorageSync('weappOptions', weappOptions)
                 // #endif
 
-            uni.setStorageSync('weappOptions', weappOptions)
+            }
+
         } else {
             getShareInfo({
                 route: '/' + currRoute(),
@@ -125,7 +132,6 @@ export const useShare = () => {
                 ...options
             }
         })
-
     }
 
     // 小程序分享，分享到朋友圈

uni-app/src/locale/zh-Hans.json

@@ -68,6 +68,8 @@
     "recharge.pages.recharge_record_detail": "充值记录详情",
     "shop.pages.goods.search": "搜索",
     "shop.pages.goods.cart": "购物车",
+    "shop.pages.goods.collect": "商品收藏",
+    "shop.pages.goods.browse": "我的足迹",
     "shop.pages.goods.category": "商品分类",
     "shop.pages.goods.detail": "商品详情",
     "shop.pages.goods.list": "商品列表",

uni-app/src/styles/official-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nc-iconfont"; /* Project id 4567203 */
-  src: url('//at.alicdn.com/t/c/font_4567203_upzww1i5qjn.woff2?t=1731549702579') format('woff2'),
+  src: url('//at.alicdn.com/t/c/font_4567203_unxj5bqsj6o.woff2?t=1732704100572') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4567203_upzww1i5qjn.woff?t=1731549702579') format('woff'),
+       url('//at.alicdn.com/t/c/font_4567203_unxj5bqsj6o.woff?t=1732704100572') format('woff'),
-       url('//at.alicdn.com/t/c/font_4567203_upzww1i5qjn.ttf?t=1731549702579') format('truetype');
+       url('//at.alicdn.com/t/c/font_4567203_unxj5bqsj6o.ttf?t=1732704100572') format('truetype');
 }
 
 .nc-iconfont {
@@ -13,6 +13,46 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nc-icon-gouwucheV6xx6:before {
+  content: "\e835";
+}
+
+.nc-icon-gouwucheV6xx-11:before {
+  content: "\e770";
+}
+
+.nc-icon-a-zuji34:before {
+  content: "\e803";
+}
+
+.nc-icon-zhifujianshu:before {
+  content: "\e831";
+}
+
+.nc-icon-tuikuanjianshu:before {
+  content: "\e830";
+}
+
+.nc-icon-xiadanjianshu:before {
+  content: "\e82f";
+}
+
+.nc-icon-zhifuzhuanhuashuai:before {
+  content: "\e82e";
+}
+
+.nc-icon-chengbenjine:before {
+  content: "\e834";
+}
+
+.nc-icon-tuikuanjine:before {
+  content: "\e833";
+}
+
+.nc-icon-zhifujine:before {
+  content: "\e832";
+}
+
 .nc-icon-gouwuche1:before {
   content: "\e76e";
 }

uni-app/src/utils/common.ts

@@ -13,6 +13,8 @@ export const redirect = (redirect: any) => {
     if (useDiyStore().mode == 'decorate') return
 
     let { url, mode, param, success, fail, complete } = redirect
+    let originalUrl = url; // 原始地址
+    let newLogin = false; // 是否需要登录
 
     // 如果未开启普通账号登录注册，则不展示登录注册页面，如果只开启了账号密码登录，就不需要跳转到登录中间页了，直接进入普通账号密码登录页面
     if (!getToken() && getNeedLoginPages().indexOf(url) != -1) {
@@ -25,12 +27,14 @@ export const redirect = (redirect: any) => {
             url = '/app/pages/auth/login'
             param = { type: 'username' }
             mode = 'redirectTo'
+            newLogin = true
         } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
             uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
             return;
         } else {
             url = '/app/pages/auth/index'
             mode = 'redirectTo'
+            newLogin = true
         }
         // #endif
 
@@ -41,12 +45,14 @@ export const redirect = (redirect: any) => {
                 url = '/app/pages/auth/login'
                 param = { type: 'username' }
                 mode = 'redirectTo'
+                newLogin = true
             } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
                 uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
                 return;
             } else {
                 url = '/app/pages/auth/index'
                 mode = 'redirectTo'
+                newLogin = true
             }
         } else {
             // 普通浏览器
@@ -54,12 +60,14 @@ export const redirect = (redirect: any) => {
                 url = '/app/pages/auth/login'
                 param = { type: 'username' }
                 mode = 'redirectTo'
+                newLogin = true
             } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile) {
                 uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
                 return;
             } else {
                 url = '/app/pages/auth/index'
                 mode = 'redirectTo'
+                newLogin = true
             }
         }
         // #endif
@@ -71,6 +79,10 @@ export const redirect = (redirect: any) => {
 
     mode != 'switchTab' && param && Object.keys(param).length && (url += uni.$u.queryParams(param))
 
+    if (newLogin) {
+        uni.setStorage({ key: 'loginBack', data: { url: originalUrl } });
+    }
+
     switch (mode) {
         case 'switchTab':
             uni.switchTab({

uni-app/src/utils/interceptor.ts

@@ -101,9 +101,13 @@ const loadShare = () => {
         'addon/shop/pages/goods/detail',
         'addon/shop/pages/point/detail',
         'addon/shop_fenxiao/pages/promote_code',
+        'addon/shop_fenxiao/pages/goods',
+        'addon/shop_fenxiao/pages/zone',
         'addon/shop_giftcard/pages/detail',
         'addon/shop_giftcard/pages/give',
         'app/pages/index/diy',
     ]
-   if(!shareWhiteList.includes(currRoute()||'')) setShare()
+    if (currRoute()) {
+        if (!shareWhiteList.includes(currRoute() || '')) setShare()
+    }
 }

uni-app/src/utils/request.ts

@@ -59,10 +59,9 @@ class Request {
         return this.request('PUT', url, data, config)
     }
 
-    public delete(url: string, config: RequestConfig = {}) {
+    public delete(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
-        return this.request('DELETE', url, {}, config)
+        return this.request('DELETE', url, data, config)
     }
-
     /**
      * 发送上传请求
      */
@@ -109,7 +108,7 @@ class Request {
             method
         })
 
-        if (params.method.toUpperCase() == 'GET') {
+        if (params.method.toUpperCase() == 'GET' || params.method.toUpperCase() == 'DELETE') {
             params.url += '?' + qs.stringify(data);
         } else {
             params.data = data;

uni-app/src/utils/topTabbar.ts

@@ -1,5 +1,6 @@
 import { ref } from 'vue';
 import { onPageScroll } from '@dcloudio/uni-app';
+import { deepClone } from '@/utils/common';
 
 export function topTabar() {
 
@@ -31,7 +32,7 @@ export function topTabar() {
                 param.value[key] = data[key]
             }
         }
-        return param.value;
+        return deepClone(param.value);
     }
 
     onPageScroll((e) => {