7 Commits

Author SHA1 Message Date
Zhukj
86e43e3e6c feat:新添加华为支付 2025-12-06 09:16:39 +08:00
Zhukj
bf09d8ad26 feat:新增华为支付 2025-12-06 08:41:52 +08:00
03aa6e099f fix(store): 部分数据初始化错误 2025-12-05 15:47:42 +08:00
4585fb6c07 chore: 保留node_modules\jweixin-module\out\index.js文件 2025-12-04 09:20:29 +08:00
4aeb7d04c4 chore: 添加@dcloudio/uni-quickapp-webview依赖及更新支付组件 2025-12-04 09:18:00 +08:00
Zhukj
067bbf6e2d chore:立即咨询改为立即支付 2025-12-04 08:39:05 +08:00
Zhukj
3cef4b9987 chore: 2025-11-29 17:13:43 +08:00
14 changed files with 2264 additions and 1884 deletions

View File

@@ -14,18 +14,18 @@ try {
// 调试版本,配置说明 // 调试版本,配置说明
const devCfg = { const devCfg = {
// 商户ID // 商户ID
uniacid: 926, //825 uniacid: 1, //825
//api请求地址 //api请求地址
baseUrl: 'https://xcx21.5g-quickapp.com/', baseUrl: 'https://dev.aigc-quickapp.com/',
// baseUrl: 'http://localhost:8010/', // baseUrl: 'http://localhost:8010/',
// 图片域名 // 图片域名
imgDomain: 'https://xcx21.5g-quickapp.com/', imgDomain: 'https://dev.aigc-quickapp.com/',
//imgDomain: 'http://localhost:8010/', //imgDomain: 'http://localhost:8010/',
// H5端域名 // H5端域名
h5Domain: 'https://xcx21.5g-quickapp.com/', h5Domain: 'https://dev.aigc-quickapp.com/',
// h5Domain: 'http://localhost:8010/', // h5Domain: 'http://localhost:8010/',
// // api请求地址 // // api请求地址

152
common/js/huaweiPay.js Normal file
View 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
View 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
View 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

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,7 @@ export const lang = {
home:'首页', home:'首页',
cart:'购物车', cart:'购物车',
leave:'立即留言', leave:'立即留言',
make:'立即咨询', make:'立即支付',
send:'配送', send:'配送',
express:'快递发货', express:'快递发货',

View File

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

View File

@@ -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
}); });
``` ```

View File

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

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

View File

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

View File

@@ -1,75 +1,78 @@
{ {
"description": "项目配置文件", "description": "项目配置文件",
"packOptions": { "packOptions": {
"ignore": [] "ignore": [],
}, "include": []
"setting": { },
"urlCheck": true, "setting": {
"es6": true, "urlCheck": true,
"enhance": false, "es6": true,
"postcss": true, "enhance": false,
"preloadBackgroundData": false, "postcss": true,
"minified": true, "preloadBackgroundData": false,
"newFeature": false, "minified": true,
"coverView": true, "newFeature": false,
"nodeModules": false, "coverView": true,
"autoAudits": false, "nodeModules": false,
"showShadowRootInWxmlPanel": true, "autoAudits": false,
"scopeDataCheck": false, "showShadowRootInWxmlPanel": true,
"uglifyFileName": false, "scopeDataCheck": false,
"checkInvalidKey": true, "uglifyFileName": false,
"checkSiteMap": true, "checkInvalidKey": true,
"uploadWithSourceMap": true, "checkSiteMap": true,
"compileHotReLoad": false, "uploadWithSourceMap": true,
"useMultiFrameRuntime": true, "compileHotReLoad": false,
"useApiHook": true, "useMultiFrameRuntime": true,
"useApiHostProcess": true, "useApiHook": true,
"babelSetting": { "useApiHostProcess": true,
"ignore": [], "babelSetting": {
"disablePlugins": [], "ignore": [],
"outputPath": "" "disablePlugins": [],
}, "outputPath": ""
"enableEngineNative": false, },
"bundle": false, "enableEngineNative": false,
"useIsolateContext": true, "bundle": false,
"useCompilerModule": true, "useIsolateContext": true,
"userConfirmedUseCompilerModuleSwitch": false, "useCompilerModule": true,
"userConfirmedBundleSwitch": false, "userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false, "userConfirmedBundleSwitch": false,
"packNpmRelationList": [], "packNpmManually": false,
"minifyWXSS": true "packNpmRelationList": [],
}, "minifyWXSS": true,
"compileType": "miniprogram", "compileWorklet": false,
"libVersion": "2.16.1", "minifyWXML": true,
"appid": "wx29215aa1bd97bbd6", "localPlugins": false,
"projectname": "niushop_b2c_v4_uniapp", "disableUseStrict": false,
"debugOptions": { "useCompilerPlugins": false,
"hidedInDevtools": [] "condition": false,
}, "swc": false,
"scripts": {}, "disableSWC": true
"staticServerOptions": { },
"baseURL": "", "compileType": "miniprogram",
"servePath": "" "libVersion": "2.16.1",
}, "appid": "wx29215aa1bd97bbd6",
"isGameTourist": false, "projectname": "niushop_b2c_v4_uniapp",
"condition": { "isGameTourist": false,
"search": { "condition": {
"list": [] "search": {
}, "list": []
"conversation": { },
"list": [] "conversation": {
}, "list": []
"game": { },
"list": [] "game": {
}, "list": []
"plugin": { },
"list": [] "plugin": {
}, "list": []
"gamePlugin": { },
"list": [] "gamePlugin": {
}, "list": []
"miniprogram": { },
"list": [] "miniprogram": {
} "list": []
} }
},
"simulatorPluginLibVersion": {},
"editorSetting": {}
} }

View File

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