冲突

commont/messages.js

@@ -479,7 +479,7 @@ export default {
 			Shelflife: "Shelf life",
 			Suitableobject: "Suitable object",
 			Customer: "Customer service",
-			Shopping: "Shopping cart",
+			Shopping: "Shopping",
 			follow: "follow",
 			notification: "Notice of arrival",
 			Sele: "Select",
@@ -1058,7 +1058,7 @@ export default {
 			Shelflife: "Periodo di validità",
 			Suitableobject: "Adatto agli oggetti",
 			Customer: "servizio",
-			Shopping: "Carrelli per acquisti",
+			Shopping: "per acquisti",
 			follow: "attenzione",
 			notification: "Notifica di ricevimento",
 			Sele: "scelta",

components/kj-flow/kj-flow.vue

@@ -72,6 +72,18 @@ color: #666666;">{{item.name_ita}}</view>
 			goodstype: {
 				typeof: '',
 				default: "normal"
+			},
+			leftchangea: {
+				type: String,
+				default: ''
+			},
+			rightchangea: {
+				type: String,
+				default: ''
+			},
+			typeida: {
+				type: String,
+				default: ''
 			}
 		},
 		name: "kj-flow",
@@ -87,6 +99,7 @@ color: #666666;">{{item.name_ita}}</view>
 				dateid: '',
 				unit_price: '',
 				language: 'zh-CN',
+				typeid: ''
 			};
 		},
 		created() {
@@ -115,7 +128,6 @@ color: #666666;">{{item.name_ita}}</view>
 					this.containerList = res
 					this.estimated_arrived_date = res[0].estimated_arrived_date
 					this.dateid = res[0].id
-					this.rightname = res[0].name
 					if (this.language == 'en-US') {
 						this.rightname = res[0].name_en
 					}
@@ -137,7 +149,15 @@ color: #666666;">{{item.name_ita}}</view>
 			transport() {
 				uni.$u.http.get('/api/transport-type').then((res) => {
 					this.transportList = res
-					this.container(res[0].id)
+					if (this.typeida) {
+						console.log(this.typeida);
+						this.leftchange = this.leftchangea
+						this.rightchange = this.rightchangea
+						this.container(this.typeida)
+						this.typeid = this.transportList[0].id
+					} else {
+						this.container(res[0].id)
+					}
 				}).catch(() => {
 
 				})
@@ -146,7 +166,10 @@ color: #666666;">{{item.name_ita}}</view>
 			//左边切换
 			changea(item, index) {
 				this.leftchange = index
+				this.typeid = item.id
 				this.container(item.id)
+				this.rightname = '',
+				this.dateid = ''
 				if (this.language == 'en-US') {
 					this.leftname = item.name_en
 				}
@@ -164,6 +187,7 @@ color: #666666;">{{item.name_ita}}</view>
 			},
 			//右边切换
 			change(item, idx) {
+				
 				this.rightchange = idx
 				this.dateid = item.id
 				if (this.language == 'en-US') {
@@ -192,7 +216,10 @@ color: #666666;">{{item.name_ita}}</view>
 						dateid: this.dateid,
 						rightname: this.rightname,
 						leftname: this.leftname,
-						unit_price: this.unit_price
+						unit_price: this.unit_price,
+						leftchange: this.leftchange,
+						rightchange: this.rightchange,
+						typeid: this.typeid
 					})
 				}
 

pageA/productdetails.vue

@@ -410,7 +410,7 @@
 				<view class="button" @click="close" style="background: #fff; color: #555555; margin-top: 58rpx">
 					{{ i18n.Cancel }}
 				</view>
-			</view>  
+			</view>
 		</u-popup>
 
 		<u-popup :show="imagea" bgColor=" rgba(244, 244, 244, 0);" mode="center"
@@ -423,14 +423,13 @@
 		</u-popup>
 		<l-painter custom-style="position: fixed; left: 200%" ref="poster"
 			css="width: 538rpx; height:900rpx; background: #fff;padding:24rpx">
-			<l-painter-image
-				src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
-				css="width: 490rpx; height: 490rpx" />
+			<l-painter-image :src="goodinfo.image" css="width: 490rpx; height: 490rpx" />
 			<l-painter-text text="¥" css=" padding-top: 20rpx;color:#F83224;" />
 			<l-painter-text :text="goodinfoyuan"
 				css="text-align:center; padding-top: 20rpx;color:#F83224; font-size: 26rpx" />
-			<l-painter-text :text="goodinfoname" css=" padding-top: 20rpx;" />
-			<l-painter-qrcode text="limeui.qcoon.cn"
+				
+			<l-painter-text :text="goodinfoname" css=" padding-top: 20rpx;display:block" />
+			<l-painter-qrcode text="https://cbec.hdlkeji.com/cbec/pageA/productdetails"
 				css="width: 132rpx; height: 132rpx;margin-top:44rpx;margin-left:174rpx" />
 			<l-painter-text text="长按识别查看" css=" padding-top: 20rpx;text-align:center;display:block;color:#777777" />
 		</l-painter>
@@ -578,8 +577,20 @@
 					console.log('picture2', this.picture2);
 				}
 			})
+
 		},
 		methods: {
+			//分享
+			onShareAppMessage(res) {
+				if (res.from === "button") {
+					// 来自页面内分享按钮
+					console.log(res.target);
+				}
+				return {
+					title: '自定义分享标题',
+					path: '/pageA/productdetails?id=' + this.id
+				};
+			},
 			//保存到手机相册
 			saveImage() {
 				var that = this
@@ -712,7 +723,7 @@
 					.catch(() => {});
 			},
 			scrollToPosition(e) {
-				var that = this  
+				var that = this
 				this.current = e.index;
 				console.log(this.current);
 				this.$nextTick(() => {

pageB/Senderinfor.vue

@@ -87,6 +87,29 @@
 			})
 		},
 		methods: {
+			addadress() {
+				const obj = {
+					mobile: this.model1.userInfo.phone,
+					name: this.model1.userInfo.name,
+					is_default: this.model1.userInfo.is_default ? 1 : 0,
+					company_name: this.model1.userInfo.company,
+					address: this.model1.userInfo.detailed,
+					country_id: this.model1.userInfo.country_id,
+				};
+				uni.$u.http
+					.post(`/api/address`, {
+						...obj,
+						...this.cityPid
+					})
+					.then((res) => {
+						console.log(res);
+						uni.navigateBack({
+							delta: 1,
+						});
+					})
+					.catch(() => {});
+			},
+
 			checkboxChange(n) {
 				console.log('change', n);
 			}

pageB/delivery.vue

@@ -17,7 +17,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 @click.stop="changeadd" src="/static/express/change.png"
+						<!-- 						<image @click.stop="changeadd" src="/static/express/change.png"
 							style='width: 40rpx;;height:40rpx ;' mode="">
 						</image> -->
 					</view>
@@ -28,7 +28,7 @@
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<!-- <view v-else class="u-row-between " style="" @click="send"> -->
-						<view v-else class="u-row-between " style="" >
+						<view v-else class="u-row-between " style="">
 							<view class="">
 								<text class="topname">{{topadd.name}}</text>
 								<text class="topaddress"
@@ -37,7 +37,7 @@
 							<view class="topaddress" style="margin-top: 14rpx;">{{topadd.full_address}}</view>
 						</view>
 						<!-- <view class="u-flex" @click.stop="addbook(0)"> -->
-			<!-- 			<view class="u-flex">
+						<!-- 			<view class="u-flex">
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view> -->
@@ -57,7 +57,7 @@
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informat}}</view>
 						</view>
 						<!-- <view v-else class="u-row-between " style="" @click="send"> -->
-						<view v-else class="u-row-between " style="" >
+						<view v-else class="u-row-between " style="">
 							<view class="">
 								<text class="topname">{{bottomadd.name}}</text>
 								<text class="topaddress"
@@ -66,7 +66,7 @@
 							<view class="topaddress" style="margin-top: 14rpx;">{{bottomadd.full_address}}</view>
 						</view>
 						<!-- <view class="u-flex" @click.stop="addbook(1)"> -->
-			<!-- 			<view class="u-flex" >
+						<!-- 			<view class="u-flex" >
 							<view class="" style="color: rgba(151, 151, 151, 1);">|</view>
 							<text class="right">{{i18n.addressbook}}</text>
 						</view> -->
@@ -98,7 +98,7 @@
 				</view>
 				<!-- 跨境物流 -->
 				<!-- <view class="info u-flex u-row-between" @click="changewu"> -->
-				<view class="info u-flex u-row-between" >
+				<view class="info u-flex u-row-between">
 					<view class="u-flex">
 						<text class="wupin">{{i18n.flow}}</text>
 					</view>
@@ -125,7 +125,7 @@
 							</u-checkbox>
 						</u-checkbox-group>
 						<text>{{i18n.readandagree}}</text>
-						<text style="color: rgba(248, 50, 36, 1);">《{{i18n.International}}》</text>
+						<text style="color: rgba(248, 50, 36, 1);" @click="transport">《{{i18n.International}}》</text>
 					</view>
 				</view>
 				<view class="tonext " style="" @click="next">
@@ -135,8 +135,8 @@
 		</view>
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow ref="child" :goodstype="goodinfo.goodtype" :province_id='bottomadd.province_id' @success='success'
-					@close='logshow=false'></kj-flow>
+				<kj-flow ref="child" :goodstype="goodinfo.goodtype" :province_id='bottomadd.province_id'
+					@success='success' @close='logshow=false'></kj-flow>
 			</view>
 		</u-popup>
 	</view>
@@ -158,7 +158,7 @@
 				container_id: '',
 				unit_price: '',
 				number: '',
-				all:0
+				all: 0
 			}
 		},
 		onLoad(options) {
@@ -183,6 +183,14 @@
 			},
 		},
 		methods: {
+			//协议
+			transport() {
+				uni.$u.http.get('/api/agreement?code=international_express_service').then((res) => {
+					console.log(res);
+				}).catch(() => {
+
+				})
+			},
 			//跨境物流选择
 			success(msg) {
 				this.logshow = false
@@ -278,7 +286,7 @@
 								this.topadd)) + "&bottom=" + encodeURIComponent(JSON.stringify(this.bottomadd)) +
 							'&leftname=' + this
 							.leftname + "&rightname=" + this.rightname + "&container_id=" + this.container_id +
-							"&unit_price=" + this.unit_price + '&all=' +this.all
+							"&unit_price=" + this.unit_price + '&all=' + this.all
 					})
 				}
 			}

pageB/recipientinfo.vue

@@ -66,7 +66,7 @@
 					</view>
 					<text class="clear">{{i18n.addressBook}}</text>
 				</view>
-				<text class="clear">
+				<text class="clear" @click="clear">
 					{{i18n.empty}}
 				</text>
 			</view>
@@ -102,10 +102,47 @@
 				detailed: "",
 				email: "",
 				companyName: "",
-				is_default:0
+				is_default: 0
 			};
 		},
+		onLoad(options) {
+			if (options.id) {
+				this.addressId = options.id;
+				this.getAddressDetail(options.id);
+			}
+		},
 		methods: {
+			//回显数据
+			getAddressDetail(id) {
+				uni.$u.http.get(`/api/address/${id}`).then((res) => {
+					console.log(res);
+					this.cityname = res.province_name;
+					this.name = res.name;
+					this.phone = res.mobile;
+					this.detailed = res.address;
+					this.companyName = res.company_name;
+					this.is_default = res.is_default;
+					this.addname = res.country_name;
+					this.email = res.email;
+					this.addid = res.country_id;
+					this.cityid = res.province_id;
+					this.postalCode = res.zip_code;
+				});
+			},
+			clear() {
+				this.phone = ''
+				this.name = ''
+				this.addid = ''
+				this.cityid = ''
+				this.detailed = ''
+				this.companyName = ''
+				this.email = ''
+				this.postalCodee = ''
+				this.is_default = ''
+				this.checkboxValue1 = []
+				this.cityname = ''
+				this.addname = ''
+			},
 			//确定
 			submit() {
 				const obj = {
@@ -117,10 +154,29 @@
 					company_name: this.companyName,
 					email: this.email,
 					zip_code: this.postalCodee,
-					is_default:this.is_default
+					is_default: this.is_default
 				};
+				if (this.addressId) {
+					uni.$u.http.put(`/api/address/${this.addressId}`, obj).then((res) => {
+						const eventchannel = this.getOpenerEventChannel();
+						eventchannel.emit('bottomadd', res)
+						uni.navigateBack()
+					});
+				} else {
+					uni.$u.http.post(`/api/address`, obj).then((res) => {
+						const eventchannel = this.getOpenerEventChannel();
+						eventchannel.emit('bottomadd', res)
+						uni.navigateBack()
+						// console.log(res);
+						// this.$router.back();
+					});
+				}
+
 				uni.$u.http.post(`/api/address`, obj).then((res) => {
-					console.log(res);
+					const eventchannel = this.getOpenerEventChannel();
+					eventchannel.emit('bottomadd', res)
+					uni.navigateBack()
+					// console.log(res);
 					// this.$router.back();
 				});
 			},
@@ -148,9 +204,9 @@
 			},
 			checkboxChange(n) {
 				console.log('change', n);
-				if(n.length>0){
+				if (n.length > 0) {
 					this.is_default = 1
-				}else{
+				} else {
 					this.is_default = 0
 				}
 			},

pageC/addEditAddress/addEditAddress.vue

@@ -160,6 +160,7 @@ export default {
   },
   onLoad(options) {
     if (options.id) {
+		console.log(options.id);
       this.addressId = options.id;
       this.getAddressDetail(options.id);
     }
@@ -181,6 +182,8 @@ export default {
           .put(`/api/address/${this.addressId}`, { ...obj, ...this.cityPid })
           .then((res) => {
             console.log(res);
+			const eventchannel = this.getOpenerEventChannel();
+			eventchannel.emit('topadd', res)
             uni.navigateBack({
               delta: 1,
             });
@@ -190,7 +193,9 @@ export default {
         uni.$u.http
           .post(`/api/address`, { ...obj, ...this.cityPid })
           .then((res) => {
-            console.log(res);
+            // console.log(res);
+			const eventchannel = this.getOpenerEventChannel();
+			eventchannel.emit('topadd', res)
             uni.navigateBack({
               delta: 1,
             });

pages/express/express.vue

@@ -63,7 +63,7 @@
 							<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 v-else class="u-row-between " style="" @click="recipirnt">
 							<view class="">
 								<text class="topname">{{bottomadd.name}}</text>
 								<text class="topaddress"
@@ -112,7 +112,9 @@
 					</view>
 				</view>
 				<view class="bottom u-flex u-row-between">
-					<button style="background-color: transparent;padding-left: 0 !important;padding-right: 0 !important;margin: 0 !important;" open-type="share" class="u-flex" >
+					<button
+						style="background-color: transparent;padding-left: 0 !important;padding-right: 0 !important;margin: 0 !important;"
+						open-type="share" class="u-flex">
 						<image src="../../static/express/share.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 						<text class="friend">{{i18n.share}}</text>
 					</button>
@@ -225,7 +227,7 @@
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
 				<kj-flow :goodstype="this.goodinfo.goodtype" ref="child" :province_id='province_id' @success='success'
-					@close='logshow=false'></kj-flow>
+					@close='logshow=false' :leftchangea = 'leftchange' :rightchangea='rightchange' :typeida='typeid'></kj-flow>
 			</view>
 		</u-popup>
 		<!-- <u-button @click="show = true">打开</u-button> -->
@@ -257,7 +259,10 @@
 				language: 'zh-CN',
 				goodinfo: {}, //物品信息
 				unit_price: '',
-				expressList: []
+				expressList: [],
+				leftchange:'',
+				rightchange:'',
+				typeid:'',
 			}
 		},
 		onLoad(options) {
@@ -362,6 +367,9 @@
 				this.container_id = msg.dateid
 				this.rightname = msg.rightname
 				this.unit_price = msg.unit_price
+				this.leftchange = msg.leftchange
+				this.rightchange = msg.rightchange
+				this.typeid = msg.typeid
 			},
 			//物流选择
 			changewu() {
@@ -479,14 +487,55 @@
 			},
 			//寄件人信息
 			send() {
-				uni.navigateTo({
-					url: '/pageB/Senderinfor'
-				})
+				var that = this
+				if (JSON.stringify(that.topadd) == '{}') {
+					uni.navigateTo({
+						url: '/pageC/addEditAddress/addEditAddress',
+						events: {
+							topadd: function(res) {
+								// console.log(res);
+								that.topadd = res
+							}
+						}
+					})
+				} else {
+					var that = this
+					uni.navigateTo({
+						url: '/pageC/addEditAddress/addEditAddress?id=' + that.topadd.id,
+						events: {
+							topadd: function(res) {
+								// console.log(res);
+								that.topadd = res
+							}
+						}
+					})
+				}
 			},
 			recipirnt() {
-				uni.navigateTo({
-					url: '/pageB/recipientinfo'
-				})
+				var that = this
+				if (JSON.stringify(that.bottomadd) == '{}') {
+					console.log(11111);
+					uni.navigateTo({
+						url: '/pageB/recipientinfo',
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res
+							}
+						}
+					})
+				} else {
+					console.log(22222222);
+					uni.navigateTo({
+						url: '/pageB/recipientinfo?id=' + that.bottomadd.id,
+						events: {
+							bottomadd: function(res) {
+								console.log(res);
+								that.bottomadd = res
+							}
+						}
+					})
+				}
 			},
 			close() {
 				this.logshow = false
@@ -512,9 +561,10 @@
 </script>
 
 <style lang="scss" scoped>
-	button{
-		border:0rpx solid rgba(0, 0, 0, 1) !important;
+	button {
+		border: 0rpx solid rgba(0, 0, 0, 1) !important;
 	}
+
 	page {
 		background-color: rgba(0, 0, 0, 0)
 	}
@@ -525,7 +575,7 @@
 		font-size: 26rpx;
 		color: #222222;
 		line-height: 36rpx;
-		text-align: right;
+		text-align: center;
 		font-style: normal;
 	}