cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并错误

Browse Source
This commit is contained in:
gaoxs
2020-05-11 09:41:33 +08:00
parent a09052d967
commit f1561e64c6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/ShareInfo.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view v-if="shareInfoStatus" class="poster-first"> <view v-if="shareInfoStatus" class="poster-first">
<view class="mask-share"> <view class="mask-share">
<!-- <image src="@/static/images/share-info.png" @click="shareInfoClose" /> --> <image src="@/static/images/s/share-info.png" @click="shareInfoClose" />
</view> </view>
</view> </view>
</template> </template>

14
utils/index.js
View File

@ -112,12 +112,14 @@ export const copyClipboard = (data) => {
export const replaceLogin = (msg) => { export const replaceLogin = (msg) => {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ if (msg) {
title: msg, uni.showToast({
icon: 'none', title: msg,
duration: 2000 icon: 'none',
}); duration: 2000
// 这里代表已经失去登录状态以及401强制推出登录了 });
}
// 这里代表已经失去登录状态以及401强制退出登录了
store.commit('LOGOUT') store.commit('LOGOUT')
if (Vue.prototype.$deviceType == 'routine') { if (Vue.prototype.$deviceType == 'routine') {
// 如果是微信小程序，跳转到授权页 // 如果是微信小程序，跳转到授权页