冲突

components/kj-flow/kj-flow.vue

@@ -21,13 +21,14 @@
 					class="iitem">
 					<view class="ititle u-flex u-row-between" style="width: 100%;">
 						<view class="ititle">发柜时间 {{item.begin_date}}</view>
-						<view>{{item.name}}</view>
+						<view style="font-size: 24rpx;
+color: #666666;">{{item.name}}</view>
 					</view>
 					<view class="u-flex u-row-between" style="margin-top: 16rpx;width: 100%;">
 						<view class="price">
 							<text style='font-size="24rpx"'>¥</text>
-							<text style='font-size="32rpx"' v-if="goodstype='normal'">{{item.normal_delivery_fee}}</text>
-							<text style='font-size="32rpx"' v-else>{{item.special_delivery_fee}}</text>
+							<text style='font-size="32rpx"'>{{item.unit_price}}</text>
+							<!-- <text style='font-size="32rpx"' v-else>{{item.special_delivery_fee}}</text> -->
 							<text style='font-size="28rpx"'>/kg</text>
 						</view>
 						<u-icon v-if="idx==rightchange" name="checkbox-mark" color="rgba(248, 50, 36, 1)"
@@ -47,11 +48,11 @@
 <script>
 	export default {
 		props: {
-			province_id:{
-				typeof:Number
+			province_id: {
+				typeof: Number
 			},
-			goodstype:{
-				typeof:''
+			goodstype: {
+				typeof: ''
 			}
 		},
 		name: "kj-flow",
@@ -61,10 +62,10 @@
 				rightchange: 0,
 				containerList: [],
 				transportList: [],
-				estimated_arrived_date:'',
-				leftname:'',
-				rightname:'',
-				dateid:''
+				estimated_arrived_date: '',
+				leftname: '',
+				rightname: '',
+				dateid: ''
 			};
 		},
 		computed: {
@@ -75,7 +76,7 @@
 		methods: {
 			//货柜列表
 			container(id) {
-				uni.$u.http.get('/api/container', {
+				uni.$u.http.get('/api/container-base', {
 					params: {
 						is_page: 0,
 						province_id: this.province_id,
@@ -93,7 +94,6 @@
 			transport() {
 				uni.$u.http.get('/api/transport-type').then((res) => {
 					this.transportList = res
-					console.log(res[0].id);
 					this.container(res[0].id)
 				}).catch(() => {
 
@@ -101,14 +101,14 @@
 			},
 
 			//左边切换
-			changea(item,index) {
+			changea(item, index) {
 				this.leftchange = index
 				this.container(item.id)
 				this.leftname = item.name
 				console.log(this.leftchange);
 			},
 			//右边切换
-			change(item,idx) {
+			change(item, idx) {
 				this.rightchange = idx
 				this.dateid = item.id
 				this.rightname = item.name
@@ -117,16 +117,16 @@
 				this.$emit('close')
 			},
 			enter() {
-				if(this.dateid==''){
+				if (this.dateid == '') {
 					this.$u.toast('请选择货柜')
-				}else{
-					this.$emit('success',{
-						dateid:this.dateid,
-						rightname:this.rightname,
-						leftname:this.leftname
+				} else {
+					this.$emit('success', {
+						dateid: this.dateid,
+						rightname: this.rightname,
+						leftname: this.leftname
 					})
 				}
-				
+
 			}
 		}
 	}

manifest.json

@@ -1,93 +1,96 @@
 {
-	"name": "wx",
-	"appid": "__UNI__EF90963",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		"optimization": {
-			"subPackages": true
-		}
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2",
-	"h5": {
-		"title": "",
-		"domain": "wx-qhb",
-		"devServer": {
-			"disableHostCheck": true,
-			"port": 8000,
-			"proxy": {
-				"/api": {
-					"target": "https://cbec.hdlkeji.com",
-					"changeOrigin": true,
-					"pathRewrite": {
-						"^/api": ""
-					}
-				}
-			}
-		}
-	}
+    "name" : "wx",
+    "appid" : "__UNI__EF90963",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "title" : "",
+        "domain" : "wx-qhb",
+        "devServer" : {
+            "disableHostCheck" : true,
+            "port" : 8000,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://cbec.hdlkeji.com",
+                    "changeOrigin" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
+        }
+    }
 }
-

pageA/comment.vue

@@ -0,0 +1,150 @@
+<template>
+	<!-- 评论 -->
+	<view class="back">
+		<view class="box" v-for="(item,idx) in commentlist" :key="idx">
+			<!-- 顶部 -->
+			<view class="" style="display: flex;justify-content: space-between;">
+				<view class="u-flex">
+					<image style="width: 68rpx;height: 68rpx;border: radius 34rpx;;" :src="item.member.avatar" mode="">
+					</image>
+					<view class="">
+						<text
+							class="name">{{item.member.nickname.slice(0,1)+'***'+item.member.nickname.slice(-1)}}</text>
+						<uni-rate network allow-half :readonly="true" color="rgba(247, 181, 0, 1)" :size='8' :value="5"
+							v-model="rate" />
+					</view>
+				</view>
+				<text class="day">{{timeSince(item.created_at)}}</text>
+			</view>
+			<view class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
+			<view class="content" style="margin-top: 20rpx;">{{item.content}}</view>
+			<!-- <view class="" v-for="(child,index) in item.image.split(',')" :key="index" style="margin-top: 22rpx;"> -->
+			<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;">
+				<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
+					style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
+					mode=""></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				merchant_goods_id: '',
+				commentlist: [],
+				rate: ''
+			};
+		},
+		onLoad(options) {
+			this.merchant_goods_id = options.id
+			this.comment()
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		methods: {
+			//评论接口
+			comment() {
+				uni.$u.http.post('/api/goods/goods_comment', {
+					merchant_goods_id: this.merchant_goods_id,
+					page: 1,
+					limit: 2
+				}).then((res) => {
+					this.commentlist = res.data
+					this.total = res.total
+				}).catch(() => {
+
+				})
+			},
+			timeSince(dateString) {
+				// 为兼容iOS，转换日期格式
+				// var dateArr = dateString.split("T")[0].split("-");
+				// var timeArr = dateString.split("T")[1].split(":");
+				// var date = new Date(dateArr[0], dateArr[1] - 1, dateArr[2], timeArr[0], timeArr[1], timeArr[2]);
+				var date = dateString;
+
+				const second = 1000;
+				const minute = 60 * second;
+				const hour = 60 * minute;
+				const day = 24 * hour;
+				const month = 30 * day;
+				const year = 12 * month;
+
+				const now = new Date().getTime();
+				const inputDate = new Date(date).getTime();
+				const diffValue = now - inputDate;
+
+				if (diffValue < 0) {
+					console.error('输入的时间不能在当前时间之后！');
+					return dateString;
+				}
+
+				if (diffValue < minute) {
+					return Math.round(diffValue / second) + '秒前';
+				} else if (diffValue < hour) {
+					return Math.round(diffValue / minute) + '分钟前';
+				} else if (diffValue < day) {
+					return Math.round(diffValue / hour) + '小时前';
+				} else if (diffValue < month) {
+					return Math.round(diffValue / day) + '天前';
+				} else if (diffValue < year) {
+					return Math.round(diffValue / month) + '个月前';
+				} else {
+					// 时间间隔超过一年，直接显示具体时间
+					return dateArr.join('-');
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.back {
+		// background-color:rgba(216, 216, 216, 1) ; 
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.box {
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 24rpx 20rpx;
+			box-sizing: border-box;
+			margin-bottom: 20rpx;
+		}
+
+		.day {
+			font-family: SFPro, SFPro;
+			font-weight: 400;
+			font-size: 20rpx;
+			color: #9E9E9E;
+			line-height: 24rpx;
+			text-align: justify;
+			font-style: normal;
+		}
+
+		.content {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #444444;
+			line-height: 36rpx;
+			text-align: justify;
+			font-style: normal;
+		}
+
+		.name {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 22rpx;
+			color: #444444;
+			line-height: 32rpx;
+			text-align: left;
+			font-style: normal;
+			margin-bottom: 34rpx;
+		}
+	}
+</style>

pageA/order.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="back">
 		<!-- 地址 -->
-		<view class="address">
+		<view class="address" @click="toadd">
 			<view class="u-flex u-row-between">
-				<view class="add">102 Huangjiao Road,</view>
+				<view class="add" v-if="addinfo">{{addinfo.full_address}}</view>
+				<view class=""  v-else >请添加您的收货地址</view>
 				<u-icon name="arrow-right" size='16'></u-icon>
 			</view>
-			<view class="info">
-				<text>Curtis Morris</text>
-				<text style="margin-left: 20rpx;">041***8314</text>
+			<view class="info" v-if="addinfo">
+				<text>{{addinfo.name}}</text>
+				<text style="margin-left: 20rpx;">{{replacePhoneToStar(addinfo.mobile)}}</text>
 			</view>
 		</view>
 		<!-- 商品 -->
@@ -29,14 +30,15 @@
 						<view class="">
 							<text class="money">¥</text>
 							<text class="money"
-								style="font-size: 34rpx;">{{goodinfo.is_discount==1? Number(sku_info.price)*Number(value):Number(sku_info.discount_price)*Number(value)}}</text>
+								style="font-size: 34rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*1000)*Number(value*1000))/1000000:(Number(sku_info.discount_price*1000)*Number(value)*1000)/1000000}}</text>
 						</view>
 						<u-number-box v-model="value">
 							<!-- <view class="bu"> -->
 							<view slot="minus" class="">
 								<u-icon name="minus" size="12"></u-icon>
 							</view>
-							<text slot="input" style="width: 40px;text-align: center;" class="input">{{value}}</text>
+							<input slot="input" v-model="value" style="width: 40px;text-align: center;"
+								class="input"></input>
 							<view slot="plus" class="">
 								<u-icon name="plus" size="12"></u-icon>
 							</view>
@@ -50,7 +52,7 @@
 		<view class="logistics u-flex u-row-between">
 			<text style="font-weight: 600;">{{i18n.flow}}</text>
 			<view class="u-flex" @click="show = true">
-				<text class="change">{{i18n.selection}}</text>
+				<text class="change">{{containname1?type1+' | '+containname1 :i18n.selection}}</text>
 				<u-icon name="arrow-right" size='16'></u-icon>
 			</view>
 		</view>
@@ -79,7 +81,8 @@
 							</view>
 							<view class="money" style="color: #F83224;font-size: 20rpx;">
 								<text>¥</text>
-								<text  style="font-size: 28rpx;">{{item.is_discount==0?item.discount_price.slice(0,-3):item.price.slice(0,-3)}}</text>
+								<text
+									style="font-size: 28rpx;">{{item.is_discount==0?item.discount_price.slice(0,-3):item.price.slice(0,-3)}}</text>
 								<text>{{item.is_discount==0?item.discount_price.slice(-3):item.price.slice(-3)}}</text>
 							</view>
 						</view>
@@ -92,47 +95,52 @@
 			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
 				<view class="name">{{i18n.Commodityamount}}</view>
 				<view class="money">
-					¥{{goodinfo.is_discount==1? Number(sku_info.price)*Number(value):Number(sku_info.discount_price)*Number(value)}}
+					¥{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}
 				</view>
 			</view>
 			<view class="u-flex u-row-between">
 				<view class="name">{{i18n.Grosscommodityweight}}</view>
 				<view class="money">{{Number(sku_info.weight)*value}}kg</view>
 			</view>
-			<view class="back u-flex">
+			<view class="back u-flex" v-if="containname1">
 				<image src="static/images/warning.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
-				<text style="margin-left: 12rpx;">{{i18n.buy}}378-380kg{{i18n.price}}¥21，{{i18n.morefavorable}}</text>
+				<text
+					style="margin-left: 12rpx;">{{i18n.buy}}{{max_weight}}kg{{i18n.price}}¥{{unit_fee}}，{{i18n.morefavorable}}</text>
 			</view>
-			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
+			<view class="u-flex u-row-between" style='margin-bottom:40rpx;margin-top: 20rpx;'>
 				<view class="name">{{i18n.Costperkilogram}}</view>
-				<view class="money">需先选择货运方式</view>
+				<view class="money">{{containname1?unit_price:'需先选择货运方式'}}</view>
 			</view>
 			<view class="u-flex u-row-between">
 				<view class="name">{{i18n.freight}}</view>
-				<view class="money">需先选择货运方式</view>
+				<view class="money">{{containname1?sum:'需先选择货运方式'}}</view>
 			</view>
 			<view class="zong u-flex u-row-right">
 				<view class="">
 					<text class="small">{{i18n.subtotal}}</text>
 					<text class="mon">¥</text>
-					<text class="mon" style="font-size: 40rpx;">2642.5</text>
+					<text class="mon"
+						style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
 				</view>
 			</view>
 		</view>
 		<view class="" style="height: 166rpx;"></view>
 		<view class="btn u-flex u-row-right">
 			<view class="">
-				<text class="kg">{{i18n.Atotalof}}39kg,</text>
+				<text class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text>
 				<text>{{i18n.total}}:</text>
 				<text class="money" style="font-size: 28rpx;">¥</text>
-				<text class="money" style="font-weight: bold;">2792.5</text>
+				<text class="money" v-if="goodinfo.is_discount==1"
+					style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
+				<text class="money" v-if="goodinfo.is_discount==0"
+					style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.discount_price)*Number(value)*10000))/10000}}</text>
 			</view>
 			<view class="order" @click="topay">
 				{{i18n.Submitorder}}
 			</view>
 		</view>
 		<!-- 跨境物流 -->
-		<u-popup :show="show" @close="close" @open="open" mode="bottom" closeIconPos='top-right' round='28'>
+		<u-popup :show="show" @close="close" mode="bottom" closeIconPos='top-right' round='28'>
 			<view style="padding: 40rpx 28rpx;box-sizing:border-box;">
 				<view class="u-flex u-row-between">
 					<view class="" style="width: 28px;height: 28px;"></view>
@@ -143,7 +151,7 @@
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 60rpx;flex-wrap: wrap;">
 					<view :class="index==idx?'active':'unactive'" v-for="(item,idx) in containerList"
-						@click="change(idx)"
+						@click="change(item,idx)"
 						style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-bottom: 28rpx;position: relative;">
 						<image v-if="index==idx" src="static/images/change.png"
 							style="width: 36rpx;height: 32rpx;position: absolute;top: 0;right: 0;" mode=""></image>
@@ -151,15 +159,16 @@
 						<view class="logname" v-if="language =='en-US'">{{item.name_en}}</view>
 						<view class="logname" v-if="language =='es-ES'">{{item.name_es}}</view>
 						<view class="logname" v-if="language =='it-IT'">{{item.name_ita}}</view>
-						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view>
+						<!-- 						<view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
+						<view class="wei">¥{{item.unit_price}}/kg</view>
 					</view>
 				</view>
 				<view class="nextto" @click="next">{{i18n.next}}</view>
 			</view>
 		</u-popup>
 		<!-- 跨境物流下一步 -->
-		<u-popup :safeAreaInsetTop='true' :show="show1" @close="close" @open="open" mode="bottom"
-			closeIconPos='top-right' round='28' bgColor='#F4F4F4'>
+		<u-popup :safeAreaInsetTop='true' :show="show1" @close="close" mode="bottom" closeIconPos='top-right' round='28'
+			bgColor='#F4F4F4'>
 			<view style="padding: 40rpx 28rpx;box-sizing:border-box;position: relative;">
 				<view class="u-flex u-row-between">
 					<view class="" style="width: 28px;height: 28px;"></view>
@@ -169,9 +178,10 @@
 					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
 				</view>
 				<scroll-view :scroll-y="true" style="500rpx">
-					<view class="transport" style="margin-top: 32rpx;" @click="activea(idx)" v-for="(item,idx) in 5">
+					<view class="transport" style="margin-top: 32rpx;" @click="activea(item,idx)"
+						v-for="(item,idx) in containlist" v-if="item.sum !=0">
 						<view class="u-flex u-row-between">
-							<text class="yundate">{{i18n.Shipmentdate}} 2023-12-09</text>
+							<text class="yundate">{{i18n.Shipmentdate}} {{item.begin_date}}</text>
 							<image v-if="datechan==idx" src="/pageA/static/images/active.png"
 								style="width: 36rpx;height: 36rpx;" mode=""></image>
 							<image v-else src="/pageA/static/images/unactive.png" style="width: 36rpx;height: 36rpx;"
@@ -179,13 +189,16 @@
 						</view>
 						<view class="u-flex u-row-between" style="margin-top: 28rpx;">
 							<view class="chest">
-								<text>2号海运柜</text>
+								<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>
 								<text style="margin: 0 16rpx;">|</text>
-								<text>{{i18n.Estimatedtimeofarrival}}22{{i18n.Workingday}}</text>
+								<text>{{i18n.Estimatedtimeofarrival}}{{item.transport_days}}{{i18n.Workingday}}</text>
 							</view>
 							<view class="mone">
 								<text>¥</text>
-								<text style="font-size: 32rpx;">1820</text>
+								<text style="font-size: 32rpx;">{{item.sum}}</text>
 							</view>
 						</view>
 					</view>
@@ -214,12 +227,29 @@
 				swiptlist: [], //推荐列表
 				language: 'zh-CN',
 				containerList: [], //列表
+				province_id: '',
+				transport_type_id: '',
+				containlist: [],
+				containid: '', //货柜id
+				containname: '', //货柜名称
+				type: '', //货运方式名称
+				containname1: '',
+				type1: '',
+				sum: '',
+				unit_price: '',
+				recommend_weight: '',
+				sum1: '',
+				unit_price1: '',
+				recommend_weight1: '',
+				max_weight: '',
+				min_weight: '',
+				unit_fee: '',
 			};
 		},
 		computed: {
 			i18n() {
 				return this.$t('index')
-			}
+			},
 		},
 		onLoad(options) {
 			// url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
@@ -235,29 +265,114 @@
 				this.language = uni.getStorageSync('language')
 			}
 			this.recommend()
-			this.container()
+			// this.container()
 		},
 		methods: {
+			//正则匹配手机号
+			replacePhoneToStar: function(phone) {
+				if (phone) {
+					return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+				}
+			},
+			//推荐重量
+			recommendweight() {
+				uni.$u.http.get('/api/express-order/recommend-container', {
+					params: {
+						container_id: this.containid,
+						type: this.goodinfo.cate == 0 ? 'normal' : 'special'
+					}
+				}).then((res) => {
+					console.log(res);
+					this.max_weight = res.max_weight
+					this.min_weight = res.min_weight
+					this.unit_fee = res.unit_fee
+				}).catch(() => {
+
+				})
+			},
+			//货运类型列表
+			transport() {
+				uni.$u.http.get('/api/transport-type', {
+					params: {
+						province_id: this.province_id,
+					}
+				}).then((res) => {
+					this.containerList = res
+					this.transport_type_id = res[0].id
+					if (this.language == 'zh-CN') {
+						this.type = res[0].name_cn
+					}
+					if (this.language == 'en-US') {
+						this.type = res[0].name_en
+					}
+					if (this.language == 'es-ES') {
+						this.type = res[0].name_es
+					}
+					if (this.language == 'it-IT') {
+						this.type = res[0].name_ita
+					}
+				}).catch(() => {
+
+				})
+			},
+			//跳转到填写地址
+			toadd() {
+				var that = this
+				uni.navigateTo({
+					url: '/pageC/addressManagement/addressManagement',
+					events: {
+						getadd(res) {
+							console.log(res);
+							that.addinfo = res
+							that.province_id = res.province_id
+							// console.log(res);
+							that.transport()
+						}
+					}
+				})
+			},
 			//货柜列表
 			container() {
-				uni.$u.http.get('/api/container', {
+				uni.$u.http.get('/api/container-base', {
 					params: {
 						is_page: 0,
 						province_id: this.province_id,
+						transport_type_id: this.transport_type_id,
+						weight: Number(this.sku_info.weight) * this.value,
+						type: this.goodinfo.cate == 0 ? 'normal' : 'special'
 					}
 				}).then((res) => {
-					this.containerList = res
-					this.estimated_arrived_date = res[0].estimated_arrived_date
-					this.dateid = res[0].id
-					this.rightname = res[0].name
+					// this.containlist = res
+					this.containlist = []
+					res.forEach((item) => {
+						if (item.sum != 0) {
+							this.containlist.push(item)
+						}
+					})
+					this.sum = this.containlist[0].sum
+					this.unit_price = this.containlist[0].unit_price
+					this.recommend_weight = this.containlist[0].recommend_weight
+					this.containid = this.containlist[0].id
+					if (this.language == 'zh-CN') {
+						this.containname = this.containlist[0].name_cn
+					}
+					if (this.language == 'en-US') {
+						this.containname = this.containlist[0].name_en
+					}
+					if (this.language == 'es-ES') {
+						this.containname = this.containlist[0].name_es
+					}
+					if (this.language == 'it-IT') {
+						this.containname = this.containlist[0].name_ita
+					}
 				}).catch(() => {
 
 				})
 			},
 			//商品推荐
 			recommend() {
-				uni.$u.http.post('/api/goods/recommend',{
-					keyword:''
+				uni.$u.http.post('/api/goods/recommend', {
+					keyword: ''
 				}).then((res) => {
 					// this.swiptlist = res.reduce((a, b) => {
 					// 	let lastIndex = a.length - 1
@@ -275,19 +390,51 @@
 
 				})
 			},
-			change(index) {
+			change(item, index) {
+				this.transport_type_id = item.id
 				this.index = index
+				if (this.language == 'zh-CN') {
+					this.type = item.name_cn
+				}
+				if (this.language == 'en-US') {
+					this.type = item.name_en
+				}
+				if (this.language == 'es-ES') {
+					this.type = item.name_es
+				}
+				if (this.language == 'it-IT') {
+					this.type = item.name_ita
+				}
 			},
 			next() {
 				this.show = false
 				this.show1 = true
+				this.type1 = this.type
+				this.container()
 			},
-			activea(idx) {
+			activea(item, idx) {
 				this.datechan = idx
+				this.sum = item.sum
+				this.unit_price = item.unit_price
+				this.recommend_weight = item.recommend_weight
+				if (this.language == 'zh-CN') {
+					this.containname = item.name_cn
+				}
+				if (this.language == 'en-US') {
+					this.containname = item.name_en
+				}
+				if (this.language == 'es-ES') {
+					this.containname = item.name_es
+				}
+				if (this.language == 'it-IT') {
+					this.containname = item.name_ita
+				}
 			},
 			//确定
 			confirm() {
 				this.show1 = false
+				this.containname1 = this.containname
+				this.recommendweight()
 			},
 			// 取消
 			close() {
@@ -296,8 +443,22 @@
 			},
 			//提交订单
 			topay() {
-				uni.navigateTo({
-					url: '/pageA/payorder'
+				uni.$u.http.post('/api/order', {
+					address_id: this.addinfo.id, //3	是	String	地址ID
+					goods_id: this.goodinfo.id, //65	是	String	商品id
+					goods_num: this.value, //2	是	String	商品数量
+					sku_item_id: this.sku_info.id, //60	是	String	规格id
+					cart_ids: '', //8,9	是	String	购物车id
+					remark: '', //备注	是	String	备注
+					merchant_goods_id: this.goodinfo.merchant_goods_id, //39	是	String	团长商品id
+					container_id: this.containid, //1	是	String	货柜id
+					share_merchant_id: '', //	是	String	分享团长id 分享商品的时候传
+					belong: 0 //0	是	String	商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
+				}).then((res) => {
+					uni.navigateTo({
+						url: '/pageA/payorder?sum=' + this.sum
+					})
+				}).catch(() => {
 				})
 			}
 		}
@@ -422,9 +583,10 @@
 		text-align: right;
 		font-style: normal;
 		overflow: hidden;
-		width: 220rpx ;
+		width: 220rpx;
 		white-space: nowrap;
 		text-overflow: ellipsis;
+		text-align: center;
 	}
 
 	.wei {
@@ -558,7 +720,7 @@
 				padding: 22rpx 16rpx;
 				box-sizing: border-box;
 				margin-top: 10rpx;
-				margin-bottom: 20rpx;
+				// margin-bottom: 20rpx;
 			}
 
 			.name {

pageA/payorder.vue

@@ -8,7 +8,7 @@
 				</view>
 				<view class="state" v-if="stateshow">
 					<view @click="statechange(item,idx)" :class="state_id==idx?'stateac':'unstate'"
-						style="margin-bottom: 20rpx;" v-for="(item,idx) in array">{{item.name}}</view>
+						style="margin-bottom: 20rpx;font-size: 24rpx;" v-for="(item,idx) in array">{{item.name}}</view>
 				</view>
 			</view>
 			<view class="u-row-center"
@@ -16,7 +16,7 @@
 				<view class="paysum">{{i18n.Actual}}</view>
 				<view class="numbe" style="margin-top: 40rpx;">
 					<text>￥</text>
-					<text style="font-size: 60rpx;font-weight: 500;">2792.5</text>
+					<text style="font-size: 60rpx;font-weight: 500;">{{sum}}</text>
 				</view>
 				<!-- 				<view class="">
 					<text>支付剩余时间 13:50</text>
@@ -93,9 +93,13 @@
 					name: '欧元'
 				}, {
 					name: '美元'
-				}]
+				}],
+				sum:''
 			};
 		},
+		onLoad(options) {
+			this.sum = options.sum
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')

pageA/productdetails.vue

@@ -1,14 +1,14 @@
 <template>
 	<view>
-		<scroll-view ref="scrollView" scroll-y="true" style="min-height: 100%;">
+		<scroll-view ref="scrollView" scroll-y="true" scroll-with-animation="true" style="min-height: 100%;"
+			:scroll-into-view="toView">
 			<!-- 页面内容 -->
-
 			<!-- 自定义导航栏 -->
 			<u-navbar :safeAreaInsetTop="true" :placeholder='true'>
 				<view class="u-nav-slot u-flex" slot="left" style="display: flex;">
 					<view class="u-flex">
 						<u-icon name="arrow-left" size="19" @click="navigateBack()"></u-icon>
-						<u-tabs :duration='duration' @click="click" :list="list1" lineColor='#fff'
+						<u-tabs :duration='duration' @click="scrollToPosition" :list="list1" lineColor='#fff'
 							:activeStyle=" {color:'#FF1515'}" :inactiveStyle="{
 						color:' #666666' }"></u-tabs>
 					</view>
@@ -24,7 +24,7 @@
 				</view>
 			</u-navbar>
 			<!-- 商品图片 -->
-			<view class="uni-margin-wrap">
+			<view class="uni-margin-wrap" id="scroll0">
 				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true">
 					<swiper-item v-if="goodinfo.video">
 						<video style="width: 750rpx;height: 750rpx;" :src='goodinfo.video'></video>
@@ -68,10 +68,12 @@
 				</view>
 				<!-- 服务 -->
 				<view class="serve" style="margin-top: 20rpx;">
-					<view class="top u-flex u-row-between"  @click="sele">
+					<view class="top u-flex u-row-between" @click="sele">
 						<view class="u-flex">
 							<view class="change">{{i18n.Sele}}</view>
-							<view class="" style="margin-left: 20rpx;">{{selectArr.length>0?selectArr.join(','):i18n.Sele}}</view>
+							<view class="" style="margin-left: 20rpx;">
+								{{selectArr.length>0?selectArr.join(','):i18n.Sele}}
+							</view>
 						</view>
 						<view class="">
 							<u-icon name="arrow-right" size='16'></u-icon>
@@ -88,11 +90,11 @@
 					</view>
 				</view>
 				<!-- 评论 -->
-				<view class="comment" ref="targetPosition">
+				<view class="comment" ref="targetPosition" id="scroll1">
 					<view class="u-flex u-row-between">
 						<text class="ping">{{i18n.review}}</text>
-						<view class="u-flex">
-							<text class="strip">5000+{{i18n.article + i18n.review}}</text>
+						<view class="u-flex" @click="tocomment">
+							<text class="strip">{{total}}{{i18n.article + i18n.review}}</text>
 							<u-icon name="arrow-right" size='16'></u-icon>
 						</view>
 					</view>
@@ -119,8 +121,11 @@
 						<image :src='goodinfo.merchant.image' style="width: 112rpx;height: 112rpx;" mode=""></image>
 						<view class="" style="margin-left: 20rpx;">
 							<view class="title">{{goodinfo.merchant.merchant_name}}</view>
-							<uni-rate network allow-half :readonly="true" color="red" :size='8' :value="5"
-								v-model="rate" />
+							<view class="redback u-flex">
+								<uni-rate network allow-half :readonly="true" active-color="red"
+									color="rgba(255, 27, 0, 0.5)" :size='8' :value="5" v-model="rate" />
+								<text style="margin-left: 8rpx;">{{rate}}</text>
+							</view>
 							<view class="" style='margin-top:20rpx'></view>
 							<view class="u-flex" style='margin-top:20rpx'>
 								<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
@@ -141,7 +146,7 @@
 						<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
 							<swiper-item v-for="(parent,index) in swiptlist" :key="index">
 								<view class="u-flex  swiper-item u-row-between">
-									<view class="" v-for="(child,idx) in parent" @click="toinfo(child.id)" :key="idx">
+									<view class="" v-for="(child,idx) in parent" @click="detail(child.id)" :key="idx">
 										<image :src="child.image" style="width: 214rpx;height: 214rpx;" mode="">
 										</image>
 										<view class="u-line-1"
@@ -174,7 +179,7 @@
 						</swiper>
 					</view>
 				</view>
-				<view class="recommend">
+				<view class="recommend" id="scroll2">
 					<view class="title">{{i18n.Productdetails}}</view>
 					<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">{{i18n.Specification}}</view>
 					<view class="specification">
@@ -188,7 +193,6 @@
 						<image :src="goodinfo.image" style="width: 100%;height: 580rpx;" mode=""></image>
 					</view>
 				</view>
-
 				<view class="" style="height: 158rpx;"></view>
 				<view class="fix u-flex u-row-between">
 					<view class="u-flex" style="column-gap: 35rpx;">
@@ -201,19 +205,23 @@
 							<image src="../static/cart1.png" style='width:40rpx;height:40rpx' mode=""></image>
 							<view class="ke">{{i18n.Shopping}}</view>
 						</view>
-						<view class="u-flex" style="justify-content: center;flex-direction: column;" @click="">
-							<!-- <image src="../static/images/index/attention.png" style='width:40rpx;height:40rpx' mode=""> -->
-							<image src="../static/images/index/bottom1.png" style='width:40rpx;height:40rpx' mode="">
-							</image>
-							<!-- <view class="ke">{{i18n.follow}}</view> -->
-							<view class="ke" style="color: rgba(248, 50, 36, 1);">已关注</view>
+						<view class="u-flex" style="justify-content: center;flex-direction: column;width:70rpx ;"
+							@click="fllow">
+							<image v-if='goodinfo.is_interest==1' src="../static/images/index/attention.png"
+								style='width:40rpx;height:40rpx' mode="">
+								<image v-if='goodinfo.is_interest==0' src="../static/images/index/bottom1.png"
+									style='width:40rpx;height:40rpx' mode="">
+								</image>
+								<view v-if='goodinfo.is_interest==1' class="ke">{{i18n.follow}}</view>
+								<view v-if='goodinfo.is_interest==0' class="ke" style="color: rgba(248, 50, 36, 1);">已关注
+								</view>
 						</view>
 					</view>
-					<view class="join" @click="join(0)">加入购物车</view>
-					<view class="pin" @click="join(1)">立即拼团</view>
-					<!-- 				<view class="tongzhi" @click="inform">
-					{{i18n.notification}}
-				</view> -->
+					<view v-if="sku_info.stock_total==0" class="tongzhi" @click="inform">
+						{{i18n.notification}}
+					</view>
+					<view v-if="sku_info.stock_total!=0" class="join" @click="join(0)">加入购物车</view>
+					<view v-if="sku_info.stock_total!=0" class="pin" @click="join(1)">立即拼团</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -226,10 +234,10 @@
 						<view class="">
 							<text class="read">¥</text>
 							<text class="read" style="font-size: 40rpx;"
-								v-if="goodinfo.is_discount==0">{{(Number(sku_info.discount_price)*Number(value)) || (Number(goodinfo.discount_price) * Number(value))}}</text>
+								v-if="goodinfo.is_discount==0">{{(Number(sku_info.discount_price*100)*Number(value*100))/10000 || (Number(goodinfo.discount_price*100) * Number(value*100))/10000}}</text>
 							<!-- <text class="read" v-if="goodinfo.is_discount==0">{{(goodinfo.discount_price * value).slice(-3)}}</text> -->
 							<text class="read" style="font-size: 40rpx;"
-								v-if="goodinfo.is_discount==1">{{(Number(sku_info.price)*Number(value))|| (Number(goodinfo.price) * Number(value))}}</text>
+								v-if="goodinfo.is_discount==1">{{(Number(sku_info.price*100)*Number(value*100))/10000|| (Number(goodinfo.price*100) * Number(value*100))/10000}}</text>
 							<!-- <text class="read" v-if="goodinfo.is_discount==1">{{(goodinfo.price * value).slice(-3)}}</text> -->
 							<!-- <text class="read" style="font-size: 40rpx;" >{{(Number(goodinfo.price) * Number(value)).toString()}}</text> -->
 						</view>
@@ -268,10 +276,11 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-popup :show="serve">
-			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: #FFF3E7;position: relative;">
+		<u-popup :show="serve" :round="20">
+			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: #FFF3E7;position: relative;border-radius: 20rpx 20rpx 0 0;">
 				<view class="u-flex" style="flex-direction: column;justify-content: center;">
-					<image src="../static/images/index/serve.png" style="width: 138rpx;height: 34rpx;" mode=""></image>
+					<image src="../static/images/index/serve.png"
+						style="width: 138rpx;height: 34rpx;  " mode=""></image>
 					<text class="info">
 						售前售后 安心无忧购物
 					</text>
@@ -358,7 +367,7 @@
 	export default {
 		data() {
 			return {
-				rate: '', //星级
+				toView: '',
 				imagea: false,
 				list1: [{
 					name: '商品',
@@ -386,7 +395,9 @@
 				selectArr: [],
 				shopcar: '',
 				sku_info: {},
-				commentlist: []
+				commentlist: [],
+				total: '',
+				rate: 5,
 			};
 		},
 		computed: {
@@ -404,10 +415,32 @@
 			}
 			this.detail(this.id)
 			this.recommend()
-
 		},
 		methods: {
-			sele(){
+			//评论页面
+			tocomment() {
+				uni.navigateTo({
+					url: '/pageA/comment?id=' + this.goodinfo.merchant_goods_id
+				})
+			},
+			//关注
+			fllow() {
+				uni.$u.http.post('/api/interest/follow', {
+					interest_type: 0,
+					interest_id: this.goodinfo.merchant_goods_id
+				}).then((res) => {
+					if (res == 'ok1') {
+						this.$u.toast('取关成功')
+						this.detail(this.id)
+					} else {
+						this.$u.toast('关注成功')
+						this.detail(this.id)
+					}
+				}).catch(() => {
+
+				})
+			},
+			sele() {
 				this.shopcar = 2
 				this.show = true
 			},
@@ -424,8 +457,8 @@
 					page: 1,
 					limit: 2
 				}).then((res) => {
-					console.log('comment', res);
 					this.commentlist = res.data
+					this.total = res.total
 				}).catch(() => {
 
 				})
@@ -450,6 +483,13 @@
 
 				})
 			},
+			scrollToPosition(e) {
+				this.current = e.index
+				setTimeout(() => {
+					this.toView = 'scroll' + e.index
+				}, 200)
+
+			},
 			//逛逛
 			goshop() {
 				uni.navigateTo({
@@ -461,17 +501,18 @@
 					console.log(res);
 					this.goodinfo = res
 					this.comment()
+					this.rate = res.merchant.score
 				}).catch(() => {
 
 				})
 			},
-			scrollToPosition() {
-				console.log(111);
-				// 使用$refs获取目标位置的DOM元素
-				const targetElement = this.$refs.targetPosition;
-				// 调用scrollToView方法滚动到目标位置
-				this.$refs.scrollView.scrollToView('targetPosition');
-			},
+			// scrollToPosition() {
+			// 	console.log(111);
+			// 	// 使用$refs获取目标位置的DOM元素
+			// 	const targetElement = this.$refs.targetPosition;
+			// 	// 调用scrollToView方法滚动到目标位置
+			// 	this.$refs.scrollView.scrollToView('targetPosition');
+			// },
 			actabs(index, child, idx) {
 				// this.actidx = index
 				// this.actab = child
@@ -493,10 +534,16 @@
 				console.log(this.sku_info);
 			},
 			order() {
-				uni.navigateTo({
-					url: '/pageA/order?sku=' + encodeURIComponent(JSON.stringify(this.sku_info)) + '&value=' + this
-						.value + '&goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo))
-				})
+				if (this.sku_info.stock_total != 0) {
+					uni.navigateTo({
+						url: '/pageA/order?sku=' + encodeURIComponent(JSON.stringify(this.sku_info)) + '&value=' +
+							this
+							.value + '&goodinfo=' + encodeURIComponent(JSON.stringify(this.goodinfo))
+					})
+				} else {
+					this.$u.toast('库存为0')
+					this.show = false
+				}
 				// console.log(JSON.stringify(this.sku_info));
 			},
 			//生成图片弹窗
@@ -507,19 +554,22 @@
 			//加入购物车
 			joincart() {
 				this.show = false
-				uni.$u.http.post('/api/cart/save', {
-					goods_id: this.id, //63 是 String 商品id 
-					goods_num: this.value, //1 是 String 商品数量
-					sku_item_id: this.sku_info.id, //38 是 String 规格详情id
-					merchant_goods_id: this.goodinfo.merchant_goods_id, //38 是 String 团长商品id
-					belong: this.goodinfo.source, //是 String 商品归属 0 团长 1 平台自营 2 团长发布或者分享的平台自营商品、 供应链商品
-					share_merchant_id: '', //是 String 分享团长id
-				}).then((res) => {
-					console.log(res);
-					this.$u.toast('添加成功')
-				}).catch(() => {
-
-				})
+				if (this.sku_info.stock_total == 0) {
+					this.$u.toast('添加失败,库存为0')
+				} else {
+					uni.$u.http.post('/api/cart/save', {
+						goods_id: this.id, //63 是 String 商品id 
+						goods_num: this.value, //1 是 String 商品数量
+						sku_item_id: this.sku_info.id, //38 是 String 规格详情id
+						merchant_goods_id: this.goodinfo.merchant_goods_id, //38 是 String 团长商品id
+						belong: this.goodinfo.source, //是 String 商品归属 0 团长 1 平台自营 2 团长发布或者分享的平台自营商品、 供应链商品
+						share_merchant_id: '', //是 String 分享团长id
+					}).then((res) => {
+						this.$u.toast('添加成功')
+					}).catch(() => {
+
+					})
+				}
 			},
 			valChange(e) {
 				return e.value
@@ -527,13 +577,6 @@
 			navigateBack() {
 				uni.navigateBack()
 			},
-			click(item) {
-				this.current = item
-				console.log(item);
-				if (item.index == 1) {
-					this.scrollToPosition()
-				}
-			},
 			join(index) {
 				this.show = true
 				this.shopcar = index
@@ -574,6 +617,20 @@
 </script>
 
 <style lang="scss" scoped>
+	.redback {
+		background: rgba(255, 27, 0, 0.07);
+		border-radius: 12rpx;
+		padding: 6rpx 12rpx;
+		box-sizing: border-box;
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 16rpx;
+		color: #FF1515;
+		line-height: 22rpx;
+		text-align: left;
+		font-style: normal;
+		width: 200rpx;
+	}
+
 	.sku {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
@@ -774,7 +831,7 @@
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
 			font-size: 26rpx;
-			color: #222222;
+			color: rgba(34, 34, 34, 0.5);
 			line-height: 36rpx;
 			text-align: left;
 			font-style: normal;

pageA/shoptype.vue

@@ -34,53 +34,54 @@
 		data() {
 			return {
 				scrollH: 0, //scroll高度
-				list: [{
-						name: "女装",
-						children: [{
-								name: "A字裙",
-								icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
-							},
-							{
-								name: "礼服/婚纱",
-								icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
-							}
-						]
-					},
-					{
-						name: "美食",
-						children: [{
-								name: "火锅",
-								icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
-							},
-							{
-								name: "精品茗茶",
-								icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
-							},
-							{
-								name: "休闲食品",
-								icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
-							},
-						]
-					},
-					{
-						name: "美妆",
-						children: [{
-								name: "化妆刷",
-								icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
-							},
-							{
-								name: "防晒品",
-								icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
-							},
-							{
-								name: "美甲",
-								icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
-							}
+				// list: [{
+				// 		name: "女装",
+				// 		children: [{
+				// 				name: "A字裙",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
+				// 			},
+				// 			{
+				// 				name: "礼服/婚纱",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
+				// 			}
+				// 		]
+				// 	},
+				// 	{
+				// 		name: "美食",
+				// 		children: [{
+				// 				name: "火锅",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
+				// 			},
+				// 			{
+				// 				name: "精品茗茶",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
+				// 			},
+				// 			{
+				// 				name: "休闲食品",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
+				// 			},
+				// 		]
+				// 	},
+				// 	{
+				// 		name: "美妆",
+				// 		children: [{
+				// 				name: "化妆刷",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
+				// 			},
+				// 			{
+				// 				name: "防晒品",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
+				// 			},
+				// 			{
+				// 				name: "美甲",
+				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
+				// 			}
 
-						]
-					}
-				],
-				language: ''
+				// 		]
+				// 	}
+				// ],
+				language: '',
+				list:[]
 			}
 		},
 		onLoad() {

pageA/subsidy.vue

@@ -144,7 +144,6 @@
 			},
 			//标签切换
 			changetab(e) {
-				console.log(e);
 				if (this.show == 1) {
 					this.subsid(e.id) //百万补贴
 				}
@@ -200,7 +199,7 @@
 			//海外包邮接口
 			shipp(id) {
 				uni.$u.http.post('api/goods/shipping', {
-					category_id: id
+					parent_id: id
 				}).then((res) => {
 					this.list = res
 				}).catch(() => {
@@ -210,7 +209,7 @@
 			//拼包好物接口
 			pack(id) {
 				uni.$u.http.post('/api/goods/pack', {
-					category_id: id
+					parent_id: id
 				}).then((res) => {
 					this.list = res
 				}).catch(() => {
@@ -220,7 +219,7 @@
 			//百万补贴接口
 			subsid(id) {
 				uni.$u.http.post('/api/goods/subsidy', {
-					category_id: id
+					parent_id: id
 				}).then((res) => {
 					this.list = res
 				}).catch(() => {

pageB/myPackage.vue

@@ -68,7 +68,8 @@
 		data() {
 			return {
 				current: 0, //tab切换
-				list1: []
+				list1: [],
+				status: '', //状态
 			};
 		},
 		onLoad(options) {
@@ -81,6 +82,13 @@
 			}]
 			console.log(options);
 			this.current = options.index
+			if (this.current == 0) {
+				this.status = 'to_transit'
+			} else if (this.current == 1) {
+				this.status = 'transit_receipt'
+			} else {
+				this.status = 'to_overseas'
+			}
 		},
 		computed: {
 			i18n() {
@@ -91,11 +99,35 @@
 			uni.setNavigationBarTitle({
 				title: this.i18n.mine + this.i18n.parcel
 			})
+			this.getlist()
 		},
 		methods: {
+			//获取列表
+			getlist() {
+				uni.$u.http.get('/api/express-order?', {
+					params: {
+						container_id: '',
+						status_collection: this.status
+					}
+				}).then((res) => {
+					console.log(res);
+				}).catch(() => {
+
+				})
+			},
 			click(item) {
 				console.log('item', item);
 				this.current = item.index
+				if (this.current == 0) {
+					this.status = 'to_transit'
+					this.getlist()
+				} else if (this.current == 1) {
+					this.status = 'transit_receipt'
+					this.getlist()
+				} else {
+					this.status = 'to_overseas'
+					this.getlist()
+				}
 			}
 		},
 		mounted() {

pageB/parcel.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 添加包裹 -->
 	<view class="back">
-		<view class="box">
+		<view class="box" style="border-radius: 16rpx 16rpx 0 0 ">
 			<view class="boxitem u-flex">
 				<text class="name">{{i18n.TrackingNumber}}</text>
 				<input style="flex: 1;" type="text" :placeholder="i18n.trackingNumber" />
@@ -13,7 +13,7 @@
 				<input style="flex: 1;" type="text" :placeholder="i18n.ExpressCompany" />
 			</view>
 		</view>
-		<view class="box">
+		<view class="box" style="border-radius:0 0 16rpx 16rpx">
 			<view class="boxitem u-flex">
 				<text class="name">{{i18n.Parcelweight}}</text>
 				<input style="flex: 1;" type="text" :placeholder="i18n.parcelWeight" />
@@ -65,7 +65,6 @@
 	.back {
 		box-sizing: border-box;
 		padding: 20rpx 24rpx;
-
 	}
 
 	.box {
@@ -74,7 +73,7 @@
 		width: 702rpx;
 		// height: 324rpx;
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		// border-radius: 16rpx;
 		box-sizing: border-box;
 
 		.boxitem {

pageC/addressManagement/addressManagement.vue

@@ -1,209 +1,199 @@
 <template>
-  <view>
-    <view class="top-tab">
-      <view :class="{ select: manage == 1 }" @click="switchTab(1)">
-        {{ i18n.inland }}
-      </view>
-      <view :class="{ select: manage == 0 }" @click="switchTab(0)">
-        {{ i18n.international }}
-      </view>
-    </view>
-    <view class="content" v-if="addressList.length != 0">
-      <addressVue
-        @deleteAddress="deleteAddress"
-        @setDefault="setDefault"
-        @toDetail="toDetail"
-        @goBack="goBack"
-        v-for="item in addressList"
-        :itemInfo="item"
-        :key="item.id"
-      />
-    </view>
-    <view class="empty" v-else> 空空如也~ </view>
-    <view class="footer" v-if="manage == 1">
-      <button class="wx">{{ i18n.wx }}</button>
-      <button
-        class="add"
-        @click="toAddRess('/pageC/addEditAddress/addEditAddress')"
-      >
-        {{ i18n.add }}
-      </button>
-    </view>
-    <view class="footer" v-else>
-      <button
-        class="add-international"
-        @click="toAddRess('/pageC/internationalAddress/internationalAddress')"
-      >
-        {{ i18n.add }}
-      </button>
-    </view>
-  </view>
+	<view>
+		<view class="top-tab">
+			<view :class="{ select: manage == 1 }" @click="switchTab(1)">
+				{{ i18n.inland }}
+			</view>
+			<view :class="{ select: manage == 0 }" @click="switchTab(0)">
+				{{ i18n.international }}
+			</view>
+		</view>
+		<view class="content" v-if="addressList.length != 0">
+			<addressVue @deleteAddress="deleteAddress" @setDefault="setDefault" @toDetail="toDetail"
+				@goBack="goBack(item)" v-for="item in addressList" :itemInfo="item" :key="item.id" />
+		</view>
+		<view class="empty" v-else> 空空如也~ </view>
+		<view class="footer" v-if="manage == 1">
+			<button class="wx">{{ i18n.wx }}</button>
+			<button class="add" @click="toAddRess('/pageC/addEditAddress/addEditAddress')">
+				{{ i18n.add }}
+			</button>
+		</view>
+		<view class="footer" v-else>
+			<button class="add-international" @click="toAddRess('/pageC/internationalAddress/internationalAddress')">
+				{{ i18n.add }}
+			</button>
+		</view>
+	</view>
 </template>
 
 <script>
-import addressVue from "./component/address.vue";
-export default {
-  components: {
-    addressVue,
-  },
-  data() {
-    return {
-      manage: 1,
-      addressList: [],
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  methods: {
-    goBack() {
-      uni.$emit("isRefresh", this.index);
-      uni.navigateBack({
-        delta: 1,
-      });
-    },
+	import addressVue from "./component/address.vue";
+	export default {
+		components: {
+			addressVue,
+		},
+		data() {
+			return {
+				manage: 1,
+				addressList: [],
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		methods: {
+			goBack(item) {
+				const eventChannel = this.getOpenerEventChannel()
+				eventChannel.emit('getadd',item)
+				uni.$emit("isRefresh", this.index);
+				uni.navigateBack({
+					delta: 1,
+				});
+			},
 
-    switchTab(num) {
-      this.manage = num;
-      this.getAddressList(num);
-    },
-    //设置默认地址
-    setDefault(value) {
-      uni.$u.http
-        .post(`/api/address/default/${value.id}`)
-        .then((res) => {
-          this.getAddressList(this.manage);
-        })
-        .catch(() => {});
-    },
-    //跳转地址详情页
-    toDetail(id) {
-      if (this.manage) {
-        uni.navigateTo({
-          url: `/pageC/addEditAddress/addEditAddress?id=${id}`,
-        });
-      } else {
-        uni.navigateTo({
-          url: `/pageC/internationalAddress/internationalAddress?id=${id}`,
-        });
-      }
-    },
-    //删除地址
-    deleteAddress(value) {
-      uni.$u.http.delete(`/api/address/${value.id}`).then((res) => {
-        this.getAddressList(this.manage);
-      });
-    },
-    toAddRess(url) {
-      uni.navigateTo({
-        url,
-      });
-    },
-    getAddressList(num) {
-      uni.$u.http
-        .get(
-          `/api/address?is_page=0&page=1&limit=10&is_domestic=${num}&is_default=`
-        )
-        .then((res) => {
-          this.addressList = res;
-        });
-    },
-  },
-  onShow() {
-    this.getAddressList(this.manage);
-  },
-  mounted() {
-    // this.getAddressList(1);
-    uni.setNavigationBarTitle({
-      title: this.i18n.address,
-    });
-  },
-};
+			switchTab(num) {
+				this.manage = num;
+				this.getAddressList(num);
+			},
+			//设置默认地址
+			setDefault(value) {
+				uni.$u.http
+					.post(`/api/address/default/${value.id}`)
+					.then((res) => {
+						this.getAddressList(this.manage);
+					})
+					.catch(() => {});
+			},
+			//跳转地址详情页
+			toDetail(id) {
+				if (this.manage) {
+					uni.navigateTo({
+						url: `/pageC/addEditAddress/addEditAddress?id=${id}`,
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pageC/internationalAddress/internationalAddress?id=${id}`,
+					});
+				}
+			},
+			//删除地址
+			deleteAddress(value) {
+				uni.$u.http.delete(`/api/address/${value.id}`).then((res) => {
+					this.getAddressList(this.manage);
+				});
+			},
+			toAddRess(url) {
+				uni.navigateTo({
+					url,
+				});
+			},
+			getAddressList(num) {
+				uni.$u.http
+					.get(
+						`/api/address?is_page=0&page=1&limit=10&is_domestic=${num}&is_default=`
+					)
+					.then((res) => {
+						this.addressList = res;
+					});
+			},
+		},
+		onShow() {
+			this.getAddressList(this.manage);
+		},
+		mounted() {
+			// this.getAddressList(1);
+			uni.setNavigationBarTitle({
+				title: this.i18n.address,
+			});
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.top-tab {
-  display: flex;
-  font-size: 32rpx;
-  color: rgba(34, 34, 34, 0.8);
-  justify-content: space-around;
-  background-color: #fff;
-  height: 80rpx;
-  align-items: center;
+	.top-tab {
+		display: flex;
+		font-size: 32rpx;
+		color: rgba(34, 34, 34, 0.8);
+		justify-content: space-around;
+		background-color: #fff;
+		height: 80rpx;
+		align-items: center;
 
-  .select {
-    position: relative;
-    font-weight: 600;
-  }
+		.select {
+			position: relative;
+			font-weight: 600;
+		}
 
-  .select::before {
-    content: "";
-    display: block;
-    width: 50%;
-    height: 4rpx;
-    background-color: #f83224;
-    position: absolute;
-    bottom: -20rpx;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-}
+		.select::before {
+			content: "";
+			display: block;
+			width: 50%;
+			height: 4rpx;
+			background-color: #f83224;
+			position: absolute;
+			bottom: -20rpx;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+	}
 
-.content {
-  padding: 20rpx 24rpx;
-  padding-bottom: 200rpx;
-}
+	.content {
+		padding: 20rpx 24rpx;
+		padding-bottom: 200rpx;
+	}
 
-.empty {
-  font-size: 28rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: rgba(51, 51, 51, 0.7);
-  margin-top: 200rpx;
-}
-.footer {
-  position: fixed;
-  bottom: 0;
-  background-color: #fff;
-  display: flex;
-  justify-content: space-around;
-  width: 750rpx;
-  padding: 20rpx 0 66rpx;
+	.empty {
+		font-size: 28rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: rgba(51, 51, 51, 0.7);
+		margin-top: 200rpx;
+	}
 
-  .wx {
-    width: 338rpx;
-    background-color: #fff;
-    border-radius: 40rpx;
-    height: 80rpx;
-    font-size: 32rpx;
-    color: #222;
-    padding: 0;
-    margin: 0;
-    border: 2rpx solid #979797;
-  }
+	.footer {
+		position: fixed;
+		bottom: 0;
+		background-color: #fff;
+		display: flex;
+		justify-content: space-around;
+		width: 750rpx;
+		padding: 20rpx 0 66rpx;
 
-  .add {
-    width: 338rpx;
-    background-color: #f83224;
-    border-radius: 40rpx;
-    height: 80rpx;
-    font-size: 32rpx;
-    color: #fff;
-    padding: 0;
-    margin: 0;
-  }
+		.wx {
+			width: 338rpx;
+			background-color: #fff;
+			border-radius: 40rpx;
+			height: 80rpx;
+			font-size: 32rpx;
+			color: #222;
+			padding: 0;
+			margin: 0;
+			border: 2rpx solid #979797;
+		}
 
-  .add-international {
-    width: 702rpx;
-    background-color: #f83224;
-    border-radius: 40rpx;
-    height: 80rpx;
-    font-size: 32rpx;
-    color: #fff;
-    margin: 0 auto;
-  }
-}
-</style>
+		.add {
+			width: 338rpx;
+			background-color: #f83224;
+			border-radius: 40rpx;
+			height: 80rpx;
+			font-size: 32rpx;
+			color: #fff;
+			padding: 0;
+			margin: 0;
+		}
+
+		.add-international {
+			width: 702rpx;
+			background-color: #f83224;
+			border-radius: 40rpx;
+			height: 80rpx;
+			font-size: 32rpx;
+			color: #fff;
+			margin: 0 auto;
+		}
+	}
+</style>

pages.json

@@ -163,6 +163,14 @@
 						"navigationBarTitleText" : "",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "comment",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh" : false
+					}
 				}
 			]
 		},

pages/express/express.vue

@@ -6,10 +6,10 @@
 			<image src="../../static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
-			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :safeAreaInsetTop="true"
-				>
+			<u-navbar bgColor='rgba(255, 215,215, 1)' :placeholder='true' :safeAreaInsetTop="true">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
-					<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
+					<image @click="tochat" src="../../static/images/index/xiaoxi.png" mode=""
+						style="width: 40rpx;height: 40rpx;">
 					</image>
 					<image @click="counter" src="../../static/images/index/compile.png" mode=""
 						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
@@ -31,11 +31,18 @@
 					</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 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 class="">
+								<text class="topname">陈盼盼</text>
+								<text class="topaddress" style="margin-left: 8rpx;">134****8314</text>
+							</view>
+							<view class="topaddress" style="margin-top: 14rpx;">上海市上海市浦东新区商城路1177弄5号</view>
 						</view>
-						<view class="u-flex">
+						<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>
@@ -53,7 +60,7 @@
 							<view class="pople">{{i18n.recipient}}</view>
 							<view class="jiadd" style="margin-top: 14rpx;">{{i18n.informate}}</view>
 						</view>
-						<view class="u-flex">
+						<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>
@@ -65,7 +72,7 @@
 						<text class="wupin">{{i18n.item}}</text>
 						<view class="mast">{{i18n.required}}</view>
 					</view>
-					<view class="u-flex" @click='goods'>  
+					<view 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>
@@ -83,7 +90,7 @@
 					</view>
 				</view>
 				<!-- 去寄件 -->
-				<view class="" style="margin-top: 34rpx;" >
+				<view class="" style="margin-top: 34rpx;">
 					<view class="mail" @click="todev">
 						{{i18n.mail}}
 					</view>
@@ -93,7 +100,7 @@
 						<image src="../../static/express/share.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 						<text class="friend">{{i18n.share}}</text>
 					</view>
-					<view class="friend">|</view>  
+					<view class="friend">|</view>
 					<view class="u-flex" @click="counter">
 						<image src="/static/images/index/compile.png" style="width: 36rpx;height: 36rpx;" mode="">
 						</image>
@@ -116,18 +123,18 @@
 				<view class="u-flex u-row-around" style="margin-top: 44rpx;">
 					<view class="flexc" style="position: relative;" @click="pack(0)">
 						<!-- <view class="" style="position: absolute;top: 0;right: 0;"> -->
-						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="value"></u-badge>
+						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="transit"></u-badge>
 						<!-- </view> -->
 						<image src="/static/express/address.png" style='width:68rpx;height:68rpx' mode=""></image>
 						<text style='margin-top:16rpx'>{{i18n.deliver}}</text>
 					</view>
 					<view class="flexc" style="position: relative;" @click="pack(1)">
-						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="value"></u-badge>
+						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="receipt"></u-badge>
 						<image src="/static/express/sign.png" style='width:68rpx;height:68rpx' mode=""></image>
 						<text style='margin-top:16rpx'>{{i18n.Sign}}</text>
 					</view>
 					<view class="flexc" style="position: relative;" @click="pack(2)">
-						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="value"></u-badge>
+						<u-badge :absolute='true' :offset="[0,10]" :type="type" max="99" :value="overseas"></u-badge>
 						<image src="../../static/express/send.png" style='width:68rpx;height:68rpx' mode=""></image>
 						<text style='margin-top:16rpx'>{{i18n.overseas}}</text>
 					</view>
@@ -212,16 +219,22 @@
 				list: [],
 				current: 0,
 				type: "error",
-				value: 1, //徽标数量
 				percentage: 50, //进度条
 				logshow: false, //物流选择
+				status_collection: '', //我的包裹选择值
+				transit: 0, //发往中转点
+				receipt: 0, //中转已签收
+				overseas: 0, //正发往海外
+				topadd: {}, //新建寄件人
+				bottomadd: {}, //新建收件人
 			}
 		},
 		onLoad(options) {
-			this.list = [this.i18n.border,this.i18n.shop]
+			this.list = [this.i18n.border, this.i18n.shop]
 			if (options.current) {
 				this.current = options.current
 			}
+
 		},
 		onShow() {
 			this.list[0] = this.i18n.border
@@ -229,6 +242,7 @@
 			uni.setNavigationBarTitle({
 				title: this.i18n.setup
 			})
+			this.express() //获取包裹数量
 		},
 		computed: {
 			i18n() {
@@ -236,9 +250,37 @@
 			}
 		},
 		methods: {
-			todev(){
+			//地址薄
+			addbook(index) {
+				uni.navigateTo({
+					url: "/pageC/addressManagement/addressManagement?index=" + index,
+					events: {
+						getadd(res) {
+							if (index == 0) {
+								this.topadd = res
+								console.log('topadd',this.topadd);
+							} else {
+								this.bottomadd = res
+								console.log('bottom',this.bottomadd);
+							}
+						}
+					}
+				})
+			},
+			//我的包裹
+			express() {
+				uni.$u.http.get('/api/express-order/status-count', {}).then((res) => {
+					console.log(res);
+					this.overseas = res.to_overseas
+					this.receipt = res.transit_receipt
+					this.transit = res.to_transit
+				}).catch(() => {
+
+				})
+			},
+			todev() {
 				uni.navigateTo({
-					url:"/pageB/delivery"
+					url: "/pageB/delivery"
 				})
 			},
 			count() {
@@ -269,9 +311,9 @@
 				})
 			},
 			//消息
-			tochat(){
+			tochat() {
 				uni.navigateTo({
-					url:'/pageA/chat/news'
+					url: '/pageA/chat/news'
 				})
 			},
 			//物品信息
@@ -318,9 +360,30 @@
 </script>
 
 <style lang="scss" scoped>
-		page{
-			background-color: rgba(0,0,0,0)
-		}
+	page {
+		background-color: rgba(0, 0, 0, 0)
+	}
+
+	.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;
@@ -568,7 +631,7 @@
 				text-align: center;
 				font-style: normal;
 				margin-left: 12rpx;
-				padding:  0 4rpx;
+				padding: 0 4rpx;
 				box-sizing: border-box;
 			}
 		}

pages/index/index.vue

@@ -167,18 +167,31 @@
 					</view>
 					<view class="">
 						<text class="money">
-							¥{{item.price}}
+							¥{{item.is_discount==0?item.discount_price:item.price}}
 						</text>
 						<text class="weight">
 							¥{{item.weight}}kg
 						</text>
 					</view>
 					<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
-						<view v-if="item.is_shipping == 0" class="taber"
-							style="border: 1rpx solid #E5BC78;color: #E5BC78;">{{i18n.postage}}
-						</view>
-						<view class="taber" style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
-							{{i18n.Trade}}
+						<!-- 					<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
+							style="border: 1rpx solid #E5BC78;color: #E5BC78;">
+							<text>{{child.name_cn}}</text>
+						</view> -->
+						<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
+							style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
+							<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 class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
 					</view>
@@ -188,7 +201,7 @@
 
 		<u-popup :show="show" mode='center' :round='16' bgColor='transparent'>
 			<view style="position: relative;">
-				<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png"
+				<image :src="configimage"
 					style="width: 570rpx;height: 764rpx;border-radius: 16rpx;" mode=""></image>
 				<view class="" style="text-align: center;" @click='show=false'>
 					<image src="../../static/images/index/close.png" mode="" style="width: 70rpx;height: 70rpx;">
@@ -230,9 +243,10 @@
 				shippList: [], //海外包邮
 				keyword: '',
 				page: 1,
-				index:0,
-				parent_id:'',
-				last_page:''
+				index: 0,
+				parent_id: '',
+				last_page: '',
+				configimage:'',
 			}
 		},
 		computed: {
@@ -241,10 +255,10 @@
 			}
 		},
 		onReachBottom() {
-			if(this.page == this.last_page) {
+			if (this.page == this.last_page) {
 				this.$u.toast('已无更多数据')
 			} else {
-				this.page ++ 
+				this.page++
 				this.goods(this.parent_id)
 			}
 		},
@@ -256,8 +270,10 @@
 			}
 			//商品推荐
 			this.recommend()
+			
 		},
 		onShow() {
+			this.config()
 			// tabs列表
 			this.category()
 			//百万补贴
@@ -271,6 +287,18 @@
 			}
 		},
 		methods: {
+			//广告弹窗
+			config(){
+				uni.$u.http.get('api/config',{
+					params:{
+						module:'advertising'
+					}}).then((res) => {
+					console.log(res);
+					this.configimage = res.image
+				}).catch(() => {
+				
+				})
+			},
 			//海外包邮接口
 			shipp() {
 				uni.$u.http.post('api/goods/shipping').then((res) => {
@@ -306,7 +334,7 @@
 					this.goods(this.parent_id)
 				}
 			},
-			search(){
+			search() {
 				if (this.index == 0) {
 					this.recommend()
 				} else {
@@ -316,7 +344,9 @@
 			},
 			//商品推荐
 			recommend() {
-				uni.$u.http.post('/api/goods/recommend',{keyword:this.keyword}).then((res) => {
+				uni.$u.http.post('/api/goods/recommend', {
+					keyword: this.keyword
+				}).then((res) => {
 					this.recomlist = res
 				}).catch(() => {
 
@@ -373,7 +403,7 @@
 						keyword: this.keyword
 					}
 				}).then((res) => {
-					this.recomlist = this.recomlist.concat(res.data) 
+					this.recomlist = this.recomlist.concat(res.data)
 					this.last_page = res.last_page
 				}).catch(() => {
 

pages/shopping/shopping.vue

@@ -5,36 +5,66 @@
 		</view>
 		<u-navbar bgColor="#FE2E2E" :safeAreaInsetTop="true" :placeholder='true'>
 			<view class="u-nav-slot" slot="left">
-				<image src="../../static/shopping/title.png" style="width: 390rpx;height: 48rpx;" mode=""></image>
+				<image v-if="language =='zh-CN'" src="../../static/shopping/title.png" style="width: 390rpx;height: 48rpx;" mode=""></image>
+				<image v-else src="../../static/shopping/title1.png" style="width: 390rpx;height: 48rpx;" mode=""></image>
 			</view>
 		</u-navbar>
 		<view class="input u-flex u-row-between" style="margin-top: 16rpx;">
 			<view class="u-flex">
 				<image src="../../static/shopping/search.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
-				<input type="text" placeholder="请输入商品名称搜索" style="width: 500rpx;margin-left: 14rpx;" />
+				<input v-model="keyword" type="text" placeholder="请输入商品名称搜索"
+					style="width: 500rpx;margin-left: 14rpx;" />
 			</view>
-			<view class="search">搜索</view>
+			<view class="search" @click="search">搜索</view>
 		</view>
 		<view class="content">
 			<view class="">
-				<u-tabs lineColor="#f56c6c" :activeStyle="{
+				<!-- 	<u-tabs lineColor="#f56c6c" :activeStyle="{
             color: 'rgba(248, 53, 39, 1)',
             fontWeight: 'bold',
             transform: 'scale(1.05)'
-        }" :list="list1" @click="click"></u-tabs>
+        }" :list="list1" @click="click"></u-tabs> -->
+				<u-tabs :activeStyle="{
+		    color: 'rgba(248, 53, 39, 1)',
+		    fontWeight: 'bold',
+		    transform: 'scale(1.05)'
+		}" :list="list1" lineColor='rgba(248, 53, 39, 1)' @change='changetab'></u-tabs>
 			</view>
 			<view class="u-flex u-row-between" style="margin-top: 24rpx;flex-wrap: wrap;">
-				<view class="item" v-for="(item,idx) in 6" :key="idx" style="margin-bottom: 20rpx;">
-					<image src="/static/images/logo.png" style="width: 340rpx;height: 340rpx;" mode=""></image>
+				<view @click="todetail(item.id)" class="item" v-for="(item,idx) in list" :key="idx" style="margin-bottom: 20rpx;">
+					<image :src="item.goods.image" style="width: 340rpx;height: 340rpx;" mode=""></image>
 					<view class="" style="padding: 20rpx;box-sizing: border-box;">
-						<text class="title">可心柔 V9系列婴儿保wadhbiuawd</text>
+						<!-- <text class="title">可心柔 V9系列婴儿保wadhbiuawd</text> -->
+						<text class="titl" v-if="language =='zh-CN'">
+							{{item.goods.name_cn}}
+						</text>
+						<view class="titl" v-if="language =='en-US'">
+							{{item.goods.name_en}}
+						</view>
+						<view class="titl" v-if="language =='es-ES'">
+							{{item.goods.name_es}}
+						</view>
+						<view class="titl" v-if="language =='it-IT'">
+							{{item.goods.name_ita}}
+						</view>
 						<view class="u-flex" style="margin-top: 12rpx;flex-wrap: wrap;column-gap: 12rpx;">
-							<view class="tabsa" v-for="(item,index) in 3">
-								{{i18n.orderpaysforitself}}
+							<view class="tabsa" v-for="(child,idx) in item.goods.label_arr" :key="idx">
+								<text class="titl" v-if="language =='zh-CN'">
+									{{child.name_cn}}
+								</text>
+								<view class="titl" v-if="language =='en-US'">
+									{{child.name_en}}
+								</view>
+								<view class="titl" v-if="language =='es-ES'">
+									{{child.name_es}}
+								</view>
+								<view class="titl" v-if="language =='it-IT'">
+									{{child.name_ita}}
+								</view>
 							</view>
 						</view>
 						<view class="num">
-							{{i18n.Soldout}}5000+{{i18n.piece}}
+							{{i18n.Soldout}}{{item.goods.sale_num}}{{i18n.piece}}
 						</view>
 						<view class="" style="margin-top: 16rpx;position: relative;">
 							<image src="/static/shopping/btn.png"
@@ -43,7 +73,7 @@
 								style="padding:10rpx 20rpx 0 26rpx;width: 85%;position: relative;z-index: 1;">
 								<view class="" style="margin-top: 10rpx;">
 									<text class="money">¥</text>
-									<text class="money" style="font-size: 40rpx;">13.2</text>
+									<text class="money" style="font-size: 40rpx;">{{item.goods.price}}</text>
 								</view>
 								<image src="../../static/shopping/shop.png" style="width: 82rpx;height: 38rpx;" mode="">
 								</image>
@@ -63,30 +93,89 @@
 	export default {
 		data() {
 			return {
-				list1: [{
-					name: '关注',
-				}, {
-					name: '推荐',
-				}, {
-					name: '电影'
-				}, {
-					name: '科技'
-				}, {
-					name: '音乐'
-				}, {
-					name: '美食'
-				}, {
-					name: '文化'
-				}, {
-					name: '财经'
-				}, {
-					name: '手工'
-				}]
+				list1: [],
+				language: 'zh-CN', //语言
+				list: [],
+				keyword: '',
+				parent_id: ''
 			};
 		},
+		onShow() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+			this.category()
+			this.shipp()
+		},
 		methods: {
-			click(item) {
+			//跳转详情
+			todetail(id){
+				uni.navigateTo({
+					url:'/pageA/productdetails?id='+id
+				})
+			},
+			//搜索
+			search() {
+				this.shipp(this.parent_id)
+			},
+			//10元购
+			shipp() {
+				uni.$u.http.post('/api/goods/ten_yuan_goods', {
+					parent_id: this.parent_id,
+					keyword: this.keyword
+				}).then((res) => {
+					this.list = res.data
+				}).catch(() => {
+
+				})
+			},
+			//商品分类列表
+			category() {
+				uni.$u.http.get('/api/goods/category', {
+					params: {
+						parent_id: 0,
+					}
+				}).then((res) => {
+					const categoryArr = res
+					this.list1 = [{
+						name: '',
+						category_id: ''
+					}]
+					if (this.language == 'en-US') {
+						categoryArr.forEach(item => {
+							item.name = item.name_en
+						})
+						this.list1[0].name = 'selection'
+					}
+					if (this.language == 'es-ES') {
+						categoryArr.forEach(item => {
+							item.name = item.name_es
+						})
+						this.list1[0].name = 'Una selección de'
+					}
+					if (this.language == 'it-IT') {
+						categoryArr.forEach(item => {
+							item.name = item.name_ita
+						})
+						this.list1[0].name = 'selezionate'
+					}
+
+					if (this.language == 'zh-CN') {
+						categoryArr.forEach(item => {
+							item.name = item.name_cn
+						})
+						this.list1[0].name = '精选'
+					}
+					this.list1 = this.list1.concat(categoryArr)
+					console.log(this.list1);
+				}).catch(() => {
+
+				})
+			},
+			changetab(item) {
+				this.parent_id = item.id
 				console.log('item', item);
+				this.shipp(item.id)
 			}
 		},
 		computed: {

unpackage/dist/dev/mp-weixin/app.json

@@ -25,7 +25,8 @@
         "confirm",
         "shoptype",
         "shoplist",
-        "rule/rule"
+        "rule/rule",
+        "comment"
       ]
     },
     {

unpackage/dist/dev/mp-weixin/pageA/index.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageA/index"],{
 
 /***/ 214:
-/*!**********************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageA%2Findex"} ***!
-  \**********************************************************************/
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageA%2Findex"} ***!
+  \***********************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22,9 +22,9 @@ createPage(_index.default);
 /***/ }),
 
 /***/ 215:
-/*!*****************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue ***!
-  \*****************************************************/
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue ***!
+  \******************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -33,7 +33,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=156d5177& */ 216);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 218);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +42,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -61,31 +61,31 @@ component.options.__file = "pageA/index.vue"
 /***/ }),
 
 /***/ 216:
-/*!************************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
-  \************************************************************************************/
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
+  \*************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=156d5177& */ 217);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=156d5177& */ 217);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_156d5177___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
 /***/ 217:
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=template&id=156d5177& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -110,25 +110,25 @@ render._withStripped = true
 /***/ }),
 
 /***/ 218:
-/*!******************************************************************************!*\
-  !*** D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************/
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 219);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 219);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 219:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageA/index.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/pageB/index.js

@@ -1,9 +1,16 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
+<<<<<<< HEAD
+/***/ 338:
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
+  \***********************************************************************************/
+=======
 /***/ 330:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
   \**********************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -13,7 +20,11 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
+<<<<<<< HEAD
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 339));
+=======
 var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 331));
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,19 +32,31 @@ createPage(_index.default);
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 339:
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue ***!
+  \******************************************************************/
+=======
 /***/ 331:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
   \*****************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 340);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 342);
+=======
 /* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 332);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 334);
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +65,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -60,32 +83,51 @@ component.options.__file = "pageB/index.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 340:
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
+  \*************************************************************************************************/
+=======
 /***/ 332:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 341);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+=======
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=ab5bf790& */ 333);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 341:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
 /***/ 333:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -109,15 +151,35 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 342:
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+=======
 /***/ 334:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 343);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 343:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 335);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
@@ -129,6 +191,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -154,5 +217,9 @@ exports.default = _default;
 
 /***/ })
 
+<<<<<<< HEAD
+},[[338,"common/runtime","common/vendor"]]]);
+=======
 },[[330,"common/runtime","common/vendor"]]]);
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map

unpackage/dist/dev/mp-weixin/pageC/index.js

@@ -1,9 +1,16 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageC/index"],{
 
+<<<<<<< HEAD
+/***/ 454:
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
+  \***********************************************************************************/
+=======
 /***/ 446:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
   \**********************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -13,7 +20,11 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
+<<<<<<< HEAD
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 455));
+=======
 var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 447));
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,19 +32,31 @@ createPage(_index.default);
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 455:
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue ***!
+  \******************************************************************/
+=======
 /***/ 447:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
   \*****************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 456);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 458);
+=======
 /* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 448);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 450);
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +65,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -60,32 +83,51 @@ component.options.__file = "pageC/index.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 456:
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
+  \*************************************************************************************************/
+=======
 /***/ 448:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 457);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+=======
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=3f36b6f9& */ 449);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 457:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
 /***/ 449:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -109,15 +151,35 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 458:
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+=======
 /***/ 450:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 459);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 459:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 451);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
@@ -129,6 +191,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -155,5 +218,9 @@ exports.default = _default;
 
 /***/ })
 
+<<<<<<< HEAD
+},[[454,"common/runtime","common/vendor"]]]);
+=======
 },[[446,"common/runtime","common/vendor"]]]);
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageC/index.js.map

unpackage/dist/dev/mp-weixin/pageD/index.js

@@ -1,9 +1,16 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageD/index"],{
 
+<<<<<<< HEAD
+/***/ 642:
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
+  \***********************************************************************************/
+=======
 /***/ 634:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
   \**********************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -13,7 +20,11 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
+<<<<<<< HEAD
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 643));
+=======
 var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 635));
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,19 +32,31 @@ createPage(_index.default);
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 643:
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue ***!
+  \******************************************************************/
+=======
 /***/ 635:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
   \*****************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 644);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 646);
+=======
 /* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 636);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 638);
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -42,7 +65,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
   _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"],
   _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
@@ -60,32 +83,51 @@ component.options.__file = "pageD/index.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 644:
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
+  \*************************************************************************************************/
+=======
 /***/ 636:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 645);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+=======
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=57c92c8c& */ 637);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__["components"]; });
 
 
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 645:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
 /***/ 637:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -109,15 +151,35 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
+/***/ 646:
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+=======
 /***/ 638:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 647);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 647:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../工具/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 639);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
@@ -129,6 +191,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -153,5 +216,9 @@ exports.default = _default;
 
 /***/ })
 
+<<<<<<< HEAD
+},[[642,"common/runtime","common/vendor"]]]);
+=======
 },[[634,"common/runtime","common/vendor"]]]);
+>>>>>>> 24b4c23a0f3edbec983b628f07c0befa37d53b6f
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageD/index.js.map