跨境下单

components/kj-flow/kj-flow.vue

@@ -52,7 +52,8 @@ color: #666666;">{{item.name}}</view>
 				typeof: Number
 			},
 			goodstype: {
-				typeof: ''
+				typeof: '',
+				default:"normal"
 			}
 		},
 		name: "kj-flow",
@@ -65,7 +66,8 @@ color: #666666;">{{item.name}}</view>
 				estimated_arrived_date: '',
 				leftname: '',
 				rightname: '',
-				dateid: ''
+				dateid: '',
+				unit_price:''
 			};
 		},
 		computed: {
@@ -87,6 +89,7 @@ color: #666666;">{{item.name}}</view>
 					this.estimated_arrived_date = res[0].estimated_arrived_date
 					this.dateid = res[0].id
 					this.rightname = res[0].name
+					this.unit_price= res[0].unit_price
 				}).catch(() => {
 
 				})
@@ -105,13 +108,13 @@ color: #666666;">{{item.name}}</view>
 				this.leftchange = index
 				this.container(item.id)
 				this.leftname = item.name
-				console.log(this.leftchange);
 			},
 			//右边切换
 			change(item, idx) {
 				this.rightchange = idx
 				this.dateid = item.id
 				this.rightname = item.name
+				this.unit_price = item.unit_price
 			},
 			close() {
 				this.$emit('close')
@@ -123,7 +126,8 @@ color: #666666;">{{item.name}}</view>
 					this.$emit('success', {
 						dateid: this.dateid,
 						rightname: this.rightname,
-						leftname: this.leftname
+						leftname: this.leftname,
+						unit_price:this.unit_price
 					})
 				}
 

pageA/counter.vue

@@ -185,9 +185,9 @@ color: rgba(34, 34, 34, 0.5);">补充体积预估费用更精确</text>
 					params: {
 						container_id: this.container_id, //		是	String	货柜ID
 						weight: this.value, //		是	String	重量(kg)
-						length: 1, //		是	String	长(m)
-						width: 1, //		是	String	宽(m)
-						height: 1, //		是	String	高(m)
+						length: this.length, //		是	String	长(m)
+						width: this.width, //		是	String	宽(m)
+						height: this.height, //		是	String	高(m)
 						type: this.goodstype, //		是	String	商品类型: normal. 普通商品, special.特殊商品
 					}
 				}).then((res) => {

pageA/order.vue

@@ -322,7 +322,6 @@
 					url: '/pageC/addressManagement/addressManagement',
 					events: {
 						getadd(res) {
-							console.log(res);
 							that.addinfo = res
 							that.province_id = res.province_id
 							// console.log(res);

pageB/delivery.vue

@@ -17,16 +17,25 @@
 				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
-						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
+						<image @click.stop="changeadd" src="/static/express/change.png"
+							style='width: 40rpx;;height:40rpx ;' mode="">
 						</image>
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
-						<view class="u-row-between " style="">
+						<view v-if="JSON.stringify(topadd)==='{}'" class="u-row-between " style="">
 							<view class="pople">{{i18n.sender}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
-						<view class="u-flex">
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{topadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(topadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
+						</view>
+						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -41,11 +50,19 @@
 						</image>
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
-						<view class="u-row-between " style="">
+						<view v-if="JSON.stringify(bottomadd)==='{}'" class="u-row-between " style="">
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
-						<view class="u-flex">
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{bottomadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(bottomadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
+						</view>
+						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view>
@@ -54,26 +71,37 @@
 			</view>
 			<view class="wup">
 				<!-- 物品信息 -->
-				<view class="info u-flex u-row-between" @click='goods'>
+				<view class="info u-flex u-row-between">
 					<view class="u-flex">
 						<text class="wupin">{{i18n.item}}</text>
 						<view class="mast">{{i18n.required}}</view>
 					</view>
-					<view class="u-flex">
-						<text class="change">{{i18n.select}}</text>
+
+					<view v-if="JSON.stringify(goodinfo)==='{}'" class="u-flex" @click='goods'>
+						<view class="change">{{i18n.selection}}</view>
 						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
 							mode=""></image>
 					</view>
+					<view v-else class="goodname" @click='goods'>
+						{{goodinfo.goodname}},{{goodinfo.weight}}kg
+					</view>
+					<!-- <view class="u-flex">
+						<text class="change">{{i18n.select}}</text>
+						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
+							mode=""></image>
+					</view> -->
 				</view>
 				<!-- 跨境物流 -->
-				<view class="info u-flex u-row-between" @click="logshow=true">
+				<view class="info u-flex u-row-between" @click="changewu">
 					<view class="u-flex">
 						<text class="wupin">{{i18n.flow}}</text>
 					</view>
 					<view class="u-flex">
-						<text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text>
-						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
-							mode=""></image>
+						<text class="change"
+							style="color: rgba(248, 50, 36, 1);">{{leftname?leftname+' |  '+rightname : i18n.selection}}</text>
+						<!-- <text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text> -->
+						<image v-if="leftname==''" src="/static/express/next1.png"
+							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -82,7 +110,7 @@
 				<view class="" style="flex: 1;">
 					<view class="sum">
 						<text>{{i18n.Estimatedprice}}</text>
-						<text style="color: rgba(248, 50, 36, 1);">¥ - -</text>
+						<text style="color: rgba(248, 50, 36, 1);">¥{{all?all:'--'}}</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
 						<u-checkbox-group shape='circle' v-model="checkboxValue1" placement="column"
@@ -101,7 +129,8 @@
 		</view>
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow @success='success' @close='logshow=false'></kj-flow>
+				<kj-flow ref="child" :goodstype="this.goodinfo.goodtype" @success='success'
+					@close='logshow=false'></kj-flow>
 			</view>
 		</u-popup>
 	</view>
@@ -114,25 +143,108 @@
 				deal: -1,
 				checkboxValue1: [],
 				logshow: false, //物流选择
+				language: 'zh-CN',
+				goodinfo: {},
+				topadd: {},
+				bottomadd: {},
+				leftname: '',
+				rightname: '',
+				container_id: '',
+				unit_price: '',
+				number:''
 			}
 		},
 		onLoad(options) {
-
+			this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo))
+			this.topadd = JSON.parse(decodeURIComponent(options.topadd))
+			this.bottomadd = JSON.parse(decodeURIComponent(options.bottom))
+			this.leftname = options.leftname
+			this.rightname = options.rightname
+			this.container_id = options.container_id
+			this.unit_price = options.unit_price
+			this.number = options.number
+		},
+		onShow() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		computed: {
 			i18n() {
 				return this.$t('index')
+			},
+			all() {
+				return this.unit_price * this.goodinfo.weight * this.goodinfo.number
 			}
 		},
 		methods: {
-			close() {
-				this.logshow = true
+			//跨境物流选择
+			success(msg) {
+				this.logshow = false
+				this.leftname = msg.leftname
+				this.container_id = msg.dateid
+				this.rightname = msg.rightname
+				this.unit_price = msg.unit_price
+			},
+			//改变地址
+			changeadd() {
+				var a = {}
+				a = this.topadd
+				this.topadd = this.bottomadd
+				this.bottomadd = a
+				this.province_id = this.bottomadd.province_id
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+				}
+			},
+			//物流选择
+			changewu() {
+				if (this.province_id) {
+					this.logshow = true
+					setTimeout(() => {
+						this.$refs.child.transport();
+					}, 800)
+				} else {
+					this.$u.toast('请先选择城市')
+				}
+			},
+			//地址薄
+			addbook(index) {
+				var that = this
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					events: {
+						getadd(res) {
+							if (index == 0) {
+								that.topadd = res
+								console.log('topadd', that.topadd);
+							} else {
+								that.bottomadd = res
+								console.log('bottom', that.bottomadd);
+								that.province_id = that.bottomadd.province_id
+							}
+						}
+					}
+				})
 			},
+			//物品信息
 			goods() {
+				var that = this
 				uni.navigateTo({
-					url: '/pageB/goods'
+					url: '/pageB/goods',
+					events: {
+						goodinfo: function(res) {
+							that.goodinfo = res
+						}
+					}
 				})
 			},
+			close() {
+				this.logshow = true
+			},
 			send() {
 				uni.navigateTo({
 					url: '/pageB/Senderinfor'
@@ -147,15 +259,39 @@
 				console.log('change', n);
 			},
 			next() {
-				uni.navigateTo({
-					url: '/pageB/end'
-				})
+				if (this.checkboxValue1.length == 0) {
+					this.$u.toast('请勾选协议')
+				} else {
+					uni.navigateTo({
+						url: '/pageB/end'
+					})
+				}
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.topname {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #222222;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.topaddress {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #777777;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.pop {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
@@ -167,6 +303,7 @@
 		padding: 32rpx 28rpx 0 0;
 		box-sizing: border-box;
 	}
+
 	.sum {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;

pageB/end.vue

@@ -37,7 +37,7 @@
 						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>20件</text>
 					</view>
 					<view class="" style="margin-top: 20rpx;">
-						<text class="abouta">{{i18n.flow}}：</text>
+						<text class="abouta">{{i18n.flow}}:</text>
 						<text class="abouta" style='color:rgba(34, 34, 34, 1)'>{{i18n.Marinetank}}</text>
 					</view>
 				</view>
@@ -47,8 +47,7 @@
 				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
-						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
-						</image>
+						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">

pageB/goods.vue

@@ -6,30 +6,51 @@
 				<text class="title">{{i18n.item}}</text>
 				<view class="mast">{{i18n.required}}</view>
 			</view>
-			<!-- 			<view class="" style="margin-top: 30rpx;">
+			<view v-if="goodname" class="" style="margin-top: 30rpx;">
 				<view class="about u-flex"
 					style="color: rgba(248, 50, 36, 1);border: 2rpx solid rgba(248, 50, 36, 1);justify-content: center;">
-					<text style="margin-right: 18rpx;">文件</text>
-					<u-icon name="close" color="rgba(248, 50, 36, 1)" size="12"></u-icon>
+					<text style="margin-right: 18rpx;">{{goodname}}</text>
+					<u-icon name="close" color="rgba(248, 50, 36, 1)" size="12" @click="goodname=''"></u-icon>
 				</view>
-			</view> -->
+			</view>
 			<view class="">
 				<view class="info">填写准确的寄送物品可帮助您推荐更合适的产品</view>
 				<view class="input">
-					<input disabled type="text" placeholder="请输入物品名称" style="width: 100%;"  @click="tosearch"/>
+					<input disabled type="text" placeholder="请输入物品名称" style="width: 100%;" @click="tosearch" />
 				</view>
-				<view class="u-flex u-row-between" style="margin-top: 28rpx;flex-wrap: wrap;">
-					<view class="about" v-for="(item,idx) in 10">文件</view>
+				<view v-if="goodname==''" class="u-flex u-row-between" style="margin-top: 28rpx;flex-wrap: wrap;">
+					<view class="about" v-for="(item,idx) in goods" @click="activename(item)">
+						<text v-if="language =='zh-CN'">{{item.name_cn}}</text>
+						<text v-if="language =='en-US'">{{item.name_en}}</text>
+						<text v-if="language =='es-ES'">{{item.name_es}}</text>
+						<text v-if="language =='it-IT'">{{item.name_ita}}</text>
+					</view>
 				</view>
 			</view>
 		</view>
 		<view class="type  u-flex u-row-between">
-			<view class="">
+			<view class="u-flex">
 				<text class="title">{{i18n.shoptype}}</text>
+				<image src="../static/express/explain.png" style="width: 32rpx;height: 32rpx;margin-left: 10rpx;"
+					mode=""></image>
 			</view>
-			<view class="">
-				<text class="change">{{i18n.selection}}</text>
-				<image src="../static/express/next1.png" style="width: 26rpx;height: 26rpx;" mode=""></image>
+			<view class="u-flex">
+				<view class="u-flex" @click="type('normal')" style="margin-right: 24rpx;">
+					<image v-if="goodtype=='normal'" style="width: 24rpx;height: 24rpx;margin-right: 6rpx;"
+						src="../static/express/active.png" mode=""></image>
+					<image v-if="goodtype=='special'" style="width: 24rpx;height: 24rpx;margin-right: 6rpx;"
+						src="../static/express/noactive.png" mode=""></image>
+					<text class='special'>{{i18n.Normal}}</text>
+				</view>
+				<view class="u-flex" @click="type('special')">
+					<image v-if="goodtype=='special'" style="width: 24rpx;height: 24rpx;margin-right: 6rpx;"
+						src="../static/express/active.png" mode=""></image>
+					<image v-if="goodtype=='normal'" style="width: 24rpx;height: 24rpx;margin-right: 6rpx;"
+						src="../static/express/noactive.png" mode=""></image>
+					<text class='special'>{{i18n.special}}</text>
+				</view>
+				<!-- 				<text class="change">{{i18n.selection}}</text>
+				<image src="../static/express/next1.png" style="width: 26rpx;height: 26rpx;" mode=""></image> -->
 			</view>
 		</view>
 		<view class="abouta">
@@ -37,11 +58,17 @@
 				<view class="title">{{i18n.estimated}}</view>
 				<view class="">
 					<u-number-box v-model="value">
-						<view slot="minus" class="minus">
+						<view @click="changeweight" slot="minus" class="minus">
 							<u-icon name="minus" size="12"></u-icon>
 						</view>
-						<text slot="input" style="width: 150rpx;text-align: center;" class="inpu">{{value}}kg</text>
-						<view slot="plus" class="plus">
+						<!-- <text slot="input" style="width: 150rpx;text-align: center;" class="inpu">{{value}}kg</text> -->
+						<view slot="input" class="u-flex"
+							style="width: 150rpx;text-align: center;background: #f4f4f4;padding: 10rpx 20rpx;">
+							<input type="text" v-model="weight" />
+							<text>kg</text>
+							<!-- <text  class="inpu">{{value}}件</text> -->
+						</view>
+						<view @click="weight++" slot="plus" class="plus">
 							<u-icon name="plus" color="#000000" size="12"></u-icon>
 						</view>
 					</u-number-box>
@@ -52,11 +79,16 @@
 				<view class="title">{{i18n.piece}}</view>
 				<view class="">
 					<u-number-box v-model="value">
-						<view slot="minus" class="minus">
+						<view @click="changenumber" slot="minus" class="minus">
 							<u-icon name="minus" size="12"></u-icon>
 						</view>
-						<text slot="input" style="width: 150rpx;text-align: center;" class="inpu">{{value}}件</text>
-						<view slot="plus" class="plus">
+						<view slot="input" class="u-flex"
+							style="width: 150rpx;text-align: center;background: #f4f4f4;padding: 10rpx 20rpx;">
+							<input type="text" v-model="number" />
+							<text>件</text>
+							<!-- <text  class="inpu">{{value}}件</text> -->
+						</view>
+						<view @click="number++" slot="plus" class="plus">
 							<u-icon name="plus" color="#000000" size="12"></u-icon>
 						</view>
 					</u-number-box>
@@ -70,7 +102,7 @@
 			</view>
 		</view>
 		<view class="btn">
-			<view class="button">{{i18n.enter}}</view>
+			<view class="button" @click="enter">{{i18n.enter}}</view>
 		</view>
 	</view>
 </template>
@@ -79,7 +111,14 @@
 	export default {
 		data() {
 			return {
-				value: 1
+				value: 1,
+				goods: [],
+				language: 'zh-CN',
+				goodname: '',
+				number: 1,
+				weight: 1,
+				goodid: '', //物品信息id
+				goodtype: 'normal', //商品类型
 			};
 		},
 		computed: {
@@ -87,15 +126,97 @@
 				return this.$t('index')
 			}
 		},
+		onLoad() {
+			this.getgoods()
+		},
 		onShow() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 			uni.setNavigationBarTitle({
 				title: this.i18n.item
 			})
 		},
-		methods:{
-			tosearch(){
+		methods: {
+			enter() {
+				if (this.goodid == '') {
+					this.$u.toast('请选择邮寄物品')
+					return
+				}
+				if (this.goodtype == '') {
+					this.$u.toast('请选择物品类型')
+					return
+				}
+				const eventchannel = this.getOpenerEventChannel();
+				eventchannel.emit('goodinfo', {
+					goodid: this.goodid,
+					goodtype: this.goodtype,
+					goodname: this.goodname,
+					number: this.number,
+					weight: this.weight
+				})
+				uni.navigateBack()
+			},
+			changeweight() {
+				if (this.weight == 1) {
+					this.$u.toast('重量不能小于1')
+				} else {
+					this.weight--
+				}
+			},
+			changenumber() {
+				if (this.number == 1) {
+					this.$u.toast('数量不能小于1')
+				} else {
+					this.number--
+				}
+			},
+			//商品类型
+			type(type) {
+				this.goodtype = type
+			},
+			//选中哪个物品
+			activename(item) {
+				if (this.language == 'zh-CN') {
+					this.goodname = item.name_cn
+				} else if (this.language == 'en-US') {
+					this.goodname = item.name_en
+				} else if (this.language == 'es-ES') {
+					this.goodname = item.name_es
+				} else if (this.language == 'it-IT') {
+					this.goodname = item.name_ita
+				}
+				this.goodid = item.id
+			},
+			getgoods() {
+				uni.$u.http.get('/api/express-goods-info', {
+					params: {
+						is_hot: 1
+					}
+				}).then((res) => {
+					this.goods = res
+				}).catch(() => {
+
+				})
+			},
+			tosearch() {
+				var that = this
 				uni.navigateTo({
-					url:"/pageB/search"
+					url: "/pageB/search",
+					events:{
+						searchinfo:function(res){
+							if (that.language == 'zh-CN') {
+								that.goodname = res.name_cn
+							} else if (that.language == 'en-US') {
+								that.goodname = res.name_en
+							} else if (that.language == 'es-ES') {
+								that.goodname = res.name_es
+							} else if (that.language == 'it-IT') {
+								that.goodname = res.name_ita
+							}
+							that.goodid = res.id
+						}
+					}
 				})
 			}
 		}
@@ -103,6 +224,16 @@
 </script>
 
 <style lang="scss" scoped>
+	.special {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #444444;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.minus {
 		width: 22px;
 		height: 22px;

pageB/search.vue

@@ -3,7 +3,7 @@
 		<!-- 搜索 -->
 		<view class="u-flex u-row-between">
 			<view class="" style="width: 622rpx;">
-				<u-search @blur='blur' @focus='focus' @click="search" placeholder="请输入物品名称" v-model="keyword"
+				<u-search  @focus='focus' placeholder="请输入物品名称" v-model="keyword"
 					:showAction='false'></u-search>
 			</view>
 			<text @click="clear" v-if="keyword==''">{{i18n.Cancel}}</text>
@@ -13,22 +13,31 @@
 			{{i18n.Popularshipment}}
 		</view>
 		<view v-if="blurshow==false && keyword==''" class="u-flex " style="column-gap: 20rpx;flex-wrap: wrap;">
-			<view class="tabs" v-for="(item,idx) in 8" :key="idx" @click="select">
-				行李
+			<view class="tabs" v-for="(item,idx) in record" :key="idx" @click="select(item)">
+				{{item}}
 			</view>
 		</view>
-		<scroll-view  v-if="blurshow && keyword" :scroll-y='true'>
-			<view class="searchitem" v-for="(item,index) in 6">草莓</view>
+		<scroll-view v-if="blurshow" :scroll-y='true'>
+			<view @click="changeitem(item)" class="searchitem" v-for="(item,index) in goods">
+				<text v-if="language =='zh-CN'">{{item.name_cn}}</text>
+				<text v-if="language =='en-US'">{{item.name_en}}</text>
+				<text v-if="language =='es-ES'">{{item.name_es}}</text>
+				<text v-if="language =='it-IT'">{{item.name_ita}}</text>
+			</view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+import { vShow } from 'vue';
 	export default {
 		data() {
 			return {
 				keyword: '',
 				blurshow: false, //是否显示热门寄件
+				language: 'zh-CN',
+				goods: [], //物品信息
+				record: [], //历史记录
 			};
 		},
 		computed: {
@@ -36,39 +45,75 @@
 				return this.$t('index')
 			}
 		},
+		onLoad() {
+			this.getgoods()
+		},
+		onShow() {
+			this.record = uni.getStorageSync('record')? uni.getStorageSync('record').reverse() : []
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+		},
 		methods: {
+			//选中标签
+			changeitem(item) {
+				// console.log(item);
+				const eventchannel = this.getOpenerEventChannel();
+				eventchannel.emit('searchinfo', item)
+				uni.navigateBack()
+			},
+			//获取物品信息列表
+			getgoods() {
+				uni.$u.http.get('/api/express-goods-info', {
+					params: {
+						// is_hot: 0,
+						name: this.keyword
+					}
+				}).then((res) => {
+					this.goods = res
+				}).catch(() => {
+
+				})
+			},
 			//取消
 			clear() {
 				uni.navigateBack()
 			},
 			enter() {
-
+				console.log(this.record);
+				this.record.push(this.keyword)
+				
+				uni.setStorageSync('record',this.record)
+				this.getgoods()
 			},
 			search() {
 
 			},
-			// 失去焦点
-			blur() {
-				this.blurshow = false
-			},
+			// // 失去焦点
+			// blur() {
+			// 	this.blurshow = false
+			// },
 			//获取焦点
 			focus() {
 				this.blurshow = true
 			},
 			//选中
-			select() {
-
+			select(name) {
+				this.keyword = name
+				this.blurshow = true
+				this.getgoods()
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.searchitem{
+	.searchitem {
 		height: 98rpx;
 		border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
 		line-height: 98rpx;
 	}
+
 	.title {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;

pages/express/express.vue

@@ -26,21 +26,23 @@
 				<view class="left u-flex" style="display: flex;">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="../../static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
-						<image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
+						<image @click="changeadd" src="../../static/express/change.png"
+							style='width: 40rpx;;height:40rpx ;' mode="">
 						</image>
 					</view>
 					<view class=" u-row-between left"
 						style="flex: 1;margin-left: 28rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08) ;display: flex;">
-						<!-- 						<view class="u-row-between " style="" @click="send">
+						<view v-if="JSON.stringify(topadd)==='{}'" class="u-row-between " style="" @click="send">
 							<view class="pople">{{i18n.sender}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
-						</view> -->
-						<view class="u-row-between " style="" @click="send">
+						</view>
+						<view v-else class="u-row-between " style="" @click="send">
 							<view class="">
-								<text class="topname">陈盼盼</text>
-								<text class="topaddress" style="margin-left: 8rpx;">134****8314</text>
+								<text class="topname">{{topadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(topadd.mobile)}}</text>
 							</view>
-							<view class="topaddress" style="margin-top: 14rpx;">上海市上海市浦东新区商城路1177弄5号</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
 						<view class="u-flex" @click.stop="addbook(0)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
@@ -56,10 +58,19 @@
 						</image>
 					</view>
 					<view class=" u-row-between left" style="flex: 1;margin-left: 28rpx;display: flex;">
-						<view class="u-row-between " style="" @click="recipirnt">
+						<view v-if="JSON.stringify(bottomadd)==='{}'" class="u-row-between " style=""
+							@click="recipirnt">
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
+						<view v-else class="u-row-between " style="" @click="send">
+							<view class="">
+								<text class="topname">{{bottomadd.name}}</text>
+								<text class="topaddress"
+									style="margin-left: 8rpx;">{{replacePhoneToStar(bottomadd.mobile)}}</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
+						</view>
 						<view class="u-flex" @click.stop="addbook(1)">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
@@ -72,20 +83,25 @@
 						<text class="wupin">{{i18n.item}}</text>
 						<view class="mast">{{i18n.required}}</view>
 					</view>
-					<view class="u-flex" @click='goods'>
+					<view v-if="JSON.stringify(goodinfo)==='{}'" class="u-flex" @click='goods'>
 						<view class="change">{{i18n.selection}}</view>
 						<image src="../../static/express/next1.png"
 							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
+					<view v-else class="goodname" @click='goods'>
+						{{goodinfo.goodname}},{{goodinfo.weight}}kg
+					</view>
 				</view>
 				<!-- 跨境物流 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
 						<text class="wupin">{{i18n.flow}}</text>
 					</view>
-					<view class="u-flex" @click="logshow=true">
-						<text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text>
-						<image src="../../static/express/next1.png"
+					<view class="u-flex" @click="changewu">
+						<!-- <text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text> -->
+						<text class="change"
+							style="color: rgba(248, 50, 36, 1);">{{leftname?leftname+' |  '+rightname : i18n.selection}}</text>
+						<image v-if="leftname==''" src="../../static/express/next1.png"
 							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
 					</view>
 				</view>
@@ -202,11 +218,12 @@
 		</view>
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow @success='success' @close='logshow=false'></kj-flow>
+				<kj-flow :goodstype="this.goodinfo.goodtype" ref="child" :province_id='province_id' @success='success'
+					@close='logshow=false'></kj-flow>
 			</view>
 		</u-popup>
 		<!-- <u-button @click="show = true">打开</u-button> -->
-		<view class="" style="height: 160rpx;"></view>
+		<!-- <view class="" style="height: 160rpx;"></view> -->
 		<kj-tabbar :value1=0></kj-tabbar>
 	</view>
 </template>
@@ -227,6 +244,13 @@
 				overseas: 0, //正发往海外
 				topadd: {}, //新建寄件人
 				bottomadd: {}, //新建收件人
+				province_id: '',
+				leftname: '',
+				rightname: '',
+				container_id: '', //货柜列表
+				language: 'zh-CN',
+				goodinfo: {}, //物品信息
+				unit_price:'',
 			}
 		},
 		onLoad(options) {
@@ -243,6 +267,9 @@
 				title: this.i18n.setup
 			})
 			this.express() //获取包裹数量
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		computed: {
 			i18n() {
@@ -250,18 +277,53 @@
 			}
 		},
 		methods: {
+			//跨境物流选择
+			success(msg) {
+				this.logshow = false
+				this.leftname = msg.leftname
+				this.container_id = msg.dateid
+				this.rightname = msg.rightname
+				this.unit_price = msg.unit_price
+			},
+			//物流选择
+			changewu() {
+				if (this.province_id) {
+					this.logshow = true
+					setTimeout(() => {
+						this.$refs.child.transport();
+					}, 800)
+				} else {
+					this.$u.toast('请先选择城市')
+				}
+			},
+			//改变地址
+			changeadd() {
+				var a = {}
+				a = this.topadd
+				this.topadd = this.bottomadd
+				this.bottomadd = a
+				this.province_id = this.bottomadd.province_id
+			},
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+				}
+			},
 			//地址薄
 			addbook(index) {
+				var that = this
 				uni.navigateTo({
 					url: "/pageC/addressManagement/addressManagement?index=" + index,
 					events: {
 						getadd(res) {
 							if (index == 0) {
-								this.topadd = res
-								console.log('topadd',this.topadd);
+								that.topadd = res
+								console.log('topadd', that.topadd);
 							} else {
-								this.bottomadd = res
-								console.log('bottom',this.bottomadd);
+								that.bottomadd = res
+								console.log('bottom', that.bottomadd);
+								that.province_id = that.bottomadd.province_id
 							}
 						}
 					}
@@ -280,7 +342,12 @@
 			},
 			todev() {
 				uni.navigateTo({
-					url: "/pageB/delivery"
+					url: "/pageB/delivery?goodinfo=" + encodeURIComponent(JSON.stringify(this.goodinfo)) +
+						"&topadd=" + encodeURIComponent(JSON.stringify(
+							this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this.bottomadd)) +
+						'&leftname=' + this
+						.leftname + "&rightname=" + this.rightname + "&container_id=" + this.container_id +
+						"&unit_price=" + this.unit_price
 				})
 			},
 			count() {
@@ -318,8 +385,14 @@
 			},
 			//物品信息
 			goods() {
+				var that = this
 				uni.navigateTo({
-					url: '/pageB/goods'
+					url: '/pageB/goods',
+					events: {
+						goodinfo: function(res) {
+							that.goodinfo = res
+						}
+					}
 				})
 			},
 			//寄件人信息
@@ -333,9 +406,6 @@
 					url: '/pageB/recipientinfo'
 				})
 			},
-			success() {
-				this.logshow = false
-			},
 			close() {
 				this.logshow = false
 			},
@@ -364,6 +434,16 @@
 		background-color: rgba(0, 0, 0, 0)
 	}
 
+	.goodname {
+		font-family: SFPro, SFPro;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #222222;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.topname {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;