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> <script>
import auth from 'common/js/auth.js'; import auth from 'common/js/auth.js';
import colorList from 'common/js/style_color.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 { export default {
mixins: [auth], mixins: [auth],
onLaunch: function(options) { onLaunch: function(options) {
// 处理uniacid存储 // console.log(options.query.uniacid)
if(options.query.uniacid){ if(options.query.uniacid){
uni.setStorageSync('uniacid', options.query.uniacid); uni.setStorageSync('uniacid', options.query.uniacid);
console.log(uni.getStorageSync('uniacid'))
} }
uni.hideTabBar(); uni.hideTabBar();
// #ifdef MP // #ifdef MP
const updateManager = uni.getUpdateManager(); const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(() => {}); updateManager.onCheckForUpdate(function(res) {
updateManager.onUpdateReady((res) => { // 请求完新版本信息的回调
});
updateManager.onUpdateReady(function(res) {
uni.showModal({ uni.showModal({
title: '更新提示', title: '更新提示',
content: '新版本已经准备好,是否重启应用?', content: '新版本已经准备好,是否重启应用?',
success(res) { success(res) {
if (res.confirm) updateManager.applyUpdate(); if (res.confirm) {
// 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}
} }
}); });
}); });
updateManager.onUpdateFailed(() => {});
updateManager.onUpdateFailed(function(res) {
// 新的版本下载失败
});
// #endif // #endif
// #ifdef H5 // #ifdef H5
if (uni.getSystemInfoSync().platform == 'ios') { if (uni.getSystemInfoSync().platform == 'ios') {
uni.setStorageSync('initUrl', location.href); uni.setStorageSync('initUrl', location.href);
} }
this.$nextTick(() => {
this.createIndependentChatbot();
});
// #endif // #endif
// 网络状态监听 uni.onNetworkStatusChange(function(res) {
uni.onNetworkStatusChange((res) => {
if (!res.isConnected) { if (!res.isConnected) {
uni.showModal({ uni.showModal({
title: '网络失去链接', title: '网络失去链接',
@@ -47,38 +55,75 @@
} }
}); });
// 初始化store
this.$store.dispatch('init'); this.$store.dispatch('init');
// 批量同步store数据 // 存储到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);
}
});
// 会员信息存在时同步购物车 // 主题风格
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')) { if (uni.getStorageSync('memberInfo')) {
this.$store.commit('setMemberInfo', uni.getStorageSync('memberInfo'));
// 查询购物车信息
this.$store.dispatch('getCartNumber'); this.$store.dispatch('getCartNumber');
} }
// #ifdef H5 // #ifdef H5
// 自动授权登录
// 未登录情况下
if (!uni.getStorageSync('memberInfo')) { if (!uni.getStorageSync('memberInfo')) {
this.getAuthInfo(); this.getAuthInfo();
} }
@@ -95,17 +140,18 @@
// #endif // #endif
// #ifdef MP-ALIPAY // #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 // #endif
}, },
onShow: function(options) { onShow: function(options) {
// #ifdef MP // #ifdef MP
// 自动授权登录
this.getAuthInfo(); this.getAuthInfo();
if (this.$store.state.token) { if (this.$store.state.token) {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/member/info', url: '/api/member/info',
success: (res) => { success: (res) => {
if (res.code >= 10) { if (res.code >= 0) {
this.$store.commit('setMemberInfo', res.data); this.$store.commit('setMemberInfo', res.data);
} }
} }
@@ -114,251 +160,47 @@
// #endif // #endif
// #ifdef MP-ALIPAY // #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 // #endif
}, },
onHide: function() {}, onHide: function() {},
methods: { 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() { getAuthInfo() {
// #ifdef H5 // #ifdef H5
if (this.$util.isWeiXin()) { if (this.$util.isWeiXin()) {
this.$util.getUrlCode(urlParams => { this.$util.getUrlCode(urlParams => {
if (urlParams.source_member) uni.setStorageSync('source_member', urlParams.source_member); if (urlParams.source_member) uni.setStorageSync('source_member', urlParams
if (urlParams.code === undefined) { .source_member);
if (urlParams.code == undefined) {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/wechat/api/wechat/authcode', url: '/wechat/api/wechat/authcode',
data: { redirect_url: location.href, scopes: 'snsapi_userinfo' }, data: {
success: (res) => res.code >= 0 && (location.href = res.data) redirect_url: location.href,
scopes: 'snsapi_userinfo'
},
success: res => {
if (res.code >= 0) {
location.href = res.data;
}
}
}); });
} else { } else {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/wechat/api/wechat/authcodetoopenid', url: '/wechat/api/wechat/authcodetoopenid',
data: { code: urlParams.code }, data: {
success: (res) => { code: urlParams.code
},
success: res => {
if (res.code >= 0) { if (res.code >= 0) {
const data = {}; let data = {};
res.data.openid && (data.wx_openid = res.data.openid); if (res.data.openid) data.wx_openid = res.data.openid;
res.data.unionid && (data.wx_unionid = res.data.unionid); if (res.data.unionid) data.wx_unionid = res.data.unionid;
res.data.userinfo && Object.assign(data, res.data.userinfo); if (res.data.userinfo) Object.assign(data, res.data
.userinfo);
this.authLogin(data); this.authLogin(data);
} }
} }
@@ -367,97 +209,105 @@
}); });
} }
// #endif // #endif
// #ifdef MP // #ifdef MP
this.getCode(data => this.authLogin(data, 'authOnlyLogin')); this.getCode(data => {
this.authLogin(data, 'authOnlyLogin');
});
// #endif // #endif
}, },
/**
* 授权登录
*/
authLogin(data, type = 'authLogin') { 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); uni.setStorageSync('authInfo', data);
this.$api.sendRequest({ this.$api.sendRequest({
url: type === 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin', url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
data, data,
success: (res) => { success: res => {
if (res.code >= 0) { if (res.code >= 0) {
this.$store.commit('setToken', res.data.token); this.$store.commit('setToken', res.data.token);
this.getMemberInfo(); this.getMemberInfo()
this.$store.dispatch('getCartNumber'); this.$store.dispatch('getCartNumber');
} }
} }
}); });
}, },
/**
* 公众号分享设置
*/
shareConfig() { shareConfig() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/wechat/api/wechat/share', url: '/wechat/api/wechat/share',
data: { url: window.location.href }, data: {
success: (res) => { url: window.location.href
if (res.code === 0) { },
const wxJS = new Weixin(); success: res => {
if (res.code == 0) {
var wxJS = new Weixin();
wxJS.init(res.data.jssdk_config); wxJS.init(res.data.jssdk_config);
const share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
share_data && wxJS.setShareData({ let share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
title: share_data.title, if (share_data) {
desc: share_data.desc, wxJS.setShareData({
link: share_data.link, title: share_data.title,
imgUrl: this.$util.img(share_data.imgUrl) desc: share_data.desc,
}, res => console.log(res)); link: share_data.link,
res.data.share_config.permission.hideOptionMenu imgUrl: this.$util.img(share_data.imgUrl)
? wxJS.weixin.hideOptionMenu() },
: wxJS.weixin.showOptionMenu(); 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() { getMemberInfo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/member/info', 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: { watch: {
$route: { $route: {
handler(newName, oldName) { handler(newName, oldName) {
this.$util.isWeiXin() && this.shareConfig(); if (this.$util.isWeiXin()) {
this.shareConfig();
}
}, },
// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
immediate: true immediate: true
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import './common/css/main.scss'; @import './common/css/main.scss';
@import './common/css/iconfont.css'; @import './common/css/iconfont.css';
@import './common/css/icondiy.css'; @import './common/css/icondiy.css'; // 自定义图标库
@import './common/css/icon/extend.css'; @import './common/css/icon/extend.css'; // 扩展图标库
page{
page {
background: #f4f6fa; 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> </style>

View File

@@ -1,22 +1,27 @@
<template> <template>
<!-- 悬浮按钮 --> <!-- 悬浮按钮 -->
<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '120rpx' : '120rpx' }"> <view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
<!-- #ifdef MP-WEIXIN --> <!-- AI智能助手 -->
<button <view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
class="btn-item" <!-- 核心修改添加🤖表情保留原有判断逻辑 -->
v-if="fixBtnShow" <text class="ai-icon" v-if="!aiAgentimg">🤖</text>
hoverClass="none" <!-- 未读消息小红点 -->
openType="contact" <view v-if="unreadCount > 0" class="unread-badge">
sessionFrom="weapp" <text class="badge-text">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
showMessageCard="true" </view>
</view> </view>
>
<text class="icox icox-kefu" v-if="!kefuimg"></text> <!-- #ifdef MP-WEIXIN -->
</button> <button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
<!-- #endif --> <text class="icox icox-kefu" v-if="!kefuimg"></text>
</button>
<!-- 其他按钮AI 电话已隐藏 --> <!-- #endif -->
</view>
<!-- 电话 -->
<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>
</template> </template>
<script> <script>
@@ -34,9 +39,9 @@
return { return {
pageCount: 0, pageCount: 0,
fixBtnShow: true, fixBtnShow: true,
tel: '', tel:'',
kefuimg: '', kefuimg:'',
phoneimg: '' phoneimg:''
}; };
}, },
created() { created() {
@@ -46,25 +51,26 @@
var that = this var that = this
uni.getStorage({ uni.getStorage({
key: 'shopInfo', key:'shopInfo',
success(e) { success(e){
that.tel = e.data.mobile that.tel = e.data.mobile
} }
}) })
}, },
computed: { computed: {
...mapGetters([ ...mapGetters([
'globalAIAgentConfig', 'globalAIKefuConfig',
'aiUnreadCount' 'aiUnreadCount'
]), ]),
aiAgentimg() { aiAgentimg() {
return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' return this.globalAIKefuConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
}, },
unreadCount() { unreadCount() {
return this.aiUnreadCount return this.aiUnreadCount
}, },
enableAIChat() { enableAIChat() {
return this.globalAIAgentConfig?.enable || true return this.globalAIKefuConfig?.enable || true // 是否开启AI智能助手
}, },
}, },
methods: { methods: {
@@ -72,20 +78,22 @@
'setAiUnreadCount' 'setAiUnreadCount'
]), ]),
// 拨打电话(已无调用,可保留或删除) //拨打电话
call() { call(){
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: this.tel + '' phoneNumber:this.tel+''
}) })
}, },
// 打开AI聊天(已无调用,可保留或删除) // 打开AI聊天弹窗
openAIChat() { openAIChat() {
if (this.enableAIChat) { if (this.enableAIChat) {
this.setAiUnreadCount(0); this.setAiUnreadCount(0);
} }
this.$util.redirectTo('/pages_tool/ai-chat/index') this.$util.redirectTo('/pages_tool/ai-chat/index')
} }
} }
}; };
</script> </script>
@@ -129,6 +137,7 @@
.btn-item { .btn-item {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; /* 新增:让🤖表情垂直居中 */
text-align: center; text-align: center;
flex-direction: column; flex-direction: column;
line-height: 1; line-height: 1;
@@ -154,12 +163,14 @@
transform: rotate(180deg); transform: rotate(180deg);
} }
&.switch {}
&.icon-xiala { &.icon-xiala {
margin: 0; margin: 0;
margin-top: 0.1rpx; margin-top: 0.1rpx;
} }
// 未读消息小红点(已无使用,可保留样式) // 未读消息小红点
.unread-badge { .unread-badge {
position: absolute; position: absolute;
top: -5rpx; top: -5rpx;
@@ -183,6 +194,16 @@
// #endif // #endif
} }
} }
// AI图标样式优化让🤖表情居中显示
.ai-icon {
font-size: 40rpx; // 调整🤖表情大小
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}
} }
} }
</style> </style>

View File

@@ -104,14 +104,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
// #endif // #endif
} }
},
{
"path": "pages/dify-chat/dify-chat",
"style": {
"navigationBarTitleText": "智能客服"
}
} }
], ],
"subPackages": [ "subPackages": [
{ {

View File

@@ -1,236 +1,236 @@
<template> <template>
<page-meta :page-style="themeColor"></page-meta> <page-meta :page-style="themeColor"></page-meta>
<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img"> <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-box" v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
<view class="site-info"> <view class="site-info">
<view class="img-box" v-if="siteInfo.logo_square"> <view class="img-box" v-if="siteInfo.logo_square">
<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image> <image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
</view> </view>
<view class="info-box" :style="{ color: '#ffffff' }"> <view class="info-box" :style="{ color: '#ffffff' }">
<text class="font-size-base">{{ siteInfo.site_name }}</text> <text class="font-size-base">{{ siteInfo.site_name }}</text>
<text>{{ followOfficialAccount.welcomeMsg }}</text> <text>{{ followOfficialAccount.welcomeMsg }}</text>
</view> </view>
</view> </view>
<view class="dite-button" @click="officialAccountsOpen">关注公众号</view> <view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
</view> </view>
<!-- <view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }"> <!-- <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"/> <ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
</view> --> </view> -->
<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page"> <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> <template v-slot:components>
<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/> <diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
</template> </template>
<template v-slot:default> <template v-slot:default>
<ns-copyright v-show="isShowCopyRight"/> <ns-copyright v-show="isShowCopyRight"/>
</template> </template>
</diy-index-page> </diy-index-page>
<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }"> <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"/> <diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :followOfficialAccount="followOfficialAccount"/>
<ns-copyright v-show="isShowCopyRight"/> <ns-copyright v-show="isShowCopyRight"/>
</view> </view>
<template v-if="adv.advshow != -1"> <template v-if="adv.advshow != -1">
<view @touchmove.prevent.stop> <view @touchmove.prevent.stop>
<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false"> <uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
<view class="small-bot"> <view class="small-bot">
<!-- <view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}"> <!-- <view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
<view bindtap="adverclose">跳过</view> <view bindtap="adverclose">跳过</view>
<view class="time">{{clock}}s</view> <view class="time">{{clock}}s</view>
</view> </view>
<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}"> <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 class="time" style="line-height: 64rpx;">{{clock}}s</view>
</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 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"> <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 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> --> <!-- <image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
</swiper-item> </swiper-item>
</swiper> </swiper>
<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow"> <view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
<i class="iconfont icon-round-close" style="color:#fff"></i> <i class="iconfont icon-round-close" style="color:#fff"></i>
</view> </view>
</view> </view>
<!-- <view class="image-wrap"> <!-- <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 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)"> <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"> <view class="item">
<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/> <image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<text class="iconfont icon-round-close" @click="closePopupWindow"></text> --> <text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
<!-- 底部tabBar --> <!-- 底部tabBar -->
<view class="page-bottom" v-if="openBottomNav"> <view class="page-bottom" v-if="openBottomNav">
<diy-bottom-nav @callback="callback" :name="name"/> <diy-bottom-nav @callback="callback" :name="name"/>
</view> </view>
<!-- 关注公众号弹窗 --> <!-- 关注公众号弹窗 -->
<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode"> <view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
<uni-popup ref="officialAccountsPopup" type="center"> <uni-popup ref="officialAccountsPopup" type="center">
<view class="official-accounts-wrap"> <view class="official-accounts-wrap">
<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image> <image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
<text class="desc">关注了解更多</text> <text class="desc">关注了解更多</text>
<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text> <text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
<!-- 收藏 --> <!-- 收藏 -->
<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect"> <uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }"> <view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/> <image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
<text @click="closeCollectPopupWindow">我知道了</text> <text @click="closeCollectPopupWindow">我知道了</text>
</view> </view>
</uni-popup> </uni-popup>
<!-- 选择门店弹出框定位当前位置展示最近的一个门店 --> <!-- 选择门店弹出框定位当前位置展示最近的一个门店 -->
<view @touchmove.prevent.stop class="choose-store"> <view @touchmove.prevent.stop class="choose-store">
<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store"> <uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
<view class="choose-store-popup"> <view class="choose-store-popup">
<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view> <view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
<view class="position-wrap"> <view class="position-wrap">
<text class="iconfont icon-dizhi"></text> <text class="iconfont icon-dizhi"></text>
<text class="address">{{ currentPosition }}</text> <text class="address">{{ currentPosition }}</text>
<view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1"> <view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
<text class="iconfont icon-dingwei"></text> <text class="iconfont icon-dingwei"></text>
<text>重新定位</text> <text>重新定位</text>
</view> </view>
</view> </view>
<view class="store-wrap" v-if="nearestStore"> <view class="store-wrap" v-if="nearestStore">
<text class="tag">当前门店</text> <text class="tag">当前门店</text>
<view class="store-name">{{ nearestStore.store_name }}</view> <view class="store-name">{{ nearestStore.store_name }}</view>
<view class="address">{{ nearestStore.show_address }}</view> <view class="address">{{ nearestStore.show_address }}</view>
<view class="distance" v-if="nearestStore.distance"> <view class="distance" v-if="nearestStore.distance">
<text class="iconfont icon-dizhi"></text> <text class="iconfont icon-dizhi"></text>
<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text> <text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
</view> </view>
</view> </view>
<button type="primary" @click="enterStore">确认进入</button> <button type="primary" @click="enterStore">确认进入</button>
<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1"> <view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
<text>选择其他门店</text> <text>选择其他门店</text>
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
<hover-nav></hover-nav> <hover-nav></hover-nav>
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<!-- 小程序隐私协议 --> <!-- 小程序隐私协议 -->
<privacy-popup ref="privacyPopup"></privacy-popup> <privacy-popup ref="privacyPopup"></privacy-popup>
<!-- #endif --> <!-- #endif -->
<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top> <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
</view> </view>
</template> </template>
<script> <script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsNavbar from '@/components/ns-navbar/ns-navbar.vue'; import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
import diyJs from '@/common/js/diy.js'; import diyJs from '@/common/js/diy.js';
import indexJs from './public/js/index.js'; import indexJs from './public/js/index.js';
import toTop from '@/components/toTop/toTop.vue'; import toTop from '@/components/toTop/toTop.vue';
import scroll from '@/common/js/scroll-view.js'; import scroll from '@/common/js/scroll-view.js';
export default { export default {
components: { components: {
uniPopup, uniPopup,
nsNavbar, nsNavbar,
toTop toTop
}, },
mixins: [diyJs, scroll, indexJs] mixins: [diyJs, scroll, indexJs]
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import '@/common/css/diy.scss'; @import '@/common/css/diy.scss';
@import './public/css/index.scss'; @import './public/css/index.scss';
.small-bot { .small-bot {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
z-index: 122; z-index: 122;
} }
.small-bot swiper { .small-bot swiper {
width: 560rpx; width: 560rpx;
height: 784rpx; height: 784rpx;
margin: 120rpx auto 0; margin: 120rpx auto 0;
border-radius: 10rpx; border-radius: 10rpx;
overflow: hidden; overflow: hidden;
} }
.small-bot swiper .slide-image { .small-bot swiper .slide-image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.small-bot-close { .small-bot-close {
width: 66rpx; width: 66rpx;
height: 66rpx; height: 66rpx;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 64rpx; line-height: 64rpx;
font-size: 64rpx; font-size: 64rpx;
color: #fff; color: #fff;
margin: 30rpx auto 0; margin: 30rpx auto 0;
} }
.small-bot-close i { .small-bot-close i {
font-size: 60rpx; font-size: 60rpx;
} }
</style> </style>
<style scoped> <style scoped>
.swiper /deep/ .uni-swiper-dots-horizontal { .swiper /deep/ .uni-swiper-dots-horizontal {
left: 40%; left: 40%;
bottom:40px bottom:40px
} }
.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { .wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
background: none !important; background: none !important;
} }
.choose-store>>>.goodslist-uni-popup-box { .choose-store>>>.goodslist-uni-popup-box {
width: 80%; width: 80%;
} }
/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box { /deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
border-radius: 0; border-radius: 0;
} }
/deep/ .placeholder { /deep/ .placeholder {
height: 0; height: 0;
} }
/deep/::-webkit-scrollbar { /deep/::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;
background-color: transparent; background-color: transparent;
display: none; display: none;
} }
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
max-height: unset !important; max-height: unset !important;
} }
/deep/ .mescroll-totop { /deep/ .mescroll-totop {
right: 24rpx!important; right: 24rpx!important;
bottom: 182rpx!important; bottom: 182rpx!important;
} }
</style> </style>

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,7 @@
{ {
"description": "项目配置文件", "description": "项目配置文件",
"packOptions": { "packOptions": {
"ignore": [], "ignore": []
"include": []
}, },
"setting": { "setting": {
"urlCheck": true, "urlCheck": true,
@@ -38,20 +37,20 @@
"userConfirmedBundleSwitch": false, "userConfirmedBundleSwitch": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true, "minifyWXSS": true
"compileWorklet": false,
"minifyWXML": true,
"localPlugins": false,
"disableUseStrict": false,
"useCompilerPlugins": false,
"condition": false,
"swc": false,
"disableSWC": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.12.0", "libVersion": "2.16.1",
"appid": "wx29215aa1bd97bbd6", "appid": "wx29215aa1bd97bbd6",
"projectname": "niushop_b2c_v4_uniapp", "projectname": "niushop_b2c_v4_uniapp",
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"staticServerOptions": {
"baseURL": "",
"servePath": ""
},
"isGameTourist": false, "isGameTourist": false,
"condition": { "condition": {
"search": { "search": {
@@ -72,7 +71,5 @@
"miniprogram": { "miniprogram": {
"list": [] "list": []
} }
}, }
"simulatorPluginLibVersion": {},
"editorSetting": {}
} }