Compare commits
7 Commits
2416eab34f
...
feat-huawe
| Author | SHA1 | Date | |
|---|---|---|---|
|
86e43e3e6c | ||
|
|
bf09d8ad26 | ||
| 03aa6e099f | |||
| 4585fb6c07 | |||
| 4aeb7d04c4 | |||
|
|
067bbf6e2d | ||
|
|
3cef4b9987 |
488
App.vue
488
App.vue
@@ -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, '&')
|
|
||||||
.replace(/</g, '<')
|
|
||||||
.replace(/>/g, '>')
|
|
||||||
.replace(/"/g, '"')
|
|
||||||
.replace(/'/g, ''');
|
|
||||||
},
|
|
||||||
|
|
||||||
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>
|
||||||
152
common/js/huaweiPay.js
Normal file
152
common/js/huaweiPay.js
Normal file
@@ -0,0 +1,152 @@
|
|||||||
|
/**
|
||||||
|
* 华为支付核心工具类
|
||||||
|
* 适配端：华为快应用（原生支付）、微信小程序（H5支付）、H5端（H5支付）
|
||||||
|
* 核心：统一封装支付调用逻辑，返回H5支付链接适配web-view组件
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 华为支付调用封装
|
||||||
|
* @param {String} outTradeNo 前端生成的唯一订单号
|
||||||
|
* @param {Number} amount 支付金额（单位：元，保留2位小数）
|
||||||
|
* @param {String} subject 订单标题
|
||||||
|
* @param {String} payType 支付类型（默认huaweipay）
|
||||||
|
* @returns {Promise} 支付结果（含H5支付链接）
|
||||||
|
*/
|
||||||
|
export function invokeHuaweiPay(outTradeNo, amount, subject, payType = 'huaweipay') {
|
||||||
|
return new Promise(async (resolve, reject) => {
|
||||||
|
try {
|
||||||
|
// 1. 显示加载中提示
|
||||||
|
uni.showLoading({
|
||||||
|
title: '发起支付...'
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. 调用后端生成订单
|
||||||
|
const orderRes = await uni.request({
|
||||||
|
url: getApiUrl() + '/api/huawei/pay/createOrder',
|
||||||
|
method: 'POST',
|
||||||
|
data: {
|
||||||
|
out_trade_no: outTradeNo,
|
||||||
|
total_amount: amount,
|
||||||
|
subject: subject,
|
||||||
|
pay_type: payType
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 3. 校验后端返回结果
|
||||||
|
if (orderRes.data.code !== 0) {
|
||||||
|
uni.hideLoading();
|
||||||
|
reject(new Error(orderRes.data.msg || '生成支付订单失败'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. 区分运行端处理
|
||||||
|
const systemInfo = uni.getSystemInfoSync();
|
||||||
|
const accountInfo = uni.getAccountInfoSync();
|
||||||
|
const isHuaweiQuickApp = systemInfo.platform === 'quickapp-huawei'; // 华为快应用
|
||||||
|
const isWechatMini = accountInfo?.miniProgram?.appId?.includes('wx'); // 微信小程序
|
||||||
|
const isH5 = systemInfo.platform === 'web' || !accountInfo?.miniProgram; // H5端
|
||||||
|
|
||||||
|
if (isHuaweiQuickApp) {
|
||||||
|
// 4.1 华为快应用：原生唤起支付控件
|
||||||
|
// 注意：这里需要根据实际的华为快应用支付SDK调用
|
||||||
|
try {
|
||||||
|
// 示例代码，实际需要根据华为快应用文档调整
|
||||||
|
const huaweiPay = require('@service.pay.huawei');
|
||||||
|
huaweiPay.pay({
|
||||||
|
orderInfo: orderRes.data.data.orderInfo,
|
||||||
|
success: (payRes) => {
|
||||||
|
uni.hideLoading();
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '华为支付控件唤起成功',
|
||||||
|
data: payRes
|
||||||
|
});
|
||||||
|
},
|
||||||
|
fail: (err) => {
|
||||||
|
uni.hideLoading();
|
||||||
|
const errMsg = err.message || err.code || '未知错误';
|
||||||
|
reject(new Error(`支付失败：${errMsg}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (sdkError) {
|
||||||
|
// SDK不存在，降级到H5支付
|
||||||
|
if (orderRes.data.data.payUrl) {
|
||||||
|
uni.hideLoading();
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转华为支付H5页面',
|
||||||
|
data: { payUrl: orderRes.data.data.payUrl }
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
uni.hideLoading();
|
||||||
|
reject(new Error('华为支付SDK不可用且无H5支付链接'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (isWechatMini || isH5) {
|
||||||
|
// 4.2 微信小程序/H5端：返回H5支付链接（适配web-view）
|
||||||
|
if (!orderRes.data.data.payUrl) {
|
||||||
|
uni.hideLoading();
|
||||||
|
reject(new Error('未获取到华为支付H5跳转链接'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uni.hideLoading();
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转华为支付H5页面',
|
||||||
|
data: { payUrl: orderRes.data.data.payUrl }
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 4.3 其他端：提示不支持
|
||||||
|
uni.hideLoading();
|
||||||
|
reject(new Error('当前环境暂不支持华为支付'));
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
uni.hideLoading();
|
||||||
|
reject(new Error(`支付异常：${err.message || '网络请求失败'}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 校验支付最终状态（统一适配所有支付方式）
|
||||||
|
* @param {String} outTradeNo 前端生成的订单号
|
||||||
|
* @returns {Promise} 校验结果（包含订单实际支付状态）
|
||||||
|
*/
|
||||||
|
export function checkPayStatus(outTradeNo) {
|
||||||
|
return new Promise(async (resolve, reject) => {
|
||||||
|
try {
|
||||||
|
// 统一调用后端状态校验接口（适配所有支付类型）
|
||||||
|
const checkRes = await uni.request({
|
||||||
|
url: getApiUrl() + '/api/pay/checkStatus',
|
||||||
|
method: 'POST',
|
||||||
|
data: {
|
||||||
|
out_trade_no: outTradeNo
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
resolve(checkRes.data);
|
||||||
|
} catch (err) {
|
||||||
|
reject(new Error(`校验支付状态失败：${err.message || '网络请求失败'}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取API基础URL
|
||||||
|
*/
|
||||||
|
function getApiUrl() {
|
||||||
|
// 尝试获取配置的API地址
|
||||||
|
try {
|
||||||
|
// #ifdef H5
|
||||||
|
const config = require('@/common/js/config.js').default;
|
||||||
|
return config.baseUrl || '';
|
||||||
|
// #endif
|
||||||
|
// #ifndef H5
|
||||||
|
const config = require('@/common/js/config.js').default;
|
||||||
|
return config.baseUrl || '';
|
||||||
|
// #endif
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('获取API配置失败，使用空字符串');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
28
common/js/payCore.js
Normal file
28
common/js/payCore.js
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
/**
|
||||||
|
* 全支付方式统一调用入口
|
||||||
|
* 整合微信/支付宝/华为支付的所有方法，简化页面引入逻辑
|
||||||
|
* 依赖：payUtils.js、huaweiPay.js（无需修改原文件）
|
||||||
|
*/
|
||||||
|
|
||||||
|
// 1. 引入原工具类的所有方法（修正方法名）
|
||||||
|
import {
|
||||||
|
invokeWechatPay, // 微信支付（完整方法名）
|
||||||
|
invokeAlipay, // 支付宝支付（完整方法名）
|
||||||
|
checkPayStatus as payUtilsCheck // 微信/支付宝支付状态校验（完整方法名）
|
||||||
|
} from './payUtils.js';
|
||||||
|
|
||||||
|
import {
|
||||||
|
invokeHuaweiPay, // 华为支付（完整方法名）
|
||||||
|
checkPayStatus as huaweiCheck // 华为支付状态校验（完整方法名）
|
||||||
|
} from './huaweiPay.js';
|
||||||
|
|
||||||
|
// 2. 导出所有支付调用方法（修正方法名，和原方法一致）
|
||||||
|
export {
|
||||||
|
invokeWechatPay,
|
||||||
|
invokeAlipay,
|
||||||
|
invokeHuaweiPay
|
||||||
|
};
|
||||||
|
|
||||||
|
// 3. 导出统一的支付状态校验方法（两个工具类逻辑完全一致，任选其一即可）
|
||||||
|
export const checkPayStatus = payUtilsCheck;
|
||||||
|
// 若需使用华为支付工具类的校验逻辑，可替换为：export const checkPayStatus = huaweiCheck;
|
||||||
212
common/js/payUtils.js
Normal file
212
common/js/payUtils.js
Normal file
@@ -0,0 +1,212 @@
|
|||||||
|
/**
|
||||||
|
* 微信/支付宝支付工具类
|
||||||
|
* 适配端：微信小程序（全支付方式）、华为快应用（全支付方式）、H5（全支付方式）
|
||||||
|
* 核心：统一封装支付调用逻辑，返回H5支付链接适配web-view组件
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 微信支付调用封装
|
||||||
|
* @param {String} outTradeNo 前端生成的唯一订单号
|
||||||
|
* @param {Number} amount 支付金额（单位：元，保留2位小数）
|
||||||
|
* @param {String} subject 订单标题
|
||||||
|
* @returns {Promise} 支付结果（含H5支付链接）
|
||||||
|
*/
|
||||||
|
export function invokeWechatPay(outTradeNo, amount, subject) {
|
||||||
|
return new Promise(async (resolve, reject) => {
|
||||||
|
try {
|
||||||
|
// 1. 调用后端接口生成微信支付订单
|
||||||
|
const orderRes = await uni.request({
|
||||||
|
url: getApiUrl() + '/api/pay/wechat/createOrder',
|
||||||
|
method: 'POST',
|
||||||
|
data: {
|
||||||
|
out_trade_no: outTradeNo,
|
||||||
|
total_amount: amount,
|
||||||
|
subject: subject,
|
||||||
|
pay_type: 'wechatpay'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. 校验后端返回结果
|
||||||
|
if (orderRes.data.code !== 0) {
|
||||||
|
reject(new Error(orderRes.data.msg || '生成微信支付订单失败'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 区分运行端处理
|
||||||
|
const systemInfo = uni.getSystemInfoSync();
|
||||||
|
const accountInfo = uni.getAccountInfoSync();
|
||||||
|
const isWechatMini = accountInfo?.miniProgram?.appId?.includes('wx'); // 微信小程序
|
||||||
|
const isHuaweiQuickApp = systemInfo.platform === 'quickapp-huawei'; // 华为快应用
|
||||||
|
|
||||||
|
if (isWechatMini) {
|
||||||
|
// 3.1 微信小程序：优先原生唤起，失败则返回H5链接
|
||||||
|
if (orderRes.data.data.timeStamp && orderRes.data.data.paySign) {
|
||||||
|
uni.requestPayment({
|
||||||
|
timeStamp: orderRes.data.data.timeStamp,
|
||||||
|
nonceStr: orderRes.data.data.nonceStr,
|
||||||
|
package: orderRes.data.data.package,
|
||||||
|
signType: 'MD5',
|
||||||
|
paySign: orderRes.data.data.paySign,
|
||||||
|
success: () => {
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '微信支付控件唤起成功',
|
||||||
|
data: {}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
fail: (err) => {
|
||||||
|
// 原生唤起失败，返回H5链接适配web-view
|
||||||
|
if (orderRes.data.data.payUrl) {
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '原生支付失败，跳转H5支付',
|
||||||
|
data: { payUrl: orderRes.data.data.payUrl }
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
reject(new Error(`微信支付失败：${err.errMsg || '无H5支付链接'}`));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else if (orderRes.data.data.payUrl) {
|
||||||
|
// 无原生支付参数，直接返回H5链接
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转微信支付H5页面',
|
||||||
|
data: { payUrl: orderRes.data.data.payUrl }
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
reject(new Error('缺少微信支付参数（原生/H5）'));
|
||||||
|
}
|
||||||
|
} else if (isHuaweiQuickApp) {
|
||||||
|
// 3.2 华为快应用：返回H5支付链接
|
||||||
|
if (!orderRes.data.data.payUrl) {
|
||||||
|
reject(new Error('未获取到微信支付H5跳转链接'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转微信支付H5页面',
|
||||||
|
data: { payUrl: orderRes.data.data.payUrl }
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 3.3 H5端：直接跳转
|
||||||
|
if (!orderRes.data.data.payUrl) {
|
||||||
|
reject(new Error('未获取到微信支付跳转链接'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
window.location.href = orderRes.data.data.payUrl;
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转微信支付页面成功',
|
||||||
|
data: {}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
reject(new Error(`微信支付异常：${err.message || '网络请求失败'}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 支付宝支付调用封装（全端支持，返回H5链接适配web-view）
|
||||||
|
* @param {String} outTradeNo 前端生成的唯一订单号
|
||||||
|
* @param {Number} amount 支付金额（单位：元）
|
||||||
|
* @param {String} subject 订单标题
|
||||||
|
* @returns {Promise} 支付结果（含H5支付链接）
|
||||||
|
*/
|
||||||
|
export function invokeAlipay(outTradeNo, amount, subject) {
|
||||||
|
return new Promise(async (resolve, reject) => {
|
||||||
|
try {
|
||||||
|
// 1. 调用后端接口生成支付宝支付订单
|
||||||
|
const orderRes = await uni.request({
|
||||||
|
url: getApiUrl() + '/api/pay/alipay/createOrder',
|
||||||
|
method: 'POST',
|
||||||
|
data: {
|
||||||
|
out_trade_no: outTradeNo,
|
||||||
|
total_amount: amount,
|
||||||
|
subject: subject,
|
||||||
|
pay_type: 'alipay'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. 校验后端返回结果
|
||||||
|
if (orderRes.data.code !== 0) {
|
||||||
|
reject(new Error(orderRes.data.msg || '生成支付宝支付订单失败'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 区分运行端处理（全端返回H5链接）
|
||||||
|
const accountInfo = uni.getAccountInfoSync();
|
||||||
|
const isWechatMini = accountInfo?.miniProgram?.appId?.includes('wx');
|
||||||
|
const isHuaweiQuickApp = uni.getSystemInfoSync().platform === 'quickapp-huawei';
|
||||||
|
|
||||||
|
if (!orderRes.data.data.payUrl) {
|
||||||
|
reject(new Error('未获取到支付宝支付H5跳转链接'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isWechatMini || isHuaweiQuickApp) {
|
||||||
|
// 3.1 微信小程序/华为快应用：返回H5链接（适配web-view）
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转支付宝支付H5页面',
|
||||||
|
data: { payUrl: orderRes.data.data.payUrl }
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 3.2 H5端：直接跳转
|
||||||
|
window.location.href = orderRes.data.data.payUrl;
|
||||||
|
resolve({
|
||||||
|
code: 0,
|
||||||
|
msg: '跳转支付宝支付页面成功',
|
||||||
|
data: {}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
reject(new Error(`支付宝支付异常：${err.message || '网络请求失败'}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 统一支付状态校验（和huaweiPay.js的checkPayStatus对齐）
|
||||||
|
* @param {String} outTradeNo 前端生成的订单号
|
||||||
|
* @returns {Promise} 校验结果（包含订单实际支付状态）
|
||||||
|
*/
|
||||||
|
export function checkPayStatus(outTradeNo) {
|
||||||
|
return new Promise(async (resolve, reject) => {
|
||||||
|
try {
|
||||||
|
// 统一调用后端状态校验接口（适配所有支付类型）
|
||||||
|
const checkRes = await uni.request({
|
||||||
|
url: getApiUrl() + '/api/pay/checkStatus', // 和huaweiPay.js使用同一接口
|
||||||
|
method: 'POST',
|
||||||
|
data: {
|
||||||
|
out_trade_no: outTradeNo
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
resolve(checkRes.data);
|
||||||
|
} catch (err) {
|
||||||
|
reject(new Error(`校验支付状态失败：${err.message || '网络请求失败'}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取API基础URL
|
||||||
|
*/
|
||||||
|
function getApiUrl() {
|
||||||
|
// 尝试获取配置的API地址
|
||||||
|
try {
|
||||||
|
// #ifdef H5
|
||||||
|
const config = require('@/common/js/config.js').default;
|
||||||
|
return config.baseUrl || '';
|
||||||
|
// #endif
|
||||||
|
// #ifndef H5
|
||||||
|
const config = require('@/common/js/config.js').default;
|
||||||
|
return config.baseUrl || '';
|
||||||
|
// #endif
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('获取API配置失败，使用空字符串');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,188 +1,213 @@
|
|||||||
<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 -->
|
<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
|
||||||
<button
|
|
||||||
class="btn-item"
|
<!-- AI智能助手 -->
|
||||||
v-if="fixBtnShow"
|
<view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
|
||||||
hoverClass="none"
|
<text class="ai-icon" v-if="!aiAgentimg">🤖</text>
|
||||||
openType="contact"
|
<!-- 未读消息小红点 -->
|
||||||
sessionFrom="weapp"
|
<view v-if="unreadCount > 0" class="unread-badge">
|
||||||
showMessageCard="true"
|
<text class="badge-text">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
|
||||||
:style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}"
|
</view>
|
||||||
>
|
</view>
|
||||||
<text class="icox icox-kefu" v-if="!kefuimg"></text>
|
|
||||||
</button>
|
<!-- #ifdef MP-WEIXIN -->
|
||||||
<!-- #endif -->
|
<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>
|
||||||
<!-- 其他按钮（AI 和 电话）已隐藏 -->
|
<!-- <view>首页</view> -->
|
||||||
</view>
|
</button>
|
||||||
</template>
|
<!-- #endif -->
|
||||||
|
|
||||||
<script>
|
<!-- 电话 -->
|
||||||
import { mapGetters, mapMutations } from 'vuex'
|
<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>
|
||||||
export default {
|
<!-- <view>我的</view> -->
|
||||||
name: 'hover-nav',
|
</view>
|
||||||
props: {
|
|
||||||
need: {
|
<!-- <view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
|
||||||
type: Boolean,
|
<text class="iconfont icon-unfold"></text>
|
||||||
default: false
|
</view>
|
||||||
},
|
<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
|
||||||
},
|
@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
|
||||||
data() {
|
<view class="">快捷</view>
|
||||||
return {
|
<view>导航</view>
|
||||||
pageCount: 0,
|
</view> -->
|
||||||
fixBtnShow: true,
|
</view>
|
||||||
tel: '',
|
</template>
|
||||||
kefuimg: '',
|
|
||||||
phoneimg: ''
|
<script>
|
||||||
};
|
import { mapGetters, mapMutations } from 'vuex'
|
||||||
},
|
|
||||||
created() {
|
export default {
|
||||||
this.kefuimg = this.$util.getDefaultImage().kefu
|
name: 'hover-nav',
|
||||||
this.phoneimg = this.$util.getDefaultImage().phone
|
props: {
|
||||||
this.pageCount = getCurrentPages().length;
|
need: {
|
||||||
|
type: Boolean,
|
||||||
var that = this
|
default: false
|
||||||
uni.getStorage({
|
},
|
||||||
key: 'shopInfo',
|
},
|
||||||
success(e) {
|
data() {
|
||||||
that.tel = e.data.mobile
|
return {
|
||||||
}
|
pageCount: 0,
|
||||||
})
|
fixBtnShow: true,
|
||||||
},
|
tel:'',
|
||||||
computed: {
|
kefuimg:'',
|
||||||
...mapGetters([
|
phoneimg:''
|
||||||
'globalAIAgentConfig',
|
};
|
||||||
'aiUnreadCount'
|
},
|
||||||
]),
|
created() {
|
||||||
aiAgentimg() {
|
this.kefuimg = this.$util.getDefaultImage().kefu
|
||||||
return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || ''
|
this.phoneimg = this.$util.getDefaultImage().phone
|
||||||
},
|
this.pageCount = getCurrentPages().length;
|
||||||
unreadCount() {
|
|
||||||
return this.aiUnreadCount
|
|
||||||
},
|
var that = this
|
||||||
enableAIChat() {
|
uni.getStorage({
|
||||||
return this.globalAIAgentConfig?.enable || true
|
key:'shopInfo',
|
||||||
},
|
success(e){
|
||||||
},
|
that.tel = e.data.mobile
|
||||||
methods: {
|
}
|
||||||
...mapMutations([
|
})
|
||||||
'setAiUnreadCount'
|
|
||||||
]),
|
},
|
||||||
|
computed: {
|
||||||
// 拨打电话（已无调用，可保留或删除）
|
...mapGetters([
|
||||||
call() {
|
'globalAIAgentConfig',
|
||||||
uni.makePhoneCall({
|
'aiUnreadCount'
|
||||||
phoneNumber: this.tel + ''
|
]),
|
||||||
})
|
aiAgentimg() {
|
||||||
},
|
return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
|
||||||
|
},
|
||||||
// 打开AI聊天（已无调用，可保留或删除）
|
unreadCount() {
|
||||||
openAIChat() {
|
return this.aiUnreadCount
|
||||||
if (this.enableAIChat) {
|
},
|
||||||
this.setAiUnreadCount(0);
|
enableAIChat() {
|
||||||
}
|
return this.globalAIAgentConfig?.enable || true // 是否开启AI智能助手
|
||||||
this.$util.redirectTo('/pages_tool/ai-chat/index')
|
},
|
||||||
}
|
},
|
||||||
}
|
methods: {
|
||||||
};
|
...mapMutations([
|
||||||
</script>
|
'setAiUnreadCount'
|
||||||
|
]),
|
||||||
<style lang="scss">
|
|
||||||
.container-box {
|
//拨打电话
|
||||||
width: 100%;
|
call(){
|
||||||
|
uni.makePhoneCall({
|
||||||
.item-wrap {
|
phoneNumber:this.tel+''
|
||||||
border-radius: 10rpx;
|
})
|
||||||
|
},
|
||||||
.image-box {
|
|
||||||
border-radius: 10rpx;
|
// 打开AI聊天弹窗
|
||||||
}
|
openAIChat() {
|
||||||
|
if (this.enableAIChat) {
|
||||||
image {
|
this.setAiUnreadCount(0);
|
||||||
width: 100%;
|
}
|
||||||
height: auto;
|
|
||||||
border-radius: 10rpx;
|
this.$util.redirectTo('/pages_tool/ai-chat/index')
|
||||||
will-change: transform;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
</script>
|
||||||
//悬浮按钮
|
|
||||||
.fixed-box {
|
<style lang="scss">
|
||||||
position: fixed;
|
.container-box {
|
||||||
right: 0rpx;
|
width: 100%;
|
||||||
bottom: 200rpx;
|
|
||||||
z-index: 10;
|
.item-wrap {
|
||||||
border-radius: 120rpx;
|
border-radius: 10rpx;
|
||||||
padding: 20rpx 0;
|
|
||||||
display: flex;
|
.image-box {
|
||||||
justify-content: center;
|
border-radius: 10rpx;
|
||||||
flex-direction: column;
|
}
|
||||||
width: 100rpx;
|
|
||||||
box-sizing: border-box;
|
image {
|
||||||
transition: 0.3s;
|
width: 100%;
|
||||||
overflow: hidden;
|
height: auto;
|
||||||
|
border-radius: 10rpx;
|
||||||
.btn-item {
|
will-change: transform;
|
||||||
display: flex;
|
}
|
||||||
justify-content: center;
|
}
|
||||||
text-align: center;
|
}
|
||||||
flex-direction: column;
|
|
||||||
line-height: 1;
|
//悬浮按钮
|
||||||
margin: 14rpx 0;
|
.fixed-box {
|
||||||
transition: 0.1s;
|
position: fixed;
|
||||||
background: #fff;
|
right: 0rpx;
|
||||||
border-radius: 50rpx;
|
bottom: 200rpx;
|
||||||
width: 80rpx;
|
z-index: 10;
|
||||||
height: 80rpx;
|
// background: #fff;
|
||||||
padding: 0;
|
// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
|
||||||
position: relative;
|
border-radius: 120rpx;
|
||||||
text {
|
padding: 20rpx 0;
|
||||||
font-size: 36rpx;
|
display: flex;
|
||||||
font-weight: bold;
|
justify-content: center;
|
||||||
}
|
flex-direction: column;
|
||||||
|
width: 100rpx;
|
||||||
view {
|
box-sizing: border-box;
|
||||||
font-size: 26rpx;
|
transition: 0.3s;
|
||||||
font-weight: bold;
|
overflow: hidden;
|
||||||
}
|
|
||||||
|
.btn-item {
|
||||||
&.show {
|
display: flex;
|
||||||
transform: rotate(180deg);
|
justify-content: center;
|
||||||
}
|
text-align: center;
|
||||||
|
flex-direction: column;
|
||||||
&.icon-xiala {
|
line-height: 1;
|
||||||
margin: 0;
|
margin: 14rpx 0;
|
||||||
margin-top: 0.1rpx;
|
transition: 0.1s;
|
||||||
}
|
background: #fff;
|
||||||
|
border-radius: 50rpx;
|
||||||
// 未读消息小红点（已无使用，可保留样式）
|
width: 80rpx;
|
||||||
.unread-badge {
|
height: 80rpx;
|
||||||
position: absolute;
|
padding: 0;
|
||||||
top: -5rpx;
|
position: relative;
|
||||||
right: -5rpx;
|
text {
|
||||||
background-color: #ff4544;
|
font-size: 36rpx;
|
||||||
color: white;
|
font-weight: bold;
|
||||||
border-radius: 20rpx;
|
}
|
||||||
min-width: 30rpx;
|
|
||||||
height: 30rpx;
|
view {
|
||||||
font-size: 10rpx;
|
font-size: 26rpx;
|
||||||
line-height: 30rpx;
|
font-weight: bold;
|
||||||
text-align: center;
|
}
|
||||||
padding: 0 8rpx;
|
|
||||||
z-index: 1;
|
&.show {
|
||||||
box-shadow: 0 2rpx 10rpx rgba(255, 69, 68, 0.3);
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
.badge-text {
|
|
||||||
font-size: 8rpx;
|
&.switch {}
|
||||||
// #ifdef MP-WEIXIN
|
|
||||||
font-size: 20rpx;
|
&.icon-xiala {
|
||||||
// #endif
|
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>
|
</style>
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -11,7 +11,7 @@ export const lang = {
|
|||||||
home:'首页',
|
home:'首页',
|
||||||
cart:'购物车',
|
cart:'购物车',
|
||||||
leave:'立即留言',
|
leave:'立即留言',
|
||||||
make:'立即咨询',
|
make:'立即支付',
|
||||||
|
|
||||||
send:'配送',
|
send:'配送',
|
||||||
express:'快递发货',
|
express:'快递发货',
|
||||||
|
|||||||
@@ -54,8 +54,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/* 快应用特有相关 */
|
|
||||||
"quickapp" : {},
|
|
||||||
/* 小程序特有相关 */
|
/* 小程序特有相关 */
|
||||||
"mp-weixin" : {
|
"mp-weixin" : {
|
||||||
"appid" : "wxa8f94045d9c2fc10",
|
"appid" : "wxa8f94045d9c2fc10",
|
||||||
@@ -126,5 +124,12 @@
|
|||||||
"uniStatistics" : {
|
"uniStatistics" : {
|
||||||
"version" : "2"
|
"version" : "2"
|
||||||
},
|
},
|
||||||
"sassImplementationName" : "node-sass"
|
"sassImplementationName" : "node-sass",
|
||||||
|
/** 快应用配置 **/
|
||||||
|
"quickapp-webview" : {
|
||||||
|
"package" : "com.jieganfsj.fivegshop",
|
||||||
|
"minPlatformVersion" : 1070,
|
||||||
|
"versionName" : "1.0.0",
|
||||||
|
"versionCode" : 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4
node_modules/jweixin-module/README.md
generated
vendored
4
node_modules/jweixin-module/README.md
generated
vendored
@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
|
|||||||
## 使用
|
## 使用
|
||||||
|
|
||||||
```js
|
```js
|
||||||
var wx = require('jweixin-module')
|
var jweixin = require('jweixin-module')
|
||||||
wx.ready(function(){
|
jweixin.ready(function(){
|
||||||
// TODO
|
// TODO
|
||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|||||||
80
node_modules/jweixin-module/package.json
generated
vendored
80
node_modules/jweixin-module/package.json
generated
vendored
@@ -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",
|
"name": "jweixin-module",
|
||||||
"escapedName": "jweixin-module",
|
"version": "1.6.0",
|
||||||
"rawSpec": "",
|
"description": "微信JS-SDK",
|
||||||
"saveSpec": null,
|
"main": "lib/index.js",
|
||||||
"fetchSpec": "latest"
|
"scripts": {},
|
||||||
},
|
"repository": {
|
||||||
"_requiredBy": [
|
"type": "git",
|
||||||
"#USER",
|
"url": "git+https://github.com/zhetengbiji/jweixin-module.git"
|
||||||
"/"
|
},
|
||||||
],
|
"keywords": [
|
||||||
"_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
|
"wxjssdk",
|
||||||
"_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
|
"weixin",
|
||||||
"_spec": "jweixin-module",
|
"jweixin",
|
||||||
"_where": "E:\\demo\\niushop_uniapp",
|
"wechat",
|
||||||
"author": {
|
"jssdk",
|
||||||
"name": "Shengqiang Guo"
|
"wx"
|
||||||
},
|
],
|
||||||
"bugs": {
|
"author": "Shengqiang Guo",
|
||||||
"url": "https://github.com/zhetengbiji/jweixin-module/issues"
|
"license": "ISC",
|
||||||
},
|
"bugs": {
|
||||||
"bundleDependencies": false,
|
"url": "https://github.com/zhetengbiji/jweixin-module/issues"
|
||||||
"deprecated": false,
|
},
|
||||||
"description": "微信JS-SDK",
|
"homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
|
||||||
"devDependencies": {
|
"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"
|
|
||||||
}
|
}
|
||||||
|
|||||||
28
package-lock.json
generated
28
package-lock.json
generated
@@ -1,13 +1,23 @@
|
|||||||
{
|
{
|
||||||
"name": "uniappsaas",
|
"name": "frontend",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
|
"dependencies": {
|
||||||
|
"@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
|
||||||
|
"jweixin-module": "^1.6.0"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"terser-webpack-plugin": "^5.3.10"
|
"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": {
|
"node_modules/@jridgewell/gen-mapping": {
|
||||||
"version": "0.3.5",
|
"version": "0.3.5",
|
||||||
"resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
|
"resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
|
||||||
@@ -619,6 +629,12 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"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": {
|
"node_modules/loader-runner": {
|
||||||
"version": "4.3.0",
|
"version": "4.3.0",
|
||||||
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
|
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
|
||||||
@@ -984,6 +1000,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"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": {
|
"@jridgewell/gen-mapping": {
|
||||||
"version": "0.3.5",
|
"version": "0.3.5",
|
||||||
"resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
|
"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==",
|
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
|
||||||
"dev": true
|
"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": {
|
"loader-runner": {
|
||||||
"version": "4.3.0",
|
"version": "4.3.0",
|
||||||
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
|
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
"terser-webpack-plugin": "^5.3.10"
|
"terser-webpack-plugin": "^5.3.10"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
|
||||||
"jweixin-module": "^1.6.0"
|
"jweixin-module": "^1.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,14 +104,7 @@
|
|||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
// #endif
|
// #endif
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "pages/dify-chat/dify-chat",
|
|
||||||
"style": {
|
|
||||||
"navigationBarTitleText": "智能客服"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
],
|
],
|
||||||
"subPackages": [
|
"subPackages": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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>
|
|
||||||
@@ -1,266 +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>
|
||||||
|
<!-- #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>
|
||||||
|
|
||||||
|
<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>
|
|
||||||
|
.small-bot {
|
||||||
<script>
|
width: 100%;
|
||||||
import uniPopup from '@/components/uni-popup/uni-popup.vue';
|
height: 100%;
|
||||||
import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
|
position: fixed;
|
||||||
import diyJs from '@/common/js/diy.js';
|
top: 0;
|
||||||
import indexJs from './public/js/index.js';
|
bottom: 0;
|
||||||
import toTop from '@/components/toTop/toTop.vue';
|
left: 0;
|
||||||
import scroll from '@/common/js/scroll-view.js';
|
right: 0;
|
||||||
|
z-index: 122;
|
||||||
|
}
|
||||||
export default {
|
|
||||||
components: {
|
.small-bot swiper {
|
||||||
uniPopup,
|
width: 560rpx;
|
||||||
nsNavbar,
|
height: 784rpx;
|
||||||
toTop
|
margin: 120rpx auto 0;
|
||||||
},
|
border-radius: 10rpx;
|
||||||
mixins: [diyJs, scroll, indexJs],
|
overflow: hidden;
|
||||||
methods: { // ← 新增 methods
|
}
|
||||||
openDifyChat() {
|
|
||||||
uni.navigateTo({
|
.small-bot swiper .slide-image {
|
||||||
url: '/pages/dify-chat/dify-chat'
|
width: 100%;
|
||||||
});
|
height: 100%;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
.small-bot-close {
|
||||||
};
|
width: 66rpx;
|
||||||
|
height: 66rpx;
|
||||||
</script>
|
border-radius: 50%;
|
||||||
|
text-align: center;
|
||||||
<style lang="scss">
|
line-height: 64rpx;
|
||||||
@import '@/common/css/diy.scss';
|
font-size: 64rpx;
|
||||||
@import './public/css/index.scss';
|
color: #fff;
|
||||||
|
margin: 30rpx auto 0;
|
||||||
|
}
|
||||||
|
|
||||||
.small-bot {
|
.small-bot-close i {
|
||||||
width: 100%;
|
font-size: 60rpx;
|
||||||
height: 100%;
|
}
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
</style>
|
||||||
bottom: 0;
|
<style scoped>
|
||||||
left: 0;
|
.swiper /deep/ .uni-swiper-dots-horizontal {
|
||||||
right: 0;
|
left: 40%;
|
||||||
z-index: 122;
|
bottom:40px
|
||||||
}
|
}
|
||||||
|
.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
|
||||||
.small-bot swiper {
|
background: none !important;
|
||||||
width: 560rpx;
|
}
|
||||||
height: 784rpx;
|
|
||||||
margin: 120rpx auto 0;
|
.choose-store>>>.goodslist-uni-popup-box {
|
||||||
border-radius: 10rpx;
|
width: 80%;
|
||||||
overflow: hidden;
|
}
|
||||||
}
|
|
||||||
|
/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
|
||||||
.small-bot swiper .slide-image {
|
border-radius: 0;
|
||||||
width: 100%;
|
}
|
||||||
height: 100%;
|
|
||||||
}
|
/deep/ .placeholder {
|
||||||
|
height: 0;
|
||||||
.small-bot-close {
|
}
|
||||||
width: 66rpx;
|
|
||||||
height: 66rpx;
|
/deep/::-webkit-scrollbar {
|
||||||
border-radius: 50%;
|
width: 0;
|
||||||
text-align: center;
|
height: 0;
|
||||||
line-height: 64rpx;
|
background-color: transparent;
|
||||||
font-size: 64rpx;
|
display: none;
|
||||||
color: #fff;
|
}
|
||||||
margin: 30rpx auto 0;
|
|
||||||
}
|
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
|
||||||
|
max-height: unset !important;
|
||||||
.small-bot-close i {
|
}
|
||||||
font-size: 60rpx;
|
|
||||||
}
|
/deep/ .mescroll-totop {
|
||||||
|
right: 24rpx!important;
|
||||||
</style>
|
bottom: 182rpx!important;
|
||||||
<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;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,78 +1,78 @@
|
|||||||
{
|
{
|
||||||
"description": "项目配置文件",
|
"description": "项目配置文件",
|
||||||
"packOptions": {
|
"packOptions": {
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"include": []
|
"include": []
|
||||||
},
|
},
|
||||||
"setting": {
|
"setting": {
|
||||||
"urlCheck": true,
|
"urlCheck": true,
|
||||||
"es6": true,
|
"es6": true,
|
||||||
"enhance": false,
|
"enhance": false,
|
||||||
"postcss": true,
|
"postcss": true,
|
||||||
"preloadBackgroundData": false,
|
"preloadBackgroundData": false,
|
||||||
"minified": true,
|
"minified": true,
|
||||||
"newFeature": false,
|
"newFeature": false,
|
||||||
"coverView": true,
|
"coverView": true,
|
||||||
"nodeModules": false,
|
"nodeModules": false,
|
||||||
"autoAudits": false,
|
"autoAudits": false,
|
||||||
"showShadowRootInWxmlPanel": true,
|
"showShadowRootInWxmlPanel": true,
|
||||||
"scopeDataCheck": false,
|
"scopeDataCheck": false,
|
||||||
"uglifyFileName": false,
|
"uglifyFileName": false,
|
||||||
"checkInvalidKey": true,
|
"checkInvalidKey": true,
|
||||||
"checkSiteMap": true,
|
"checkSiteMap": true,
|
||||||
"uploadWithSourceMap": true,
|
"uploadWithSourceMap": true,
|
||||||
"compileHotReLoad": false,
|
"compileHotReLoad": false,
|
||||||
"useMultiFrameRuntime": true,
|
"useMultiFrameRuntime": true,
|
||||||
"useApiHook": true,
|
"useApiHook": true,
|
||||||
"useApiHostProcess": true,
|
"useApiHostProcess": true,
|
||||||
"babelSetting": {
|
"babelSetting": {
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"disablePlugins": [],
|
"disablePlugins": [],
|
||||||
"outputPath": ""
|
"outputPath": ""
|
||||||
},
|
},
|
||||||
"enableEngineNative": false,
|
"enableEngineNative": false,
|
||||||
"bundle": false,
|
"bundle": false,
|
||||||
"useIsolateContext": true,
|
"useIsolateContext": true,
|
||||||
"useCompilerModule": true,
|
"useCompilerModule": true,
|
||||||
"userConfirmedUseCompilerModuleSwitch": false,
|
"userConfirmedUseCompilerModuleSwitch": false,
|
||||||
"userConfirmedBundleSwitch": false,
|
"userConfirmedBundleSwitch": false,
|
||||||
"packNpmManually": false,
|
"packNpmManually": false,
|
||||||
"packNpmRelationList": [],
|
"packNpmRelationList": [],
|
||||||
"minifyWXSS": true,
|
"minifyWXSS": true,
|
||||||
"compileWorklet": false,
|
"compileWorklet": false,
|
||||||
"minifyWXML": true,
|
"minifyWXML": true,
|
||||||
"localPlugins": false,
|
"localPlugins": false,
|
||||||
"disableUseStrict": false,
|
"disableUseStrict": false,
|
||||||
"useCompilerPlugins": false,
|
"useCompilerPlugins": false,
|
||||||
"condition": false,
|
"condition": false,
|
||||||
"swc": false,
|
"swc": false,
|
||||||
"disableSWC": true
|
"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",
|
||||||
"isGameTourist": false,
|
"isGameTourist": false,
|
||||||
"condition": {
|
"condition": {
|
||||||
"search": {
|
"search": {
|
||||||
"list": []
|
"list": []
|
||||||
},
|
},
|
||||||
"conversation": {
|
"conversation": {
|
||||||
"list": []
|
"list": []
|
||||||
},
|
},
|
||||||
"game": {
|
"game": {
|
||||||
"list": []
|
"list": []
|
||||||
},
|
},
|
||||||
"plugin": {
|
"plugin": {
|
||||||
"list": []
|
"list": []
|
||||||
},
|
},
|
||||||
"gamePlugin": {
|
"gamePlugin": {
|
||||||
"list": []
|
"list": []
|
||||||
},
|
},
|
||||||
"miniprogram": {
|
"miniprogram": {
|
||||||
"list": []
|
"list": []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"simulatorPluginLibVersion": {},
|
"simulatorPluginLibVersion": {},
|
||||||
"editorSetting": {}
|
"editorSetting": {}
|
||||||
}
|
}
|
||||||
@@ -58,6 +58,7 @@ const store = new Vuex.Store({
|
|||||||
cartNumber: 0,
|
cartNumber: 0,
|
||||||
cartMoney: 0,
|
cartMoney: 0,
|
||||||
cartChange: 0,
|
cartChange: 0,
|
||||||
|
wechatConfigStatus:0,
|
||||||
bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
|
bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
|
||||||
aiUnreadCount: 10, // AI未读消息数量
|
aiUnreadCount: 10, // AI未读消息数量
|
||||||
globalAIAgentConfig: null, // AI客服配置
|
globalAIAgentConfig: null, // AI客服配置
|
||||||
@@ -74,11 +75,21 @@ const store = new Vuex.Store({
|
|||||||
mapConfig: {
|
mapConfig: {
|
||||||
tencent_map_key: '',
|
tencent_map_key: '',
|
||||||
wap_is_open: 1,
|
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: {
|
mutations: {
|
||||||
|
// 设置是否可以领取新人礼
|
||||||
|
setCanReceiveRegistergiftInfo(state, data) {
|
||||||
|
state.canReceiveRegistergiftInfo = data;
|
||||||
|
},
|
||||||
// 设置那些组件展示
|
// 设置那些组件展示
|
||||||
setDiyGroupShowModule(state, data) {
|
setDiyGroupShowModule(state, data) {
|
||||||
state.diyGroupShowModule = data;
|
state.diyGroupShowModule = data;
|
||||||
@@ -182,11 +193,19 @@ const store = new Vuex.Store({
|
|||||||
uni.setStorageSync('copyright', value);
|
uni.setStorageSync('copyright', value);
|
||||||
},
|
},
|
||||||
setMemberInfo(state, value) {
|
setMemberInfo(state, value) {
|
||||||
|
// 会员被锁定后，清除会员登录信息
|
||||||
|
if (value && value.status == 0) {
|
||||||
|
value = null;
|
||||||
|
}
|
||||||
state.memberInfo = value;
|
state.memberInfo = value;
|
||||||
if (value) {
|
if (value) {
|
||||||
uni.setStorageSync('memberInfo', value);
|
uni.setStorageSync('memberInfo', value);
|
||||||
} else {
|
} else {
|
||||||
|
// 会员为空时，清除会员登录信息
|
||||||
uni.removeStorageSync('memberInfo');
|
uni.removeStorageSync('memberInfo');
|
||||||
|
this.commit('setToken', '');
|
||||||
|
this.dispatch('emptyCart');
|
||||||
|
//uni.removeStorageSync('authInfo');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setCartNumber(state, cartNumber) {
|
setCartNumber(state, cartNumber) {
|
||||||
@@ -201,6 +220,12 @@ const store = new Vuex.Store({
|
|||||||
setCartMoney(state, value) {
|
setCartMoney(state, value) {
|
||||||
state.cartMoney = value;
|
state.cartMoney = value;
|
||||||
},
|
},
|
||||||
|
setInitStatus(state,value){
|
||||||
|
state.initStatus = value
|
||||||
|
},
|
||||||
|
setWechatConfigStatus(state,value){
|
||||||
|
state.wechatConfigStatus = value
|
||||||
|
},
|
||||||
// 设置AI未读消息数量
|
// 设置AI未读消息数量
|
||||||
setAiUnreadCount(state, value) {
|
setAiUnreadCount(state, value) {
|
||||||
state.aiUnreadCount = value;
|
state.aiUnreadCount = value;
|
||||||
@@ -220,6 +245,7 @@ const store = new Vuex.Store({
|
|||||||
success: res => {
|
success: res => {
|
||||||
var data = res.data;
|
var data = res.data;
|
||||||
if (data) {
|
if (data) {
|
||||||
|
|
||||||
this.commit('setThemeStyle', colorList[data.style_theme.name]);
|
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('setGlobalAIAgentConfig', data.ai_agent_config);
|
||||||
|
|
||||||
this.commit('setGlobalStoreConfig', data.store_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('setDefaultStoreInfo', null);
|
||||||
this.commit('setGlobalStoreInfo', null);
|
this.commit('setGlobalStoreInfo', null);
|
||||||
}
|
}
|
||||||
|
this.commit('setInitStatus',true)
|
||||||
resolve(data);
|
resolve(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,7 +293,7 @@ const store = new Vuex.Store({
|
|||||||
data: {},
|
data: {},
|
||||||
success: res => {
|
success: res => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
let list = [];
|
let list = {};
|
||||||
let ids = [];
|
let ids = [];
|
||||||
let totalMoney = 0;
|
let totalMoney = 0;
|
||||||
let totalNum = 0;
|
let totalNum = 0;
|
||||||
@@ -279,16 +306,17 @@ const store = new Vuex.Store({
|
|||||||
goods_id: item.goods_id,
|
goods_id: item.goods_id,
|
||||||
sku_id: item.sku_id,
|
sku_id: item.sku_id,
|
||||||
num: item.num,
|
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]) {
|
if (!list['goods_' + cart.goods_id]) {
|
||||||
list['goods_' + cart.goods_id] = {};
|
list['goods_' + cart.goods_id] = {};
|
||||||
}
|
}
|
||||||
list['goods_' + cart.goods_id]['sku_' + cart
|
list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
|
||||||
.sku_id
|
list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
|
||||||
] =
|
list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
|
||||||
cart;
|
|
||||||
ids.push(cart.cart_id);
|
ids.push(cart.cart_id);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -299,8 +327,7 @@ const store = new Vuex.Store({
|
|||||||
let item = list[goods][sku];
|
let item = list[goods][sku];
|
||||||
if (typeof item == 'object') {
|
if (typeof item == 'object') {
|
||||||
num += item.num;
|
num += item.num;
|
||||||
money += parseFloat(item.discount_price) * parseInt(item
|
money += parseFloat(item.discount_price) * parseInt(item.num);
|
||||||
.num);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
list[goods].num = num;
|
list[goods].num = num;
|
||||||
@@ -311,7 +338,6 @@ const store = new Vuex.Store({
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.commit('setCartList', list);
|
this.commit('setCartList', list);
|
||||||
|
|
||||||
this.commit('setCartIds', ids);
|
this.commit('setCartIds', ids);
|
||||||
|
|||||||
Reference in New Issue
Block a user