feat：v1.4前端更新

app/libs/login.js

@@ -1,46 +1,50 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
 import store from "../store";
 import Cache from '../utils/cache';
 import { Debounce } from '@/utils/validate.js'
-// #ifdef H5
+// #ifdef H5 || APP-PLUS
 import { isWeixin } from "../utils";
 import auth from './wechat';
 // #endif
 
+
 import { LOGIN_STATUS, USER_INFO, EXPIRES_TIME, STATE_R_KEY, BACK_URL} from './../config/cache';
 
 function prePage(){
 	let pages = getCurrentPages();
 	let prePage = pages[pages.length - 1];
-	return prePage.route;
+	return prePage.$page.fullPath;
 }
 
 export const toLogin = Debounce(_toLogin,800)
 
 export function _toLogin(push, pathLogin) {
+	// 公众号登录方式(单选),1微信授权，2手机号登录/
+	let publicLoginType = getApp().globalData.publicLoginType;
 	
 	store.commit("LOGOUT");
 	let path = prePage();
 	let login_back_url = Cache.get(BACK_URL);
-	
-	// #ifdef APP
-		uni.navigateTo({
-			url: '/pages/users/login/index'
-		})
-		return
-	// #endif
-	
-	
 	// #ifdef H5
-	// path = location.href;
+	path = location.href;
 	path = location.pathname + location.search;
 	// #endif
 	if(!pathLogin){
 		pathLogin = '/page/users/login/index'
-		Cache.set('login_back_url',path);
+		Cache.set(BACK_URL,path);
 	}
 		
 	// #ifdef H5
-	if (isWeixin()) {
+	if (isWeixin() && publicLoginType ==1) {
 		let urlData = location.pathname + location.search
 		if (urlData.indexOf('?') !== -1) {
 			urlData += '&go_longin=1';
@@ -68,9 +72,26 @@ export function _toLogin(push, pathLogin) {
 	if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) {
 		// #ifdef MP
 		uni.navigateTo({
-			url: '/pages/users/wechat_login/index'
+			 url: '/pages/users/wechat_login/index'
 		})
 		// #endif
+		// #ifdef APP-PLUS
+			uni.showModal({
+			    title: '登录提示',
+			    content: '登录以后可体验商城完整功能',
+				cancelColor: '#000000',
+				confirmColor: '#526BB1',
+			    success: function (res) {
+			        if (res.confirm) {
+			           uni.navigateTo({
+			           	url: '/pages/users/login/index'
+			           })
+			        } else if (res.cancel) {
+			            // console.log('用户点击取消');
+			        }
+			    }
+			});
+		// #endif
 	}
 }