Commit a7ec69ac by fengzhaoyu

修改:改成第三方企业应用

parent d4bcc59f
...@@ -13,11 +13,13 @@ App({ ...@@ -13,11 +13,13 @@ App({
console.log(msg) console.log(msg)
}, },
// axios.defaults.baseURL = 'http://192.168.1.193:8400' // 本地荣 // axios.defaults.baseURL = 'http://192.168.1.193:8400' // 本地荣
// axios.defaults.baseURL = 'http://192.168.1.174:8400' // 本地钱 // axios.defaults.baseURL = 'http://192.168.1.174:8400' // 本地钱1
// axios.defaults.baseURL = 'http://192.168.1.106:8400' // 本地钱2
// axios.defaults.baseURL = 'http://139.196.213.18:8400' // beta环境 // axios.defaults.baseURL = 'http://139.196.213.18:8400' // beta环境
globalData: { globalData: {
loadingType: 0, loadingType: 0,
// globalUrl: '192.168.1.174:8400' // globalUrl: '192.168.1.174:8400'
globalUrl: '139.196.213.18:8400' globalUrl: '192.168.1.102:8400'
// globalUrl: '139.196.213.18:8400'
} }
}); });
...@@ -48,6 +48,7 @@ Page({ ...@@ -48,6 +48,7 @@ Page({
method: 'POST', method: 'POST',
dataType: 'json', dataType: 'json',
success: function(res) { success: function(res) {
console.log(res)
// 全局存储用户信息token和用户信息 // 全局存储用户信息token和用户信息
if(res.data.resultCode === '0'){ if(res.data.resultCode === '0'){
const data = res.data.data; const data = res.data.data;
......
...@@ -12,11 +12,11 @@ Page({ ...@@ -12,11 +12,11 @@ Page({
content: '加载中...' content: '加载中...'
}); });
let data = { let data = {
userId: dd.getStorageSync({ key: 'userId' }).data, ddUserId: dd.getStorageSync({ key: 'userId' }).data,
orderPrice: this.data.inputValue orderPrice: this.data.inputValue
} }
const _that = this; const _that = this;
$http.$http('charge/charge_alipay', data, 'GET').then((res) => { $http.$http('isv/charge/charge_alipay', data, 'GET').then((res) => {
_that.ddPayFn(res) _that.ddPayFn(res)
}).catch((res) => { }).catch((res) => {
dd.hideLoading(); dd.hideLoading();
......
...@@ -50,9 +50,9 @@ Page({ ...@@ -50,9 +50,9 @@ Page({
currentPage: this.data.currentPage, currentPage: this.data.currentPage,
pageNumber: this.data.pageNumber, pageNumber: this.data.pageNumber,
available: this.data.available, available: this.data.available,
userId: dd.getStorageSync({ key: 'userId' }).data ddUserId: dd.getStorageSync({ key: 'userId' }).data
} }
$http.$http('account/query_subsidyList_by_user_id', data, 'GET').then((res) => { $http.$http('isv/account/query_subsidyList_by_user_id', data, 'GET').then((res) => {
let dataList = [...res.recordList]; let dataList = [...res.recordList];
let dataListSource = _that.data.dataList; let dataListSource = _that.data.dataList;
if (dataList.length > 0) { if (dataList.length > 0) {
......
...@@ -32,7 +32,8 @@ Page({ ...@@ -32,7 +32,8 @@ Page({
pageNumber: 10, pageNumber: 10,
trxNo: this.data.trxNo trxNo: this.data.trxNo
} }
$http.$http('consume/list_payment_record', data, 'GET').then((res) => { $http.$http('isv/consume/list_expense_record', data, 'GET').then((res) => {
console.log(res)
data = res.recordList[0] data = res.recordList[0]
data.createDate = _that.timeToStr(data.createDate); data.createDate = _that.timeToStr(data.createDate);
_that.setData({ _that.setData({
......
...@@ -33,11 +33,11 @@ Page({ ...@@ -33,11 +33,11 @@ Page({
// 获取用户详细信息 // 获取用户详细信息
getUserDetails(){ getUserDetails(){
const _that = this; const _that = this;
let userId = dd.getStorageSync({ key: 'userId' }).data; let ddUserId = dd.getStorageSync({ key: 'userId' }).data;
let data = { let data = {
userId: userId ddUserId: ddUserId
} }
$http.$http('account/queryAccountDetail', data, 'GET').then((res) => { $http.$http('isv/account/queryAccountDetail', data, 'GET').then((res) => {
console.log(res) console.log(res)
this.setData({ this.setData({
name: res.name, name: res.name,
......
...@@ -102,14 +102,15 @@ Page({ ...@@ -102,14 +102,15 @@ Page({
let data = { let data = {
currentPage: this.data.currentPage, currentPage: this.data.currentPage,
pageNumber: this.data.pageNumber, pageNumber: this.data.pageNumber,
userIds: [dd.getStorageSync({ key: 'userId' }).data], ddUserIds: [dd.getStorageSync({ key: 'userId' }).data],
orderStartTime: this.data.orderStartTime, orderStartTime: this.data.orderStartTime,
orderEndTime: this.data.orderEndTime, orderEndTime: this.data.orderEndTime,
orderType: this.data.orderType, orderType: this.data.orderType,
sceneType: this.data.sceneType, sceneType: this.data.sceneType,
statusList: this.data.statusList orderStatus: this.data.statusList
} }
$http.$http('consume/list_payment_record', data, 'GET').then((res) => { $http.$http('isv/consume/list_expense_record', data, 'GET').then((res) => {
console.log('record' + res)
let dataList = [...res.recordList]; let dataList = [...res.recordList];
let recordListDataSource = _that.data.recordListData let recordListDataSource = _that.data.recordListData
if (dataList.length > 0) { if (dataList.length > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment