liang
/
samehome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://git.weirui0755.com/liang/samehome

master
[liang] 3 years ago
parent
c3f94d1085 a299f72a7e
commit
3f238f301f
5 changed files with 127 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      manifest.json
  2. 6
      pages/home/index.vue
  3. 128
      utils/api.js
  4. 40
      utils/axios.js
  5. 6
      utils/constant.js

30
manifest.json
View File

@ -46,6 +46,36 @@
"sdkConfigs" : {}
}
},
"h5" : {
"publicPath" : "/",
"devServer" : {
// "port" : 8083,
"disableHostCheck" : true,
"https" : true,
"proxy" : {
"/api" : {
"ws" : false,
"target" : "https://sapi.payairs.com",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {
"^/api" : ""
}
},
"/market" : {
"ws" : false,
"target" : "https://market.acefinex.com",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {
"^/market" : ""
}
}
},
"port" : ""
}
},
/* 快应用特有相关 */
"quickapp" : {},
/* 小程序特有相关 */

6
pages/home/index.vue
View File

@ -89,6 +89,7 @@ Blame
<script>
import languagePopups from '@/components/language-popups/language-popups.vue'
import languageData from '@/utils/language/config'
import api from '@/utils/api'
// 引入echarts
// import * as echarts from 'echarts';
// let videoPlayerObj = {};
@ -162,6 +163,7 @@ export default {
if (uni.getStorageSync('langTrue')) {
this.langTrue = uni.getStorageSync('langTrue')
}
this.getbanner();
},
onHide() {
@ -173,6 +175,10 @@ export default {
}
},
methods: {
getbanner(){
const indexBanner=api.indexBanner({'mark':'APP_INDEX'});
console.log(indexBanner)
},
// 弹出语言选择框
laug() {
this.laugValue = true;

128
utils/api.js
View File

@ -2,96 +2,96 @@ import Vue from 'vue';
import qs from 'qs'
const api = {
//---------------------------------recharge充值---------------------------------
rechargeConfig: (qs.stringify(params) => Vue.prototype.$axios.post('/api/recharge/rechargeConfig',qs.stringify(params),//获取充值配置
rechargeAddress: (qs.stringify(params) => Vue.prototype.$axios.post('/api/recharge/rechargeAddress',qs.stringify(params),//获取对应数字币种的充值地址
recharge: (qs.stringify(params) => Vue.prototype.$axios.post('/api/recharge/recharge',qs.stringify(params),//法币在线充值下单
rechargeList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/recharge/rechargeList',qs.stringify(params),//充值记录
rechargeConfig: (params) => Vue.prototype.$axios.post('/api/recharge/rechargeConfig',params),//获取充值配置
rechargeAddress: (params) => Vue.prototype.$axios.post('/api/recharge/rechargeAddress',params),//获取对应数字币种的充值地址
recharge: (params) => Vue.prototype.$axios.post('/api/recharge/recharge',params),//法币在线充值下单
rechargeList: (params) => Vue.prototype.$axios.post('/api/recharge/rechargeList',params),//充值记录
//--------------------------------- withdraw提现 ---------------------------------
withdrawConfig: (qs.stringify(params) => Vue.prototype.$axios.post('/api/withdraw/withdrawConfig',qs.stringify(params),//获取提现配置
withdrawAddressList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/withdraw/withdrawAddressList',qs.stringify(params),//提现地址列表
withdrawAddressAdd: (qs.stringify(params) => Vue.prototype.$axios.post('/api/withdraw/withdrawAddressAdd',qs.stringify(params),//保存提现地址
withdrawAddressDel: (qs.stringify(params) => Vue.prototype.$axios.post('/api/withdraw/withdrawAddressDel',qs.stringify(params),//删除提现地址
withdraw: (qs.stringify(params) => Vue.prototype.$axios.post('/api/withdraw/withdraw',qs.stringify(params),//提现下单
withdrawList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/withdraw/withdrawList',qs.stringify(params),//提现记录
withdrawConfig: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawConfig',params),//获取提现配置
withdrawAddressList: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawAddressList',params),//提现地址列表
withdrawAddressAdd: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawAddressAdd',params),//保存提现地址
withdrawAddressDel: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawAddressDel',params),//删除提现地址
withdraw: (params) => Vue.prototype.$axios.post('/api/withdraw/withdraw',params),//提现下单
withdrawList: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawList',params),//提现记录
//--------------------------------- mine 挖矿 ---------------------------------
mineList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/mine/mineList',qs.stringify(params),//获取挖矿产品列表、
mineRecord: (qs.stringify(params) => Vue.prototype.$axios.post('/api/mine/mineRecord',qs.stringify(params),//获取购买挖矿记录
showMineDetails: (qs.stringify(params) => Vue.prototype.$axios.post('/api/mine/showMineDetails',qs.stringify(params),//获取挖矿产品详情和用户余额
mineSubmit: (qs.stringify(params) => Vue.prototype.$axios.post('/api/mine/mineSubmit',qs.stringify(params),//提交购买挖矿产品订单
mineList: (params) => Vue.prototype.$axios.post('/api/mine/mineList',params),//获取挖矿产品列表、
mineRecord: (params) => Vue.prototype.$axios.post('/api/mine/mineRecord',params),//获取购买挖矿记录
showMineDetails: (params) => Vue.prototype.$axios.post('/api/mine/showMineDetails',params),//获取挖矿产品详情和用户余额
mineSubmit: (params) => Vue.prototype.$axios.post('/api/mine/mineSubmit',params),//提交购买挖矿产品订单
//--------------------------------- 行情 ---------------------------------
addFavor: (qs.stringify(params) => Vue.prototype.$axios.post('/market/addFavor',qs.stringify(params),//关注交易对
removeFavor: (qs.stringify(params) => Vue.prototype.$axios.post('/market/removeFavor',qs.stringify(params),//取消关注交易对
symbolGroup: (qs.stringify(params) => Vue.prototype.$axios.post('/market/symbolGroup',qs.stringify(params),//(新)获取交易对列表(HTTP)
marketDetail: (qs.stringify(params) => Vue.prototype.$axios.post('/market/detail',qs.stringify(params),//获取24显示行情(HTTP)
bboList: (qs.stringify(params) => Vue.prototype.$axios.post('/market/bboList',qs.stringify(params),//获取买卖单(HTTP)
tradeList: (qs.stringify(params) => Vue.prototype.$axios.post('/market/tradeList',qs.stringify(params),//获取成交记录(HTTP)
addFavor: (params) => Vue.prototype.$axios.post('/market/addFavor',params),//关注交易对
removeFavor: (params) => Vue.prototype.$axios.post('/market/removeFavor',params),//取消关注交易对
symbolGroup: (params) => Vue.prototype.$axios.post('/market/symbolGroup',params),//(新)获取交易对列表(HTTP)
marketDetail: (params) => Vue.prototype.$axios.post('/market/detail',params),//获取24显示行情(HTTP)
bboList: (params) => Vue.prototype.$axios.post('/market/bboList',params),//获取买卖单(HTTP)
tradeList: (params) => Vue.prototype.$axios.post('/market/tradeList',params),//获取成交记录(HTTP)
//--------------------------------- contract ---------------------------------
contractOrder: (qs.stringify(params) => Vue.prototype.$axios.post('/api/contract/order',qs.stringify(params),//合约下单接口
setWinOrLossStopPrice: (qs.stringify(params) => Vue.prototype.$axios.post('/api/contract/setWinOrLossStopPrice',qs.stringify(params),//设置止盈止损
contractCancel: (qs.stringify(params) => Vue.prototype.$axios.post('/api/contract/cancel',qs.stringify(params),//订单撤销
contractClosed: (qs.stringify(params) => Vue.prototype.$axios.post('/api/contract/closed',qs.stringify(params),//合约订单平仓
contractConfig: (qs.stringify(params) => Vue.prototype.$axios.post('/api/contract/contractConfig',qs.stringify(params),//合约配置
contractOrderList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/contract/orderList',qs.stringify(params),//合约订单列表
contractOrder: (params) => Vue.prototype.$axios.post('/api/contract/order',params),//合约下单接口
setWinOrLossStopPrice: (params) => Vue.prototype.$axios.post('/api/contract/setWinOrLossStopPrice',params),//设置止盈止损
contractCancel: (params) => Vue.prototype.$axios.post('/api/contract/cancel',params),//订单撤销
contractClosed: (params) => Vue.prototype.$axios.post('/api/contract/closed',params),//合约订单平仓
contractConfig: (params) => Vue.prototype.$axios.post('/api/contract/contractConfig',params),//合约配置
contractOrderList: (params) => Vue.prototype.$axios.post('/api/contract/orderList',params),//合约订单列表
//--------------------------------- transfer ---------------------------------
getTransferConfig: (qs.stringify(params) => Vue.prototype.$axios.post('/api/transfer/getTransferConfig',qs.stringify(params),//获取转账配置配置
changeCoinWays: (qs.stringify(params) => Vue.prototype.$axios.post('/api/transfer/changeCoinWays',qs.stringify(params),//切换币种或转出账户
transfer: (qs.stringify(params) => Vue.prototype.$axios.post('/api/transfer/transfer',qs.stringify(params),//提交划转资金
getTransferConfig: (params) => Vue.prototype.$axios.post('/api/transfer/getTransferConfig',params),//获取转账配置配置
changeCoinWays: (params) => Vue.prototype.$axios.post('/api/transfer/changeCoinWays',params),//切换币种或转出账户
transfer: (params) => Vue.prototype.$axios.post('/api/transfer/transfer',params),//提交划转资金
//--------------------------------- invitation ---------------------------------
invitation: (qs.stringify(params) => Vue.prototype.$axios.post('/api/invitation/invitRules',qs.stringify(params),//获取邀请规则文案
invitData: (qs.stringify(params) => Vue.prototype.$axios.post('/api/invitation/invitData',qs.stringify(params),//获取用户邀请数据
invitationRecord: (qs.stringify(params) => Vue.prototype.$axios.post('/api/invitation/invitationRecord',qs.stringify(params),//获取用户邀请记录
invitation: (params) => Vue.prototype.$axios.post('/api/invitation/invitRules',params),//获取邀请规则文案
invitData: (params) => Vue.prototype.$axios.post('/api/invitation/invitData',params),//获取用户邀请数据
invitationRecord: (params) => Vue.prototype.$axios.post('/api/invitation/invitationRecord',params),//获取用户邀请记录
//--------------------------------- 申购 ---------------------------------
subscriptionList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/exchange/subscriptionList',qs.stringify(params),//申购币列表
subscription: (qs.stringify(params) => Vue.prototype.$axios.post('/api/exchange/subscription',qs.stringify(params),//申购币详情
selCoin: (qs.stringify(params) => Vue.prototype.$axios.post('api/exchange/selCoin',qs.stringify(params),//申购详情页切换币种
exchangeCoin: (qs.stringify(params) => Vue.prototype.$axios.post('/api/exchange/exchangeCoin',qs.stringify(params),//提交申购订单
subscriptionRecord: (qs.stringify(params) => Vue.prototype.$axios.post('/api/exchange/subscriptionRecord',qs.stringify(params),//用户申购记录
subscriptionList: (params) => Vue.prototype.$axios.post('/api/exchange/subscriptionList',params),//申购币列表
subscription: (params) => Vue.prototype.$axios.post('/api/exchange/subscription',params),//申购币详情
selCoin: (params) => Vue.prototype.$axios.post('api/exchange/selCoin',params),//申购详情页切换币种
exchangeCoin: (params) => Vue.prototype.$axios.post('/api/exchange/exchangeCoin',params),//提交申购订单
subscriptionRecord: (params) => Vue.prototype.$axios.post('/api/exchange/subscriptionRecord',params),//用户申购记录
//--------------------------------- charity ---------------------------------
charityList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/charity/charityList',qs.stringify(params),//获取慈善产品列表
charityRecord: (qs.stringify(params) => Vue.prototype.$axios.post('/api/charity/charityRecord',qs.stringify(params),//获取慈善捐赠记录
charitySubmit: (qs.stringify(params) => Vue.prototype.$axios.post('/api/charity/charitySubmit',qs.stringify(params),//提交捐赠
showCharityDetails: (qs.stringify(params) => Vue.prototype.$axios.post('/api/charity/showCharityDetails',qs.stringify(params),//获取慈善产品详情和用户余额
charityList: (params) => Vue.prototype.$axios.post('/api/charity/charityList',params),//获取慈善产品列表
charityRecord: (params) => Vue.prototype.$axios.post('/api/charity/charityRecord',params),//获取慈善捐赠记录
charitySubmit: (params) => Vue.prototype.$axios.post('/api/charity/charitySubmit',params),//提交捐赠
showCharityDetails: (params) => Vue.prototype.$axios.post('/api/charity/showCharityDetails',params),//获取慈善产品详情和用户余额
//--------------------------------- 步数 ---------------------------------
updateSteps: (qs.stringify(params) => Vue.prototype.$axios.post('/api/steps/updateSteps',qs.stringify(params),// 更新步数
receivStepsAward: (qs.stringify(params) => Vue.prototype.$axios.post('/api/steps/receivStepsAward',qs.stringify(params),//领取奖励
updateSteps: (params) => Vue.prototype.$axios.post('/api/steps/updateSteps',params),// 更新步数
receivStepsAward: (params) => Vue.prototype.$axios.post('/api/steps/receivStepsAward',params),//领取奖励
//--------------------------------- home ---------------------------------
indexInfo: () => Vue.prototype.$axios.get('/api/index/info'),//获取系统通用配置
indexLang: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/lang',qs.stringify(params),//切换语言
customerService: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/customerService',qs.stringify(params),//获取客服联系方式
sendEmailCode: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/sendEmailCode',qs.stringify(params),//发送邮箱验证码
indexBanner: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/banner',qs.stringify(params),//获取banner图列表
noticeList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/noticeList',qs.stringify(params),//获取公告滚动数据
notices: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/notices',qs.stringify(params),//获取公告分页列表
noticeRead: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/noticeRead',qs.stringify(params),//标记公告已读
noticeDetail: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/noticeDetail',qs.stringify(params),//获取公告详情
appVersion: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/appVersion',qs.stringify(params),//校验APP应用版本
indexLang: (params) => Vue.prototype.$axios.post('/api/index/lang',params),//切换语言
customerService: (params) => Vue.prototype.$axios.post('/api/index/customerService',params),//获取客服联系方式
sendEmailCode: (params) => Vue.prototype.$axios.post('/api/index/sendEmailCode',params),//发送邮箱验证码
indexBanner: (params) => Vue.prototype.$axios.post('/api/index/banner',params),//获取banner图列表
noticeList: (params) => Vue.prototype.$axios.post('/api/index/noticeList',params),//获取公告滚动数据
notices: (params) => Vue.prototype.$axios.post('/api/index/notices',params),//获取公告分页列表
noticeRead: (params) => Vue.prototype.$axios.post('/api/index/noticeRead',params),//标记公告已读
noticeDetail: (params) => Vue.prototype.$axios.post('/api/index/noticeDetail',params),//获取公告详情
appVersion: (params) => Vue.prototype.$axios.post('/api/index/appVersion',params),//校验APP应用版本
//--------------------------------- 个人中心 ---------------------------------
register: (qs.stringify(params) => Vue.prototype.$axios.post('/api/index/register',qs.stringify(params),//注册
login: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/login',qs.stringify(params),//登录
loginOut: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/loginOut',qs.stringify(params),//退出登录
forgotPassword: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/forgotPassword',qs.stringify(params),//忘记密码
register: (params) => Vue.prototype.$axios.post('/api/index/register',params),//注册
login: (params) => Vue.prototype.$axios.post('/api/user/login',params),//登录
loginOut: (params) => Vue.prototype.$axios.post('/api/user/loginOut',params),//退出登录
forgotPassword: (params) => Vue.prototype.$axios.post('/api/user/forgotPassword',params),//忘记密码
updatePassword: () => Vue.prototype.$axios.get('/api/user/updatePassword'),//修改登录密码
userAccount: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/userAccount',qs.stringify(params),//用户余额信息
bankCardInfo: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/bankCardInfo',qs.stringify(params),//获取银行卡信息
bindBank: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/bindBank',qs.stringify(params),//绑定/修改银行卡
certification: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/certification',qs.stringify(params),//保存实名认证信息
certificationInfo: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/certificationInfo',qs.stringify(params),//获取实名认证信息
billList: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/billList',qs.stringify(params),//账单记录
userInfo: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/userInfo',qs.stringify(params),//会员基本信息
updatePayPassword: (qs.stringify(params) => Vue.prototype.$axios.post('/api/user/updatePayPassword',qs.stringify(params),//修改提现密码
userAccount: (params) => Vue.prototype.$axios.post('/api/user/userAccount',params),//用户余额信息
bankCardInfo: (params) => Vue.prototype.$axios.post('/api/user/bankCardInfo',params),//获取银行卡信息
bindBank: (params) => Vue.prototype.$axios.post('/api/user/bindBank',params),//绑定/修改银行卡
certification: (params) => Vue.prototype.$axios.post('/api/user/certification',params),//保存实名认证信息
certificationInfo: (params) => Vue.prototype.$axios.post('/api/user/certificationInfo',params),//获取实名认证信息
billList: (params) => Vue.prototype.$axios.post('/api/user/billList',params),//账单记录
userInfo: (params) => Vue.prototype.$axios.post('/api/user/userInfo',params),//会员基本信息
updatePayPassword: (params) => Vue.prototype.$axios.post('/api/user/updatePayPassword',params),//修改提现密码

40
utils/axios.js
View File

@ -5,28 +5,24 @@ import md5 from 'js-md5';
import constant from './constant.js';
let baseURL = '';
let key = '';
// #ifdef H5
baseURL = constant.H5
key = constant.H5_KEY
baseURL = constant.H5_BASE_URL
// #endif
// #ifdef APP-PLUS
baseURL = constant.APP
key = constant.APP_KEY
baseURL = constant.BASE_URL
// #endif
const service = axios.create({
withCredentials: true,
crossDomain: true,
baseURL: constant.BASE_URL,
baseURL: baseURL,
timeout: 160000
})
console.log(constant.BASE_URL)
// request拦截器,在请求之前做一些处理
service.interceptors.request.use(
config => {
const language = uni.getStorageSync("language") || 'en_US';
console.log('语言', uni.getStorageSync('language'))
const language = uni.getStorageSync("language")|| 'en_US';
console.log('语言', language)
if (constant.SHOW_DIALOG) {
uni.showLoading({
title: 'loading',
@ -34,8 +30,15 @@ service.interceptors.request.use(
})
}
if (config.url.indexOf('market') > -1) {
config.baseURL = Vue.prototype.MARKET_URL;
}
// #ifdef H5
baseURL = constant.H5_MARKET_URL;
// #endif
// #ifdef APP-PLUS
config.baseURL = Vue.prototype.MARKET_URL;
// #endif
}
const ticket = uni.getStorageSync('ticket')
if (ticket != '') {
config.data['ticket'] = ticket
@ -64,7 +67,7 @@ service.interceptors.request.use(
if (config.method == 'post') {
console.log(config.data)
dataStr = config.data.split('&');
dataStr = qs.stringify(config.data).split('&');
@ -81,9 +84,8 @@ service.interceptors.request.use(
let sign = '';
var t = Date.now() - 2901;
// config.headers["timestamp"] = t;
// config.data["timestamp"] = t
config.data['lang'] = language;
for (var k in config.data)
keys.push(k);
keys.sort(function(a, b) {
@ -91,7 +93,7 @@ service.interceptors.request.use(
})
//console.log("keys===========",keys);
keys.forEach(function(e) {
@ -103,9 +105,11 @@ service.interceptors.request.use(
});
key = "key=" + constant.KEY;
key = "key=" + constant.KEY;
console.log(sign + key)
sign = md5(sign + key);
config.data['timestamp'] = null
if (config.method == 'post') {
config.data['sign'] = sign
@ -121,7 +125,7 @@ service.interceptors.request.use(
return config;
},
error => {
// console.log(error); // for debug
console.error(error); // for debug
uni.hideLoading();
return Promise.reject(error);
}

6
utils/constant.js
View File

@ -1,5 +1,7 @@
const IS_TEST = true;
const H5_BASE_URL = '/api';
const BASE_URL = IS_TEST?'https://sapi.payairs.com':'';
const H5_MARKET_URL = '/market';
const MARKET_URL = IS_TEST?'https://market.acefinex.com':'';
const KEY = IS_TEST?'jsabdjhfbsjndfksnjndja,sndmbstart':'';
const WSSURL = IS_TEST?'wss://market.acefinex.com/wss/':'';
@ -10,5 +12,7 @@ export default {
MARKET_URL,
KEY,
WSSURL,
SHOW_DIALOG
SHOW_DIALOG,
H5_BASE_URL,
H5_MARKET_URL
}
Write Preview
Loading…
Cancel
Save