chore(merge): 这个版本正常运行

This commit is contained in:
2025-12-10 15:30:39 +08:00
parent 89fbfcaca6
commit 2750d8012f
6 changed files with 1117 additions and 1256 deletions

488
App.vue
View File

@@ -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>