From 5070148400b92512029d778399d639cf0347edcb Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Sat, 11 Sep 2021 11:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.js                 |  4 ++--
 common/uploadFile.js           |  2 --
 manifest.json                  |  2 +-
 pages/index/index.vue          |  3 +--
 pages/order/confirm_atonce.vue | 26 +++++++++++++-------------
 pages/order/confirm_order.vue  |  4 +++-
 pages/recommList/index.vue     |  2 +-
 7 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/common/http.js b/common/http.js
index 174aa4d..e613bfd 100644
--- a/common/http.js
+++ b/common/http.js
@@ -93,9 +93,9 @@ function $http(url, data = {}, options = {}){
 		var accountInfo = wx.getAccountInfoSync();
 		var autoappid = accountInfo.miniProgram.appId;
 		
-		options.appid = autoappid || 'wxeb58570b5e04d147';
+		console.log('当前自动获取的aapid',autoappid)
 		
-		console.log('请求',options.appid)
+		options.appid = autoappid || 'wxeb58570b5e04d147';
 		
 		let user_info = uni.getStorageSync('userinfo')
 		let user_token = user_info.token
diff --git a/common/uploadFile.js b/common/uploadFile.js
index 85d0d08..c096e0e 100644
--- a/common/uploadFile.js
+++ b/common/uploadFile.js
@@ -34,8 +34,6 @@ const uploadFile = function (filePath, successc, failc) {
 	var autoappid = accountInfo.miniProgram.appId;
 	
 	var uploadappid = autoappid || 'wxeb58570b5e04d147';
-	
-	console.log('上次',uploadappid)
 
 	uni.uploadFile({
 		url: url + url_a,//开发者服务器 url
diff --git a/manifest.json b/manifest.json
index f580220..e6bda00 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxeb58570b5e04d147",
+        "appid" : "wxb35ef055a4dd8ad4",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index faefc67..52b6012 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -322,7 +322,7 @@
 			content: '';
 			position: absolute;
 			z-index: 1;
-			// background: rgba(0, 0, 0, 0.5);
+			background: rgba(0, 0, 0, 0.3);
 			top: 0;
 			left: 0;
 		}
@@ -362,7 +362,6 @@
 				// height: 142rpx;
 				height: max-content;
 				width: 100%;
-				background-color: rgba(0,0,0,0.65);
 				box-sizing: border-box;
 				padding: 15rpx;
 				position: absolute;
diff --git a/pages/order/confirm_atonce.vue b/pages/order/confirm_atonce.vue
index 2d1a1df..0ab6664 100644
--- a/pages/order/confirm_atonce.vue
+++ b/pages/order/confirm_atonce.vue
@@ -1,4 +1,6 @@
-<template></template>
+<template>
+	<view></view>
+</template>
 
 <script>
 	export default {
@@ -37,19 +39,17 @@
 							}).then(res => {
 								uni.setStorageSync('userinfo', res.data);
 								that.userInfo = JSON.stringify(res.data)
-								if(res.data) {
-									uni.showModal({
-										title: '支付提示',
-										content: '确认支付吗?',
-										confirmColor: '#1998FE',
-										showCancel: false,
-										success(res2) {
-											if (res2.confirm) {
-												that.payOnce();
-											}
+								uni.showModal({
+									title: '支付提示',
+									content: '确认支付吗?',
+									confirmColor: '#1998FE',
+									showCancel: false,
+									success(res2) {
+										if (res2.confirm) {
+											that.payOnce();
 										}
-									});
-								}
+									}
+								});
 							})
 						}
 					}
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 44a852a..810bd62 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -148,7 +148,9 @@
 					that.$url('/pages/payState/paystate?ifSuccess=2&order_id='+that.pay_order_id,{type: 'redirect'})
 				}
 			})
-			
+		},
+		onUnload() {
+			uni.$off('payState');
 		},
 		methods: {
 			payStatus(type) {
diff --git a/pages/recommList/index.vue b/pages/recommList/index.vue
index 8531c01..fdb96bc 100644
--- a/pages/recommList/index.vue
+++ b/pages/recommList/index.vue
@@ -4,7 +4,7 @@
 			<u-tabs :list="tab_list" :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
 		</view>
 		<lf-nocontent v-else></lf-nocontent>
-		<swiper :style="{height: 'calc('+ windowHeight +'px - 60rpx)', width: '750rpx'}" :current="current" @change="swiperChange">
+		<swiper :style="{height: 'calc('+ windowHeight +'px - 60rpx)', width: '750rpx', padding: '0 0 86rpx 0'}" :current="current" @change="swiperChange">
 			<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 				<scroll-view class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 					<view class="lf-m-t-20"></view>