From b2c2c41a428ec7fa15c6df5d16df03a0d531d141 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Fri, 10 Sep 2021 18:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA=E5=90=B8?=
 =?UTF-8?q?=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.js                |  2 +-
 common/uploadFile.js          |  2 +-
 components/lf-nav/lf-nav.vue  | 14 +++++++++++---
 manifest.json                 |  2 +-
 pages/index/index.vue         | 17 ++++++++++++++++-
 pages/order/confirm_order.vue |  3 +--
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/common/http.js b/common/http.js
index eb42767..174aa4d 100644
--- a/common/http.js
+++ b/common/http.js
@@ -93,7 +93,7 @@ function $http(url, data = {}, options = {}){
 		var accountInfo = wx.getAccountInfoSync();
 		var autoappid = accountInfo.miniProgram.appId;
 		
-		options.appid = autoappid || 'wxb35ef055a4dd8ad4';
+		options.appid = autoappid || 'wxeb58570b5e04d147';
 		
 		console.log('请求',options.appid)
 		
diff --git a/common/uploadFile.js b/common/uploadFile.js
index c9925bc..85d0d08 100644
--- a/common/uploadFile.js
+++ b/common/uploadFile.js
@@ -33,7 +33,7 @@ const uploadFile = function (filePath, successc, failc) {
 	var accountInfo = wx.getAccountInfoSync();
 	var autoappid = accountInfo.miniProgram.appId;
 	
-	var uploadappid = autoappid || 'wxb35ef055a4dd8ad4';
+	var uploadappid = autoappid || 'wxeb58570b5e04d147';
 	
 	console.log('上次',uploadappid)
 
diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index ca84d93..aacc359 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view :style="{marginBottom: spreadOut ? headHeight + 'px' : '0px'}">
+		<view :style="{marginBottom: spreadOut ? headHeight + 'px' : '0px', '--diycolor': inputColor, '--diytextcolor': textColor}">
 			<view :class="{head: true, 'border-b': boderBottom}" :style="{height: headHeight + 'px', background: bgColor}">
 			 <block v-if="diy">
 				 <view class="diy-head" :style="{'top': headHeight - 38 + 'px'}">
@@ -63,6 +63,14 @@
 			boderBottom: {
 				type: Boolean, // 是否显示底部边框线
 				default: false
+			},
+			inputColor: {
+				type: String, // 标题字体颜色
+				default: 'rgba(255,255,255,0.5)'
+			},
+			textColor: {
+				type: String, // 标题字体颜色
+				default: '#777'
 			}
 		},
 		data() {
@@ -186,7 +194,7 @@
 .search{
 	width: 344rpx;
 	height: 50rpx;
-	background-color: rgba(255,255,255,0.5);
+	background-color: var(--diycolor);
 	color: #777;
 	border-radius: 30rpx;
 	margin: 0 auto;
@@ -197,7 +205,7 @@
 }
 
 /deep/.input-placeholder{
-	color: #777;
+	color: var(--diytextcolor);
 	font-size: 40rpx!important;
 }
 
diff --git a/manifest.json b/manifest.json
index e6bda00..f580220 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxb35ef055a4dd8ad4",
+        "appid" : "wxeb58570b5e04d147",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 41828bd..faefc67 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<lf-nav :search="true" :spreadOut="false" bgColor="transparent"></lf-nav>
+		<lf-nav :search="true" :bgColor="nav_bg_color" :inputColor="nav_input_color" :textColor="nav_text_color" :spreadOut="false"></lf-nav>
 		<swiper class="head" :current="banner_current" autoplay interval="3000">
 			<swiper-item @click="clickBanner(item.type,item.url)" v-for="(item,index) of banner" :key="index">
 				<image :src="item.picture" class="swipe-img" mode="aspectFill"></image>
@@ -125,6 +125,9 @@
 		data() {
 			return {
 				banner: [],
+				nav_bg_color: 'transparent' ,// 导航背景颜色
+				nav_input_color: 'rgba(255,255,255,0.5)',
+				nav_text_color: '#777',
 				banner_current: 0,
 				recomm_list: [],
 				channel_list: [],
@@ -143,6 +146,18 @@
 			this.getIndexData()
 			this.getFavourite()
 		},
+		// 页面滚动
+		onPageScroll(event){
+			if(event.scrollTop >= 100){
+				this.nav_bg_color = '#1998FE';
+				this.nav_input_color = 'rgba(255,255,255,0.5)';
+				this.nav_text_color = '#fff';
+			}else{
+				this.nav_bg_color = 'transparent';
+				this.nav_input_color = 'rgba(255,255,255,0.5)';
+				this.nav_text_color = '#777';
+			}
+		},
 		methods: {
 			//获取猜你喜欢
 			getFavourite() {
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 588859d..44a852a 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -137,9 +137,8 @@
 			}
 		},
 		onShow(e) {
-			// this.backPayState = uni.getStorageSync('backPayState')
 			let that = this
-			 uni.$on('payState',(data) => {
+			uni.$on('payState',(data) => {
 				that.payState = data.msg;
 				that.pay_order_id = data.payorder_id;
 				console.log('传来的订单id',that.pay_order_id)