Compare commits

...

7 Commits

Author SHA1 Message Date
FrancisHu 2df97b5cb2 4.17重庆冲突修改 2024-04-17 13:44:42 +08:00
FrancisHu 5f25b23564 4.17跳转提交 2024-04-17 13:41:49 +08:00
FrancisHu 5b0c9b5155 4.15解决冲突 2024-04-15 15:55:08 +08:00
FrancisHu 188b9b1871 4.15提交 2024-04-15 15:54:12 +08:00
FrancisHu 3c8369e7ba 解决冲突 2024-04-12 15:45:26 +08:00
FrancisHu bd1d85c42e 4.12宁夏merge修改 2024-04-12 15:41:38 +08:00
FrancisHu 0f358e7af5 4.8宁夏显示领料申请 2024-04-08 17:31:04 +08:00
13 changed files with 124 additions and 1065 deletions

View File

@ -340,7 +340,14 @@ import { basePath } from '../../public'
} else if (res.data.code == 500) { } else if (res.data.code == 500) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '登录状态已过期,请重新登录!' title: '登录状态已过期,请重新登录!',
success: () => {
uni.removeStorageSync('token')
uni.removeStorageSync('userInfo')
uni.reLaunch({
url: '/pages/login/login'
})
}
}) })
} else { } else {
uni.showToast({ uni.showToast({

View File

@ -358,7 +358,14 @@ import { basePath } from '../../public'
} else if (res.data.code == 500) { } else if (res.data.code == 500) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '登录状态已过期,请重新登录!' title: '登录状态已过期,请重新登录!',
success: () => {
uni.removeStorageSync('token')
uni.removeStorageSync('userInfo')
uni.reLaunch({
url: '/pages/login/login'
})
}
}) })
} }
}).catch(err => { }).catch(err => {

View File

@ -643,13 +643,15 @@ import { basePath } from '../../public'
that.showLoading = false that.showLoading = false
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '登录状态已过期,请重新登录!' title: '登录状态已过期,请重新登录!',
success: () => {
uni.removeStorageSync('token')
uni.removeStorageSync('userInfo')
uni.reLaunch({
url: '/pages/login/login'
})
}
}) })
/* setTimeout(() => {
uni.reLaunch({
url: '/pages/login/login'
})
}, 200) */
} else { } else {
that.showLoading = false that.showLoading = false
uni.showToast({ uni.showToast({

View File

@ -17,7 +17,7 @@
<span>已认证</span> <span>已认证</span>
</h4> </h4>
</view> </view>
<u-cell-group style="width: 95%; margin: 15rpx auto;" :border="false"> <!-- <u-cell-group style="width: 95%; margin: 15rpx auto;" :border="false">
<u-cell <u-cell
title="个人信息" title="个人信息"
:isLink="true" :isLink="true"
@ -32,7 +32,7 @@
:border="false" :border="false"
> >
</u-cell> </u-cell>
</u-cell-group> </u-cell-group> -->
<!-- <button ></button> --> <!-- <button ></button> -->
<view <view
class="exit-log" class="exit-log"

View File

@ -6,10 +6,10 @@
</view> </view>
<h4 class="tit">业务办理</h4> <h4 class="tit">业务办理</h4>
<view class="secs"> <view class="secs">
<!-- <view @click="jumpUrl('fetchMaterial')"> <view @click="jumpUrl('fetchMaterial')">
<image src="/static/fetchMaterial.png" mode=""></image> <image src="/static/fetchMaterial.png" mode=""></image>
<span>领料申请</span> <span>领料申请</span>
</view> --> </view>
<view @click="jumpUrl('exitMaterial')"> <view @click="jumpUrl('exitMaterial')">
<image src="/static/exitMaterial.png" mode=""></image> <image src="/static/exitMaterial.png" mode=""></image>
<span>退料申请</span> <span>退料申请</span>

Binary file not shown.

View File

@ -1 +1 @@
https://app.liuyingyong.cn/build/download/45b01760-f60e-11ee-af20-cdedf0f0a7ec https://app.liuyingyong.cn/build/download/bdfad4c0-fafd-11ee-bf83-f33121d734c6

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff