Compare commits
No commits in common. "c43b52fbba7743951bbd70364707ac0eceb32f35" and "343981a0a53f467e1d3aa9a254a8208f242d454a" have entirely different histories.
c43b52fbba
...
343981a0a5
@ -1,5 +1,5 @@
|
||||
const baseUrl = 'https://ddbs.1024tool.vip/';
|
||||
let isNavigatingToLogin = false;
|
||||
|
||||
function request(url, method = 'GET', data = {}) {
|
||||
const header = {
|
||||
'content-type': 'application/json',
|
||||
@ -21,19 +21,12 @@ function request(url, method = 'GET', data = {}) {
|
||||
if (res.data.code) {
|
||||
if (res.data.code == 10103) {
|
||||
wx.removeStorageSync('access_token');
|
||||
if (!isNavigatingToLogin) {
|
||||
const pages = getCurrentPages();
|
||||
const currentRoute = pages[pages.length - 1]?.route;
|
||||
if (currentRoute !== 'pages/login/login') {
|
||||
isNavigatingToLogin = true;
|
||||
wx.navigateTo({
|
||||
url: '/pages/login/login',
|
||||
complete: () => {
|
||||
isNavigatingToLogin = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
// wx.switchTab({
|
||||
// url: '/pages/my/index',
|
||||
// })
|
||||
wx.navigateTo({
|
||||
url: '/pages/login/login',
|
||||
})
|
||||
reject(res.data);
|
||||
}
|
||||
reject(res.data);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import * as echarts from '../../ec-canvas/echarts.min';
|
||||
import request from '~/api/request';
|
||||
import { heightList, weightList } from '~/assets/js/heightWeight';
|
||||
import { heightList, weightList } from '../../assets/js/heightWeight';
|
||||
const app = getApp();
|
||||
|
||||
Page({
|
||||
|
||||
@ -66,22 +66,22 @@
|
||||
</view>
|
||||
<text class="echarts-title">{{activeIndex == 0 ? '身高(cm)':'体重(g)'}}</text>
|
||||
<view class="echarts-canvas-container">
|
||||
<ec-canvas wx:if="{{ activeIndex == 0 }}" id="mychart-dom-height" canvas-id="mychart-height" ec="{{ ec }}" ></ec-canvas>
|
||||
<ec-canvas wx:else id="mychart-dom-weight" canvas-id="mychart-weight" ec="{{ ec2 }}" ></ec-canvas>
|
||||
<ec-canvas wx:if="{{ activeIndex == 0 }}" id="mychart-dom-height" canvas-id="mychart-height" ec="{{ ec }}" force-use-old-canvas="true"></ec-canvas>
|
||||
<ec-canvas wx:else id="mychart-dom-weight" canvas-id="mychart-weight" ec="{{ ec2 }}" force-use-old-canvas="true"></ec-canvas>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item-title">
|
||||
总胆红素趋势</view>
|
||||
<view class="item-content">
|
||||
<view class="echarts-canvas-container">
|
||||
<ec-canvas id="mychart-dom-direct" canvas-id="mychart-direct" ec="{{ ec3 }}" ></ec-canvas>
|
||||
<ec-canvas id="mychart-dom-direct" canvas-id="mychart-direct" ec="{{ ec3 }}" force-use-old-canvas="true"></ec-canvas>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item-title">
|
||||
直接胆红素趋势</view>
|
||||
<view class="item-content">
|
||||
<view class="echarts-canvas-container">
|
||||
<ec-canvas id="mychart-dom-indirect" canvas-id="mychart-indirect" ec="{{ ec4 }}" ></ec-canvas>
|
||||
<ec-canvas id="mychart-dom-indirect" canvas-id="mychart-indirect" ec="{{ ec4 }}" force-use-old-canvas="true"></ec-canvas>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<view class="box_1">
|
||||
<view class="image_1"></view>
|
||||
<view class="image-wrapper_1">
|
||||
<!-- <text class="iconfont icon-fanhui image_2" bind:tap="toBack"></text> -->
|
||||
<text class="iconfont icon-fanhui image_2" bind:tap="toBack"></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="box_2">
|
||||
@ -13,13 +13,13 @@
|
||||
<view class="section_1">
|
||||
<view class="image-text_1">
|
||||
<text class="iconfont icon-shouji thumbnail_1"></text>
|
||||
<input bindchange="bindKeyInput" lines="1" type="number" class="text-group_2" maxlength="11" placeholder="请输入手机号" data-mode="mobile" value="{{mobile}}"></input>
|
||||
<input lines="1" type="number" class="text-group_2" maxlength="11" placeholder="请输入手机号" data-mode="mobile" value="{{mobile}}"></input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="section_2">
|
||||
<view class="image-text_2">
|
||||
<text class="iconfont icon-mima1 thumbnail_2"></text>
|
||||
<input bindchange="bindKeyInput" lines="1" type="text" class="text-group_3" placeholder="请输入密码" data-mode="password" password="{{!showPassword}}" value="{{password}}"></input>
|
||||
<input lines="1" type="text" class="text-group_3" placeholder="请输入密码" data-mode="password" password="{{!showPassword}}" value="{{password}}"></input>
|
||||
<text class="iconfont icon-yanjing_yincang yanjing" wx:if="{{!showPassword}}" bindtap="togglePassword"></text>
|
||||
<text class="iconfont icon-yanjing-xianshi yanjing" wx:if="{{showPassword}}" bindtap="togglePassword"></text>
|
||||
</view>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user