From a06111c67cc0a68e43e626de7d109ec18bbf4803 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 2 Mar 2024 14:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js                    |  4 +--
 libs/login.js                    |  4 +--
 pages/payment/get_payment.vue    | 62 +++++++++++++++++++-------------
 pages/users/login/login_copy.vue | 20 ++++++++---
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/config/app.js b/config/app.js
index aed86ed..5d52a61 100644
--- a/config/app.js
+++ b/config/app.js
@@ -12,8 +12,8 @@ let httpApiSix
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/libs/login.js b/libs/login.js
index 153c507..7da3eb9 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -47,8 +47,8 @@ export function toLogin(push, pathLogin) {
 	}
 	// #endif
 	if (!pathLogin)
-		pathLogin = '/page/users/login/login_copy'
-	Cache.set('login_back_url', path);
+		pathLogin = '/page/users/login/login_copy';
+  Cache.set('login_back_url', path);
 	// #ifdef H5
 	if (isWeixin()) {
 		auth.oAuth();
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index a430780..e94019e 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -1,12 +1,11 @@
 <template>
-	<view>
-		<view class="container" v-if="merchantInfo && !isEmpty">
-			<view class="v-navbar">
-				<u-navbar title="面对面收款" :safeAreaInsetTop="false" :fixed="false" :autoBack="true" bgColor="transparent"
-					leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
-				</u-navbar>
-			</view>
-
+	<view class="container">
+    <view class="v-navbar">
+    	<u-navbar title="面对面收款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
+    		leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
+    	</u-navbar>
+    </view>
+		<view v-if="merchantInfo && !isEmpty">
 			<view class="v-desc">
 				<view>
 					<view class="v-desc-main">付款给商家</view>
@@ -50,9 +49,9 @@
 		<!-- 无商户信息提示 -->
 		<view v-else class="empty">
 			<image src="/static/images/no_thing.png"></image>
-			<text>暂未登陆~</text>
+			<text style="margin-top: 60rpx;">{{tips}}</text>
 			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
+			<authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
 			</authorize>
 		</view>
 	</view>
@@ -64,6 +63,7 @@
 		addCart,
 		orderCheck
 	} from "@/api/payment.js";
+  import Cache from '@/utils/cache';
 	import {
 		mapGetters
 	} from "vuex";
@@ -100,27 +100,35 @@
 				},
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				mer_id: ''
+				mer_id: '',
+        tips: '暂未登陆~'
 			}
 		},
 
 		onLoad(opt) {
 			this.mer_id = opt.mer_id;
-			if (!this.isLogin) {
-				this.isAuto = true;
-				this.isShowAuth = true
-			} else {
-				this.getProductInfoByMerid(opt.mer_id);
-			}
 		},
-
+    onShow() {
+      if (!this.isLogin) {
+        Cache.set("login_back_url_weixin", getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
+      	this.isAuto = true;
+      	this.isShowAuth = true;
+      } else {
+      	this.getProductInfoByMerid(this.mer_id);
+      }
+    },
 		methods: {
+      leftClick(e){
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      },
 			// 授权关闭
 			authColse: function(e) {
 				this.isShowAuth = e;
 			},
 			onLoadFun() {
-				this.$Cache.set("login_back_url", getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
+        this.getProductInfoByMerid(this.mer_id);
 				this.isShowAuth = false;
 			},
 
@@ -151,9 +159,9 @@
 							})
 						});
 					});
-				}).catch(() => {
+				}).catch((err) => {
 					this.$util.Tips({
-						title: "操作失败！"
+						title: err.message || err.msg || err
 					})
 				})
 			},
@@ -165,10 +173,16 @@
 				}).then(res => {
 					this.merchantInfo = res.data;
 				}).catch((err) => {
+          this.tips = err.message || err.smg || err;
+          this.$util.Tips({
+          	title: err.message || err.msg || err
+          })
 					// #ifdef APP
-					uni.navigateBack({
-						delta: 1
-					})
+					setTimeout(()=>{
+            uni.navigateBack({
+            	delta: 1
+            })
+          }, 1500)
 					// #endif
 
 					// #ifndef APP
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index eb3bfcc..ffce2df 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -254,6 +254,7 @@
 		mapGetters
 	} from "vuex";
 	import Verify from '@/components/verify/verify.vue';
+import { Toast } from "../../../libs/uniApi";
 	const BACK_URL = "login_back_url";
 	// #ifdef APP-PLUS
 	var jpushModule = uni.requireNativePlugin("JG-JPush");
@@ -726,17 +727,26 @@
 						// #endif
 					})
 					.then(res => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
 						that.$store.commit("LOGIN", {
 							'token': res.data.token,
 							'time': res.data.exp
 						});
 						that.$store.commit("SETUID", res.data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', res.data.user);
-						uni.switchTab({
-							url: '/pages/user/index'
-						})
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+            let method
+            let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+            	'/pages/goods_cate/goods_cate',
+            	'/pages/user/index'
+            ]
+            if (indexPat.includes(this.getPath(backUrl))) {
+            	method = 'switchTab'
+            } else {
+            	method = 'navigateTo'
+            }
+            uni[method]({
+            	url: backUrl
+            });
 					})
 					.catch(res => {
 						that.$util.Tips({