From c9cfce929560c8c4ea47abd96f21237003e1ed73 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Tue, 18 Apr 2023 22:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                   |  4 +++-
 pages/app/merchant/apply.vue | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index 30a70c9..8a9d57e 100644
--- a/pages.json
+++ b/pages.json
@@ -262,7 +262,9 @@
 					"path": "merchant/apply",
 					"style": {
 						"navigationBarTitleText": "门店入驻",
-						"navigationStyle": "custom"
+						"navigationBarBackgroundColor": "#21222B",
+						"navigationBarTextStyle": "white"
+						// "navigationStyle": "custom"
 					},
 					"meta": {
 						"auth": true,
diff --git a/pages/app/merchant/apply.vue b/pages/app/merchant/apply.vue
index b4416c5..b277d18 100644
--- a/pages/app/merchant/apply.vue
+++ b/pages/app/merchant/apply.vue
@@ -2,9 +2,9 @@
 <template>
 	<view class="apply-commission-wrap page_box">
 		<!-- 标题栏 -->
-		<view class="head-box">
+		<!-- <view class="head-box">
 			<shopro-navbar back-icon-color="#fff" :background="{}"></shopro-navbar>
-		</view>
+		</view> -->
 
 		<!-- 表单 -->
 		<view class="apply-form content_box">
@@ -27,7 +27,7 @@
 				<u-form-item :labelStyle="labelStyle" label-width="150" label-position="left" label="营业天数" prop="weeks">
 					<u-input type="select" placeholder="请选择营业天数" disabled :placeholderStyle="placeholderStyle" v-model="model.weeks" @click="onSelect('week')"></u-input>
 				</u-form-item>
-				<u-form-item :labelStyle="labelStyle" right-icon="map-fill" :right-icon-style="{color:'#4CB89D'}" label-width="150" label-position="left" label="所在地区" prop="area">
+				<u-form-item :labelStyle="labelStyle" right-icon="map-fill" :right-icon-style="{color:'#EDCE9A'}" label-width="150" label-position="left" label="所在地区" prop="area">
 					<u-input type="text" disabled v-model="model.area" placeholder="请点击定位" @click="chooseLocation"></u-input>
 				</u-form-item>
 				<u-form-item :border-bottom="false" :labelStyle="labelStyle" label-width="150" label-position="left" label="详细地址" prop="address">
@@ -474,9 +474,10 @@
 		background-color: #fff;
 
 		.head-box {
-			background: url($IMG_URL+'/imgs/user/sh_leader_apply_head.png') no-repeat;
+			// background-color: #EDCE9A;
+			// background: url($IMG_URL+'/imgs/user/sh_leader_apply_head.png') no-repeat;
 			background-size: 100% auto;
-			height: 370rpx;
+			// height: 370rpx;
 		}
 	}
 
@@ -493,15 +494,16 @@
 			.agreement-text {
 				font-size: 24rpx;
 				font-weight: 500;
-				color: #4cb89d;
+				color: #EDCE9A;
 			}
 		}
 
 		.save-btn {
 			width: 690rpx;
 			line-height: 86rpx;
-			background: linear-gradient(90deg, #2dae9c, #6bc29e);
-			box-shadow: 0px 7rpx 11rpx 2rpx rgba(61, 179, 156, 0.34);
+			// background: linear-gradient(90deg, #2dae9c, #6bc29e);
+			background: #EDCE9A;
+			// box-shadow: 0px 7rpx 11rpx 2rpx rgba(61, 179, 156, 0.34);
 			border-radius: 43rpx;
 			font-weight: 500;
 			color: #ffffff;