合并错误

components/ShareInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <view v-if="shareInfoStatus" class="poster-first">
     <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>
 </template>

utils/index.js

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