冲突

commont/messages.js

@@ -121,7 +121,7 @@ export default {
 			enter: "确定",
 			shoptype: "商品类型",
 			estimated: "预估重量",
-			piece: "件数",
+			piece: "件",
 			rule: "了解计费规则",
 			Starting: "起始地",
 			destination: "目的地",

pageA/productdetails.vue

@@ -18,10 +18,10 @@
 				</view> -->
 				</view>
 				<view class="u-nav-slot u-flex" slot="right" style="display: flex">
-					<view class="" style="margin-left: 184rpx" @click="sharea">
+					<view class="" style="" @click="sharea">
 						<image src="static/images/share.png" style="width: 38rpx; height: 38rpx" mode=""></image>
 					</view>
-					<view class="" style="width: 180rpx"></view>
+					<view class="" style="width: 200rpx"></view>
 				</view>
 			</u-navbar>
 			<!-- 商品图片 -->
@@ -45,7 +45,7 @@
               i18n.Discounted
             }}</text>
 						<text class="money">¥</text>
-						<text class="money" style="font-size: 48rpx">{{
+						<text v-if="goodinfo.discount_price" class="money" style="font-size: 48rpx">{{
               goodinfo.is_discount == 0
                 ? goodinfo.discount_price.slice(0, -3)
                 : goodinfo.price.slice(0, -3)
@@ -320,9 +320,10 @@
 					<view class="title1" style="margin-top: 40rpx; margin-bottom: 32rpx">
 						{{ item.name }}
 					</view>
-					<view class="u-flex" style="column-gap: 18rpx; flex-wrap: wrap">
-						<view class="" :class="selectArr[index] == child ? 'acttab' : 'tabs'"
-							v-for="(child, idx) in item.values" :key="idx" @click="actabs(index, child, item)">
+					<view class="u-flex" style=" flex-wrap: wrap">
+						<view style="margin-right: 18rpx;" class=""
+							:class="selectArr[index] == child ? 'acttab' : 'tabs'" v-for="(child, idx) in item.values"
+							:key="idx" @click="actabs(index, child, item)">
 							{{ child }}
 						</view>
 					</view>
@@ -427,9 +428,9 @@
 			<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;display:block" />
-			<l-painter-qrcode text="https://cbec.hdlkeji.com/cbec/pageA/productdetails"
+			<l-painter-qrcode :text="'https://cbec.hdlkeji.com/cbec?id='+id"
 				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>
@@ -551,13 +552,25 @@
 		},
 		computed: {
 			i18n() {
-
 				return this.$t("index");
 			},
 		},
 		onLoad(options) {
-			this.id = options.id;
-			this.comment();
+			if (options.q && options.q != "undefined") {
+				// 获取到二维码原始链接内容
+				const qrUrl = decodeURIComponent(options.q)
+				console.log(qrUrl);
+				//此处就是我们要获取的参数 json，通过方法解析
+				let jsonUrl = methods.GetwxUrlParam(qrUrl);
+				//比如我要得到id的值，直接取值即可
+				let id = jsonUrl.id;
+				this.id = id;
+				this.comment();
+				console.log("巡逻点ID：" + id);
+			} else {
+				this.id = options.id;
+				this.comment();
+			}
 		},
 		onShow() {
 			if (uni.getStorageSync("language") != "") {
@@ -580,6 +593,24 @@
 
 		},
 		methods: {
+			//解析链接地址
+			GetwxUrlParam(url) {
+				let theRequest = {};
+				if (url.indexOf("#") != -1) {
+					const str = url.split("#")[1];
+					const strs = str.split("&");
+					for (let i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
+					}
+				} else if (url.indexOf("?") != -1) {
+					const str = url.split("?")[1];
+					const strs = str.split("&");
+					for (let i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
+					}
+				}
+				return theRequest;
+			},
 			//分享
 			onShareAppMessage(res) {
 				if (res.from === "button") {
@@ -594,7 +625,6 @@
 			//保存到手机相册
 			saveImage() {
 				var that = this
-				console.log('this.picture2.slice,-1)', this.picture2.slice(23));
 				var fileManager = uni.getFileSystemManager();
 				fileManager.writeFile({
 					filePath: wx.env.USER_DATA_PATH + '/img.jpg', // 指定图片的临时路径

pageB/ParcelExpress.vue

@@ -265,15 +265,37 @@
 					return 
 				}
 				var that = this
-				uni.navigateTo({
-					url: '/pageB/goods',
-					events: {
-						goodinfo: function(res) {
-							that.goodinfo = res
-							that.calculate()
+				if (JSON.stringify(this.goodinfo) == '{}') {
+					uni.navigateTo({
+						url: '/pageB/goods',
+						events: {
+							goodinfo: function(res) {
+								that.goodinfo = res
+								that.calculate()
+							}
 						}
-					}
-				})
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageB/goods?goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo)),
+						events: {
+							goodinfo: function(res) {
+								that.goodinfo = res
+								console.log(res);
+								that.calculate()
+							}
+						}
+					})
+				}
+				// uni.navigateTo({
+				// 	url: '/pageB/goods',
+				// 	events: {
+				// 		goodinfo: function(res) {
+				// 			that.goodinfo = res
+				// 			that.calculate()
+				// 		}
+				// 	}
+				// })
 			},
 			//寄件人信息
 			send() {

pageB/delivery.vue

@@ -116,7 +116,8 @@
 				<view class="" style="flex: 1;">
 					<view class="sum">
 						<text>{{i18n.Estimatedprice}}</text>
-						<text style="color: rgba(248, 50, 36, 1);">¥{{all?all:'--'}}</text>
+						<text style="color: rgba(248, 50, 36, 1);font-size: 26rpx;">¥</text>
+						<text style="color: rgba(248, 50, 36, 1);font-size: 36rpx;font-weight: 600;">{{all?all:'--'}}</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
 						<u-checkbox-group shape='circle' v-model="checkboxValue1" placement="column"
@@ -125,7 +126,7 @@
 							</u-checkbox>
 						</u-checkbox-group>
 						<text>{{i18n.readandagree}}</text>
-						<text style="color: rgba(248, 50, 36, 1);" @click="transport">《{{i18n.International}}》</text>
+						<text style="color: rgba(248, 50, 36, 1);" @click="internationalshowa">《{{i18n.International}}》</text>
 					</view>
 				</view>
 				<view class="tonext " style="" @click="next">
@@ -139,6 +140,17 @@
 					@success='success' @close='logshow=false'></kj-flow>
 			</view>
 		</u-popup>
+		<u-popup :show="internationalshow" :round="20" @close="close()" :closeable='true'>
+			<view style="
+		  padding: 48rpx 24rpx;
+		  box-sizing: border-box;
+		  position: relative;
+		  border-radius: 20rpx 20rpx 0 0;
+		">
+				<view class="" style="text-align: center;font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx;">{{contenttitle}}</view>
+				<u-parse :content="content"></u-parse>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -158,7 +170,10 @@
 				container_id: '',
 				unit_price: '',
 				number: '',
-				all: 0
+				all: 0,
+				internationalshow:false,
+				content:'',
+				contenttitle:''
 			}
 		},
 		onLoad(options) {
@@ -184,12 +199,35 @@
 		},
 		methods: {
 			//协议
-			transport() {
-				uni.$u.http.get('/api/agreement?code=international_express_service').then((res) => {
+			internationalshowa() {
+				this.internationalshow = true
+				this.international()
+			},
+			//国际快递服务协议
+			international() {
+				uni.$u.http.get('/api/agreement', {
+					params: {
+						code: 'international_express_service'
+					}
+				}).then((res) => {
 					console.log(res);
-				}).catch(() => {
-
-				})
+					if (this.language == 'zh-CN') {
+						this.content = res.content_cn
+						this.contenttitle = res.name_cn
+					}
+					if (this.language == 'en-US') {
+						this.content = res.content_en
+						this.contenttitle = res.name_en
+					}
+					if (this.language == 'es-ES') {
+						this.content = res.content_es
+						this.contenttitle = res.content_ita
+					}
+					if (this.language == 'it-IT') {
+						this.content = res.content_cn
+						this.contenttitle = res.name_ita
+					}
+				}).catch(() => {})
 			},
 			//跨境物流选择
 			success(msg) {
@@ -257,7 +295,8 @@
 				})
 			},
 			close() {
-				this.logshow = true
+				this.logshow = false
+				this.internationalshow = false
 			},
 			send() {
 				uni.navigateTo({

pageB/goods.vue

@@ -8,7 +8,7 @@
 			</view>
 			<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;">
+					style="color: rgba(248, 50, 36, 1);border: 2rpx solid rgba(248, 50, 36, 1);justify-content: center;width: 420rpx;">
 					<text style="margin-right: 18rpx;">{{goodname}}</text>
 					<u-icon name="close" color="rgba(248, 50, 36, 1)" size="12" @click="goodname=''"></u-icon>
 				</view>
@@ -49,8 +49,6 @@
 						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">
@@ -117,7 +115,7 @@
 			</view>
 			<view class="u-flex" style="margin-top: 28rpx;">
 				<view class="zhu">
-				{{i18n.Note}}
+					{{i18n.Note}}
 					<text class="rule"> {{i18n.rule}}</text>
 				</view>
 			</view>
@@ -150,7 +148,18 @@
 				return this.$t('index')
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			if (options.goodinfo) {
+				var goodinfo = JSON.parse(decodeURIComponent(options.goodinfo));
+				this.goodid = goodinfo.goodid
+				this.goodname = goodinfo.goodname
+				this.goodtype = goodinfo.goodtype
+				this.height = goodinfo.height
+				this.length = goodinfo.length
+				this.number = goodinfo.number
+				this.weight = goodinfo.weight
+				this.width = goodinfo.width
+			}
 			this.getgoods()
 		},
 		onShow() {
@@ -178,9 +187,9 @@
 					goodname: this.goodname,
 					number: this.number,
 					weight: this.weight,
-					length:this.length,
-					width:this.width,
-					height:this.height,
+					length: this.length,
+					width: this.width,
+					height: this.height,
 				})
 				uni.navigateBack()
 			},
@@ -259,6 +268,7 @@
 		padding: 12rpx 28rpx;
 		box-sizing: border-box;
 	}
+
 	.special {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;

pages/express/express.vue

@@ -227,7 +227,8 @@
 		<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' :leftchangea = 'leftchange' :rightchangea='rightchange' :typeida='typeid'></kj-flow>
+					@close='logshow=false' :leftchangea='leftchange' :rightchangea='rightchange'
+					:typeida='typeid'></kj-flow>
 			</view>
 		</u-popup>
 		<!-- <u-button @click="show = true">打开</u-button> -->
@@ -260,9 +261,9 @@
 				goodinfo: {}, //物品信息
 				unit_price: '',
 				expressList: [],
-				leftchange:'',
-				rightchange:'',
-				typeid:'',
+				leftchange: '',
+				rightchange: '',
+				typeid: '',
 			}
 		},
 		onLoad(options) {
@@ -476,14 +477,26 @@
 			//物品信息
 			goods() {
 				var that = this
-				uni.navigateTo({
-					url: '/pageB/goods',
-					events: {
-						goodinfo: function(res) {
-							that.goodinfo = res
+				if (JSON.stringify(this.goodinfo) == '{}') {
+					uni.navigateTo({
+						url: '/pageB/goods',
+						events: {
+							goodinfo: function(res) {
+								that.goodinfo = res
+							}
 						}
-					}
-				})
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pageB/goods?goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo)),
+						events: {
+							goodinfo: function(res) {
+								that.goodinfo = res
+								console.log(res);
+							}
+						}
+					})
+				}
 			},
 			//寄件人信息
 			send() {