bug修复

common/router/index.js

@@ -11,7 +11,7 @@ const router = new Router({
     routes: [...modules]//路由表
 });
 
-const whiteList = ['/pages/login/login','/pages/login/loginOauth2','/pages/login/xieyi','/pages/login/mimi','/pages/login/resetpassword','/pages/login/settled','/pages/login/register']
+const whiteList = ['/pages/login/login','/pages/login/loginOauth2','/pages/login/xieyi','/pages/login/mimi','/pages/login/resetpassword','/pages/login/settled','/pages/login/register','/pages/login/map']
 //全局路由前置守卫
 router.beforeEach((to, from, next) => {
 	if(to.path == '/oauth2-app/login'){

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.0.9.8",
-    "versionCode" : 1098,
+    "versionName" : "1.1.0.2",
+    "versionCode" : 1102,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/login/map.vue

@@ -1,26 +1,26 @@
 <template>
 	<view class="content">
-		<view id="amap" class="amap" style="width: 100%; height: 59vh;" 
-			:pointList="pointList" :change:pointList="ModuleMap.setParkList">
+		<view id="amap" class="amap" style="width: 100%; height: 59vh;" :pointList="pointList"
+			:change:pointList="ModuleMap.setParkList">
 		</view>
-		<view class="btns"> 
+		<view class="btns">
 			<view @click="back">取消</view>
 			<view @click="checkAdd">确定</view>
 		</view>
-		 <view class="inputCon">
-			 <view class="searchView">
-				 <text class="iconfont icon-sousuo"></text>
-				 <input type="text" placeholder="搜索地点" v-model="searchWords" confirm-type="search" @confirm="searchFn"/>
-				 <text @click="cancel">取消</text>
-			 </view>
-		 </view>
-		 <view class="list">
-			 <view class="item" v-for="(add,index) in dataTips" :key="add.id" @click="select(add,index)"
-			 :class="selectIndex==index?'active':''">
-				 <view class="name">{{add.name}}</view>
-				 <view class="address">{{add.district || ''}}{{add.address || ''}}</view>
-			 </view>
-		 </view>
+		<view class="inputCon">
+			<view class="searchView">
+				<text class="iconfont icon-sousuo"></text>
+				<input type="text" placeholder="搜索地点" v-model="searchWords" confirm-type="search" @confirm="searchFn" />
+				<text @click="cancel">取消</text>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item" v-for="(add,index) in dataTips" :key="add.id" @click="select(add,index)"
+				:class="selectIndex==index?'active':''">
+				<view class="name">{{add.name}}</view>
+				<view class="address">{{add.district || ''}}{{add.address || ''}}</view>
+			</view>
+		</view>
 		<!-- <view style="position: absolute;top:30upx;width: 100%;">
             <view class="map-min-2-search-box">
                 <input
@@ -45,9 +45,11 @@
 </template>
 
 <script>
-	var amapFile = require('@/static/map/amap-wx.130.js');//如：..­/..­/libs/amap-wx.js
+	var amapFile = require('@/static/map/amap-wx.130.js'); //如：..­/..­/libs/amap-wx.js
 	// 创建地图
-	var myAmapFun = new amapFile.AMapWX({key: '915d1d1ed40dc41450eda1d930ea1b2d'});
+	var myAmapFun = new amapFile.AMapWX({
+		key: '915d1d1ed40dc41450eda1d930ea1b2d'
+	});
 	export default {
 		data() {
 			return {
@@ -57,75 +59,81 @@
 				pointList: null,
 				address: '',
 
-				selectIndex:undefined,
-				selectAddr:{},
-				searchWords:"",
-				id:0, // 使用 marker点击事件 需要填写id
+				selectIndex: undefined,
+				selectAddr: {},
+				searchWords: "",
+				id: 0, // 使用 marker点击事件 需要填写id
 				title: 'map',
 				// latitude: 39.909,
 				// longitude: 116.39742,
-				dataTips:[],
+				dataTips: [],
 				map: null,
-				centerArr:[]
-
+				centerArr: [],
+				city:'',
+				currentAddress:{}
 			};
 		},
+		onShow() {
+		},
 		methods: {
-			checkAdd(){
+			checkAdd() {
 				console.log(this.markers);
 				uni.setStorageSync('address', this.markers[0]);
+				uni.setStorageSync('currentAddress', this.currentAddress);
 				// var pages = getCurrentPages();// 获取所有的页面栈
 				// var prevPage = pages[pages.length - 2]; // 找到上一个页面，注意是页面，如果是页面中有组件，则需要通过页面接受到数据后，再次往组件中传递
 				// prevPage.$vm.addressObj = this.selectAddr;//在上一个页面中就可以用addressObj进行接收
 				// uni.navigateBack();
-                this.back()
+				this.back()
 			},
-			back(){
-                 // 返回上一页
-                uni.navigateBack({
-                    delta: 1 // 返回的页面数，默认为1
-                })
+			back() {
+				// 返回上一页
+				uni.navigateBack({
+					delta: 1 // 返回的页面数，默认为1
+				})
 			},
-			cancel(){
-				if(this.searchWords){
+			cancel() {
+				if (this.searchWords) {
 					this.searchWords = "";
 					myAmapFun.getPoiAround({
-					  location: this.markers[0].longitude+','+this.markers[0].latitude,
-					  success: (data)=>{
-						console.log("获取当前的列表",data);
-						this.dataTips = data.poisData;
-					  },
-					  fail: (info)=>{
-						console.log(info)
-					  }
+						location: this.markers[0].longitude + ',' + this.markers[0].latitude,
+						success: (data) => {
+							console.log("获取当前的列表", data);
+							this.dataTips = data.poisData;
+						},
+						fail: (info) => {
+							console.log(info)
+						}
 					})
 				}
 			},
-			reserGeo(){
+			reserGeo() {
 				myAmapFun.getRegeo({
-				  success: (data)=>{
-					console.log("获取当前定位信息",data);
-				  },
-				  fail: (info)=>{
-					console.log(info)
-				  }
+					success: (data) => {
+						console.log("获取当前定位信息", data);
+					},
+					fail: (info) => {
+						console.log(info)
+					}
 				})
 			},
 			// 根据地址列表中选择某一个地点
-			select(add,index){
-				console.log(add,index);
-				if(!add){
+			select(add, index) {
+				console.log(add, index);
+				this.currentAddress = add
+				
+				if (!add) {
 					return;
 				}
 				this.selectIndex = index;
 				var location = add.location.split(",");
 				this.selectAddr = {
-					address:add.pname?(add.pname+add.cityname+add.adname+add.address):(add.district+add.address),
-					latitude:location[1],
-					longitude:location[0]
+					address: add.pname ? (add.pname + add.cityname + add.adname + add.address) : (add.district + add.address),
+					latitude: location[1],
+					longitude: location[0]
 				};
 				this.markers = [{
-					latitude:location[1],
+					latitude: location[1],
 					longitude: location[0]
 				}]
 				// this.markers[0].latitude = +location[1];
@@ -134,20 +142,21 @@
 
 			},
 			// 根据内容进行检索
-			searchFn(){
-				console.log("根据地址检索",this.searchWords);
+			searchFn() {
+				console.log("根据地址检索", this.searchWords);
 				myAmapFun.getInputtips({
-				  keywords: this.searchWords,
-				  location: '',
-				  success: (data) => {
-					  console.log(111,data);
-					if(data && data.tips){
-					  this.dataTips = data.tips;
+					keywords: this.searchWords,
+					location: '',
+					city:this.city || '太原' ,
+					success: (data) => {
+						console.log(111, data);
+						if (data && data.tips) {
+							this.dataTips = data.tips;
+						}
+					},
+					fail: data => {
+						console.log(222, data);
 					}
-				  },
-				  fail:data=>{
-					  console.log(222,data);
-				  }
 				})
 			},
 			//标记点触发方法
@@ -158,23 +167,23 @@
 					latitude: this.latitude,
 					longitude: this.longitude
 				}]
-				
+
 			},
-	},
-	onLoad(e) {
-		// myAmapFun.getRegeo({
-		// 	success: (data)=>{
-		// 	console.log("获取当前定位信息",data[0][longitude]);
-		// 	// this.centerArr=[data[0].longitude,data[0].latitude]
-		// 	},
-		// 	fail: (info)=>{
-		// 	console.log(info)
-		// 	}
-		// })
-		if(e){
+		},
+		onLoad(e) {
+			// myAmapFun.getRegeo({
+			// 	success: (data)=>{
+			// 	console.log("获取当前定位信息",data[0][longitude]);
+			// 	// this.centerArr=[data[0].longitude,data[0].latitude]
+			// 	},
+			// 	fail: (info)=>{
+			// 	console.log(info)
+			// 	}
+			// })
+			if (e) {
+				console.log(e);
 				let point = JSON.parse(decodeURIComponent(e.position))
 				// point.iconPath = '/static/avatar_boy.png';
-				console.log(point,77777);
 				this.markers = [point]
 				// 传入的标点（反显用）
 				this.longitude = point.longitude
@@ -182,6 +191,8 @@
 			}
 		},
 		mounted() {
+			
+
 			// 将传入的标点传入下面的 ModuleMap 中
 			this.pointList = [this.longitude, this.latitude];
 		},
@@ -208,7 +219,7 @@
 					} else {
 						const script = document.createElement('script');
 						script.src =
-						'https://webapi.amap.com/maps?v=1.4.15&key=6b8b0fd9f75da24fb1c13edf7b2d7daa'; //这里是自己申请的高德的key
+							'https://webapi.amap.com/maps?v=1.4.15&key=6b8b0fd9f75da24fb1c13edf7b2d7daa'; //这里是自己申请的高德的key
 						script.onload = () => {
 							this.initAmap(v);
 						}
@@ -276,156 +287,173 @@
 		}
 	}
 </script>
-<style scoped  lang="scss">
-.map-min-2-search-box {
-  height: 84rpx;
-  background: #efefef;
-  border-radius: 7px;
-  height: 42px;
-  margin: 0 14px 10px;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-justify-content: space-around;
-  justify-content: space-around;
-
-  input {
-    cursor: auto;
-    display: block;
-    font-family: UICTFontTextStyleBody;
-    height: 1.4rem;
-    min-height: 1.4rem;
-    overflow: hidden;
-    text-overflow: clip;
-    white-space: nowrap;
-  }
-
-  .locationpicker-search-content-ipt {
-    height: 42px;
-    padding-left: 10px;
-    width: 70%;
-  }
-
-  .locationpicker-search-clear {
-    height: 43px;
-    text-align: center;
-    width: 33px;
-
-    .locationpicker-search-clear-ipt {
-      height: 16px;
-      margin-top: 13px;
-      width: 16px;
-    }
-  }
-
-  .locationpicker-search--content-btn-line {
-    background: #c7c7c7;
-    height: 16px;
-    margin: 13px -10px 0 0;
-    width: 1px;
-  }
-
-  .locationpicker-search-content-btn {
-    color: #427cff;
-    height: 42px;
-    line-height: 42px;
-    padding: 0 10px 0 20px;
-  }
-}
-.content{
-        height: 100vh;
-		.list{
-			height:calc(40vh - 100upx);
+<style scoped lang="scss">
+	.map-min-2-search-box {
+		height: 84rpx;
+		background: #efefef;
+		border-radius: 7px;
+		height: 42px;
+		margin: 0 14px 10px;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-justify-content: space-around;
+		justify-content: space-around;
+
+		input {
+			cursor: auto;
+			display: block;
+			font-family: UICTFontTextStyleBody;
+			height: 1.4rem;
+			min-height: 1.4rem;
+			overflow: hidden;
+			text-overflow: clip;
+			white-space: nowrap;
+		}
+
+		.locationpicker-search-content-ipt {
+			height: 42px;
+			padding-left: 10px;
+			width: 70%;
+		}
+
+		.locationpicker-search-clear {
+			height: 43px;
+			text-align: center;
+			width: 33px;
+
+			.locationpicker-search-clear-ipt {
+				height: 16px;
+				margin-top: 13px;
+				width: 16px;
+			}
+		}
+
+		.locationpicker-search--content-btn-line {
+			background: #c7c7c7;
+			height: 16px;
+			margin: 13px -10px 0 0;
+			width: 1px;
+		}
+
+		.locationpicker-search-content-btn {
+			color: #427cff;
+			height: 42px;
+			line-height: 42px;
+			padding: 0 10px 0 20px;
+		}
+	}
+
+	.content {
+		height: 100vh;
+
+		.list {
+			height: calc(40vh - 100upx);
 			overflow-y: auto;
-			width:702upx;
-			margin:0 auto 0;
-			padding-bottom:20upx;
-			.item{
-				border-bottom:2upx solid #f3f3f3;
-				&:last-child{
-					border:none;
+			width: 702upx;
+			margin: 0 auto 0;
+			padding-bottom: 20upx;
+
+			.item {
+				border-bottom: 2upx solid #f3f3f3;
+
+				&:last-child {
+					border: none;
 				}
-				.address{
-					font-size:22upx;
-					color:#666;
-					margin:10upx 0;
+
+				.address {
+					font-size: 22upx;
+					color: #666;
+					margin: 10upx 0;
 				}
-				.name{
-					font-size:30upx;
-					color:#333;
-					margin-top:10upx;
+
+				.name {
+					font-size: 30upx;
+					color: #333;
+					margin-top: 10upx;
 				}
-				&.active{
-					.name{
+
+				&.active {
+					.name {
 						font-weight: bold;
-						color:#E13500;
+						color: #E13500;
 					}
-					.address{
-						color:#E13500;
+
+					.address {
+						color: #E13500;
 					}
 				}
 			}
 		}
-		.inputCon{
-			width:100%;
-			background:#fff;
-			top:0;
+
+		.inputCon {
+			width: 100%;
+			background: #fff;
+			top: 0;
 			position: relative;
-			z-index:20;
-			height:100upx;
+			z-index: 20;
+			height: 100upx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			.searchView{
-				width:702upx;
-				height:60upx;
+
+			.searchView {
+				width: 702upx;
+				height: 60upx;
 				display: flex;
 				align-items: center;
 				line-height: 60upx;
 				border-radius: 40upx;
-				padding:0 30upx;
+				padding: 0 30upx;
 				box-sizing: border-box;
-				background:#f3f3f3;
-				font-size:26upx;
-				.iconfont{
-					color:#666;
-					margin-right:20upx;
+				background: #f3f3f3;
+				font-size: 26upx;
+
+				.iconfont {
+					color: #666;
+					margin-right: 20upx;
 				}
-				input{
-					flex:1;
+
+				input {
+					flex: 1;
 				}
-				view{
+
+				view {
 					flex-shrink: 0;
 				}
 			}
 		}
-		
+
 	}
-	.btns{
+
+	.btns {
 		position: fixed;
-		top:0;
-		left:0;
+		top: 0;
+		left: 0;
 		// height:100upx;
-		width:100%;
+		width: 100%;
 		// background:linear-gradient(to bottom,rgba(0,0,0,0.4),rgba(0,0,0,0));
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		z-index:1000 !important;
-		view{
-			margin:50upx 24upx 0;
-			font-size:30upx;
-            width:100upx;
-            height:60upx;
-            line-height: 60upx;
-            text-align: center;
-            border-radius: 10upx;
-            color:#fff;
-			&:first-child{
-                background:#7e6d68;
+		z-index: 1000 !important;
+
+		view {
+			margin: 50upx 24upx 0;
+			font-size: 30upx;
+			width: 100upx;
+			height: 60upx;
+			line-height: 60upx;
+			text-align: center;
+			border-radius: 10upx;
+			color: #fff;
+
+			&:first-child {
+				background: #7e6d68;
 			}
-			&:last-child{
-				background:#E13500;
+
+			&:last-child {
+				background: #E13500;
 			}
 		}
 	}
-</style>
+</style>   地图搜索出来的结果以当前经纬度为中心

pages/login/settled.vue

@@ -1,28 +1,28 @@
 <template>
-    <view>
-        <cu-custom :bgColor="title == '申请入驻' ? 'bg-gradual-blue1' : 'bg-fff'" :isBack="true">
-            <block slot="content">{{ title }}</block>
-        </cu-custom>
-        <view class="progress" v-if="title == '申请入驻'">
-            <view class="progress-style progress-bag">
-                <view v-if="tab == 1" class="progress-icon"></view>
-                <view v-if="tab == 2" class="progress-style progress-bag1">
-                    <view class="progress-icon1"></view>
-                </view>
-                <view v-if="tab == 3" class="progress-style progress-bag2">
-                    <view class="progress-icon1"></view>
-                </view>
-            </view>
-            <view class="progress-title flex justify-between">
-                <view :class="tab == '1' ? 'color' : ''">账户信息</view>
-                <view :class="tab == '2' ? 'color' : ''">提交资料</view>
-                <view :class="tab == '3' ? 'color' : ''">门店信息</view>
-            </view>
-        </view>
-        <status v-else :status="form.status" :updateTime="form.updateTime" :remark="form.remark"></status>
-        <view v-if="tab == 1" class="tab-top">
-            <form>
-                <!-- <view class="borderRadiu">
+	<view>
+		<cu-custom :bgColor="title == '申请入驻' ? 'bg-gradual-blue1' : 'bg-fff'" :isBack="true">
+			<block slot="content">{{ title }}</block>
+		</cu-custom>
+		<view class="progress" v-if="title == '申请入驻'">
+			<view class="progress-style progress-bag">
+				<view v-if="tab == 1" class="progress-icon"></view>
+				<view v-if="tab == 2" class="progress-style progress-bag1">
+					<view class="progress-icon1"></view>
+				</view>
+				<view v-if="tab == 3" class="progress-style progress-bag2">
+					<view class="progress-icon1"></view>
+				</view>
+			</view>
+			<view class="progress-title flex justify-between">
+				<view :class="tab == '1' ? 'color' : ''">账户信息</view>
+				<view :class="tab == '2' ? 'color' : ''">提交资料</view>
+				<view :class="tab == '3' ? 'color' : ''">门店信息</view>
+			</view>
+		</view>
+		<status v-else :status="form.status" :updateTime="form.updateTime" :remark="form.remark"></status>
+		<view v-if="tab == 1" class="tab-top">
+			<form>
+				<!-- <view class="borderRadiu">
                     <view class="flex cu-form-group margin-top1 ">
                         <view class="content ">
                             <text class="text-bold" >选择所属供应商</text>
@@ -43,71 +43,71 @@
                 </view>
                 </view> -->
 
-                <view class="borderRadiu">
-                    <view class="flex cu-form-group margin-top1 ">
-                        <view class="content ">
-                            <text class="text-bold">账户信息</text>
-                            <i class="text-bg "></i>
-                        </view>
-                    </view>
-                    <view class=" cu-form-group ">
-                        <view class="title">姓名</view>
-                        <input placeholder="请输入联系人姓名" v-model="form.name" name="input"></input>
-                    </view>
-                </view>
-            </form>
-        </view>
-        <view v-if="tab == 2" class="tab-top" :style="title == '店铺信息' ? 'margin-top: 120upx' : ''">
-            <form>
-                <view class="borderRadiu">
-                    <view class="flex cu-form-group margin-top1">
-                        <view class="content ">
-                            <text class="text-bold">提交经营主体资料</text>
-                            <i class="text-bg "></i>
-                        </view>
-                    </view>
-                    <view class=" cu-form-group">
-                        <view class="title">主体类型</view>
-                        <!-- <uni-data-checkbox  v-model="form.type" :localdata="hobby"></uni-data-checkbox> -->
-                        <radio-group @change="typeChang($event, 'type')" v-model="form.type">
-                            <label class="margin-left-sm">
-                                <radio :class="form.type == '1' ? 'checked blue' : ''"
-                                    :checked="form.type == '1' ? true : false" value="1"></radio>
-                                <!-- <checkbox class=' blue' :class="form.type?'checked':''" :checked="form.type?true:false" value="1"></checkbox> -->
-                                <text class="margin-left-sm">普通企业</text>
-                            </label>
-                            <label class="margin-left-sm">
-                                <radio :class="form.type == '2' ? 'checked blue' : ''"
-                                    :checked="form.type == '2' ? true : false" value="2"></radio>
-                                <text class="margin-left-sm">个体工商户</text>
-                            </label>
-                        </radio-group>
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">公司名称</view>
-                        <input placeholder="请输入公司名称" v-model="form.corporateName" name="input"></input>
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">统一代码</view>
-                        <input placeholder="请输入统一社会信用代码" v-model="form.creditCode" name="input"></input>
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">有效期 </view>
-                        <!-- <uni-data-checkbox  v-model="form.lifespan" :localdata="lifespanOption"></uni-data-checkbox> -->
-                        <radio-group @change="typeChang($event, 'lifespanType')" v-model="form.lifespanType">
-                            <label class="margin-left-sm">
-                                <radio :class="form.lifespanType == '1' ? 'checked blue' : ''"
-                                    :checked="form.lifespanType == '1' ? true : false" value="1"></radio>
-                                <!-- <checkbox class=' blue' :class="form.type?'checked':''" :checked="form.type?true:false" value="1"></checkbox> -->
-                                <text class="margin-left-sm">长期有效</text>
-                            </label>
-                            <label class="margin-left-sm">
-                                <radio :class="form.lifespanType == '2' ? 'checked blue' : ''"
-                                    :checked="form.lifespanType == '2' ? true : false" value="2"></radio>
-                                <text class="margin-left-sm">固定期限</text>
-                            </label>
-                        </radio-group>
-                        <!-- <radio-group @change="typeChang($event, 'lifespan')" v-model="form.lifespan">
+				<view class="borderRadiu">
+					<view class="flex cu-form-group margin-top1 ">
+						<view class="content ">
+							<text class="text-bold">账户信息</text>
+							<i class="text-bg "></i>
+						</view>
+					</view>
+					<view class=" cu-form-group ">
+						<view class="title">姓名</view>
+						<input placeholder="请输入联系人姓名" v-model="form.name" name="input"></input>
+					</view>
+				</view>
+			</form>
+		</view>
+		<view v-if="tab == 2" class="tab-top" :style="title == '店铺信息' ? 'margin-top: 120upx' : ''">
+			<form>
+				<view class="borderRadiu">
+					<view class="flex cu-form-group margin-top1">
+						<view class="content ">
+							<text class="text-bold">提交经营主体资料</text>
+							<i class="text-bg "></i>
+						</view>
+					</view>
+					<view class=" cu-form-group">
+						<view class="title">主体类型</view>
+						<!-- <uni-data-checkbox  v-model="form.type" :localdata="hobby"></uni-data-checkbox> -->
+						<radio-group @change="typeChang($event, 'type')" v-model="form.type">
+							<label class="margin-left-sm">
+								<radio :class="form.type == '1' ? 'checked blue' : ''" :checked="form.type == '1' ? true : false"
+									value="1"></radio>
+								<!-- <checkbox class=' blue' :class="form.type?'checked':''" :checked="form.type?true:false" value="1"></checkbox> -->
+								<text class="margin-left-sm">普通企业</text>
+							</label>
+							<label class="margin-left-sm">
+								<radio :class="form.type == '2' ? 'checked blue' : ''" :checked="form.type == '2' ? true : false"
+									value="2"></radio>
+								<text class="margin-left-sm">个体工商户</text>
+							</label>
+						</radio-group>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">公司名称</view>
+						<input placeholder="请输入公司名称" v-model="form.corporateName" name="input"></input>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">统一代码</view>
+						<input placeholder="请输入统一社会信用代码" v-model="form.creditCode" name="input"></input>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">有效期 </view>
+						<!-- <uni-data-checkbox  v-model="form.lifespan" :localdata="lifespanOption"></uni-data-checkbox> -->
+						<radio-group @change="typeChang($event, 'lifespanType')" v-model="form.lifespanType">
+							<label class="margin-left-sm">
+								<radio :class="form.lifespanType == '1' ? 'checked blue' : ''"
+									:checked="form.lifespanType == '1' ? true : false" value="1"></radio>
+								<!-- <checkbox class=' blue' :class="form.type?'checked':''" :checked="form.type?true:false" value="1"></checkbox> -->
+								<text class="margin-left-sm">长期有效</text>
+							</label>
+							<label class="margin-left-sm">
+								<radio :class="form.lifespanType == '2' ? 'checked blue' : ''"
+									:checked="form.lifespanType == '2' ? true : false" value="2"></radio>
+								<text class="margin-left-sm">固定期限</text>
+							</label>
+						</radio-group>
+						<!-- <radio-group @change="typeChang($event, 'lifespan')" v-model="form.lifespan">
                         <label class="margin-left-sm">
                             <radio class="blue radio" value="1" checked></radio>
                             <text class="margin-left-sm">长期有效</text>
@@ -117,739 +117,865 @@
                             <text class="margin-left-sm">固定期限</text>
                         </label>
                     </radio-group> -->
-                    </view>
-                    <view class="cu-form-group" v-if="form.lifespanType == 2">
-                        <view class="title">有效期起</view>
-                        <picker mode="date" :value="form.lifespanBegin" @change="typeChang($event, 'lifespanBegin')">
-                            <view class="picker" v-if="form.lifespanBegin">
-                                {{ form.lifespanBegin }}
-                            </view>
-                            <view class="picker" v-else style="color: #999999;">
-                                请选择
-                            </view>
-                        </picker>
-                    </view>
-                    <view class="cu-form-group" v-if="form.lifespanType == 2">
-                        <view class="title">有效期止</view>
-                        <picker mode="date" :value="form.lifespanEnd" @change="typeChang($event, 'lifespanEnd')">
-                            <view class="picker" v-if="form.lifespanEnd">
-                                {{ form.lifespanEnd }}
-                            </view>
-                            <view class="picker" v-else style="color: #999999;">
-                                请选择
-                            </view>
-                        </picker>
-                    </view>
-                    <view class="customize">
-                        <view class="title">营业执照</view>
-                        <view style="border-bottom: 1px solid #EEEEEE;">
-                            <view class="business-img flex align-center">
-                                <image
-                                    :src="businessLicenseImg ? businessLicenseImg : '/static/login/yingyezhizhao.png'"
-                                    mode="" @click="businessChange('businessLicense')">
-                                </image>
-                            </view>
-                        </view>
-                        <view class="business-prompt">
-                            请上传营业执照照片或复印件，复印件需加盖公司公章，仅支持jpg、png格式;图片需清晰、完整、无反光、无PS、无不相关水印、非拍屏
-                        </view>
-                    </view>
-                </view>
-                <view class="borderRadiu" style="margin-bottom: 114upx;">
-                    <view class="flex cu-form-group margin-top1 ">
-                        <view class="content ">
-                            <text class="text-bold">法人信息</text>
-                            <i class="text-bg "></i>
-                        </view>
-                    </view>
-                    <view class="cu-form-group  ">
-                        <view class="title">法人姓名</view>
-                        <input placeholder="请输入法人姓名" v-model="form.legalPerson" name="input"></input>
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">法人证件号</view>
-                        <input placeholder="请输入法人证件号" v-model="form.legalPersonCode" name="input"></input>
-                    </view>
-                    <view class="customize">
-                        <view class="title">法人证件照片</view>
-                        <view style="padding: 16upx 0;border-bottom: 1px solid #EEEEEE;">
-                            <view class="flex upload justify-between">
-                                <view class="imgOcr-border">
-                                    <image :src="identityOneImg ? identityOneImg : '/static/login/code1.png'" mode=""
-                                        @click="businessChange('identityOne')"></image>
-                                </view>
-                                <view class="imgOcr-border">
-                                    <image :src="identityTwoImg ? identityTwoImg : '/static/login/code2.png'" mode=""
-                                        @click="businessChange('identityTwo')"></image>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="business-prompt">
-                            <view>请上传中国大陆公民.身份证照片，仅支持jpg、png格式</view>
-                            <view>1、需提供与主体证照上一致的法人证件照片</view>
-                            <view>2、图片需清晰、完整、无反光、无PS、无不相关水印、非拍屏</view>
-                            <view>3、证件未过期</view>
-                        </view>
-                    </view>
-                </view>
-            </form>
-        </view>
-        <view v-if="tab == 3" class="tab-top" :style="title == '店铺信息' ? 'margin-top: 120upx' : ''">
-            <form>
-                <view class="borderRadiu" style="margin-bottom: 114upx;">
-                    <view class="flex cu-form-group margin-top1">
-                        <view class="content ">
-                            <text class="text-bold">提交门店信息</text>
-                            <i class="text-bg "></i>
-                        </view>
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">门店名称</view>
-                        <input placeholder="请输入门店名称" v-model="form.storeName" name="input"></input>
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">所在地区</view>
-                        <view style="display: flex;width: 74%;justify-content: space-between;"
-                            @click="$refs.picker.show()">
-                            <!-- <u-input readonly placeholder="去设置" v-model="form.locality" @click="$refs.picker.show()"    /> -->
-                            <view style="font-size: 30rpx;">
-                                <text v-if="form.locality"> {{ form.locality }}</text>
-                                <text v-else style="color: grey">请选择所在地区</text>
-                            </view>
-                            <u-icon name="arrow-right" style="margin-left: 17rpx;color: #C7C6CA"></u-icon>
-                        </view>
-                        <!-- <input disabled="true" @mousedown="$refs.picker.show()" placeholder="请选择所在地区" ref="inputRef"
+					</view>
+					<view class="cu-form-group" v-if="form.lifespanType == 2">
+						<view class="title">有效期起</view>
+						<picker mode="date" :value="form.lifespanBegin" @change="typeChang($event, 'lifespanBegin')">
+							<view class="picker" v-if="form.lifespanBegin">
+								{{ form.lifespanBegin }}
+							</view>
+							<view class="picker" v-else style="color: #999999;">
+								请选择
+							</view>
+						</picker>
+					</view>
+					<view class="cu-form-group" v-if="form.lifespanType == 2">
+						<view class="title">有效期止</view>
+						<picker mode="date" :value="form.lifespanEnd" @change="typeChang($event, 'lifespanEnd')">
+							<view class="picker" v-if="form.lifespanEnd">
+								{{ form.lifespanEnd }}
+							</view>
+							<view class="picker" v-else style="color: #999999;">
+								请选择
+							</view>
+						</picker>
+					</view>
+					<view class="customize">
+						<view class="title">营业执照</view>
+						<view style="border-bottom: 1px solid #EEEEEE;">
+							<view class="business-img flex align-center">
+								<image :src="businessLicenseImg ? businessLicenseImg : '/static/login/yingyezhizhao.png'" mode=""
+									@click="businessChange('businessLicense')">
+								</image>
+							</view>
+						</view>
+						<view class="business-prompt">
+							请上传营业执照照片或复印件，复印件需加盖公司公章，仅支持jpg、png格式;图片需清晰、完整、无反光、无PS、无不相关水印、非拍屏
+						</view>
+					</view>
+				</view>
+				<view class="borderRadiu" style="margin-bottom: 114upx;">
+					<view class="flex cu-form-group margin-top1 ">
+						<view class="content ">
+							<text class="text-bold">法人信息</text>
+							<i class="text-bg "></i>
+						</view>
+					</view>
+					<view class="cu-form-group  ">
+						<view class="title">法人姓名</view>
+						<input placeholder="请输入法人姓名" v-model="form.legalPerson" name="input"></input>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">法人证件号</view>
+						<input placeholder="请输入法人证件号" v-model="form.legalPersonCode" name="input"></input>
+					</view>
+					<view class="customize">
+						<view class="title">法人证件照片</view>
+						<view style="padding: 16upx 0;border-bottom: 1px solid #EEEEEE;">
+							<view class="flex upload justify-between">
+								<view class="imgOcr-border">
+									<image :src="identityOneImg ? identityOneImg : '/static/login/code1.png'" mode=""
+										@click="businessChange('identityOne')"></image>
+								</view>
+								<view class="imgOcr-border">
+									<image :src="identityTwoImg ? identityTwoImg : '/static/login/code2.png'" mode=""
+										@click="businessChange('identityTwo')"></image>
+								</view>
+							</view>
+						</view>
+						<view class="business-prompt">
+							<view>请上传中国大陆公民.身份证照片，仅支持jpg、png格式</view>
+							<view>1、需提供与主体证照上一致的法人证件照片</view>
+							<view>2、图片需清晰、完整、无反光、无PS、无不相关水印、非拍屏</view>
+							<view>3、证件未过期</view>
+						</view>
+					</view>
+				</view>
+			</form>
+		</view>
+		<view v-if="tab == 3" class="tab-top" :style="title == '店铺信息' ? 'margin-top: 120upx' : ''">
+			<form>
+				<view class="borderRadiu" style="margin-bottom: 114upx;">
+					<view class="flex cu-form-group margin-top1">
+						<view class="content ">
+							<text class="text-bold">提交门店信息</text>
+							<i class="text-bg "></i>
+						</view>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">门店名称</view>
+						<input placeholder="请输入门店名称" v-model="form.storeName" name="input"></input>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">所在地区</view>
+						<view style="display: flex;width: 74%;justify-content: space-between;" @click="$refs.picker.show()">
+							<!-- <u-input readonly placeholder="去设置" v-model="form.locality" @click="$refs.picker.show()"    /> -->
+							<view style="font-size: 30rpx;">
+								<text v-if="form.locality"> {{ form.locality }}</text>
+								<text v-else style="color: grey">请选择所在地区</text>
+							</view>
+							<u-icon name="arrow-right" style="margin-left: 17rpx;color: #C7C6CA"></u-icon>
+						</view>
+						<!-- <input disabled="true" @mousedown="$refs.picker.show()" placeholder="请选择所在地区" ref="inputRef"
                             name="input" v-model="form.locality"></input>
                         <text class='cuIcon-right' style="color: #C7C6CA ;" @click="$refs.picker.show();mapIsHidden='none'"></text> -->
 
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">门店地址</view>
-                        <input placeholder="请输入门店地址详细地址" v-model="form.address" name="input"></input>
-                    </view>
-                    <view class="customize">
-                        <view class="title">地理位置</view>
-                        <view class=" booder-top" style="padding-bottom: 16upx" :style="{ 'display': mapIsHidden }">
-                            <map style="width: 100%; height: 218upx;" :latitude="latitude" scale="14" zIndex="100"
-                                :longitude="longitude" :markers="markers" @tap="handleMarkerTap"></map>
-                        </view>
-
-                        <!-- <aMap class=" booder-top" style="padding-bottom: 7px;"></aMap> -->
-                        <view class="business-prompt">
-                            若位置有误直接影响客户到店，请在地图中仔细核对，可拖拽地图确保位置正确
-                        </view>
-                    </view>
-                    <view class="customize">
-                        <view class="title">门头照片</view>
-                        <view class="grid col-3 grid-square flex-sub booder-top">
-                            <view class="bg-img" v-for="(item, index) in headPhotoImg" :key="index" @tap="ViewImage"
-                                :data-url="headPhotoImg[index]">
-                                <image :src="headPhotoImg[index]" mode="aspectFill"></image>
-                                <view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
-                                    <text class='cuIcon-close'></text>
-                                </view>
-                            </view>
-                            <view class="solids" @tap="ChooseImage" v-if="headPhotoImg.length <= 4">
-                                <text class='cuIcon-cameraadd'></text>
-                            </view>
-                        </view>
-                        <view class="business-prompt">
-                            门店照片需包含完整的门店入口和招牌名称，建议现场拍摄门头照;最多可上传5张，支持格式bmp、png、jpeg、jpg，单个图片不超过5MB，建议尺寸在2000*1500px以上
-                        </view>
-                    </view>
-                </view>
-            </form>
-        </view>
-        <view v-if="tab == 1" class="padding flex flex-direction sub-bottom">
-            <button class="cu-btn bg-blue round " @click="tab = 2">保存并下一步</button>
-        </view>
-        <view v-if="tab == 2 && title == '申请入驻'" class="padding flex sub-bottom">
-            <button class="cu-btn round line-blue  shadow" @click="tab = 1">上一步</button>
-            <button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="tab = 3">保存并下一步</button>
-        </view>
-        <view v-if="tab == 2 && title == '店铺信息'" class="padding flex sub-bottom">
-            <button class="cu-btn round line-gray  shadow" @click="$Router.push({ name: 'settings' })">取消</button>
-            <button style="margin-left: 12upx;width:77%" class="cu-btn line-blue  round shadow"
-                @click="tab = 3">下一页</button>
-        </view>
-        <view v-if="tab == 3" class="padding flex sub-bottom">
-            <button class="cu-btn round line-blue  shadow" @click="tab = 2">{{ title == '申请入驻' ? '上一步' : '上一页'
+					</view>
+					<view class="cu-form-group">
+						<view class="title">门店地址</view>
+						<input placeholder="请输入门店地址详细地址" v-model="form.address" name="input"></input>
+					</view>
+					<view class="customize">
+						<view class="title">地理位置</view>
+						<view class=" booder-top" style="padding-bottom: 16upx" :style="{ 'display': mapIsHidden }">
+							<map style="width: 100%; height: 218upx;" :latitude="latitude" scale="14" zIndex="100"
+								:longitude="longitude" :markers="marker" @tap="handleMarkerTap"></map>
+						</view>
+
+						<!-- <aMap class=" booder-top" style="padding-bottom: 7px;"></aMap> -->
+						<view class="business-prompt">
+							若位置有误直接影响客户到店，请在地图中仔细核对，可拖拽地图确保位置正确
+						</view>
+					</view>
+					<view class="customize">
+						<view class="title">门头照片</view>
+						<view class="grid col-3 grid-square flex-sub booder-top">
+							<view class="bg-img" v-for="(item, index) in headPhotoImg" :key="index" @tap="ViewImage"
+								:data-url="headPhotoImg[index]">
+								<image :src="headPhotoImg[index]" mode="aspectFill"></image>
+								<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
+									<text class='cuIcon-close'></text>
+								</view>
+							</view>
+							<view class="solids" @tap="ChooseImage" v-if="headPhotoImg.length <= 4">
+								<text class='cuIcon-cameraadd'></text>
+							</view>
+						</view>
+						<view class="business-prompt">
+							门店照片需包含完整的门店入口和招牌名称，建议现场拍摄门头照;最多可上传5张，支持格式bmp、png、jpeg、jpg，单个图片不超过5MB，建议尺寸在2000*1500px以上
+						</view>
+					</view>
+				</view>
+			</form>
+		</view>
+		<view v-if="tab == 1" class="padding flex flex-direction sub-bottom">
+			<button class="cu-btn bg-blue round " @click="tab = 2">保存并下一步</button>
+		</view>
+		<view v-if="tab == 2 && title == '申请入驻'" class="padding flex sub-bottom">
+			<button class="cu-btn round line-blue  shadow" @click="tab = 1">上一步</button>
+			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="tab = 3">保存并下一步</button>
+		</view>
+		<view v-if="tab == 2 && title == '店铺信息'" class="padding flex sub-bottom">
+			<button class="cu-btn round line-gray  shadow" @click="$Router.push({ name: 'settings' })">取消</button>
+			<button style="margin-left: 12upx;width:77%" class="cu-btn line-blue  round shadow" @click="tab = 3">下一页</button>
+		</view>
+		<view v-if="tab == 3" class="padding flex sub-bottom">
+			<button class="cu-btn round line-blue  shadow" @click="tab = 2">{{ title == '申请入驻' ? '上一步' : '上一页'
                 }}</button>
-            <button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="sumbit">提交审核</button>
-        </view>
-        <view class="cu-load load-modal" v-if="lodingshow">
-            <image src="/static/logo.png" mode="aspectFit"></image>
-            <view class="gray-text">加载中...</view>
-        </view>
-        <w-picker class="picker-style" :visible.sync="visible" ref="picker" mode="region" :value="form.locality"
-            @confirm="onConfirm($event, 'region')"></w-picker>
-    </view>
+			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="sumbit">提交审核</button>
+		</view>
+		<view class="cu-load load-modal" v-if="lodingshow">
+			<image src="/static/logo.png" mode="aspectFit"></image>
+			<view class="gray-text">加载中...</view>
+		</view>
+		<w-picker class="picker-style" :visible.sync="visible" ref="picker" mode="region" :value="form.locality"
+			@confirm="onConfirm($event, 'region')"></w-picker>
+	</view>
 
 </template>
 <script>
-import { watch } from 'vue'
-import configService from '../../common/service/config.service'
-import regionPicker from "../../components/w-picker/region-picker.vue"
-// import aMap from "./map.vue"
-import status from "../store/components/status.vue"
-
-export default {
-    components: {
-        regionPicker, status
-        // aMap
-    },
-    data() {
-        return {
-            imageList: [],
-            mapIsHidden: false,
-            latitude: 37.827066,
-            longitude: 112.34988,
-            title: '申请入驻',
-            lodingshow: false,
-            form: {
-                name: null,
-                type: 1,
-                corporateName: null,
-                creditCode: null,
-                lifespanType: 1,
-                lifespanBegin: this.timestampToTime(),
-                lifespanEnd: '9999-12-31',
-                businessLicense: null,
-                legalPerson: null,
-                legalPersonCode: null,
-                storeName: null,
-                country: null,
-                locality: '',
-                address: null,
-                headPhoto: '',
-                passWord: uni.getStorageSync('password'),
-                phone: uni.getStorageSync('phone'),
-            },
-            formName: {
-                headPhoto: '门头照片',
-                name: '姓名',
-                corporateName: '公司名称',
-                creditCode: '统一代码',
-                legalPerson: '法人姓名',
-                legalPersonCode: '法人证件号',
-                storeName: '门店名称',
-                locality: '所在地区',
-                address: '门店地址',
-            },
-            tab: 1,
-            supplierOption: [],
-            businessLicenseImg: '',
-            identityOneImg: '',
-            identityTwoImg: '',
-            visible: false,
-            index: -1,
-            // markers:[{
-            // 	latitude: 37.827066,
-            // 	longitude: 112.34988,
-            // 	iconPath: '../../static/avatar_girl.png'
-            // }]
-            markers: [],
-            headPhotoImg: [],
-        }
-    },
-    watch: {
-        visible(val) {
-            if (!val) {
-                this.mapIsHidden = 'block'
-            }
-        }
-    },
-    onShow() {
-        this.markers = uni.getStorageSync('address') ?
-            [Object.assign(uni.getStorageSync('address'), { iconPath: '../../static/boiaoji.png' })]
-            : []
-
-    },
-    async onLoad(data) {
-        if (data.params) {
-            let obj = JSON.parse(decodeURIComponent(data.params));
-            this.title = '店铺信息'
-            this.tab = 2
-            obj.lifespanType = obj.lifespanType ? obj.lifespanType : '1'
-            this.markers = this.form.longitude && this.form.latitude ?
-                [{ longitude: this.form.longitude, latitude: this.form.latitude, iconPath: '../../static/boiaoji.png' }]
-                : []
-            this.businessLicenseImg = configService.apiUrl + '/' + obj.businessLicense
-            this.identityOneImg = configService.apiUrl + '/' + obj.identityOne
-            this.headPhotoImg = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
-            obj.headPhoto = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
-            this.identityTwoImg = configService.apiUrl + '/' + obj.identityTwo
-            obj.locality=obj.locality?obj.locality:''
-            this.form = obj
-        }
-        // let res = await this.$http.get("/merchant/app/allList")
-        // if (res.data.success) {
-        //     this.supplierOption = res.data.result
-        // } else {
-        //     this.$tip.toast(res.data.message);
-        // }
-
-    },
-    methods: {
-        handleMarkerTap() {
-            const queryString = uni.getStorageSync('address') ? encodeURIComponent(JSON.stringify(uni.getStorageSync('address'))) : ''
-            uni.navigateTo({
-                url: `/pages/login/map?position=${queryString}`
-            })
-
-        },
-        getFile(e) {
-            let path = ''
-            uni.uploadFile({
-                url: configService.apiUrl + '/sys/common/upload',
-                filePath: e,
-                name: "file",
-                formData: {
-                    'biz': 'temp',
-                },
-                success: (files) => {
-                    let data = JSON.parse(files.data);
-                    if (data.success) {
-                        path = res.tempFilePaths
-                    }
-                }
-            })
-            console.log(path, 88);
-
-            return path
-        },
-        uploadAll() {
-            if (this.imageList.length === 0) {
-                uni.showToast({ title: '请先选择图片', icon: 'none' });
-                return;
-            }
-
-            uni.showLoading({ title: '上传中...', mask: true });
-
-            const uploadPromises = this.imageList.map((path, index) => {
-                return new Promise((resolve, reject) => {
-                    uni.uploadFile({
-                        url: configService.apiUrl + '/sys/common/upload',// 替换为实际接口
-                        filePath: path,
-                        formData: {
-                            'biz': 'temp',
-                        },
-                        name: 'file',
-                        success: (files)=>{
-                            resolve(configService.apiUrl + '/' +JSON.parse(files.data).message)
-                        },
-                        fail: reject
-                    });
-                });
-
-            });
-
-            Promise.all(uploadPromises)
-                .then(results => {
-                    uni.hideLoading();
-                    this.imageList = []; // 清空已上传列表
-                    this.headPhotoImg = this.headPhotoImg.concat(results)
-                    this.form.headPhoto = this.form.headPhoto.concat(results)
-                    
-                })
-                .catch(error => {
-                    uni.hideLoading();
-                });
-        },
-
-        ChooseImage() {
-            uni.chooseImage({
-                count: 5-Number(this.headPhotoImg.length) , 
-                sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-                sourceType: ['album'], //从相册选择
-                success: (res) => {
-                    if (res) {
-                        this.imageList = [...this.imageList, ...res.tempFilePaths];
-                        this.uploadAll()
-                    }
-                }
-            });
-        },
-        ViewImage(e) {
-            uni.previewImage({
-                urls: this.headPhotoImg,
-                current: e.currentTarget.dataset.url
-            });
-        },
-        DelImg(e) {
-            uni.showModal({
-                title: '提示',
-                content: '确定要删除？',
-                cancelText: '取消',
-                confirmText: '确定',
-                success: res => {
-                    if (res.confirm) {
-                        this.headPhotoImg.splice(e.currentTarget.dataset.index, 1)
-                        this.form.headPhoto.splice(e.currentTarget.dataset.index, 1)
-                    }
-                }
-            })
-        },
-        onConfirm(e) {
-            this.mapIsHidden = false
-            this.form.locality = e.result
-            this.form.country = e.value[e.value.length - 1]
-        },
-        PickerChange(e) {
-            this.form.purveyorId = this.supplierOption[e.detail.value].id
-        },
-        typeChang(e, val) {
-            this.form[val] = e.detail.value
-        },
-
-        async businessChange(type) {
-            let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
-                count: 1,
-                sizeType: ['compressed']
-            });
-            let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
-            if (!size) {
-                this.$refs.uToast.show({
-                    title: '上传图片大小不能超过 5MB!',
-                    type: 'error',
-                })
-                return false
-            }
-
-            if (chooseImageRes) {
-                this.lodingshow = true;
-                // this.$tip.loading()
-                this[type + 'Img'] = chooseImageRes.tempFilePaths[0];
-                uni.uploadFile({
-                    url: configService.apiUrl + '/sys/common/upload',
-                    filePath: chooseImageRes.tempFilePaths[0],
-                    name: "file",
-                    formData: {
-                        'biz': 'temp',
-                    },
-                    success: (files) => {
-                        let data = JSON.parse(files.data);
-                        if (data.success) {
-                            this.form[type] = data.message
-
-                            if (type == 'businessLicense' || type == 'identityOne') {
-                                uni.uploadFile({
-                                    url: configService.apiUrl + `${type == 'businessLicense' ? '/order/identify/businessLicense' : '/order/identify/idCard'}`,
-                                    filePath: chooseImageRes.tempFilePaths[0],
-                                    name: "image1",
-                                    success: (uploadFileRes) => {
-                                        let data1 = JSON.parse(uploadFileRes.data).result;
-                                        let obj = {}
-                                        if (type == 'businessLicense') {
-                                            obj = {
-                                                corporateName: data1.company ? data1.company : '', //公司名称
-                                                creditCode: data1.socialCreditCode ? data1.socialCreditCode : '', //统一社会信用代码
-                                                lifespanBegin: data1.registerDate ? data1.registerDate.substr(0,
-                                                    4) + '-' + data1.registerDate.substr(5, 2) + '-' + data1.registerDate
-                                                        .substr(8, 2) : '',
-                                                lifespanEnd: data1.effectiveDate && data1.effectiveDate.includes('年') ? data1.effectiveDate.substr(0,
-                                                    4) + '-' + data1.effectiveDate.substr(5, 2) + '-' + data1.effectiveDate
-                                                        .substr(8, 2) : '9999-12-31',
-                                                lifespanType: data1.registerDate || data1.effectiveDate ? '2' : '1',
-                                            }
-
-                                        }
-                                        else {
-                                            obj = {
-                                                legalPerson: data1.customerInfo.name ? data1.customerInfo.name : '', //法人姓名
-                                                legalPersonCode: data1.customerInfo.identifyNumber ? data1.customerInfo.identifyNumber : '', //法人证件号
-                                            }
-                                        }
-                                        this.$nextTick(() => {
-                                            this.form = {
-                                                ...this.form,
-                                                ...obj,
-                                            }
-                                            // this.$set(this.form, obj);
-                                            // this.form=Object.assign(this.form,obj)
-                                            console.log(obj, this.form, 88888);
-
-                                        })
-                                        this.lodingshow = false;
-
-                                    }
-                                });
-                            }
-                            else {
-                                this.lodingshow = false;
-
-                            }
-                        }
-                    }
-                });
-            } else {
-                this.lodingshow = false;
-            }
-        },
-        timestampToTime(timestamp) {
-            // let date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-            let date = new Date(new Date());//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-            let Y = date.getFullYear() + '-';
-            let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-            let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
-            return Y + M + D;
-        },
-        sumbit() {
-            
-            if (this.title == '申请入驻') {
-                for (let j in this.form) {
-                    if (!this.form[j]) {
-                        if (this.form['lifespanType'] == 2 && (this.form['lifespanBegin'] == null || this.form['lifespanEnd'] == null)) {
-                            this.$tip.alert('请选择日期！')
-                            return
-                        }
-                        if (this.form['businessLicense'] == null) {
-                            this.$tip.alert('请上传营业执照！')
-                            return
-                        }
-                        this.$tip.alert(`请填写${this.formName[j]}！`)
-                        return
-                    }
-                }
-                let data = {
-                    ...this.form,
-                    source: 2,
-                    headPhoto: Array.isArray(this.form.headPhoto)?this.form.headPhoto.join(','):this.form.headPhoto,
-                    longitude: this.markers.length > 0 ? this.markers[0].longitude : '',
-                    latitude: this.markers.length > 0 ? this.markers[0].latitude : ''
-                }
-                this.$http.post('/merchant/app/add', data).then(res => {
-                    if (res.data.success) {
-                        this.$tip.success(res.data.result || '成功')
-                        this.$Router.push({ name: "login" })
-                    }
-                    else {
-                        this.$tip.error(res.data.message);
-                    }
-                })
-            }
-            else {
-                let data = {
-                    ...this.form,
-                    source: 2,
-                    headPhoto: Array.isArray(this.form.headPhoto)?this.form.headPhoto.join(','):this.form.headPhoto,
-                    longitude: this.markers.length > 0 ? this.markers[0].longitude : '',
-                    latitude: this.markers.length > 0 ? this.markers[0].latitude : ''
-                }
-				console.log(this.form.headPhoto,88);
-				
-                this.$http.post('/merchant/localMerchantInfo/edit', data).then(res => {
-                    if (res.data.success) {
-                        this.$tip.success(res.data.result || '成功')
-                        uni.navigateBack({
-                            delta: 1 // 返回的页面数，默认为1
-                        })
-                    }
-                    else {
-                        this.$tip.error(res.data.message);
-                    }
-                })
-            }
-
-        }
-    }
-}
+	import {
+		watch
+	} from 'vue'
+	import configService from '../../common/service/config.service'
+	import regionPicker from "../../components/w-picker/region-picker.vue"
+	// import aMap from "./map.vue"
+	import status from "../store/components/status.vue"
+
+	export default {
+		components: {
+			regionPicker,
+			status
+			// aMap
+		},
+		data() {
+			return {
+				imageList: [],
+				mapIsHidden: false,
+				latitude: 37.827066,
+				longitude: 112.34988,
+				// latitude: null, // 默认中心纬度（例如北京）
+				// longitude: null, // 默认中心经度
+				marker: [], // 初始为空数组
+				title: '申请入驻',
+				lodingshow: false,
+				form: {
+					name: null,
+					type: 1,
+					corporateName: null,
+					creditCode: null,
+					lifespanType: 1,
+					lifespanBegin: this.timestampToTime(),
+					lifespanEnd: '9999-12-31',
+					businessLicense: null,
+					legalPerson: null,
+					legalPersonCode: null,
+					storeName: null,
+					country: null,
+					locality: '',
+					address: null,
+					headPhoto: '',
+					passWord: uni.getStorageSync('password'),
+					phone: uni.getStorageSync('phone'),
+				},
+				formName: {
+					name: '姓名',
+					type: '主体类型',
+					corporateName: '公司名称',
+					creditCode: '统一代码',
+					lifespanType: '有效期',
+					headPhoto: '门头照片',
+					legalPerson: '法人姓名',
+					legalPersonCode: '法人证件号',
+					storeName: '门店名称',
+					locality: '所在地区',
+					address: '门店地址',
+					businessLicense: '营业执照'
+				},
+				tab: 1,
+				supplierOption: [],
+				businessLicenseImg: '',
+				identityOneImg: '',
+				identityTwoImg: '',
+				visible: false,
+				index: -1,
+				// markers:[{
+				// 	latitude: 37.827066,
+				// 	longitude: 112.34988,
+				// 	iconPath: '../../static/avatar_girl.png'
+				// }]
+				markers: [],
+				headPhotoImg: [],
+			}
+		},
+		watch: {
+			visible(val) {
+				if (!val) {
+					this.mapIsHidden = 'block'
+				}
+			}
+		},
+		computed() {
+
+		},
+		onShow() {
+			this.getCurrentLocation();
+			// this.setDefaultLocation()
+			// uni.getStorage({
+			// 	key: 'currentAddress',
+			// 	success: function(res) {
+			// 		console.log(res);
+			// 		let temp = res.data.location.split(',')
+			// 		this.latitude = temp[1];
+			// 		this.longitude = temp[0];
+
+
+			// 		this.marker = [{
+			// 			id: 0,
+			// 			latitude: temp[1],
+			// 			longitude: temp[0],
+			// 			title: res.data.name,
+			// 			iconPath: '../../static/boiaoji.png',
+			// 			width: 30,
+			// 			height: 30
+			// 		}];
+			// 		console.log(this.marker)
+			// 	}
+			// });
+			// let currentaddress = uni.getStorageSync('currentAddress')
+			// console.log(currentaddress)
+
+
+
+
+
+			this.markers = uni.getStorageSync('address') ? [Object.assign(uni.getStorageSync('address'), {
+				iconPath: '../../static/boiaoji.png'
+			})] : []
+
+		},
+		async onLoad(data) {
+
+			if (data.params) {
+				let obj = JSON.parse(decodeURIComponent(data.params));
+				this.title = '店铺信息'
+				this.tab = 2
+				obj.lifespanType = obj.lifespanType ? obj.lifespanType : '1'
+				this.markers = this.form.longitude && this.form.latitude ? [{
+					longitude: this.form.longitude,
+					latitude: this.form.latitude,
+					iconPath: '../../static/boiaoji.png'
+				}] : []
+				this.businessLicenseImg = configService.apiUrl + '/' + obj.businessLicense
+				this.identityOneImg = configService.apiUrl + '/' + obj.identityOne
+				this.headPhotoImg = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
+				obj.headPhoto = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
+				this.identityTwoImg = configService.apiUrl + '/' + obj.identityTwo
+				obj.locality = obj.locality ? obj.locality : ''
+				this.form = obj
+			}
+			// let res = await this.$http.get("/merchant/app/allList")
+			// if (res.data.success) {
+			//     this.supplierOption = res.data.result
+			// } else {
+			//     this.$tip.toast(res.data.message);
+			// }
+
+		},
+		methods: {
+			getCurrentLocation() {
+				console.log('1111111')
+				uni.getStorage({
+					key: 'currentAddress',
+					success: (res) => {
+						console.log(res, '2222222');
+						if (res.data && res.data.location) {
+							let temp = res.data.location.split(',');
+							this.latitude = temp[1];
+							this.longitude = temp[0];
+
+							this.marker = [{
+								id: 0,
+								latitude: temp[1],
+								longitude: temp[0],
+								title: res.data.name || '当前位置',
+								iconPath: '../../static/boiaoji.png',
+								width: 30,
+								height: 30,
+								callout: { // 添加标注说明
+									content: res.data.name || '当前位置',
+									color: '#000',
+									fontSize: 12,
+									borderRadius: 10,
+									bgColor: '#fff',
+									padding: 5,
+									display: 'ALWAYS'
+								}
+							}];
+this.$forceUpdate();
+						}
+
+					},
+					fail: () => {
+						console.log('3333333')
+						// 如果没有存储的位置，可以设置默认位置
+						this.setDefaultLocation();
+					}
+				});
+			},
+			setDefaultLocation() {
+				console.log('444444444')
+				let that = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						console.log('555555555')
+						console.log(res)
+						that.latitude = res.latitude;
+						that.longitude = res.longitude;
+						that.marker = [{
+							id: 0,
+							latitude: that.latitude,
+							longitude: that.longitude,
+							title: '默认位置',
+							iconPath: '../../static/boiaoji.png',
+							width: 30,
+							height: 30
+						}];
+						
+					},
+					fail() {
+						console.log('666666666')
+					}
+				});
+
+
+			},
+
+			handleMarkerTap() {
+				const queryString = uni.getStorageSync('address') ? encodeURIComponent(JSON.stringify(uni.getStorageSync(
+					'address'))) : ''
+				uni.navigateTo({
+					url: `/pages/login/map?position=${queryString}`
+					// url:'/pages/login/map'
+				})
+
+			},
+			getFile(e) {
+				let path = ''
+				uni.uploadFile({
+					url: configService.apiUrl + '/sys/common/upload',
+					filePath: e,
+					name: "file",
+					formData: {
+						'biz': 'temp',
+					},
+					success: (files) => {
+						let data = JSON.parse(files.data);
+						if (data.success) {
+							path = res.tempFilePaths
+						}
+					}
+				})
+				console.log(path, 88);
+
+				return path
+			},
+			uploadAll() {
+				if (this.imageList.length === 0) {
+					uni.showToast({
+						title: '请先选择图片',
+						icon: 'none'
+					});
+					return;
+				}
+
+				uni.showLoading({
+					title: '上传中...',
+					mask: true
+				});
+
+				const uploadPromises = this.imageList.map((path, index) => {
+					return new Promise((resolve, reject) => {
+						uni.uploadFile({
+							url: configService.apiUrl + '/sys/common/upload', // 替换为实际接口
+							filePath: path,
+							formData: {
+								'biz': 'temp',
+							},
+							name: 'file',
+							success: (files) => {
+								resolve(configService.apiUrl + '/' + JSON.parse(files.data).message)
+							},
+							fail: reject
+						});
+					});
+
+				});
+
+				Promise.all(uploadPromises)
+					.then(results => {
+						uni.hideLoading();
+						this.imageList = []; // 清空已上传列表
+						this.headPhotoImg = this.headPhotoImg.concat(results)
+						this.form.headPhoto = this.form.headPhoto.concat(results)
+
+					})
+					.catch(error => {
+						uni.hideLoading();
+					});
+			},
+
+			ChooseImage() {
+				uni.chooseImage({
+					count: 5 - Number(this.headPhotoImg.length),
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: (res) => {
+						if (res) {
+							this.imageList = [...this.imageList, ...res.tempFilePaths];
+							this.uploadAll()
+						}
+					}
+				});
+			},
+			ViewImage(e) {
+				uni.previewImage({
+					urls: this.headPhotoImg,
+					current: e.currentTarget.dataset.url
+				});
+			},
+			DelImg(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除？',
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							this.headPhotoImg.splice(e.currentTarget.dataset.index, 1)
+							this.form.headPhoto.splice(e.currentTarget.dataset.index, 1)
+						}
+					}
+				})
+			},
+			onConfirm(e) {
+				this.mapIsHidden = false
+				this.form.locality = e.result
+				this.form.country = e.value[e.value.length - 1]
+			},
+			PickerChange(e) {
+				this.form.purveyorId = this.supplierOption[e.detail.value].id
+			},
+			typeChang(e, val) {
+				this.form[val] = e.detail.value
+			},
+
+			async businessChange(type) {
+				let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed']
+				});
+				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
+				if (!size) {
+					this.$refs.uToast.show({
+						title: '上传图片大小不能超过 5MB!',
+						type: 'error',
+					})
+					return false
+				}
+
+				if (chooseImageRes) {
+					this.lodingshow = true;
+					// this.$tip.loading()
+					this[type + 'Img'] = chooseImageRes.tempFilePaths[0];
+					uni.uploadFile({
+						url: configService.apiUrl + '/sys/common/upload',
+						filePath: chooseImageRes.tempFilePaths[0],
+						name: "file",
+						formData: {
+							'biz': 'temp',
+						},
+						success: (files) => {
+							let data = JSON.parse(files.data);
+							if (data.success) {
+								this.form[type] = data.message
+
+								if (type == 'businessLicense' || type == 'identityOne') {
+									uni.uploadFile({
+										url: configService.apiUrl +
+											`${type == 'businessLicense' ? '/order/identify/businessLicense' : '/order/identify/idCard'}`,
+										filePath: chooseImageRes.tempFilePaths[0],
+										name: "image1",
+										success: (uploadFileRes) => {
+											let data1 = JSON.parse(uploadFileRes.data).result;
+											let obj = {}
+											if (type == 'businessLicense') {
+												obj = {
+													corporateName: data1.company ? data1.company : '', //公司名称
+													creditCode: data1.socialCreditCode ? data1.socialCreditCode : '', //统一社会信用代码
+													lifespanBegin: data1.registerDate ? data1.registerDate.substr(0,
+															4) + '-' + data1.registerDate.substr(5, 2) + '-' + data1.registerDate
+														.substr(8, 2) : '',
+													lifespanEnd: data1.effectiveDate && data1.effectiveDate.includes('年') ? data1
+														.effectiveDate.substr(0,
+															4) + '-' + data1.effectiveDate.substr(5, 2) + '-' + data1.effectiveDate
+														.substr(8, 2) : '9999-12-31',
+													lifespanType: data1.registerDate || data1.effectiveDate ? '2' : '1',
+												}
+
+											} else {
+												obj = {
+													legalPerson: data1.customerInfo.name ? data1.customerInfo.name : '', //法人姓名
+													legalPersonCode: data1.customerInfo.identifyNumber ? data1.customerInfo
+														.identifyNumber : '', //法人证件号
+												}
+											}
+											this.$nextTick(() => {
+												this.form = {
+													...this.form,
+													...obj,
+												}
+												// this.$set(this.form, obj);
+												// this.form=Object.assign(this.form,obj)
+												console.log(obj, this.form, 88888);
+
+											})
+											this.lodingshow = false;
+
+										}
+									});
+								} else {
+									this.lodingshow = false;
+
+								}
+							}
+						}
+					});
+				} else {
+					this.lodingshow = false;
+				}
+			},
+			timestampToTime(timestamp) {
+				// let date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				let date = new Date(new Date()); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				let Y = date.getFullYear() + '-';
+				let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+				let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
+				return Y + M + D;
+			},
+			sumbit() {
+				if (this.title == '申请入驻') {
+					for (let j in this.form) {
+						console.log(j)
+						console.log(this.form[j])
+						console.log(this.formName[j])
+						if (!this.form[j]) {
+							if (this.form['lifespanType'] == 2 && (this.form['lifespanBegin'] == null || this.form['lifespanEnd'] ==
+									null)) {
+								this.$tip.alert('请选择日期！')
+								return
+							}
+							if (this.form['businessLicense'] == null) {
+								this.$tip.alert('请上传营业执照！')
+								return
+							}
+							if (this.formName[j]) {
+								this.$tip.alert(`请填写${this.formName[j]}！`)
+								return
+							}
+
+
+						}
+					}
+					let data = {
+						...this.form,
+						source: 2,
+						headPhoto: Array.isArray(this.form.headPhoto) ? this.form.headPhoto.join(',') : this.form.headPhoto,
+						longitude: this.markers.length > 0 ? this.markers[0].longitude : '',
+						latitude: this.markers.length > 0 ? this.markers[0].latitude : ''
+					}
+					this.$http.post('/merchant/app/add', data).then(res => {
+						if (res.data.success) {
+							this.$tip.success(res.data.result || '成功')
+							this.$Router.push({
+								name: "login"
+							})
+						} else {
+							this.$tip.error(res.data.message);
+						}
+					})
+				} else {
+					let data = {
+						...this.form,
+						source: 2,
+						headPhoto: Array.isArray(this.form.headPhoto) ? this.form.headPhoto.join(',') : this.form.headPhoto,
+						longitude: this.markers.length > 0 ? this.markers[0].longitude : '',
+						latitude: this.markers.length > 0 ? this.markers[0].latitude : ''
+					}
+					console.log(this.form.headPhoto, 88);
+
+					this.$http.post('/merchant/localMerchantInfo/edit', data).then(res => {
+						if (res.data.success) {
+							this.$tip.success(res.data.result || '成功')
+							uni.navigateBack({
+								delta: 1 // 返回的页面数，默认为1
+							})
+						} else {
+							this.$tip.error(res.data.message);
+						}
+					})
+				}
+
+			}
+		}
+	}
 </script>
 <style scoped lang="scss">
-page {
-    background: #F8F8FA;
-}
-
-.cu-form-group .title {
-    width: 190upx;
-}
-
-.cu-bg {
-    background: linear-gradient(180deg, #D6E9FF 0%, #FFFFFF 100%);
-}
-
-.tab-top {
-    margin-top: 78upx;
-    padding: 26upx;
-}
-
-.borderRadiu {
-    border-radius: 8px;
-    padding-bottom: 10px;
-    background-color: #ffffff;
-    // border-bottom: 1px solid #eee;
-}
-
-.sub-bottom {
-    position: fixed;
-    width: 100%;
-    bottom: 0;
-    background: #FFFFFF;
-    border-top: 1px solid #EEEEEE;
-}
-
-.progress-status {
-    position: fixed;
-    width: 100%;
-    z-index: 9999;
-    padding: 26upx 42upx;
-    background: #FFFFFF;
-
-    .status {
-        font-size: 38upx;
-        color: #F6863E;
-        font-weight: 500;
-        margin-bottom: 10upx;
-
-        text {
-            margin-left: 5upx
-        }
-
-        image {
-            vertical-align: text-top;
-            width: 42upx;
-            height: 42upx;
-        }
-    }
-}
-
-.progress {
-    position: fixed;
-    height: 96upx;
-    width: 100%;
-    z-index: 9999;
-    background: #FFFFFF;
-    padding: 20upx 30upx;
-
-    .progress-title {
-        margin-top: 16upx;
-        font-size: 24upx;
-        color: #999999;
-
-        .color {
-            color: #333333;
-
-        }
-    }
-
-    .progress-style {
-        width: 100%;
-        height: 10upx;
-        border-radius: 5px 5px 5px 5px;
-    }
-
-    .progress-bag {
-        position: relative;
-        background: rgba(68, 154, 255, 0.05);
-
-        .progress-icon {
-            position: absolute;
-            margin-top: -1px;
-            width: 12upx;
-            height: 12upx;
-            background: #449AFF;
-            border-radius: 50%;
-            box-shadow: 0px 0px 0px 7upx rgba(68, 154, 255, 0.3);
-        }
-
-        .progress-icon1 {
-            position: absolute;
-            margin-top: -1px;
-            width: 12upx;
-            height: 12upx;
-            background: #449AFF;
-            border-radius: 50%;
-            left: 99%;
-            box-shadow: 0px 0px 0px 7upx rgba(68, 154, 255, 0.3);
-        }
-
-        .progress-bag1 {
-            width: 50%;
-            position: absolute;
-            background: rgba(68, 154, 255, 0.8);
-
-        }
-
-        .progress-bag2 {
-            position: absolute;
-            background: rgba(68, 154, 255, 0.8);
-        }
-    }
-
-}
-
-.customize {
-    background-color: #fff;
-    // border-top: 0.5px solid #eee;
-    margin: 16upx 18upx;
-
-    .title {
-        font-size: 30upx;
-        // padding: 10px;
-    }
-
-    .business-img {
-        height: 218upx;
-        width: 360upx;
-        padding: 16upx;
-        // padding-bottom: 16upx;
-        background: url('/static/login/yingye2.png');
-        margin: 16upx auto;
-        background-size: cover;
-
-        image {
-            width: 100%;
-            height: 100%;
-        }
-    }
-
-    .business-prompt {
-        padding-top: 16upx;
-        font-size: 20upx;
-        color: #999999;
-    }
-}
-
-.booder-top {
-    border-bottom: 1px solid rgb(238, 238, 238);
-    padding-top: 7px;
-}
-
-
-.img-border {
-    padding: 15px 20px;
-
-}
-
-.upload {
-    width: 100%;
-    height: 188upx;
-    // padding: 15px 20px;
-    background-color: white;
-
-    .imgOcr-border {
-        position: relative;
-        width: 48%;
-        height: 100%;
-        padding: 12upx;
-        // background-color: #fff;
-        background: url('/static/login/code3.png');
-
-        background-size: cover;
-        // box-shadow: 0px 4px 10px 0px #DAE3F4;
-
-        image {
-            width: 100%;
-            // border-radius: 4px;
-            height: 100%;
-        }
-    }
-}
-
-.picker-style {
-    .w-picker-cnt .visible {
-        position: absolute;
-        z-index: 100000;
-    }
-}
+	page {
+		background: #F8F8FA;
+	}
+
+	.cu-form-group .title {
+		width: 190upx;
+	}
+
+	.cu-bg {
+		background: linear-gradient(180deg, #D6E9FF 0%, #FFFFFF 100%);
+	}
+
+	.tab-top {
+		margin-top: 78upx;
+		padding: 26upx;
+	}
+
+	.borderRadiu {
+		border-radius: 8px;
+		padding-bottom: 10px;
+		background-color: #ffffff;
+		// border-bottom: 1px solid #eee;
+	}
+
+	.sub-bottom {
+		position: fixed;
+		width: 100%;
+		bottom: 0;
+		background: #FFFFFF;
+		border-top: 1px solid #EEEEEE;
+	}
+
+	.progress-status {
+		position: fixed;
+		width: 100%;
+		z-index: 9999;
+		padding: 26upx 42upx;
+		background: #FFFFFF;
+
+		.status {
+			font-size: 38upx;
+			color: #F6863E;
+			font-weight: 500;
+			margin-bottom: 10upx;
+
+			text {
+				margin-left: 5upx
+			}
+
+			image {
+				vertical-align: text-top;
+				width: 42upx;
+				height: 42upx;
+			}
+		}
+	}
+
+	.progress {
+		position: fixed;
+		height: 96upx;
+		width: 100%;
+		z-index: 9999;
+		background: #FFFFFF;
+		padding: 20upx 30upx;
+
+		.progress-title {
+			margin-top: 16upx;
+			font-size: 24upx;
+			color: #999999;
+
+			.color {
+				color: #333333;
+
+			}
+		}
+
+		.progress-style {
+			width: 100%;
+			height: 10upx;
+			border-radius: 5px 5px 5px 5px;
+		}
+
+		.progress-bag {
+			position: relative;
+			background: rgba(68, 154, 255, 0.05);
+
+			.progress-icon {
+				position: absolute;
+				margin-top: -1px;
+				width: 12upx;
+				height: 12upx;
+				background: #449AFF;
+				border-radius: 50%;
+				box-shadow: 0px 0px 0px 7upx rgba(68, 154, 255, 0.3);
+			}
+
+			.progress-icon1 {
+				position: absolute;
+				margin-top: -1px;
+				width: 12upx;
+				height: 12upx;
+				background: #449AFF;
+				border-radius: 50%;
+				left: 99%;
+				box-shadow: 0px 0px 0px 7upx rgba(68, 154, 255, 0.3);
+			}
+
+			.progress-bag1 {
+				width: 50%;
+				position: absolute;
+				background: rgba(68, 154, 255, 0.8);
+
+			}
+
+			.progress-bag2 {
+				position: absolute;
+				background: rgba(68, 154, 255, 0.8);
+			}
+		}
+
+	}
+
+	.customize {
+		background-color: #fff;
+		// border-top: 0.5px solid #eee;
+		margin: 16upx 18upx;
+
+		.title {
+			font-size: 30upx;
+			// padding: 10px;
+		}
+
+		.business-img {
+			height: 218upx;
+			width: 360upx;
+			padding: 16upx;
+			// padding-bottom: 16upx;
+			background: url('/static/login/yingye2.png');
+			margin: 16upx auto;
+			background-size: cover;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.business-prompt {
+			padding-top: 16upx;
+			font-size: 20upx;
+			color: #999999;
+		}
+	}
+
+	.booder-top {
+		border-bottom: 1px solid rgb(238, 238, 238);
+		padding-top: 7px;
+	}
+
+
+	.img-border {
+		padding: 15px 20px;
+
+	}
+
+	.upload {
+		width: 100%;
+		height: 188upx;
+		// padding: 15px 20px;
+		background-color: white;
+
+		.imgOcr-border {
+			position: relative;
+			width: 48%;
+			height: 100%;
+			padding: 12upx;
+			// background-color: #fff;
+			background: url('/static/login/code3.png');
+
+			background-size: cover;
+			// box-shadow: 0px 4px 10px 0px #DAE3F4;
+
+			image {
+				width: 100%;
+				// border-radius: 4px;
+				height: 100%;
+			}
+		}
+	}
+
+	.picker-style {
+		.w-picker-cnt .visible {
+			position: absolute;
+			z-index: 100000;
+		}
+	}
 </style>

pages/order/serviceOrder/live.vue

@@ -35,11 +35,14 @@
 								</view>
 							</view>
 							<view class="play" v-if="item.recordUrl">
-								<image src="/static/pause.png" mode="" @click="exchangeStatus(item),play(item)" v-if="item.isPlay"></image>
-								<image src="/static/play.png" mode="" @click="exchangeStatus(item),play(item)" v-else></image>
+								<!-- <image src="/static/pause.png" mode="" @click="exchangeStatus(item),play(item)" v-if="item.isPlay">
+								</image>
+								<image src="/static/play.png" mode="" @click="exchangeStatus(item),play(item)" v-else></image> -->
+								<image :src="item.isPlay ? '/static/pause.png' : '/static/play.png'" mode="aspectFit"
+									@click="handleAudioPlay(item)" class="play-icon" />
 							</view>
 						</view>
-						<view class="content" >
+						<view class="content">
 							{{item.msgContent}}
 						</view>
 					</view>
@@ -59,6 +62,8 @@
 				form: [],
 				historyList: [],
 				audioContext: null,
+				currentAudioId: null, // 当前播放的音频ID
+				isAudioPlaying: false, // 音频是否正在播放
 			}
 		},
 		methods: {
@@ -99,24 +104,135 @@
 						}
 					})
 			},
-			//播放，暂停
-			play(item) {
-				const audioContext = uni.createInnerAudioContext();
-				audioContext.autoplay = true;
-				audioContext.src = configService.apiUrl + '/' + item.recordUrl
-				if(item.isPlay){
-					audioContext.onPlay(() => {
-						console.log('开始播放');
-					});
-				}else{
-					audioContext.pause();
-					console.log('音频已暂停');
+			// 处理音频播放/暂停
+			handleAudioPlay(item) {
+				// 如果是当前正在播放的音频
+				if (this.currentAudioId === item.id) {
+					if (this.isAudioPlaying) {
+						this.pauseAudio();
+					} else {
+						this.resumeAudio();
+					}
+				}
+				// 如果是新的音频
+				else {
+					this.playNewAudio(item);
+				}
+			},
+
+			// 播放新音频
+			playNewAudio(item) {
+				// 先停止当前播放的音频
+				if (this.audioContext) {
+					this.stopAudio();
 				}
-				
+
+				// 创建新的音频上下文
+				this.audioContext = uni.createInnerAudioContext();
+				this.audioContext.src = `${configService.apiUrl}/${item.recordUrl}`;
+
+				// 设置事件监听
+				this.setupAudioListeners();
+
+				// 更新状态
+				this.currentAudioId = item.id;
+				this.isAudioPlaying = true;
+
+				// 开始播放
+				this.audioContext.play();
+
+				// 更新UI状态
+				this.updateAudioStatus(item.id, true);
+			},
+
+			// 暂停音频
+			pauseAudio() {
+				if (this.audioContext) {
+					this.audioContext.pause();
+					this.isAudioPlaying = false;
+					this.updateAudioStatus(this.currentAudioId, false);
+				}
+			},
+
+			// 继续播放
+			resumeAudio() {
+				if (this.audioContext) {
+					this.audioContext.play();
+					this.isAudioPlaying = true;
+					this.updateAudioStatus(this.currentAudioId, true);
+				}
+			},
+
+			// 停止音频
+			stopAudio() {
+				if (this.audioContext) {
+					this.audioContext.stop();
+					this.updateAudioStatus(this.currentAudioId, false);
+					this.cleanupAudio();
+				}
+			},
+
+			// 设置音频事件监听
+			setupAudioListeners() {
+				if (!this.audioContext) return;
+
+				this.audioContext.onPlay(() => {
+					console.log('开始播放');
+					this.isAudioPlaying = true;
+					this.updateAudioStatus(this.currentAudioId, true);
+				});
+
+				this.audioContext.onPause(() => {
+					console.log('暂停播放');
+					this.isAudioPlaying = false;
+					this.updateAudioStatus(this.currentAudioId, false);
+				});
+
+				this.audioContext.onStop(() => {
+					console.log('停止播放');
+					this.isAudioPlaying = false;
+					this.updateAudioStatus(this.currentAudioId, false);
+				});
+
+				this.audioContext.onEnded(() => {
+					console.log('播放结束');
+					this.isAudioPlaying = false;
+					this.updateAudioStatus(this.currentAudioId, false);
+					this.cleanupAudio();
+				});
+
+				this.audioContext.onError((err) => {
+					console.error('播放错误:', err);
+					this.isAudioPlaying = false;
+					this.updateAudioStatus(this.currentAudioId, false);
+					this.cleanupAudio();
+					uni.showToast({
+						title: '音频播放失败',
+						icon: 'none'
+					});
+				});
+			},
+
+			// 更新音频播放状态
+			updateAudioStatus(audioId, isPlaying) {
+				this.historyList = this.historyList.map(item => {
+					if (item.id === audioId) {
+						item.isPlay = isPlaying;
+					} else if (item.isPlay) {
+						item.isPlay = false; // 确保其他音频状态被重置
+					}
+					return item;
+				});
 			},
-			exchangeStatus(item, index) {
-				item.isPlay = !item.isPlay
-					this.$forceUpdate()
+
+			// 清理音频资源
+			cleanupAudio() {
+				if (this.audioContext) {
+					this.audioContext.destroy();
+					this.audioContext = null;
+				}
+				this.currentAudioId = null;
+				this.isAudioPlaying = false;
 			},
 			getHistroyList() {
 				let data = {
@@ -128,7 +244,7 @@
 					this.historyList.forEach(item => {
 						if (item.recordUrl) {
 							item.isPlay = false
-						}else{
+						} else {
 							item.isPlay = null
 						}
 					})
@@ -138,10 +254,17 @@
 		onLoad(options) {
 			this.taskId = options.taskId
 		},
+		beforeDestroy() {
+			if (this.audioContext) {
+				this.audioContext.stop();
+				this.audioContext.destroy();
+				this.audioContext = null;
+			}
+		},
 		mounted() {
 			this.getLive()
 			this.getHistroyList()
-			
+
 		}
 	}
 </script>

pages/order/serviceOrder/orderDetail.vue

@@ -44,14 +44,40 @@
 				<view class="car_address">
 					<view class="address">
 						送/取车地址:{{form.carAddress}}
-						<image src="/static/order/address.png" mode="" @click="navigation"></image>
+						<image src="/static/order/address.png" mode="" @click="navigation(form.userLongitude,form.userLatitude)"></image>
 					</view>
 					<view class="car_license">
 						车牌号:{{form.licenseNo}}
 					</view>
 				</view>
 			</view>
+			
 			<!-- 上门取车显示信息结束 -->
+			<!-- 救援显示信息开始 -->
+			<view class="car_data"  v-if="form.checkType > 20">
+			<view class="name">
+				<view class="user_name">
+					用户姓名：{{form.contactsName}}
+				</view>
+				<view class="call" @click="callUser">
+					<image src="/static/order/call.png" mode=""></image>
+					联系客户
+				</view>
+			</view>
+			<view class="address">
+				<view class="location">
+					<span style="font-weight: 600;">救援地址：</span>
+					{{form.carAddress}}
+				</view>
+				<view class="go" @click="navigation(form.userLongitude,form.userLatitude)">
+					<image src="/static/order/address.png" mode=""></image>
+					导航
+				</view>
+			</view>
+				<view class="car_id">
+					车牌号：{{form.licenseNo}}
+				</view>
+			</view>
 			<view class="product">
 				<view class="fat_product">
 					<view class="product_img">
@@ -560,7 +586,7 @@
 				})
 			},
 			//导航
-			navigation(){
+			navigation(longitude,latitude){
 				console.log(this.form)
 				// uni.openLocation({
 				// 	longitude: Number(this.form.userLongitude),
@@ -575,8 +601,8 @@
 				// 	},
 				// })
 				uni.openLocation({
-					longitude: Number(this.form.userLongitude),
-					latitude: Number(this.form.userLatitude),
+					longitude: Number(longitude),
+					latitude: Number(latitude),
 					name: this.form.carAddress, // 位置名称
 					// address: e.F_Address, // 位置地点
 					success: function(res) {
@@ -840,6 +866,58 @@
 						margin-top: 12rpx;
 					}
 				}
+				.name{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					border-bottom: 1px solid #eeeeee;
+					padding-bottom: 14rpx;
+					.user_name{
+						font-weight: 600;
+						font-size: 30rpx;
+					}
+					.call{
+						width: 156rpx;
+						height: 48rpx;
+						background: #F4F9FE;
+						border-radius: 8rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 24rpx;
+						color: #2D88F4;
+						image{
+							width: 28rpx;
+							height: 28rpx;
+							margin-right: 8rpx;
+						}
+					}
+				}
+				.address{
+					display: flex;
+					align-items: start;
+					justify-content: space-between;
+					margin-top: 16rpx;
+					margin-bottom: 12rpx;
+					.location{
+						font-size: 26rpx;
+					}
+					.go{
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						font-size: 18rpx;
+						color: rgba(45,136,244,0.96);
+						image{
+							width: 44rpx;
+							height: 44rpx;
+							
+						}
+					}
+				}
+				.car_id{
+					font-size: 26rpx;
+				}
 			}
 
 			.product {

pages/product/creatProduct.vue

@@ -38,7 +38,9 @@
 						支持jpg、png格式
 					</view>
 					<view v-if="tabIndex==1">
-						<image  v-for="(val,index) in fmImageList" :key="index" :src="val.url" mode="" style="width: 140rpx;height:140rpx;border-radius: 4px; border: 1px solid #ebecee;margin-right:20rpx;margin-bottom:10rpx" ></image>
+						<image v-for="(val,index) in fmImageList" :key="index" :src="val.url" mode=""
+							style="width: 140rpx;height:140rpx;border-radius: 4px; border: 1px solid #ebecee;margin-right:20rpx;margin-bottom:10rpx">
+						</image>
 					</view>
 					<u-upload v-else ref="uUpload" :action="action" :file-list="fmImageList" @on-success="handleSuccess"
 						@on-remove=" handleRemove" max-count="1" width="140rpx" height="140rpx"></u-upload>
@@ -61,7 +63,7 @@
 						原价<span>*</span>
 					</view>
 					<view class="picker">
-						<u-input :disabled="tabIndex==1"  v-model="form.price" placeholder="输入商品原价" />
+						<u-input :disabled="tabIndex==1" v-model="form.price" placeholder="输入商品原价" />
 					</view>
 					<view class="unit">
 						元
@@ -99,13 +101,15 @@
 							金豆奖励
 						</view>
 						<view class="picker set">
-							<u-switch v-model="jindouChecked" :disabled="tabIndex==1" style="margin-left:8rpx;" size="28" @change="e=>e==false?form.goldAward='':''"></u-switch>
+							<u-switch v-model="jindouChecked" :disabled="tabIndex==1" style="margin-left:8rpx;" size="28"
+								@change="e=>e==false?form.goldAward='':''"></u-switch>
 						</view>
 					</view>
-					<view  style="border:none;" v-if="jindouChecked">
+					<view style="border:none;" v-if="jindouChecked">
 						<view class="exchange-input">
-							<input type="digit" v-model.number="form.goldAward" @input="e => form.goldAward = e.detail.value? e.detail.value.replace(/[^\d]/g, ''):''" placeholder="请输入金豆奖励数量"
-								placeholder-class="input-placeholder" />
+							<input type="digit" v-model.number="form.goldAward"
+								@input="e => form.goldAward = e.detail.value? e.detail.value.replace(/[^\d]/g, ''):''"
+								placeholder="请输入金豆奖励数量" placeholder-class="input-placeholder" />
 							<text class="exchange-all">个金豆</text>
 						</view>
 					</view>
@@ -114,13 +118,15 @@
 							积分奖励
 						</view>
 						<view class="picker set">
-							<u-switch v-model="jifenChecked" :disabled="tabIndex==1" style="margin-left:8rpx;" size="28" @change="e=>e==false?form.integralAward='':''"></u-switch>
+							<u-switch v-model="jifenChecked" :disabled="tabIndex==1" style="margin-left:8rpx;" size="28"
+								@change="e=>e==false?form.integralAward='':''"></u-switch>
 						</view>
 					</view>
-					<view  style="border:none;" v-if="jifenChecked">
+					<view style="border:none;" v-if="jifenChecked">
 						<view class="exchange-input">
-							<input type="digit" v-model.number="form.integralAward" @input="e => form.integralAward = e.detail.value? e.detail.value.replace(/[^\d]/g, ''):''" placeholder="请输入积分奖励数量"
-								placeholder-class="input-placeholder" />
+							<input type="digit" v-model.number="form.integralAward"
+								@input="e => form.integralAward = e.detail.value? e.detail.value.replace(/[^\d]/g, ''):''"
+								placeholder="请输入积分奖励数量" placeholder-class="input-placeholder" />
 							<text class="exchange-all">个积分</text>
 						</view>
 					</view>
@@ -188,7 +194,8 @@
 							使用说明
 						</view>
 						<view class="textarea">
-							<u-input v-model="form.instructions" :disabled="tabIndex==1"  type="textarea" placeholder="请输入" maxlength="500" />
+							<u-input v-model="form.instructions" :disabled="tabIndex==1" type="textarea" placeholder="请输入"
+								maxlength="500" />
 						</view>
 						<view class="num">
 							<span
@@ -212,7 +219,8 @@
 			</view>
 		</view>
 		<rangTime ref="rangTime" :mode="mode" @onSubmit="onEndTimeChange" />
-		<refund v-show="isRefund" :Confirm="form.refundConfirm" :Label="form.refundLabel"  @confirm="saveFound" @close="cutRule" />
+		<refund v-show="isRefund" :Confirm="form.refundConfirm" :Label="form.refundLabel" @confirm="saveFound"
+			@close="cutRule" />
 		<view class="popup" v-if="isSelectType">
 			<view class="model">
 				<view class="title">
@@ -227,8 +235,8 @@
 						</view>
 					</view>
 					<view class="left border">
-						<view class="item" :class="currentCenter == index ? 'active' : ''"
-							v-for="(item, index) in treeCenter" :key="item.id" @click="selectRight(item, index)">
+						<view class="item" :class="currentCenter == index ? 'active' : ''" v-for="(item, index) in treeCenter"
+							:key="item.id" @click="selectRight(item, index)">
 							{{ item.name }}
 						</view>
 					</view>
@@ -250,753 +258,785 @@
 </template>
 
 <script>
-import rangTime from '../../components/dengrq-datetime-picker/dateSelector/index.vue'
-import refund from '@/components/product/refund.vue'
-
-import configService from '../../common/service/config.service'
-export default {
-	components: {
-		rangTime,
-		refund
-	},
-	data() {
-		return {
-			tabIndex:'0',
-			mode: 1,
-			form: {
-				instructions: '',
-				preBook: 0,
-				merchantId: null
-				// categoryId:'',
-				// productName: '',
-				// productImage: '',
-				// checked: null,
-				// num: 0,
-				// refundLabel:null,
-				// refundConfirm:null
-			},
-			fmImageList: [], //封面图回显
-			xqImage: [], //详情图回显
-			showRule: '', //显示退款规则文字
-			action: configService.apiUrl + '/sys/common/upload', //图片上传地址
-			// action: 'http://192.168.0.36:8080/jeecg-boot/sys/common/upload', //图片上传地址
-			schedule: 1, //进度
-			fileList: [],
-			selectedTime: null,
-			isSelectDate: false,
-			isRefund: false,
-			isSelectType: false,
-			treeLeft: [], //一级列表
-			treeCenter: [], //二级列表
-			treeRight: [], //三级列表
-			currentLeft: 0, //一级选中
-			currentCenter: 0, //二级选中
-			currentRight: 0, //三级选中
-			productType: [], //选中的商品分类id
-			selectTypeList: [], //选中的商品分类名称
-			showText: '',
-			showDate: '',
-			showSellDate: '',
-			makeChecked: false,
-			// imageHttp: 'http://192.168.0.36:8080/jeecg-boot/', //上传图片前缀+
-			imageHttp: configService.apiUrl + '/', //上传图片前缀+
-			productId: '',
-			jindouChecked: false,
-			jifenChecked: false,
-		}
-	},
-	methods: {
-		// 上传封面图成功回调
-		handleSuccess(res, index, lists) {
-			this.form.productImage = this.imageHttp + res.message
-			
-		},
-		// 移除封面图文件回调
-		handleRemove(index, lists) {
-				this.fmImageList = [];
-		},
-		//上传详情图
-		detailsSuccess(res, index, lists) {
-			this.xqImage = lists
+	import rangTime from '../../components/dengrq-datetime-picker/dateSelector/index.vue'
+	import refund from '@/components/product/refund.vue'
 
+	import configService from '../../common/service/config.service'
+	export default {
+		components: {
+			rangTime,
+			refund
 		},
-		detailsRemove(index, lists) {
-			this.xqImage = lists
+		data() {
+			return {
+				tabIndex: '0',
+				mode: 1,
+				form: {
+					instructions: '',
+					preBook: 0,
+					merchantId: null
+					// categoryId:'',
+					// productName: '',
+					// productImage: '',
+					// checked: null,
+					// num: 0,
+					// refundLabel:null,
+					// refundConfirm:null
+				},
+				fmImageList: [], //封面图回显
+				xqImage: [], //详情图回显
+				showRule: '', //显示退款规则文字
+				action: configService.apiUrl + '/sys/common/upload', //图片上传地址
+				// action: 'http://192.168.0.36:8080/jeecg-boot/sys/common/upload', //图片上传地址
+				schedule: 1, //进度
+				fileList: [],
+				selectedTime: null,
+				isSelectDate: false,
+				isRefund: false,
+				isSelectType: false,
+				treeLeft: [], //一级列表
+				treeCenter: [], //二级列表
+				treeRight: [], //三级列表
+				currentLeft: 0, //一级选中
+				currentCenter: 0, //二级选中
+				currentRight: 0, //三级选中
+				productType: [], //选中的商品分类id
+				selectTypeList: [], //选中的商品分类名称
+				showText: '',
+				showDate: '',
+				showSellDate: '',
+				makeChecked: false,
+				// imageHttp: 'http://192.168.0.36:8080/jeecg-boot/', //上传图片前缀+
+				imageHttp: configService.apiUrl + '/', //上传图片前缀+
+				productId: '',
+				jindouChecked: false,
+				jifenChecked: false,
+			}
 		},
-		//下一步
-		next() {
-			console.log(this.tabIndex);
-			
-			let temp = []
-			if ( this.xqImage.length > 0) {
-				this.xqImage.forEach((item => {
-					temp.push(item.url)
+		methods: {
+			// 上传封面图成功回调
+			handleSuccess(res, index, lists) {
+				this.form.productImage = this.imageHttp + res.message
+
+			},
+			// 移除封面图文件回调
+			handleRemove(index, lists) {
+				this.fmImageList = [];
+			},
+			//上传详情图
+			detailsSuccess(res, index, lists) {
+				console.log(lists)
+				this.xqImage = lists
+				let temp = []
+				lists.forEach((item => {
+					// temp.push(item.url)
+					if (item.response.message) {
+				
+						temp.push( this.imageHttp + item.response.message)
+					}
 				}))
+				this.form.detailImages = temp.join(',')
 
-			}
-			this.form.detailImages = temp.join(',')
-			//基础信息必填提示
-			if (!this.form.categoryId) {
-				uni.showToast({
-					title: '请选择商品分类',
-					icon: 'none'
-				});
-				return
-			}
-			if (!this.form.productName) {
-				uni.showToast({
-					title: '请输入商品名称',
-					icon: 'none'
-				});
-				return
-			}
-			if (!this.form.productImage) {
-				uni.showToast({
-					title: '请上传商品封面图',
-					icon: 'none'
-				});
-				return
-			}
-			if (this.tabIndex=='0' && !this.form.detailImages) {
-				uni.showToast({
-					title: '请上传商品详情图',
-					icon: 'none'
-				});
-				return
-			}
-			if (!this.form.price) {
-				uni.showToast({
-					title: '请输入商品原价',
-					icon: 'none'
-				});
-				return
-			}
-			if (!this.form.soldPrice) {
-				uni.showToast({
-					title: '请输入商品售价',
-					icon: 'none'
-				});
-				return
-			} else {
-				this.schedule += 1
-			}
+			},
+			detailsRemove(index, lists) {
+				this.xqImage = lists
+				let temp = []
+				lists.forEach((item => {
+					// temp.push(item.url)
+					if (item.response.message) {
+				
+						temp.push( this.imageHttp + item.response.message)
+					}
+				}))
+				this.form.detailImages = temp.join(',')
+			},
+			//下一步
+			next() {
+				console.log(this.xqImage);
 
-		},
-		// 跳转至组合商品页
-		goGroup() {
-			// if(this.tabIndex==0){
+				let temp = []
+				// if (this.xqImage.length > 0) {
+				// 	this.xqImage.forEach((item => {
+				// 		// temp.push(item.url)
+				// 		if (item.response.message) {
+
+				// 			temp.push({
+				// 				url: this.imageHttp + item.response.message
+				// 			})
+				// 		}
+				// 	}))
+
+				// }
+				// this.form.detailImages = temp.join(',')
+				//基础信息必填提示
+				if (!this.form.categoryId) {
+					uni.showToast({
+						title: '请选择商品分类',
+						icon: 'none'
+					});
+					return
+				}
+				if (!this.form.productName) {
+					uni.showToast({
+						title: '请输入商品名称',
+						icon: 'none'
+					});
+					return
+				}
+				if (!this.form.productImage) {
+					uni.showToast({
+						title: '请上传商品封面图',
+						icon: 'none'
+					});
+					return
+				}
+				if (this.tabIndex == '0' && !this.form.detailImages) {
+					uni.showToast({
+						title: '请上传商品详情图',
+						icon: 'none'
+					});
+					return
+				}
+				if (!this.form.price) {
+					uni.showToast({
+						title: '请输入商品原价',
+						icon: 'none'
+					});
+					return
+				}
+				if (!this.form.soldPrice) {
+					uni.showToast({
+						title: '请输入商品售价',
+						icon: 'none'
+					});
+					return
+				} else {
+					this.schedule += 1
+				}
+
+			},
+			// 跳转至组合商品页
+			goGroup() {
+				// if(this.tabIndex==0){
 				uni.navigateTo({
 					url: '/pages/product/group'
 				})
-			// }
+				// }
 
-		},
-		//返回
-		back() {
-			uni.navigateTo({
-				url: '/pages/product/index'
-			})
-		},
-		// 处理 confirm 事件，接收子组件传递的时间段数据
-		handleConfirm(time) {
-			this.selectedTime = time; // 保存时间段数据
-			this.isSelectDate = false
-		},
-		//隐藏弹窗
-		closeSelectDate() {
-			this.isSelectDate = false
-		},
-		//跳转至可用时间
-		setUsable() {
+			},
+			//返回
+			back() {
+				uni.navigateTo({
+					url: '/pages/product/index'
+				})
+			},
+			// 处理 confirm 事件，接收子组件传递的时间段数据
+			handleConfirm(time) {
+				this.selectedTime = time; // 保存时间段数据
+				this.isSelectDate = false
+			},
+			//隐藏弹窗
+			closeSelectDate() {
+				this.isSelectDate = false
+			},
+			//跳转至可用时间
+			setUsable() {
 				uni.navigateTo({
 					url: '/pages/product/usable'
 				})
 
-		},
-		// 保存退款规则
-		saveFound(rules) {
-			this.form.refundConfirm = rules.refundConfirm.refundConfirm
-			this.form.refundLabel = rules.refundLabel.refundLabel
-			let value1 = []
-			value1.push(rules.refundConfirm.name, rules.refundLabel.name)
-			this.showRule = value1.join("·")
-			// this.selectedRules = rules; 
-			this.isRefund = false
-		},
-		cutRule() {
-			this.isRefund = false
-		},
-		//获取商品分类一级列表
-		getLeftTree() {
-			this.$http.get("/sys/category/childList?pid=" + '1889836358116098050', {}).then(res => {
-				if (res.data.code == 0) {
-					this.treeLeft = res.data.result
-					if (this.treeLeft[0]) {
-						this.getCenterTree(this.treeLeft[0].id)
+			},
+			// 保存退款规则
+			saveFound(rules) {
+				this.form.refundConfirm = rules.refundConfirm.refundConfirm
+				this.form.refundLabel = rules.refundLabel.refundLabel
+				let value1 = []
+				value1.push(rules.refundConfirm.name, rules.refundLabel.name)
+				this.showRule = value1.join("·")
+				// this.selectedRules = rules; 
+				this.isRefund = false
+			},
+			cutRule() {
+				this.isRefund = false
+			},
+			//获取商品分类一级列表
+			getLeftTree() {
+				this.$http.get("/sys/category/childList?pid=" + '1889836358116098050', {}).then(res => {
+					if (res.data.code == 0) {
+						this.treeLeft = res.data.result
+						if (this.treeLeft[0]) {
+							this.getCenterTree(this.treeLeft[0].id)
+						}
 					}
-				}
-			})
-		},
-		//获取商品分类二级列表
-		getCenterTree(id) {
-			this.$http.get("/sys/category/childList?pid=" + id, {}).then(res => {
-				if (res.data.code == 0) {
-					this.treeCenter = res.data.result
-					if (this.treeCenter[0]) {
-						// this.getRightTree(this.treeCenter[0].id)
+				})
+			},
+			//获取商品分类二级列表
+			getCenterTree(id) {
+				this.$http.get("/sys/category/childList?pid=" + id, {}).then(res => {
+					if (res.data.code == 0) {
+						this.treeCenter = res.data.result
+						if (this.treeCenter[0]) {
+							// this.getRightTree(this.treeCenter[0].id)
+						}
 					}
+				})
+			},
+			//获取商品分类三级列表
+			getRightTree(id) {
+				this.$http.get("/sys/category/childList?pid=" + id, {}).then(res => {
+					if (res.data.code == 0) {
+						this.treeRight = res.data.result
+					}
+				})
+			},
+			selectProductType() {
+				if (this.tabIndex == '0') {
+					this.isSelectType = true
+					this.showText = ''
+					this.productType = []
+					this.selectTypeList = []
+					this.currentLeft = null
+					this.currentCenter = null
+					this.currentRight = null
 				}
-			})
-		},
-		//获取商品分类三级列表
-		getRightTree(id) {
-			this.$http.get("/sys/category/childList?pid=" + id, {}).then(res => {
-				if (res.data.code == 0) {
-					this.treeRight = res.data.result
-				}
-			})
-		},
-		selectProductType() {
-			if(this.tabIndex=='0'){
-				this.isSelectType = true
-				this.showText = ''
+
+			},
+			//选中一级
+			selectLeft(item, index) {
+				this.currentLeft = index
+				this.currentCenter = null
+				this.currentRight = null
+				this.treeCenter = []
+				this.treeRight = []
 				this.productType = []
 				this.selectTypeList = []
-				this.currentLeft = null
-				this.currentCenter = null
+				this.productType.push(item.id)
+				this.selectTypeList.push(item.name)
+				this.getCenterTree(item.id)
+			},
+			//选中二级
+			selectRight(item, index) {
+				this.getRightTree(this.treeCenter[0].id)
+				this.currentCenter = index
 				this.currentRight = null
-			}
+				if (this.selectTypeList.length >= 2) {
+					this.productType.splice(1, 2)
+					this.selectTypeList.splice(1, 2)
+				}
+				this.productType.push(item.id)
+				this.selectTypeList.push(item.name)
+				this.getRightTree(item.id)
+			},
+			//选中三级
+			selectLast(item, index) {
+				if (this.selectTypeList.length >= 3) {
+					this.productType.splice(2, 1)
+					this.selectTypeList.splice(2, 1)
+				}
+				this.productType.push(item.id)
+				this.selectTypeList.push(item.name)
+				this.currentRight = index
+			},
+			//确定分类
+			selectType() {
+				this.isSelectType = false
+				this.form.categoryId = this.productType.join(',')
+				this.showText = this.selectTypeList.join('·')
+			},
+			//关闭选择分类弹窗
+			closePopup() {
+				this.isSelectType = false
+			},
+			selectDate() {
+				// this.isSelectDate = true
+				this.$refs.rangTime.open()
+			},
+			onEndTimeChange(val) {
+				this.form.saleStartDate = val.startDate
+				this.form.saleEndDate = val.endDate
+				this.showDate = val.startDate + '-' + val.endDate
+				this.$forceUpdate(); // 强制刷新视图
+			},
+			//提交审核
+			submit() {
+				console.log(this.form)
+				this.makeChecked ? this.form.preBook = 1 : this.form.preBook = 0
+				if (!this.form.saleStartDate) {
+					uni.showToast({
+						title: '请设置售卖时间',
+						icon: 'none'
+					});
+					return
+				} else if (!this.form.stockQuantity) {
+					uni.showToast({
+						title: '请输入商品库存',
+						icon: 'none'
+					});
+					return
+				} else if (!this.form.availableEndDate && !this.form.expirationDays) {
+					uni.showToast({
+						title: '请选择可用时间',
+						icon: 'none'
+					});
+					return
+				} else if (this.form.refundConfirmName == '' || this.form.refundLabelName == '') {
+					uni.showToast({
+						title: '请选择退款标签',
+						icon: 'none'
+					});
+					return
+				} else {
+					if (this.productId == '') {
+						this.$http.post("/app/product/add", this.form).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '添加成功',
+									icon: 'none'
+								});
+								this.back()
+								uni.removeStorage({
+									key: 'smdate',
+								});
+								uni.removeStorage({
+									key: 'group',
+								});
+							} else {
+								uni.showToast({
+									title: res.message,
+									icon: 'none'
+								});
+							}
 
-		},
-		//选中一级
-		selectLeft(item, index) {
-			this.currentLeft = index
-			this.currentCenter = null
-			this.currentRight = null
-			this.treeCenter = []
-			this.treeRight = []
-			this.productType = []
-			this.selectTypeList = []
-			this.productType.push(item.id)
-			this.selectTypeList.push(item.name)
-			this.getCenterTree(item.id)
-		},
-		//选中二级
-		selectRight(item, index) {
-			this.getRightTree(this.treeCenter[0].id)
-			this.currentCenter = index
-			this.currentRight = null
-			if (this.selectTypeList.length >= 2) {
-				this.productType.splice(1, 2)
-				this.selectTypeList.splice(1, 2)
-			}
-			this.productType.push(item.id)
-			this.selectTypeList.push(item.name)
-			this.getRightTree(item.id)
-		},
-		//选中三级
-		selectLast(item, index) {
-			if (this.selectTypeList.length >= 3) {
-				this.productType.splice(2, 1)
-				this.selectTypeList.splice(2, 1)
-			}
-			this.productType.push(item.id)
-			this.selectTypeList.push(item.name)
-			this.currentRight = index
-		},
-		//确定分类
-		selectType() {
-			this.isSelectType = false
-			this.form.categoryId = this.productType.join(',')
-			this.showText = this.selectTypeList.join('·')
-		},
-		//关闭选择分类弹窗
-		closePopup() {
-			this.isSelectType = false
-		},
-		selectDate() {
-			// this.isSelectDate = true
-			this.$refs.rangTime.open()
-		},
-		onEndTimeChange(val) {
-			this.form.saleStartDate = val.startDate
-			this.form.saleEndDate = val.endDate
-			this.showDate = val.startDate + '-' + val.endDate
-			this.$forceUpdate(); // 强制刷新视图
-		},
-		//提交审核
-		submit() {
-			console.log(this.form)
-			this.makeChecked ? this.form.preBook = 1 : this.form.preBook = 0
-			if (!this.form.saleStartDate) {
-				uni.showToast({
-					title: '请设置售卖时间',
-					icon: 'none'
-				});
-				return
-			} else if (!this.form.stockQuantity) {
-				uni.showToast({
-					title: '请输入商品库存',
-					icon: 'none'
-				});
-				return
-			} else if (!this.form.availableEndDate && !this.form.expirationDays) {
-				uni.showToast({
-					title: '请选择可用时间',
-					icon: 'none'
-				});
-				return
-			}
-			else if (this.form.refundConfirmName == '' ||this.form.refundLabelName=='' ) {
-				uni.showToast({
-					title: '请选择退款标签',
-					icon: 'none'
-				});
-				return
-			}
-			 else {
-				if (this.productId == '') {
-					this.$http.post("/app/product/add", this.form).then(res => {
-						if (res.data.code == 200) {
-							uni.showToast({
-								title: '添加成功',
-								icon: 'none'
-							});
-							this.back()
+
+						})
+					} else {
+						this.form.productId = this.productId
+						this.$http.post("/app/product/edit", this.form).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '编辑成功',
+									icon: 'none'
+								});
+								this.back()
+							}else{
+								uni.showToast({
+									icon:'none',
+									title:res.data.sessage
+								})
+							}
 							uni.removeStorage({
 								key: 'smdate',
 							});
 							uni.removeStorage({
 								key: 'group',
 							});
-						}else{
-							uni.showToast({
-								title: res.message,
-								icon: 'none'
-							});
-						}
-						
-						
-					})
-				} else {
-					this.form.productId = this.productId
-					this.$http.post("/app/product/edit", this.form).then(res => {
-						if (res.data.code == 200) {
-							uni.showToast({
-								title: '编辑成功',
-								icon: 'none'
-							});
-						}
-						uni.removeStorage({
-							key: 'smdate',
-						});
-						uni.removeStorage({
-							key: 'group',
-						});
-						this.back()
-					})
+							
+						})
+					}
+
 				}
+			},
+			//回显数据
+			getForm() {
+				this.$http.get("/app/product/queryById?id=" + this.productId, {}).then(res => {
+					if (res.data.code == 200) {
+						this.form = res.data.result
+						this.jifenChecked = res.data.result.integralAward ? true : false
+						this.jindouChecked = res.data.result.goldAward ? true : false
+						this.showText = res.data.result.productCategory
+						this.fmImageList.push({
+							url: res.data.result.productImage
+						})
 
-			}
-		},
-		//回显数据
-		getForm() {
-			this.$http.get("/app/product/queryById?id=" + this.productId, {}).then(res => {
-				if (res.data.code == 200) {
-					this.form = res.data.result
-					this. jifenChecked= res.data.result.integralAward?true:false
-					this. jindouChecked= res.data.result.goldAward?true:false
-					this.showText = res.data.result.productCategory
-					this.fmImageList.push({
-						url: res.data.result.productImage
-					})
-					
-					if(res.data.result.detailImages){
-						let xqtemp = []
-						xqtemp = res.data.result.detailImages.split(',')
-						xqtemp.map(item => {
-							this.xqImage.push({
-								url: item
+						if (res.data.result.detailImages) {
+							let xqtemp = []
+							xqtemp = res.data.result.detailImages.split(',')
+							xqtemp.map(item => {
+								this.xqImage.push({
+									url: item
+								})
 							})
+							console.log(this.xqImage)
+						}
+
+						this.showDate = res.data.result.saleStartDate.slice(0, 10) + '-' + res.data.result.saleEndDate.slice(0,
+							10)
+						if (res.data.result.availableEndDate) {
+							this.showSellDate = res.data.result.availableStartDate.slice(0, 10) + '-' + res.data.result
+								.availableEndDate.slice(0, 10)
+						} else if (res.data.result.expirationDays) {
+							this.showSellDate = res.data.result.expirationDays + '天后失效'
+						}
+						res.data.result.preBook == 0 ? this.makeChecked = false : this.makeChecked = true
+						if (res.data.result.refundLabelName && res.data.result.refundConfirmName) {
+							this.showRule = res.data.result.refundLabelName + '·' + res.data.result.refundConfirmName
+						}
+
+						console.log(this.showRule)
+						uni.setStorage({
+							key: 'group',
+							data: res.data.result.productGroups
 						})
 					}
-					
-					this.showDate = res.data.result.saleStartDate.slice(0, 10) + '-' + res.data.result.saleEndDate.slice(0,
-						10)
-					if (res.data.result.availableEndDate) {
-						this.showSellDate = res.data.result.availableStartDate.slice(0, 10) + '-' + res.data.result
-							.availableEndDate.slice(0, 10)
-					} else if (res.data.result.expirationDays) {
-						this.showSellDate = res.data.result.expirationDays + '天后失效'
-					}
-					res.data.result.preBook == 0 ? this.makeChecked = false : this.makeChecked = true
-					if(res.data.result.refundLabelName &&res.data.result.refundConfirmName ){
-						this.showRule = res.data.result.refundLabelName + '·' + res.data.result.refundConfirmName
+				})
+			}
+		},
+		mounted() {
+			this.getLeftTree()
+			this.getForm()
+		},
+		onLoad(options) {
+			if (options.productId) {
+				this.productId = options.productId
+			}
+			if (options.tabIndex) {
+				this.tabIndex = options.tabIndex
+			}
+
+		},
+		onShow() {
+			let that = this
+			uni.getStorage({
+				key: 'login_user_info',
+				success: function(res) {
+					that.form.merchantId = res.data.merchantId
+				}
+			})
+			uni.getStorage({
+				key: 'smdate',
+				success: (res) => {
+					if (res.data.availableEndDate) {
+						this.showSellDate = res.data.availableStartDate + '-' + res.data.availableEndDate
+						this.form.availableStartDate = res.data.availableStartDate
+						this.form.availableEndDate = res.data.availableEndDate
+						this.form.expirationDays = null
+					} else if (res.data.expirationDays) {
+						this.form.expirationDays = res.data.expirationDays
+						this.form.availableEndDate = null
+						this.form.availableStartDate = null
+						this.$nextTick(() => {
+							this.showSellDate = res.data.expirationDays + '天后失效'
+						});
 					}
-					
-					console.log(this.showRule)
-					uni.setStorage({
-						key: 'group',
-						data: res.data.result.productGroups
-					})
+
 				}
 			})
-		}
-	},
-	mounted() {
-		this.getLeftTree()
-		this.getForm()
-	},
-	onLoad(options) {
-		if (options.productId) {
-			this.productId = options.productId
-		}
-		if (options.tabIndex) {
-			this.tabIndex = options.tabIndex
-		}
-		
-	},
-	onShow() {
-		let that = this
-		uni.getStorage({
-			key: 'login_user_info',
-			success: function (res) {
-				that.form.merchantId = res.data.merchantId
-			}
-		})
-		uni.getStorage({
-			key: 'smdate',
-			success: (res) => {
-				if (res.data.availableEndDate) {
-					this.showSellDate = res.data.availableStartDate + '-' + res.data.availableEndDate
-					this.form.availableStartDate = res.data.availableStartDate
-					this.form.availableEndDate = res.data.availableEndDate
-					this.form.expirationDays = null
-				} else if (res.data.expirationDays) {
-					this.form.expirationDays = res.data.expirationDays
-					this.form.availableEndDate = null
-					this.form.availableStartDate = null
-					this.$nextTick(() => {
-						this.showSellDate = res.data.expirationDays + '天后失效'
-					});
+			uni.getStorage({
+				key: 'group',
+				success: function(res) {
+					that.form.productGroups = res.data
 				}
-
-			}
-		})
-		uni.getStorage({
-			key: 'group',
-			success: function (res) {
-				that.form.productGroups = res.data
-			}
-		})
+			})
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-.creat {
-	width: 100vw;
-	height: 100vh;
-	background: #F7F8FC;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-
-	/*#ifdef APP-PLUS*/
-	.top {
-		width: 100%;
-		height: var(--status-bar-height);
-		background-color: #fff;
-	}
-
-	/*#endif*/
-	.head {
-		width: 100%;
-		height: 112rpx;
-		padding: 32rpx 24rpx;
+	.creat {
+		width: 100vw;
+		height: 100vh;
+		background: #F7F8FC;
 		display: flex;
-		align-items: center;
-		background-color: #fff;
-		position: relative;
+		flex-direction: column;
+		justify-content: space-between;
 
-		.cuIcon-back {
-			font-size: 40rpx;
-			margin-right: 40rpx;
+		/*#ifdef APP-PLUS*/
+		.top {
+			width: 100%;
+			height: var(--status-bar-height);
+			background-color: #fff;
 		}
 
-		.case {
-			font-size: 36rpx;
-			font-weight: 600;
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
+		/*#endif*/
+		.head {
+			width: 100%;
+			height: 112rpx;
+			padding: 32rpx 24rpx;
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+			position: relative;
 
-		.step {
-			position: absolute;
-			right: 20rpx;
-		}
-	}
+			.cuIcon-back {
+				font-size: 40rpx;
+				margin-right: 40rpx;
+			}
 
-	.content {
-		width: 100%;
-		flex: 1;
-		padding: 24rpx;
-		overflow-y: auto;
+			.case {
+				font-size: 36rpx;
+				font-weight: 600;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+			}
 
-		.prompt {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #999999;
-			// padding: 10rpx 0;
-			margin-bottom: 18rpx;
+			.step {
+				position: absolute;
+				right: 20rpx;
+			}
 		}
 
-		.titl {
+		.content {
 			width: 100%;
-			// height: 60rpx;
-			font-weight: 600;
-			font-size: 32rpx;
-			color: #333333;
-			margin-bottom: 16rpx;
-		}
+			flex: 1;
+			padding: 24rpx;
+			overflow-y: auto;
 
-		.form {
-			background-color: #fff;
-			padding: 16rpx;
-			border-radius: 16rpx;
+			.prompt {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #999999;
+				// padding: 10rpx 0;
+				margin-bottom: 18rpx;
+			}
 
-			.item {
+			.titl {
 				width: 100%;
-				height: 58rpx;
-				border-bottom: 1px solid #EEEEEE;
-				display: flex;
-				// align-items: center;
-				padding-bottom: 16rpx;
+				// height: 60rpx;
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #333333;
 				margin-bottom: 16rpx;
+			}
 
-				.label {
-					margin-right: 20rpx;
-					font-weight: 600;
-					font-size: 28rpx;
-					min-width: 126rpx;
+			.form {
+				background-color: #fff;
+				padding: 16rpx;
+				border-radius: 16rpx;
+
+				.item {
+					width: 100%;
+					height: 58rpx;
+					border-bottom: 1px solid #EEEEEE;
+					display: flex;
+					// align-items: center;
+					padding-bottom: 16rpx;
+					margin-bottom: 16rpx;
 
-					span {
-						color: red;
+					.label {
+						margin-right: 20rpx;
+						font-weight: 600;
+						font-size: 28rpx;
+						min-width: 126rpx;
+
+						span {
+							color: red;
+						}
 					}
-				}
 
-				.picker {
-					flex: 1;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					font-size: 28rpx;
-					color: #999999;
-				}
+					.picker {
+						flex: 1;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						font-size: 28rpx;
+						color: #999999;
+					}
 
-				.set {
-					display: flex;
-					justify-content: flex-end;
+					.set {
+						display: flex;
+						justify-content: flex-end;
 
-					::v-deep.u-input {
-						text-align: right !important;
+						::v-deep.u-input {
+							text-align: right !important;
+						}
 					}
 				}
-			}
 
-			.upload {
-				display: block;
-				height: auto;
+				.upload {
+					display: block;
+					height: auto;
 
-				.tips {
-					font-size: 20rpx;
-					color: #999999;
-					margin-bottom: 16rpx;
-					margin-top: 10rpx;
+					.tips {
+						font-size: 20rpx;
+						color: #999999;
+						margin-bottom: 16rpx;
+						margin-top: 10rpx;
+					}
 				}
-			}
 
-			.textarea {
-				width: 100%;
-				height: 196rpx;
-				background: #F7F8FC;
-				border-radius: 4rpx;
-				padding: 12rpx 16rpx;
-				font-size: 26rpx;
-				margin-top: 12rpx;
-			}
+				.textarea {
+					width: 100%;
+					height: 196rpx;
+					background: #F7F8FC;
+					border-radius: 4rpx;
+					padding: 12rpx 16rpx;
+					font-size: 26rpx;
+					margin-top: 12rpx;
+				}
 
-			.num {
-				width: 100%;
-				text-align: right;
-				font-size: 24rpx;
-				color: #999999;
-				margin-top: 6rpx;
+				.num {
+					width: 100%;
+					text-align: right;
+					font-size: 24rpx;
+					color: #999999;
+					margin-top: 6rpx;
+				}
 			}
 		}
-	}
 
-	.btn {
-		width: 100%;
-		height: 112rpx;
-		background-color: #fff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-
-		.next {
-			width: 672rpx;
-			height: 76rpx;
-			border-radius: 54rpx;
-			border: 1px solid #449AFF;
-			margin: 0 auto;
+		.btn {
+			width: 100%;
+			height: 112rpx;
+			background-color: #fff;
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			font-size: 28rpx;
-			color: #449AFF;
-		}
 
-		.handle {
-			width: 100%;
-			display: flex;
-			justify-content: space-around;
-
-			.back {
-				width: 205rpx;
+			.next {
+				width: 672rpx;
 				height: 76rpx;
 				border-radius: 54rpx;
 				border: 1px solid #449AFF;
+				margin: 0 auto;
 				display: flex;
-				align-items: center;
 				justify-content: center;
+				align-items: center;
 				font-size: 28rpx;
 				color: #449AFF;
 			}
 
-			.submit {
-				width: 443rpx;
-				height: 76rpx;
-				background: linear-gradient(90deg, #77B6FF 0%, #449AFF 100%);
-				border-radius: 53rpx;
+			.handle {
+				width: 100%;
 				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 28rpx;
-				color: #FFFFFF;
+				justify-content: space-around;
+
+				.back {
+					width: 205rpx;
+					height: 76rpx;
+					border-radius: 54rpx;
+					border: 1px solid #449AFF;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 28rpx;
+					color: #449AFF;
+				}
+
+				.submit {
+					width: 443rpx;
+					height: 76rpx;
+					background: linear-gradient(90deg, #77B6FF 0%, #449AFF 100%);
+					border-radius: 53rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
 			}
 		}
-	}
 
-	.popup {
-		width: 100vw;
-		height: 100vh;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: rgba(0, 0, 0, 0.4);
-		display: flex;
-		align-items: flex-end;
-
-		z-index: 99;
+		.popup {
+			width: 100vw;
+			height: 100vh;
+			position: fixed;
+			top: 0;
+			left: 0;
+			background: rgba(0, 0, 0, 0.4);
+			display: flex;
+			align-items: flex-end;
 
-		.model {
-			width: 100%;
-			background-color: #fff;
-			border-radius: 20rpx 20rpx 0rpx 0rpx;
-			padding: 0rpx 24rpx;
-			padding-bottom: 20rpx;
+			z-index: 99;
 
-			.title {
+			.model {
 				width: 100%;
-				height: 86rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				border-bottom: 1px solid #EEEEEE;
-				position: relative;
-
-				image {
-					width: 40rpx;
-					height: 40rpx;
-					position: absolute;
-					right: 0px;
+				background-color: #fff;
+				border-radius: 20rpx 20rpx 0rpx 0rpx;
+				padding: 0rpx 24rpx;
+				padding-bottom: 20rpx;
+
+				.title {
+					width: 100%;
+					height: 86rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-bottom: 1px solid #EEEEEE;
+					position: relative;
+
+					image {
+						width: 40rpx;
+						height: 40rpx;
+						position: absolute;
+						right: 0px;
+					}
 				}
-			}
 
-			.tree {
-				display: flex;
-				height: 546rpx;
+				.tree {
+					display: flex;
+					height: 546rpx;
 
-				.left {
-					overflow-y: auto;
+					.left {
+						overflow-y: auto;
 
-					.item {
-						width: 224rpx;
-						height: 78rpx;
-						padding: 20rpx;
-						font-size: 26rpx;
-					}
+						.item {
+							width: 224rpx;
+							height: 78rpx;
+							padding: 20rpx;
+							font-size: 26rpx;
+						}
 
-					.active {
-						background: rgba(68, 154, 255, 0.1);
-						color: #2983EC;
+						.active {
+							background: rgba(68, 154, 255, 0.1);
+							color: #2983EC;
+						}
 					}
-				}
 
-				.border {
-					border-left: 1px solid #eeeeee;
-					border-right: 1px solid #eeeeee;
+					.border {
+						border-left: 1px solid #eeeeee;
+						border-right: 1px solid #eeeeee;
+					}
 				}
-			}
 
-			.sub {
-				display: flex;
-				justify-content: space-between;
-				margin-top: 16rpx;
-				border-top: 1px solid #eeeeee;
-				padding-top: 16rpx;
-
-				.submit {
-					width: 672rpx;
-					height: 76rpx;
-					background: linear-gradient(90deg, #77B6FF 0%, #449AFF 100%);
-					border-radius: 53rpx;
+				.sub {
 					display: flex;
-					align-items: center;
-					justify-content: center;
-					font-size: 28rpx;
-					color: #FFFFFF;
+					justify-content: space-between;
+					margin-top: 16rpx;
+					border-top: 1px solid #eeeeee;
+					padding-top: 16rpx;
+
+					.submit {
+						width: 672rpx;
+						height: 76rpx;
+						background: linear-gradient(90deg, #77B6FF 0%, #449AFF 100%);
+						border-radius: 53rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 28rpx;
+						color: #FFFFFF;
+					}
 				}
 			}
 		}
 	}
-}
-
-::v-deep.u-upload__button {
-	width: 250rpx !important;
-	height: 250rpx !important;
-}
-
-.exchange-input {
-	display: flex;
-	justify-content: space-between;
-	height: 65rpx;
-	background: #F7F8FC;
-	border-radius: 12rpx;
-	margin-bottom: 20rpx;
-	padding: 20rpx;
-	font-size: 28rpx;
-	width: 100%;
-	.exchange-all {
-		color: #333333;
-		font-size: 28rpx;
 
+	::v-deep.u-upload__button {
+		width: 250rpx !important;
+		height: 250rpx !important;
 	}
-	input {
+
+	.exchange-input {
+		display: flex;
+		justify-content: space-between;
+		height: 65rpx;
+		background: #F7F8FC;
+		border-radius: 12rpx;
+		margin-bottom: 20rpx;
+		padding: 20rpx;
 		font-size: 28rpx;
+		width: 100%;
+
+		.exchange-all {
+			color: #333333;
+			font-size: 28rpx;
+
+		}
+
+		input {
+			font-size: 28rpx;
+		}
 	}
-}
 </style>