4.3提交
This commit is contained in:
parent
a26fc1a4a7
commit
fd78b504a6
8
App.vue
8
App.vue
@ -1,4 +1,5 @@
|
|||||||
<script>
|
<script>
|
||||||
|
import version from '@/utils/version.js'
|
||||||
export default {
|
export default {
|
||||||
globalData: {
|
globalData: {
|
||||||
plAd: true,
|
plAd: true,
|
||||||
@ -20,6 +21,13 @@ export default {
|
|||||||
options.referrerInfo.extraData.token
|
options.referrerInfo.extraData.token
|
||||||
);
|
);
|
||||||
uni.setStorageSync("userInfo", options.referrerInfo.extraData.userInfo);
|
uni.setStorageSync("userInfo", options.referrerInfo.extraData.userInfo);
|
||||||
|
if(process.env.UNI_PLATFORM =="mp-weixin"){
|
||||||
|
uni.setStorageSync("app_version",version);
|
||||||
|
}else{
|
||||||
|
let app_version=options.referrerInfo.extraData.app_version?options.referrerInfo.extraData.app_version:version;
|
||||||
|
uni.setStorageSync("app_version",app_version);
|
||||||
|
};
|
||||||
|
|
||||||
//getApp({allowDefault: true}).globalData.apiHost = options.referrerInfo.extraData.apiHost;
|
//getApp({allowDefault: true}).globalData.apiHost = options.referrerInfo.extraData.apiHost;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
|
|||||||
@ -240,7 +240,8 @@ const showSign = ref(false)
|
|||||||
const signInfo=reactive({
|
const signInfo=reactive({
|
||||||
news:{
|
news:{
|
||||||
summary:'',
|
summary:'',
|
||||||
title:''
|
title:'',
|
||||||
|
tags:''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// 分页相关数据 - 收益
|
// 分页相关数据 - 收益
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
|
|
||||||
let BASE_URL='https://dev-app.igandan.com/app';
|
//let BASE_URL='https://dev-app.igandan.com/app';
|
||||||
//let BASE_URL='https://app.igandan.com/app'
|
let BASE_URL='https://app.igandan.com/app'
|
||||||
export default BASE_URL
|
export default BASE_URL
|
||||||
@ -1,5 +1,5 @@
|
|||||||
let DOC_URL='https://dev-doc.igandan.com/app/';
|
//let DOC_URL='https://dev-doc.igandan.com/app/';
|
||||||
//let DOC_URL='https://doc.igandan.com/app/'
|
let DOC_URL='https://doc.igandan.com/app/'
|
||||||
// if(app.globalData.apiHost.indexOf('dev')>-1){
|
// if(app.globalData.apiHost.indexOf('dev')>-1){
|
||||||
// DOC_URL='https://dev-doc.igandan.com/app/'
|
// DOC_URL='https://dev-doc.igandan.com/app/'
|
||||||
// }else{
|
// }else{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
let OTHER_HOST='https://dev-wx.igandan.com'
|
//let OTHER_HOST='https://dev-wx.igandan.com'
|
||||||
//let OTHER_HOST='https://wx.igandan.com'
|
let OTHER_HOST='https://wx.igandan.com'
|
||||||
//const app = getApp({allowDefault: true});
|
//const app = getApp({allowDefault: true});
|
||||||
// if(app.globalData.apiHost && app.globalData.apiHost.indexOf('dev')>-1){
|
// if(app.globalData.apiHost && app.globalData.apiHost.indexOf('dev')>-1){
|
||||||
// OTHER_HOST='https://dev-wx.igandan.com'
|
// OTHER_HOST='https://dev-wx.igandan.com'
|
||||||
|
|||||||
@ -58,10 +58,12 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
|
|||||||
header['Authorization']='Bearer ' + token;
|
header['Authorization']='Bearer ' + token;
|
||||||
let userInfo= uni.getStorageSync('userInfo')
|
let userInfo= uni.getStorageSync('userInfo')
|
||||||
defaultData = {
|
defaultData = {
|
||||||
version: version,
|
mini_version: version,
|
||||||
|
version: uni.getStorageSync('app_version'),
|
||||||
user_uuid:userInfo.uuid,
|
user_uuid:userInfo.uuid,
|
||||||
client_type:client_type,
|
client_type:client_type,
|
||||||
timestamp:new Date().getTime()
|
timestamp:new Date().getTime(),
|
||||||
|
|
||||||
}
|
}
|
||||||
postData={
|
postData={
|
||||||
...data,
|
...data,
|
||||||
@ -75,7 +77,8 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
|
|||||||
let userInfo= uni.getStorageSync('userInfo')
|
let userInfo= uni.getStorageSync('userInfo')
|
||||||
console.log(userInfo)
|
console.log(userInfo)
|
||||||
defaultData = {
|
defaultData = {
|
||||||
version: version,
|
mini_version: version,
|
||||||
|
version: uni.getStorageSync('app_version'),
|
||||||
user_uuid:userInfo.uuid,
|
user_uuid:userInfo.uuid,
|
||||||
client_type:client_type,
|
client_type:client_type,
|
||||||
timestamp:new Date().getTime()+""
|
timestamp:new Date().getTime()+""
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
const version="4.2.5"
|
const version="4.2.7"
|
||||||
export default version
|
export default version
|
||||||
Loading…
x
Reference in New Issue
Block a user