Merge remote-tracking branch 'remotes/origin/dev/1.0' into custom/2811-xcx6.aigc-quickapp.com

common/js/style_color.js

@@ -61,8 +61,8 @@ export default {
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
 		...{
-			hover_nav_bg_color: '#c6251b', //背景色: 红色 '#c6251b', 白色： '#FFFC'
-			hover_nav_text_color: '#FFFFFF' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
+			hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色： '#FFFC'
+			hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
 		},
 	},
 	'green': {

common/js/util.js

@@ -1162,47 +1162,5 @@ export default {
 	verifyMobile(mobile) {
 		var parse = /^\d{11}$/.test(mobile);
 		return parse;
-	},
-	/**
-	 * 判断是否为快应用环境
-	 * @returns {boolean} 是否为快应用
-	 */
-	isQuickApp() {
-		// #ifndef QUICKAPP-WEBVIEW
-		let _isQuickApp = false;
-		try {
-			const ua = navigator?.userAgent?.toLowerCase();
-			console.log('ua = ', ua);
-			_isQuickApp = ua.indexOf('quickapp') !== -1;
-
-			if (!_isQuickApp) {
-				// 特殊说明由于网站是嵌入到快应用的Webview组件中<web>，UA中不会包含quickapp字符串，
-				// 但是会包含uniacid参数，所以这里通过uniacid参数来判断是否为快应用环境
-				_isQuickApp = ua.indexOf('uniacid=') !== -1;
-			}
-		} catch (e) {}
-
-		if (!_isQuickApp) {
-			const systemInfo = this.getDeviceInfo();
-			_isQuickApp = systemInfo?.platform === 'quickapp' || process?.env?.UNI_PLATFORM === 'quickapp';
-		}
-		return _isQuickApp;
-		// #endif
-
-		return true;
-	},
-	/**
-	 * 判断是否为华为快应用环境
-	 * @returns {boolean} 是否为华为快应用
-	 */
-	isHuaweiQuickApp() {
-		if (!this.isQuickApp()) return false;
-
-		// #ifndef QUICKAPP-WEBVIEW-HUAWEI
-		const systemInfo = this.getDeviceInfo();
-		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' || 
-		       (typeof qh !== 'undefined' && qh.platform === 'huawei');
-		// #endif
-		return true;
 	}
 }

components-diy/diy-wechat-channel.vue

@@ -1,5 +1,4 @@
 <template>
-    <!-- #ifdef MP-WEIXIN -->
 	<view class="diy-wechat-channel" :style="channelWarpCss">
 		<view class="channel-header" @tap="handlerClick">
 			<image class="channel-avatar" :src="$util.img(value.avatarUrl)" mode="aspectFill"></image>
@@ -9,7 +8,8 @@
 			</view>
 			<image class="channel-arrow" :src="$util.img('addon/personnel/shop/view/enterprise/arrow.png')" mode="aspectFill"></image>
 		</view>
-		<!-- 嵌入式视频播放 -->	 
+		<!-- 嵌入式视频播放 -->
+		<!-- #ifdef MP-WEIXIN -->		 
 		<native-component v-if="value.embedMode && typeof wx !== 'undefined' && wx.canIUse('component.channel-video')">
 			<channel-video 
 				:feed-id="value.feedId" 
@@ -17,7 +17,8 @@
 				:feed-token="value.feedToken" 
 				style="width: 100%; height: 320rpx;">
 			</channel-video>
-		</native-component>	
+		</native-component>
+		<!-- #endif -->		
 		<!-- 跳转式视频播放 -->
 		<view v-else class="channel-video" @tap="playVideo">
 			<image class="video-cover" :src="$util.img(value.coverUrl)" mode="aspectFill"></image>
@@ -32,10 +33,8 @@
 			</view>
 		</view>
 	</view>
-    <!-- #endif -->    
 </template>
 
-
 <script>
 // 微信视频号组件
 import DiyMinx from './minx.js'

components/privacy-popup/privacy-popup.vue

@@ -1,385 +1,237 @@
 <template>
-	<view>
-		<view class="privacy-mask" v-if="showPop">
+	<!-- #ifdef MP -->
+	<view v-if="showPop">
+		<view class="privacy-mask">
 			<view class="privacy-wrap">
 				<view class="privacy-title">用户隐私保护提示</view>
 				<view class="privacy-desc">
-					感谢您使用{{ appName }}，在使用前您应当阅读并同意
-					<text class="privacy-link" @tap="openPrivacyContract">{{ privacyContractName }}</text>
-					<!-- #ifdef QUICKAPP-WEBVIEW || H5 -->
-					<text class="privacy-link" @tap="openPrivacyService">{{ privacyServiceName }}</text>
-					<!-- #endif -->
-					,当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用{{ appName }}相关功能。
+					感谢您使用本小程序，在使用前您应当阅读并同意
+					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
+					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
 				</view>
 				<view class="privacy-button-flex">
 					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
-					<!-- #ifdef QUICKAPP-WEBVIEW || MP-WEIXIN -->
-					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization"
-						@agreeprivacyauthorization="handleAgree">同意并继续</button>
-					<!-- #endif -->
-					<!-- #ifdef WEB || H5 -->
-					<button id="agree-btn" class="privacy-button-btn bg-agree" @tap="handleAgree" @click="handleAgree">同意并继续</button>
-					<!-- #endif -->
+					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
 				</view>
 			</view>
 		</view>
 	</view>
+	<!-- #endif -->
+	<!-- #ifdef WEB || H5 -->
+	<view v-if="showPop"></view>
+	<!-- #endif -->
 </template>
 
 <script>
-// #ifdef QUICKAPP-WEBVIEW
-import has from '@system.has'
-// #endif
-
-const closeOtherPagePopUpHooks = new Set();
-const privacyContractPage = '/pages_tool/agreement/contenr?type=0';
-const privacyServicePage = '/pages_tool/agreement/contenr?type=1';
-
-export default {
-	name: 'PrivacyPopup',
-	data() {
-		return {
-			agree: false,
-			showPop: false,
-			privacyAuthorization: null,
-			privacyResolves: new Set(),
-			privacyContractName: '用户隐私保护指引',
-			appName: '本小程序',
-			// #ifdef WEB || H5
-			appName: '本应用',
-			privacyContractName: '《隐私条款》',
-			privacyServiceName: '《用户服务协议》',
-			// #endif
-		}
-	},
-	mounted() {
-		this.listenPrivacySettingChange()
-		this.curPageShow()
-	},
-	created() {
-		try {
-			// #ifdef MP-WEIXIN
+	export default {
+		data() {
+			return {
+				agree: false,
+				showPop: false,
+				privacyAuthorization: null,
+				privacyResolves: new Set(),
+				closeOtherPagePopUpHooks: new Set(),
+				privacyContractName: '用户隐私保护指引'
+			}
+		},
+		mounted() {
+			this.init()
+			this.curPageShow()
+		},
+		created() {
+			let that = this
 			//查询微信侧记录的用户是否有待同意的隐私政策信息
-			wx.getPrivacySetting({
-				success: (res) => {
-					// console.log('隐私政策信息', res);
-					// console.log(res.privacyContractName);
-					this.privacyContractName = res.privacyContractName
-				}
-			});
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW || H5
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.getPrivacySetting) {
-					has.getPrivacySetting({
-						success: (res) => {
-							if (res.privacyContractName) {
-								this.privacyContractName = res.privacyContractName
-							}
-						},
+			try {
+				wx.getPrivacySetting({
+					success(res) {
+						// console.log('隐私政策信息', res);
+						// console.log(res.privacyContractName);
+						that.privacyContractName = res.privacyContractName
+					}
+				});
+			} catch (e) {
+				// console.log("=========低版本基础库==========")
+			}
+		},
+		methods: {
+			// 监听何时需要提示用户阅读隐私政策
+			init() {
+				let that = this;
+				if (wx.onNeedPrivacyAuthorization) {
+					wx.onNeedPrivacyAuthorization((resolve) => {
+						if (typeof that.privacyAuthorization === 'function') {
+							that.privacyAuthorization(resolve)
+						}
 					})
 				}
-			}
-			// #endif
-		} catch (e) {
-			console.error("=========低版本基础库==========", e)
-		}
-	},
-	methods: {
-		getPrivacySettingByQuickApp() {
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.getPrivacySetting) {
-					has.getPrivacySetting({
+			},
+			proactive() {
+				let that = this
+				if (wx.getPrivacySetting) {
+					wx.getPrivacySetting({
 						success: (res) => {
 							// console.log(res)
 							if (res.needAuthorization) {
-								this.popUp()
+								that.popUp()
 								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
 								this.closeOtherPagePopUp(this.disPopUp)
 							} else {
 								this.$emit('agree')
 							}
 						},
-					})
+					});
 				} else {
-					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理，判断是否已经授权
-					if (uni.getStorageSync('privacyAgreed')) {
-						this.$emit('agree')
-					} else {
-						this.popUp()
-						// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-						this.closeOtherPagePopUp(this.disPopUp)
-					}
+					this.$emit('agree')
 				}
-			}
-			// #endif
-		},
-
-		listenPrivacySettingChange() {
-			// #ifdef MP-WEIXIN
-			// 监听微信侧隐私政策授权变化事件
-			if (wx.onNeedPrivacyAuthorization) {
-				wx.onNeedPrivacyAuthorization((resolve) => {
-					if (typeof this.privacyAuthorization === 'function') {
-						this.privacyAuthorization(resolve)
+			},
+			//初始化监听程序
+			curPageShow() {
+				this.privacyAuthorization = resolve => {
+					this.privacyResolves.add(resolve)
+					//打开弹窗
+					this.popUp()
+					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+					this.closeOtherPagePopUp(this.disPopUp)
+				}
+				this.closeOtherPagePopUpHooks.add(this.disPopUp)
+			},
+			// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+			closeOtherPagePopUp(closePopUp) {
+				this.closeOtherPagePopUpHooks.forEach(hook => {
+					if (closePopUp !== hook) {
+						hook()
 					}
 				})
-			}
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				// 监听快速应用侧隐私政策授权变化事件
-				if (typeof has != 'undefined' && has?.onPrivacySettingChange) {
-					has.onPrivacySettingChange((res) => {
-						// console.log(res)
-						if (res.needAuthorization) {
-							this.popUp()
-							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-							this.closeOtherPagePopUp(this.disPopUp)
-						} else {
-							this.$emit('agree')
-						}
-					})
-				}
-			}
-			// #endif
-
-			// 主动查询用户隐私政策授权状态，针对快速应用
-			this.getPrivacySettingByQuickApp();
-		},
-		// 主动查询用户隐私政策授权状态
-		proactive() {
-			// #ifdef MP-WEIXIN
-			if (wx.getPrivacySetting) {
-				wx.getPrivacySetting({
-					success: (res) => {
-						// console.log(res)
-						if (res.needAuthorization) {
-							this.popUp()
-							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-							this.closeOtherPagePopUp(this.disPopUp)
-						} else {
-							this.$emit('agree')
-						}
+			},
+			//打开隐私协议
+			openPrivacyContract() {
+				wx.openPrivacyContract({
+					success(res) {
+						// console.log('打开隐私协议', res);
 					},
+					fail(err) {
+						// console.error('打开隐私协议失败', err)
+					}
 				});
-			} else {
+			},
+			// 不同意
+			handleDisagree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'disagree',
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
+				//退出小程序
+				uni.showModal({
+					content: '未同意隐私协议，无法使用相关功能',
+					success: () => {
+						this.$emit('disagree')
+					}
+				})
+			},
+			// 同意并继续
+			handleAgree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'agree',
+						buttonId: 'agree-btn'
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
 				this.$emit('agree')
-			}
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW
-			this.getPrivacySettingByQuickApp();
-			// #endif
-		},
-		//初始化监听程序
-		curPageShow() {
-			closeOtherPagePopUpHooks.add(this.disPopUp)
-			this.privacyAuthorization = resolve => {
-				this.privacyResolves.add(resolve)
-				//打开弹窗
-				this.popUp()
-				// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-				this.closeOtherPagePopUp(this.disPopUp)
-			}
-		},
-		// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-		closeOtherPagePopUp(closePopUp) {
-			closeOtherPagePopUpHooks.forEach(hook => {
-				if (closePopUp !== hook) {
-					hook()
+			},
+			//打开弹窗
+			popUp() {
+				if (this.showPop === false) {
+					this.showPop = true
 				}
-			})
-		},
-		//打开隐私协议
-		openPrivacyContract() {
-			// #ifdef MP-WEIXIN
-			wx.openPrivacyContract({
-				success(res) {
-					// console.log('打开隐私协议', res);
-				},
-				fail(err) {
-					// console.error('打开隐私协议失败', err)
-				}
-			});
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.openPrivacySetting) {
-					has.openPrivacySetting({
-						success: (res) => {
-							// console.log('打开隐私协议', res);
-						},
-						fail: (err) => {
-							// console.error('打开隐私协议失败', err)
-						}
-					});
-				} else {
-					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理
-					this.$util.redirectTo(privacyContractPage);
-				}
-			} else {
-				// H5 环境下的处理逻辑
-				this.$util.redirectTo(privacyContractPage);
-			}
-			// #endif
-		},
-		//打开用户服务协议
-		openPrivacyService() {
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.openPrivacySetting) {
-					has.openPrivacySetting({
-						success: (res) => {
-							// console.log('打开用户服务协议', res);
-						},
-						fail: (err) => {
-							// console.error('打开用户服务协议失败', err)
-						}
-					});
-				} else {
-					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理
-					this.$util.redirectTo(privacyServicePage);
-				}
-			} else {
-				// H5 环境下的处理逻辑
-				this.$util.redirectTo(privacyServicePage);
-			}
-			// #endif
-		},
-		// 不同意
-		handleDisagree() {
-			this.privacyResolves.forEach(resolve => {
-				resolve({
-					event: 'disagree',
-				})
-			})
-			this.privacyResolves.clear()
+			},
 			//关闭弹窗
-			this.disPopUp()
-			//退出小程序
-			uni.showModal({
-				content: '未同意隐私协议，无法使用相关功能',
-				success: () => {
-					this.$emit('disagree')
+			disPopUp() {
+				if (this.showPop === true) {
+					this.showPop = false
 				}
-			})
-		},
-		// 同意并继续
-		handleAgree() {
-			this.privacyResolves.forEach(resolve => {
-				resolve({
-					event: 'agree',
-					buttonId: 'agree-btn'
-				})
-			})
-			this.privacyResolves.clear()
-			//关闭弹窗
-			this.disPopUp()
-
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			// 保存用户授权状态到本地存储，用于快应用Webview组件中的H5方式处理
-			uni.setStorageSync('privacyAgreed', true);		
-			// #endif	
-			this.$emit('agree')
-		},
-		//打开弹窗
-		popUp() {
-			this.showPop = true;
-		},
-		//关闭弹窗
-		disPopUp() {
-			this.showPop = false;
-		},
-	},
-	beforeDestroy() {
-		// 清理事件监听器和集合
-		this.privacyResolves.clear()
-		closeOtherPagePopUpHooks.delete(this.disPopUp)
-		// 注意：这里需要根据实际情况清理微信和快速应用的事件监听器
-		// 由于微信的 wx.onNeedPrivacyAuthorization 没有对应的 off 方法，这里可能需要其他方式处理
-	},
-}
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.privacy-mask {
-	position: fixed;
-	z-index: 5000;
-	top: 0;
-	right: 0;
-	left: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.2);
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.privacy-mask {
+		position: fixed;
+		z-index: 5000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.privacy-wrap {
-	width: 632rpx;
-	padding: 48rpx 30rpx;
-	box-sizing: border-box;
-	background: #fff;
-	border-radius: 16rpx;
-}
+	.privacy-wrap {
+		width: 632rpx;
+		padding: 48rpx 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		border-radius: 16rpx;
+	}
 
-.privacy-title {
-	padding: 0rpx 30rpx 40rpx 30rpx;
-	font-weight: 700;
-	font-size: 36rpx;
-	text-align: center;
-}
+	.privacy-title {
+		padding: 0rpx 30rpx 40rpx 30rpx;
+		font-weight: 700;
+		font-size: 36rpx;
+		text-align: center;
+	}
 
-.privacy-desc {
-	font-size: 30rpx;
-	color: #555;
-	line-height: 2;
-	text-align: left;
-	padding: 0 40rpx;
-}
+	.privacy-desc {
+		font-size: 30rpx;
+		color: #555;
+		line-height: 2;
+		text-align: left;
+		padding: 0 40rpx;
+	}
 
-.privacy-link {
-	color: #2f80ed;
-}
+	.privacy-link {
+		color: #2f80ed;
+	}
 
-.privacy-button-flex {
-	display: flex;
-	padding: 20rpx 40rpx;
-}
+	.privacy-button-flex {
+		display: flex;
+		padding: 20rpx 40rpx;
+	}
 
-.privacy-button-btn {
-	color: #FFF;
-	font-size: 30rpx;
-	// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-	font-size: 28rpx;
-	// #endif
-	font-weight: 500;
-	line-height: 100rpx;
-	text-align: center;
-	height: 100rpx;
-	border-radius: 20rpx;
-	border: none;
-	background: #07c160;
-	flex: 1;
-	margin-right: 30rpx;
-	justify-content: center;
-}
+	.privacy-button-btn {
+		color: #FFF;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 100rpx;
+		text-align: center;
+		height: 100rpx;
+		border-radius: 20rpx;
+		border: none;
+		background: #07c160;
+		flex: 1;
+		margin-right: 30rpx;
+		justify-content: center;
+	}
 
-.privacy-button-btn::after {
-	border: none;
-}
+	.privacy-button-btn::after {
+		border: none;
+	}
 
-.bg-disagree {
-	color: #07c160;
-	background: #f2f2f2;
-}
+	.bg-disagree {
+		color: #07c160;
+		background: #f2f2f2;
+	}
 
-.bg-agree {
-	margin-right: 0rpx;
-}
+	.bg-agree {
+		margin-right: 0rpx;
+	}
 </style>

lang/zh-cn/goods/category.js

@@ -3,5 +3,5 @@ export const lang = {
 	title: '商品分类',
 	search:'商品搜索',
 	seeMore : '查看更多',
-	Make: "询底价"
+	Make: "咨询"
 }

lang/zh-cn/goods/detail.js

@@ -22,7 +22,7 @@ export const lang = {
 	status:'该商品已下架',
 	sellout:'库存不足',
 	max:'已达最大限购数量',
-	makebtn:'价格电议',
+	makebtn:' ',
 	sales:'销量',
 	stock:'库存',
 	kefu:'客服',

lang/zh-cn/goods/list.js

@@ -6,6 +6,6 @@ export const lang = {
 	Price:'价格',
 	Filter:'筛选',
 	Search:'请输入您要搜索的商品',
-	Make:'立即询底价',
+	Make:'查看详情',
 	
 }

lang/zh-cn/order/activist.js

@@ -1,6 +1,6 @@
-export const lang = {
-	//title为每个页面的标题
-	title: '售后',
-	checkDetail: '查看详情',
-	emptyTips: '暂无售后记录'
-}
+export const lang = {
+	//title为每个页面的标题
+	title: '售后',
+	checkDetail: '查看详情',
+	emptyTips: '暂无售后记录'
+}

pages/index/index.vue

@@ -137,8 +137,10 @@
 				</uni-popup>
 			</view>
 			<hover-nav :need="true"></hover-nav>
-			<!-- 隐私协议 -->
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
 			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
 			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 			<ns-login ref="login"></ns-login>
 		</view>

pages_goods/list.vue

@@ -319,8 +319,9 @@ export default {
 @import './public/css/list.scss';
 </style>
 <style scoped>
->>>.uni-tag--primary.uni-tag--inverted {
+.uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
+	
 }
 
 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {

pages_tool/member/footprint.vue

@@ -23,9 +23,9 @@
 
 								<view class="lineheight-clear">
 									<view class="discount-price">
-										<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-										<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-										<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										
+										
+										
 									</view>
 									<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
 										<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
@@ -39,7 +39,7 @@
 										<text class="unit">{{ $lang('common.currencySymbol') }}</text>
 										<text>{{ showMarketPrice(item) }}</text>
 									</view>
-									<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									
 								</view>
 							</view>
 						</view>

pages_tool/member/index.vue

@@ -96,7 +96,6 @@ export default {
 						this.$store.commit('setMemberInfo', '');
 						this.$store.dispatch('emptyCart');
 						uni.removeStorageSync('authInfo');
-						uni.removeStorageSync('privacyAgreed');
 						this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
 					}
 				}
@@ -119,9 +118,7 @@ export default {
 									this.$store.commit('setMemberInfo', '');
 									this.$store.dispatch('emptyCart');
 									uni.removeStorageSync('authInfo');
-									uni.removeStorageSync('privacyAgreed');
 									this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
-									
 								} else {
 									this.$util.showToast({
 										title: rres.message

scripts/clean-empty-directories.js

@@ -1,62 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-/**
- * 递归删除空目录
- * @param {string} dirPath - 要检查的目录路径
- * @param {boolean} dryRun - 是否只打印不删除
- */
-function removeEmptyDirectories(dirPath, dryRun = false) {
-  try {
-    // 读取目录内容
-    const files = fs.readdirSync(dirPath);
-    
-    // 递归检查子目录
-    for (const file of files) {
-      const fullPath = path.join(dirPath, file);
-      const stat = fs.statSync(fullPath);
-      
-      if (stat.isDirectory()) {
-        removeEmptyDirectories(fullPath, dryRun);
-      }
-    }
-    
-    // 再次读取目录内容，因为子目录可能已经被删除
-    const updatedFiles = fs.readdirSync(dirPath);
-    
-    // 如果目录为空
-    if (updatedFiles.length === 0) {
-      console.log(`${dryRun ? 'Would remove' : 'Removing'} empty directory: ${dirPath}`);
-      if (!dryRun) {
-        fs.rmdirSync(dirPath);
-      }
-    }
-  } catch (error) {
-    console.error(`Error processing directory ${dirPath}:`, error.message);
-  }
-}
-
-/**
- * 主函数
- */
-function main() {
-  // 获取项目根目录
-  const projectRoot = path.resolve(__dirname, '..');
-  
-  console.log('Starting to remove empty directories...');
-  console.log(`Project root: ${projectRoot}`);
-  console.log('====================================');
-  
-  // 执行删除操作
-  removeEmptyDirectories(projectRoot);
-  
-  console.log('====================================');
-  console.log('Empty directory cleanup completed!');
-}
-
-// 运行主函数
-if (require.main === module) {
-  main();
-}
-
-module.exports = removeEmptyDirectories;