暂存code
This commit is contained in:
hejiangming
+8
-3
@@ -1,6 +1,6 @@
|
||||
|
||||
export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 正式环境
|
||||
// export const BASE_URL="http://192.168.0.108:8087"; // 超哥本地
|
||||
export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
|
||||
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
|
||||
|
||||
export const PRIVACY_EN="https://www.finecc.net/?Privacy-Agreement/";//隐私协议地址（英文版）
|
||||
export const PRIVACY_CN="https://www.finecc.net/?Privacy/";//隐私协议地址（中文版）
|
||||
@@ -8,4 +8,9 @@ export const PRIVACY_CN="https://www.finecc.net/?Privacy/";//隐私协议地址
|
||||
export const USER_EN="https://www.finecc.net/?FAQ/3421.html";//用户协议（英文版）
|
||||
export const USER_CN="https://www.finecc.net/?wenti/3422.html";//用户协议（中文版）
|
||||
|
||||
export const APPID = "hmuk25aaf86reta9sdwpo";// 用于App分包
|
||||
// 德商汇 测试环境
|
||||
// export const Authorization = "JETZ/vKlEkgrxD4f14YBDNjmh2i2KoPF2ToNtDnIqtHV33tZdyZU8YfMBZV+5OT2cCc5URvFuhE9jCbnDScnjV/QtJMZK57dVWL9nmkByJ1epgDjkOO0w9gN8hVmcnDl8Rt415b2PDfagNmTZ6yThBGEjA+9w4rnkDQxec6SI/EcYDjX5EDQC8WQd3+1jyyfSrVpNOktB1/wlkP9B1VUATCD3agxQG5BrUvLWxiCPre12/mHv2N9cnNbgbu698RaWF2LsvULRGNciS0OJJYaKz7RPCZnA4C34C1m85beBgrrvJUaJtimlB9GU9c9NX5atdc3z/gRbVaEXhv24mpQVA==";
|
||||
|
||||
// 认证平台
|
||||
// 德商汇 正式环境
|
||||
export const Authorization = "bxboAtH04huysyO1DO2E4FNomvQaFItp0gzHRv0aM+Hx4Rb9pijiAlWdRPUtB4HUJrwa1yVGoKFyCmXGZYja9v+GPz+SFVnDJJk/yit2LLMxX85SpnzRzVySJSsDTBLSTrh5BhGPST2iymdcGvQAdNIW9gAQoeDGIr8o3ctgLF08cdJiEQc255Ql7LxdqiHgP/SgY2JUrlGxGzE5iXDETCmXCvBxqbxEzhe4JbgdEMlKjjA0jcFDam0ArHPD2CoHI7WemdJZDw2+OAokFnoSF8dMyt1G9+nHqD40iMcK5bG6BFUNJwVMFgIZvQz5OqotqaNKnq/80UNDyOyeaaj9Lw==";
|
||||
+240
-8
@@ -11,8 +11,8 @@ export function getValue(optionArr, key) {
|
||||
return resultVal;
|
||||
}
|
||||
optionArr.map(item => {
|
||||
if (item.key === key) {
|
||||
resultVal = item.value || item.name;
|
||||
if (item.type === key || item.key === key ) {
|
||||
resultVal = item.value || item.name ;
|
||||
}
|
||||
});
|
||||
return resultVal;
|
||||
@@ -25,13 +25,23 @@ export const SMS_TYPE = {
|
||||
"REGISTER":"register",
|
||||
}
|
||||
|
||||
// 图片类型 common-公共,device-设备,ad-广告
|
||||
// 图片类型 图片分类：COMMON-公共,CATEGORY-商品类目图标,BRAND-品牌LOGO,SHOP-店铺LOGO,GOODS-商品图片,SPECS-商品规格图片
|
||||
export const IMG_TYPE = {
|
||||
"COMMON":"common",
|
||||
"DEVICE":"device",
|
||||
"AD":"ad",
|
||||
"COMMON":"COMMON",
|
||||
"CATEGORY":"CATEGORY",
|
||||
"BRAND":"BRAND",
|
||||
"SHOP":"SHOP",
|
||||
"GOODS":"GOODS",
|
||||
"SPECS":"SPECS",
|
||||
}
|
||||
// 订单的 状态:1-待支付，2-待发货，3-待收货，4-交易成功，5-售后（我加的）
|
||||
export const MINE_ORDER_TYPE = {
|
||||
"UNPAID":1,
|
||||
"UNSHIPPED":2,
|
||||
"NOT_RECEIVE":3,
|
||||
"SUCCEED":4,
|
||||
"AFTER_SALE":5,
|
||||
}
|
||||
|
||||
|
||||
// 订单的 状态:0-待支付，1-支付中，2-待发货，3-待收货，4-交易成功，5-交易关闭
|
||||
export const ORDER_TYPE = {
|
||||
@@ -109,4 +119,226 @@ export const SEARCH_TYPE={
|
||||
NORMAL:0,
|
||||
EXPLOSIVE:1,
|
||||
SOMETHING:2,
|
||||
}
|
||||
}
|
||||
|
||||
export const WAY_LIST = [
|
||||
{
|
||||
disabled:false,
|
||||
id:PAYMENT_WAY.WECHAT,
|
||||
name:"微信支付",
|
||||
path:"/static/product/way_wx.png",
|
||||
},
|
||||
{
|
||||
disabled:false,
|
||||
id:PAYMENT_WAY.ALIPAY,
|
||||
name:"支付宝支付",
|
||||
path:"/static/product/way_zfb.png",
|
||||
},
|
||||
]
|
||||
|
||||
/**
|
||||
* 发货状态 0-无需发货，1-待发货，2-已发货，3-已收货
|
||||
*/
|
||||
export const DELIVER_STATUS = {
|
||||
NO_DELIVERY_REQUIRED:0,
|
||||
AWAIT_DELIVERY_REQUIRED:1,
|
||||
YES_DELIVERY_REQUIRED:2,
|
||||
RECEIVED:3,
|
||||
}
|
||||
|
||||
export const DELIVER_STATUS_ = [
|
||||
{
|
||||
key: 0,
|
||||
value: "无需发货"
|
||||
},{
|
||||
key: 1,
|
||||
value: "待发货"
|
||||
},
|
||||
{
|
||||
key: 2,
|
||||
value: "已发货"
|
||||
},{
|
||||
key: 3,
|
||||
value: "已收货"
|
||||
}
|
||||
];
|
||||
/**
|
||||
* 余额类型：1-消费获得，2-抽奖获得，3-直推获得，4-间推获得，5-极差奖，6-平级奖，7-充值，8-提现，9-支付，10-转出，11-转入，12-兑换，13-释放转出，14-释放转入，15-协议变更，16-买入，17-卖出
|
||||
*/
|
||||
export const BALANCE_TYPE = [
|
||||
{
|
||||
key: 1,
|
||||
value: "消费获得"
|
||||
},
|
||||
{
|
||||
key: 2,
|
||||
value: "抽奖获得"
|
||||
},
|
||||
{
|
||||
key: 3,
|
||||
value: "直推获得"
|
||||
},
|
||||
{
|
||||
key: 4,
|
||||
value: "间推获得"
|
||||
},
|
||||
{
|
||||
key: 5,
|
||||
value: "极差奖"
|
||||
},
|
||||
{
|
||||
key: 6,
|
||||
value: "平级奖"
|
||||
},
|
||||
{
|
||||
key: 7,
|
||||
value: "充值"
|
||||
},
|
||||
{
|
||||
key: 8,
|
||||
value: "提现"
|
||||
},{
|
||||
key: 9,
|
||||
value: "支付"
|
||||
},{
|
||||
key: 10,
|
||||
value: "转出"
|
||||
},{
|
||||
key: 11,
|
||||
value: "转入"
|
||||
},{
|
||||
key: 12,
|
||||
value: "兑换"
|
||||
},{
|
||||
key: 13,
|
||||
value: "释放转出"
|
||||
},{
|
||||
key: 14,
|
||||
value: "释放转入"
|
||||
},
|
||||
{
|
||||
key: 15,
|
||||
value: "协议变更"
|
||||
},
|
||||
{
|
||||
key: 16,
|
||||
value: "买入"
|
||||
},
|
||||
{
|
||||
key: 17,
|
||||
value: "卖出"
|
||||
},
|
||||
{
|
||||
key: 18,
|
||||
value: "系统赠送"
|
||||
},
|
||||
{
|
||||
key: 19,
|
||||
value: "区域代理收益"
|
||||
},
|
||||
]
|
||||
/**
|
||||
* 证状证件类型：1-居民身份证，2-护照
|
||||
*/
|
||||
export const CERT_OPTION= [
|
||||
{
|
||||
key: 1,
|
||||
value: "居民身份证"
|
||||
},{
|
||||
key: 2,
|
||||
value: "护照"
|
||||
},
|
||||
]
|
||||
|
||||
/**
|
||||
* 实名认证状态：0-未认证，1-审核中，2-已认证，3-认证失败
|
||||
*/
|
||||
export const CERT_STATUS_OPTION= [
|
||||
{
|
||||
key: 0,
|
||||
value: "未认证"
|
||||
},{
|
||||
key: 1,
|
||||
value: "审核中"
|
||||
},{
|
||||
key: 2,
|
||||
value: "已认证"
|
||||
},{
|
||||
key: 3,
|
||||
value: "认证失败"
|
||||
},
|
||||
]
|
||||
/**
|
||||
* 账户类别
|
||||
* @type {[{value: string, key: number},{value: string, key: number},{value: string, key: number},{value: string, key: number},{value: string, key: number},null,null]}
|
||||
*/
|
||||
export const ACCOUNT_CATEGORY = [
|
||||
{
|
||||
key: "expend",
|
||||
value: "贡献值"
|
||||
},
|
||||
{
|
||||
key: "raffle",
|
||||
value: "抽奖次数"
|
||||
},
|
||||
{
|
||||
key: "exchange",
|
||||
value: "兑换券"
|
||||
},
|
||||
{
|
||||
key: "deduction",
|
||||
value: "抵扣券"
|
||||
},
|
||||
{
|
||||
key: "vcoin",
|
||||
value: "交易币"
|
||||
},
|
||||
{
|
||||
key: "bonus",
|
||||
value: "推荐佣金"
|
||||
},
|
||||
{
|
||||
key: "redpacket",
|
||||
value: "现金红包"
|
||||
},
|
||||
{
|
||||
key: "balance",
|
||||
value: "现金余额"
|
||||
}
|
||||
];
|
||||
/**
|
||||
* 账户类型
|
||||
* @type {[{value: string, key: number},{value: string, key: number},{value: string, key: number},{value: string, key: number},{value: string, key: number},null,null]}
|
||||
*/
|
||||
export const ACCOUNT_TYPE = [
|
||||
{
|
||||
key: "lock",
|
||||
value: "锁定账户"
|
||||
},
|
||||
{
|
||||
key: "current",
|
||||
value: "活期账户"
|
||||
},
|
||||
{
|
||||
key: "quicken",
|
||||
value: "加速释放账户"
|
||||
}
|
||||
];
|
||||
|
||||
/**
|
||||
* 提现结果：1-已打款，2-拒绝
|
||||
* @type {[{value: string, key: number},{value: string, key: number}]}
|
||||
*/
|
||||
export const FINANCE_WITHDRAWAL_STATUS = [
|
||||
{
|
||||
key: 0,
|
||||
value: "审核中"
|
||||
}, {
|
||||
key: 1,
|
||||
value: "已打款"
|
||||
},
|
||||
{
|
||||
key: 2,
|
||||
value: "拒绝"
|
||||
},
|
||||
]
|
||||
@@ -275,4 +275,71 @@ export function assembleAddress(addressObj){
|
||||
resutlObj.ids=ids.join(",");
|
||||
resutlObj.names=names.join(" ");
|
||||
return resutlObj;
|
||||
}
|
||||
|
||||
export function handleAmount(amount){
|
||||
let currentAmount = parseFloat(amount) || 0;
|
||||
if(amount && amount>0){
|
||||
currentAmount = "+"+currentAmount;
|
||||
}
|
||||
|
||||
return currentAmount;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取后四位银行卡号
|
||||
* @param {Object} number
|
||||
*/
|
||||
export function getBankNumber(number){
|
||||
let currentAmount = number || '';
|
||||
if(number && number.length > 4){
|
||||
currentAmount = currentAmount.slice(-4);
|
||||
}
|
||||
return currentAmount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 加密银行卡号
|
||||
* @param {Object} cardNumber
|
||||
*/
|
||||
export function encipherBankNumber(cardNumber){
|
||||
if (cardNumber.length <= 8) {
|
||||
return cardNumber;
|
||||
}
|
||||
const firstFour = cardNumber.slice(0, 4); // 获取前四位
|
||||
const lastFour = cardNumber.slice(-4); // 获取后四位
|
||||
const mask = '****'; // 替换中间的字符
|
||||
const maskedCard = firstFour + ' '+mask + ' '+lastFour; // 拼接字符串
|
||||
return maskedCard;
|
||||
}
|
||||
|
||||
/**
|
||||
* 版本号名比较是否需要升级
|
||||
* 返回 true 表示需要升级
|
||||
* @param {Object} reqV 之前
|
||||
* @param {Object} curV 当前最新
|
||||
*/
|
||||
export function comparisonVersionHandler(reqV, curV){
|
||||
|
||||
if (curV && reqV) {
|
||||
curV = String(curV);
|
||||
reqV = String(reqV);
|
||||
//将两个版本号拆成数字
|
||||
let arr1 = curV.split('.'), //當前
|
||||
arr2 = reqV.split('.');
|
||||
let minLength = Math.min(arr1.length, arr2.length),
|
||||
position = 0,
|
||||
diff = 0;
|
||||
//依次比较版本号每一位大小，当对比得出结果后跳出循环
|
||||
while (position < minLength && ((diff = parseInt(arr1[position]) - parseInt(arr2[position])) == 0)) {
|
||||
position++;
|
||||
}
|
||||
diff = (diff != 0) ? diff : (arr1.length - arr2.length);
|
||||
//若curV大于reqV，则返回true
|
||||
return diff > 0;
|
||||
} else {
|
||||
//输入为空
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+34
-15
@@ -1,27 +1,30 @@
|
||||
import {getStorageFun,TOKEN_NAME} from './auth.js';
|
||||
import qs from "qs";
|
||||
import { BASE_URL } from '@/utils/config.js'
|
||||
import { BASE_URL,Authorization } from '@/utils/config.js'
|
||||
|
||||
// utils/http.js (修改后的版本)
|
||||
// const baseUrl = 'http://192.168.0.108:8087';
|
||||
|
||||
function request(options) {
|
||||
const { url, method = 'GET', data = {}, headers = {} } = options;
|
||||
const { url, method = 'GET', data = {}, headers = {},isShowLoading=true } = options;
|
||||
|
||||
// const token = uni.getStorageSync(tokenKey); // 获取token, 根据实际情况调整获取方式
|
||||
const token = getStorageFun(TOKEN_NAME); // 获取token, 根据实际情况调整获取方式
|
||||
const defaultHeaders = {
|
||||
// 'HSM-AUTH': token ? token : '', // 如果存在token, 则添加到请求头中
|
||||
"Authorization":Authorization,
|
||||
'HSM-AUTH': token ? token : '', // 如果存在token, 则添加到请求头中
|
||||
'content-type': ['post','POST'].includes(method) ? 'application/x-www-form-urlencoded' : 'application/json',
|
||||
};
|
||||
if(token){
|
||||
defaultHeaders['HSM-AUTH'] = token;
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
// 请求之前做一些事
|
||||
uni.showLoading({
|
||||
title: "加载中...",
|
||||
})
|
||||
if(isShowLoading){
|
||||
// 请求之前做一些事
|
||||
uni.showLoading({
|
||||
title: "加载中...",
|
||||
})
|
||||
}
|
||||
uni.request({
|
||||
url: BASE_URL + url,
|
||||
method,
|
||||
@@ -31,15 +34,30 @@ function request(options) {
|
||||
...headers, // 使用展开运算符合并默认头和自定义头
|
||||
},
|
||||
success: (res) => {
|
||||
uni.hideLoading();
|
||||
const data = res.data;
|
||||
if(isShowLoading){
|
||||
// 请求之前做一些事
|
||||
uni.hideLoading();
|
||||
}
|
||||
|
||||
let data = res.data;
|
||||
if(data && typeof(data) === "string"){
|
||||
data = JSON.parse(data);
|
||||
}
|
||||
if(data.status === 500){
|
||||
uni.showToast({
|
||||
title: "系统异常，请稍后再试",
|
||||
icon: 'none', // 可选 success/loading/none
|
||||
duration: 2000, // 持续时长，单位ms
|
||||
mask: false, // 是否显示透明蒙层，防止触摸穿透
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (data.bizcode === 100) {
|
||||
resolve(data); // 成功时返回数据
|
||||
} else if (data.bizcode === 201) {
|
||||
if([201,200].includes(data.errcode)){
|
||||
uni.showToast({
|
||||
title: '登录失效，请从新登录',
|
||||
title: '登录失效，请重新登录',
|
||||
icon: 'none', // 可选 success/loading/none
|
||||
duration: 2000, // 持续时长，单位ms
|
||||
mask: false, // 是否显示透明蒙层，防止触摸穿透
|
||||
@@ -68,20 +86,21 @@ function request(options) {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: data.msg,
|
||||
icon: 'error', // 可选 success/loading/none
|
||||
icon: 'none', // 可选 success/loading/none
|
||||
duration: 2000, // 持续时长，单位ms
|
||||
mask: false, // 是否显示透明蒙层，防止触摸穿透
|
||||
});
|
||||
reject(data); // 其他错误情况返回错误信息
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
uni.hideLoading();
|
||||
if(isShowLoading){
|
||||
// 请求之前做一些事
|
||||
uni.hideLoading();
|
||||
}
|
||||
uni.showToast({
|
||||
title: "服务器异常，稍后再试",
|
||||
icon: 'error', // 可选 success/loading/none
|
||||
icon: 'none', // 可选 success/loading/none
|
||||
duration: 2000, // 持续时长，单位ms
|
||||
mask: false, // 是否显示透明蒙层，防止触摸穿透
|
||||
});
|
||||
// reject(error); // 请求失败时返回错误信息
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user