From 12ea919be4f724cbca4464e8941264f3d0652087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 19 Sep 2022 16:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF=E6=BA=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/pages/account/login/index.vue   | 21 ++++++++++++++++++-
 .../pages/users/payment_on_behalf/index.vue   | 12 +++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue
index a4ef34055..1ce82ee2a 100644
--- a/template/admin/src/pages/account/login/index.vue
+++ b/template/admin/src/pages/account/login/index.vue
@@ -59,7 +59,9 @@
         :imgSize="{ width: '330px', height: '155px' }"
       ref="verify"
     ></Verify>
-
+    <div class="footer">
+      <div class="pull-right">{{copyright}}</div>
+    </div>
   </div>
 </template>
 <script>
@@ -102,6 +104,7 @@ export default {
       swiperList: [],
       defaultSwiperList: require('@/assets/images/sw.jpg'),
       key: '',
+      copyright: 'Copyright © 2022 | 西安众邦网络科技有限公司',
     };
   },
   created() {
@@ -166,6 +169,7 @@ export default {
           this.login_logo = data.login_logo ? data.login_logo : require('@/assets/images/logo.png');
           this.swiperList = data.slide.length ? data.slide : [{ slide: this.defaultSwiperList }];
           this.key = data.key;
+          if(data.copyright != '') this.copyright = data.copyright;
         })
         .catch((err) => {
           this.$Message.error(err);
@@ -451,4 +455,19 @@ a:link, a:visited, a:hover, a:active {
   padding: 10px 20px;
   height: 36px;
 }
+.pull-right {
+    float: right!important;
+}
+.footer{
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  left: 0;
+  margin: 0;
+  background: rgba(255,255,255,.8);
+  border-top: 1px solid #e7eaec;
+  overflow: hidden;
+  padding: 10px 20px;
+  height: 36px;
+}
 </style>
diff --git a/template/uni-app/pages/users/payment_on_behalf/index.vue b/template/uni-app/pages/users/payment_on_behalf/index.vue
index c118c8039..cd7d350ab 100644
--- a/template/uni-app/pages/users/payment_on_behalf/index.vue
+++ b/template/uni-app/pages/users/payment_on_behalf/index.vue
@@ -187,8 +187,8 @@
 				this.pay_close = true;
 			},
 			getDetail() {
+				let that = this;
 				friendDetail(this.order_id).then(res => {
-					console.log(res)
 					this.resData = res.data.info
 					if (this.resData.paid && !this.resData.type) {
 						this.goOrderDetail()
@@ -196,7 +196,15 @@
 					//#ifdef H5
 					this.ShareInfo(this.resData)
 					//#endif
-				})
+				}).catch((err) => {
+					console.log('1',err)
+					that.$util.Tips({
+						title: err
+					}, {
+						tab: 4,
+						url: '/pages/index/index'
+					});
+				});
 			},
 			//#ifdef H5
 			ShareInfo(data) {