From ac31a0cd628be66dca1273d753aa993ab0e8cbd1 Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Thu, 11 May 2023 09:09:27 +0800
Subject: [PATCH] 1

---
 BagAuth/pages/login/oldLogin.vue         |  5 ++---
 BagAuth/pages/login/register.vue         |  5 +++--
 BagStation/pages/makeOrder/payResult.vue | 13 ++++++++-----
 components/three-sites.vue               |  1 +
 utils/request.js                         |  8 ++++----
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/BagAuth/pages/login/oldLogin.vue b/BagAuth/pages/login/oldLogin.vue
index e2e546a..6c10fba 100644
--- a/BagAuth/pages/login/oldLogin.vue
+++ b/BagAuth/pages/login/oldLogin.vue
@@ -8,7 +8,7 @@
 			<view class="padding-xl ">
 				<view class="image login-bg">
 					<image :src="otherImgURL+'logo@ZP.png'" mode="widthFix"></image>
-					<view class="text-bold text-lg padding-top">
+					<view class=" xxx text-bold text-lg padding-top">
 						一路油你 中品加油
 					</view>
 					<view class="text-df text-grey padding-top-xs padding-bottom">
@@ -19,8 +19,7 @@
 		</view>
 		<scroll-view class="bg-white nav padding login-shadow">
 			<view class="flex text-center padding-bottom">
-				<view class="cu-item text-bold text-lg flex-sub">
-
+				<view class="cu-item text-bold text-lg flex-sub"> 
 				</view>
 				<!-- <view class="cu-item text-bold text-lg flex-sub "
 					:class="[1==TabCur?'text-red cur':'',(animation=='animation-fades'&&1==TabCur)?'animation-fade':'']"
diff --git a/BagAuth/pages/login/register.vue b/BagAuth/pages/login/register.vue
index a1ff1ba..4d1d42b 100644
--- a/BagAuth/pages/login/register.vue
+++ b/BagAuth/pages/login/register.vue
@@ -7,7 +7,7 @@
 			:style="'background-image: url('+imgURL+'login-bg-top.png);height: 480upx;'">
 			<view class="padding-xl ">
 				<view class="image login-bg">
-					<image :src="imgURL+'new-logo.png'" mode="widthFix"></image>
+					<image :src="otherImgURL+'logo@ZP.png'" mode="widthFix"></image>
 					<view class="text-bold text-lg padding-top">
 						一路油你 中品加油
 					</view>
@@ -24,7 +24,7 @@
 					<view class="cu-item text-bold text-lg flex-sub">
 
 					</view>
-					<view class="cu-item text-red cur text-bold text-lg  flex-sub ">
+					<view class="cu-item text-blues cur text-bold text-lg  flex-sub ">
 						个人账号
 					</view>
 					<view class="cu-item text-bold text-lg flex-sub">
@@ -93,6 +93,7 @@
 		},
 		data() {
 			return {
+				otherImgURL: this.global.otherImgURL,
 				tips: '发送验证码',
 				accuntSource: false,
 				imgURL: this.global.imgURL,
diff --git a/BagStation/pages/makeOrder/payResult.vue b/BagStation/pages/makeOrder/payResult.vue
index ee937c9..1697944 100644
--- a/BagStation/pages/makeOrder/payResult.vue
+++ b/BagStation/pages/makeOrder/payResult.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
-			<block slot="backText">返回</block>
+			<block @click='clearInterval(timeinterval)' slot="backText">返回</block>
 			<block slot="content">订单支付结果</block>
 		</cu-custom>
 		<view   :class="showQr ? 'bg-blue' :''" >
@@ -315,7 +315,7 @@
 				},1000)  //设置定时器，时时间每隔一秒钟走一次（即每秒）
 				setTimeout(()=>{
 					this.newQrString()
-				},5000)
+				},2000)
 			
 			if(option.payMethod == '1' && option.status == 'success'){
 				if(option.status == 'success') {
@@ -399,13 +399,16 @@
 		,
 		onHide() {
 			console.log('这里是hiden')
-			this.innerAudioContext.stop()
+			this.innerAudioContext.stop();
+			clearInterval(this.timeinterval);
+			this.timeinterval =null
 		},
 		onUnload() {
 			console.log('这里是卸载页面')
 			this.innerAudioContext.stop();
-			if(this.timeinterval)clearInterval(this.timeinterval);
-		},
+			clearInterval(this.timeinterval);
+			this.timeinterval  = null
+			},
 	}
 </script>
 
diff --git a/components/three-sites.vue b/components/three-sites.vue
index f5e9fbf..6293b1f 100644
--- a/components/three-sites.vue
+++ b/components/three-sites.vue
@@ -9,6 +9,7 @@
 						<text class="cuIcon-close text-red"></text>
 					</view>
 				</view>
+				<img src=""  alt="">
 				<view class="padding-xl bg-white">
 					<view class="" v-if="siteList.length>0">
 						<three-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
diff --git a/utils/request.js b/utils/request.js
index 8cdeea2..510e9c9 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,12 +2,12 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 
 // const env = process.env.NODE_ENV
-// const env = 'production'/*  */
-const env = 'test'
-const testUrl = 'http://192.168.0.20:38080'
+const env = 'production'/*  */
+// const env = 'test'
+const testUrl = 'http://192.168.0.26:38080'
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
-const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+const productUrl = 'http://119.177.60.118:8000/adminapi' // 生产，加密 new 
 // const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new 
 const service = axios.create({
 	baseURL: env == 'production' ? productUrl : testUrl,