Compare commits
4 Commits
feat-huawe
...
2416eab34f
| Author | SHA1 | Date | |
|---|---|---|---|
| 2416eab34f | |||
| c4f2cea1a9 | |||
| 227ab42e5a | |||
| 4cf19e417f |
476
App.vue
476
App.vue
@@ -1,51 +1,43 @@
|
||||
<script>
|
||||
import auth from 'common/js/auth.js';
|
||||
import colorList from 'common/js/style_color.js'
|
||||
import {
|
||||
Weixin
|
||||
} from 'common/js/wx-jssdk.js';
|
||||
import { Weixin } from 'common/js/wx-jssdk.js';
|
||||
|
||||
export default {
|
||||
mixins: [auth],
|
||||
onLaunch: function(options) {
|
||||
// console.log(options.query.uniacid)
|
||||
// 处理uniacid存储
|
||||
if(options.query.uniacid){
|
||||
uni.setStorageSync('uniacid', options.query.uniacid);
|
||||
console.log(uni.getStorageSync('uniacid'))
|
||||
}
|
||||
uni.hideTabBar();
|
||||
|
||||
// #ifdef MP
|
||||
const updateManager = uni.getUpdateManager();
|
||||
updateManager.onCheckForUpdate(function(res) {
|
||||
// 请求完新版本信息的回调
|
||||
});
|
||||
|
||||
updateManager.onUpdateReady(function(res) {
|
||||
updateManager.onCheckForUpdate(() => {});
|
||||
updateManager.onUpdateReady((res) => {
|
||||
uni.showModal({
|
||||
title: '更新提示',
|
||||
content: '新版本已经准备好,是否重启应用?',
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
// 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
|
||||
updateManager.applyUpdate();
|
||||
}
|
||||
if (res.confirm) updateManager.applyUpdate();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
updateManager.onUpdateFailed(function(res) {
|
||||
// 新的版本下载失败
|
||||
});
|
||||
updateManager.onUpdateFailed(() => {});
|
||||
// #endif
|
||||
|
||||
// #ifdef H5
|
||||
if (uni.getSystemInfoSync().platform == 'ios') {
|
||||
uni.setStorageSync('initUrl', location.href);
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.createIndependentChatbot();
|
||||
});
|
||||
// #endif
|
||||
|
||||
uni.onNetworkStatusChange(function(res) {
|
||||
// 网络状态监听
|
||||
uni.onNetworkStatusChange((res) => {
|
||||
if (!res.isConnected) {
|
||||
uni.showModal({
|
||||
title: '网络失去链接',
|
||||
@@ -55,75 +47,38 @@
|
||||
}
|
||||
});
|
||||
|
||||
// 初始化store
|
||||
this.$store.dispatch('init');
|
||||
|
||||
// 存储到store中
|
||||
|
||||
// 主题风格
|
||||
if (uni.getStorageSync('themeStyle')) {
|
||||
this.$store.commit('setThemeStyle', colorList[uni.getStorageSync('themeStyle')]);
|
||||
// 批量同步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('addonIsExist')) {
|
||||
this.$store.commit('setAddonIsExist', uni.getStorageSync('addonIsExist'));
|
||||
}
|
||||
|
||||
// 默认图
|
||||
if (uni.getStorageSync('defaultImg')) {
|
||||
this.$store.commit('setDefaultImg', uni.getStorageSync('defaultImg'));
|
||||
}
|
||||
|
||||
// 站点信息
|
||||
if (uni.getStorageSync('siteInfo')) {
|
||||
this.$store.commit('setSiteInfo', uni.getStorageSync('siteInfo'));
|
||||
}
|
||||
|
||||
// 门店配置
|
||||
if (uni.getStorageSync('globalStoreConfig')) {
|
||||
this.$store.commit('setGlobalStoreConfig', uni.getStorageSync('globalStoreConfig'));
|
||||
}
|
||||
|
||||
// 门店信息
|
||||
if (uni.getStorageSync('globalStoreInfo')) {
|
||||
this.$store.commit('setGlobalStoreInfo', uni.getStorageSync('globalStoreInfo'));
|
||||
}
|
||||
|
||||
// 默认门店信息
|
||||
if (uni.getStorageSync('defaultStoreInfo')) {
|
||||
this.$store.commit('setDefaultStoreInfo', uni.getStorageSync('defaultStoreInfo'));
|
||||
}
|
||||
|
||||
// 客服配置
|
||||
if (uni.getStorageSync('servicerConfig')) {
|
||||
this.$store.commit('setServicerConfig', uni.getStorageSync('servicerConfig'));
|
||||
}
|
||||
|
||||
// 版权信息
|
||||
if (uni.getStorageSync('copyright')) {
|
||||
this.$store.commit('setCopyright', uni.getStorageSync('copyright'));
|
||||
}
|
||||
|
||||
// 地址配置
|
||||
if (uni.getStorageSync('mapConfig')) {
|
||||
this.$store.commit('setMapConfig', uni.getStorageSync('mapConfig'));
|
||||
}
|
||||
|
||||
if (uni.getStorageSync('token')) {
|
||||
this.$store.commit('setToken', uni.getStorageSync('token'));
|
||||
}
|
||||
|
||||
// 会员信息
|
||||
// 会员信息存在时同步购物车
|
||||
if (uni.getStorageSync('memberInfo')) {
|
||||
this.$store.commit('setMemberInfo', uni.getStorageSync('memberInfo'));
|
||||
|
||||
// 查询购物车信息
|
||||
this.$store.dispatch('getCartNumber');
|
||||
}
|
||||
|
||||
// #ifdef H5
|
||||
// 自动授权登录
|
||||
// 未登录情况下
|
||||
if (!uni.getStorageSync('memberInfo')) {
|
||||
this.getAuthInfo();
|
||||
}
|
||||
@@ -140,18 +95,17 @@
|
||||
// #endif
|
||||
|
||||
// #ifdef MP-ALIPAY
|
||||
if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
|
||||
if (options.query?.m) uni.setStorageSync('source_member', options.query.m);
|
||||
// #endif
|
||||
},
|
||||
onShow: function(options) {
|
||||
// #ifdef MP
|
||||
// 自动授权登录
|
||||
this.getAuthInfo();
|
||||
if (this.$store.state.token) {
|
||||
this.$api.sendRequest({
|
||||
url: '/api/member/info',
|
||||
success: (res) => {
|
||||
if (res.code >= 0) {
|
||||
if (res.code >= 10) {
|
||||
this.$store.commit('setMemberInfo', res.data);
|
||||
}
|
||||
}
|
||||
@@ -160,47 +114,251 @@
|
||||
// #endif
|
||||
|
||||
// #ifdef MP-ALIPAY
|
||||
if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
|
||||
if (options.query?.m) uni.setStorageSync('source_member', options.query.m);
|
||||
// #endif
|
||||
},
|
||||
onHide: function() {},
|
||||
methods: {
|
||||
/**
|
||||
* 获取授权信息
|
||||
*/
|
||||
// 安全的 HTML 转义(防止 XSS)
|
||||
htmlEncode(str) {
|
||||
if (typeof str !== 'string') return '';
|
||||
return str
|
||||
.replace(/&/g, '&')
|
||||
.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() {
|
||||
// #ifdef H5
|
||||
if (this.$util.isWeiXin()) {
|
||||
this.$util.getUrlCode(urlParams => {
|
||||
if (urlParams.source_member) uni.setStorageSync('source_member', urlParams
|
||||
.source_member);
|
||||
|
||||
if (urlParams.code == undefined) {
|
||||
if (urlParams.source_member) uni.setStorageSync('source_member', urlParams.source_member);
|
||||
if (urlParams.code === undefined) {
|
||||
this.$api.sendRequest({
|
||||
url: '/wechat/api/wechat/authcode',
|
||||
data: {
|
||||
redirect_url: location.href,
|
||||
scopes: 'snsapi_userinfo'
|
||||
},
|
||||
success: res => {
|
||||
if (res.code >= 0) {
|
||||
location.href = res.data;
|
||||
}
|
||||
}
|
||||
data: { redirect_url: location.href, scopes: 'snsapi_userinfo' },
|
||||
success: (res) => res.code >= 0 && (location.href = res.data)
|
||||
});
|
||||
} else {
|
||||
this.$api.sendRequest({
|
||||
url: '/wechat/api/wechat/authcodetoopenid',
|
||||
data: {
|
||||
code: urlParams.code
|
||||
},
|
||||
success: res => {
|
||||
data: { code: urlParams.code },
|
||||
success: (res) => {
|
||||
if (res.code >= 0) {
|
||||
let data = {};
|
||||
if (res.data.openid) data.wx_openid = res.data.openid;
|
||||
if (res.data.unionid) data.wx_unionid = res.data.unionid;
|
||||
if (res.data.userinfo) Object.assign(data, res.data
|
||||
.userinfo);
|
||||
const data = {};
|
||||
res.data.openid && (data.wx_openid = res.data.openid);
|
||||
res.data.unionid && (data.wx_unionid = res.data.unionid);
|
||||
res.data.userinfo && Object.assign(data, res.data.userinfo);
|
||||
this.authLogin(data);
|
||||
}
|
||||
}
|
||||
@@ -209,105 +367,97 @@
|
||||
});
|
||||
}
|
||||
// #endif
|
||||
|
||||
// #ifdef MP
|
||||
this.getCode(data => {
|
||||
this.authLogin(data, 'authOnlyLogin');
|
||||
});
|
||||
this.getCode(data => this.authLogin(data, 'authOnlyLogin'));
|
||||
// #endif
|
||||
},
|
||||
/**
|
||||
* 授权登录
|
||||
*/
|
||||
authLogin(data, type = 'authLogin') {
|
||||
if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
|
||||
|
||||
uni.getStorageSync('source_member') && (data.source_member = uni.getStorageSync('source_member'));
|
||||
uni.setStorageSync('authInfo', data);
|
||||
|
||||
this.$api.sendRequest({
|
||||
url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
|
||||
url: type === 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
|
||||
data,
|
||||
success: res => {
|
||||
success: (res) => {
|
||||
if (res.code >= 0) {
|
||||
this.$store.commit('setToken', res.data.token);
|
||||
this.getMemberInfo()
|
||||
this.getMemberInfo();
|
||||
this.$store.dispatch('getCartNumber');
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 公众号分享设置
|
||||
*/
|
||||
shareConfig() {
|
||||
this.$api.sendRequest({
|
||||
url: '/wechat/api/wechat/share',
|
||||
data: {
|
||||
url: window.location.href
|
||||
},
|
||||
success: res => {
|
||||
if (res.code == 0) {
|
||||
var wxJS = new Weixin();
|
||||
data: { url: window.location.href },
|
||||
success: (res) => {
|
||||
if (res.code === 0) {
|
||||
const wxJS = new Weixin();
|
||||
wxJS.init(res.data.jssdk_config);
|
||||
|
||||
let share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
|
||||
if (share_data) {
|
||||
wxJS.setShareData({
|
||||
const share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
|
||||
share_data && wxJS.setShareData({
|
||||
title: share_data.title,
|
||||
desc: share_data.desc,
|
||||
link: share_data.link,
|
||||
imgUrl: this.$util.img(share_data.imgUrl)
|
||||
},
|
||||
res => {
|
||||
console.log(res);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
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(); //放开分享好友等按钮
|
||||
}, res => console.log(res));
|
||||
res.data.share_config.permission.hideOptionMenu
|
||||
? wxJS.weixin.hideOptionMenu()
|
||||
: wxJS.weixin.showOptionMenu();
|
||||
}
|
||||
}
|
||||
},
|
||||
fail: err => {}
|
||||
});
|
||||
},
|
||||
getMemberInfo() {
|
||||
this.$api.sendRequest({
|
||||
url: '/api/member/info',
|
||||
success: (res) => {
|
||||
if (res.code >= 0) {
|
||||
// 登录成功,存储会员信息
|
||||
this.$store.commit('setMemberInfo', res.data);
|
||||
}
|
||||
}
|
||||
success: (res) => res.code >= 0 && this.$store.commit('setMemberInfo', res.data)
|
||||
});
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
$route: {
|
||||
handler(newName, oldName) {
|
||||
if (this.$util.isWeiXin()) {
|
||||
this.shareConfig();
|
||||
}
|
||||
this.$util.isWeiXin() && this.shareConfig();
|
||||
},
|
||||
// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
|
||||
immediate: true
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
@import './common/css/main.scss';
|
||||
@import './common/css/iconfont.css';
|
||||
@import './common/css/icondiy.css'; // 自定义图标库
|
||||
@import './common/css/icon/extend.css'; // 扩展图标库
|
||||
page{
|
||||
@import './common/css/icondiy.css';
|
||||
@import './common/css/icon/extend.css';
|
||||
|
||||
page {
|
||||
background: #f4f6fa;
|
||||
}
|
||||
body {
|
||||
padding-bottom: 80px !important;
|
||||
}
|
||||
|
||||
/* 聊天窗口滚动条美化 */
|
||||
#independent-chat-window div::-webkit-scrollbar {
|
||||
width: 4px;
|
||||
}
|
||||
#independent-chat-window div::-webkit-scrollbar-thumb {
|
||||
background: #ddd;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
/* 彩虹动画 */
|
||||
@keyframes rainbowPulse {
|
||||
0% { background-position: 0% 50%; }
|
||||
50% { background-position: 100% 50%; }
|
||||
100% { background-position: 0% 50%; }
|
||||
}
|
||||
|
||||
/* 强制固定定位,防止被其他样式干扰 */
|
||||
#independent-chat-btn,
|
||||
#independent-chat-window {
|
||||
position: fixed !important;
|
||||
}
|
||||
</style>
|
||||
@@ -1,152 +0,0 @@
|
||||
/**
|
||||
* 华为支付核心工具类
|
||||
* 适配端:华为快应用(原生支付)、微信小程序(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 '';
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
/**
|
||||
* 全支付方式统一调用入口
|
||||
* 整合微信/支付宝/华为支付的所有方法,简化页面引入逻辑
|
||||
* 依赖: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;
|
||||
@@ -1,212 +0,0 @@
|
||||
/**
|
||||
* 微信/支付宝支付工具类
|
||||
* 适配端:微信小程序(全支付方式)、华为快应用(全支付方式)、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 '';
|
||||
}
|
||||
}
|
||||
@@ -462,11 +462,7 @@ export default {
|
||||
openChoosePayment() {
|
||||
// #ifdef MP
|
||||
if (this.paymentData.is_virtual) {
|
||||
if(this.paymentData?.is_virtual_delivery == 1){
|
||||
this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
|
||||
}else{
|
||||
this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
|
||||
}
|
||||
} else {
|
||||
switch (this.orderCreateData.delivery.delivery_type) {
|
||||
case 'express': //物流配送
|
||||
@@ -609,9 +605,8 @@ export default {
|
||||
let delivery = {
|
||||
delivery_type: data.name,
|
||||
delivery_type_name: data.title
|
||||
};
|
||||
|
||||
// 如果是门店配送或者门店自提
|
||||
}
|
||||
// 如果是门店配送
|
||||
if (data.name == 'store' || data.name == 'local') {
|
||||
if (data.store_list[0]) {
|
||||
delivery.store_id = data.store_list[0].store_id;
|
||||
@@ -697,7 +692,7 @@ export default {
|
||||
let obj = {
|
||||
delivery: this.orderCreateData.delivery,
|
||||
dataTime: data
|
||||
};
|
||||
}
|
||||
this.$refs.timePopup.open(obj, type);
|
||||
this.$forceUpdate();
|
||||
}
|
||||
|
||||
@@ -1,38 +1,21 @@
|
||||
<template>
|
||||
<!-- 悬浮按钮 -->
|
||||
<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
|
||||
<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
|
||||
|
||||
<!-- AI智能助手 -->
|
||||
<view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
|
||||
<text class="ai-icon" v-if="!aiAgentimg">🤖</text>
|
||||
<!-- 未读消息小红点 -->
|
||||
<view v-if="unreadCount > 0" class="unread-badge">
|
||||
<text class="badge-text">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '120rpx' : '120rpx' }">
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
|
||||
<button
|
||||
class="btn-item"
|
||||
v-if="fixBtnShow"
|
||||
hoverClass="none"
|
||||
openType="contact"
|
||||
sessionFrom="weapp"
|
||||
showMessageCard="true"
|
||||
:style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}"
|
||||
>
|
||||
<text class="icox icox-kefu" v-if="!kefuimg"></text>
|
||||
<!-- <view>首页</view> -->
|
||||
</button>
|
||||
<!-- #endif -->
|
||||
|
||||
<!-- 电话 -->
|
||||
<view class="btn-item" v-if="fixBtnShow" @click="call()" :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
|
||||
<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
|
||||
<!-- <view>我的</view> -->
|
||||
</view>
|
||||
|
||||
<!-- <view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
|
||||
<text class="iconfont icon-unfold"></text>
|
||||
</view>
|
||||
<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
|
||||
@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
|
||||
<view class="">快捷</view>
|
||||
<view>导航</view>
|
||||
</view> -->
|
||||
<!-- 其他按钮(AI 和 电话)已隐藏 -->
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -51,9 +34,9 @@
|
||||
return {
|
||||
pageCount: 0,
|
||||
fixBtnShow: true,
|
||||
tel:'',
|
||||
kefuimg:'',
|
||||
phoneimg:''
|
||||
tel: '',
|
||||
kefuimg: '',
|
||||
phoneimg: ''
|
||||
};
|
||||
},
|
||||
created() {
|
||||
@@ -61,15 +44,13 @@
|
||||
this.phoneimg = this.$util.getDefaultImage().phone
|
||||
this.pageCount = getCurrentPages().length;
|
||||
|
||||
|
||||
var that = this
|
||||
uni.getStorage({
|
||||
key:'shopInfo',
|
||||
success(e){
|
||||
key: 'shopInfo',
|
||||
success(e) {
|
||||
that.tel = e.data.mobile
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
@@ -77,13 +58,13 @@
|
||||
'aiUnreadCount'
|
||||
]),
|
||||
aiAgentimg() {
|
||||
return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
|
||||
return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || ''
|
||||
},
|
||||
unreadCount() {
|
||||
return this.aiUnreadCount
|
||||
},
|
||||
enableAIChat() {
|
||||
return this.globalAIAgentConfig?.enable || true // 是否开启AI智能助手
|
||||
return this.globalAIAgentConfig?.enable || true
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
@@ -91,22 +72,20 @@
|
||||
'setAiUnreadCount'
|
||||
]),
|
||||
|
||||
//拨打电话
|
||||
call(){
|
||||
// 拨打电话(已无调用,可保留或删除)
|
||||
call() {
|
||||
uni.makePhoneCall({
|
||||
phoneNumber:this.tel+''
|
||||
phoneNumber: this.tel + ''
|
||||
})
|
||||
},
|
||||
|
||||
// 打开AI聊天弹窗
|
||||
// 打开AI聊天(已无调用,可保留或删除)
|
||||
openAIChat() {
|
||||
if (this.enableAIChat) {
|
||||
this.setAiUnreadCount(0);
|
||||
}
|
||||
|
||||
this.$util.redirectTo('/pages_tool/ai-chat/index')
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@@ -137,8 +116,6 @@
|
||||
right: 0rpx;
|
||||
bottom: 200rpx;
|
||||
z-index: 10;
|
||||
// background: #fff;
|
||||
// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
|
||||
border-radius: 120rpx;
|
||||
padding: 20rpx 0;
|
||||
display: flex;
|
||||
@@ -177,14 +154,12 @@
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
&.switch {}
|
||||
|
||||
&.icon-xiala {
|
||||
margin: 0;
|
||||
margin-top: 0.1rpx;
|
||||
}
|
||||
|
||||
// 未读消息小红点
|
||||
// 未读消息小红点(已无使用,可保留样式)
|
||||
.unread-badge {
|
||||
position: absolute;
|
||||
top: -5rpx;
|
||||
|
||||
@@ -9,29 +9,25 @@
|
||||
</view>
|
||||
<scroll-view scroll-y="true" class="popup-body">
|
||||
<view class="pay-money">
|
||||
<text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
|
||||
<text class="money">支付金额{{ payMoney|moneyFormat }}元</text>
|
||||
</view>
|
||||
|
||||
<view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
|
||||
<view class="iconfont icon-yue"></view>
|
||||
<view class="info-wrap">
|
||||
<text class="name">余额抵扣</text>
|
||||
<view class="money">可用¥{{ balanceDeduct | moneyFormat }}</view>
|
||||
<text class="name">余额支付</text>
|
||||
<view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view>
|
||||
</view>
|
||||
<ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
|
||||
</view>
|
||||
<block v-if="payMoney > 0">
|
||||
<block v-if="payTypeList.length">
|
||||
<block v-for="(item, index) in payTypeList">
|
||||
<view v-if="offlineShow || item.type != 'offlinepay'" class="payment-item" :key="index"
|
||||
@click="payIndex = index">
|
||||
<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
|
||||
<view class="iconfont" :class="item.icon"></view>
|
||||
<text class="name">{{ item.name }}</text>
|
||||
<text class="iconfont"
|
||||
:class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
|
||||
<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
|
||||
</view>
|
||||
</block>
|
||||
</block>
|
||||
<block v-else>
|
||||
<view class="empty">平台尚未配置支付方式!</view>
|
||||
</block>
|
||||
@@ -47,19 +43,16 @@
|
||||
|
||||
<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
|
||||
<script>
|
||||
import uniPopup from '@/components/uni-popup/uni-popup.vue';
|
||||
import nsSwitch from '@/components/ns-switch/ns-switch.vue';
|
||||
import uniPopup from '@/components/uni-popup/uni-popup.vue';
|
||||
import nsSwitch from '@/components/ns-switch/ns-switch.vue';
|
||||
|
||||
// #ifdef H5
|
||||
import {
|
||||
// #ifdef H5
|
||||
import {
|
||||
Weixin
|
||||
} from 'common/js/wx-jssdk.js';
|
||||
// #endif
|
||||
} from 'common/js/wx-jssdk.js';
|
||||
// #endif
|
||||
|
||||
// 引入统一支付工具类
|
||||
import { invokeWechatPay, invokeAlipay, invokeHuaweiPay } from '../../common/js/payCore.js';
|
||||
|
||||
export default {
|
||||
export default {
|
||||
name: 'payment',
|
||||
components: {
|
||||
uniPopup,
|
||||
@@ -70,51 +63,47 @@ export default {
|
||||
balanceUsable: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
payIndex: 0,
|
||||
payTypeList: [
|
||||
// #ifdef H5 || MP-ALIPAY
|
||||
{
|
||||
// #ifdef H5
|
||||
payTypeList: [{
|
||||
name: '支付宝支付',
|
||||
icon: 'icon-zhifubaozhifu-',
|
||||
type: 'alipay'
|
||||
},
|
||||
// #endif
|
||||
// #ifdef H5 || MP-WEIXIN
|
||||
{
|
||||
name: '微信支付',
|
||||
icon: 'icon-weixin1',
|
||||
type: 'wechatpay'
|
||||
},
|
||||
// #endif
|
||||
// #ifdef H5 || QUICKAPP-HUAWEI
|
||||
{
|
||||
name: '华为支付',
|
||||
icon: 'icon-zhekou',
|
||||
type: 'huaweipay'
|
||||
},
|
||||
// #endif
|
||||
{
|
||||
name: '线下支付',
|
||||
icon: 'icondiy icon-yuezhifu',
|
||||
type: 'offlinepay'
|
||||
},
|
||||
}
|
||||
],
|
||||
// #ifdef H5
|
||||
timer: null,
|
||||
// #endif
|
||||
// #ifdef MP-WEIXIN
|
||||
payTypeList: [{
|
||||
name: '微信支付',
|
||||
provider: 'wxpay',
|
||||
icon: 'icon-weixin1',
|
||||
type: 'wechatpay'
|
||||
}],
|
||||
// #endif
|
||||
// #ifdef MP-ALIPAY
|
||||
payTypeList: [{
|
||||
name: '支付宝支付',
|
||||
icon: 'icon-zhifubaozhifu-',
|
||||
type: 'alipay',
|
||||
provider: 'alipay'
|
||||
}],
|
||||
// #endif
|
||||
payInfo: null,
|
||||
balanceConfig: 0,
|
||||
// 预售页面判断
|
||||
sale: true,
|
||||
isBalance: 0,
|
||||
balance: 0,
|
||||
//重置是否已完成,没有完成不能调用api/pay/pay
|
||||
resetPayComplete: true,
|
||||
repeatFlag: false,
|
||||
balance: 0
|
||||
};
|
||||
},
|
||||
created(e) {
|
||||
@@ -138,32 +127,9 @@ export default {
|
||||
}
|
||||
}
|
||||
return money;
|
||||
},
|
||||
offlineShow() {
|
||||
// 获取当前页面栈实例数组
|
||||
const pages = getCurrentPages();
|
||||
const currentPage = pages[pages.length - 1];
|
||||
// 获取页面路由路径
|
||||
let routePath = currentPage.route;
|
||||
return this.$store.state.offlineWhiteList.length ? this.$store.state.offlineWhiteList.includes(routePath) : false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* 父级页面onShow调用
|
||||
*/
|
||||
pageShow() {
|
||||
if (this.payInfo) {
|
||||
let offlinepay = uni.getStorageSync('offlinepay');
|
||||
if (offlinepay) {
|
||||
uni.removeStorageSync('offlinepay');
|
||||
this.close()
|
||||
}
|
||||
} else {
|
||||
uni.removeStorageSync('offlinepay');
|
||||
}
|
||||
|
||||
},
|
||||
close() {
|
||||
this.$emit('close');
|
||||
this.$refs.choosePaymentPopup.close();
|
||||
@@ -180,22 +146,14 @@ export default {
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (this.resetPayComplete == false) {
|
||||
this.$util.showToast({
|
||||
title: '支付取消中,请稍后再试!'
|
||||
});
|
||||
return;
|
||||
}
|
||||
uni.showLoading({
|
||||
title: '支付中...',
|
||||
mask: true
|
||||
});
|
||||
if (this.repeatFlag) return;
|
||||
this.repeatFlag = true;
|
||||
this.pay();
|
||||
uni.setStorageSync('pay_flag', 1);
|
||||
},
|
||||
getPayInfo(out_trade_no, callback) {
|
||||
getPayInfo(out_trade_no) {
|
||||
this.$api.sendRequest({
|
||||
url: '/api/pay/info',
|
||||
data: {
|
||||
@@ -207,7 +165,6 @@ export default {
|
||||
if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
|
||||
setTimeout(() => {
|
||||
this.$refs.choosePaymentPopup.open();
|
||||
if (typeof callback == 'function') callback();
|
||||
})
|
||||
} else {
|
||||
this.$util.showToast({
|
||||
@@ -221,6 +178,7 @@ export default {
|
||||
* 获取余额配置
|
||||
*/
|
||||
getBalanceConfig() {
|
||||
|
||||
this.$api.sendRequest({
|
||||
url: '/api/pay/getBalanceConfig',
|
||||
data: {},
|
||||
@@ -238,6 +196,10 @@ export default {
|
||||
success: res => {
|
||||
if (res.code == 0 && res.data) {
|
||||
this.balance = parseFloat(res.data.usable_balance);
|
||||
//余额不足以抵扣整个订单时不显示
|
||||
if(parseFloat(this.payMoney) > this.balance){
|
||||
this.balanceConfig = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -253,8 +215,10 @@ export default {
|
||||
if (res.data.pay_type == '') {
|
||||
this.payTypeList = [];
|
||||
} else {
|
||||
this.payTypeList = this.payTypeList.filter((val, key) => {
|
||||
return res.data.pay_type.indexOf(val.type) != -1
|
||||
this.payTypeList.forEach((val, key) => {
|
||||
if (res.data.pay_type.indexOf(val.type) == -1) {
|
||||
this.payTypeList.splice(key, 1);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -264,86 +228,105 @@ export default {
|
||||
// #ifdef H5
|
||||
pay() {
|
||||
var payType = this.payTypeList[this.payIndex];
|
||||
if (!payType || payType.type === 'offlinepay') {
|
||||
// 线下支付仍使用原有逻辑
|
||||
this.payOffline();
|
||||
var return_url = '';
|
||||
if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
|
||||
return_url = '/pages_promotion/blindbox/index?outTradeNo=';
|
||||
} else {
|
||||
return_url = '/pages_tool/pay/result?code=';
|
||||
}
|
||||
this.$api.sendRequest({
|
||||
url: '/api/pay/pay',
|
||||
data: {
|
||||
out_trade_no: this.payInfo.out_trade_no,
|
||||
pay_type: payType ? payType.type : '',
|
||||
return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo
|
||||
.out_trade_no),
|
||||
is_balance: this.isBalance
|
||||
},
|
||||
success: res => {
|
||||
uni.hideLoading();
|
||||
if (res.code >= 0) {
|
||||
if (res.data.pay_success) {
|
||||
this.paySuccess();
|
||||
return;
|
||||
}
|
||||
|
||||
// 使用统一支付工具类进行支付
|
||||
this.invokeUnifiedPay(payType.type);
|
||||
},
|
||||
|
||||
/**
|
||||
* 统一支付调用方法(使用新的支付工具类)
|
||||
*/
|
||||
async invokeUnifiedPay(payType) {
|
||||
try {
|
||||
let payResult;
|
||||
const amount = this.payMoney;
|
||||
const outTradeNo = this.payInfo.out_trade_no;
|
||||
const subject = '订单支付';
|
||||
|
||||
// 根据支付类型调用对应的支付方法
|
||||
switch (payType) {
|
||||
case 'wechatpay':
|
||||
payResult = await invokeWechatPay(outTradeNo, amount, subject);
|
||||
break;
|
||||
switch (payType.type) {
|
||||
case 'alipay':
|
||||
payResult = await invokeAlipay(outTradeNo, amount, subject);
|
||||
break;
|
||||
case 'huaweipay':
|
||||
payResult = await invokeHuaweiPay(outTradeNo, amount, subject);
|
||||
break;
|
||||
default:
|
||||
throw new Error('不支持的支付方式');
|
||||
}
|
||||
|
||||
// 处理H5支付跳转
|
||||
if (payResult.code === 0 && payResult.data?.payUrl) {
|
||||
// H5端直接跳转,其他端需要在WebView中显示
|
||||
const systemInfo = uni.getSystemInfoSync();
|
||||
if (systemInfo.platform === 'web') {
|
||||
window.location.href = payResult.data.payUrl;
|
||||
this.checkPayStatus();
|
||||
if (this.$util.isWeiXin()) {
|
||||
var wx_alipay = encodeURIComponent(res.data.data);
|
||||
this.$util.redirectTo('/pages_tool/pay/wx_pay', {
|
||||
wx_alipay: wx_alipay,
|
||||
out_trade_no: this.payInfo.out_trade_no
|
||||
}, '', 'redirectTo');
|
||||
} else {
|
||||
// 微信小程序/华为快应用中显示WebView
|
||||
this.showPayWebView(payResult.data.payUrl);
|
||||
location.href = res.data.data;
|
||||
this.checkPayStatus();
|
||||
}
|
||||
} else if (payResult.code === 0) {
|
||||
// 原生支付成功
|
||||
break;
|
||||
case 'wechatpay':
|
||||
if (this.$util.isWeiXin()) {
|
||||
if (uni.getSystemInfoSync().platform == 'ios') {
|
||||
var url = uni.getStorageSync('initUrl');
|
||||
} else {
|
||||
var url = location.href;
|
||||
}
|
||||
// 获取jssdk配置
|
||||
this.$api.sendRequest({
|
||||
url: '/wechat/api/wechat/jssdkconfig',
|
||||
data: {
|
||||
url: url
|
||||
},
|
||||
success: jssdkRes => {
|
||||
var wxJS = new Weixin(),
|
||||
payData = res.data.data;
|
||||
wxJS.init(jssdkRes.data);
|
||||
wxJS.pay({
|
||||
timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
|
||||
nonceStr: payData.nonceStr,
|
||||
package: payData.package,
|
||||
signType: payData.signType,
|
||||
paySign: payData.paySign
|
||||
},
|
||||
res => {
|
||||
if (res.errMsg == 'chooseWXPay:ok') {
|
||||
this.paySuccess();
|
||||
} else {
|
||||
throw new Error(payResult.msg || '支付失败');
|
||||
}
|
||||
} catch (error) {
|
||||
this.repeatFlag = false;
|
||||
this.$util.showToast({
|
||||
title: error.message || '支付失败'
|
||||
title: res.errMsg
|
||||
});
|
||||
setTimeout(() => {
|
||||
this.close();
|
||||
}, 1500)
|
||||
}
|
||||
},
|
||||
res => {
|
||||
this.$util.showToast({
|
||||
title: '您已取消支付'
|
||||
});
|
||||
this.resetpay();
|
||||
}
|
||||
);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
location.href = res.data.url;
|
||||
this.checkPayStatus();
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
this.$util.showToast({
|
||||
title: res.message
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 显示支付WebView(用于微信小程序/华为快应用的H5支付)
|
||||
*/
|
||||
showPayWebView(payUrl) {
|
||||
// 这里可以打开一个新的WebView页面来显示支付
|
||||
// 或者使用现有的跳转逻辑
|
||||
this.$util.redirectTo('/pages/Pay/Pay', {
|
||||
payUrl: payUrl,
|
||||
outTradeNo: this.payInfo.out_trade_no
|
||||
fail: res => {
|
||||
uni.hideLoading();
|
||||
this.$util.showToast({
|
||||
title: 'request:fail'
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 线下支付处理(保留原有逻辑)
|
||||
*/
|
||||
payOffline() {
|
||||
this.$util.redirectTo('/pages_tool/pay/offlinepay', {
|
||||
outTradeNo: this.payInfo.out_trade_no
|
||||
}
|
||||
});
|
||||
this.repeatFlag = false;
|
||||
},
|
||||
checkPayStatus() {
|
||||
this.timer = setInterval(() => {
|
||||
@@ -369,17 +352,94 @@ export default {
|
||||
// #ifdef MP
|
||||
pay() {
|
||||
var payType = this.payTypeList[this.payIndex];
|
||||
if (!payType || payType.type === 'offlinepay') {
|
||||
// 线下支付仍使用原有逻辑
|
||||
this.$util.redirectTo('/pages_tool/pay/offlinepay', {
|
||||
outTradeNo: this.payInfo.out_trade_no
|
||||
});
|
||||
this.repeatFlag = false;
|
||||
this.$api.sendRequest({
|
||||
url: '/api/pay/pay',
|
||||
data: {
|
||||
out_trade_no: this.payInfo.out_trade_no,
|
||||
pay_type: payType ? payType.type : '',
|
||||
scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene,
|
||||
is_balance: this.isBalance
|
||||
},
|
||||
success: res => {
|
||||
uni.hideLoading();
|
||||
if (res.code >= 0) {
|
||||
if (res.data.pay_success) {
|
||||
this.paySuccess();
|
||||
return;
|
||||
}
|
||||
var payData = res.data.data;
|
||||
|
||||
// 小程序端也使用统一支付工具类
|
||||
this.invokeUnifiedPay(payType.type);
|
||||
// #ifdef MP-WEIXIN
|
||||
var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
|
||||
if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
|
||||
uni.requestOrderPayment({
|
||||
timeStamp: payData.timeStamp,
|
||||
nonceStr: payData.nonceStr,
|
||||
package: payData.package,
|
||||
signType: payData.signType,
|
||||
paySign: payData.paySign,
|
||||
success: res => {
|
||||
this.paySuccess();
|
||||
},
|
||||
fail: res => {
|
||||
this.flag = false;
|
||||
if (res.errMsg == 'requestOrderPayment:fail cancel') {
|
||||
this.$util.showToast({
|
||||
title: '您已取消支付'
|
||||
});
|
||||
this.resetpay();
|
||||
} else {
|
||||
uni.showModal({
|
||||
content: '支付失败,失败原因: ' + res.errMsg,
|
||||
showCancel: false
|
||||
});
|
||||
setTimeout(() => {
|
||||
this.close();
|
||||
}, 1500)
|
||||
}
|
||||
}
|
||||
});
|
||||
return
|
||||
}
|
||||
// #endif
|
||||
|
||||
uni.requestPayment({
|
||||
provider: payType.provider,
|
||||
...payData,
|
||||
success: res => {
|
||||
this.paySuccess();
|
||||
},
|
||||
fail: res => {
|
||||
this.flag = false;
|
||||
if (res.errMsg == 'requestPayment:fail cancel') {
|
||||
this.$util.showToast({
|
||||
title: '您已取消支付'
|
||||
});
|
||||
this.resetpay();
|
||||
} else {
|
||||
uni.showModal({
|
||||
content: '支付失败,失败原因: ' + res.errMsg,
|
||||
showCancel: false
|
||||
});
|
||||
setTimeout(() => {
|
||||
this.close();
|
||||
}, 1500)
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this.$util.showToast({
|
||||
title: res.message
|
||||
});
|
||||
}
|
||||
},
|
||||
fail: res => {
|
||||
uni.hideLoading();
|
||||
this.$util.showToast({
|
||||
title: 'request:fail'
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
// #endif
|
||||
/**
|
||||
@@ -403,23 +463,13 @@ export default {
|
||||
* 重置支付单据
|
||||
*/
|
||||
resetpay() {
|
||||
this.resetPayComplete = false;
|
||||
this.$api.sendRequest({
|
||||
url: '/api/pay/resetpay',
|
||||
data: {
|
||||
out_trade_no: this.payInfo.out_trade_no,
|
||||
},
|
||||
success: res => {
|
||||
if (res.code == 0) {
|
||||
this.getPayInfo(res.data, () => {
|
||||
this.resetPayComplete = true;
|
||||
});
|
||||
} else {
|
||||
this.resetPayComplete = true;
|
||||
}
|
||||
},
|
||||
fail: res => {
|
||||
this.resetPayComplete = true;
|
||||
if (res.code == 0) this.getPayInfo(res.data);
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -429,11 +479,11 @@ export default {
|
||||
clearInterval(this.timer);
|
||||
},
|
||||
// #endif
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.popup {
|
||||
.popup {
|
||||
width: 75vw;
|
||||
background: #fff;
|
||||
border-top-left-radius: $border-radius;
|
||||
@@ -488,9 +538,9 @@ export default {
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.choose-payment-popup {
|
||||
.choose-payment-popup {
|
||||
.payment-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -520,16 +570,10 @@ export default {
|
||||
color: #24af41;
|
||||
}
|
||||
|
||||
.icon-yuezhifu {
|
||||
color: #f9a647;
|
||||
}
|
||||
|
||||
.icon-zhifubaozhifu- {
|
||||
color: #00a0e9;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.icon-checkboxblank {
|
||||
font-size: 40rpx;
|
||||
color: $color-line;
|
||||
@@ -598,13 +642,13 @@ export default {
|
||||
font-size: $font-size-toolbar;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.empty {
|
||||
.empty {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
padding: 40rpx 0;
|
||||
color: $color-sub;
|
||||
font-size: $font-size-tag;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -11,7 +11,7 @@ export const lang = {
|
||||
home:'首页',
|
||||
cart:'购物车',
|
||||
leave:'立即留言',
|
||||
make:'立即支付',
|
||||
make:'立即咨询',
|
||||
|
||||
send:'配送',
|
||||
express:'快递发货',
|
||||
|
||||
@@ -54,6 +54,8 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
/* 快应用特有相关 */
|
||||
"quickapp" : {},
|
||||
/* 小程序特有相关 */
|
||||
"mp-weixin" : {
|
||||
"appid" : "wxa8f94045d9c2fc10",
|
||||
@@ -124,12 +126,5 @@
|
||||
"uniStatistics" : {
|
||||
"version" : "2"
|
||||
},
|
||||
"sassImplementationName" : "node-sass",
|
||||
/** 快应用配置 **/
|
||||
"quickapp-webview" : {
|
||||
"package" : "com.jieganfsj.fivegshop",
|
||||
"minPlatformVersion" : 1070,
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : 0
|
||||
}
|
||||
"sassImplementationName" : "node-sass"
|
||||
}
|
||||
|
||||
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
|
||||
var jweixin = require('jweixin-module')
|
||||
jweixin.ready(function(){
|
||||
var wx = require('jweixin-module')
|
||||
wx.ready(function(){
|
||||
// TODO
|
||||
});
|
||||
```
|
||||
|
||||
58
node_modules/jweixin-module/package.json
generated
vendored
58
node_modules/jweixin-module/package.json
generated
vendored
@@ -1,13 +1,42 @@
|
||||
{
|
||||
"_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",
|
||||
"version": "1.6.0",
|
||||
"description": "微信JS-SDK",
|
||||
"main": "lib/index.js",
|
||||
"scripts": {},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/zhetengbiji/jweixin-module.git"
|
||||
"escapedName": "jweixin-module",
|
||||
"rawSpec": "",
|
||||
"saveSpec": null,
|
||||
"fetchSpec": "latest"
|
||||
},
|
||||
"_requiredBy": [
|
||||
"#USER",
|
||||
"/"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
|
||||
"_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
|
||||
"_spec": "jweixin-module",
|
||||
"_where": "E:\\demo\\niushop_uniapp",
|
||||
"author": {
|
||||
"name": "Shengqiang Guo"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/zhetengbiji/jweixin-module/issues"
|
||||
},
|
||||
"bundleDependencies": false,
|
||||
"deprecated": false,
|
||||
"description": "微信JS-SDK",
|
||||
"devDependencies": {
|
||||
"textfile": "^1.2.0",
|
||||
"uglify-js": "^3.4.9"
|
||||
},
|
||||
"homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
|
||||
"keywords": [
|
||||
"wxjssdk",
|
||||
"weixin",
|
||||
@@ -16,11 +45,16 @@
|
||||
"jssdk",
|
||||
"wx"
|
||||
],
|
||||
"author": "Shengqiang Guo",
|
||||
"license": "ISC",
|
||||
"bugs": {
|
||||
"url": "https://github.com/zhetengbiji/jweixin-module/issues"
|
||||
"main": "out/index.js",
|
||||
"name": "jweixin-module",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/zhetengbiji/jweixin-module.git"
|
||||
},
|
||||
"homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
|
||||
"devDependencies": {}
|
||||
"scripts": {
|
||||
"build": "node build",
|
||||
"prepublish": "npm run build"
|
||||
},
|
||||
"version": "1.4.1"
|
||||
}
|
||||
|
||||
28
package-lock.json
generated
28
package-lock.json
generated
@@ -1,23 +1,13 @@
|
||||
{
|
||||
"name": "frontend",
|
||||
"name": "uniappsaas",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
|
||||
"jweixin-module": "^1.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"terser-webpack-plugin": "^5.3.10"
|
||||
}
|
||||
},
|
||||
"node_modules/@dcloudio/uni-quickapp-webview": {
|
||||
"version": "2.0.2-4080420251103001",
|
||||
"resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
|
||||
"integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ==",
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@jridgewell/gen-mapping": {
|
||||
"version": "0.3.5",
|
||||
"resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
|
||||
@@ -629,12 +619,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/jweixin-module": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
|
||||
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/loader-runner": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
|
||||
@@ -1000,11 +984,6 @@
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@dcloudio/uni-quickapp-webview": {
|
||||
"version": "2.0.2-4080420251103001",
|
||||
"resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
|
||||
"integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ=="
|
||||
},
|
||||
"@jridgewell/gen-mapping": {
|
||||
"version": "0.3.5",
|
||||
"resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
|
||||
@@ -1477,11 +1456,6 @@
|
||||
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
|
||||
"dev": true
|
||||
},
|
||||
"jweixin-module": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
|
||||
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
|
||||
},
|
||||
"loader-runner": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
"terser-webpack-plugin": "^5.3.10"
|
||||
},
|
||||
"dependencies": {
|
||||
"@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
|
||||
"jweixin-module": "^1.6.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +104,14 @@
|
||||
"navigationStyle": "custom"
|
||||
// #endif
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/dify-chat/dify-chat",
|
||||
"style": {
|
||||
"navigationBarTitleText": "智能客服"
|
||||
}
|
||||
}
|
||||
|
||||
],
|
||||
"subPackages": [
|
||||
{
|
||||
|
||||
20
pages/dify-chat/dify-chat.vue
Normal file
20
pages/dify-chat/dify-chat.vue
Normal file
@@ -0,0 +1,20 @@
|
||||
<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,3 +1,4 @@
|
||||
|
||||
<template>
|
||||
<page-meta :page-style="themeColor"></page-meta>
|
||||
<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
|
||||
@@ -121,7 +122,7 @@
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
<hover-nav></hover-nav>
|
||||
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<!-- 小程序隐私协议 -->
|
||||
<privacy-popup ref="privacyPopup"></privacy-popup>
|
||||
@@ -129,6 +130,8 @@
|
||||
<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
|
||||
<ns-login ref="login"></ns-login>
|
||||
</view>
|
||||
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -146,8 +149,17 @@
|
||||
nsNavbar,
|
||||
toTop
|
||||
},
|
||||
mixins: [diyJs, scroll, indexJs]
|
||||
mixins: [diyJs, scroll, indexJs],
|
||||
methods: { // ← 新增 methods
|
||||
openDifyChat() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/dify-chat/dify-chat'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
@@ -232,5 +244,23 @@
|
||||
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>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -49,7 +49,7 @@
|
||||
"disableSWC": true
|
||||
},
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "2.16.1",
|
||||
"libVersion": "3.12.0",
|
||||
"appid": "wx29215aa1bd97bbd6",
|
||||
"projectname": "niushop_b2c_v4_uniapp",
|
||||
"isGameTourist": false,
|
||||
|
||||
@@ -58,7 +58,6 @@ const store = new Vuex.Store({
|
||||
cartNumber: 0,
|
||||
cartMoney: 0,
|
||||
cartChange: 0,
|
||||
wechatConfigStatus:0,
|
||||
bottomNavHidden: false, // 底部导航是否隐藏,true:隐藏,false:显示
|
||||
aiUnreadCount: 10, // AI未读消息数量
|
||||
globalAIAgentConfig: null, // AI客服配置
|
||||
@@ -75,21 +74,11 @@ const store = new Vuex.Store({
|
||||
mapConfig: {
|
||||
tencent_map_key: '',
|
||||
wap_is_open: 1,
|
||||
wap_valid_time: 0,
|
||||
},
|
||||
copyright: null,
|
||||
initStatus:false,
|
||||
offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
|
||||
canReceiveRegistergiftInfo: {
|
||||
status: false,
|
||||
path: ''
|
||||
wap_valid_time: 0
|
||||
},
|
||||
copyright: null
|
||||
},
|
||||
mutations: {
|
||||
// 设置是否可以领取新人礼
|
||||
setCanReceiveRegistergiftInfo(state, data) {
|
||||
state.canReceiveRegistergiftInfo = data;
|
||||
},
|
||||
// 设置那些组件展示
|
||||
setDiyGroupShowModule(state, data) {
|
||||
state.diyGroupShowModule = data;
|
||||
@@ -193,19 +182,11 @@ const store = new Vuex.Store({
|
||||
uni.setStorageSync('copyright', value);
|
||||
},
|
||||
setMemberInfo(state, value) {
|
||||
// 会员被锁定后,清除会员登录信息
|
||||
if (value && value.status == 0) {
|
||||
value = null;
|
||||
}
|
||||
state.memberInfo = value;
|
||||
if (value) {
|
||||
uni.setStorageSync('memberInfo', value);
|
||||
} else {
|
||||
// 会员为空时,清除会员登录信息
|
||||
uni.removeStorageSync('memberInfo');
|
||||
this.commit('setToken', '');
|
||||
this.dispatch('emptyCart');
|
||||
//uni.removeStorageSync('authInfo');
|
||||
}
|
||||
},
|
||||
setCartNumber(state, cartNumber) {
|
||||
@@ -220,12 +201,6 @@ const store = new Vuex.Store({
|
||||
setCartMoney(state, value) {
|
||||
state.cartMoney = value;
|
||||
},
|
||||
setInitStatus(state,value){
|
||||
state.initStatus = value
|
||||
},
|
||||
setWechatConfigStatus(state,value){
|
||||
state.wechatConfigStatus = value
|
||||
},
|
||||
// 设置AI未读消息数量
|
||||
setAiUnreadCount(state, value) {
|
||||
state.aiUnreadCount = value;
|
||||
@@ -245,7 +220,6 @@ const store = new Vuex.Store({
|
||||
success: res => {
|
||||
var data = res.data;
|
||||
if (data) {
|
||||
|
||||
this.commit('setThemeStyle', colorList[data.style_theme.name]);
|
||||
|
||||
// 底部导航
|
||||
@@ -266,7 +240,6 @@ const store = new Vuex.Store({
|
||||
this.commit('setGlobalAIAgentConfig', data.ai_agent_config);
|
||||
|
||||
this.commit('setGlobalStoreConfig', data.store_config);
|
||||
this.commit('setWechatConfigStatus',data.wechat_config_status)
|
||||
|
||||
//联系我们
|
||||
|
||||
@@ -279,7 +252,7 @@ const store = new Vuex.Store({
|
||||
this.commit('setDefaultStoreInfo', null);
|
||||
this.commit('setGlobalStoreInfo', null);
|
||||
}
|
||||
this.commit('setInitStatus',true)
|
||||
|
||||
resolve(data);
|
||||
}
|
||||
}
|
||||
@@ -293,7 +266,7 @@ const store = new Vuex.Store({
|
||||
data: {},
|
||||
success: res => {
|
||||
if (res.code == 0) {
|
||||
let list = {};
|
||||
let list = [];
|
||||
let ids = [];
|
||||
let totalMoney = 0;
|
||||
let totalNum = 0;
|
||||
@@ -306,17 +279,16 @@ const store = new Vuex.Store({
|
||||
goods_id: item.goods_id,
|
||||
sku_id: item.sku_id,
|
||||
num: item.num,
|
||||
discount_price: item.discount_price,
|
||||
min_buy: item.min_buy,
|
||||
stock: item.stock,
|
||||
discount_price: item.discount_price
|
||||
};
|
||||
|
||||
if (!list['goods_' + cart.goods_id]) {
|
||||
list['goods_' + cart.goods_id] = {};
|
||||
}
|
||||
list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
|
||||
list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
|
||||
list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
|
||||
list['goods_' + cart.goods_id]['sku_' + cart
|
||||
.sku_id
|
||||
] =
|
||||
cart;
|
||||
ids.push(cart.cart_id);
|
||||
});
|
||||
|
||||
@@ -327,7 +299,8 @@ const store = new Vuex.Store({
|
||||
let item = list[goods][sku];
|
||||
if (typeof item == 'object') {
|
||||
num += item.num;
|
||||
money += parseFloat(item.discount_price) * parseInt(item.num);
|
||||
money += parseFloat(item.discount_price) * parseInt(item
|
||||
.num);
|
||||
}
|
||||
}
|
||||
list[goods].num = num;
|
||||
@@ -338,6 +311,7 @@ const store = new Vuex.Store({
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
this.commit('setCartList', list);
|
||||
|
||||
this.commit('setCartIds', ids);
|
||||
|
||||
Reference in New Issue
Block a user