Skip to content

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

Merge branch 'dev_lqs' into 'master' 

修改

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