2024.03.04

- 针对小程序环境完善拦截器提示框显示报错信息逻辑；

pages/login/login.vue

@@ -99,7 +99,7 @@
 				</view>
 				<!-- #endif -->
 				<view
-					v-if="(terminal === 3) || (terminal === 2)"
+					v-if="(terminal === 6) || (terminal === 3) || (terminal === 2)"
 					style="display: flex;flex-direction: column;align-items: center;padding-left: 48rpx;"
 				>
 					<view style="width: fit-content;padding: 14rpx;border: 1rpx solid #ffffff;border-radius: 48rpx;">
@@ -173,7 +173,7 @@ export default {
 			uni.switchTab({
 				url: '/pages/index/index'
 			})
-		} else if (this.$store.state.app.terminal === 3) {
+		} else if ((this.$store.state.app.terminal === 6) || (this.$store.state.app.terminal === 3)) {
 			const code = getUrlCode().code
 			if (code) this.handleWXLogin()
 		}

store/modules/app.js

@@ -1,5 +1,5 @@
 import { CHANGE_IS_IN_MINIPROGRAM, CHANGE_SYSTERM_INFO, CHANGE_SYSTERM_TERMINAL } from './type'
-import { isInWx } from '../../utils'
+import { isInWx, isH5InWebview } from '../../utils'
 
 export default {
 	namespaced: true,
@@ -44,10 +44,14 @@ export default {
 				})
 			})
 		},
-		getSystermTerminal({ commit }) {
+		getSystermTerminal({ state, dispatch, commit }) {
 			return new Promise((resolve, reject) => {
 				if (isInWx()) {
-					commit(CHANGE_SYSTERM_TERMINAL, 3)
+					if (state.isInMiniProgram || isH5InWebview()) {
+						commit(CHANGE_SYSTERM_TERMINAL, 6)
+					} else {
+						commit(CHANGE_SYSTERM_TERMINAL, 3)
+					}
 				} else {
 					// #ifdef H5
 					commit(CHANGE_SYSTERM_TERMINAL, 5) // H5包含pc和移动端浏览器和微信浏览器的可能

store/modules/auth.js

@@ -62,6 +62,9 @@ export default {
 					})
 					.catch((err) => {
 						uni.hideLoading()
+						// // #ifdef MP
+						// uni.showToast({ title: (err && err.message) || JSON.stringify(err), icon: 'none' })
+						// // #endif
 						reject(err)
 					})
 			})
@@ -144,10 +147,10 @@ export default {
 					uni.login({
 						provider: 'weixin',
 						success: (res) => {
-							uni.hideLoading()
 							loginData.code = res.code
 						},
 						fail: (err) => {
+							uni.hideLoading()
 							uni.showToast({ title: '微信登录授权失败', icon: 'none' })
 						}
 					})

utils/AnotherTFRequest.js

@@ -9,6 +9,8 @@ const request = (base_url) => function (url, data = {}, method = 'GET', cb, head
 		if (res.token) header.Authorization = res.token
 		if (res.ssoUserInfo && res.ssoUserInfo.token) header['satoken-user'] = res.ssoUserInfo.token
 		// showLoading()
+		let _isShowToast = true
+		if (data._isShowToast === false) (_isShowToast = false) && delete data._isShowToast
 		uni.request({
 			url: base_url + url,
 			data,
@@ -40,11 +42,25 @@ const request = (base_url) => function (url, data = {}, method = 'GET', cb, head
 						})
 						reject(res.data)
 					} else {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none'
-						})
 						reject(res.data)
+						if (_isShowToast) {
+							// #ifndef MP
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none'
+							})
+							// #endif
+							// #ifdef MP
+							Promise.resolve().then(() => {
+								Promise.resolve().then(() => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none'
+									})
+								})
+							})
+						// #endif
+						}
 					}
 				} else {
 					reject(res)

utils/Commonutils.js

@@ -1,8 +1,8 @@
-// import { whoami } from '../api/auth'
-import { USER_ID, T_STORAGE_KEY, USER_INFO } from '../constant'
+// import { whoami, getConfigApi } from '../api/auth'
+import { USER_ID, T_STORAGE_KEY, USER_INFO, USER_TOKEN } from '../constant'
+// const wx = require('weixin-js-sdk')
 // import { isNull } from 'lodash-es'
 
-
 /**
  * @description 解决小数计算精度问题（en，你应该使用big.js）
  * @param {Number, String} data 数字
@@ -170,25 +170,128 @@ export const getStorageKeyToken = () => {
 }
 
 /**
- * 跳转到新团蜂入驻端项目
- * @returns
+ * 判断当前H5是否在webview中打开
  */
 
-export const jumpToOtherProject = (url, cb = () => { }) => {
+export const isH5InWebview = () => {
+	const ua = navigator.userAgent.toLowerCase()
+	return typeof ua === 'string' && (ua.includes('webview') || ua.includes('miniprogramhtmlwebview'))
+}
+
+// 判断当前是否处于微信环境
+export const isInWx = () => {
 	// #ifdef H5
-	window.location.href = url
+	var ua = navigator.userAgent.toLowerCase()
+	return ua.match(/MicroMessenger/i) == 'micromessenger'
 	// #endif
+
 	// #ifdef APP
-	plus.runtime.openURL(url, cb)
-	// #endif
-	// #ifdef MP
-	uni.redirectTo({
-		url: `/user/view?target=${url}`
-	})
+	return false
 	// #endif
 }
 
 /**
+ * 跳转到新团蜂入驻端项目
+ * @returns
+ */
+
+export const jumpToOtherProject = ({ isInMiniProgram, id, appId, url, toType, query, montageTerminal }, cb = () => { }) => {
+	if (toType === 'H5') {
+		// #ifdef H5
+		window.location.href = url
+		// #endif
+		// #ifdef APP
+		plus.runtime.openURL(url, cb)
+		// #endif
+		// #ifdef MP
+		uni.redirectTo({
+			url: `/user/view?target=${url}`
+		})
+		// #endif
+	} else if (toType === 'MP') {
+		if (isInWx()) {
+			if (isInMiniProgram || isH5InWebview()) {
+				wx.miniProgram.navigateTo({ // 先跳去本小程序其它页面，再跳去其它小程序页面
+					url: query && montageTerminal && montageTerminal.includes(6) ? `/${url}${query}` : `/${url}`,
+					fail: () => {
+						setTimeout(() => { uni.switchTab({	url: '/pages/index/index' }) }, 2000)
+					}
+				})
+			} else {
+				if (!getStorageKeyToken()) return
+				const currentUrl = window.location.href.replace('#', 'ericToken')
+				getConfigApi({
+					url: currentUrl,
+					token: uni.getStorageSync(USER_TOKEN)
+				}).then(({ data }) => {
+					wx.config({
+						debug: false, // 开启调试模式
+						appId: data.appId, // 必填，公众号的唯一标识
+						timestamp: data.timestamp, // 必填，生成签名的时间戳
+						nonceStr: data.nonceStr, // 必填，生成签名的随机串
+						signature: data.signature, // 必填，签名，见附录1
+						jsApiList: [
+							'updateAppMessageShareData',
+							'updateTimelineShareData',
+							'onMenuShareAppMessage',
+							'onMenuShareTimeline'
+						], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+						openTagList: [ 'wx-open-launch-weapp' ]
+					})
+					wx.ready(function () {
+						// config信息验证成功
+						// console.log(res);
+					})
+					wx.error(function (res) {
+						// config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+						// alert('error:'+JSON.stringify(res));
+					})
+				})
+			}
+		} else {
+			// #ifdef H5
+			location.href = 'weixin://dl/business/?appid=wxb446588ba0dbb9d7&path=pages/index/index'
+			// #endif
+			// #ifdef APP
+			plus.share.getServices(function (result) {
+				let sweixin = null
+				for (const i in result) {
+					if (result[i].id == 'weixin') {
+						sweixin = result[i]
+					}
+				}
+				if (sweixin) {
+					sweixin.launchMiniProgram({
+						id, // 微信小程序的原始ID（"g_"开头的字符串）
+						type: 0,
+						path: query && montageTerminal && montageTerminal.includes(1) ? url + query : url
+					})
+				}
+			}, function (e) {
+				console.log('获取分享服务列表失败：' + e.message)
+			})
+			// #endif
+			// #ifdef MP
+			uni.navigateToMiniProgram({
+				appId,
+				path: query && montageTerminal && (montageTerminal.includes(2) || montageTerminal.includes(4)) ? url + query : url,
+				extraData: {},
+				success: (res) => {
+					console.log('打开成功')
+				},
+				fail: (err) => {
+					console.log('打开失败', err)
+				},
+				complete: (result) => {
+					console.log(result)
+				}
+			})
+			// #endif
+		}
+	}
+}
+
+/**
  * 点击复制
  * @param {*} text
  */
@@ -312,18 +415,6 @@ export const getUrlCode = () => {
 }
 // #endif
 
-// 判断当前是否处于微信环境
-export const isInWx = () => {
-	// #ifdef H5
-	var ua = navigator.userAgent.toLowerCase()
-	return ua.match(/MicroMessenger/i) == 'micromessenger'
-	// #endif
-
-	// #ifdef APP
-	return false
-	// #endif
-}
-
 /**
  * 大数转小数 12345.123 = 1.23万
  */
@@ -369,15 +460,6 @@ export const tradeOrderNo = function () {
 }
 
 /**
- * 判断当前H5是否在webview中打开
- */
-
-export const isH5InWebview = () => {
-	const ua = navigator.userAgent.toLowerCase()
-	return typeof ua === 'string' && (ua.includes('webview') || ua.includes('miniprogramhtmlwebview'))
-}
-
-/**
  * 判断当前资源是否是视频格式
  * @param {string} url
  * @returns {boolean}