1

mer_uniapp/pages.json

@@ -102,6 +102,13 @@
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "美食"
 			}
+		},
+		{
+			"path": "pages/merchant_search/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "搜索外卖商家"
+			}
 		}
 	],
 	"subPackages": [{

mer_uniapp/pages/merchant_search/index.vue

@@ -0,0 +1,446 @@
+<template>
+	<view class="container flex-col" :data-theme="theme" :style="{height: winHeight + 'px'}">
+		<!-- #ifdef MP -->
+		<view class="cart_nav">
+			<nav-bar iconColor='#fff' ref="navBarRef" :navTitle="navTitle" backgroundColor="#FF6702" :isBackgroundColor="false">
+			</nav-bar>
+		</view>
+		<!-- #endif -->
+		<view class='searchGood'>
+			<view class='search-box acea-row row-between-wrapper'>
+				<view class="flex-y-center">
+					<text class='iconfont icon-sousuo2'></text>
+					<input type='text' :value='searchValue' :focus="focus" placeholder='点击搜索外卖商家' confirm-type='search' @confirm="searchBut"
+					 placeholder-class='placeholder' @input="setValue" maxlength="20"></input>
+					<view class='bnt flex-center' @tap='searchBut'>搜索</view>
+				</view>
+			</view>
+			<!-- #ifdef MP -->
+			<view class='title'>热门搜索</view>
+			<!-- #endif -->
+			<!-- #ifndef MP -->
+			<view class='title'>热门搜索</view>
+			<!-- #endif -->
+			<view class='list acea-row'>
+				<block v-for="(item,index) in hotSearchList" :key="index">
+					<view class='item' @tap='setHotSearchValue(item.title)'>{{item.title}}</view>
+				</block>
+			</view>
+			<view class='line'></view>
+		</view>
+		<view style="padding: 0 20rpx;flex: 1;overflow: hidden;" class="flex-col">
+			<!-- 销量排行 -->
+			<view class="tab-list" style="margin-top: 10rpx;">
+				<view :class=" item.checked ? 'tab-item2' : 'tab-item2-false' " v-for="item in labelList" :key="item.id" @click="item2Click(item)">{{item.label}}</view>
+			</view>
+
+			<scroll-view scroll-y scroll-with-animation style="flex: 1;overflow: hidden;">
+				<view class="content-goods2" v-for="item in merchantList" :key="item.id" @click="merchantTab(item)">
+					<view>
+						<image :src="item.avatar" style="width: 230rpx;height: 230rpx;"></image>
+					</view>
+
+					<view style="margin-left: 20rpx;flex: 1;">
+						<view class="">
+							<text class="goods-title">{{item.name}}</text>
+						</view>
+
+						<view style="margin-top: 10rpx;">
+							<text class="goods-score">{{item.score}}</text>
+							<text class="goods-info" style="margin-left: 10rpx;">月销 {{item.salesVolume}}</text>
+							<text class="goods-info" style="margin-left: 25rpx;">人均 ¥ {{item.perCapita}}</text>
+						</view>
+
+						<view style="margin-top: 10rpx;display: flex;align-items: center;">
+							<text class="goods-info">起送 ¥ {{item.perCapita}}</text>
+							<text v-if="!item.isfreeDeliverfee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
+							<view v-if="!item.isfreeDeliverfee && item.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
+								{{item.freeDeliverFee}}</view>
+							<text v-if="item.isfreeDeliverfee" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥
+								{{item.distCosts}}</text>
+							<text class="goods-info" style="margin-left: 38rpx;">10分钟</text>
+							<text class="goods-info" style="margin-left: 10rpx;">{{item.distance}}</text>
+						</view>
+
+						<view style="margin-top: 22rpx;"><text class="goods-sales">已售卖{{item.salesVolume}}件</text></view>
+
+						<view style="margin-top: 14rpx;">
+							<text class="goods-labels" v-for="(item2,index2) in item.discountLabel" :key="index2">{{item2}}</text>
+						</view>
+
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		getSearchKeyword,
+	} from '@/api/product.js';
+	// #ifdef MP
+	import navBar from '@/components/navBar';
+	// #endif
+	import {
+		getMerchantList,
+		getHomeInfo
+	} from '@/api/home.js';
+	let app = getApp();
+	export default {
+		components: {
+			// #ifdef MP
+			navBar
+			// #endif
+		},
+		data() {
+			return {
+				winHeight: 0,
+				navTitle: '搜索外卖商家',
+				hostProduct: [],
+				searchValue: '',
+				focus: false,
+				bastList: [],
+				hotSearchList: [],
+				theme: app.globalData.theme,
+				labelList: [{
+					id: 1,
+					label: "销量排行",
+					checked: true
+				}, {
+					id: 2,
+					label: "满减大促",
+					checked: false
+				}, {
+					id: 3,
+					label: "首单立减",
+					checked: false
+				}, {
+					id: 4,
+					label: "减配送费",
+					checked: false
+				}],
+				merchantList: [],
+				cateId: 0
+			};
+		},
+		// 滚动监听
+		onPageScroll(e) {
+			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+			uni.$emit('scroll');
+		},
+		onShow: function() {
+			this.getRoutineHotSearch();
+		},
+		onLoad(e) {
+			let that = this
+			uni.getSystemInfo({
+				success: function(res) {
+					that.winHeight = res.windowHeight
+				},
+			});
+			if (e.searchVal) that.searchValue = e.searchVal;
+			e.navTitle ? that.navTitle = e.navTitle : ''
+			e.cateId ? that.cateId = e.cateId : ''
+			that.getMatchedData()
+		},
+		methods: {
+			getMatchedData() {
+				getMerchantList({
+					latitude: uni.getStorageSync('user_latitude'),
+					longitude: uni.getStorageSync('user_longitude'),
+					cateId: this.cateId
+				}).then(res => {
+					// this.merchantList = res.data.list;
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					this.merchantList.push(res.data.list[0])
+					console.log('商品信息:', this.merchantList);
+				});
+			},
+			getRoutineHotSearch: function() {
+				let that = this;
+				getSearchKeyword().then(res => {
+					that.$set(that, 'hotSearchList', res.data);
+				});
+			},
+			setHotSearchValue: function(event) {
+				this.$set(this, 'searchValue', event);
+				this.page = 1;
+				this.$set(this, 'bastList', []);
+				this.getMatchedData()
+				// uni.navigateTo({
+				// 	url: `/pages/goods/goods_list/index?searchValue=${this.searchValue}`
+				// })
+			},
+			setValue: function(event) {
+				this.$set(this, 'searchValue', event.detail.value);
+			},
+			searchBut: function(e) {
+				let that = this;
+				let val = '';
+				that.focus = false;
+				if (e.detail.value) {
+					val = e.detail.value
+				}
+				if (that.searchValue.length > 0 || val) {
+					this.getMatchedData()
+					// uni.navigateTo({
+					// 	url: `/pages/goods/goods_list/index?searchValue=${val?val:that.searchValue}`
+					// })
+				} else {
+					return this.$util.Tips({
+						title: '请输入要搜索的商品',
+						icon: 'none',
+						duration: 1000,
+						mask: true,
+					});
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		overflow: hidden;
+		position: relative;
+	}
+
+	page {
+		background-color: #f5f5f5 !important;
+	}
+
+	.searchGood .search {
+		padding-left: 30rpx;
+		background-color: #fff !important;
+	}
+
+	.searchGood .search {
+		/* #ifndef MP */
+		padding-top: 20rpx;
+		padding-bottom: 20rpx;
+		/* #endif */
+		/* #ifdef MP */
+		position: fixed;
+		width: 100%;
+		z-index: 9999;
+		top: 0;
+		/* #endif */
+	}
+
+	.searchGood .search .input {
+		width: 598rpx;
+		background-color: #f7f7f7;
+		border-radius: 33rpx;
+		padding: 0 35rpx;
+		box-sizing: border-box;
+		height: 66rpx;
+	}
+
+	.searchGood .search .input input {
+		width: 472rpx;
+		font-size: 26rpx;
+	}
+
+	.searchGood .search .input .placeholder {
+		color: #bbb;
+	}
+
+	.searchGood .search .input .iconfont {
+		color: #000;
+		font-size: 35rpx;
+	}
+
+	.searchGood .search .bnt {
+		width: 120rpx;
+		text-align: center;
+		height: 66rpx;
+		line-height: 66rpx;
+		font-size: 30rpx;
+		color: #282828;
+	}
+
+	.searchGood .title {
+		font-weight: 500;
+		font-family: PingFang SC, PingFang SC;
+		font-size: 28rpx;
+		color: #333;
+		margin: 50rpx 30rpx 25rpx 30rpx;
+	}
+
+	.searchGood .list {
+		padding-left: 10rpx;
+	}
+
+	.searchGood .list .item {
+		font-size: 26rpx;
+		color: #454545;
+		padding: 0 21rpx;
+		height: 60rpx;
+		border-radius: 30rpx;
+		line-height: 60rpx;
+		border: 1rpx solid #aaa;
+		margin: 0 0 20rpx 20rpx;
+	}
+
+	.searchGood .line {
+		margin: 20rpx 30rpx 0 30rpx;
+	}
+
+	.searchBox {
+		width: 100%;
+	}
+
+	.search-box {
+		background-color: #fff;
+		padding: 0 39rpx;
+		margin-top: 10rpx;
+		box-sizing: border-box;
+		height: 96rpx;
+
+		.flex-y-center {
+			width: 100%;
+			height: 69rpx;
+			padding-left: 29rpx;
+			border-radius: 35rpx;
+			border: 2rpx solid #FF6702;
+		}
+
+		.bnt {
+			background: #FF6702;
+			border-radius: 35rpx;
+			width: 115rpx;
+			height: 100%;
+			font-weight: 500;
+			font-size: 35rpx;
+			color: #FFFFFF;
+		}
+	}
+
+	.icon-fanhui2 {
+		// line-height: 66rpx;
+	}
+
+	.search-box input {
+		width: 90%;
+		font-size: 26rpx;
+	}
+
+	.search-box .placeholder {
+		color: #bbb;
+	}
+
+	.search-box .iconfont {
+		color: #000;
+		font-size: 35rpx;
+	}
+
+	.tab-list {
+		display: flex;
+		/* 启用弹性布局 */
+		flex-direction: row;
+		/* 横向排列 */
+		justify-content: space-between;
+		/* 均匀分布子项 */
+		flex-wrap: wrap;
+		/* 允许换行（适用于屏幕宽度不足时） */
+
+		.tab-item2 {
+			width: 23%;
+			/* 5个元素平分宽度，留2%作为间隙 */
+			text-align: center;
+			background-color: #FFC127;
+			border-radius: 8rpx;
+			font-size: 23rpx;
+			padding: 6rpx;
+			font-weight: 400;
+		}
+
+		.tab-item2-false {
+			width: 23%;
+			/* 5个元素平分宽度，留2%作为间隙 */
+			text-align: center;
+			background-color: #fff;
+			border-radius: 8rpx;
+			font-size: 23rpx;
+			padding: 6rpx;
+			font-weight: 400;
+		}
+	}
+
+	.content-goods2 {
+		background: #FFFFFF;
+		border-radius: 23rpx;
+		margin-top: 10rpx;
+		padding: 20rpx;
+		display: flex;
+	}
+
+	.goods-title {
+		color: #141414;
+		font-size: 26rpx;
+		font-weight: 600;
+	}
+
+	.goods-desc {
+		color: #646464;
+		font-size: 21rpx;
+		margin-top: 10rpx;
+	}
+
+	.goods-price {
+		color: #FF9805;
+		font-size: 34rpx;
+		font-weight: 600;
+	}
+
+	.goods-score {
+		color: $bg-color-primary;
+		font-size: 27rpx;
+	}
+
+	.goods-info {
+		color: #999999;
+		font-size: 21rpx;
+	}
+
+	.goods-info3 {
+		color: #999999;
+		font-size: 21rpx;
+		margin-left: 10rpx;
+		text-decoration: line-through;
+	}
+
+	.goods-sales {
+		background-color: #FEEFE5;
+		color: #FF6702;
+		border-radius: 8rpx;
+		font-size: 21rpx;
+		padding: 4rpx 20rpx;
+	}
+
+	.goods-labels {
+		background-color: #FFF6F6;
+		color: #FF4B4B;
+		border: 2rpx solid #FF4B4B;
+		border-radius: 8rpx;
+		font-size: 21rpx;
+		padding: 4rpx 16rpx;
+		margin-right: 20rpx;
+	}
+</style>

mer_uniapp/pages/takeout/index.vue

@@ -6,7 +6,13 @@
 			</nav-bar>
 		</view>
 		<!-- #endif -->
-		<view class="box-color"></view>
+		<view class='search-box acea-row row-between-wrapper'>
+			<view class="flex-y-center">
+				<text class='iconfont icon-sousuo2'></text>
+				<input type='text' confirm-type='search' name="search" placeholder='点击搜索外卖商家' placeholder-class='placeholder'
+				 maxlength="20" @tap="goMerchant"></input>
+			</view>
+		</view>
 		<view class="box-merchant flex-col">
 			<view class="top-merchant">
 				<view class="flex-y-center">
@@ -32,7 +38,7 @@
 				<view class="flex-y-center" style="margin: 15rpx 0;">
 					<view class="cert-box" v-for="(item, index) in recommendObj.discountLabel" :key="index">{{item}}</view>
 				</view>
-				<scroll-view :scroll-x="true" scroll-with-animation style="height: 130px;white-space: nowrap;">
+				<scroll-view :scroll-x="true" scroll-with-animation style="white-space: nowrap;">
 					<view class="top-box-item" v-for="(item, index) in recommendObj.proList" :key="index">
 						<image style="width: 100%; height: 131rpx;border-radius: 10rpx;" :src="item.image"></image>
 						<view class="name">{{item.name}}</view>
@@ -127,9 +133,9 @@
 			return {
 				takeoutId: null,
 				winHeight: 0,
-				optionIndex: 0,
 				recommendObj: {},
 				optionData: [],
+				optionIndex: 0,
 				labelList: [{
 					id: 1,
 					label: "销量排行",
@@ -162,6 +168,7 @@
 				const data = res.data;
 				data[0].id = 0;
 				data[0].name = '全部';
+				data[0].icon = '/static/img/quanbu.png';
 				that.optionIndex = 0;
 				that.optionData = data || []
 				console.log(that.optionData, '12312321321312321321312312')
@@ -178,6 +185,9 @@
 			})
 		},
 		methods: {
+			goMerchant() {
+				this.$util.navigateTo('/pages/merchant_search/index');
+			},
 			item2Click(item) {
 				item.checked = !item.checked;
 			},
@@ -192,7 +202,7 @@
 				});
 			},
 			onOptionClick(item) {
-				if (optionIndex === item.id) return
+				if (this.optionIndex === item.id) return
 				this.optionIndex = item.id;
 				getMatchedData()
 			},
@@ -215,20 +225,45 @@
 		position: relative;
 	}
 
-	.box-color {
-		width: 100%;
-		height: 200rpx;
-		margin-top: -1px;
-		background-color: $bg-color-primary;
-		position: absolute;
-		z-index: -1;
+	.search-box {
+		background-color: #fff;
+		padding: 0 39rpx;
+		margin-top: 10rpx;
+		box-sizing: border-box;
+		height: 96rpx;
+
+		.flex-y-center {
+			width: 100%;
+			height: 69rpx;
+			padding-left: 29rpx;
+			border-radius: 35rpx;
+			border: 2rpx solid #FF6702;
+		}
+	}
+
+	.icon-fanhui2 {
+		// line-height: 66rpx;
+	}
+
+	.search-box input {
+		width: 90%;
+		font-size: 26rpx;
+	}
+
+	.search-box .placeholder {
+		color: #bbb;
+	}
+
+	.search-box .iconfont {
+		color: #000;
+		font-size: 35rpx;
 	}
 
 	.box-merchant {
 		background-color: #F5F5F5;
 		border-radius: 30rpx 30rpx 0 0;
 		padding: 20rpx 20rpx 0 20rpx;
-		margin-top: 30rpx;
+		// margin-top: 30rpx;
 		overflow: hidden;
 		flex: 1;
 	}

mer_uniapp/pages/users/user_rider/index.vue

@@ -1,93 +1,98 @@
 <template>
 	<view>
-		<!-- 状态栏高度 -->
-		<view :style="{ height: `${statusBarHeight}px`, backgroundColor: '#FF6702' }"></view>
-
-		<!-- 导航栏 -->
-		<view :style="{ height: `${navigationBarHeight}rpx`,lineHeight: `${navigationBarHeight}rpx`}" class="order-nav">
-			<view class="back-button" @tap="handBack()"></view>
-			成为骑手
+		<!-- #ifdef MP -->
+		<view class="cart_nav">
+			<nav-bar ref="navBarRef" navTitle="成为骑手" :isBackgroundColor="false">
+			</nav-bar>
 		</view>
-		<!-- <form @submit="formSubmit"> -->
-		<view style="background-color: #fff;padding: 21rpx 0 86rpx 39rpx;">
-			<view class="item-box">
-				<view class="title" style="width: 147rpx;">姓名</view>
-				<input class="uni-input" v-model="name" focus placeholder="请输入你的姓名" />
-			</view>
-			<view class="item-box">
-				<view class="title" style="width: 147rpx;">手机号</view>
-				<input class="uni-input" type='number' v-model="phone" focus placeholder="请输入你的手机号" />
-			</view>
-			<view class="item-box">
-				<view class="title" style="width: 147rpx;">短信验证</view>
-				<input class="uni-input" type='number' maxlength="6" v-model="bindingCaptcha" focus placeholder="请输入验证码" />
-				<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="code">
-					{{ text }}
-				</button>
-			</view>
-			<view class="item-box" style="justify-content: space-between;">
-				<view class="title">是否有过配送经验</view>
-				<switch :value="isSwitch" :checked="isSwitch" @change="isSwitch = !isSwitch" color="#12CA00" style="transform:scale(0.9)">
-					<text style="margin-top: 3rpx;">{{isSwitch ? '是' : '否'}}</text>
-				</switch>
-			</view>
-			<view class="item-box" style="border: none;padding: 0;">
-				<view class="title">配送职责（可多选）</view>
-			</view>
-			<view class="item-box" style="justify-content: space-between;">
-				<view class="item-job" :class="checkbox1 ? 'job-border-color' : ''" @tap="checkbox1 = !checkbox1">
-					<view v-if="checkbox1">
-						<view class="sjx"></view>
-						<text class="dg-icon"></text>
-					</view>
-					<text class="title">骑手</text>
-					<view class="job-remark">负责校园外卖配送</view>
+		<!-- #endif -->
+		<form @submit="formSubmit">
+			<view class="merchantsSettled">
+				<view class="merchantBg">
+					<image class="bag" src="/static/img/rider.jpg" alt="" srcset="" />
 				</view>
-				<view class="item-job" :class="checkbox2 ? 'job-border-color' : ''" @tap="checkbox2 = !checkbox2">
-					<view v-if="checkbox2">
-						<view class="sjx"></view>
-						<text class="dg-icon"></text>
+				<view class="list">
+					<view style="padding: 21rpx 0 86rpx 39rpx;">
+						<view class="item-box">
+							<view class="title" style="width: 147rpx;">姓名</view>
+							<input class="uni-input" v-model="name" focus placeholder="请输入你的姓名" />
+						</view>
+						<view class="item-box">
+							<view class="title" style="width: 147rpx;">手机号</view>
+							<input class="uni-input" type='number' v-model="phone" focus placeholder="请输入你的手机号" />
+						</view>
+						<view class="item-box">
+							<view class="title" style="width: 147rpx;">短信验证</view>
+							<input class="uni-input" type='number' maxlength="6" v-model="bindingCaptcha" focus placeholder="请输入验证码" />
+							<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="code">
+								{{ text }}
+							</button>
+						</view>
+						<view class="item-box" style="justify-content: space-between;">
+							<view class="title">是否有过配送经验</view>
+							<switch :value="isSwitch" :checked="isSwitch" @change="isSwitch = !isSwitch" color="#12CA00" style="transform:scale(0.9)">
+								<text style="margin-top: 3rpx;">{{isSwitch ? '是' : '否'}}</text>
+							</switch>
+						</view>
+						<view class="item-box" style="border: none;padding: 0;">
+							<view class="title">配送职责（可多选）</view>
+						</view>
+						<view class="item-box" style="justify-content: space-between;">
+							<view class="item-job" :class="checkbox1 ? 'job-border-color' : ''" @tap="checkbox1 = !checkbox1">
+								<view v-if="checkbox1">
+									<view class="sjx"></view>
+									<text class="dg-icon"></text>
+								</view>
+								<text class="title">骑手</text>
+								<view class="job-remark">负责校园外卖配送</view>
+							</view>
+							<view class="item-job" :class="checkbox2 ? 'job-border-color' : ''" @tap="checkbox2 = !checkbox2">
+								<view v-if="checkbox2">
+									<view class="sjx"></view>
+									<text class="dg-icon"></text>
+								</view>
+								<text class="title">快递员</text>
+								<view class="job-remark">负责快递代取/代寄</view>
+							</view>
+							<!-- <checkbox-group name="checkbox" style="margin-top: 38rpx;" @change="checkboxChange">
+							<label style="margin-left: 96rpx">
+								<checkbox class="mycheck" value="1" :checked="checkbox1" /> <text style="margin-left: 10rpx"> 骑手</text>
+							</label>
+							<label style="margin-left: 96rpx">
+								<checkbox class="mycheck" value="2" :checked="checkbox2" /> <text style="margin-left: 10rpx"> 快递员</text>
+							</label>
+						</checkbox-group> -->
+
+						</view>
+						<view class="item no-border">
+							<text class="acea-row row-middle required item-title">请上传身份证证件照正反照</text>
+							<text v-if="merchantTypeInfo" class="item-title">( {{merchantTypeInfo}} )</text>
+							<text class="item-desc">(图片最多可上传5张，格式支持JPG、PNG、JPEG)</text>
+							<view class="upload">
+								<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index" @click="getPhotoClickIdx">
+									<image :src='item'></image>
+									<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+								</view>
+								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 5">
+									<text class='iconfont icon-icon25201'></text>
+									<view>上传凭证</view>
+								</view>
+							</view>
+						</view>
 					</view>
-					<text class="title">快递员</text>
-					<view class="job-remark">负责快递代取/代寄</view>
-				</view>
-				<!-- <checkbox-group name="checkbox" style="margin-top: 38rpx;" @change="checkboxChange">
-					<label style="margin-left: 96rpx">
-						<checkbox class="mycheck" value="1" :checked="checkbox1" /> <text style="margin-left: 10rpx"> 骑手</text>
-					</label>
-					<label style="margin-left: 96rpx">
-						<checkbox class="mycheck" value="2" :checked="checkbox2" /> <text style="margin-left: 10rpx"> 快递员</text>
-					</label>
-				</checkbox-group> -->
-
-			</view>
-			<view class="item no-border">
-				<text class="acea-row row-middle required item-title">请上传身份证证件照正反照</text>
-				<text v-if="merchantTypeInfo" class="item-title">( {{merchantTypeInfo}} )</text>
-				<text class="item-desc">(图片最多可上传5张，格式支持JPG、PNG、JPEG)</text>
-				<view class="upload">
-					<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index" @click="getPhotoClickIdx">
-						<image :src='item'></image>
-						<text class='iconfont icon-guanbi1'
-						 @click.stop='DelPic(index)'></text>
+					<view style="padding: 0 96rpx;margin: 96rpx 0 20rpx 0;">
+						<label class="radio">
+							<radio activeBackgroundColor="$bg-color-primary" value="isAgree" @tap="isAgree = !isAgree" :checked="isAgree" />我已阅读相关条款
+						</label>
+						<button class="settleAgree" @click="showProtocol = true">《入驻协议》</button>
 					</view>
-					<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 5">
-						<text class='iconfont icon-icon25201'></text>
-						<view>上传凭证</view>
+					<view style="padding: 0 96rpx;">
+						<button class="sub" @tap="formSubmit">提交</button>
 					</view>
+
 				</view>
 			</view>
-		</view>
-		<view style="padding: 0 96rpx;margin: 96rpx 0 20rpx 0;">
-			<label class="radio">
-				<radio activeBackgroundColor="$bg-color-primary" value="isAgree" @tap="isAgree = !isAgree" :checked="isAgree" />我已阅读相关条款
-			</label>
-			<button class="settleAgree" @click="showProtocol = true">《入驻协议》</button>
-		</view>
-		<view style="padding: 0 96rpx;">
-			<button class="sub" @tap="formSubmit">提交</button>
-		</view>
-		<!-- </form> -->
+		</form>
 
 		<view class="settlementAgreement" v-if="showProtocol">
 			<view class="setAgCount">
@@ -112,11 +117,13 @@
 		Debounce
 	} from '@/utils/validate.js'
 	import Verify from '../components/verifition/verify.vue';
+	import navBar from '@/components/navBar';
 	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	let app = getApp();
 	export default {
 		components: {
-			Verify
+			Verify,
+			navBar
 		},
 		data() {
 			return {
@@ -322,10 +329,6 @@
 </script>
 
 <style scoped lang="scss">
-	/* 可以使用 !important 来确保样式覆盖 */
-	uni-checkbox .uni-checkbox-input {
-		border-radius: 5rpx !important;
-	}
 
 	.item-box {
 		display: flex;
@@ -397,6 +400,7 @@
 
 	.sub {
 		width: 100%;
+		margin: 25px auto 25px auto;
 		background-color: $bg-color-primary;
 		font-weight: 600;
 		font-size: 35rpx;
@@ -579,8 +583,47 @@
 			right: -10px;
 		}
 	}
-	
+
 	.job-border-color {
 		border-color: $bg-color-primary;
 	}
+
+	.merchantsSettled {
+		position: relative;
+		background-color: $bg-color-primary;
+		height: 140vh;
+	}
+
+	.merchantsSettled .merchantBg {
+		width: 100%;
+		height: 900rpx;
+
+		.bag {
+			width: 100%;
+			height: 100%;
+		}
+
+		.merchantBg-title {
+			text-align: center;
+			color: #fff;
+			font-size: 60rpx;
+			font-weight: 600;
+			margin-bottom: 20rpx;
+		}
+
+		.merchantBg-join {
+			text-align: center;
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.merchantsSettled .list {
+		background-color: #fff;
+		border-radius: 12px;
+		margin: 0 24rpx;
+		position: absolute;
+		top: 18%;
+		width: calc(100% - 24px);
+	}
 </style>