fix(store): 部分数据初始化错误

chore: 保留node_modules\jweixin-module\out\index.js文件
chore: 添加@dcloudio/uni-quickapp-webview依赖及更新支付组件
2025-12-05 15:47:42 +08:00 · 2025-12-04 09:20:29 +08:00 · 2025-12-04 09:18:00 +08:00 · 2025-12-04 08:39:05 +08:00 · 2025-11-29 17:13:43 +08:00
16 changed files with 3181 additions and 3818 deletions
--- a/App.vue
+++ b/App.vue
@@ -1,43 +1,51 @@
 <script>
 	import auth from 'common/js/auth.js';
 	import colorList from 'common/js/style_color.js'
-	import { Weixin } from 'common/js/wx-jssdk.js';
+	import {
+		Weixin
+	} from 'common/js/wx-jssdk.js';

 	export default {
 		mixins: [auth],
 		onLaunch: function(options) {
-			// 处理uniacid存储
+			// console.log(options.query.uniacid)
 			if(options.query.uniacid){
 				uni.setStorageSync('uniacid', options.query.uniacid);
+				console.log(uni.getStorageSync('uniacid'))
 			}
 			uni.hideTabBar();

 			// #ifdef MP
 			const updateManager = uni.getUpdateManager();
-			updateManager.onCheckForUpdate(() => {});
-			updateManager.onUpdateReady((res) => {
+			updateManager.onCheckForUpdate(function(res) {
+				// 请求完新版本信息的回调
+			});
+
+			updateManager.onUpdateReady(function(res) {
 				uni.showModal({
 					title: '更新提示',
 					content: '新版本已经准备好，是否重启应用？',
 					success(res) {
-						if (res.confirm) updateManager.applyUpdate();
+						if (res.confirm) {
+							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						}
 					}
 				});
 			});
-			updateManager.onUpdateFailed(() => {});
+
+			updateManager.onUpdateFailed(function(res) {
+				// 新的版本下载失败
+			});
 			// #endif

 			// #ifdef H5
 			if (uni.getSystemInfoSync().platform == 'ios') {
 				uni.setStorageSync('initUrl', location.href);
 			}
-			this.$nextTick(() => {
-				this.createIndependentChatbot();
-			});
 			// #endif

-			// 网络状态监听
-			uni.onNetworkStatusChange((res) => {
+			uni.onNetworkStatusChange(function(res) {
 				if (!res.isConnected) {
 					uni.showModal({
 						title: '网络失去链接',
@@ -47,38 +55,75 @@
 				}
 			});

-			// 初始化store
 			this.$store.dispatch('init');

-			// 批量同步store数据
-			const storeKeys = [
-				{key: 'themeStyle', mutation: 'setThemeStyle', handler: (v) => colorList[v]},
-				{key: 'addonIsExist', mutation: 'setAddonIsExist'},
-				{key: 'defaultImg', mutation: 'setDefaultImg'},
-				{key: 'siteInfo', mutation: 'setSiteInfo'},
-				{key: 'globalStoreConfig', mutation: 'setGlobalStoreConfig'},
-				{key: 'globalStoreInfo', mutation: 'setGlobalStoreInfo'},
-				{key: 'defaultStoreInfo', mutation: 'setDefaultStoreInfo'},
-				{key: 'servicerConfig', mutation: 'setServicerConfig'},
-				{key: 'copyright', mutation: 'setCopyright'},
-				{key: 'mapConfig', mutation: 'setMapConfig'},
-				{key: 'token', mutation: 'setToken'},
-				{key: 'memberInfo', mutation: 'setMemberInfo'}
-			];
-			storeKeys.forEach(item => {
-				const value = uni.getStorageSync(item.key);
-				if (value) {
-					const data = item.handler ? item.handler(value) : value;
-					this.$store.commit(item.mutation, data);
-				}
-			});
+			// 存储到store中

-			// 会员信息存在时同步购物车
+			// 主题风格
+			if (uni.getStorageSync('themeStyle')) {
+				this.$store.commit('setThemeStyle', colorList[uni.getStorageSync('themeStyle')]);
+			}
+
+			// 插件是否存在
+			if (uni.getStorageSync('addonIsExist')) {
+				this.$store.commit('setAddonIsExist', uni.getStorageSync('addonIsExist'));
+			}
+
+			// 默认图
+			if (uni.getStorageSync('defaultImg')) {
+				this.$store.commit('setDefaultImg', uni.getStorageSync('defaultImg'));
+			}
+
+			// 站点信息
+			if (uni.getStorageSync('siteInfo')) {
+				this.$store.commit('setSiteInfo', uni.getStorageSync('siteInfo'));
+			}
+
+			// 门店配置
+			if (uni.getStorageSync('globalStoreConfig')) {
+				this.$store.commit('setGlobalStoreConfig', uni.getStorageSync('globalStoreConfig'));
+			}
+
+			// 门店信息
+			if (uni.getStorageSync('globalStoreInfo')) {
+				this.$store.commit('setGlobalStoreInfo', uni.getStorageSync('globalStoreInfo'));
+			}
+
+			// 默认门店信息
+			if (uni.getStorageSync('defaultStoreInfo')) {
+				this.$store.commit('setDefaultStoreInfo', uni.getStorageSync('defaultStoreInfo'));
+			}
+
+			// 客服配置
+			if (uni.getStorageSync('servicerConfig')) {
+				this.$store.commit('setServicerConfig', uni.getStorageSync('servicerConfig'));
+			}
+
+			// 版权信息
+			if (uni.getStorageSync('copyright')) {
+				this.$store.commit('setCopyright', uni.getStorageSync('copyright'));
+			}
+
+			// 地址配置
+			if (uni.getStorageSync('mapConfig')) {
+				this.$store.commit('setMapConfig', uni.getStorageSync('mapConfig'));
+			}
+
+			if (uni.getStorageSync('token')) {
+				this.$store.commit('setToken', uni.getStorageSync('token'));
+			}
+
+			// 会员信息
 			if (uni.getStorageSync('memberInfo')) {
+				this.$store.commit('setMemberInfo', uni.getStorageSync('memberInfo'));
+
+				// 查询购物车信息
 				this.$store.dispatch('getCartNumber');
 			}

 			// #ifdef H5
+			// 自动授权登录
+			// 未登录情况下
 			if (!uni.getStorageSync('memberInfo')) {
 				this.getAuthInfo();
 			}
@@ -95,17 +140,18 @@
 			// #endif

 			// #ifdef MP-ALIPAY
-			if (options.query?.m) uni.setStorageSync('source_member', options.query.m);
+			if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
 			// #endif
 		},
 		onShow: function(options) {
 			// #ifdef MP
+			// 自动授权登录
 			this.getAuthInfo();
 			if (this.$store.state.token) {
 				this.$api.sendRequest({
 					url: '/api/member/info',
 					success: (res) => {
-						if (res.code >= 10) { 
+						if (res.code >= 0) {
 							this.$store.commit('setMemberInfo', res.data);
 						}
 					}
@@ -114,251 +160,47 @@
 			// #endif

 			// #ifdef MP-ALIPAY
-			if (options.query?.m) uni.setStorageSync('source_member', options.query.m);
+			if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
 			// #endif
 		},
 		onHide: function() {},
 		methods: {
-			// 安全的 HTML 转义（防止 XSS）
-			htmlEncode(str) {
-				if (typeof str !== 'string') return '';
-				return str
-					.replace(/&/g, '&amp;')
-					.replace(/</g, '&lt;')
-					.replace(/>/g, '&gt;')
-					.replace(/"/g, '&quot;')
-					.replace(/'/g, '&#039;');
-			},
-
-			createIndependentChatbot() {
-				console.log('创建响应式智能客服窗口...');
-
-				// 清除已存在的元素
-				document.querySelectorAll('[id^="independent-chat-"]').forEach(el => el.remove());
-
-				// ========== 按钮 ==========
-				const chatBtn = document.createElement('div');
-				chatBtn.id = 'independent-chat-btn';
-				chatBtn.innerHTML = '💬';
-				chatBtn.style.cssText = `
-					width: 56px;
-					height: 56px;
-					border-radius: 50%;
-					position: fixed;
-					bottom: calc(180px + env(safe-area-inset-bottom, 0px));
-					right: 0px;
-					z-index: 999999;
-					cursor: pointer;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					color: white;
-					font-size: 24px;
-					box-shadow: 0 4px 12px rgba(0,0,0,0.2);
-					background: linear-gradient(135deg, #ff9a9e, #fad0c4, #a1c4fd, #c2e9fb, #d4fc79, #96e6a1);
-					background-size: 300% 300%;
-					animation: rainbowPulse 4s ease infinite;
-					user-select: none;
-					-webkit-user-drag: none;
-				`;
-				document.body.appendChild(chatBtn);
-
-				// ========== 聊天窗口 ==========
-				const chatWindow = document.createElement('div');
-				chatWindow.id = 'independent-chat-window';
-				chatWindow.style.cssText = `
-					position: fixed;
-					z-index: 999998;
-					border-radius: 12px;
-					background: white;
-					box-shadow: 0 4px 20px rgba(0,0,0,0.2);
-					display: none;
-					flex-direction: column;
-					overflow: hidden;
-				`;
-				document.body.appendChild(chatWindow);
-
-				// 头部
-				const chatHeader = document.createElement('div');
-				chatHeader.style.cssText = `
-					height: 50px;
-					background: #1C64F2;
-					color: white;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: 0 16px;
-					font-size: 18px;
-					font-weight: 600;
-				`;
-				chatHeader.innerHTML = `<span>智能客服</span><span id="close-chat-window" style="cursor:pointer;font-size:24px;">×</span>`;
-				chatWindow.appendChild(chatHeader);
-
-				// 内容区
-				const chatContent = document.createElement('div');
-				chatContent.style.cssText = `
-					flex: 1;
-					padding: 16px;
-					overflow-y: auto;
-					background: #f9fafb;
-				`;
-				chatContent.innerHTML = `
-					<div style="display:flex;margin-bottom:16px;">
-						<div style="width:36px;height:36px;border-radius:50%;background:#1C64F2;color:white;display:flex;align-items:center;justify-content:center;margin-right:8px;">🤖</div>
-						<div style="background:white;padding:8px 12px;border-radius:8px;max-width:70%;">您好！有什么可以帮到您的吗？</div>
-					</div>
-				`;
-				chatWindow.appendChild(chatContent);
-
-				// 输入区
-				const chatInputArea = document.createElement('div');
-				chatInputArea.style.cssText = `
-					height: 60px;
-					display: flex;
-					align-items: center;
-					padding: 0 16px;
-					border-top: 1px solid #eee;
-				`;
-				const chatInput = document.createElement('input');
-				chatInput.type = 'text';
-				chatInput.placeholder = '请输入您的问题...';
-				chatInput.style.cssText = `
-					flex: 1;
-					height: 36px;
-					padding: 0 12px;
-					border: 1px solid #ddd;
-					border-radius: 18px;
-					outline: none;
-					font-size: 14px;
-				`;
-				const sendBtn = document.createElement('button');
-				sendBtn.innerText = '发送'; // 横排文字
-				sendBtn.style.cssText = `
-					margin-left: 12px;
-					padding: 6px 16px;
-					background: #1C64F2;
-					color: white;
-					border: none;
-					border-radius: 18px;
-					cursor: pointer;
-					font-size: 14px;
-					white-space: nowrap; /* 防止换行 */
-					text-align: center; /* 居中 */
-					line-height: 1.5; /* 调整高度 */
-				`;
-				chatInputArea.appendChild(chatInput);
-				chatInputArea.appendChild(sendBtn);
-				chatWindow.appendChild(chatInputArea);
-
-				// ========== 响应式尺寸控制 ==========
-				const updateWindowSize = () => {
-					const isMobile = window.innerWidth <= 768;
-					if (isMobile) {
-						chatWindow.style.width = 'calc(90vw - 40px)';
-						chatWindow.style.maxWidth = '400px';
-						chatWindow.style.height = '70vh';
-						chatWindow.style.maxHeight = '600px';
-						chatWindow.style.right = '5vw';
-						chatWindow.style.bottom = 'calc(86px + env(safe-area-inset-bottom, 0px))';
-					} else {
-						chatWindow.style.width = '360px';
-						chatWindow.style.height = '520px';
-						chatWindow.style.maxWidth = 'none';
-						chatWindow.style.maxHeight = 'none';
-						chatWindow.style.right = '20px';
-						chatWindow.style.bottom = '86px';
-					}
-					chatContent.style.maxHeight = 'calc(100% - 110px)';
-				};
-
-				// 初始化并监听窗口变化
-				updateWindowSize();
-				window.addEventListener('resize', updateWindowSize);
-
-				// ========== 交互逻辑 ==========
-				let isShow = false;
-				const toggleChat = () => {
-					isShow = !isShow;
-					chatWindow.style.display = isShow ? 'flex' : 'none';
-					if (isShow) {
-						updateWindowSize(); // 确保旋转/切换后尺寸正确
-						chatInput.focus();
-					}
-				};
-
-				chatBtn.onclick = toggleChat;
-				document.getElementById('close-chat-window').onclick = () => {
-					isShow = false;
-					chatWindow.style.display = 'none';
-				};
-
-				document.addEventListener('click', (e) => {
-					if (!chatBtn.contains(e.target) && !chatWindow.contains(e.target)) {
-						isShow = false;
-						chatWindow.style.display = 'none';
-					}
-				});
-
-				// 发送消息
-				const sendMessage = () => {
-					const msg = chatInput.value.trim();
-					if (!msg) return;
-					const safeMsg = this.htmlEncode(msg);
-					chatContent.insertAdjacentHTML('beforeend', `
-						<div style="display:flex;margin-bottom:16px;justify-content:flex-end;">
-							<div style="background:#1C64F2;color:white;padding:8px 12px;border-radius:8px;max-width:70%;">
-								${safeMsg}
-							</div>
-							<div style="width:36px;height:36px;border-radius:50%;background:#eee;display:flex;align-items:center;justify-content:center;margin-left:8px;">👤</div>
-						</div>
-					`);
-					chatInput.value = '';
-					chatContent.scrollTop = chatContent.scrollHeight;
-					setTimeout(() => {
-						chatContent.insertAdjacentHTML('beforeend', `
-							<div style="display:flex;margin-bottom:16px;">
-								<div style="width:36px;height:36px;border-radius:50%;background:#1C64F2;color:white;display:flex;align-items:center;justify-content:center;margin-right:8px;">🤖</div>
-								<div style="background:white;padding:8px 12px;border-radius:8px;max-width:70%;">
-									已收到您的问题："${safeMsg}"，我们会尽快回复！
-								</div>
-							</div>
-						`);
-						chatContent.scrollTop = chatContent.scrollHeight;
-					}, 800);
-				};
-
-				sendBtn.onclick = sendMessage;
-				chatInput.onkeydown = (e) => {
-					if (e.key === 'Enter') {
-						e.preventDefault();
-						sendMessage();
-					}
-				};
-
-				console.log('响应式智能客服窗口创建完成');
-			},
-
+			/**
+			 * 获取授权信息
+			 */
 			getAuthInfo() {
 				// #ifdef H5
 				if (this.$util.isWeiXin()) {
 					this.$util.getUrlCode(urlParams => {
-						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams.source_member);
-						if (urlParams.code === undefined) {
+						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams
+							.source_member);
+
+						if (urlParams.code == undefined) {
 							this.$api.sendRequest({
 								url: '/wechat/api/wechat/authcode',
-								data: { redirect_url: location.href, scopes: 'snsapi_userinfo' },
-								success: (res) => res.code >= 0 && (location.href = res.data)
+								data: {
+									redirect_url: location.href,
+									scopes: 'snsapi_userinfo'
+								},
+								success: res => {
+									if (res.code >= 0) {
+										location.href = res.data;
+									}
+								}
 							});
 						} else {
 							this.$api.sendRequest({
 								url: '/wechat/api/wechat/authcodetoopenid',
-								data: { code: urlParams.code },
-								success: (res) => {
+								data: {
+									code: urlParams.code
+								},
+								success: res => {
 									if (res.code >= 0) {
-										const data = {};
-										res.data.openid && (data.wx_openid = res.data.openid);
-										res.data.unionid && (data.wx_unionid = res.data.unionid);
-										res.data.userinfo && Object.assign(data, res.data.userinfo);
+										let data = {};
+										if (res.data.openid) data.wx_openid = res.data.openid;
+										if (res.data.unionid) data.wx_unionid = res.data.unionid;
+										if (res.data.userinfo) Object.assign(data, res.data
+											.userinfo);
 										this.authLogin(data);
 									}
 								}
@@ -367,97 +209,105 @@
 					});
 				}
 				// #endif
+
 				// #ifdef MP
-				this.getCode(data => this.authLogin(data, 'authOnlyLogin'));
+				this.getCode(data => {
+					this.authLogin(data, 'authOnlyLogin');
+				});
 				// #endif
 			},
+			/**
+			 * 授权登录
+			 */
 			authLogin(data, type = 'authLogin') {
-				uni.getStorageSync('source_member') && (data.source_member = uni.getStorageSync('source_member'));
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
 				uni.setStorageSync('authInfo', data);
+
 				this.$api.sendRequest({
-					url: type === 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
+					url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
 					data,
-					success: (res) => {
+					success: res => {
 						if (res.code >= 0) {
 							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
+							this.getMemberInfo()
 							this.$store.dispatch('getCartNumber');
 						}
 					}
 				});
 			},
+			/**
+			 * 公众号分享设置
+			 */
 			shareConfig() {
 				this.$api.sendRequest({
 					url: '/wechat/api/wechat/share',
-					data: { url: window.location.href },
-					success: (res) => {
-						if (res.code === 0) {
-							const wxJS = new Weixin();
+					data: {
+						url: window.location.href
+					},
+					success: res => {
+						if (res.code == 0) {
+							var wxJS = new Weixin();
 							wxJS.init(res.data.jssdk_config);
-							const share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
-							share_data && wxJS.setShareData({
-								title: share_data.title,
-								desc: share_data.desc,
-								link: share_data.link,
-								imgUrl: this.$util.img(share_data.imgUrl)
-							}, res => console.log(res));
-							res.data.share_config.permission.hideOptionMenu 
-								? wxJS.weixin.hideOptionMenu() 
-								: wxJS.weixin.showOptionMenu();
+
+							let share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
+							if (share_data) {
+								wxJS.setShareData({
+										title: share_data.title,
+										desc: share_data.desc,
+										link: share_data.link,
+										imgUrl: this.$util.img(share_data.imgUrl)
+									},
+									res => {
+										console.log(res);
+									}
+								);
+							}
+
+							let hideOptionMenu = res.data.share_config.permission.hideOptionMenu;
+							let hideMenuItems = res.data.share_config.permission.hideMenuItems;
+
+							if (hideOptionMenu) {
+								wxJS.weixin.hideOptionMenu(); //屏蔽分享好友等按钮
+							} else {
+								wxJS.weixin.showOptionMenu(); //放开分享好友等按钮
+							}
 						}
-					}
+					},
+					fail: err => {}
 				});
 			},
 			getMemberInfo() {
 				this.$api.sendRequest({
 					url: '/api/member/info',
-					success: (res) => res.code >= 0 && this.$store.commit('setMemberInfo', res.data)
+					success: (res) => {
+						if (res.code >= 0) {
+							// 登录成功，存储会员信息
+							this.$store.commit('setMemberInfo', res.data);
+						}
+					}
 				});
 			}
 		},
 		watch: {
 			$route: {
 				handler(newName, oldName) {
-					this.$util.isWeiXin() && this.shareConfig();
+					if (this.$util.isWeiXin()) {
+						this.shareConfig();
+					}
 				},
+				// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
 				immediate: true
 			}
 		}
 	};
 </script>
-
 <style lang="scss">
 	@import './common/css/main.scss';
 	@import './common/css/iconfont.css';
-	@import './common/css/icondiy.css';
-	@import './common/css/icon/extend.css';
-
-	page {
+	@import './common/css/icondiy.css'; // 自定义图标库
+	@import './common/css/icon/extend.css'; // 扩展图标库
+	page{
 		background: #f4f6fa;
 	}
-	body {
-		padding-bottom: 80px !important;
-	}
-
-	/* 聊天窗口滚动条美化 */
-	#independent-chat-window div::-webkit-scrollbar {
-		width: 4px;
-	}
-	#independent-chat-window div::-webkit-scrollbar-thumb {
-		background: #ddd;
-		border-radius: 2px;
-	}
-
-	/* 彩虹动画 */
-	@keyframes rainbowPulse {
-		0% { background-position: 0% 50%; }
-		50% { background-position: 100% 50%; }
-		100% { background-position: 0% 50%; }
-	}
-
-	/* 强制固定定位，防止被其他样式干扰 */
-	#independent-chat-btn,
-	#independent-chat-window {
-		position: fixed !important;
-	}
 </style>
--- a/components/common-payment/payment.js
+++ b/components/common-payment/payment.js
--- a/components/hover-nav/hover-nav.vue
+++ b/components/hover-nav/hover-nav.vue
@@ -1,188 +1,213 @@
-<template>
-	<!-- 悬浮按钮 -->
-	<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '120rpx' : '120rpx' }">
-		<!-- #ifdef MP-WEIXIN -->
-		<button 
-			class="btn-item" 
-			v-if="fixBtnShow" 
-			hoverClass="none" 
-			openType="contact" 
-			sessionFrom="weapp" 
-			showMessageCard="true" 
-			:style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}"
-		>
-			<text class="icox icox-kefu" v-if="!kefuimg"></text>
-		</button>
-		<!-- #endif -->
-		
-		<!-- 其他按钮（AI 和 电话）已隐藏 -->
-	</view>
-</template>
-
-<script>
-	import { mapGetters, mapMutations } from 'vuex'
-
-	export default {
-		name: 'hover-nav',
-		props: {
-			need: {
-				type: Boolean,
-				default: false
-			},
-		},
-		data() {
-			return {
-				pageCount: 0,
-				fixBtnShow: true,
-				tel: '',
-				kefuimg: '',
-				phoneimg: ''
-			};
-		},
-		created() {
-			this.kefuimg = this.$util.getDefaultImage().kefu
-			this.phoneimg = this.$util.getDefaultImage().phone
-			this.pageCount = getCurrentPages().length;
-
-			var that = this
-			uni.getStorage({
-				key: 'shopInfo',
-				success(e) {
-					that.tel = e.data.mobile
-				}
-			})
-		},
-		computed: {
-			...mapGetters([
-				'globalAIAgentConfig',
-				'aiUnreadCount'
-			]),
-			aiAgentimg() {
-				return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || ''
-			},
-			unreadCount() {
-				return this.aiUnreadCount
-			},
-			enableAIChat() {
-				return this.globalAIAgentConfig?.enable || true
-			},
-		},		
-		methods: {
-			...mapMutations([
-				'setAiUnreadCount'
-			]),
-
-			// 拨打电话（已无调用，可保留或删除）
-			call() {
-				uni.makePhoneCall({
-					phoneNumber: this.tel + ''
-				})
-			},
-
-			// 打开AI聊天（已无调用，可保留或删除）
-			openAIChat() {
-				if (this.enableAIChat) {
-					this.setAiUnreadCount(0);
-				}
-				this.$util.redirectTo('/pages_tool/ai-chat/index')
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container-box {
-		width: 100%;
-
-		.item-wrap {
-			border-radius: 10rpx;
-
-			.image-box {
-				border-radius: 10rpx;
-			}
-
-			image {
-				width: 100%;
-				height: auto;
-				border-radius: 10rpx;
-				will-change: transform;
-			}
-		}
-	}
-
-	//悬浮按钮
-	.fixed-box {
-		position: fixed;
-		right: 0rpx;
-		bottom: 200rpx;
-		z-index: 10;
-		border-radius: 120rpx;
-		padding: 20rpx 0;
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		width: 100rpx;
-		box-sizing: border-box;
-		transition: 0.3s;
-		overflow: hidden;
-
-		.btn-item {
-			display: flex;
-			justify-content: center;
-			text-align: center;
-			flex-direction: column;
-			line-height: 1;
-			margin: 14rpx 0;
-			transition: 0.1s;
-			background: #fff;
-			border-radius: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			padding: 0;
-			position: relative;
-			text {
-				font-size: 36rpx;
-				font-weight: bold;
-			}
-
-			view {
-				font-size: 26rpx;
-				font-weight: bold;
-			}
-
-			&.show {
-				transform: rotate(180deg);
-			}
-
-			&.icon-xiala {
-				margin: 0;
-				margin-top: 0.1rpx;
-			}
-			
-			// 未读消息小红点（已无使用，可保留样式）
-			.unread-badge {
-				position: absolute;
-				top: -5rpx;
-				right: -5rpx;
-				background-color: #ff4544;
-				color: white;
-				border-radius: 20rpx;
-				min-width: 30rpx;
-				height: 30rpx;
-				font-size: 10rpx;
-				line-height: 30rpx;
-				text-align: center;
-				padding: 0 8rpx;
-				z-index: 1;
-				box-shadow: 0 2rpx 10rpx rgba(255, 69, 68, 0.3);
-
-				.badge-text {
-					font-size: 8rpx;
-					// #ifdef MP-WEIXIN
-					font-size: 20rpx;
-					// #endif
-				}
-			}
-		}
-	}
+<template>
+		<!-- 悬浮按钮 -->
+		<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
+			<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
+
+			<!-- AI智能助手 -->
+			<view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
+				<text class="ai-icon" v-if="!aiAgentimg">🤖</text>
+				<!-- 未读消息小红点 -->
+				<view v-if="unreadCount > 0" class="unread-badge">
+					<text class="badge-text">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
+				</view>
+			</view>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
+				<text class="icox icox-kefu" v-if="!kefuimg"></text>
+			<!-- 	<view>首页</view> -->
+			</button>
+			<!-- #endif -->
+
+			<!-- 电话 -->
+			<view class="btn-item" v-if="fixBtnShow" @click="call()"  :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
+				<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+				<!-- <view>我的</view> -->
+			</view>
+
+		<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+				<text class="iconfont icon-unfold"></text>
+			</view>
+			<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
+				@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+				<view class="">快捷</view>
+				<view>导航</view>
+			</view> -->
+		</view>
+</template>
+
+<script>
+	import { mapGetters, mapMutations } from 'vuex'
+
+	export default {
+		name: 'hover-nav',
+		props: {
+			need: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				pageCount: 0,
+				fixBtnShow: true,
+				tel:'',
+				kefuimg:'',
+				phoneimg:''
+			};
+		},
+		created() {
+			this.kefuimg = this.$util.getDefaultImage().kefu
+			this.phoneimg = this.$util.getDefaultImage().phone
+			this.pageCount = getCurrentPages().length;
+
+
+			var that = this
+			uni.getStorage({
+				key:'shopInfo',
+				success(e){
+					that.tel = e.data.mobile
+				}
+			})
+		
+		},
+		computed: {
+			...mapGetters([
+				'globalAIAgentConfig',
+				'aiUnreadCount'
+			]),
+			aiAgentimg() {
+				return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
+			},
+			unreadCount() {
+				return this.aiUnreadCount
+			},
+			enableAIChat() {
+				return this.globalAIAgentConfig?.enable || true // 是否开启AI智能助手
+			},
+		},		
+		methods: {
+			...mapMutations([
+				'setAiUnreadCount'
+			]),
+
+			//拨打电话
+			call(){
+				uni.makePhoneCall({
+					phoneNumber:this.tel+''
+				})
+			},
+
+			// 打开AI聊天弹窗
+			openAIChat() {
+				if (this.enableAIChat) {
+					this.setAiUnreadCount(0);
+				}
+
+				this.$util.redirectTo('/pages_tool/ai-chat/index')
+			}
+
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container-box {
+		width: 100%;
+
+		.item-wrap {
+			border-radius: 10rpx;
+
+			.image-box {
+				border-radius: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: auto;
+				border-radius: 10rpx;
+				will-change: transform;
+			}
+		}
+	}
+
+	//悬浮按钮
+	.fixed-box {
+		position: fixed;
+		right: 0rpx;
+		bottom: 200rpx;
+		z-index: 10;
+		// background: #fff;
+		// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
+		border-radius: 120rpx;
+		padding: 20rpx 0;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		width: 100rpx;
+		box-sizing: border-box;
+		transition: 0.3s;
+		overflow: hidden;
+
+		.btn-item {
+			display: flex;
+			justify-content: center;
+			text-align: center;
+			flex-direction: column;
+			line-height: 1;
+			margin: 14rpx 0;
+			transition: 0.1s;
+			background: #fff;
+			border-radius: 50rpx;
+			width: 80rpx;
+			height: 80rpx;
+			padding: 0;
+			position: relative;
+			text {
+				font-size: 36rpx;
+				font-weight: bold;
+			}
+
+			view {
+				font-size: 26rpx;
+				font-weight: bold;
+			}
+
+			&.show {
+				transform: rotate(180deg);
+			}
+
+			&.switch {}
+
+			&.icon-xiala {
+				margin: 0;
+				margin-top: 0.1rpx;
+			}
+			
+			// 未读消息小红点
+			.unread-badge {
+				position: absolute;
+				top: -5rpx;
+				right: -5rpx;
+				background-color: #ff4544;
+				color: white;
+				border-radius: 20rpx;
+				min-width: 30rpx;
+				height: 30rpx;
+				font-size: 10rpx;
+				line-height: 30rpx;
+				text-align: center;
+				padding: 0 8rpx;
+				z-index: 1;
+				box-shadow: 0 2rpx 10rpx rgba(255, 69, 68, 0.3);
+
+				.badge-text {
+					font-size: 8rpx;
+					// #ifdef MP-WEIXIN
+					font-size: 20rpx;
+					// #endif
+				}
+			}
+		}
+	}
 </style>
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
--- a/lang/zh-cn/goods/detail.js
+++ b/lang/zh-cn/goods/detail.js
@@ -11,7 +11,7 @@ export const lang = {
 	home:'首页',
 	cart:'购物车',
 	leave:'立即留言',
-	make:'立即咨询',
+	make:'立即支付',
 	
 	send:'配送',
 	express:'快递发货',
--- a/manifest.json
+++ b/manifest.json
@@ -54,8 +54,6 @@
            }
        }
    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
        "appid" : "wxa8f94045d9c2fc10",
@@ -126,5 +124,12 @@
    "uniStatistics" : {
        "version" : "2"
    },
-    "sassImplementationName" : "node-sass"
+    "sassImplementationName" : "node-sass",
+    /** 快应用配置 **/
+    "quickapp-webview" : {
+        "package" : "com.jieganfsj.fivegshop",
+        "minPlatformVersion" : 1070,
+        "versionName" : "1.0.0",
+        "versionCode" : 0
+    }
 }
--- a/node_modules/jweixin-module/README.md
+++ b/node_modules/jweixin-module/README.md
@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
 ## 使用

 ```js
-var wx = require('jweixin-module')
-wx.ready(function(){
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
    // TODO
 });
 ```
--- a/node_modules/jweixin-module/package.json
+++ b/node_modules/jweixin-module/package.json
@@ -1,60 +1,26 @@
 {
-  "_from": "jweixin-module",
-  "_id": "jweixin-module@1.4.1",
-  "_inBundle": false,
-  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
-  "_location": "/jweixin-module",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "jweixin-module",
    "name": "jweixin-module",
-    "escapedName": "jweixin-module",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
-  "_spec": "jweixin-module",
-  "_where": "E:\\demo\\niushop_uniapp",
-  "author": {
-    "name": "Shengqiang Guo"
-  },
-  "bugs": {
-    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "微信JS-SDK",
-  "devDependencies": {
-    "textfile": "^1.2.0",
-    "uglify-js": "^3.4.9"
-  },
-  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-  "keywords": [
-    "wxjssdk",
-    "weixin",
-    "jweixin",
-    "wechat",
-    "jssdk",
-    "wx"
-  ],
-  "license": "ISC",
-  "main": "out/index.js",
-  "name": "jweixin-module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
-  },
-  "scripts": {
-    "build": "node build",
-    "prepublish": "npm run build"
-  },
-  "version": "1.4.1"
+    "version": "1.6.0",
+    "description": "微信JS-SDK",
+    "main": "lib/index.js",
+    "scripts": {},
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+    },
+    "keywords": [
+        "wxjssdk",
+        "weixin",
+        "jweixin",
+        "wechat",
+        "jssdk",
+        "wx"
+    ],
+    "author": "Shengqiang Guo",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+    },
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+    "devDependencies": {}
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,23 @@
 {
-  "name": "uniappsaas",
+  "name": "frontend",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
+      "dependencies": {
+        "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
+        "jweixin-module": "^1.6.0"
+      },
      "devDependencies": {
        "terser-webpack-plugin": "^5.3.10"
      }
    },
+    "node_modules/@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ==",
+      "license": "Apache-2.0"
+    },
    "node_modules/@jridgewell/gen-mapping": {
      "version": "0.3.5",
      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -619,6 +629,12 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+      "license": "ISC"
+    },
    "node_modules/loader-runner": {
      "version": "4.3.0",
      "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -984,6 +1000,11 @@
    }
  },
  "dependencies": {
+    "@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ=="
+    },
    "@jridgewell/gen-mapping": {
      "version": "0.3.5",
      "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -1456,6 +1477,11 @@
      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
      "dev": true
    },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
    "loader-runner": {
      "version": "4.3.0",
      "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
    "terser-webpack-plugin": "^5.3.10"
  },
  "dependencies": {
+    "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
    "jweixin-module": "^1.6.0"
  }
 }
--- a/pages.json
+++ b/pages.json
@@ -104,14 +104,7 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-		},
-		{
-			"path": "pages/dify-chat/dify-chat",
-			"style": {
-				"navigationBarTitleText": "智能客服"
-			}
 		}
-		
 	],
 	"subPackages": [
 		{
--- a/pages/dify-chat/dify-chat.vue
+++ b/pages/dify-chat/dify-chat.vue
@@ -1,20 +0,0 @@
-<template>
-  <view class="container">
-    <web-view src="https://dify.aigc-quickapp.com/chatbot/ILbr8HHEgpBW2ggp"></web-view>
-  </view>
-</template>
-
-<script>
-export default {
-  onLoad() {
-    console.log('Dify 聊天页已加载')
-  }
-}
-</script>
-
-<style>
-.container {
-  width: 100%;
-  height: 100vh;
-}
-</style>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,266 +1,236 @@
-
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="site-info-box" v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-			<view class="site-info">
-				<view class="img-box" v-if="siteInfo.logo_square">
-					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-				</view>
-				<view class="info-box" :style="{ color: '#ffffff' }">
-					<text class="font-size-base">{{ siteInfo.site_name }}</text>
-					<text>{{ followOfficialAccount.welcomeMsg }}</text>
-				</view>
-			</view>
-			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
-		</view>
-
-	<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
-		</view> -->
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<template v-slot:components>
-				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
-			</template>
-			<template v-slot:default>
-				<ns-copyright v-show="isShowCopyRight"/>
-			</template>
-		</diy-index-page>
-
-		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :followOfficialAccount="followOfficialAccount"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</view>
-
-		<template v-if="adv.advshow != -1">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					 <view class="small-bot">
-					<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
-							<view bindtap="adverclose">跳过</view>
-							<view class="time">{{clock}}s</view>
-						</view>
-						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
-							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
-						</view> -->
-						<swiper autoplay="true" :circular="true" indicator-active-color="#fff" indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
-							<swiper-item v-for="(item, index) in adv.list" :key="index">
-								<image class="slide-image"  @click="$util.diyRedirectTo(item.link)" height="100%" :src="$util.img(item.imageUrl)" width="100%"></image>
-							<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
-							</swiper-item>
-						</swiper>
-						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
-							<i class="iconfont icon-round-close" style="color:#fff"></i>
-						</view>
-					</view>
-				<!-- 	<view class="image-wrap">
-						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
-							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
-								<view class="item">
-									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
-								</view>
-							</swiper-item>
-						</swiper>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
-				</uni-popup>
-			</view>
-		</template>
-
-		<!-- 底部tabBar -->
-		<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name"/>
-		</view>
-
-		<!-- 关注公众号弹窗 -->
-		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-			<uni-popup ref="officialAccountsPopup" type="center">
-				<view class="official-accounts-wrap">
-					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-					<text class="desc">关注了解更多</text>
-					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
-				</view>
-			</uni-popup>
-		</view>
-
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
-				<text @click="closeCollectPopupWindow">我知道了</text>
-			</view>
-		</uni-popup>
-
-		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-		<view @touchmove.prevent.stop class="choose-store">
-			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-				<view class="choose-store-popup">
-					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-					<view class="position-wrap">
-						<text class="iconfont icon-dizhi"></text>
-						<text class="address">{{ currentPosition }}</text>
-						<view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-							<text class="iconfont icon-dingwei"></text>
-							<text>重新定位</text>
-						</view>
-					</view>
-					<view class="store-wrap" v-if="nearestStore">
-						<text class="tag">当前门店</text>
-						<view class="store-name">{{ nearestStore.store_name }}</view>
-						<view class="address">{{ nearestStore.show_address }}</view>
-						<view class="distance" v-if="nearestStore.distance">
-							<text class="iconfont icon-dizhi"></text>
-							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
-						</view>
-					</view>
-					<button type="primary" @click="enterStore">确认进入</button>
-					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-						<text>选择其他门店</text>
-						<text class="iconfont icon-right"></text>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
-		
-		<!-- #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>
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+		<view class="site-info-box" v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+			<view class="site-info">
+				<view class="img-box" v-if="siteInfo.logo_square">
+					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+				</view>
+				<view class="info-box" :style="{ color: '#ffffff' }">
+					<text class="font-size-base">{{ siteInfo.site_name }}</text>
+					<text>{{ followOfficialAccount.welcomeMsg }}</text>
+				</view>
+			</view>
+			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
+		</view>
+
+	<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
+		</view> -->
+
+		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+			<template v-slot:components>
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
+			</template>
+			<template v-slot:default>
+				<ns-copyright v-show="isShowCopyRight"/>
+			</template>
+		</diy-index-page>
+
+		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :followOfficialAccount="followOfficialAccount"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+		</view>
+
+		<template v-if="adv.advshow != -1">
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+					 <view class="small-bot">
+					<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+							<view bindtap="adverclose">跳过</view>
+							<view class="time">{{clock}}s</view>
+						</view>
+						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
+							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
+						</view> -->
+						<swiper autoplay="true" :circular="true" indicator-active-color="#fff" indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+							<swiper-item v-for="(item, index) in adv.list" :key="index">
+								<image class="slide-image"  @click="$util.diyRedirectTo(item.link)" height="100%" :src="$util.img(item.imageUrl)" width="100%"></image>
+							<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
+							</swiper-item>
+						</swiper>
+						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+							<i class="iconfont icon-round-close" style="color:#fff"></i>
+						</view>
+					</view>
+				<!-- 	<view class="image-wrap">
+						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
+							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+								<view class="item">
+									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
+				</uni-popup>
+			</view>
+		</template>
+
+		<!-- 底部tabBar -->
+		<view class="page-bottom" v-if="openBottomNav">
+			<diy-bottom-nav @callback="callback" :name="name"/>
+		</view>
+
+		<!-- 关注公众号弹窗 -->
+		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+			<uni-popup ref="officialAccountsPopup" type="center">
+				<view class="official-accounts-wrap">
+					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+					<text class="desc">关注了解更多</text>
+					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+				</view>
+			</uni-popup>
+		</view>
+
+		<!-- 收藏 -->
+		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
+				<text @click="closeCollectPopupWindow">我知道了</text>
+			</view>
+		</uni-popup>
+
+		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
+		<view @touchmove.prevent.stop class="choose-store">
+			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+				<view class="choose-store-popup">
+					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+					<view class="position-wrap">
+						<text class="iconfont icon-dizhi"></text>
+						<text class="address">{{ currentPosition }}</text>
+						<view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+							<text class="iconfont icon-dingwei"></text>
+							<text>重新定位</text>
+						</view>
+					</view>
+					<view class="store-wrap" v-if="nearestStore">
+						<text class="tag">当前门店</text>
+						<view class="store-name">{{ nearestStore.store_name }}</view>
+						<view class="address">{{ nearestStore.show_address }}</view>
+						<view class="distance" v-if="nearestStore.distance">
+							<text class="iconfont icon-dizhi"></text>
+							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
+						</view>
+					</view>
+					<button type="primary" @click="enterStore">确认进入</button>
+					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+						<text>选择其他门店</text>
+						<text class="iconfont icon-right"></text>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<hover-nav></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>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+	import diyJs from '@/common/js/diy.js';
+	import indexJs from './public/js/index.js';
+    import toTop from '@/components/toTop/toTop.vue';
+    import scroll from '@/common/js/scroll-view.js';
+
+
+	export default {
+		components: {
+			uniPopup,
+			nsNavbar,
+            toTop
+		},
+		mixins: [diyJs, scroll, indexJs]
+	};
+</script>
+
+<style lang="scss">
+	@import '@/common/css/diy.scss';
+	@import './public/css/index.scss';
 	
-	
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-	import diyJs from '@/common/js/diy.js';
-	import indexJs from './public/js/index.js';
-    import toTop from '@/components/toTop/toTop.vue';
-    import scroll from '@/common/js/scroll-view.js';
-
-
-	export default {
-		components: {
-			uniPopup,
-			nsNavbar,
-            toTop
-		},
-		mixins: [diyJs, scroll, indexJs],
-		 methods: { // ← 新增 methods
-		    openDifyChat() {
-		      uni.navigateTo({
-		        url: '/pages/dify-chat/dify-chat'
-		      });
-		    }
-		  }
-		
-	};
-	
-</script>
-
-<style lang="scss">
-	@import '@/common/css/diy.scss';
-	@import './public/css/index.scss';
-	
-	
-	
-	.small-bot {
-	    width: 100%;
-	    height: 100%;
-	    position: fixed;
-	    top: 0;
-	    bottom: 0;
-	    left: 0;
-	    right: 0;
-	    z-index: 122;
-	}
-	
-	.small-bot swiper {
-	    width: 560rpx;
-	    height: 784rpx;
-	    margin: 120rpx auto 0;
-	    border-radius: 10rpx;
-	    overflow: hidden;
-	}
-	
-	.small-bot swiper .slide-image {
-	    width: 100%;
-	    height: 100%;
-	}
-	
-	.small-bot-close {
-	    width: 66rpx;
-	    height: 66rpx;
-	    border-radius: 50%;
-	    text-align: center;
-	    line-height: 64rpx;
-	    font-size: 64rpx;
-	    color: #fff;
-	    margin: 30rpx auto 0;
-	}
-	
-	.small-bot-close i {
-	    font-size: 60rpx;
-	}
-
-</style>
-<style scoped>
-	.swiper /deep/ .uni-swiper-dots-horizontal {
-		left: 40%;
-		bottom:40px
-	}
-	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none !important;
-	}
-
-	.choose-store>>>.goodslist-uni-popup-box {
-		width: 80%;
-	}
-
-	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-		border-radius: 0;
-	}
-
-	/deep/ .placeholder {
-		height: 0;
-	}
-
-	/deep/::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		background-color: transparent;
-		display: none;
-	}
-
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
-    
-    /deep/ .mescroll-totop {
-        right: 24rpx!important; 
-        bottom: 182rpx!important;
-    }
-.dify-bubble {
-  position: fixed;
-  bottom: 30rpx;
-  right: 30rpx;
-  width: 90rpx;
-  height: 90rpx;
-  background-color: #1C64F2;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 9999;
-  box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.2);
-}
-
-.dify-bubble .icon {
-  color: white;
-  font-size: 40rpx;
-}
+	
+	
+	.small-bot {
+	    width: 100%;
+	    height: 100%;
+	    position: fixed;
+	    top: 0;
+	    bottom: 0;
+	    left: 0;
+	    right: 0;
+	    z-index: 122;
+	}
+	
+	.small-bot swiper {
+	    width: 560rpx;
+	    height: 784rpx;
+	    margin: 120rpx auto 0;
+	    border-radius: 10rpx;
+	    overflow: hidden;
+	}
+	
+	.small-bot swiper .slide-image {
+	    width: 100%;
+	    height: 100%;
+	}
+	
+	.small-bot-close {
+	    width: 66rpx;
+	    height: 66rpx;
+	    border-radius: 50%;
+	    text-align: center;
+	    line-height: 64rpx;
+	    font-size: 64rpx;
+	    color: #fff;
+	    margin: 30rpx auto 0;
+	}
+	
+	.small-bot-close i {
+	    font-size: 60rpx;
+	}
+
+</style>
+<style scoped>
+	.swiper /deep/ .uni-swiper-dots-horizontal {
+		left: 40%;
+		bottom:40px
+	}
+	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none !important;
+	}
+
+	.choose-store>>>.goodslist-uni-popup-box {
+		width: 80%;
+	}
+
+	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+		border-radius: 0;
+	}
+
+	/deep/ .placeholder {
+		height: 0;
+	}
+
+	/deep/::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		display: none;
+	}
+
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
+    
+    /deep/ .mescroll-totop {
+        right: 24rpx!important; 
+        bottom: 182rpx!important;
+    }
+
 </style>
--- a/pages_tool/ai-chat/index.vue
+++ b/pages_tool/ai-chat/index.vue
--- a/project.config.json
+++ b/project.config.json
@@ -1,8 +1,7 @@
 {
  "description": "项目配置文件",
  "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
  },
  "setting": {
    "urlCheck": true,
@@ -38,20 +37,20 @@
    "userConfirmedBundleSwitch": false,
    "packNpmManually": false,
    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "compileWorklet": false,
-    "minifyWXML": true,
-    "localPlugins": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "condition": false,
-    "swc": false,
-    "disableSWC": true
+    "minifyWXSS": true
  },
  "compileType": "miniprogram",
-  "libVersion": "3.12.0",
+  "libVersion": "2.16.1",
  "appid": "wx29215aa1bd97bbd6",
  "projectname": "niushop_b2c_v4_uniapp",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
  "isGameTourist": false,
  "condition": {
    "search": {
@@ -72,7 +71,5 @@
    "miniprogram": {
      "list": []
    }
-  },
-  "simulatorPluginLibVersion": {},
-  "editorSetting": {}
+  }
 }
--- a/store/index.js
+++ b/store/index.js
@@ -58,6 +58,7 @@ const store = new Vuex.Store({
 		cartNumber: 0,
 		cartMoney: 0,
 		cartChange: 0,
+		wechatConfigStatus:0,
 		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
 		aiUnreadCount: 10, // AI未读消息数量
 		globalAIAgentConfig: null, // AI客服配置
@@ -74,11 +75,21 @@ const store = new Vuex.Store({
 		mapConfig: {
 			tencent_map_key: '',
 			wap_is_open: 1,
-			wap_valid_time: 0
+			wap_valid_time: 0,
+		},
+		copyright: null,
+		initStatus:false,
+		offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
+		canReceiveRegistergiftInfo: {
+			status: false,
+			path: ''
 		},
-		copyright: null
 	},
 	mutations: {
+		// 设置是否可以领取新人礼
+		setCanReceiveRegistergiftInfo(state, data) {
+			state.canReceiveRegistergiftInfo = data;
+		},
 		// 设置那些组件展示
 		setDiyGroupShowModule(state, data) {
 			state.diyGroupShowModule = data;
@@ -182,11 +193,19 @@ const store = new Vuex.Store({
 			uni.setStorageSync('copyright', value);
 		},
 		setMemberInfo(state, value) {
+			// 会员被锁定后，清除会员登录信息
+			if (value && value.status == 0) {
+				value = null;
+			}
 			state.memberInfo = value;
 			if (value) {
 				uni.setStorageSync('memberInfo', value);
 			} else {
+				// 会员为空时，清除会员登录信息
 				uni.removeStorageSync('memberInfo');
+				this.commit('setToken', '');
+				this.dispatch('emptyCart');
+				//uni.removeStorageSync('authInfo');
 			}
 		},
 		setCartNumber(state, cartNumber) {
@@ -201,6 +220,12 @@ const store = new Vuex.Store({
 		setCartMoney(state, value) {
 			state.cartMoney = value;
 		},
+		setInitStatus(state,value){
+			state.initStatus = value
+		},
+		setWechatConfigStatus(state,value){
+			state.wechatConfigStatus = value
+		},    
 		// 设置AI未读消息数量
 		setAiUnreadCount(state, value) {
 			state.aiUnreadCount = value;
@@ -220,6 +245,7 @@ const store = new Vuex.Store({
 					success: res => {
 						var data = res.data;
 						if (data) {
+
 							this.commit('setThemeStyle', colorList[data.style_theme.name]);

 							// 底部导航
@@ -240,6 +266,7 @@ const store = new Vuex.Store({
 							this.commit('setGlobalAIAgentConfig', data.ai_agent_config);

 							this.commit('setGlobalStoreConfig', data.store_config);
+              this.commit('setWechatConfigStatus',data.wechat_config_status)
 							
 							//联系我们
 							
@@ -252,7 +279,7 @@ const store = new Vuex.Store({
 								this.commit('setDefaultStoreInfo', null);
 								this.commit('setGlobalStoreInfo', null);
 							}
-
+							this.commit('setInitStatus',true)
 							resolve(data);
 						}
 					}
@@ -266,7 +293,7 @@ const store = new Vuex.Store({
 				data: {},
 				success: res => {
 					if (res.code == 0) {
-						let list = [];
+						let list = {};
 						let ids = [];
 						let totalMoney = 0;
 						let totalNum = 0;
@@ -279,16 +306,17 @@ const store = new Vuex.Store({
 									goods_id: item.goods_id,
 									sku_id: item.sku_id,
 									num: item.num,
-									discount_price: item.discount_price
+									discount_price: item.discount_price,
+									min_buy: item.min_buy,
+									stock: item.stock,
 								};

 								if (!list['goods_' + cart.goods_id]) {
 									list['goods_' + cart.goods_id] = {};
 								}
-								list['goods_' + cart.goods_id]['sku_' + cart
-										.sku_id
-									] =
-									cart;
+								list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
+								list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
+								list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
 								ids.push(cart.cart_id);
 							});

@@ -299,8 +327,7 @@ const store = new Vuex.Store({
 									let item = list[goods][sku];
 									if (typeof item == 'object') {
 										num += item.num;
-										money += parseFloat(item.discount_price) * parseInt(item
-											.num);
+										money += parseFloat(item.discount_price) * parseInt(item.num);
 									}
 								}
 								list[goods].num = num;
@@ -311,7 +338,6 @@ const store = new Vuex.Store({

 							}
 						}
-
 						this.commit('setCartList', list);

 						this.commit('setCartIds', ids);
Author	SHA1	Message	Date
ZF sun	03aa6e099f	fix(store): 部分数据初始化错误	2025-12-05 15:47:42 +08:00
ZF sun	4585fb6c07	chore: 保留node_modules\jweixin-module\out\index.js文件	2025-12-04 09:20:29 +08:00
ZF sun	4aeb7d04c4	chore: 添加@dcloudio/uni-quickapp-webview依赖及更新支付组件	2025-12-04 09:18:00 +08:00
Zhukj	067bbf6e2d	chore：立即咨询改为立即支付	2025-12-04 08:39:05 +08:00
Zhukj	3cef4b9987	chore：	2025-11-29 17:13:43 +08:00