Skip to content

X
XiTianSenMall
Commit ddc50b5f authored by leiqingsong's avatar leiqingsong
Browse files
Options

修改

parent 6e5de1d4
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 110 deletions
H5/src/App.vue
View file @ ddc50b5f
......@@ -6,7 +6,7 @@
</template>
<script>
import { getAuthToken } from "@/utils/bridgeToAppFun";
import { getAuthToken, showBottomBar } from "@/utils/bridgeToAppFun";
import BaseNavBar from "./components/BaseNavBar.vue";
export default {
components: {
......@@ -27,12 +27,15 @@ export default {
// userId: "1313123232"
// }
// localStorage.setItem('user', JSON.stringify(user));
console.log('和App开始交互');
getAuthToken().then(res => {
console.log('获取token成功', res);
}).catch(err => {
console.log('获取token失败', err);
})
console.log("和App开始交互");
showBottomBar();
getAuthToken()
.then(res => {
console.log("获取token成功", res);
})
.catch(err => {
console.log("获取token失败", err);
});
}
};
</script>
......
H5/src/api/bank.js
View file @ ddc50b5f
......@@ -68,11 +68,11 @@ export function getUserBankInfo(params) {
/**
* 获取银行卡列表
* @returns
* @returns
*/
export function getBankList() {
return request({
url: "/bank/getBankNameList",
method: "get"
})
});
}
H5/src/api/user.js
View file @ ddc50b5f
......@@ -65,12 +65,11 @@ export function logout(token) {
});
}
/**
* 根据token获取userId
* @param {*} params token
*/
export function getUserInfo() {
export function getUserInfo() {
return request({
url: "/api/user/info",
method: "post"
......@@ -80,12 +79,12 @@ export function logout(token) {
/**
* 获取用户信息
* @param {*} params userId
* @returns
* @returns
*/
export function getUserInfo2(params) {
return request({
url: "/user/getByUserId",
method: "get",
params
})
});
}
H5/src/utils/bridgeToAppFun.js
View file @ ddc50b5f
......@@ -6,13 +6,13 @@ function saveUser(data) {
localStorage.setItem("token", data);
if (data) {
getUserInfo().then(res => {
console.log('存用户信息');
console.log("存用户信息");
console.log(res);
console.log('----');
console.log("----");
if (res.code == 0) {
localStorage.setItem("user", JSON.stringify(res.data));
}
})
});
} else {
console.log("调用失败");
}
......@@ -22,51 +22,41 @@ function saveUser(data) {
export function getAuthToken() {
const userAgent = navigator.userAgent;
console.log("ua", userAgent);
if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) { // android
if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
// android
console.log("android, 和安卓交互");
const token = window.android.getAuthToken();
console.log('an-token', token);
console.log("an-token", token);
return new Promise((resolve, reject) => {
if (token) {
saveUser(token);
resolve(token)
resolve(token);
} else {
reject('失败')
reject("失败");
}
})
} else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) { // ios
});
} else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
// ios
console.log("ios");
return new Promise((resolve, reject) => {
console.log("调用1");
try {
window.webkit.messageHandlers.Location.postMessage(null); //调用OC方法“postMessage”
resolve('成功');
} catch (e) {
//TODO handle the exception
reject('异常');
console.log('ios, 异常');
}
//监听OC的方法
// function setLocation(data) {
// console.log('监听', data);
// }
// jsBridge.callhandler("getAuthToken", null, data => {
// console.log("调用2");
// localStorage.setItem("token", data);
// console.log("--------------");
// if (data) {
// resolve(data)
// getUserInfo().then(res => {
// if (res.code === 0) {
// localStorage.setItem("user", JSON.stringify(res.data));
// }
// })
// } else {
// console.log("调用失败");
// reject("getAuthToken", data);
// }
// });
})
jsBridge.callhandler("getAuthToken", null, data => {
console.log("调用2");
localStorage.setItem("token", data);
console.log("--------------");
if (data) {
resolve(data);
getUserInfo().then(res => {
if (res.code === 0) {
localStorage.setItem("user", JSON.stringify(res.data));
}
});
} else {
console.log("调用失败");
reject("getAuthToken", data);
}
});
});
}
}
......@@ -74,10 +64,32 @@ export function getAuthToken() {
export function logoutToApp() {
console.log("退出登录");
const userAgent = navigator.userAgent;
if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) {
console.log('an');
window.android.logout()
if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
console.log("an");
window.android.logout();
} else {
jsBridge.callhandler("logout");
}
}
export function navigateBack() {
console.log("返回");
const userAgent = navigator.userAgent;
if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
console.log("an");
window.android.navigateBack();
} else {
jsBridge.callhandler("navigateBack");
}
}
export function showBottomBar(params) {
console.log("隐藏底部");
const userAgent = navigator.userAgent;
if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
console.log("an");
window.android.showBottomBar(params);
} else {
jsBridge.callhandler("showBottomBar", params);
}
}
H5/src/utils/localGetter.js
View file @ ddc50b5f
export function getUserId() {
let userInfo = localStorage.getItem('user')
if(userInfo){
return JSON.parse(userInfo).userId || '';
}else{
return ''
}
}
\ No newline at end of file
let userInfo = localStorage.getItem("user");
if (userInfo) {
return JSON.parse(userInfo).userId || "";
} else {
return "";
}
}
H5/src/utils/request.js
View file @ ddc50b5f
......@@ -11,7 +11,7 @@ const service = axios.create({
service.interceptors.request.use(
config => {
const token = localStorage.getItem("token");
config.headers["token"] = token;
config.headers["token"] = token;
if (!config.loading) {
loading = Toast.loading({
forbidClick: true,
......
H5/src/views/bank.vue
View file @ ddc50b5f
......@@ -46,13 +46,18 @@
</template>
<script>
import { getUserBankInfo, addUserBankInfo, editUserBankInfo, getBankList } from "@/api/bank";
import {
getUserBankInfo,
addUserBankInfo,
editUserBankInfo,
getBankList
} from "@/api/bank";
export default {
name: "Bank",
data() {
return {
sheetShow: false,
actions:[],
actions: [],
form: {
bankName: "",
cardNumber: "",
......@@ -75,7 +80,7 @@ export default {
if (res.code === 0) {
this.actions = res.data;
}
})
});
},
addAndEditBankInfo() {
const params = this.form;
......
H5/src/views/customer-service.vue
View file @ ddc50b5f
......@@ -43,8 +43,8 @@ export default {
},
getCustomerData() {
let params = {
userId:this.$userId
}
userId: this.$userId
};
getCustomer(params).then(res => {
if (res.code === 0) {
this.imageUrl = process.env.VUE_APP_BASE_URL + res.data;
......
H5/src/views/income/wallet.vue
View file @ ddc50b5f
......@@ -2,21 +2,12 @@
<div class="wallet">
<div class="content">
<img class="balance-img" src="@/assets/images/余额.png" alt />
<p
class="currentprofitlabel"
>
<p class="currentprofitlabel">
当月收益
</p>
<div
class="currentprofit"
@click="jumpToIncomeDetail"
>
<div class="currentprofit" @click="jumpToIncomeDetail">
<span class="month-income">{{ walletInfo.moneyIncome }}</span>
<img
src="@/assets/images/右箭头.png"
alt
class="month-income-arrow"
/>
<img src="@/assets/images/右箭头.png" alt class="month-income-arrow" />
</div>
<div class="bottom-box">
<div class="income-item">
......@@ -24,11 +15,7 @@
<p>累计收益</p>
<div @click="jumpToAll">
<span class="money">{{ walletInfo.totalIncome }}</span>
<img
src="@/assets/images/右箭头.png"
alt
class="arrow"
/>
<img src="@/assets/images/右箭头.png" alt class="arrow" />
</div>
</div>
<div class="income-item">
......@@ -36,11 +23,7 @@
<p>未提余额</p>
<div @click="jumpToCanCashOut">
<span class="money">{{ walletInfo.currentMoneyCan }}</span>
<img
src="@/assets/images/右箭头.png"
alt
class="arrow"
/>
<img src="@/assets/images/右箭头.png" alt class="arrow" />
</div>
</div>
</div>
......@@ -115,7 +98,7 @@ export default {
box-sizing: border-box;
height: calc(100vh - 48px);
overflow: hidden;
padding:15px;
padding: 15px;
box-sizing: border-box;
p {
margin: 0;
......@@ -126,14 +109,14 @@ export default {
height: 100%;
text-align: center;
background-color: #ffffff;
.currentprofitlabel{
position:absolute;
top:136px;
width:100%;
font-size:18px;
color:#333333
.currentprofitlabel {
position: absolute;
top: 136px;
width: 100%;
font-size: 18px;
color: #333333;
}
.currentprofit{
.currentprofit {
position: absolute;
width: 100%;
top: 178px;
......@@ -151,7 +134,7 @@ export default {
font-size: 28px;
color: #333333;
}
.month-income-arrow{
.month-income-arrow {
width: 11px;
height: 18px;
}
......@@ -168,7 +151,7 @@ export default {
img {
width: 30px;
height: 29px;
&.arrow{
&.arrow {
width: 12px;
height: 18px;
}
......
H5/src/views/modefyAvatar.vue
View file @ ddc50b5f
......@@ -9,9 +9,7 @@
>
<van-button type="primary">上传新头像</van-button>
</van-uploader>
<van-button type="primary" plain @click="checkBtn"
>确定</van-button
>
<van-button type="primary" plain @click="checkBtn">确定</van-button>
</div>
</div>
</template>
......@@ -92,7 +90,7 @@ export default {
margin-bottom: 52px;
border-radius: 4px;
}
.van-uploader{
.van-uploader {
font-size: 0;
}
.btn {
......
H5/src/views/rewards/fastest-progress.vue
View file @ ddc50b5f
<template>
<div class="fastest-progress">
<div class="bg">
<van-icon name="arrow-left" @click="$router.go(-1)" />
<van-icon name="arrow-left" @click="handlerBack" />
<span class="title">本月进步最大奖励池</span>
<span class="award">￥{{ growthTotal }}</span>
</div>
......@@ -30,6 +30,7 @@
</template>
<script>
import { navigateBack } from "@/utils/bridgeToAppFun";
import BaseRefreshScroll from "../../components/BaseRefreshScroll.vue";
import RankItem from "./compoments/rankItem.vue";
import { getProgressPrizes } from "@/api/progressPrizes";
......@@ -49,6 +50,9 @@ export default {
this.getProgressPrizes();
},
methods: {
handlerBack() {
navigateBack();
},
getProgressPrizes() {
const _this = this;
getProgressPrizes().then(res => {
......
H5/src/views/settings.vue
View file @ ddc50b5f
......@@ -63,23 +63,23 @@ export default {
};
},
mounted() {
this.getUser()
this.getUser();
},
methods: {
getUser() {
const params = {
userId: this.$userId
}
};
getUserInfo2(params).then(res => {
if (res.code == 0) {
this.inviteeCode = res.data.inviteCode;
this.avatar = 'http://8.131.244.76:81' + res.data.headImage;
this.avatar = "http://8.131.244.76:81" + res.data.headImage;
localStorage.setItem("user", JSON.stringify(res.data));
}
})
});
},
logout() {
localStorage.removeItem('token');
localStorage.removeItem("token");
logout().then();
logoutToApp();
},
......
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