解决冲突

components/kj-flow/kj-flow.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="u-flex u-row-between">
-			<view class=""></view>
+			<view class="" style="width: 28px;height: 28px;"></view>
 			<view class="title">跨境物流</view>
 			<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
 		</view>
@@ -10,7 +10,7 @@
 				<view v-for="(item,idx) in 6" :key="idx" @click="changea(idx)"
 					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;"
 					:style="{background:idx==leftchange? '':'#F7F7F7'}">
-					<view class="ititle">海运散货</view>
+					<view class="ititle" :style="{fontWeight:idx==leftchange?'600':''}">海运散货</view>
 					<view class="itime" v-if="idx==leftchange">预计到货时间 </view>
 					<view class="itime" v-if="idx==leftchange">2023-12-31</view>
 				</view>

manifest.json

@@ -1,76 +1,79 @@
 {
-	"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"
-}
+    "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"
+    }
+}

pageA/counter.vue

@@ -34,9 +34,9 @@
 				<view slot="minus" class="minus">
 					<u-icon name="minus" size="12"></u-icon>
 				</view>
-				<text slot="input" style="width: 50px;text-align: center;" class="input">{{value}}kg</text>
+				<text slot="input" style="width: 50px;text-align: center;display: block;height: 30px;line-height: 30px;background: #f5f5f5;" class="input">{{value}}kg</text>
 				<view slot="plus" class="plus">
-					<u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
+					<u-icon name="plus"  size="12"></u-icon>
 				</view>
 			</u-number-box>
 		</view>
@@ -248,9 +248,9 @@
 		.minus {
 			width: 22px;
 			height: 22px;
-			border-width: 1px;
-			border-color: #E6E6E6;
-			border-style: solid;
+			// border-width: 1px;
+			// border-color: #E6E6E6;
+			// border-style: solid;
 			border-top-left-radius: 100px;
 			border-top-right-radius: 100px;
 			border-bottom-left-radius: 100px;
@@ -267,7 +267,7 @@
 		.plus {
 			width: 22px;
 			height: 22px;
-			background-color: #FF0000;
+			// background-color: #FF0000;
 			border-radius: 50%;
 			/* #ifndef APP-NVUE */
 			display: flex;

pageA/order.vue

@@ -20,13 +20,16 @@
 			<view class="u-flex" style="margin-top: 32rpx;">
 				<image src="../static/images/logo.png" style="width: 184rpx;height: 184rpx;" mode=""></image>
 				<view class=" "
-					style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;">
+					style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
 					<view class="">
 						<text>鲜活黑虎虾 越冬虾 1kg 35-48只</text>
 						<view class="weight">黑虎虾 10kg</view>
 					</view>
 					<view class="u-flex u-row-between">
-						<text class="money">¥528.5</text>
+						<view class="">
+							<text class="money">¥</text>
+							<text class="money" style="font-size: 34rpx;">528.5</text>
+						</view>
 						<u-number-box v-model="value">
 							<!-- <view class="bu"> -->
 							<view slot="minus" class="">
@@ -62,7 +65,11 @@
 							<image src="../static/images/logo.png" style="width: 156rpx;height: 156rpx;" mode="">
 							</image>
 							<view class="title">Lemmycree/莱 米可蕊 洁净…</view>
-							<view class="">¥26.9</view>
+							<view class="money" style="color: #F83224;font-size: 20rpx;">
+								<text>¥</text>
+								<text style="font-size: 28rpx;">26</text>
+								<text>.9</text>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -93,7 +100,8 @@
 			<view class="zong u-flex u-row-right">
 				<view class="">
 					<text class="small">{{i18n.subtotal}}</text>
-					<text class="mon">¥2642.5</text>
+					<text class="mon">¥</text>
+					<text class="mon" style="font-size: 40rpx;">2642.5</text>
 				</view>
 			</view>
 		</view>
@@ -102,7 +110,8 @@
 			<view class="">
 				<text class="kg">{{i18n.Atotalof}}39kg,</text>
 				<text>{{i18n.total}}:</text>
-				<text class="money">¥2792.5</text>
+				<text class="money" style="font-size: 28rpx;">¥</text>
+				<text class="money" style="font-weight: bold;">2792.5</text>
 			</view>
 			<view class="order" @click="topay">
 				{{i18n.Submitorder}}
@@ -111,8 +120,12 @@
 		<!-- 跨境物流 -->
 		<u-popup :show="show" @close="close" @open="open" mode="bottom" closeIconPos='top-right' round='28'>
 			<view style="padding: 40rpx 28rpx;box-sizing:border-box;">
-				<view class="poptitle">
-					{{i18n.flow}}
+				<view class="u-flex u-row-between">
+					<view class="" style="width: 28px;height: 28px;"></view>
+					<view class="poptitle">
+						{{i18n.flow}}
+					</view>
+					<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
 				</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 6" @click="change(idx)"
@@ -130,31 +143,35 @@
 		<u-popup :safeAreaInsetTop='true' :show="show1" @close="close" @open="open" mode="bottom"
 			closeIconPos='top-right' round='28' bgColor='#F4F4F4'>
 			<view style="padding: 40rpx 28rpx;box-sizing:border-box;position: relative;">
-				<view class="poptitle">
-					{{i18n.flow}}
-				</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="u-flex u-row-between">
-						<text class="yundate">{{i18n.Shipmentdate}} 2023-12-09</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;"
-							mode=""></image>
+				<view class="u-flex u-row-between">
+					<view class="" style="width: 28px;height: 28px;"></view>
+					<view class="poptitle">
+						{{i18n.flow}}
 					</view>
-					<view class="u-flex u-row-between" style="margin-top: 28rpx;">
-						<view class="chest">
-							<text>2号海运柜</text>
-							<text style="margin: 0 16rpx;">|</text>
-							<text>{{i18n.Estimatedtimeofarrival}}22{{i18n.Workingday}}</text>
+					<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="u-flex u-row-between">
+							<text class="yundate">{{i18n.Shipmentdate}} 2023-12-09</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;"
+								mode=""></image>
 						</view>
-						<view class="mone">
-							<text>¥</text>
-							<text style="font-size: 32rpx;">1820</text>
+						<view class="u-flex u-row-between" style="margin-top: 28rpx;">
+							<view class="chest">
+								<text>2号海运柜</text>
+								<text style="margin: 0 16rpx;">|</text>
+								<text>{{i18n.Estimatedtimeofarrival}}22{{i18n.Workingday}}</text>
+							</view>
+							<view class="mone">
+								<text>¥</text>
+								<text style="font-size: 32rpx;">1820</text>
+							</view>
 						</view>
 					</view>
-				</view>
-				<!-- </scroll-view> -->
+				</scroll-view>
 				<view class="" style="height: 166rpx;"></view>
 				<view class="enbottom  u-flex u-row-between">
 					<view class="cancel" @click="close">{{i18n.Cancel}}</view>
@@ -212,6 +229,10 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .u-status-bar {
+		height: 0 !important;
+	}
+
 	.confirm {
 		width: 398rpx;
 		height: 84rpx;
@@ -264,7 +285,7 @@
 
 	.yundate {
 		font-family: PingFangSC, PingFang SC;
-		font-weight: 600;
+		font-weight: 550;
 		font-size: 32rpx;
 		color: #333333;
 		line-height: 44rpx;
@@ -386,6 +407,8 @@
 				line-height: 38rpx;
 				text-align: left;
 				font-style: normal;
+				// font-weight: 500;
+				font-weight: bold;
 			}
 
 			.kg {
@@ -425,7 +448,7 @@
 			.zong {
 				width: 654rpx;
 				padding: 22rpx 0 0 0;
-				border-top: 2rpx solid #979797;
+				border-top: 2rpx solid rgba(151, 151, 151, 0.1);
 				margin-top: 32rpx;
 
 				.small {
@@ -446,6 +469,7 @@
 					text-align: left;
 					font-style: normal;
 					margin-left: 12rpx;
+					font-weight: bold;
 				}
 			}
 
@@ -474,6 +498,7 @@
 				line-height: 38rpx;
 				text-align: left;
 				font-style: normal;
+				font-weight: 600;
 			}
 		}
 
@@ -553,6 +578,7 @@
 				line-height: 34rpx;
 				text-align: left;
 				font-style: normal;
+				font-weight: 600;
 			}
 
 			.name {
@@ -570,7 +596,7 @@
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
 				font-size: 24rpx;
-				color: #222222;
+				color: rgba(34, 34, 34, 0.6);
 				line-height: 34rpx;
 				text-align: left;
 				font-style: normal;

pageA/productdetails.vue

@@ -1,190 +1,207 @@
 <template>
 	<view>
-		<!-- 自定义导航栏 -->
-		<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='0' @click="click" :list="list1" lineColor='#fff' :activeStyle=" {color:'#FF1515'}"
-						:inactiveStyle="{
+		<scroll-view ref="scrollView" scroll-y="true" style="min-height: 100%;">
+			<!-- 页面内容 -->
+
+			<!-- 自定义导航栏 -->
+			<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='0' @click="click" :list="list1" lineColor='#fff'
+							:activeStyle=" {color:'#FF1515'}" :inactiveStyle="{
 						color:' #666666' }"></u-tabs>
-				</view>
-				<!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
+					</view>
+					<!-- 				<view class="" style="margin-left: 184rpx;" @click="share = true">
 					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 				</view> -->
-			</view>
-			<view class="u-nav-slot u-flex" slot="right" style="display: flex;">
-				<view class="" style="margin-left: 184rpx;" @click="share = true">
-					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 				</view>
-				<view class="" style="width: 180rpx;"></view>
-			</view>
-		</u-navbar>
-		<!-- 商品图片 -->
-		<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png" style="width: 750rpx;height: 750rpx;" mode="">
-		</image>
-		<view class="back">
-			<!-- 折扣 -->
-			<view class="discount">
-				<view class="top">
-					<text class='count'>{{i18n.Discounted}}</text>
-					<text class='money'>¥</text>
-					<text class='money' style="font-size: 48rpx;">258</text>
-					<text class='money'>.00</text>
-					<text class='right'>¥328.5</text>
-				</view>
-				<view class="bottom">
-					<text class="tabs">{{i18n.sametype}}</text>
-					<view class="title">
-						<text class="title" selectable @longpress="onLongPress">
-							布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼
-						</text>
+				<view class="u-nav-slot u-flex" slot="right" style="display: flex;">
+					<view class="" style="margin-left: 184rpx;" @click="share = true">
+						<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
 					</view>
-				</view>
-			</view>
-			<!-- 服务 -->
-			<view class="serve" style="margin-top: 20rpx;">
-				<view class="top u-flex u-row-between">
-					<view class="u-flex">
-						<view class="change">{{i18n.Sele}}</view>
-						<view class="" style="margin-left: 20rpx;">{{i18n.Netcontent}}</view>
+					<view class="" style="width: 180rpx;"></view>
+				</view>
+			</u-navbar>
+			<!-- 商品图片 -->
+			<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png" style="width: 750rpx;height: 750rpx;" mode="">
+			</image>
+			<view class="back">
+				<!-- 折扣 -->
+				<view class="discount">
+					<view class="top">
+						<text class='count'>{{i18n.Discounted}}</text>
+						<text class='money'>¥</text>
+						<text class='money' style="font-size: 48rpx;">258</text>
+						<text class='money'>.00</text>
+						<text class='right'>¥328.5</text>
 					</view>
-					<view class="">
-						<u-icon name="arrow-right" size='16'></u-icon>
+					<view class="bottom">
+						<text class="tabs">{{i18n.sametype}}</text>
+						<view class="title">
+							<text class="title" selectable @longpress="onLongPress">
+								布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼
+							</text>
+						</view>
 					</view>
 				</view>
-				<view class="top u-flex u-row-between" style="margin-top: 36rpx;">
-					<view class="u-flex" @click="serve=true">
-						<view class="change">{{i18n.service}}</view>
-						<view class="" style="margin-left: 20rpx;">正品保障 · 极速退款 · 7天无理由退</view>
+				<!-- 服务 -->
+				<view class="serve" style="margin-top: 20rpx;">
+					<view class="top u-flex u-row-between">
+						<view class="u-flex">
+							<view class="change">{{i18n.Sele}}</view>
+							<view class="" style="margin-left: 20rpx;">{{i18n.Netcontent}}</view>
+						</view>
+						<view class="">
+							<u-icon name="arrow-right" size='16'></u-icon>
+						</view>
 					</view>
-					<view class="">
-						<u-icon name="arrow-right" size='16'></u-icon>
+					<view class="top u-flex u-row-between" style="margin-top: 36rpx;" @click="serve=true">
+						<view class="u-flex">
+							<view class="change">{{i18n.service}}</view>
+							<view class="" style="margin-left: 20rpx;">正品保障 · 极速退款 · 7天无理由退</view>
+						</view>
+						<view class="">
+							<u-icon name="arrow-right" size='16'></u-icon>
+						</view>
 					</view>
 				</view>
-			</view>
-			<!-- 评论 -->
-			<view class="comment">
-				<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>
-						<u-icon name="arrow-right" size='16'></u-icon>
+				<!-- 评论 -->
+				<view class="comment" ref="targetPosition">
+					<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>
+							<u-icon name="arrow-right" size='16'></u-icon>
+						</view>
 					</view>
-				</view>
-				<view class="uesr u-flex u-row-between" style="margin-top: 36rpx;">
-					<view class="u-flex">
-						<image src="../static/images/logo.png" style="width: 52rpx;height: 52rpx;" mode=""></image>
-						<text class="name">有**钱</text>
+					<view class="uesr u-flex u-row-between" style="margin-top: 36rpx;">
+						<view class="u-flex">
+							<image src="../static/images/logo.png" style="width: 52rpx;height: 52rpx;" mode=""></image>
+							<text class="name">有**钱</text>
+						</view>
+						<text class="strip">2023.11.23</text>
+					</view>
+					<view class="content">
+						回购了不知道第几次了，家里猫还没吃腻呢，
 					</view>
-					<text class="strip">2023.11.23</text>
-				</view>
-				<view class="content">
-					回购了不知道第几次了，家里猫还没吃腻呢，
 				</view>
-			</view>
-			<!-- 店铺 -->
-			<view class="store u-flex u-row-between">
-				<view class="u-flex">
-					<image src='../static/images/logo.png' style="width: 112rpx;height: 112rpx;" mode=""></image>
-					<view class="" style="margin-left: 20rpx;">
-						<view class="title">小萌优选🔥（每天0元秒杀）</view>
-						<view class="" style='margin-top:20rpx'></view>
-						<view class="u-flex" style='margin-top:20rpx'>
-							<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
-							<view class="line"></view>
-							<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
+				<!-- 店铺 -->
+				<view class="store u-flex u-row-between">
+					<view class="u-flex">
+						<image src='../static/images/logo.png' style="width: 112rpx;height: 112rpx;" mode=""></image>
+						<view class="" style="margin-left: 20rpx;">
+							<view class="title">小萌优选🔥（每天0元秒杀）</view>
+							<view class="" style='margin-top:20rpx'></view>
+							<view class="u-flex" style='margin-top:20rpx'>
+								<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
+								<view class="line"></view>
+								<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
+							</view>
 						</view>
 					</view>
+					<view class="goshop">{{i18n.stroll}}</view>
 				</view>
-				<view class="goshop">{{i18n.stroll}}</view>
-			</view>
-			<!-- 推荐 -->
-			<view class="recommend">
-				<view class="title">
-					{{i18n.Recommended}}
-				</view>
-				<view class="">
-					<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
-						<swiper-item v-for="(parent,index) in 4" :key="index">
-							<view class="u-flex  swiper-item u-row-between">
-								<view class="" v-for="child in 3" @click="toinfo(child.id)">
-									<image src="/static/images/logo.png" style="width: 214rpx;height: 214rpx;" mode=""></image>
-									<view class="u-line-1" style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;">布兰德烘焙猫粮预售鲜肉乌骨鸡囤货</view>
-									<view class="">
-										<span style="color:rgba(204, 51, 0, 1) ;margin-top: 12rpx;font-size: 26rpx;">¥{{child.price||235.55}}</span>
+				<!-- 推荐 -->
+				<view class="recommend">
+					<view class="title">
+						{{i18n.Recommended}}
+					</view>
+					<view class="">
+						<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
+							<swiper-item v-for="(parent,index) in 4" :key="index">
+								<view class="u-flex  swiper-item u-row-between">
+									<view class="" v-for="child in 3" @click="toinfo(child.id)">
+										<image src="/static/images/logo.png" style="width: 214rpx;height: 214rpx;"
+											mode="">
+										</image>
+										<view class="u-line-1"
+											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;">
+											布兰德烘焙猫粮预售鲜肉乌骨鸡囤货</view>
+										<view class="">
+											<span
+												style="color:rgba(204, 51, 0, 1) ;margin-top: 12rpx;font-size: 26rpx;">¥{{child.price||235.55}}</span>
+										</view>
 									</view>
 								</view>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-			<view class="recommend">
-				<view class="title">{{i18n.Productdetails}}</view>
-				<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">{{i18n.Specification}}</view>
-				<view class="specification">
-					<view class="item u-flex" style='margin-bottom:28rpx'>
-						<view style='width:150rpx;'>{{i18n.material}}</view>
-						<text style='margin-left:58rpx'>保鲜鸡肉，鸡心，鸡肝</text>
-					</view>
-					<view class="item u-flex" style='margin-bottom:28rpx'>
-						<view style='width:150rpx;'>{{i18n.specification}}</view>
-						<text style='margin-left:58rpx'>300g</text>
-					</view>
-					<view class="item u-flex" style='margin-bottom:28rpx'>
-						<view style='width:150rpx;'>{{i18n.Shelflife}}</view>
-						<text style='margin-left:58rpx'>12个月</text>
-					</view>
-					<view class="item u-flex">
-						<view style='width:150rpx;'>{{i18n.Suitableobject}}</view>
-						<text style='margin-left:58rpx'>3个月以上的全猫种</text>
+							</swiper-item>
+						</swiper>
 					</view>
 				</view>
-			</view>
-			<view class="">
-				<image src="../static/images/logo.png" style="width: 710rpx;height: 580rpx;" mode=""></image>
-			</view>
-			<view class="" style="height: 158rpx;"></view>
-			<view class="fix u-flex u-row-between">
-				<view class="u-flex" style="column-gap: 35rpx;">
-					<view class="u-flex" style="justify-content: center;flex-direction: column;">
-						<image src="../static/images/index/service.png" style='width:40rpx;height:40rpx' mode="">
-						</image>
-						<view class="ke">{{i18n.Customer}}</view>
-					</view>
-					<view class="u-flex" style="justify-content: center;flex-direction: column;" @click="join">
-						<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;">
-						<image src="../static/images/index/attention.png" style='width:40rpx;height:40rpx' mode="">
-						</image>
-						<view class="ke">{{i18n.follow}}</view>
+				<view class="recommend">
+					<view class="title">{{i18n.Productdetails}}</view>
+					<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">{{i18n.Specification}}</view>
+					<view class="specification">
+						<view class="item u-flex" style='margin-bottom:28rpx'>
+							<view style='width:150rpx;'>{{i18n.material}}</view>
+							<text style='margin-left:58rpx'>保鲜鸡肉，鸡心，鸡肝</text>
+						</view>
+						<view class="item u-flex" style='margin-bottom:28rpx'>
+							<view style='width:150rpx;'>{{i18n.specification}}</view>
+							<text style='margin-left:58rpx'>300g</text>
+						</view>
+						<view class="item u-flex" style='margin-bottom:28rpx'>
+							<view style='width:150rpx;'>{{i18n.Shelflife}}</view>
+							<text style='margin-left:58rpx'>12个月</text>
+						</view>
+						<view class="item u-flex">
+							<view style='width:150rpx;'>{{i18n.Suitableobject}}</view>
+							<text style='margin-left:58rpx'>3个月以上的全猫种</text>
+						</view>
 					</view>
 				</view>
-				<!-- 	<view class="join" @click="join">加入购物车</view>
-				<view class="pin">立即拼团</view> -->
-				<view class="tongzhi" @click="inform">
+				<view class="">
+					<image src="../static/images/logo.png" style="width: 710rpx;height: 580rpx;" mode=""></image>
+				</view>
+				<view class="" style="height: 158rpx;"></view>
+				<view class="fix u-flex u-row-between">
+					<view class="u-flex" style="column-gap: 35rpx;">
+						<view class="u-flex" style="justify-content: center;flex-direction: column;">
+							<image src="../static/images/index/service.png" style='width:40rpx;height:40rpx' mode="">
+							</image>
+							<view class="ke">{{i18n.Customer}}</view>
+						</view>
+						<view class="u-flex" style="justify-content: center;flex-direction: column;" @click="join">
+							<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;">
+							<image src="../static/images/index/attention.png" style='width:40rpx;height:40rpx' mode="">
+							</image>
+							<view class="ke">{{i18n.follow}}</view>
+						</view>
+					</view>
+					<view class="join" @click="join">加入购物车</view>
+					<view class="pin" @click="order">立即拼团</view>
+					<!-- 				<view class="tongzhi" @click="inform">
 					{{i18n.notification}}
+				</view> -->
 				</view>
 			</view>
-		</view>
+		</scroll-view>
 		<!-- 加入购物车 -->
-		<u-popup :show="show">
-			<view style="padding:48rpx 28rpx;box-sizing: border-box;">
+		<u-popup :round="10" :show="show">
+			<view style="padding:48rpx 28rpx;box-sizing: border-box;position: relative;">
 				<view class="u-flex">
 					<image src="../static/images/logo.png" style="width: 192rpx;height: 192rpx;" mode=""></image>
 					<view class="" style="margin-left: 20rpx;">
-						<view class="">¥168.00</view>
+						<view class="">
+							<text class="read">¥</text>
+							<text class="read" style="font-size: 40rpx;">168</text>
+							<text class="read">.00</text>
+						</view>
 						<text class="guige">已选：鸡肉；2kg【单包装】</text>
 					</view>
 				</view>
+				<view class="" style="position: absolute;top: 48rpx;right: 28rpx;">
+					<u-icon name="close" @click="show==false" color="#000" size="28"></u-icon>
+				</view>
 				<view class="title1" style="margin-top: 40rpx;margin-bottom: 32rpx;">
 					食品口味
 				</view>
 				<view class="u-flex" style="column-gap: 18rpx;flex-wrap: wrap;">
-					<view class="tabs">
+					<view class="" :class="idx==actab?'acttab':'tabs'" v-for="(item,idx) in 4" :key="idx"
+						@click="actabs(idx)">
 						鸡肉
 					</view>
 				</view>
@@ -238,17 +255,20 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-popup :show="share" bgColor=' rgba(244, 244, 244, 1);'>
-			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(244, 244, 244, 1);">
-				<view class="u-flex" style="flex-direction: column;justify-content: center;">
+		<u-popup :round="10" :show="share" bgColor=' rgba(244, 244, 244, 1);'>
+			<view
+				style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(244, 244, 244, 1);border-radius: 10px 10px 0 0 ;">
+				<view class="u-flex u-row-between" style="">
+					<view class="" style="width: 28px;height: 28px;"></view>
 					<text class="info" style="font-size: 32rpx;">
 						{{i18n.shar}}
 					</text>
-				</view>
-				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
 					<image src="../static/images/index/bottom2.png" style="width: 40rpx;height: 40rpx;">
 				</view>
-				<view class="u-flex " style="justify-content: space-around;margin-top: 82rpx;">
+				<!-- 				<view class="" style="position: absolute;top: 48rpx;right:24rpx;">
+					
+				</view> -->
+				<view class="u-flex u-row-between" style="margin-top: 82rpx;padding:  0 140rpx;">
 					<view class="">
 						<image src="../static/images/index/link.png" style="width: 108rpx;height: 108rpx;" mode="">
 						</image>
@@ -265,8 +285,12 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-popup :show="imagea" bgColor=' rgba(244, 244, 244, 0);' mode='center' :customStyle="{alignItems: 'center'}" >
-			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(255, 255, 255, 1);border-radius: 16rpx;width: 538rpx;">
+		<u-popup :show="imagea" bgColor=' rgba(244, 244, 244, 0);' mode='center' :customStyle="{alignItems: 'center'}">
+			<view class="u-fle" style="display: flex; justify-content: flex-end;width: 100%;">
+				<u-icon name="close" @click="imagea==false" color="#fff" size="28"></u-icon>
+			</view>
+			<view
+				style="padding:48rpx 24rpx;box-sizing: border-box;background-color: rgba(255, 255, 255, 1);border-radius: 16rpx;width: 538rpx;">
 				<view class="" style="">
 					<image src="../static/images/index/bottom2.png" style="width: 490rpx;height: 490rpx;">
 				</view>
@@ -276,7 +300,8 @@
 					<span>00</span>
 				</view>
 				<view class="title">布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼</view>
-				<view class="" style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 44rpx;">
+				<view class=""
+					style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-top: 44rpx;">
 					<image src="../static/images/logo.png" style="width: 132rpx;height: 132rpx;" mode=""></image>
 					<view class="view">长按识别查看</view>
 				</view>
@@ -292,14 +317,12 @@
 			return {
 				imagea: false,
 				list1: [{
-						name: '商品',
-					}
-					// , {
-					// 	name: '评价',
-					// }, {
-					// 	name: '详情'
-					// },
-				],
+					name: '商品',
+				}, {
+					name: '评价',
+				}, {
+					name: '详情'
+				}, ],
 				current: 0,
 				// 购物车
 				show: false,
@@ -308,7 +331,8 @@
 				//分享
 				share: false,
 				value: 0, //步进器的值
-				swiptlist: []
+				swiptlist: [],
+				actab: 0
 			};
 		},
 		computed: {
@@ -317,8 +341,23 @@
 			}
 		},
 		methods: {
+			scrollToPosition() {
+				console.log(111);
+				// 使用$refs获取目标位置的DOM元素
+				const targetElement = this.$refs.targetPosition;
+				// 调用scrollToView方法滚动到目标位置
+				this.$refs.scrollView.scrollToView('targetPosition');
+			},
+			actabs(idx) {
+				this.actab = idx
+			},
+			order() {
+				uni.navigateTo({
+					url: '/pageA/order'
+				})
+			},
 			//生成图片弹窗
-			builder(){
+			builder() {
 				this.imagea = true
 				this.share = false
 			},
@@ -348,6 +387,10 @@
 			},
 			click(item) {
 				this.current = item
+				console.log(item);
+				if (item.index == 1) {
+					this.scrollToPosition()
+				}
 			},
 			join() {
 				this.show = true
@@ -388,7 +431,35 @@
 </script>
 
 <style lang="scss" scoped>
-	.money{
+	.acttab {
+		height: 68rpx;
+		padding: 14rpx 30rpx;
+		text-align: center;
+		box-sizing: border-box;
+		display: inline;
+		background: rgba(248, 50, 36, 0.06);
+		border-radius: 6rpx;
+		border: 2rpx solid #F83224;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #F83224;
+		line-height: 40rpx;
+	}
+
+	.read {
+		font-family: HarmonyOS_Sans_Medium;
+		font-size: 26rpx;
+		color: #F83224;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	// ::v-deep .u-popup__content{
+	// 	background-color: rgba(0,0,0,0) !important;
+	// }
+	.money {
 		font-family: HarmonyOS_Sans_Medium;
 		font-size: 20rpx;
 		color: #F83224;
@@ -396,7 +467,8 @@
 		text-align: left;
 		font-style: normal;
 	}
-	.title{
+
+	.title {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 28rpx;
@@ -406,7 +478,8 @@
 		font-style: normal;
 		margin-top: 16rpx;
 	}
-	.view{
+
+	.view {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 20rpx;
@@ -416,6 +489,7 @@
 		font-style: normal;
 		margin-top: 12rpx;
 	}
+
 	.actabs {
 		width: 116rpx;
 		height: 68rpx;
@@ -450,7 +524,7 @@
 
 	.title1 {
 		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
+		font-weight: 550;
 		font-size: 32rpx;
 		color: #222222;
 		line-height: 44rpx;
@@ -640,7 +714,7 @@
 
 			.title {
 				font-family: PingFangSC, PingFang SC;
-				font-weight: 500;
+				font-weight: 550;
 				font-size: 28rpx;
 				color: #222222;
 				line-height: 40rpx;
@@ -831,7 +905,7 @@
 				.title {
 					margin-top: 24rpx;
 					font-family: PingFangSC, PingFang SC;
-					font-weight: 500;
+					font-weight: 550;
 					font-size: 32rpx;
 					color: #222222;
 					line-height: 44rpx;
@@ -856,7 +930,8 @@
 			}
 		}
 	}
-	::v-deep .u-popup__content data-v-17becaea{
+
+	::v-deep .u-popup__content data-v-17becaea {
 		align-items: center !important;
 	}
 </style>

pageA/rule/rule.vue

@@ -1,95 +1,46 @@
 <template>
-	<div class="product-specifications">
-		<view class="">{{all}}</view>
-	</div>
+  <div>
+    <ul>
+      <!-- 遍历转换后的数组 -->
+      <li v-for="(item, index) in formattedItems" :key="index">
+        {{ item.item }}, 高度: {{ item.height }}
+      </li>
+    </ul>
+  </div>
 </template>
 
 <script>
-import { nextTick } from 'vue';
-	export default {
-		data() {
-			return {
-				arr: [
-					['黑色', '白色', '蓝色'],
-					['8GB', '16GB', '32GB'],
-					['大', '中', '小']
-				],
-				all: [],
-				allArray: [{
-					name: '颜色',
-					size: ['白色', '红色', '黑色'],
-				}, {
-					name: '尺寸',
-					size: ['X', 'XL', 'XXL']
-				}],
-				rule:[]
-			};
-		},
-		mounted() {
-			let colorArray = ['白色', '红色', '黑色'] //选择的颜色
-			let sizeArray = ['X', 'XL', 'XXL'] //选择的尺寸
-			//组合数组 格式为：[[],[]]
-			this.fun()
-		
-			
-		},
-		methods: {
-			// fun() {
-			// 	var obj = {}
-			// 	this.allArray.forEach((item) => {
-			// 		item.size.forEach((a) => {
-			// 			obj = {[item.name]: a}
-			// 			obj[item.name]
-			// 			console.log(this.allArray);    
-			// 		})
-			// 	})
-			// },
-			
-			fun(){
-				this.all = this.allArray.map(item => {
-				  // 将每个size数组中的元素转换为对象形式
-				  const transformedSize = item.size.map(size => ({ [item.name]: size }));
-				  // 返回更新后的对象
-				  return {
-				    size: transformedSize
-				  };
-				});
-				
-				this.$nextTick(()=>{
-					const rule = this.cartesianProductOf(this.all); //调用笛卡尔积方法
-				})
-				// console.log(this.all);   
-			},
-
-
-			cartesianProductOf: function() { //笛卡尔积
-				return Array.prototype.reduce.call(arguments, function(a, b) {
-					var ret = [];
-					console.log(a);
-					a.forEach(function(a) {
-						b.forEach(function(b) {
-							ret.push(a.concat([b]));
-						});
-					});
-					return ret;
-				}, [
-					[]
-				]);
-			},
-		}
-	}
-</script>
-
-<style scoped>
-	.spec-item {
-		margin: 10px;
-	}
-
-	.combinations-list {
-		margin-top: 20px;
-	}
-
-	.combination-item {
-		margin: 5px 0;
-	}
-</style>
+export default {
+  data() {
+    return {
+      // 原始数组
+      items: [
+        ['绿色', '中'],
+        ['绿色', '中'],
+        ['绿色', '中'],
+        ['绿色', '中'],
+        ['绿色', '中'],
+        ['绿色', '中']
+      ],
+      // 转换后的数据
+      formattedItems: []
+    };
+  },
+  created() {
+    this.formatItems();  
+  },
+  methods: {
+    formatItems() {
+      // 遍历原始数组并转换格式
+      this.items.forEach(item => {
+        // 创建新的item对象并添加到formattedItems数组中
+        this.formattedItems.push({
+          item: `${item[0]}，${item[1]}`,
+          height: '' // 假设高度为20
+        });
+      });
+	  console.log(this.formattedItems);  
+    }
+  }
+};
+</script>   

pageA/shoplist.vue

@@ -64,7 +64,7 @@
 					<view class="btn1">
 						{{i18n.reset}}
 					</view>
-					<view class="btn2">
+					<view class="btn2" @click="shai=false">
 						{{i18n.enter}}
 					</view>
 				</view>
@@ -197,6 +197,9 @@
 			click(item) {
 				console.log('item', item);
 				this.curess = item.index
+				uni.navigateTo({
+					url:'/pageB/delivery'
+				})
 			},
 			changei(idx) {
 				this.index = idx

pageA/subsidy.vue

@@ -3,7 +3,7 @@
 	<view style="position: relative;">
 		<image src="static/images/back.png"
 			style="width: 750rpx;height: 468rpx;position: absolute;top: 0;left: 0;z-index: -1;" mode=""></image>
-		<u-navbar :safeAreaInsetTop="true" bgColor="rgba(0,0,0,0)" :placeholder='true'>
+		<u-navbar :autoBack='true' :safeAreaInsetTop="true" bgColor="rgba(0,0,0,0)" :placeholder='true'>
 			<view class="u-nav-slot u-flex" slot="left">
 				<u-icon name="arrow-left" size="19" color='rgba(253, 252, 251, 1)'></u-icon>
 				<view class="input">
@@ -14,9 +14,9 @@
 		</u-navbar>
 		<!-- 标签 -->
 		<view class=" u-row-center" style="margin-top: 52rpx;display: flex;flex-direction: column;align-items: center;">
-			<!-- <image src="static/images/img1.png" style="width: 484rpx;height: 52rpx;" mode=""></image> -->
-			<!-- <image src="static/images/img2.png" style="width: 346rpx;height: 64rpx;" mode=""></image> -->
-			<image src="static/images/goshop.png" style="width: 382rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==1" src="static/images/img1.png" style="width: 484rpx;height: 52rpx;" mode=""></image>
+			<image v-if="show==2" src="static/images/img2.png" style="width: 346rpx;height: 64rpx;" mode=""></image>
+			<image v-if="show==3" src="static/images/goshop.png" style="width: 382rpx;height: 52rpx;" mode=""></image>
 			<!-- 			<image src="static/images/img1.png" style="width: 484rpx;height: 52rpx;" mode=""></image> -->
 			<view class="biaopqian" style="margin-top: 20rpx;">
 				<text>{{i18n.Goodgoods}}</text>
@@ -49,11 +49,11 @@
 							</text>
 						</view>
 					</view>
-					<view class="backimg" style="position: relative;">
+					<view class="backimg" style="position: relative;" >
 						<image src="./static/images/tab.png"
 							style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;z-index: 0;" mode="">
 						</image>
-						<!-- 					<view class="u-flex u-row-between"
+						<view v-if="show==1" class="u-flex u-row-between"
 							style="position: relative;z-index: 1;padding:0 24rpx ;text-align: center;line-height: 68rpx;">
 							<view class="">
 								<text class="textone">补贴价</text>
@@ -66,18 +66,20 @@
 								<text class='textfour' style="margin-left: 8rpx;">¥</text>
 								<text class='textfour' style="font-size:  28rpx;">25.8</text>
 							</view>
-						</view> -->
-						<view class="u-flex u-row-between"
+						</view>
+						<view v-if="show==2 || show==3" class="u-flex u-row-between"
 							style="position: relative;z-index: 1;padding:0 24rpx ;text-align: center;line-height: 68rpx;">
 							<view class="">
-								<text class="textone">{{i18n.Subsidized}}</text>
+								<text v-if="show==2" class="textone">{{i18n.Subsidized}}</text>
+								<text v-if="show==3" class="textone">包邮价</text>
 								<text class='texttwo' style="margin-left: 12rpx;">¥</text>
 								<text class='texttwo' style="font-size: 40rpx;">16</text>
 								<text class='texttwo'>.13</text>
 							</view>
-							<!-- <view class=""> -->
-							<image src="static/images/qiang.png" style="width: 48rpx;height: 38rpx;" mode=""></image>
-							<!-- </view> -->
+							<view class="">
+								<image src="static/images/qiang.png" style="width: 48rpx;height: 38rpx;" mode="">
+								</image> 
+							</view>
 						</view>
 					</view>
 				</view>
@@ -108,7 +110,8 @@
 					name: '财经'
 				}, {
 					name: '手工'
-				}]
+				}],
+				show:1
 			};
 		},
 		computed: {
@@ -116,6 +119,9 @@
 				return this.$t('index')
 			}
 		},
+		onLoad(options) {
+			this.show = options.show
+		}
 	}
 </script>
 

pageB/ParcelExpress.vue

@@ -6,8 +6,8 @@
 			<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 title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
-				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
+			<u-navbar :autoBack='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
+				:safeAreaInsetTop="true" style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>
 				</view>
@@ -35,7 +35,7 @@
 			</view>
 			<!-- 地址 -->
 			<view class="address">
-				<view class="left u-flex" style="display: flex;">
+				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
@@ -54,7 +54,7 @@
 					</view>
 				</view>
 				<view class="left u-flex"
-					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)">
+					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)" @click="recipirnt">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/shou.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
@@ -72,7 +72,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="wup">
+			<view class="wup" @click="goods">
 				<!-- 物品信息 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
@@ -103,7 +103,7 @@
 						<text style="color: rgba(248, 50, 36, 1);">《{{i18n.International}}》</text>
 					</view>
 				</view>
-				<view class="tonext " style="">
+				<view class="tonext " style="" @click="next">
 					{{i18n.next}}
 				</view>
 			</view>
@@ -128,8 +128,29 @@
 			}
 		},
 		methods: {
+			goods() {
+				uni.navigateTo({
+					url: '/pageB/goods'
+				})
+			},
+			//寄件人信息
+			send() {
+				uni.navigateTo({
+					url: '/pageB/Senderinfor'
+				})
+			},
+			recipirnt() {
+				uni.navigateTo({
+					url: '/pageB/recipientinfo'
+				})
+			},
 			checkboxChange(n) {
 				console.log('change', n);
+			},
+			next() {
+				uni.navigateTo({
+					url: '/pageB/account'
+				})
 			}
 		}
 	}

pageB/Senderinfor.vue

@@ -3,7 +3,7 @@
 	<view class="back">
 		<view class="info">
 			<view class="item u-flex u-row-between">
-				<text class="title">{{i18n.goods}}</text>
+				<text class="title">{{i18n.senderinfo}}</text>
 				<view class="u-flex">
 					<u-icon name="order" color="rgba(0, 0, 0, 0.6)" size="23"></u-icon>
 					<text class="wx">{{i18n.wxAddress}}</text>

pageB/account.vue

@@ -6,7 +6,7 @@
 			<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 title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
+			<u-navbar :autoBack ='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
 				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>
@@ -95,7 +95,8 @@
 				<!-- 物品信息 -->
 				<view class="info u-flex u-row-between">
 					<view class="u-flex">
-						<text class="wupin">{{i18n.item}}</text>
+						<!-- <text class="wupin">{{i18n.item}}</text> -->
+						<text class="wupin">包裹总重</text>
 					</view>
 					<view class="u-flex">
 						<text class="chang">30kg</text>
@@ -121,7 +122,7 @@
 			</view>
 			<view class="" style="height: 166rpx;"></view>
 			<!-- 下一步 -->
-			<view class="next  u-flex-between" style="display: flex;">
+			<view class="next  u-flex-between" style="display: flex;" @click="payorder">
 				<view class="gopay">{{i18n.Immediatepayment}}</view>
 			</view>
 		</view>
@@ -147,7 +148,17 @@
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);
+			},
+			payorder(){
+				uni.navigateTo({
+					url:'/pageA/payorder'
+				})
 			}
+			// end(){
+			// 	uni.navigateTo({
+			// 		url:'/pageB/end'
+			// 	})
+			// }
 		}
 	}
 </script>

pageB/delivery.vue

@@ -6,15 +6,15 @@
 			<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 title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
-				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
+			<u-navbar :autoBack='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
+				:safeAreaInsetTop="true" style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>
 				</view>
 			</u-navbar>
 			<!-- 地址 -->
 			<view class="address">
-				<view class="left u-flex" style="display: flex;">
+				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
@@ -33,7 +33,8 @@
 					</view>
 				</view>
 				<view class="left u-flex"
-					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)">
+					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)"
+					@click="recipe">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/shou.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
@@ -53,26 +54,26 @@
 			</view>
 			<view class="wup">
 				<!-- 物品信息 -->
-				<view class="info u-flex u-row-between">
+				<view class="info u-flex u-row-between" @click='goods'>
 					<view class="u-flex">
 						<text class="wupin">{{i18n.item}}</text>
 						<view class="mast">{{i18n.required}}</view>
 					</view>
 					<view class="u-flex">
 						<text class="change">{{i18n.select}}</text>
-						<image src="/static/express/next1.png"
-							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
+						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
+							mode=""></image>
 					</view>
 				</view>
 				<!-- 跨境物流 -->
-				<view class="info u-flex u-row-between">
+				<view class="info u-flex u-row-between" @click="logshow=true">
 					<view class="u-flex">
 						<text class="wupin">{{i18n.flow}}</text>
 					</view>
 					<view class="u-flex">
 						<text class="change" style="color: rgba(248, 50, 36, 1);">{{i18n.selection}}</text>
-						<image src="/static/express/next1.png"
-							style="width: 28rpx;height: 28rpx;margin-left: 6rpx;" mode=""></image>
+						<image src="/static/express/next1.png" style="width: 28rpx;height: 28rpx;margin-left: 6rpx;"
+							mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -84,19 +85,25 @@
 						<text style="color: rgba(248, 50, 36, 1);">¥ - -</text>
 					</view>
 					<view class="deal u-flex" style="margin-top: 16rpx;">
-						<u-checkbox-group shape='circle' v-model="checkboxValue1" placement="column" @change="checkboxChange">
-							<u-checkbox :customStyle="{marginBottom: '8px',marginTop:'5px'}" :name="deal" >
+						<u-checkbox-group shape='circle' v-model="checkboxValue1" placement="column"
+							@change="checkboxChange">
+							<u-checkbox :customStyle="{marginBottom: '8px',marginTop:'5px'}" :name="deal">
 							</u-checkbox>
 						</u-checkbox-group>
 						<text>{{i18n.readandagree}}</text>
 						<text style="color: rgba(248, 50, 36, 1);">《{{i18n.International}}》</text>
 					</view>
 				</view>
-				<view class="tonext " style="">
+				<view class="tonext " style="" @click="next">
 					{{i18n.next}}
 				</view>
 			</view>
 		</view>
+		<u-popup round='28' :show="logshow" @close="close">
+			<view class="pop">
+				<kj-flow @success='success' @close='logshow=false'></kj-flow>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -104,8 +111,9 @@
 	export default {
 		data() {
 			return {
-				deal:-1,
-				checkboxValue1:[],
+				deal: -1,
+				checkboxValue1: [],
+				logshow: false, //物流选择
 			}
 		},
 		onLoad(options) {
@@ -117,14 +125,48 @@
 			}
 		},
 		methods: {
+			close() {
+				this.logshow = true
+			},
+			goods() {
+				uni.navigateTo({
+					url: '/pageB/goods'
+				})
+			},
+			send() {
+				uni.navigateTo({
+					url: '/pageB/Senderinfor'
+				})
+			},
+			recipe() {
+				uni.navigateTo({
+					url: '/pageB/recipientinfo'
+				})
+			},
 			checkboxChange(n) {
 				console.log('change', n);
+			},
+			next() {
+				uni.navigateTo({
+					url: '/pageB/end'
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.pop {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #333333;
+		line-height: 50rpx;
+		text-align: left;
+		font-style: normal;
+		padding: 32rpx 28rpx 0 0;
+		box-sizing: border-box;
+	}
 	.sum {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;

pageB/end.vue

@@ -6,7 +6,7 @@
 			<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 title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
+			<u-navbar :autoBack='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true' :safeAreaInsetTop="true"
 				style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>
@@ -44,7 +44,7 @@
 			</view>
 			<!-- 地址 -->
 			<view class="address">
-				<view class="left u-flex" style="display: flex;">
+				<view class="left u-flex" style="display: flex;" @click="send">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/ji.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<image src="/static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode="">
@@ -63,7 +63,7 @@
 					</view>
 				</view>
 				<view class="left u-flex"
-					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)">
+					style="display: flex;margin-top: 26rpx;border-bottom:2rpx solid rgba(151, 151, 151, 0.08)" @click="recipe">
 					<view class="u-row-between left" style="display: flex;flex-direction: column;">
 						<image src="/static/express/shou.png" style='width: 40rpx;;height:40rpx ;' mode=""></image>
 						<!-- <image src="../../static/express/change.png" style='width: 40rpx;;height:40rpx ;' mode=""> -->
@@ -83,9 +83,9 @@
 			</view>
 			<!-- 快递服务 -->
 			<view class="wup u-flex u-row-between">
-				<view>快递服务</view>
+				<view>{{i18n.Expressservice}}</view>
 				<view class="u-flex" @click="toexpress">
-					<view>{{expname||i18n.selection}}</view>
+					<view class="selection">{{expname||i18n.selection}}</view>
 					<image src="../static/express/next1.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
 				</view>
 			</view>
@@ -105,7 +105,7 @@
 						<text style="color: rgba(248, 50, 36, 1);">《国际快递服务协议》</text>
 					</view>
 				</view> -->
-				<view class="tonext " style="">
+				<view class="tonext " style="" @click="payorder">
 					{{i18n.Orderconfirmation}}
 				</view>
 			</view>
@@ -131,6 +131,21 @@
 			}
 		},
 		methods: {
+			send() {
+				uni.navigateTo({
+					url: '/pageB/Senderinfor'
+				})
+			},
+			recipe() {
+				uni.navigateTo({
+					url: '/pageB/recipientinfo'
+				})
+			},
+			payorder(){
+				uni.navigateTo({
+					url:'/pageA/payorder'
+				})
+			},
 			checkboxChange(n) {
 				console.log('change', n);
 			},
@@ -149,6 +164,16 @@
 </script>
 
 <style lang="scss" scoped>
+	.selection {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #666666;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.mail {
 		width: 702rpx;
 		height: 332rpx;

pageB/goods.vue

@@ -6,22 +6,22 @@
 				<text class="title">{{i18n.item}}</text>
 				<view class="mast">{{i18n.required}}</view>
 			</view>
-			<view class="" style="margin-top: 30rpx;">
+			<!-- 			<view class="" style="margin-top: 30rpx;">
 				<view class="about u-flex"
 					style="color: rgba(248, 50, 36, 1);border: 2rpx solid rgba(248, 50, 36, 1);justify-content: center;">
 					<text style="margin-right: 18rpx;">文件</text>
 					<u-icon name="close" color="rgba(248, 50, 36, 1)" size="12"></u-icon>
 				</view>
-			</view>
-			<!-- 			<view class="">
+			</view> -->
+			<view class="">
 				<view class="info">填写准确的寄送物品可帮助您推荐更合适的产品</view>
 				<view class="input">
-					<input type="text" placeholder="请输入物品名称" style="width: 100%;" />
+					<input disabled type="text" placeholder="请输入物品名称" style="width: 100%;"  @click="tosearch"/>
 				</view>
 				<view class="u-flex u-row-between" style="margin-top: 28rpx;flex-wrap: wrap;">
 					<view class="about" v-for="(item,idx) in 10">文件</view>
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<view class="type  u-flex u-row-between">
 			<view class="">
@@ -92,6 +92,13 @@
 				title: this.i18n.item
 			})
 		},
+		methods:{
+			tosearch(){
+				uni.navigateTo({
+					url:"/pageB/search"
+				})
+			}
+		}
 	}
 </script>
 
@@ -244,7 +251,7 @@
 				font-style: normal;
 				margin-left: 8rpx;
 				padding: 0 6rpx;
-				box-sizing:border-box;
+				box-sizing: border-box;
 			}
 
 			.about {

pageB/recipientinfo.vue

@@ -5,7 +5,7 @@
 			<view class="item u-flex u-row-between">
 				<text class="title">{{i18n.goods}}</text>
 			</view>
-			<view class="item u-flex ">
+			<view class="item u-flex " @click="tocitychange">
 				<text class="left">{{i18n.country}}</text>
 				<view class="right u-flex u-row-between" style="flex: 1;">
 					<input type="text" :placeholder="i18n.selection" />
@@ -91,6 +91,11 @@
 		methods: {
 			checkboxChange(n) {
 				console.log('change', n);
+			},
+			tocitychange(){
+				uni.navigateTo({
+					url:'/pageB/citychange'
+				})
 			}
 		},
 		computed: {

pages.json

@@ -214,7 +214,7 @@
 				{
 					"path": "citychange",
 					"style": {
-						"navigationBarTitleText": "选择城市",
+						"navigationBarTitleText": "选择国家",
 						"enablePullDownRefresh": false
 					}
 				},

pages/express/express.vue

@@ -83,8 +83,8 @@
 					</view>
 				</view>
 				<!-- 去寄件 -->
-				<view class="" style="margin-top: 34rpx;">
-					<view class="mail" @click="count">
+				<view class="" style="margin-top: 34rpx;" >
+					<view class="mail" @click="todev">
 						{{i18n.mail}}
 					</view>
 				</view>
@@ -236,6 +236,11 @@
 			}
 		},
 		methods: {
+			todev(){
+				uni.navigateTo({
+					url:"/pageB/delivery"
+				})
+			},
 			count() {
 				uni.navigateTo({
 					url: '/pageB/account'

pages/index/index.vue

@@ -50,16 +50,15 @@
 				</view>
 			</view>
 		</view>
-		<!-- </view> -->
 		<view class="shopback">
 			<view class="u-flex u-row-between">
-				<view class="bigbox">
+				<view class="bigbox" @click="subsidy(1)">
 					<view class="u-flex">
 						<image src="../../static/images/index/butie.png" style="width: 104rpx;height: 26rpx;" mode="">
 						</image>
 						<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
 					</view>
-					<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
+					<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;" >
 						<view v-for="(item,idx) in 4" class="ssbox  " style="margin-top: 16rpx;">
 							<view class="" style="position: relative">
 								<image src=""
@@ -85,7 +84,7 @@
 					</view>
 				</view>
 				<view class="">
-					<view class="smallbox">
+					<view class="smallbox" @click="subsidy(2)">
 						<view class="u-flex">
 							<image src="../../static/images/index/pinbao.png" style="width: 164rpx;height: 26rpx;"
 								mode=""></image>
@@ -118,7 +117,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="smallbox">
+					<view class="smallbox" @click="subsidy(3)">
 						<view class="u-flex">
 							<image src="../../static/images/index/postage.png" style="width: 116rpx;height: 26rpx;"
 								mode=""></image>
@@ -230,6 +229,11 @@
 			}
 		},
 		methods: {
+			subsidy(item){
+				uni.navigateTo({
+					url:'/pageA/subsidy?show=' + item
+				})
+			},
 			//物流计算器
 			counter() {
 				uni.navigateTo({

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

@@ -1,9 +1,16 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pageB/index"],{
 
+<<<<<<< HEAD
 /***/ 325:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
   \**********************************************************************/
+=======
+/***/ 323:
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageB%2Findex"} ***!
+  \***********************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -13,7 +20,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 326));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageB/index.vue */ 324));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,17 +28,24 @@ createPage(_index.default);
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 326:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue ***!
   \*****************************************************/
+=======
+/***/ 324:
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue ***!
+  \******************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 327);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 329);
+/* harmony import */ var _index_vue_vue_type_template_id_ab5bf790___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=ab5bf790& */ 325);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 327);
 /* 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);
 
@@ -60,17 +74,29 @@ component.options.__file = "pageB/index.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 327:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
   \************************************************************************************/
+=======
+/***/ 325:
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=template&id=ab5bf790& ***!
+  \*************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 328);
 /* 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"]; });
+=======
+/* 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& */ 326);
+/* 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"]; });
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 
 /* 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"]; });
 
@@ -82,10 +108,17 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 328:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/***/ 326:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -109,15 +142,23 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 329:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
+=======
+/***/ 327:
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageB/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 330);
 /* 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 +170,19 @@ __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& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/* 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& */ 328);
+/* 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); 
+
+/***/ }),
+
+/***/ 328:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -154,5 +208,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[325,"common/runtime","common/vendor"]]]);
+},[[323,"common/runtime","common/vendor"]]]);
 //# 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
 /***/ 441:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
   \**********************************************************************/
+=======
+/***/ 439:
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageC%2Findex"} ***!
+  \***********************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -13,7 +20,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 442));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageC/index.vue */ 440));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,17 +28,24 @@ createPage(_index.default);
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 442:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue ***!
   \*****************************************************/
+=======
+/***/ 440:
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue ***!
+  \******************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 443);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 445);
+/* harmony import */ var _index_vue_vue_type_template_id_3f36b6f9___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=3f36b6f9& */ 441);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 443);
 /* 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);
 
@@ -60,17 +74,29 @@ component.options.__file = "pageC/index.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 443:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
   \************************************************************************************/
+=======
+/***/ 441:
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=template&id=3f36b6f9& ***!
+  \*************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 444);
 /* 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"]; });
+=======
+/* 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& */ 442);
+/* 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"]; });
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 
 /* 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"]; });
 
@@ -82,10 +108,17 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 444:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/***/ 442:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -109,15 +142,23 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 445:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
+=======
+/***/ 443:
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageC/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 446);
 /* 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 +170,19 @@ __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& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/* 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& */ 444);
+/* 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); 
+
+/***/ }),
+
+/***/ 444:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -155,5 +209,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[441,"common/runtime","common/vendor"]]]);
+},[[439,"common/runtime","common/vendor"]]]);
 //# 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
 /***/ 629:
 /*!**********************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
   \**********************************************************************/
+=======
+/***/ 627:
+/*!***********************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/main.js?{"page":"pageD%2Findex"} ***!
+  \***********************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -13,7 +20,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 630));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pageD/index.vue */ 628));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,17 +28,24 @@ createPage(_index.default);
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 630:
 /*!*****************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue ***!
   \*****************************************************/
+=======
+/***/ 628:
+/*!******************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue ***!
+  \******************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 631);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 633);
+/* harmony import */ var _index_vue_vue_type_template_id_57c92c8c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=57c92c8c& */ 629);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 631);
 /* 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);
 
@@ -60,17 +74,29 @@ component.options.__file = "pageD/index.vue"
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 631:
 /*!************************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
   \************************************************************************************/
+=======
+/***/ 629:
+/*!*************************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=template&id=57c92c8c& ***!
+  \*************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 632);
 /* 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"]; });
+=======
+/* 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& */ 630);
+/* 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"]; });
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 
 /* 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"]; });
 
@@ -82,10 +108,17 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 632:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/***/ 630:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! exports provided: render, staticRenderFns, recyclableRender, components */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -109,15 +142,23 @@ render._withStripped = true
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ 633:
 /*!******************************************************************************!*\
   !*** D:/project/crossBorder/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
   \******************************************************************************/
+=======
+/***/ 631:
+/*!*******************************************************************************************!*\
+  !*** C:/Users/Administrator/Desktop/yswc/wx-qhb/pageD/index.vue?vue&type=script&lang=js& ***!
+  \*******************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* 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& */ 634);
 /* 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 +170,19 @@ __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& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+=======
+/* 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& */ 632);
+/* 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); 
+
+/***/ }),
+
+/***/ 632:
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -153,5 +207,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[629,"common/runtime","common/vendor"]]]);
+},[[627,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageD/index.js.map

unpackage/dist/dev/mp-weixin/pages/cart/cart.js

@@ -101,6 +101,7 @@ var components
 try {
   components = {
     uNavbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 739))
     },
     uCheckboxGroup: function () {
@@ -123,6 +124,30 @@ try {
     },
     kjTabbar: function () {
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 788))
+=======
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 649))
+    },
+    uCheckboxGroup: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 757))
+    },
+    uSwipeAction: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action/u-swipe-action */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action/u-swipe-action")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action/u-swipe-action.vue */ 765))
+    },
+    uSwipeActionItem: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-swipe-action-item/u-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swipe-action-item/u-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue */ 771))
+    },
+    uCheckbox: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 783))
+    },
+    uNumberBox: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-number-box/u-number-box */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-number-box/u-number-box")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-number-box/u-number-box.vue */ 791))
+    },
+    uIcon: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 665))
+    },
+    kjTabbar: function () {
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 698))
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/express/express.js

@@ -101,6 +101,7 @@ var components
 try {
   components = {
     uNavbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 739))
     },
     uSubsection: function () {
@@ -120,6 +121,27 @@ try {
     },
     kjTabbar: function () {
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 788))
+=======
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 649))
+    },
+    uSubsection: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 657))
+    },
+    uBadge: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-badge/u-badge */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-badge/u-badge")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-badge/u-badge.vue */ 734))
+    },
+    uLineProgress: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-line-progress/u-line-progress.vue */ 742))
+    },
+    uPopup: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 690))
+    },
+    kjFlow: function () {
+      return __webpack_require__.e(/*! import() | components/kj-flow/kj-flow */ "components/kj-flow/kj-flow").then(__webpack_require__.bind(null, /*! @/components/kj-flow/kj-flow.vue */ 750))
+    },
+    kjTabbar: function () {
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 698))
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
     },
   }
 } catch (e) {
@@ -429,6 +451,11 @@ var _default = {
     }
   },
   methods: {
+    todev: function todev() {
+      uni.navigateTo({
+        url: "/pageB/delivery"
+      });
+    },
     count: function count() {
       uni.navigateTo({
         url: '/pageB/account'

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

@@ -101,6 +101,7 @@ var components
 try {
   components = {
     uNavbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 739))
     },
     uSubsection: function () {
@@ -120,6 +121,27 @@ try {
     },
     kjTabbar: function () {
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 788))
+=======
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 649))
+    },
+    uSubsection: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 657))
+    },
+    uIcon: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 665))
+    },
+    uTabs: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 674))
+    },
+    uSwiper: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 682))
+    },
+    uPopup: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 690))
+    },
+    kjTabbar: function () {
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 698))
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
     },
   }
 } catch (e) {
@@ -374,7 +396,6 @@ exports.default = void 0;
 //
 //
 //
-//
 var _default = {
   data: function data() {
     return {
@@ -414,6 +435,11 @@ var _default = {
     }
   },
   methods: {
+    subsidy: function subsidy(item) {
+      uni.navigateTo({
+        url: '/pageA/subsidy?show=' + item
+      });
+    },
     //物流计算器
     counter: function counter() {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,17 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 847))
     },
     uCheckbox: function () {
       return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 873))
+=======
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 757))
+    },
+    uCheckbox: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 783))
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,7 +101,11 @@ var components
 try {
   components = {
     kjTabbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 788))
+=======
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 698))
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
     },
   }
 } catch (e) {
@@ -166,22 +170,38 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 796));
+=======
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 706));
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 803));
+=======
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 713));
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 810));
+=======
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 720));
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 817));
+=======
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 727));
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js

@@ -101,6 +101,7 @@ var components
 try {
   components = {
     uNavbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 739))
     },
     uTabs: function () {
@@ -108,6 +109,15 @@ try {
     },
     kjTabbar: function () {
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 788))
+=======
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 649))
+    },
+    uTabs: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 674))
+    },
+    kjTabbar: function () {
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 698))
+>>>>>>> c510bfc1b0c9b2ab1d910acd2ec4eb15a568f022
     },
   }
 } catch (e) {