Compare commits

..

No commits in common. "cb465615b23c0917d84b843ceb0a7a8d6b60a214" and "376d1a0459477fdf75cba28202b1a4800d4f8a5d" have entirely different histories.

4 changed files with 5 additions and 62 deletions

View File

@ -14,7 +14,7 @@
</view>
<view class="cell-list-box">
<view class="cell-list-group">
<view class="cell-list-item" v-for="item in cellList" @click="toPage(item.path,item)">
<view class="cell-list-item" v-for="item in cellList" @click="toPage(item.path)">
<view class="cell-list-item-left">
<image
style="width: 60rpx; height: 60rpx"
@ -172,34 +172,6 @@ export default {
},
toPage(path) {
if(item.title === '注销'){
let u = navigator.userAgent;
let isAndroid =
u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
// let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios
try {
if (isAndroid && AndroidJs) {
console.log("%c%s", "color:red", "安卓--调用返回方法");
const reqRow = {
name: "logout",
data: "",
};
AndroidJs.func(JSON.stringify(reqRow)); //
} else {
console.log("%c%s", "color:red", "苹果--调用返回方法");
const reqRow = {
name: "back-iphone",
data: "",
};
window.webkit.messageHandlers.func.postMessage(
JSON.stringify(reqRow)
); // ios
}
} catch (e) {
console.log(e, "e-----判断安卓苹果类型出错");
}
return
}
if (!path) return;
useRouter(path, {}, "navigateTo");
},

View File

@ -2,7 +2,7 @@
<view class="content">
<view v-if="true" style="display:flex">
<u-button type="error" @click="testFn">调试录入卡片</u-button>
<!-- <u-button type="error" @click="test1Fn">调试token过期</u-button> -->
<u-button type="error" @click="test1Fn">调试token过期</u-button>
</view>
<daySelect @dateChange="onDateChange" />
<view v-if="isToday" class="task-info">

View File

@ -50,8 +50,7 @@ export default {
onLoad() {},
methods: {
login1Fn() {
// this.phone = "13800451500";
this.phone = "18174010561";
this.phone = "13800451500";
this.pwd = "123456";
const normalTabBar = [

View File

@ -36,7 +36,7 @@
<view
class="cell-list-item"
v-for="item in cellList"
@click="toPage(item.path,item)"
@click="toPage(item.path)"
>
<view class="cell-list-item-left">
<image
@ -187,35 +187,7 @@ export default {
}
},
toPage(path,item) {
if(item.title === '注销'){
let u = navigator.userAgent;
let isAndroid =
u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
// let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios
try {
if (isAndroid && AndroidJs) {
console.log("%c%s", "color:red", "安卓--调用返回方法");
const reqRow = {
name: "logout",
data: "",
};
AndroidJs.func(JSON.stringify(reqRow)); //
} else {
console.log("%c%s", "color:red", "苹果--调用返回方法");
const reqRow = {
name: "back-iphone",
data: "",
};
window.webkit.messageHandlers.func.postMessage(
JSON.stringify(reqRow)
); // ios
}
} catch (e) {
console.log(e, "e-----判断安卓苹果类型出错");
}
return
}
toPage(path) {
if (!path) return;
useRouter(path, {}, "navigateTo");