Browse Source

fix:去掉标题返回

sunChengjie 11 months ago
parent
commit
ce28af4f36

+ 1 - 1
src/pages/addressbook.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<!-- table切换 -->
 		<div class="tab">
 			<div>

+ 1 - 1
src/pages/cityaddressbook.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<!-- table切换 -->
 		<div class="tab">
 			<div>

File diff suppressed because it is too large
+ 698 - 664
src/pages/cityexpress.vue


+ 93 - 62
src/pages/daishou.vue

@@ -1,94 +1,125 @@
 <template>
 	<div>
-		<back :title="titlename"></back>
+
 		<div class="content">
 			<van-search v-model="value" placeholder="请输入搜索关键词" />
 			<div class="slide">
 				<van-collapse v-model="activeNames" accordion>
-				  <van-collapse-item title="总部>销售部" name="1" value="12/12">
-					  <ul>
-						  <li><p>测试1</p></li>
-						  <li><p>测试1</p></li>
-						  <li><p>测试1</p></li>
-					  </ul>
-				  </van-collapse-item>
-				  <van-collapse-item title="总部>销售部" name="2" value="12/12">
-					  <ul>
-					  	<li><p>测试2</p></li>
-					  	<li><p>测试2</p></li>
-					  	<li><p>测试2</p></li>					  
-					  </ul>
-				  </van-collapse-item>
-				  <van-collapse-item title="总部>销售部" name="3" value="12/12">
-					  <ul>
-						  <li><p>测试3</p></li>
-						  <li><p>测试4</p></li>
-						  <li><p>测试5</p></li>
-					  </ul>
-				  </van-collapse-item>
+					<van-collapse-item title="总部>销售部" name="1" value="12/12">
+						<ul>
+							<li>
+								<p>测试1</p>
+							</li>
+							<li>
+								<p>测试1</p>
+							</li>
+							<li>
+								<p>测试1</p>
+							</li>
+						</ul>
+					</van-collapse-item>
+					<van-collapse-item title="总部>销售部" name="2" value="12/12">
+						<ul>
+							<li>
+								<p>测试2</p>
+							</li>
+							<li>
+								<p>测试2</p>
+							</li>
+							<li>
+								<p>测试2</p>
+							</li>
+						</ul>
+					</van-collapse-item>
+					<van-collapse-item title="总部>销售部" name="3" value="12/12">
+						<ul>
+							<li>
+								<p>测试3</p>
+							</li>
+							<li>
+								<p>测试4</p>
+							</li>
+							<li>
+								<p>测试5</p>
+							</li>
+						</ul>
+					</van-collapse-item>
 				</van-collapse>
 			</div>
 			<!--  -->
 			<div class="search" v-show="false">
 				<ul>
-					<li><p>测试2</p></li>
-					<li><p>测试2</p></li>
-					<li><p>测试2</p></li>					  
+					<li>
+						<p>测试2</p>
+					</li>
+					<li>
+						<p>测试2</p>
+					</li>
+					<li>
+						<p>测试2</p>
+					</li>
 				</ul>
 			</div>
 		</div>
 	</div>
-	
+
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				titlename:"快递代收",
-				value:"",
-				activeNames: "",
-			}
-		},
-		methods:{
-			
+export default {
+	data() {
+		return {
+			titlename: "快递代收",
+			value: "",
+			activeNames: "",
 		}
+	},
+	methods: {
+
 	}
+}
 </script>
 
 <style scoped lang="less">
-	.content{
-		padding: .2rem .33rem;
-		/deep/.van-search{
-			padding: 0px;
-			.van-search__content{
-				background: white;
-			}
+.content {
+	padding: .2rem .33rem;
+
+	/deep/.van-search {
+		padding: 0px;
+
+		.van-search__content {
+			background: white;
 		}
-		.slide{
-			margin-top: .2rem;
-			ul{
-				li{
-					p{
-						padding: .1rem 0rem;
-						font-size: .3rem;
-					}
+	}
+
+	.slide {
+		margin-top: .2rem;
+
+		ul {
+			li {
+				p {
+					padding: .1rem 0rem;
+					font-size: .3rem;
 				}
 			}
 		}
-		.search{
-			margin-top: .2rem;
-			background: white;
-			padding: 10px 16px;
-			ul{
-				li{
-					p{
-						padding: .2rem 0rem;
-						font-size: .3rem;
-					}
-					border-bottom: .01rem solid #F6F6F6;
+	}
+
+	.search {
+		margin-top: .2rem;
+		background: white;
+		padding: 10px 16px;
+
+		ul {
+			li {
+				p {
+					padding: .2rem 0rem;
+					font-size: .3rem;
 				}
+
+				border-bottom: .01rem solid #F6F6F6;
 			}
 		}
 	}
+}
 </style>

+ 1 - 1
src/pages/editaddress.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<div class="form">
 			<van-cell-group inset>
 				<van-field v-model="message" rows="1" label="识别" type="textarea"

+ 0 - 2
src/pages/express.vue

@@ -1,7 +1,5 @@
 <template>
 	<div class="content">
-		<backindex :title="titlename"></backindex>
-
 		<!--运单号-->
 		<div v-show="wayShow" class="sm" style="padding-top: 10px;height: 50px;">
 			<div>

+ 156 - 153
src/pages/foreignaddress.vue

@@ -1,180 +1,183 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
 		<div class="form">
 			<van-form @submit="onSubmit">
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="personName" name="姓名" label="姓名" placeholder="请用英文输入姓名"/>
-			  <van-field v-model="emailAddress" name="邮箱" label="邮箱" placeholder="请用英文输入邮箱"/>
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="countryCode" name="国家编码" label="国家编码" placeholder="请用英文输入国家编码"/>
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="city" name="州/城市" label="州/城市" placeholder="请用英文输入州/城市"/>
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="phone" type="number" name="电话" label="电话" placeholder="请输入电话"/>
-			 <!-- <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" /> -->
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="postalCode" name="邮编" label="邮编" placeholder="请用输入邮编"/>
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="address" name="详细地址" label="详细地址" placeholder="请用英文输入详细地址"/>
-			  <van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="companyName" name="公司名称" label="公司名称" placeholder="请用英文输入公司名称 如SF EXPRESS CO,LTD"/>
-			  <div style="margin-top: 16px;">
-			    <van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
-			  </div>
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="personName" name="姓名" label="姓名"
+					placeholder="请用英文输入姓名" />
+				<van-field v-model="emailAddress" name="邮箱" label="邮箱" placeholder="请用英文输入邮箱" />
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="countryCode" name="国家编码"
+					label="国家编码" placeholder="请用英文输入国家编码" />
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="city" name="州/城市" label="州/城市"
+					placeholder="请用英文输入州/城市" />
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="phone" type="number" name="电话"
+					label="电话" placeholder="请输入电话" />
+				<!-- <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" /> -->
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="postalCode" name="邮编" label="邮编"
+					placeholder="请用输入邮编" />
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="address" name="详细地址" label="详细地址"
+					placeholder="请用英文输入详细地址" />
+				<van-field oninput="value=value.replace(/[^\w\.\s/]/ig,'')" v-model="companyName" name="公司名称"
+					label="公司名称" placeholder="请用英文输入公司名称 如SF EXPRESS CO,LTD" />
+				<div style="margin-top: 16px;">
+					<van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
+				</div>
 			</van-form>
 			<!-- 城市选择 -->
 			<van-popup v-model="areashow" position="bottom">
-			  <van-area
-			    :area-list="areaList"
-			    @confirm="onConfirm3"
-			    @cancel="areashow = false"
-			  />
+				<van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
 			</van-popup>
 		</div>
 	</div>
 </template>
 
 <script>
-	import {Toast,Dialog} from 'vant'
-	import areaList from "@/script/areas.js"
-	export default{
-		data(){
-			return{
-				titlename:"寄件人",
-				personName:"",
-				countryCode:"",
-				emailAddress:"",
-				postalCode:"",
-				companyName:"",
-				phone:"",
-				city:"",
-				address:"",
-				areashow:false,
+import { Toast, Dialog } from 'vant'
+import areaList from "@/script/areas.js"
+export default {
+	data() {
+		return {
+			titlename: "寄件人",
+			personName: "",
+			countryCode: "",
+			emailAddress: "",
+			postalCode: "",
+			companyName: "",
+			phone: "",
+			city: "",
+			address: "",
+			areashow: false,
+		}
+	},
+	created: function () {
+		this.isLogin();
+		this.titlename = this.$route.query.active
+		if (this.titlename == 1) {
+			this.titlename = "寄件人地址"
+			if (JSON.stringify(this.$store.state.foreignJjInfo) != '{}') {
+				this.personName = this.$store.state.foreignJjInfo.personName
+				this.countryCode = this.$store.state.foreignJjInfo.countryCode
+				this.emailAddress = this.$store.state.foreignJjInfo.emailAddress
+				this.postalCode = this.$store.state.foreignJjInfo.postalCode
+				this.companyName = this.$store.state.foreignJjInfo.companyName
+				this.phone = this.$store.state.foreignJjInfo.phone
+				this.address = this.$store.state.foreignJjInfo.address
+				this.city = this.$store.state.foreignJjInfo.city
 			}
-		},
-		created:function(){
-			this.isLogin();
-			this.titlename=this.$route.query.active
-			if(this.titlename==1){
-				this.titlename="寄件人地址"
-				if(JSON.stringify(this.$store.state.foreignJjInfo)!='{}'){
-					this.personName = this.$store.state.foreignJjInfo.personName
-					this.countryCode = this.$store.state.foreignJjInfo.countryCode
-					this.emailAddress = this.$store.state.foreignJjInfo.emailAddress
-					this.postalCode = this.$store.state.foreignJjInfo.postalCode
-					this.companyName = this.$store.state.foreignJjInfo.companyName
-					this.phone = this.$store.state.foreignJjInfo.phone
-					this.address = this.$store.state.foreignJjInfo.address
-					this.city = this.$store.state.foreignJjInfo.city
-				}
+		}
+		if (this.titlename == 2) {
+			this.titlename = "收件人地址"
+			console.log(this.$store.state.foreignSjInfo)
+			if (JSON.stringify(this.$store.state.foreignSjInfo) != '{}') {
+				this.personName = this.$store.state.foreignSjInfo.personName
+				this.countryCode = this.$store.state.foreignSjInfo.countryCode
+				this.emailAddress = this.$store.state.foreignSjInfo.emailAddress
+				this.postalCode = this.$store.state.foreignSjInfo.postalCode
+				this.companyName = this.$store.state.foreignSjInfo.companyName
+				this.phone = this.$store.state.foreignSjInfo.phone
+				this.address = this.$store.state.foreignSjInfo.address
+				this.city = this.$store.state.foreignSjInfo.city
 			}
-			if(this.titlename==2){
-				this.titlename="收件人地址"
-				console.log(this.$store.state.foreignSjInfo)
-				if(JSON.stringify(this.$store.state.foreignSjInfo)!='{}'){
-					this.personName = this.$store.state.foreignSjInfo.personName
-					this.countryCode = this.$store.state.foreignSjInfo.countryCode
-					this.emailAddress = this.$store.state.foreignSjInfo.emailAddress
-					this.postalCode = this.$store.state.foreignSjInfo.postalCode
-					this.companyName = this.$store.state.foreignSjInfo.companyName
-					this.phone = this.$store.state.foreignSjInfo.phone
-					this.address = this.$store.state.foreignSjInfo.address
-					this.city = this.$store.state.foreignSjInfo.city
-				}
+		}
+	},
+	methods: {
+		//确定
+		onSubmit() {
+			if (this.personName == '' || this.personName == undefined) {
+				Toast('请用英文输入姓名');
+				return;
 			}
+
+			if (this.emailAddress == '' || this.emailAddress == undefined) {
+				Toast('请用英文输入邮箱');
+				return;
+			}
+
+			if (this.countryCode == '' || this.countryCode == undefined) {
+				Toast('请用英文输入国家编号');
+				return;
+			}
+
+			if (this.city == '' || this.city == undefined) {
+				Toast('请用英文输入州/城市');
+				return;
+			}
+
+			if (this.phone == '' || this.phone == undefined) {
+				Toast('请输入电话');
+				return;
+			}
+
+			if (this.postalCode == '' || this.postalCode == undefined) {
+				Toast('请输入邮编');
+				return;
+			}
+
+			if (this.address == '' || this.address == undefined) {
+				Toast('请用英文输入详细地址');
+				return;
+			}
+
+			if (this.companyName == '' || this.companyName == undefined) {
+				Toast('请用英文输入公司名称');
+				return;
+			}
+
+			if (this.$route.query.active == 1) {
+				let foreignJjInfo = {};
+				foreignJjInfo.jjname = this.personName + ' ' + this.phone
+				foreignJjInfo.jjadd = this.countryCode + ' ' + this.address
+				foreignJjInfo.personName = this.personName;
+				foreignJjInfo.emailAddress = this.emailAddress;
+				foreignJjInfo.countryCode = this.countryCode;
+				foreignJjInfo.city = this.city;
+				foreignJjInfo.phone = this.phone;
+				foreignJjInfo.postalCode = this.postalCode;
+				foreignJjInfo.address = this.address;
+				foreignJjInfo.companyName = this.companyName;
+				this.$store.commit("getForeignJjInfo", foreignJjInfo);
+			} else if (this.$route.query.active == 2) {
+				let foreignSjInfo = {};
+				foreignSjInfo.sjname = this.personName + ' ' + this.phone
+				foreignSjInfo.sjadd = this.countryCode + ' ' + this.address
+				foreignSjInfo.personName = this.personName;
+				foreignSjInfo.emailAddress = this.emailAddress;
+				foreignSjInfo.countryCode = this.countryCode;
+				foreignSjInfo.city = this.city;
+				foreignSjInfo.phone = this.phone;
+				foreignSjInfo.postalCode = this.postalCode;
+				foreignSjInfo.address = this.address;
+				foreignSjInfo.companyName = this.companyName;
+				this.$store.commit("getForeignSjInfo", foreignSjInfo);
+			}
+
+			this.$router.push({ path: "/Foreignexpress" })
 		},
-		methods:{
-			//确定
-			onSubmit(){
-				if(this.personName == '' || this.personName == undefined){
-					Toast('请用英文输入姓名');
-					return;
-				}
-				
-				if(this.emailAddress == '' || this.emailAddress == undefined){
-					Toast('请用英文输入邮箱');
-					return;
-				}
-				
-				if(this.countryCode == '' || this.countryCode == undefined){
-					Toast('请用英文输入国家编号');
-					return;
-				}
-				
-				if(this.city == '' || this.city == undefined){
-					Toast('请用英文输入州/城市');
-					return;
-				}
-				
-				if(this.phone == '' || this.phone == undefined){
-					Toast('请输入电话');
-					return;
-				}
-				
-				if(this.postalCode == '' || this.postalCode == undefined){
-					Toast('请输入邮编');
-					return;
-				}
-				
-				if(this.address == '' || this.address == undefined){
-					Toast('请用英文输入详细地址');
-					return;
-				}
-				
-				if(this.companyName == '' || this.companyName == undefined){
-					Toast('请用英文输入公司名称');
-					return;
-				}
-				
-				if(this.$route.query.active == 1){
-					let foreignJjInfo = {};
-					foreignJjInfo.jjname = this.personName+' '+this.phone
-					foreignJjInfo.jjadd = this.countryCode+' '+this.address
-					foreignJjInfo.personName = this.personName;
-					foreignJjInfo.emailAddress = this.emailAddress;
-					foreignJjInfo.countryCode = this.countryCode;
-					foreignJjInfo.city = this.city;
-					foreignJjInfo.phone = this.phone;
-					foreignJjInfo.postalCode = this.postalCode;
-					foreignJjInfo.address = this.address;
-					foreignJjInfo.companyName = this.companyName;
-					this.$store.commit("getForeignJjInfo",foreignJjInfo);
-				}else if(this.$route.query.active == 2){
-					let foreignSjInfo = {};
-					foreignSjInfo.sjname = this.personName+' '+this.phone
-					foreignSjInfo.sjadd = this.countryCode+' '+this.address
-					foreignSjInfo.personName = this.personName;
-					foreignSjInfo.emailAddress = this.emailAddress;
-					foreignSjInfo.countryCode = this.countryCode;
-					foreignSjInfo.city = this.city;
-					foreignSjInfo.phone = this.phone;
-					foreignSjInfo.postalCode = this.postalCode;
-					foreignSjInfo.address = this.address;
-					foreignSjInfo.companyName = this.companyName;
-					this.$store.commit("getForeignSjInfo",foreignSjInfo);
-				}
-				
-				this.$router.push({path:"/Foreignexpress"})
-			},
-			onConfirm3(e){//确定
-				this.city=e[0].name+' '+e[1].name+' '+e[2].name
-				this.areashow=false
-				console.log(e)
-			},
+		onConfirm3(e) {//确定
+			this.city = e[0].name + ' ' + e[1].name + ' ' + e[2].name
+			this.areashow = false
+			console.log(e)
 		},
-		computed:{
-			areaList(){
-				return areaList
-			}
+	},
+	computed: {
+		areaList() {
+			return areaList
 		}
 	}
+}
 </script>
 
 <style scoped lang="less">
-	.content{
-		
-		.form{
-			padding: .3rem;
-			/deep/.van-field__value{
-				input{
-					text-align: right;
-				}
-				
+.content {
+
+	.form {
+		padding: .3rem;
+
+		/deep/.van-field__value {
+			input {
+				text-align: right;
 			}
+
 		}
 	}
+}
 </style>

File diff suppressed because it is too large
+ 659 - 615
src/pages/foreignexpress.vue


+ 1 - 1
src/pages/forgetpassword.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<div class="login">
 			<!-- <div class="item">
 				<van-cell-group>

+ 150 - 153
src/pages/hkaddress.vue

@@ -1,180 +1,177 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<div class="form">
 			<van-form @submit="onSubmit"><!--oninput="value=value.replace(/[^\w\.\s/]/ig,'')"-->
-			  <van-field  v-model="personName" name="姓名" label="姓名" placeholder="请输入姓名"/>
-			  <van-field  v-model="emailAddress" name="邮箱" label="邮箱" placeholder="请输入邮箱"/>
-			  <van-field  v-model="countryCode" name="国家编码" label="国家编码" placeholder="请用输入国家编码"/>
-			  <van-field  v-model="city" name="州/城市" label="州/城市" placeholder="请输入州/城市"/>
-			  <van-field  v-model="phone" type="number" name="电话" label="电话" placeholder="请输入电话"/>
-			 <!-- <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" /> -->
-			  <van-field  v-model="postalCode" name="邮编" label="邮编" placeholder="请输入邮编"/>
-			  <van-field  v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址"/>
-			  <van-field  v-model="companyName" name="公司名称" label="公司名称" placeholder="请输入公司名称 如SF EXPRESS CO,LTD"/>
-			  <div style="margin-top: 16px;">
-			    <van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
-			  </div>
+				<van-field v-model="personName" name="姓名" label="姓名" placeholder="请输入姓名" />
+				<van-field v-model="emailAddress" name="邮箱" label="邮箱" placeholder="请输入邮箱" />
+				<van-field v-model="countryCode" name="国家编码" label="国家编码" placeholder="请用输入国家编码" />
+				<van-field v-model="city" name="州/城市" label="州/城市" placeholder="请输入州/城市" />
+				<van-field v-model="phone" type="number" name="电话" label="电话" placeholder="请输入电话" />
+				<!-- <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" /> -->
+				<van-field v-model="postalCode" name="邮编" label="邮编" placeholder="请输入邮编" />
+				<van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址" />
+				<van-field v-model="companyName" name="公司名称" label="公司名称" placeholder="请输入公司名称 如SF EXPRESS CO,LTD" />
+				<div style="margin-top: 16px;">
+					<van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
+				</div>
 			</van-form>
 			<!-- 城市选择 -->
 			<van-popup v-model="areashow" position="bottom">
-			  <van-area
-			    :area-list="areaList"
-			    @confirm="onConfirm3"
-			    @cancel="areashow = false"
-			  />
+				<van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
 			</van-popup>
 		</div>
 	</div>
 </template>
 
 <script>
-	import {Toast,Dialog} from 'vant'
-	import areaList from "@/script/areas.js"
-	export default{
-		data(){
-			return{
-				titlename:"寄件人",
-				personName:"",
-				countryCode:"",
-				emailAddress:"",
-				postalCode:"",
-				companyName:"",
-				phone:"",
-				city:"",
-				address:"",
-				areashow:false,
+import { Toast, Dialog } from 'vant'
+import areaList from "@/script/areas.js"
+export default {
+	data() {
+		return {
+			titlename: "寄件人",
+			personName: "",
+			countryCode: "",
+			emailAddress: "",
+			postalCode: "",
+			companyName: "",
+			phone: "",
+			city: "",
+			address: "",
+			areashow: false,
+		}
+	},
+	created: function () {
+		this.isLogin();
+		this.titlename = this.$route.query.active
+		if (this.titlename == 1) {
+			this.titlename = "寄件人地址"
+			if (JSON.stringify(this.$store.state.hkJjInfo) != '{}') {
+				this.personName = this.$store.state.hkJjInfo.personName
+				this.countryCode = this.$store.state.hkJjInfo.countryCode
+				this.emailAddress = this.$store.state.hkJjInfo.emailAddress
+				this.postalCode = this.$store.state.hkJjInfo.postalCode
+				this.companyName = this.$store.state.hkJjInfo.companyName
+				this.phone = this.$store.state.hkJjInfo.phone
+				this.address = this.$store.state.hkJjInfo.address
+				this.city = this.$store.state.hkJjInfo.city
 			}
-		},
-		created:function(){
-			this.isLogin();
-			this.titlename=this.$route.query.active
-			if(this.titlename==1){
-				this.titlename="寄件人地址"
-				if(JSON.stringify(this.$store.state.hkJjInfo)!='{}'){
-					this.personName = this.$store.state.hkJjInfo.personName
-					this.countryCode = this.$store.state.hkJjInfo.countryCode
-					this.emailAddress = this.$store.state.hkJjInfo.emailAddress
-					this.postalCode = this.$store.state.hkJjInfo.postalCode
-					this.companyName = this.$store.state.hkJjInfo.companyName
-					this.phone = this.$store.state.hkJjInfo.phone
-					this.address = this.$store.state.hkJjInfo.address
-					this.city = this.$store.state.hkJjInfo.city
-				}
+		}
+		if (this.titlename == 2) {
+			this.titlename = "收件人地址"
+			console.log(this.$store.state.hkSjInfo)
+			if (JSON.stringify(this.$store.state.hkSjInfo) != '{}') {
+				this.personName = this.$store.state.hkSjInfo.personName
+				this.countryCode = this.$store.state.hkSjInfo.countryCode
+				this.emailAddress = this.$store.state.hkSjInfo.emailAddress
+				this.postalCode = this.$store.state.hkSjInfo.postalCode
+				this.companyName = this.$store.state.hkSjInfo.companyName
+				this.phone = this.$store.state.hkSjInfo.phone
+				this.address = this.$store.state.hkSjInfo.address
+				this.city = this.$store.state.hkSjInfo.city
+			}
+		}
+	},
+	methods: {
+		//确定
+		onSubmit() {
+			if (this.personName == '' || this.personName == undefined) {
+				Toast('请用英文输入姓名');
+				return;
+			}
+
+			if (this.emailAddress == '' || this.emailAddress == undefined) {
+				Toast('请用英文输入邮箱');
+				return;
+			}
+
+			if (this.countryCode == '' || this.countryCode == undefined) {
+				Toast('请用英文输入国家编号');
+				return;
+			}
+
+			if (this.city == '' || this.city == undefined) {
+				Toast('请用英文输入州/城市');
+				return;
+			}
+
+			if (this.phone == '' || this.phone == undefined) {
+				Toast('请输入电话');
+				return;
+			}
+
+			if (this.postalCode == '' || this.postalCode == undefined) {
+				Toast('请输入邮编');
+				return;
 			}
-			if(this.titlename==2){
-				this.titlename="收件人地址"
-				console.log(this.$store.state.hkSjInfo)
-				if(JSON.stringify(this.$store.state.hkSjInfo)!='{}'){
-					this.personName = this.$store.state.hkSjInfo.personName
-					this.countryCode = this.$store.state.hkSjInfo.countryCode
-					this.emailAddress = this.$store.state.hkSjInfo.emailAddress
-					this.postalCode = this.$store.state.hkSjInfo.postalCode
-					this.companyName = this.$store.state.hkSjInfo.companyName
-					this.phone = this.$store.state.hkSjInfo.phone
-					this.address = this.$store.state.hkSjInfo.address
-					this.city = this.$store.state.hkSjInfo.city
-				}
+
+			if (this.address == '' || this.address == undefined) {
+				Toast('请用英文输入详细地址');
+				return;
 			}
+
+			if (this.companyName == '' || this.companyName == undefined) {
+				Toast('请用英文输入公司名称');
+				return;
+			}
+
+			if (this.$route.query.active == 1) {
+				let hkJjInfo = {};
+				hkJjInfo.jjname = this.personName + ' ' + this.phone
+				hkJjInfo.jjadd = this.countryCode + ' ' + this.address
+				hkJjInfo.personName = this.personName;
+				hkJjInfo.emailAddress = this.emailAddress;
+				hkJjInfo.countryCode = this.countryCode;
+				hkJjInfo.city = this.city;
+				hkJjInfo.phone = this.phone;
+				hkJjInfo.postalCode = this.postalCode;
+				hkJjInfo.address = this.address;
+				hkJjInfo.companyName = this.companyName;
+				this.$store.commit("getHkJjInfo", hkJjInfo);
+			} else if (this.$route.query.active == 2) {
+				let hkSjInfo = {};
+				hkSjInfo.sjname = this.personName + ' ' + this.phone
+				hkSjInfo.sjadd = this.countryCode + ' ' + this.address
+				hkSjInfo.personName = this.personName;
+				hkSjInfo.emailAddress = this.emailAddress;
+				hkSjInfo.countryCode = this.countryCode;
+				hkSjInfo.city = this.city;
+				hkSjInfo.phone = this.phone;
+				hkSjInfo.postalCode = this.postalCode;
+				hkSjInfo.address = this.address;
+				hkSjInfo.companyName = this.companyName;
+				this.$store.commit("getHkSjInfo", hkSjInfo);
+			}
+
+			this.$router.push({ path: "/Hkexpress" })
 		},
-		methods:{
-			//确定
-			onSubmit(){
-				if(this.personName == '' || this.personName == undefined){
-					Toast('请用英文输入姓名');
-					return;
-				}
-				
-				if(this.emailAddress == '' || this.emailAddress == undefined){
-					Toast('请用英文输入邮箱');
-					return;
-				}
-				
-				if(this.countryCode == '' || this.countryCode == undefined){
-					Toast('请用英文输入国家编号');
-					return;
-				}
-				
-				if(this.city == '' || this.city == undefined){
-					Toast('请用英文输入州/城市');
-					return;
-				}
-				
-				if(this.phone == '' || this.phone == undefined){
-					Toast('请输入电话');
-					return;
-				}
-				
-				if(this.postalCode == '' || this.postalCode == undefined){
-					Toast('请输入邮编');
-					return;
-				}
-				
-				if(this.address == '' || this.address == undefined){
-					Toast('请用英文输入详细地址');
-					return;
-				}
-				
-				if(this.companyName == '' || this.companyName == undefined){
-					Toast('请用英文输入公司名称');
-					return;
-				}
-				
-				if(this.$route.query.active == 1){
-					let hkJjInfo = {};
-					hkJjInfo.jjname = this.personName+' '+this.phone
-					hkJjInfo.jjadd = this.countryCode+' '+this.address
-					hkJjInfo.personName = this.personName;
-					hkJjInfo.emailAddress = this.emailAddress;
-					hkJjInfo.countryCode = this.countryCode;
-					hkJjInfo.city = this.city;
-					hkJjInfo.phone = this.phone;
-					hkJjInfo.postalCode = this.postalCode;
-					hkJjInfo.address = this.address;
-					hkJjInfo.companyName = this.companyName;
-					this.$store.commit("getHkJjInfo",hkJjInfo);
-				}else if(this.$route.query.active == 2){
-					let hkSjInfo = {};
-					hkSjInfo.sjname = this.personName+' '+this.phone
-					hkSjInfo.sjadd = this.countryCode+' '+this.address
-					hkSjInfo.personName = this.personName;
-					hkSjInfo.emailAddress = this.emailAddress;
-					hkSjInfo.countryCode = this.countryCode;
-					hkSjInfo.city = this.city;
-					hkSjInfo.phone = this.phone;
-					hkSjInfo.postalCode = this.postalCode;
-					hkSjInfo.address = this.address;
-					hkSjInfo.companyName = this.companyName;
-					this.$store.commit("getHkSjInfo",hkSjInfo);
-				}
-				
-				this.$router.push({path:"/Hkexpress"})
-			},
-			onConfirm3(e){//确定
-				this.city=e[0].name+' '+e[1].name+' '+e[2].name
-				this.areashow=false
-				console.log(e)
-			},
+		onConfirm3(e) {//确定
+			this.city = e[0].name + ' ' + e[1].name + ' ' + e[2].name
+			this.areashow = false
+			console.log(e)
 		},
-		computed:{
-			areaList(){
-				return areaList
-			}
+	},
+	computed: {
+		areaList() {
+			return areaList
 		}
 	}
+}
 </script>
 
 <style scoped lang="less">
-	.content{
-		
-		.form{
-			padding: .3rem;
-			/deep/.van-field__value{
-				input{
-					text-align: right;
-				}
-				
+.content {
+
+	.form {
+		padding: .3rem;
+
+		/deep/.van-field__value {
+			input {
+				text-align: right;
 			}
+
 		}
 	}
+}
 </style>

File diff suppressed because it is too large
+ 645 - 601
src/pages/hkexpress.vue


+ 1 - 1
src/pages/inaddressbook.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<!-- table切换 -->
 		<div class="tab">
 			<div>

+ 0 - 7
src/pages/index.vue

@@ -50,13 +50,6 @@ export default {
 	created: async function () {
 		this.getOpenid();
 
-		// const code = getUrlParam('code');
-		// if (code) {
-		// 	const res = await getWxUserInfo({ code: code, userId: localStorage.getItem("userId") })
-		// 	console.log(res, '==========res')
-		// }
-
-
 	},
 	methods: {
 		link() {

+ 0 - 1
src/pages/inexpress.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="content">
-		<backindex :title="titlename"></backindex>
 		<div class="jjinfo">
 			<van-field :value="recipientsName" @focus="onFocus" name="phone" label="收件人姓名" placeholder="请输入收件人姓名"
 				:rules="[{ required: true }]" />

+ 1 - 1
src/pages/innewaddress.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<div class="form">
 			<van-form @submit="onSubmit">
 				<form action="/">

+ 0 - 1
src/pages/logisticslist.vue

@@ -1,6 +1,5 @@
 <template>
 	<div>
-		<back :title="titlename"></back>
 		<div class="content">
 			<div class="tab">
 				<div>

+ 1 - 1
src/pages/multipleaddressbook.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<!-- table切换 -->
 		<div class="tab">
 			<div>

File diff suppressed because it is too large
+ 888 - 825
src/pages/multipleexpress.vue


+ 0 - 1
src/pages/my.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="body">
 		<!-- 选择类型 -->
-		<!-- <back :title="titlename"></back> -->
 		<div class="head">
 			<template v-if="headimgurl != null && headimgurl != ''">
 				<img :src="headimgurl" alt="">

+ 0 - 4
src/pages/myaddressbook.vue

@@ -1,9 +1,5 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
-		<!-- table切换 -->
-
-
 		<!-- 收件人 -->
 		<div style="margin-top: 20px;">
 			<div class="jjinfo" v-for="item in addressList" :key="item.id">

+ 99 - 86
src/pages/myexpress.vue

@@ -1,16 +1,16 @@
 <template>
 	<div>
-		<backindex :title="titlename"></backindex>
+
 		<!-- table切换 -->
 		<div class="tab">
 			<div>
-				<p @click="tab(1)" :class="[index==1?'active':'']">寄件人</p>
-				<p @click="tab(2)" :class="[index==2?'active':'']" class="">收件人</p>
-			</div>		
+				<p @click="tab(1)" :class="[index == 1 ? 'active' : '']">寄件人</p>
+				<p @click="tab(2)" :class="[index == 2 ? 'active' : '']" class="">收件人</p>
+			</div>
 		</div>
 		<!-- 内容 -->
 		<div class="content">
-			<div v-if="index==1">
+			<div v-if="index == 1">
 				<div class="list">
 					<div class="list_top">
 						<p>派单号 213213213</p>
@@ -54,7 +54,7 @@
 					</div>
 				</div>
 			</div>
-			<div v-if="index==2">
+			<div v-if="index == 2">
 				<div class="list">
 					<div class="list_top">
 						<p>派单号 213213213</p>
@@ -77,103 +77,116 @@
 					</div>
 				</div>
 			</div>
-			
+
 		</div>
 	</div>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				titlename:"我的快件",
-				index:1,
-			}
-		},
-		methods:{
-			tab(obj){
-				this.index=obj
-			}
+export default {
+	data() {
+		return {
+			titlename: "我的快件",
+			index: 1,
+		}
+	},
+	methods: {
+		tab(obj) {
+			this.index = obj
 		}
 	}
+}
 </script>
 
 <style scoped lang="less">
-	.tab{
-		font-size: .36rem;
-		color: #8c8c8c;
+.tab {
+	font-size: .36rem;
+	color: #8c8c8c;
+	background: white;
+
+	div {
+		display: flex;
+		text-align: center;
+		border-radius: .05rem;
+		justify-content: center;
+
+		p {
+			padding: .2rem .3rem;
+			margin: 0px .4rem;
+		}
+
+		p.active {
+			color: #00c4b8;
+			border-bottom: .02rem solid #00c4b8;
+		}
+	}
+}
+
+.content {
+	padding: .33rem;
+
+	.list {
 		background: white;
-		div{
+		font-size: .3rem;
+		color: #333;
+		padding: .2rem .4rem;
+		margin-bottom: .2rem;
+
+		.list_top {
+			font-size: .24rem;
+			color: #999;
 			display: flex;
-			text-align: center;			
-			border-radius: .05rem;
-			justify-content: center;
-			p{
-				padding: .2rem .3rem;
-				margin: 0px .4rem;				
-			}
-			p.active{
-				color: #00c4b8;
-				border-bottom: .02rem solid #00c4b8;
-			}
-		}		
-	}
-	.content{
-		padding: .33rem;
-		.list{			
-			background: white;
-			font-size: .3rem;
-			color: #333;
-			padding: .2rem .4rem;
-					margin-bottom: .2rem;
-			.list_top{
-				font-size: .24rem;
-				color: #999;
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: .3rem;
+			justify-content: space-between;
+			margin-bottom: .3rem;
+		}
+
+		.list_bottom {
+			display: flex;
+			justify-content: space-between;
+
+			.list_bottom_left {
+				text-align: center;
+				padding-top: .3rem;
+
+				p:nth-of-type(2) {
+					font-size: .24rem;
+					margin-top: .2rem;
+				}
 			}
-			
-			.list_bottom{
-				display: flex;
-				justify-content: space-between;
-				.list_bottom_left{
-					text-align: center;
-					padding-top: .3rem;
-					p:nth-of-type(2){
-						font-size: .24rem;
-						margin-top: .2rem;
-					}
+
+			.list_bottom_mid {
+				text-align: center;
+
+				img {
+					width: .6rem;
+					height: .6rem;
+				}
+
+				span {
+					display: block;
+					width: 2rem;
+					height: .05rem;
+					border-radius: 50%;
+					background: #00c4b8;
+					margin: .15rem 0rem;
 				}
-				.list_bottom_mid{
-					text-align: center;
-					img{
-						width: .6rem;
-						height: .6rem;
-					}
-					span{
-						display: block;
-						width: 2rem;
-						height: .05rem;
-						border-radius: 50%;
-						background: #00c4b8;
-						margin: .15rem 0rem;
-					}
-					p{
-						color: #f5693d;
-						font-size: .26rem;
-					}
+
+				p {
+					color: #f5693d;
+					font-size: .26rem;
 				}
-				.list_bottom_right{
-					padding-top: .3rem;
-					text-align: center;
-					p:nth-of-type(2){
-						font-size: .24rem;
-						margin-top: .2rem;
-					}
+			}
+
+			.list_bottom_right {
+				padding-top: .3rem;
+				text-align: center;
+
+				p:nth-of-type(2) {
+					font-size: .24rem;
+					margin-top: .2rem;
 				}
 			}
 		}
 	}
-	
+}
 </style>

+ 1 - 1
src/pages/newaddress.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<div class="form">
 			<van-cell-group inset>
 				<van-field v-model="message" rows="1" label="识别" type="textarea"

+ 1 - 1
src/pages/personinfomation.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<back :title="titlename"></back>
+
 		<!-- 表单 -->
 		<van-form @submit="onSubmit">
 			<van-field v-model="user.name" class="m" name="NAME" label="中文名" placeholder="请填写中文名"

+ 0 - 1
src/pages/search.vue

@@ -1,6 +1,5 @@
 <template>
 	<div>
-		<back :title="titlename"></back>
 		<div class="content">
 			<!-- 收件 -->
 			<div class="batch_box" @scroll.passive="getScroll($event)"

+ 0 - 1
src/pages/setting.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="body">
 		<!-- 选择类型 -->
-		<back :title="titlename"></back>
 		<div class="list">
 			<router-link to="/Forgetpassword">
 				<span>修改密码</span>

+ 0 - 1
src/pages_bak/addressbook.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
 		<!-- table切换 -->
 		<div class="tab">
 			<div>

+ 425 - 392
src/pages_bak/cityexpress.vue

@@ -1,399 +1,432 @@
-<template>
-	<div class="content">
-		<back :title="titlename"></back>
-		<!-- 寄件地址 -->
-		<div class="jjinfo">
-			<div>
-				<div class="jj">
-					<div class="jjaddress">
-						<p>寄</p>
-						<div>
-							<p v-if="jjname==''||jjname==' '">寄件地址</p>
-							<p v-else>{{jjname}}</p>
-							<p v-if="jjadd==''||jjadd==' '" @click="addtype(1)">填写寄件地址</p>
-							<p v-else @click="addtype(1)">{{jjadd}}</p>
-						</div>
-					</div>
-					<div class="dzb">
-						<img src="../assets/images/addlist.png" alt="">
-						<p>地址簿</p>
-					</div>				
-				</div>
-				<div class="jj" style="border-top:.01rem solid #ededed">
-					<div class="jjaddress">
-						<p style="background: #fa9c22;">收</p>
-						<div>
-							<p v-if="sjname==''||sjname==' '">寄件地址</p>
-							<p v-else>{{sjname}}</p>
-							<p v-if="sjadd==''||sjadd==' '" @click="addtype(2)">填写收件地址</p>
-							<p v-else @click="addtype(2)">{{sjadd}}</p>
-						</div>
-					</div>
-					<div class="dzb">
-						<img src="../assets/images/addlist.png" alt="">
-						<p>地址簿</p>
-					</div>
-				</div>
-			</div>
-			
-		</div>
-		<!-- 取件时长 -->
-		<div class="bz">
-			<div>
-				<van-field v-model="time" name="取件时长" label="取件时长" @click="timeshow=true" placeholder="请选择"/>
-			</div>		
-		</div>
-		<!-- 寄件属性 -->
-		<div class="choose">
-			<div>
-				<div class="type_wp">
-					<div>
-						<p>物品类型</p>
-						<p v-if="wptype==''" @click="wpshow=true">请选择</p>
-						<p v-else @click="wpshow=true">{{wptype}}</p>
-					</div>
-					<div>
-						<p>重量</p>
-						<p>一件</p>
-					</div>
-				</div>
-				<div class="type_price">
-					<div>
-						<p>付款方式</p>
-                        <p v-if="pricetype==''" @click="priceshow=true">请选择</p>
-						<p v-else @click="priceshow=true">{{pricetype}}</p>
-					</div>
-					<div>
-						<p>声明价值</p>
-						<p>0元</p>
-					</div>
-				</div>
-			</div>			
-		</div>
-		
-		<!-- 我同意 -->
-		<div class="check">
-			<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
-		</div>
-		<!-- 寄件 -->
-		<div class="btn-jj">
-			<van-button type="info" color="#00c4b8">立即寄件</van-button>
-		</div>
-		<!-- 弹窗物品类型 -->
-		<van-popup v-model="wpshow" position="bottom">
-		  <van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow=false"/>
-		</van-popup>
-		<!-- 弹窗付款方式 -->
-		<van-popup v-model="priceshow" position="bottom">
-		  <van-picker title="付款方式" show-toolbar :columns="pricelist" @confirm="onConfirm2" @cancel="priceshow=false"/>
-		</van-popup>
-		<!-- 填写地址 -->
-		<van-popup round v-model="addshow" class="whrite_add" closeable closed="close">
-			<div>
-				<p style="font-size: 16px;text-align: center;margin-bottom: 16px;">{{title}}</p>
-				<van-form @submit="onSubmit">
-				  <van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名"/>
-				  <van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机"/>
-				  <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" />
-				  <van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址"/>
-				  <div style="margin-top: 16px;">
-				    <van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
-				  </div>
-				</van-form>
-			</div>		  
-		</van-popup>
-		<!-- 城市选择 -->
-		<van-popup v-model="areashow" position="bottom">
-		  <van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
-		</van-popup>
-		<!-- 取件时长 -->
-		<van-popup v-model="timeshow" position="bottom">
-		  <van-picker title="取件时长" show-toolbar :columns="timelist" @confirm="onConfirm4" @cancel="timeshow=false"/>
-		</van-popup>
-	</div>	
+<template>
+	<div class="content">
+
+		<!-- 寄件地址 -->
+		<div class="jjinfo">
+			<div>
+				<div class="jj">
+					<div class="jjaddress">
+						<p>寄</p>
+						<div>
+							<p v-if="jjname == '' || jjname == ' '">寄件地址</p>
+							<p v-else>{{ jjname }}</p>
+							<p v-if="jjadd == '' || jjadd == ' '" @click="addtype(1)">填写寄件地址</p>
+							<p v-else @click="addtype(1)">{{ jjadd }}</p>
+						</div>
+					</div>
+					<div class="dzb">
+						<img src="../assets/images/addlist.png" alt="">
+						<p>地址簿</p>
+					</div>
+				</div>
+				<div class="jj" style="border-top:.01rem solid #ededed">
+					<div class="jjaddress">
+						<p style="background: #fa9c22;">收</p>
+						<div>
+							<p v-if="sjname == '' || sjname == ' '">寄件地址</p>
+							<p v-else>{{ sjname }}</p>
+							<p v-if="sjadd == '' || sjadd == ' '" @click="addtype(2)">填写收件地址</p>
+							<p v-else @click="addtype(2)">{{ sjadd }}</p>
+						</div>
+					</div>
+					<div class="dzb">
+						<img src="../assets/images/addlist.png" alt="">
+						<p>地址簿</p>
+					</div>
+				</div>
+			</div>
+
+		</div>
+		<!-- 取件时长 -->
+		<div class="bz">
+			<div>
+				<van-field v-model="time" name="取件时长" label="取件时长" @click="timeshow = true" placeholder="请选择" />
+			</div>
+		</div>
+		<!-- 寄件属性 -->
+		<div class="choose">
+			<div>
+				<div class="type_wp">
+					<div>
+						<p>物品类型</p>
+						<p v-if="wptype == ''" @click="wpshow = true">请选择</p>
+						<p v-else @click="wpshow = true">{{ wptype }}</p>
+					</div>
+					<div>
+						<p>重量</p>
+						<p>一件</p>
+					</div>
+				</div>
+				<div class="type_price">
+					<div>
+						<p>付款方式</p>
+						<p v-if="pricetype == ''" @click="priceshow = true">请选择</p>
+						<p v-else @click="priceshow = true">{{ pricetype }}</p>
+					</div>
+					<div>
+						<p>声明价值</p>
+						<p>0元</p>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- 我同意 -->
+		<div class="check">
+			<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
+		</div>
+		<!-- 寄件 -->
+		<div class="btn-jj">
+			<van-button type="info" color="#00c4b8">立即寄件</van-button>
+		</div>
+		<!-- 弹窗物品类型 -->
+		<van-popup v-model="wpshow" position="bottom">
+			<van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow = false" />
+		</van-popup>
+		<!-- 弹窗付款方式 -->
+		<van-popup v-model="priceshow" position="bottom">
+			<van-picker title="付款方式" show-toolbar :columns="pricelist" @confirm="onConfirm2"
+				@cancel="priceshow = false" />
+		</van-popup>
+		<!-- 填写地址 -->
+		<van-popup round v-model="addshow" class="whrite_add" closeable closed="close">
+			<div>
+				<p style="font-size: 16px;text-align: center;margin-bottom: 16px;">{{ title }}</p>
+				<van-form @submit="onSubmit">
+					<van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名" />
+					<van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机" />
+					<van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区"
+						@click="areashow = true" />
+					<van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址" />
+					<div style="margin-top: 16px;">
+						<van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
+					</div>
+				</van-form>
+			</div>
+		</van-popup>
+		<!-- 城市选择 -->
+		<van-popup v-model="areashow" position="bottom">
+			<van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
+		</van-popup>
+		<!-- 取件时长 -->
+		<van-popup v-model="timeshow" position="bottom">
+			<van-picker title="取件时长" show-toolbar :columns="timelist" @confirm="onConfirm4" @cancel="timeshow = false" />
+		</van-popup>
+	</div>
 </template>
 
-<script>
-	import areaList from "@/script/areas.js"
-	export default{
-		data(){
-			return {
-				titlename:"同城急送",
-				wptype:"",//物品类型
-				wpshow:false,//物品类型弹窗显示
-				wplist:["物品1","物品二"],
-				pricetype:"",//付款类型
-				priceshow:false,//付款类型弹窗显示
-				pricelist:["月结","日结","到付"],
-				addshow:false,
-				name:"",
-				phone:"",
-				city:"",
-				address:"",
-				areashow:false,
-				index:"",
-				title:"",
-				jjname:"",
-				jjadd:"",
-				sjname:"",
-				sjadd:"",
-				check:false,
-				time:"",
-				timeshow:false,
-				timelist:["一小时内","一天内"]
-			}
-		},
-		created:function(){
-			//this.areaList=area.areaList
-		},
-		methods:{
-			// 选择物品确定
-			onConfirm1(e){//确定
-				this.wptype=e
-				this.wpshow=false
-				console.log(e)
-			},
-			// 选择付款方式确定
-			onConfirm2(e){//确定
-				this.pricetype=e
-				this.priceshow=false
-				console.log(e)
-			},
-			// 填写地址确定
-			onConfirm3(e){//确定
-				this.city=e[0].name+' '+e[1].name+' '+e[2].name
-				this.areashow=false
-				console.log(e)
-			},
-			// 取件时长
-			onConfirm4(e){//确定
-			
-				this.time=e
-			
-				this.timeshow=false
-			
-				console.log(e)
-			
-			},
-						
-			// 寄件地址1与收件地址2
-			addtype(obj){
-				this.index=obj
-				if(obj==1){
-					this.title="寄件地址"
-				}
-				if(obj==2){
-					this.title="收件地址"
-				}
-				this.addshow=true
-			},
-			// 填写地址确定
-			onSubmit(){
-				if(this.index==1){
-					this.jjname=this.name+' '+this.phone
-					this.jjadd=this.city+' '+this.address
-				}
-				if(this.index==2){
-					this.sjname=this.name+' '+this.phone
                    this.sjadd=this.city+' '+this.address
-				}
-				this.addshow=false
-				this.name=""
-				this.phone=""
-				this.city=""
-				this.address=""
-			},
-			close(){
-				this.name=""
-				this.phone=""
-				this.city=""
-				this.address=""
-			},
-		},
-		computed:{
-			areaList(){
-				return areaList
-			}
-		}
+<script>
+import areaList from "@/script/areas.js"
+export default {
+	data() {
+		return {
+			titlename: "同城急送",
+			wptype: "",//物品类型
+			wpshow: false,//物品类型弹窗显示
+			wplist: ["物品1", "物品二"],
+			pricetype: "",//付款类型
+			priceshow: false,//付款类型弹窗显示
+			pricelist: ["月结", "日结", "到付"],
+			addshow: false,
+			name: "",
+			phone: "",
+			city: "",
+			address: "",
+			areashow: false,
+			index: "",
+			title: "",
+			jjname: "",
+			jjadd: "",
+			sjname: "",
+			sjadd: "",
+			check: false,
+			time: "",
+			timeshow: false,
+			timelist: ["一小时内", "一天内"]
+		}
+	},
+	created: function () {
+		//this.areaList=area.areaList
+	},
+	methods: {
+		// 选择物品确定
+		onConfirm1(e) {//确定
+			this.wptype = e
+			this.wpshow = false
+			console.log(e)
+		},
+		// 选择付款方式确定
+		onConfirm2(e) {//确定
+			this.pricetype = e
+			this.priceshow = false
+			console.log(e)
+		},
+		// 填写地址确定
+		onConfirm3(e) {//确定
+			this.city = e[0].name + ' ' + e[1].name + ' ' + e[2].name
+			this.areashow = false
+			console.log(e)
+		},
+		// 取件时长
+		onConfirm4(e) {//确定
+
+			this.time = e
+
+			this.timeshow = false
+
+			console.log(e)
+
+		},
+
+		// 寄件地址1与收件地址2
+		addtype(obj) {
+			this.index = obj
+			if (obj == 1) {
+				this.title = "寄件地址"
+			}
+			if (obj == 2) {
+				this.title = "收件地址"
+			}
+			this.addshow = true
+		},
+		// 填写地址确定
+		onSubmit() {
+			if (this.index == 1) {
+				this.jjname = this.name + ' ' + this.phone
+				this.jjadd = this.city + ' ' + this.address
+			}
+			if (this.index == 2) {
+				this.sjname = this.name + ' ' + this.phone
+				this.sjadd = this.city + ' ' + this.address
+			}
+			this.addshow = false
+			this.name = ""
+			this.phone = ""
+			this.city = ""
+			this.address = ""
+		},
+		close() {
+			this.name = ""
+			this.phone = ""
+			this.city = ""
+			this.address = ""
+		},
+	},
+	computed: {
+		areaList() {
+			return areaList
+		}
 	}
+}
 </script>
 
-<style scoped lang="less">
-	.content{
-		.jjinfo{
-			font-size: .24rem;
-			color: #999999;
-			padding: .33rem;
-			>div{
-				background: white;
-				border-radius: .05rem;
-				padding: .1rem .3rem;
-				.jj{
-					display: flex;
-					justify-content: space-between;
-					padding: .2rem 0rem;
-					.jjaddress{
-						display: flex;
-						padding: .1rem 0rem;
-						>p{
-							font-size: .24rem;
-							font-weight: bold;
-							display: inline-block;
-							width:.5rem;
-							height: .5rem;
-							background: #00c4b8;
-							text-align: center;
-							line-height: .5rem;
-							color: white;
-							border-radius: 50%;
-							margin-right: .3rem;
-						}
-						div{
-							//font-weight: bold;
-							max-width: 4.2rem;
-							p:nth-of-type(1){
-								font-size: .24rem;
-								color: #333;
-								margin-bottom: .2rem;
-							}
-							p:nth-of-type(2){
-								font-size: .3rem;
-							}
-						}
-					}
-					.dzb{
-						text-align: center;
-						border-left: .01rem solid #ededed;
-						padding-left: .3rem;
-						
-						img{
-							width:.39rem;
-							height: .42rem;
-							padding-top: .2rem;
-						}
-						p{
-							font-size: .2rem;
-						}
-						
-					}
-				}
-		    }
-		
-		}
-		.choose{
-			font-size: .3rem;
-			color: #999999;
-			font-weight: bold;
-			padding: 0.33rem .33rem;
-			>div{
-				background: white;
-				
-				padding: .3rem .3rem;
-				border-radius: .05rem;
-				.type_wp{
-					display: flex;
-					justify-content: center;
-					div{
-						flex: 1;
-						text-align: center;
-						p:nth-of-type(2){
-							color: #333;
-							margin-top: .2rem;
-							font-size: .36rem;
-							//position: relative;
-						}
-						
-					} 
-					div:nth-of-type(1){
-						border-right: .01rem solid #ededed;
-						p:nth-of-type(2):after{
-							content: "";
-							display: inline-block;
-							width: .15rem;
-							height: .15rem;
-							border-bottom: .01rem solid #999;
-							border-right: .01rem solid #999;
-							transform: rotate(45deg);
-							margin-left: .15rem;
-							position: relative;
-							top: -.08rem;
-						}
-					}
-				}
-				.type_price{
-					display: flex;
-					justify-content: center;
-					border-top: .01rem solid #ededed;
-					margin-top: .3rem;
-					padding-top: .3rem;
-					div{
-						flex: 1;
-						text-align: center;
-						p:nth-of-type(2){
-							color: #333;
-							margin-top: .2rem;
-							font-size: .36rem;
-						}
-					}
-					div:nth-of-type(1){
-						border-right: .01rem solid #ededed;
-						p:nth-of-type(2):after{
-							content: "";
-							display: inline-block;
-							width: .15rem;
-							height: .15rem;
-							border-bottom: .01rem solid #999;
-							border-right: .01rem solid #999;
-							transform: rotate(45deg);
-							margin-left: .15rem;
-							position: relative;
-							top: -.08rem;
-						}
-					}
-				}
-			}
-			
-		}
-		.bz{
-			padding: 0rem .33rem;
-		    font-size: .3rem;
-			/deep/.van-field__value{
-				input{
-					text-align: right;
-				}
-				
-			}
-		}
-		.check{
-			font-size: .24rem;
-			
-			text-align: center;
-			
-			/deep/.van-checkbox{
-				justify-content: center;
-				.van-checkbox__label{
-					color: #999;
-				}
-			}
-		}
-		.btn-jj{
-			padding: .33rem;
-			button{
-				width: 100%;
-			}
-		}
-	}
-	.whrite_add{
-		width: 6.6rem;
-		padding: .4rem .2rem;
-		/deep/.van-field__value{
-			input{
-				text-align: right;
-			}
-			
-		}
-		/deep/.van-popup__close-icon--top-right{
-			top: 5px;
-			right: 10px;
-		}
+<style scoped lang="less">
+.content {
+	.jjinfo {
+		font-size: .24rem;
+		color: #999999;
+		padding: .33rem;
+
+		>div {
+			background: white;
+			border-radius: .05rem;
+			padding: .1rem .3rem;
+
+			.jj {
+				display: flex;
+				justify-content: space-between;
+				padding: .2rem 0rem;
+
+				.jjaddress {
+					display: flex;
+					padding: .1rem 0rem;
+
+					>p {
+						font-size: .24rem;
+						font-weight: bold;
+						display: inline-block;
+						width: .5rem;
+						height: .5rem;
+						background: #00c4b8;
+						text-align: center;
+						line-height: .5rem;
+						color: white;
+						border-radius: 50%;
+						margin-right: .3rem;
+					}
+
+					div {
+						//font-weight: bold;
+						max-width: 4.2rem;
+
+						p:nth-of-type(1) {
+							font-size: .24rem;
+							color: #333;
+							margin-bottom: .2rem;
+						}
+
+						p:nth-of-type(2) {
+							font-size: .3rem;
+						}
+					}
+				}
+
+				.dzb {
+					text-align: center;
+					border-left: .01rem solid #ededed;
+					padding-left: .3rem;
+
+					img {
+						width: .39rem;
+						height: .42rem;
+						padding-top: .2rem;
+					}
+
+					p {
+						font-size: .2rem;
+					}
+
+				}
+			}
+		}
+
+	}
+
+	.choose {
+		font-size: .3rem;
+		color: #999999;
+		font-weight: bold;
+		padding: 0.33rem .33rem;
+
+		>div {
+			background: white;
+
+			padding: .3rem .3rem;
+			border-radius: .05rem;
+
+			.type_wp {
+				display: flex;
+				justify-content: center;
+
+				div {
+					flex: 1;
+					text-align: center;
+
+					p:nth-of-type(2) {
+						color: #333;
+						margin-top: .2rem;
+						font-size: .36rem;
+						//position: relative;
+					}
+
+				}
+
+				div:nth-of-type(1) {
+					border-right: .01rem solid #ededed;
+
+					p:nth-of-type(2):after {
+						content: "";
+						display: inline-block;
+						width: .15rem;
+						height: .15rem;
+						border-bottom: .01rem solid #999;
+						border-right: .01rem solid #999;
+						transform: rotate(45deg);
+						margin-left: .15rem;
+						position: relative;
+						top: -.08rem;
+					}
+				}
+			}
+
+			.type_price {
+				display: flex;
+				justify-content: center;
+				border-top: .01rem solid #ededed;
+				margin-top: .3rem;
+				padding-top: .3rem;
+
+				div {
+					flex: 1;
+					text-align: center;
+
+					p:nth-of-type(2) {
+						color: #333;
+						margin-top: .2rem;
+						font-size: .36rem;
+					}
+				}
+
+				div:nth-of-type(1) {
+					border-right: .01rem solid #ededed;
+
+					p:nth-of-type(2):after {
+						content: "";
+						display: inline-block;
+						width: .15rem;
+						height: .15rem;
+						border-bottom: .01rem solid #999;
+						border-right: .01rem solid #999;
+						transform: rotate(45deg);
+						margin-left: .15rem;
+						position: relative;
+						top: -.08rem;
+					}
+				}
+			}
+		}
+
+	}
+
+	.bz {
+		padding: 0rem .33rem;
+		font-size: .3rem;
+
+		/deep/.van-field__value {
+			input {
+				text-align: right;
+			}
+
+		}
+	}
+
+	.check {
+		font-size: .24rem;
+
+		text-align: center;
+
+		/deep/.van-checkbox {
+			justify-content: center;
+
+			.van-checkbox__label {
+				color: #999;
+			}
+		}
+	}
+
+	.btn-jj {
+		padding: .33rem;
+
+		button {
+			width: 100%;
+		}
+	}
+}
+
+.whrite_add {
+	width: 6.6rem;
+	padding: .4rem .2rem;
+
+	/deep/.van-field__value {
+		input {
+			text-align: right;
+		}
+
+	}
+
+	/deep/.van-popup__close-icon--top-right {
+		top: 5px;
+		right: 10px;
 	}
+}
 </style>

+ 462 - 431
src/pages_bak/express.vue

@@ -1,442 +1,473 @@
-<template>
-	<div class="content">
-		<back :title="titlename"></back>
-		<!-- 寄件地址 -->
-		<div class="jjinfo">
-			<div>
-				<div class="jj">
-					<div class="jjaddress">
-						<p>寄</p>
-						<div>
-							<p v-if="jjname==''||jjname==' '">寄件地址</p>
-							<p v-else>{{jjname}}</p>
-							<p v-if="jjadd==''||jjadd==' '" @click="addtype(1)">填写寄件地址</p>
-							<p v-else @click="addtype(1)">{{jjadd}}</p>
-						</div>
-					</div>
-					<div class="dzb" @click="link(1)">
-						<img src="../assets/images/addlist.png" alt="">
-						<p>地址簿</p>
-					</div>				
-				</div>
-				<div class="jj" style="border-top:.01rem solid #ededed">
-					<div class="jjaddress">
-						<p style="background: #fa9c22;">收</p>
-						<div>
-							<p v-if="sjname==''||sjname==' '">收件地址</p>
-							<p v-else>{{sjname}}</p>
-							<p v-if="sjadd==''||sjadd==' '" @click="addtype(2)">填写收件地址</p>
-							<p v-else @click="addtype(2)">{{sjadd}}</p>
-						</div>
-					</div>
-					<div class="dzb" @click="link(2)">
-						<img src="../assets/images/addlist.png" alt="">
-						<p>地址簿</p>
-					</div>
-				</div>
-			</div>
-			
-		</div>
-		<!-- 寄件属性 -->
-		<div class="choose">
-			<div>
-				<div class="type_wp">
-					<div>
-						<p>物品类型</p>
-						<p v-if="wptype==''" @click="wpshow=true">请选择</p>
-						<p v-else @click="wpshow=true">{{wptype}}</p>
-					</div>
-					<div>
-						<p>重量(公斤)</p>
-						<p>
+<template>
+	<div class="content">
+
+		<!-- 寄件地址 -->
+		<div class="jjinfo">
+			<div>
+				<div class="jj">
+					<div class="jjaddress">
+						<p>寄</p>
+						<div>
+							<p v-if="jjname == '' || jjname == ' '">寄件地址</p>
+							<p v-else>{{ jjname }}</p>
+							<p v-if="jjadd == '' || jjadd == ' '" @click="addtype(1)">填写寄件地址</p>
+							<p v-else @click="addtype(1)">{{ jjadd }}</p>
+						</div>
+					</div>
+					<div class="dzb" @click="link(1)">
+						<img src="../assets/images/addlist.png" alt="">
+						<p>地址簿</p>
+					</div>
+				</div>
+				<div class="jj" style="border-top:.01rem solid #ededed">
+					<div class="jjaddress">
+						<p style="background: #fa9c22;">收</p>
+						<div>
+							<p v-if="sjname == '' || sjname == ' '">收件地址</p>
+							<p v-else>{{ sjname }}</p>
+							<p v-if="sjadd == '' || sjadd == ' '" @click="addtype(2)">填写收件地址</p>
+							<p v-else @click="addtype(2)">{{ sjadd }}</p>
+						</div>
+					</div>
+					<div class="dzb" @click="link(2)">
+						<img src="../assets/images/addlist.png" alt="">
+						<p>地址簿</p>
+					</div>
+				</div>
+			</div>
+
+		</div>
+		<!-- 寄件属性 -->
+		<div class="choose">
+			<div>
+				<div class="type_wp">
+					<div>
+						<p>物品类型</p>
+						<p v-if="wptype == ''" @click="wpshow = true">请选择</p>
+						<p v-else @click="wpshow = true">{{ wptype }}</p>
+					</div>
+					<div>
+						<p>重量(公斤)</p>
+						<p>
 							<van-field name="stepper" style="padding: 0px;">
 								<template #input>
 									<van-stepper v-model="stepper"></van-stepper>
 								</template>
-							</van-field>
-						</p>
-					</div>
-				</div>
-				<div class="type_price">
-					<div>
-						<p>付款方式</p>
-                        <p v-if="pricetype==''" @click="priceshow=true">请选择</p>
-						<p v-else @click="priceshow=true">{{pricetype}}</p>
-					</div>
-					<div>
-						<p>声明价值</p>
-						<p>0元</p>
-					</div>
-				</div>
-			</div>			
-		</div>
-		<!-- 备注 -->
-		<div class="bz">
-			<div>
-				<van-field v-model="bz" name="备注" label="备注" placeholder="包装运输等要求"/>
-			</div>		
-		</div>
-		<!-- 我同意 -->
-		<div class="check">
-			<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
-		</div>
-		<!-- 寄件 -->
-		<div class="btn-jj">
-			<van-button type="info" color="#00c4b8">立即寄件</van-button>
-		</div>
-		<!-- 弹窗物品类型 -->
-		<van-popup v-model="wpshow" position="bottom">
-		  <van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow=false"/>
-		</van-popup>
-		<!-- 弹窗付款方式 -->
-		<van-popup v-model="priceshow" position="bottom">
-		  <van-picker title="付款方式" show-toolbar :columns="pricelist" @confirm="onConfirm2" @cancel="priceshow=false"/>
-		</van-popup>
-		<!-- 填写地址 -->
-		<van-popup round v-model="addshow" class="whrite_add" closeable closed="close">
-			<div>
-				<p style="font-size: 16px;text-align: center;margin-bottom: 16px;">{{title}}</p>
-				<van-form @submit="onSubmit">
-				  <van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名" :rules="[{ required: false}]"/>
-				  <van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机" :rules="[{ required: false}]"/>
-				  <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" :rules="[{ required: false}]"/>
-				  <van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址" :rules="[{ required: false}]"/>
-				  <div style="margin-top: 16px;">
-				    <van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
-				  </div>
-				</van-form>
-			</div>
-		  
-		</van-popup>
-		<!-- 城市选择 -->
-		<van-popup v-model="areashow" position="bottom">
-		  <van-area
-		    :area-list="areaList"
-		    @confirm="onConfirm3"
-		    @cancel="areashow = false"
-		  />
-		</van-popup>
-	</div>	
+							</van-field>
+						</p>
+					</div>
+				</div>
+				<div class="type_price">
+					<div>
+						<p>付款方式</p>
+						<p v-if="pricetype == ''" @click="priceshow = true">请选择</p>
+						<p v-else @click="priceshow = true">{{ pricetype }}</p>
+					</div>
+					<div>
+						<p>声明价值</p>
+						<p>0元</p>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 备注 -->
+		<div class="bz">
+			<div>
+				<van-field v-model="bz" name="备注" label="备注" placeholder="包装运输等要求" />
+			</div>
+		</div>
+		<!-- 我同意 -->
+		<div class="check">
+			<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
+		</div>
+		<!-- 寄件 -->
+		<div class="btn-jj">
+			<van-button type="info" color="#00c4b8">立即寄件</van-button>
+		</div>
+		<!-- 弹窗物品类型 -->
+		<van-popup v-model="wpshow" position="bottom">
+			<van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow = false" />
+		</van-popup>
+		<!-- 弹窗付款方式 -->
+		<van-popup v-model="priceshow" position="bottom">
+			<van-picker title="付款方式" show-toolbar :columns="pricelist" @confirm="onConfirm2"
+				@cancel="priceshow = false" />
+		</van-popup>
+		<!-- 填写地址 -->
+		<van-popup round v-model="addshow" class="whrite_add" closeable closed="close">
+			<div>
+				<p style="font-size: 16px;text-align: center;margin-bottom: 16px;">{{ title }}</p>
+				<van-form @submit="onSubmit">
+					<van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名" :rules="[{ required: false }]" />
+					<van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机"
+						:rules="[{ required: false }]" />
+					<van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区"
+						@click="areashow = true" :rules="[{ required: false }]" />
+					<van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址"
+						:rules="[{ required: false }]" />
+					<div style="margin-top: 16px;">
+						<van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
+					</div>
+				</van-form>
+			</div>
+
+		</van-popup>
+		<!-- 城市选择 -->
+		<van-popup v-model="areashow" position="bottom">
+			<van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
+		</van-popup>
+	</div>
 </template>
 
-<script>
-	import areaList from "@/script/areas.js"
-	import { Stepper,Toast } from 'vant';
-	export default{
-		data(){
-			return {
-				titlename:"寄件",
-				wptype:"",//物品类型
-				wpshow:false,//物品类型弹窗显示
-				wplist:["日用品","食品","文件","衣物","数码产品","其他"],
-				pricetype:"",//付款类型
-				stepper:'',
-				priceshow:false,//付款类型弹窗显示
-				pricelist:["月结","日结","到付"],
-				addshow:false,
-				name:"",
-				phone:"",
-				city:"",
-				address:"",
-				areashow:false,
-				index:"",
-				title:"",
-				jjname:"",
-				jjadd:"",
-				sjname:"",
-				sjadd:"",
-				bz:"",
-				check:false,
-				openid:''
-			}
-		},
-		created:function(){
-			this.openid = this.$store.state.openId
-			
-			//寄件地址
-			if(JSON.stringify(this.$store.state.jjInfo)!='{}'){
-				this.jjname = this.$store.state.jjInfo.jjname
-				this.jjadd = this.$store.state.jjInfo.jjadd
-			}
-			
-			//收件地址
-			if(JSON.stringify(this.$store.state.sjInfo)!='{}'){
-				this.sjname = this.$store.state.sjInfo.jjname
-				this.sjadd = this.$store.state.sjInfo.jjadd
-			}
-			
-		},
-		methods:{
-			// 选择物品确定
-			onConfirm1(e){//确定
-				this.wptype=e
-				this.wpshow=false
-				console.log(e)
-			},
-			// 选择付款方式确定
-			onConfirm2(e){//确定
-				this.pricetype=e
-				this.priceshow=false
-				console.log(e)
-			},
-			// 填写地址确定
-			onConfirm3(e){//确定
-				this.city=e[0].name+' '+e[1].name+' '+e[2].name
-				this.areashow=false
-				console.log(e)
-			},
-			// 寄件地址1与收件地址2
-			addtype(obj){
-				this.index=obj
-				if(obj==1){
-					this.title="寄件地址"
-				}
-				if(obj==2){
-					this.title="收件地址"
-				}
-				this.addshow=true
-			},
-			// 填写地址确定
-			onSubmit(){
-				if(this.name == '' || this.name == undefined ){
-					Toast('请填写姓名')
-					return
-				}
-				if(this.phone == '' || this.phone == undefined ){
-					Toast('请填写手机')
-					return
-				}
-				let regPhone = new RegExp(this.$store.state.regPhone)
-				if(!regPhone.test(this.phone)){
-					Toast('手机号格式不正确')
-					return
-				}
-				if(this.city == '' || this.city == undefined ){
-					Toast('请选择省市区')
-					return
-				}
-				if(this.address == '' || this.address == undefined ){
-					Toast('请填写详细地址')
-					return
-				}
-				if(this.index==1){
-					this.jjname=this.name+' '+this.phone
-					this.jjadd=this.city+' '+this.address
-					let jjInfo = {}
-					jjInfo.jjname = this.jjname
-					jjInfo.jjadd = this.jjadd
-					this.$store.commit("getJjInfo",jjInfo)
-				}
-				if(this.index==2){
-					this.sjname=this.name+' '+this.phone
                    this.sjadd=this.city+' '+this.address
-					let sjInfo = {}
-					sjInfo.sjname = this.sjname
-					sjInfo.jjadd = this.sjadd
-					this.$store.commit("getSjInfo",sjInfo)
-				}
-				
-				this.addshow=false
-				this.name=""
-				this.phone=""
-				this.city=""
-				this.address=""
-			},
-			close(){
-				this.name=""
-				this.phone=""
-				this.city=""
-				this.address=""
-			},
-			// 地址簿跳转
-			link(obj){
-				this.$router.push({path:'/Addressbook',query:{active:obj}})
-			}
-		},
-		computed:{
-			areaList(){
-				return areaList
-			}
-		}
+<script>
+import areaList from "@/script/areas.js"
+import { Stepper, Toast } from 'vant';
+export default {
+	data() {
+		return {
+			titlename: "寄件",
+			wptype: "",//物品类型
+			wpshow: false,//物品类型弹窗显示
+			wplist: ["日用品", "食品", "文件", "衣物", "数码产品", "其他"],
+			pricetype: "",//付款类型
+			stepper: '',
+			priceshow: false,//付款类型弹窗显示
+			pricelist: ["月结", "日结", "到付"],
+			addshow: false,
+			name: "",
+			phone: "",
+			city: "",
+			address: "",
+			areashow: false,
+			index: "",
+			title: "",
+			jjname: "",
+			jjadd: "",
+			sjname: "",
+			sjadd: "",
+			bz: "",
+			check: false,
+			openid: ''
+		}
+	},
+	created: function () {
+		this.openid = this.$store.state.openId
+
+		//寄件地址
+		if (JSON.stringify(this.$store.state.jjInfo) != '{}') {
+			this.jjname = this.$store.state.jjInfo.jjname
+			this.jjadd = this.$store.state.jjInfo.jjadd
+		}
+
+		//收件地址
+		if (JSON.stringify(this.$store.state.sjInfo) != '{}') {
+			this.sjname = this.$store.state.sjInfo.jjname
+			this.sjadd = this.$store.state.sjInfo.jjadd
+		}
+
+	},
+	methods: {
+		// 选择物品确定
+		onConfirm1(e) {//确定
+			this.wptype = e
+			this.wpshow = false
+			console.log(e)
+		},
+		// 选择付款方式确定
+		onConfirm2(e) {//确定
+			this.pricetype = e
+			this.priceshow = false
+			console.log(e)
+		},
+		// 填写地址确定
+		onConfirm3(e) {//确定
+			this.city = e[0].name + ' ' + e[1].name + ' ' + e[2].name
+			this.areashow = false
+			console.log(e)
+		},
+		// 寄件地址1与收件地址2
+		addtype(obj) {
+			this.index = obj
+			if (obj == 1) {
+				this.title = "寄件地址"
+			}
+			if (obj == 2) {
+				this.title = "收件地址"
+			}
+			this.addshow = true
+		},
+		// 填写地址确定
+		onSubmit() {
+			if (this.name == '' || this.name == undefined) {
+				Toast('请填写姓名')
+				return
+			}
+			if (this.phone == '' || this.phone == undefined) {
+				Toast('请填写手机')
+				return
+			}
+			let regPhone = new RegExp(this.$store.state.regPhone)
+			if (!regPhone.test(this.phone)) {
+				Toast('手机号格式不正确')
+				return
+			}
+			if (this.city == '' || this.city == undefined) {
+				Toast('请选择省市区')
+				return
+			}
+			if (this.address == '' || this.address == undefined) {
+				Toast('请填写详细地址')
+				return
+			}
+			if (this.index == 1) {
+				this.jjname = this.name + ' ' + this.phone
+				this.jjadd = this.city + ' ' + this.address
+				let jjInfo = {}
+				jjInfo.jjname = this.jjname
+				jjInfo.jjadd = this.jjadd
+				this.$store.commit("getJjInfo", jjInfo)
+			}
+			if (this.index == 2) {
+				this.sjname = this.name + ' ' + this.phone
+				this.sjadd = this.city + ' ' + this.address
+				let sjInfo = {}
+				sjInfo.sjname = this.sjname
+				sjInfo.jjadd = this.sjadd
+				this.$store.commit("getSjInfo", sjInfo)
+			}
+
+			this.addshow = false
+			this.name = ""
+			this.phone = ""
+			this.city = ""
+			this.address = ""
+		},
+		close() {
+			this.name = ""
+			this.phone = ""
+			this.city = ""
+			this.address = ""
+		},
+		// 地址簿跳转
+		link(obj) {
+			this.$router.push({ path: '/Addressbook', query: { active: obj } })
+		}
+	},
+	computed: {
+		areaList() {
+			return areaList
+		}
 	}
+}
 </script>
 
-<style scoped lang="less">
-	.content{
-		.jjinfo{
-			font-size: .24rem;
-			color: #999999;
-			padding: .33rem;
-			>div{
-				background: white;
-				border-radius: .05rem;
-				padding: .1rem .3rem;
-				.jj{
-					display: flex;
-					justify-content: space-between;
-					padding: .2rem 0rem;
-					.jjaddress{
-						display: flex;
-						padding: .1rem 0rem;
-						>p{
-							font-size: .24rem;
-							font-weight: bold;
-							display: inline-block;
-							width:.5rem;
-							height: .5rem;
-							background: #00c4b8;
-							text-align: center;
-							line-height: .5rem;
-							color: white;
-							border-radius: 50%;
-							margin-right: .3rem;
-						}
-						div{
-							//font-weight: bold;
-							max-width: 4.2rem;
-							p:nth-of-type(1){
-								font-size: .24rem;
-								color: #333;
-								margin-bottom: .2rem;
-							}
-							p:nth-of-type(2){
-								font-size: .3rem;
-							}
-						}
-					}
-					.dzb{
-						text-align: center;
-						border-left: .01rem solid #ededed;
-						padding-left: .3rem;
-						
-						img{
-							width:.39rem;
-							height: .42rem;
-							padding-top: .2rem;
-						}
-						p{
-							font-size: .2rem;
-						}
-						
-					}
-				}
-		    }
-		
-		}
-		.choose{
-			font-size: .3rem;
-			color: #999999;
-			font-weight: bold;
-			padding: 0rem .33rem;
-			>div{
-				background: white;
-				
-				padding: .3rem .3rem;
-				border-radius: .05rem;
-				.type_wp{
-					display: flex;
-					justify-content: center;
-					div{
-						flex: 1;
-						text-align: center;
-						p:nth-of-type(2){
-							color: #333;
-							margin-top: .2rem;
-							font-size: .36rem;
-							//position: relative;
-						}
-						
-					} 
-					div:nth-of-type(1){
-						border-right: .01rem solid #ededed;
-						p:nth-of-type(2):after{
-							content: "";
-							display: inline-block;
-							width: .15rem;
-							height: .15rem;
-							border-bottom: .01rem solid #999;
-							border-right: .01rem solid #999;
-							transform: rotate(45deg);
-							margin-left: .15rem;
-							position: relative;
-							top: -.08rem;
-						}
-					}
-				}
-				.type_price{
-					display: flex;
-					justify-content: center;
-					border-top: .01rem solid #ededed;
-					margin-top: .3rem;
-					padding-top: .3rem;
-					div{
-						flex: 1;
-						text-align: center;
-						p:nth-of-type(2){
-							color: #333;
-							margin-top: .2rem;
-							font-size: .36rem;
-						}
-					}
-					div:nth-of-type(1){
-						border-right: .01rem solid #ededed;
-						p:nth-of-type(2):after{
-							content: "";
-							display: inline-block;
-							width: .15rem;
-							height: .15rem;
-							border-bottom: .01rem solid #999;
-							border-right: .01rem solid #999;
-							transform: rotate(45deg);
-							margin-left: .15rem;
-							position: relative;
-							top: -.08rem;
-						}
-					}
-				}
-			}
-			
-		}
-	    .bz{
-			padding: .33rem;
-		    font-size: .3rem;
-			/deep/.van-field__value{
-				input{
-					text-align: right;
-				}
-				
-			}
-		}
-		.check{
-			font-size: .24rem;
-			
-			text-align: center;
-			
-			/deep/.van-checkbox{
-				justify-content: center;
-				.van-checkbox__label{
-					color: #999;
-				}
-			}
-		}
-		.btn-jj{
-			padding: .33rem;
-			button{
-				width: 100%;
-			}
-		}
-	}
-	.whrite_add{
-		width: 6.6rem;
-		padding: .4rem .2rem;
-		/deep/.van-field__value{
-			input{
-				text-align: right;
-			}
-			
-		}
-		/deep/.van-popup__close-icon--top-right{
-			top: 5px;
-			right: 10px;
-		}
+<style scoped lang="less">
+.content {
+	.jjinfo {
+		font-size: .24rem;
+		color: #999999;
+		padding: .33rem;
+
+		>div {
+			background: white;
+			border-radius: .05rem;
+			padding: .1rem .3rem;
+
+			.jj {
+				display: flex;
+				justify-content: space-between;
+				padding: .2rem 0rem;
+
+				.jjaddress {
+					display: flex;
+					padding: .1rem 0rem;
+
+					>p {
+						font-size: .24rem;
+						font-weight: bold;
+						display: inline-block;
+						width: .5rem;
+						height: .5rem;
+						background: #00c4b8;
+						text-align: center;
+						line-height: .5rem;
+						color: white;
+						border-radius: 50%;
+						margin-right: .3rem;
+					}
+
+					div {
+						//font-weight: bold;
+						max-width: 4.2rem;
+
+						p:nth-of-type(1) {
+							font-size: .24rem;
+							color: #333;
+							margin-bottom: .2rem;
+						}
+
+						p:nth-of-type(2) {
+							font-size: .3rem;
+						}
+					}
+				}
+
+				.dzb {
+					text-align: center;
+					border-left: .01rem solid #ededed;
+					padding-left: .3rem;
+
+					img {
+						width: .39rem;
+						height: .42rem;
+						padding-top: .2rem;
+					}
+
+					p {
+						font-size: .2rem;
+					}
+
+				}
+			}
+		}
+
+	}
+
+	.choose {
+		font-size: .3rem;
+		color: #999999;
+		font-weight: bold;
+		padding: 0rem .33rem;
+
+		>div {
+			background: white;
+
+			padding: .3rem .3rem;
+			border-radius: .05rem;
+
+			.type_wp {
+				display: flex;
+				justify-content: center;
+
+				div {
+					flex: 1;
+					text-align: center;
+
+					p:nth-of-type(2) {
+						color: #333;
+						margin-top: .2rem;
+						font-size: .36rem;
+						//position: relative;
+					}
+
+				}
+
+				div:nth-of-type(1) {
+					border-right: .01rem solid #ededed;
+
+					p:nth-of-type(2):after {
+						content: "";
+						display: inline-block;
+						width: .15rem;
+						height: .15rem;
+						border-bottom: .01rem solid #999;
+						border-right: .01rem solid #999;
+						transform: rotate(45deg);
+						margin-left: .15rem;
+						position: relative;
+						top: -.08rem;
+					}
+				}
+			}
+
+			.type_price {
+				display: flex;
+				justify-content: center;
+				border-top: .01rem solid #ededed;
+				margin-top: .3rem;
+				padding-top: .3rem;
+
+				div {
+					flex: 1;
+					text-align: center;
+
+					p:nth-of-type(2) {
+						color: #333;
+						margin-top: .2rem;
+						font-size: .36rem;
+					}
+				}
+
+				div:nth-of-type(1) {
+					border-right: .01rem solid #ededed;
+
+					p:nth-of-type(2):after {
+						content: "";
+						display: inline-block;
+						width: .15rem;
+						height: .15rem;
+						border-bottom: .01rem solid #999;
+						border-right: .01rem solid #999;
+						transform: rotate(45deg);
+						margin-left: .15rem;
+						position: relative;
+						top: -.08rem;
+					}
+				}
+			}
+		}
+
+	}
+
+	.bz {
+		padding: .33rem;
+		font-size: .3rem;
+
+		/deep/.van-field__value {
+			input {
+				text-align: right;
+			}
+
+		}
+	}
+
+	.check {
+		font-size: .24rem;
+
+		text-align: center;
+
+		/deep/.van-checkbox {
+			justify-content: center;
+
+			.van-checkbox__label {
+				color: #999;
+			}
+		}
+	}
+
+	.btn-jj {
+		padding: .33rem;
+
+		button {
+			width: 100%;
+		}
+	}
+}
+
+.whrite_add {
+	width: 6.6rem;
+	padding: .4rem .2rem;
+
+	/deep/.van-field__value {
+		input {
+			text-align: right;
+		}
+
+	}
+
+	/deep/.van-popup__close-icon--top-right {
+		top: 5px;
+		right: 10px;
 	}
+}
 </style>

+ 362 - 338
src/pages_bak/inexpress.vue

@@ -1,345 +1,369 @@
-<template>
-	<div class="content">
-		<back :title="titlename"></back>
-		<!-- 寄件地址 -->
-		<div class="jjinfo">
-			<div>
-				<div class="jj">
-					<div class="jjaddress">
-						<p>寄</p>
-						<div>
-							<p v-if="jjname==''||jjname==' '">寄件地址</p>
-							<p v-else>{{jjname}}</p>
-							<p v-if="jjadd==''||jjadd==' '" @click="addtype(1)">填写寄件地址</p>
-							<p v-else @click="addtype(1)">{{jjadd}}</p>
-						</div>
-					</div>
-					<div class="dzb">
-						<img src="../assets/images/addlist.png" alt="">
-						<p>地址簿</p>
-					</div>				
-				</div>
-				<div class="jj" style="border-top:.01rem solid #ededed">
-					<div class="jjaddress">
-						<p style="background: #fa9c22;">收</p>
-						<div>
-							<p v-if="sjname==''||sjname==' '">寄件地址</p>
-							<p v-else>{{sjname}}</p>
-							<p v-if="sjadd==''||sjadd==' '" @click="addtype(2)">填写收件地址</p>
-							<p v-else @click="addtype(2)">{{sjadd}}</p>
-						</div>
-					</div>
-					<div class="dzb">
-						<img src="../assets/images/addlist.png" alt="">
-						<p>地址簿</p>
-					</div>
-				</div>
-			</div>
-			
-		</div>
-		<!-- 寄件属性 -->
-		<div class="choose">
-			<div>
-				<div class="type_wp">
-					<div>
-						<p>物品类型</p>
-						<p v-if="wptype==''" @click="wpshow=true">请选择</p>
-						<p v-else @click="wpshow=true">{{wptype}}</p>
-					</div>
-					<div>
-						<p>重量</p>
-						<p>一件</p>
-					</div>
-				</div>
-			</div>			
-		</div>
-		<!-- 备注 -->
-		<div class="bz">
-			<div>
-				<van-field v-model="bz" name="备注" label="备注" placeholder="包装运输等要求"/>
-			</div>		
-		</div>
-		<!-- 我同意 -->
-		<div class="check">
-			<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
-		</div>
-		<!-- 寄件 -->
-		<div class="btn-jj">
-			<van-button type="info" color="#00c4b8">立即寄件</van-button>
-		</div>
-		<!-- 弹窗物品类型 -->
-		<van-popup v-model="wpshow" position="bottom">
-		  <van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow=false"/>
-		</van-popup>
-		<!-- 弹窗付款方式 -->
-		<van-popup v-model="priceshow" position="bottom">
-		  <van-picker title="付款方式" show-toolbar :columns="pricelist" @confirm="onConfirm2" @cancel="priceshow=false"/>
-		</van-popup>
-		<!-- 填写地址 -->
-		<van-popup round v-model="addshow" class="whrite_add" closeable closed="close">
-			<div>
-				<p style="font-size: 16px;text-align: center;margin-bottom: 16px;">{{title}}</p>
-				<van-form @submit="onSubmit">
-				  <van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名"/>
-				  <van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机"/>
-				  <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" />
-				  <van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址"/>
-				  <div style="margin-top: 16px;">
-				    <van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
-				  </div>
-				</van-form>
-			</div>
-		  
-		</van-popup>
-		<!-- 城市选择 -->
-		<van-popup v-model="areashow" position="bottom">
-		  <van-area
-		    :area-list="areaList"
-		    @confirm="onConfirm3"
-		    @cancel="areashow = false"
-		  />
-		</van-popup>
-	</div>	
+<template>
+	<div class="content">
+
+		<!-- 寄件地址 -->
+		<div class="jjinfo">
+			<div>
+				<div class="jj">
+					<div class="jjaddress">
+						<p>寄</p>
+						<div>
+							<p v-if="jjname == '' || jjname == ' '">寄件地址</p>
+							<p v-else>{{ jjname }}</p>
+							<p v-if="jjadd == '' || jjadd == ' '" @click="addtype(1)">填写寄件地址</p>
+							<p v-else @click="addtype(1)">{{ jjadd }}</p>
+						</div>
+					</div>
+					<div class="dzb">
+						<img src="../assets/images/addlist.png" alt="">
+						<p>地址簿</p>
+					</div>
+				</div>
+				<div class="jj" style="border-top:.01rem solid #ededed">
+					<div class="jjaddress">
+						<p style="background: #fa9c22;">收</p>
+						<div>
+							<p v-if="sjname == '' || sjname == ' '">寄件地址</p>
+							<p v-else>{{ sjname }}</p>
+							<p v-if="sjadd == '' || sjadd == ' '" @click="addtype(2)">填写收件地址</p>
+							<p v-else @click="addtype(2)">{{ sjadd }}</p>
+						</div>
+					</div>
+					<div class="dzb">
+						<img src="../assets/images/addlist.png" alt="">
+						<p>地址簿</p>
+					</div>
+				</div>
+			</div>
+
+		</div>
+		<!-- 寄件属性 -->
+		<div class="choose">
+			<div>
+				<div class="type_wp">
+					<div>
+						<p>物品类型</p>
+						<p v-if="wptype == ''" @click="wpshow = true">请选择</p>
+						<p v-else @click="wpshow = true">{{ wptype }}</p>
+					</div>
+					<div>
+						<p>重量</p>
+						<p>一件</p>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 备注 -->
+		<div class="bz">
+			<div>
+				<van-field v-model="bz" name="备注" label="备注" placeholder="包装运输等要求" />
+			</div>
+		</div>
+		<!-- 我同意 -->
+		<div class="check">
+			<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
+		</div>
+		<!-- 寄件 -->
+		<div class="btn-jj">
+			<van-button type="info" color="#00c4b8">立即寄件</van-button>
+		</div>
+		<!-- 弹窗物品类型 -->
+		<van-popup v-model="wpshow" position="bottom">
+			<van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow = false" />
+		</van-popup>
+		<!-- 弹窗付款方式 -->
+		<van-popup v-model="priceshow" position="bottom">
+			<van-picker title="付款方式" show-toolbar :columns="pricelist" @confirm="onConfirm2"
+				@cancel="priceshow = false" />
+		</van-popup>
+		<!-- 填写地址 -->
+		<van-popup round v-model="addshow" class="whrite_add" closeable closed="close">
+			<div>
+				<p style="font-size: 16px;text-align: center;margin-bottom: 16px;">{{ title }}</p>
+				<van-form @submit="onSubmit">
+					<van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名" />
+					<van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机" />
+					<van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区"
+						@click="areashow = true" />
+					<van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址" />
+					<div style="margin-top: 16px;">
+						<van-button color="#00c4b8" block type="info" native-type="submit">确定</van-button>
+					</div>
+				</van-form>
+			</div>
+
+		</van-popup>
+		<!-- 城市选择 -->
+		<van-popup v-model="areashow" position="bottom">
+			<van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
+		</van-popup>
+	</div>
 </template>
 
-<script>
-	import areaList from "@/script/areas.js"
-	export default{
-		data(){
-			return {
-				titlename:"内部件",
-				wptype:"",//物品类型
-				wpshow:false,//物品类型弹窗显示
-				wplist:["物品1","物品二"],
-				pricetype:"",//付款类型
-				priceshow:false,//付款类型弹窗显示
-				pricelist:["月结","日结","到付"],
-				addshow:false,
-				name:"",
-				phone:"",
-				city:"",
-				address:"",
-				areashow:false,
-				index:"",
-				title:"",
-				jjname:"",
-				jjadd:"",
-				sjname:"",
-				sjadd:"",
-				bz:"",
-				check:false
-			}
-		},
-		created:function(){
-			//this.areaList=area.areaList
-		},
-		methods:{
-			// 选择物品确定
-			onConfirm1(e){//确定
-				this.wptype=e
-				this.wpshow=false
-				console.log(e)
-			},
-			// 选择付款方式确定
-			onConfirm2(e){//确定
-				this.pricetype=e
-				this.priceshow=false
-				console.log(e)
-			},
-			// 填写地址确定
-			onConfirm3(e){//确定
-				this.city=e[0].name+' '+e[1].name+' '+e[2].name
-				this.areashow=false
-				console.log(e)
-			},
-			// 寄件地址1与收件地址2
-			addtype(obj){
-				this.index=obj
-				if(obj==1){
-					this.title="寄件地址"
-				}
-				if(obj==2){
-					this.title="收件地址"
-				}
-				this.addshow=true
-			},
-			// 填写地址确定
-			onSubmit(){
-				if(this.index==1){
-					this.jjname=this.name+' '+this.phone
-					this.jjadd=this.city+' '+this.address
-				}
-				if(this.index==2){
-					this.sjname=this.name+' '+this.phone
                    this.sjadd=this.city+' '+this.address
-				}
-				this.addshow=false
-				this.name=""
-				this.phone=""
-				this.city=""
-				this.address=""
-			},
-			close(){
-				this.name=""
-				this.phone=""
-				this.city=""
-				this.address=""
-			},
-		},
-		computed:{
-			areaList(){
-				return areaList
-			}
-		}
+<script>
+import areaList from "@/script/areas.js"
+export default {
+	data() {
+		return {
+			titlename: "内部件",
+			wptype: "",//物品类型
+			wpshow: false,//物品类型弹窗显示
+			wplist: ["物品1", "物品二"],
+			pricetype: "",//付款类型
+			priceshow: false,//付款类型弹窗显示
+			pricelist: ["月结", "日结", "到付"],
+			addshow: false,
+			name: "",
+			phone: "",
+			city: "",
+			address: "",
+			areashow: false,
+			index: "",
+			title: "",
+			jjname: "",
+			jjadd: "",
+			sjname: "",
+			sjadd: "",
+			bz: "",
+			check: false
+		}
+	},
+	created: function () {
+		//this.areaList=area.areaList
+	},
+	methods: {
+		// 选择物品确定
+		onConfirm1(e) {//确定
+			this.wptype = e
+			this.wpshow = false
+			console.log(e)
+		},
+		// 选择付款方式确定
+		onConfirm2(e) {//确定
+			this.pricetype = e
+			this.priceshow = false
+			console.log(e)
+		},
+		// 填写地址确定
+		onConfirm3(e) {//确定
+			this.city = e[0].name + ' ' + e[1].name + ' ' + e[2].name
+			this.areashow = false
+			console.log(e)
+		},
+		// 寄件地址1与收件地址2
+		addtype(obj) {
+			this.index = obj
+			if (obj == 1) {
+				this.title = "寄件地址"
+			}
+			if (obj == 2) {
+				this.title = "收件地址"
+			}
+			this.addshow = true
+		},
+		// 填写地址确定
+		onSubmit() {
+			if (this.index == 1) {
+				this.jjname = this.name + ' ' + this.phone
+				this.jjadd = this.city + ' ' + this.address
+			}
+			if (this.index == 2) {
+				this.sjname = this.name + ' ' + this.phone
+				this.sjadd = this.city + ' ' + this.address
+			}
+			this.addshow = false
+			this.name = ""
+			this.phone = ""
+			this.city = ""
+			this.address = ""
+		},
+		close() {
+			this.name = ""
+			this.phone = ""
+			this.city = ""
+			this.address = ""
+		},
+	},
+	computed: {
+		areaList() {
+			return areaList
+		}
 	}
+}
 </script>
 
-<style scoped lang="less">
-	.content{
-		.jjinfo{
-			font-size: .24rem;
-			color: #999999;
-			padding: .33rem;
-			>div{
-				background: white;
-				border-radius: .05rem;
-				padding: .1rem .3rem;
-				.jj{
-					display: flex;
-					justify-content: space-between;
-					padding: .2rem 0rem;
-					.jjaddress{
-						display: flex;
-						padding: .1rem 0rem;
-						>p{
-							font-size: .24rem;
-							font-weight: bold;
-							display: inline-block;
-							width:.5rem;
-							height: .5rem;
-							background: #00c4b8;
-							text-align: center;
-							line-height: .5rem;
-							color: white;
-							border-radius: 50%;
-							margin-right: .3rem;
-						}
-						div{
-							//font-weight: bold;
-							max-width: 4.2rem;
-							p:nth-of-type(1){
-								font-size: .24rem;
-								color: #333;
-								margin-bottom: .2rem;
-							}
-							p:nth-of-type(2){
-								font-size: .3rem;
-							}
-						}
-					}
-					.dzb{
-						text-align: center;
-						border-left: .01rem solid #ededed;
-						padding-left: .3rem;
-						
-						img{
-							width:.39rem;
-							height: .42rem;
-							padding-top: .2rem;
-						}
-						p{
-							font-size: .2rem;
-						}
-						
-					}
-				}
-		    }
-		
-		}
-		.choose{
-			font-size: .3rem;
-			color: #999999;
-			font-weight: bold;
-			padding: 0rem .33rem;
-			>div{
-				background: white;
-				
-				padding: .3rem .3rem;
-				border-radius: .05rem;
-				.type_wp{
-					display: flex;
-					justify-content: center;
-					div{
-						flex: 1;
-						text-align: center;
-						p:nth-of-type(2){
-							color: #333;
-							margin-top: .2rem;
-							font-size: .36rem;
-							//position: relative;
-						}
-						
-					} 
-					div:nth-of-type(1){
-						border-right: .01rem solid #ededed;
-						p:nth-of-type(2):after{
-							content: "";
-							display: inline-block;
-							width: .15rem;
-							height: .15rem;
-							border-bottom: .01rem solid #999;
-							border-right: .01rem solid #999;
-							transform: rotate(45deg);
-							margin-left: .15rem;
-							position: relative;
-							top: -.08rem;
-						}
-					}
-				}
-				
-			}
-			
-		}
-	    .bz{
-			padding: .33rem;
-		    font-size: .3rem;
-			/deep/.van-field__value{
-				input{
-					text-align: right;
-				}
-				
-			}
-		}
-		.check{
-			font-size: .24rem;
-			
-			text-align: center;
-			
-			/deep/.van-checkbox{
-				justify-content: center;
-				.van-checkbox__label{
-					color: #999;
-				}
-			}
-		}
-		.btn-jj{
-			padding: .33rem;
-			button{
-				width: 100%;
-			}
-		}
-	}
-	.whrite_add{
-		width: 6.6rem;
-		padding: .4rem .2rem;
-		/deep/.van-field__value{
-			input{
-				text-align: right;
-			}
-			
-		}
-		/deep/.van-popup__close-icon--top-right{
-			top: 5px;
-			right: 10px;
-		}
+<style scoped lang="less">
+.content {
+	.jjinfo {
+		font-size: .24rem;
+		color: #999999;
+		padding: .33rem;
+
+		>div {
+			background: white;
+			border-radius: .05rem;
+			padding: .1rem .3rem;
+
+			.jj {
+				display: flex;
+				justify-content: space-between;
+				padding: .2rem 0rem;
+
+				.jjaddress {
+					display: flex;
+					padding: .1rem 0rem;
+
+					>p {
+						font-size: .24rem;
+						font-weight: bold;
+						display: inline-block;
+						width: .5rem;
+						height: .5rem;
+						background: #00c4b8;
+						text-align: center;
+						line-height: .5rem;
+						color: white;
+						border-radius: 50%;
+						margin-right: .3rem;
+					}
+
+					div {
+						//font-weight: bold;
+						max-width: 4.2rem;
+
+						p:nth-of-type(1) {
+							font-size: .24rem;
+							color: #333;
+							margin-bottom: .2rem;
+						}
+
+						p:nth-of-type(2) {
+							font-size: .3rem;
+						}
+					}
+				}
+
+				.dzb {
+					text-align: center;
+					border-left: .01rem solid #ededed;
+					padding-left: .3rem;
+
+					img {
+						width: .39rem;
+						height: .42rem;
+						padding-top: .2rem;
+					}
+
+					p {
+						font-size: .2rem;
+					}
+
+				}
+			}
+		}
+
+	}
+
+	.choose {
+		font-size: .3rem;
+		color: #999999;
+		font-weight: bold;
+		padding: 0rem .33rem;
+
+		>div {
+			background: white;
+
+			padding: .3rem .3rem;
+			border-radius: .05rem;
+
+			.type_wp {
+				display: flex;
+				justify-content: center;
+
+				div {
+					flex: 1;
+					text-align: center;
+
+					p:nth-of-type(2) {
+						color: #333;
+						margin-top: .2rem;
+						font-size: .36rem;
+						//position: relative;
+					}
+
+				}
+
+				div:nth-of-type(1) {
+					border-right: .01rem solid #ededed;
+
+					p:nth-of-type(2):after {
+						content: "";
+						display: inline-block;
+						width: .15rem;
+						height: .15rem;
+						border-bottom: .01rem solid #999;
+						border-right: .01rem solid #999;
+						transform: rotate(45deg);
+						margin-left: .15rem;
+						position: relative;
+						top: -.08rem;
+					}
+				}
+			}
+
+		}
+
+	}
+
+	.bz {
+		padding: .33rem;
+		font-size: .3rem;
+
+		/deep/.van-field__value {
+			input {
+				text-align: right;
+			}
+
+		}
+	}
+
+	.check {
+		font-size: .24rem;
+
+		text-align: center;
+
+		/deep/.van-checkbox {
+			justify-content: center;
+
+			.van-checkbox__label {
+				color: #999;
+			}
+		}
+	}
+
+	.btn-jj {
+		padding: .33rem;
+
+		button {
+			width: 100%;
+		}
+	}
+}
+
+.whrite_add {
+	width: 6.6rem;
+	padding: .4rem .2rem;
+
+	/deep/.van-field__value {
+		input {
+			text-align: right;
+		}
+
+	}
+
+	/deep/.van-popup__close-icon--top-right {
+		top: 5px;
+		right: 10px;
 	}
+}
 </style>

+ 110 - 108
src/pages_bak/newaddress.vue

@@ -1,135 +1,137 @@
 <template>
 	<div class="content">
-		<back :title="titlename"></back>
+
 		<div class="form">
 			<van-form @submit="onSubmit">
-			  <van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名" :rules="[{ required: false}]"/>
-			  <van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机" :rules="[{ required: false}]"/>
-			  <van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区" @click="areashow = true" :rules="[{ required: false}]"/>
-			  <van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址" :rules="[{ required: false}]"/>
-			  <div style="margin-top: 16px;">
-			    <van-button color="#00c4b8" block type="info" native-type="submit" :disabled="disabled">确定</van-button>
-			  </div>
+				<van-field v-model="name" name="姓名" label="姓名" placeholder="请输入姓名" :rules="[{ required: false }]" />
+				<van-field v-model="phone" maxlength="11" type="number" name="手机" label="手机" placeholder="请输入手机"
+					:rules="[{ required: false }]" />
+				<van-field readonly clickable name="area" :value="city" label="省市区" placeholder="请选择省市区"
+					@click="areashow = true" :rules="[{ required: false }]" />
+				<van-field v-model="address" name="详细地址" label="详细地址" placeholder="请输入详细地址"
+					:rules="[{ required: false }]" />
+				<div style="margin-top: 16px;">
+					<van-button color="#00c4b8" block type="info" native-type="submit"
+						:disabled="disabled">确定</van-button>
+				</div>
 			</van-form>
 			<!-- 城市选择 -->
 			<van-popup v-model="areashow" position="bottom">
-			  <van-area
-			    :area-list="areaList"
-			    @confirm="onConfirm3"
-			    @cancel="areashow = false"
-			  />
+				<van-area :area-list="areaList" @confirm="onConfirm3" @cancel="areashow = false" />
 			</van-popup>
 		</div>
 	</div>
 </template>
 
 <script>
-	import areaList from "@/script/areas.js"
-	import {Toast} from 'vant'
-	export default{
-		data(){
-			return{
-				titlename:"寄件人",
-				name:"",
-				phone:"",
-				city:"",
-				address:"",
-				areashow:false,
-				type:'',
-				disabled:false
+import areaList from "@/script/areas.js"
+import { Toast } from 'vant'
+export default {
+	data() {
+		return {
+			titlename: "寄件人",
+			name: "",
+			phone: "",
+			city: "",
+			address: "",
+			areashow: false,
+			type: '',
+			disabled: false
+		}
+	},
+	created: function () {
+		this.type = this.$route.query.type
+		if (this.type == 1) {
+			this.titlename = "新建寄件人地址"
+		}
+		if (this.type == 2) {
+			this.titlename = "新建收件人地址"
+		}
+	},
+	methods: {
+		onSubmit() {
+
+			if (this.name == '' || this.name == undefined) {
+				Toast('请输入姓名')
+				return
 			}
-		},
-		created:function(){
-			this.type=this.$route.query.type
-			if(this.type==1){
-				this.titlename="新建寄件人地址"
+
+			if (this.phone == '' || this.phone == undefined) {
+				Toast('请填写手机号')
+				return
 			}
-			if(this.type==2){
-				this.titlename="新建收件人地址"
+
+			let regPhone = new RegExp(this.$store.state.regPhone)
+			if (!regPhone.test(this.phone)) {
+				Toast('手机号格式不正确')
+				return
 			}
-		},
-		methods:{
-			onSubmit(){
-				
-				if(this.name == '' || this.name == undefined){
-					Toast('请输入姓名')
-					return
-				}
-				
-				if(this.phone == '' || this.phone == undefined){
-					Toast('请填写手机号')
-					return
-				}
-				
-				let regPhone = new RegExp(this.$store.state.regPhone)
-				if(!regPhone.test(this.phone)){
-					Toast('手机号格式不正确')
-					return
-				}
-				
-				if(this.city == '' || this.city == undefined){
-					Toast('请选择省市区')
-					return
-				}
-				
-				if(this.address == '' || this.address == undefined){
-					Toast('请输入详细地址')
-					return
-				}
-				
-				this.disabled = true;
-				
-				this.$http.post(this.$store.state.host+"/personal/saveAddressInfo.do",{user_id:this.openid,
-					name:this.name,
-					phone:this.phone,
-					provinceAndCity:this.city,
-					address:this.address,
-					type:this.type
-					},{emulateJSON:true})
-						.then(res=>{
-							//发送成功
-							if(res.body.msg=='success'){
-								Toast("保存成功");
-								let that = this;
-								setTimeout(function(){
-									that.$router.push({path:'/Addressbook',query:{active:that.type}})
-								},500)
-							}else{
-								Toast("保存失败");
-							}
-							this.disabled = false;
-					},res=>{
-						//发送失败
-						Toast("网络错误");
-						this.disabled = false;
-					})
+
+			if (this.city == '' || this.city == undefined) {
+				Toast('请选择省市区')
+				return
+			}
+
+			if (this.address == '' || this.address == undefined) {
+				Toast('请输入详细地址')
+				return
+			}
+
+			this.disabled = true;
+
+			this.$http.post(this.$store.state.host + "/personal/saveAddressInfo.do", {
+				user_id: this.openid,
+				name: this.name,
+				phone: this.phone,
+				provinceAndCity: this.city,
+				address: this.address,
+				type: this.type
+			}, { emulateJSON: true })
+				.then(res => {
+					//发送成功
+					if (res.body.msg == 'success') {
+						Toast("保存成功");
+						let that = this;
+						setTimeout(function () {
+							that.$router.push({ path: '/Addressbook', query: { active: that.type } })
+						}, 500)
+					} else {
+						Toast("保存失败");
+					}
+					this.disabled = false;
+				}, res => {
+					//发送失败
+					Toast("网络错误");
 					this.disabled = false;
-			},
-			onConfirm3(e){//确定
-				this.city=e[0].name+' '+e[1].name+' '+e[2].name
-				this.areashow=false
-				console.log(e)
-			},
+				})
+			this.disabled = false;
 		},
-		computed:{
-			areaList(){
-				return areaList
-			}
+		onConfirm3(e) {//确定
+			this.city = e[0].name + ' ' + e[1].name + ' ' + e[2].name
+			this.areashow = false
+			console.log(e)
+		},
+	},
+	computed: {
+		areaList() {
+			return areaList
 		}
 	}
+}
 </script>
 
 <style scoped lang="less">
-	.content{
-		
-		.form{
-			padding: .3rem;
-			/deep/.van-field__value{
-				input{
-					text-align: right;
-				}
-				
+.content {
+
+	.form {
+		padding: .3rem;
+
+		/deep/.van-field__value {
+			input {
+				text-align: right;
 			}
+
 		}
 	}
+}
 </style>

+ 3 - 5
src/script/common.js

@@ -16,20 +16,18 @@ export default {
 
 			const res = await getWxUserInfo({ code: code, userId: localStorage.getItem("userId") })
 			console.log(res, '================================getWxUserInfo')
-			if (res.body.code == '0') {
+			if (res.code == '0') {
 				console.log('直接走+======', res)
-				localStorage.setItem("openid", res.body.openId);
-				localStorage.setItem("headimgurl", res.body.headimgurl);
+				localStorage.setItem("openid", res.openId);
+				localStorage.setItem("headimgurl", res.headimgurl);
 			} else {
 				this.urlredirect();
 			}
 		}
 
-
 		Vue.prototype.urlredirect = async function () {
 			const res = await getWxConfig({})
 			const href = window.location.href
-			// const href = 'https://tianzong.info666.com/'
 			window.location.href =
 				`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${res.wxConfig.appId}&redirect_uri=${encodeURIComponent(href)}` + `&response_type=code&scope=snsapi_userinfo&state=STATE&connect_redirect=1#wechat_redirect`;
 		}