冲突

pageA/balance.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pageA/counter.vue

@@ -0,0 +1,349 @@
+<template>
+	<view class="back">
+		<!-- 城市 -->
+		<view class="add u-flex u-row-around">
+			<text class='address' @click="change(0)">{{original||'起始地'}}</text>
+			<image src="static/images/arrows.png" mode="" style="width: 130rpx;height: 10rpx;"></image>
+			<text class='address' @click="change(1)">{{bourn||'目的地'}}</text>
+		</view>
+		<!-- 商品类型 -->
+		<view class="type">
+			<view class="title u-flex">
+				<text>商品类型</text>
+				<image src="" mode="" style="width: 12rpx;height: 12rpx;"></image>
+			</view>
+			<view class="u-flex" style="margin-top: 24rpx;">
+				<view class="left">普通商品</view>
+				<view class="right" style="margin-left: 20rpx;">特殊商品</view>
+			</view>
+		</view>
+		<!-- 跨境物流 -->
+		<view class="logistics u-flex u-row-between">
+			<text style="font-weight: 600;">跨境物流</text>
+			<view class="u-flex">
+				<text class="change">请选择</text>
+				<u-icon name="arrow-right" size='16'></u-icon>
+			</view>
+		</view>
+		<!-- 商品重量 -->
+		<view class="weight u-flex u-row-between">
+			<text style="font-weight: 600;">商品重量</text>
+			<u-number-box v-model="value">
+				<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>
+				<view slot="plus" class="plus">
+					<u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
+				</view>
+			</u-number-box>
+		</view>
+		<!-- 获取价格 -->
+		<view @click="gain" :class="gat==1?'yuan':'price'">
+			获取价格
+		</view>
+		<view class="gain" v-if="gatShow">
+			<view class="">
+				<text class='weigh'>计算重量：</text>
+				<text class='weigh' style="color: rgba(34, 34, 34, 1);">30.00kg</text>
+			</view>
+			<view class="u-flex u-row-between"
+				style="border-top: 2rpx solid #979797;margin-top: 32rpx;padding-top: 20rpx;">
+				<view class="">
+					<text class='weigh'>预估运费</text>
+					<text style="margin-left: 6rpx;" class='red'>¥</text>
+					<text class='red' style="font-size: 32rpx;">3619</text>
+					<text class='red'>起</text>
+				</view>
+				<view class="info" @click="logistics">查看详情</view>
+			</view>
+		</view>
+		<!-- 地址选择 -->
+		<u-picker :show="show" ref="uPicker" :columns="columns" @confirm="confirm" @change="changeHandler"></u-picker>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: 1,
+				show: false,
+				original: '', //起始地
+				bourn: '', //目的地
+				type: 0,
+				gat: 0,
+				gatShow: false,
+				columns: [
+					['中国', '美国'],
+					['深圳', '厦门', '上海', '拉萨']
+				],
+				columnData: [
+					['深圳', '厦门', '上海', '拉萨'],
+					['得州', '华盛顿', '纽约', '阿拉斯加']
+				]
+			};
+		},
+		methods: {
+			//物流详情
+			logistics(){
+				uni.navigateTo({
+					url:'/pageA/logisticsinfo'
+				})
+			},
+			//获取价格
+			gain() {
+				this.gat = 1
+				this.gatShow = true
+			},
+			//开启地址选择器
+			change(type) {
+				this.type = type
+				this.show = true
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values, // values为当前变化列的数组内容
+					index,
+					// 微信小程序无法将picker实例传出来，只能通过ref操作
+					picker = this.$refs.uPicker
+				} = e
+				// 当第一列值发生变化时，变化第二列(后一列)对应的选项
+				if (columnIndex === 0) {
+					// picker为选择器this实例，变化第二列对应的选项
+					picker.setColumnValues(1, this.columnData[index])
+				}
+			},
+			// 回调参数为包含columnIndex、value、values
+			confirm(e) {
+				console.log('confirm', e)
+				this.show = false
+				if (this.type == 0) {
+					this.original = e.value[0] + '-' + e.value[1]
+					// console.log(e.value[0]);
+				} else {
+					this.bourn = e.value[0] + '-' + e.value[1]
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.back {
+		background-color: rgba(244, 244, 244, 1);
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+
+		.yuan {
+			width: 702rpx;
+			height: 96rpx;
+			background: #F83224;
+			box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+			border-radius: 48rpx;
+			margin-top: 62rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 96rpx;
+			text-align: center;
+			font-style: normal;
+		}
+
+		.gain {
+			width: 702rpx;
+			height: 208rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			margin-top: 68rpx;
+			padding: 40rpx 24rpx 34rpx 24rpx;
+			box-sizing: border-box;
+
+			.weigh {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #777777;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.info {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.red {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 20rpx;
+				color: #F83224;
+				line-height: 26rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		//步进器
+		.minus {
+			width: 22px;
+			height: 22px;
+			border-width: 1px;
+			border-color: #E6E6E6;
+			border-style: solid;
+			border-top-left-radius: 100px;
+			border-top-right-radius: 100px;
+			border-bottom-left-radius: 100px;
+			border-bottom-right-radius: 100px;
+			@include flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.input {
+			padding: 0 10px;
+		}
+
+		.plus {
+			width: 22px;
+			height: 22px;
+			background-color: #FF0000;
+			border-radius: 50%;
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			justify-content: center;
+			align-items: center;
+		}
+
+		//商品重量
+		.weight {
+			padding: 34rpx 20rpx;
+			box-sizing: border-box;
+			width: 702rpx;
+			height: 108rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+		}
+
+
+		//获取价格
+		.price {
+			width: 702rpx;
+			height: 96rpx;
+			background: #F83224;
+			box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+			border-radius: 48rpx;
+			position: fixed;
+			bottom: 72rpx;
+			left: 24rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 96rpx;
+			text-align: center;
+			font-style: normal;
+		}
+
+		//跨境物流
+		.logistics {
+			width: 702rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 28rpx 22rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+
+			.change {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #F83224;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 8rpx;
+			}
+		}
+
+		// 商品类型
+		.type {
+			padding: 28rpx 20rpx;
+			box-sizing: border-box;
+			width: 702rpx;
+			height: 190rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+
+			.title {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.left {
+				width: 202rpx;
+				height: 60rpx;
+				border-radius: 36rpx;
+				border: 1rpx solid #F83224;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #F83224;
+				line-height: 60rpx;
+				text-align: center;
+				font-style: normal;
+			}
+
+			.right {
+				width: 202rpx;
+				height: 60rpx;
+				border-radius: 36rpx;
+				border: 1rpx solid #979797;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #979797;
+				line-height: 60rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
+
+		//城市
+		.add {
+			width: 702rpx;
+			height: 144rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 50rpx 76rpx;
+			box-sizing: border-box;
+
+			.address {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 44rpx;
+				text-align: right;
+				font-style: normal;
+			}
+		}
+	}
+</style>

pageA/logisticsinfo.vue

@@ -0,0 +1,85 @@
+<template>
+	<!-- 物流详情 -->
+	<view class="back">
+		<view class="top">
+			<view class="explain">渠道说明</view>
+			<view class="u-flex u-row-between" style='margin-top:32rpx'>
+				<text class="mode">计费模式</text>
+				<text class='mode'>阶梯首重续费模式</text>
+			</view>
+			<view class="u-flex u-row-between" style='margin-top:32rpx'>
+				<text class='mode'>计费重量</text>
+				<text class='mode'>30.00kg</text>
+			</view>
+			<view class="u-flex u-row-between" style='margin-top:32rpx'>
+				<text class='mode'>预估费用</text>
+				<text class='mode'>¥2400.00</text>
+			</view>
+		</view>
+		<view class="top" style="margin-top: 20rpx;">
+			<view class="explain">物品类型</view>
+			<view class="" style='margin-top:32rpx'>
+				仅限普货，美国限重20kg(8kg以内未
+			</view>
+			<view style='margin-top:32rpx' class="explain">渠道规则</view>
+			<view class="" style='margin-top:32rpx'>
+				仅限普货，美国限重20kg(8kg以内未
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.back {
+		width: 750rpx;
+		background: #F4F4F4;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+
+		.mode {
+			font-family: SFPro, SFPro;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #555555;
+			line-height: 32rpx;
+			text-align: center;
+			font-style: normal;
+		}
+
+		.explain {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 600;
+			font-size: 32rpx;
+			color: #222222;
+			line-height: 44rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.top {
+			width: 702rpx;
+			// height: 316rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 32rpx 20rpx;
+			box-sizing: border-box;
+		}
+
+		// .bottom {
+		// 	width: 702rpx;
+		// 	// height: 912rpx;
+		// 	background: #FFFFFF;
+		// 	border-radius: 16rpx;
+		// }
+	}
+</style>

pageA/order.vue

@@ -0,0 +1,402 @@
+<template>
+	<view class="back">
+		<!-- 地址 -->
+		<view class="address">
+			<view class="u-flex u-row-between">
+				<view class="add">102 Huangjiao Road,</view>
+				<u-icon name="arrow-right" size='16'></u-icon>
+			</view>
+			<view class="info">
+				<text>Curtis Morris</text>
+				<text style="margin-left: 20rpx;">041***8314</text>
+			</view>
+		</view>
+		<!-- 商品 -->
+		<view class="shop">
+			<view class="">
+				<image src="../static/images/logo.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
+				<text class="name">灰妈团购🔥</text>
+			</view>
+			<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;">
+					<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>
+						<u-number-box v-model="value">
+							<!-- <view class="bu"> -->
+							<view slot="minus" class="">
+								<u-icon name="minus" size="12"></u-icon>
+							</view>
+							<text slot="input" style="width: 40px;text-align: center;" class="input">{{value}}</text>
+							<view slot="plus" class="">
+								<u-icon name="plus" size="12"></u-icon>
+							</view>
+							<!-- </view> -->
+						</u-number-box>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 物流 -->
+		<view class="logistics u-flex u-row-between">
+			<text style="font-weight: 600;">跨境物流</text>
+			<view class="u-flex">
+				<text class="change">请选择</text>
+				<u-icon name="arrow-right" size='16'></u-icon>
+			</view>
+		</view>
+		<!-- 推荐 -->
+		<view class="recommend">
+			<view class="top">
+				<image src="static/images/recommend.png" style="width: 124rpx;height: 30rpx;" mode=""></image>
+			</view>
+			<view class="bottom">
+				<scroll-view scroll-x class="u-flex" style="column: gap 28rpx; display: flex;">
+					<view class="u-flex">
+						<view class="" v-for="(item,idx) in 6" :key="idx">
+							<image src="../static/images/logo.png" style="width: 156rpx;height: 156rpx;" mode="">
+							</image>
+							<view class="title">Lemmycree/莱 米可蕊 洁净…</view>
+							<view class="">¥26.9</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- 商品相关 -->
+		<view class="abount" style="margin-top: 20rpx;">
+			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
+				<view class="name">商品金额</view>
+				<view class="money">¥2642.5</view>
+			</view>
+			<view class="u-flex u-row-between">
+				<view class="name">商品总重</view>
+				<view class="money">300kg</view>
+			</view>
+			<view class="back u-flex">
+				<image src="static/images/warning.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
+				<text style="margin-left: 12rpx;">购买到378-380kg单价¥21，会更优惠</text>
+			</view>
+			<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
+				<view class="name">每公斤费用</view>
+				<view class="money">¥24</view>
+			</view>
+			<view class="u-flex u-row-between">
+				<view class="name">运费</view>
+				<view class="money">¥100.00</view>
+			</view>
+			<view class="zong u-flex u-row-right">
+				<view class="">
+					<text class="small">小计</text>
+					<text class="mon">¥2642.5</text>
+				</view>
+			</view>
+		</view>
+		<view class="" style="height: 166rpx;"></view>
+		<view class="btn u-flex u-row-right">
+			<view class="">
+				<text class="kg">共39kg,</text>
+				<text>合计:</text>
+				<text class="money">¥2792.5</text>
+			</view>
+			<view class="order">
+				提交订单
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: 1
+			};
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.back {
+		background: rgba(244, 244, 244, 1);
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+
+		.btn {
+			width: 750rpx;
+			height: 166rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx -1rpx 0rpx 0rpx rgba(0, 0, 0, 0.05);
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			padding: 0 24rpx 5rpx 5rpx;
+			box-sizing: border-box;
+
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 48rpx;
+				color: #F83224;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.kg {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.order {
+				width: 232rpx;
+				height: 80rpx;
+				background: #F83224;
+				border-radius: 40rpx;
+				font-family: PingFangTC, PingFangTC;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				line-height: 80rpx;
+				text-align: center;
+				font-style: normal;
+				margin-left: 20rpx;
+			}
+		}
+
+		//商品相关
+		.abount {
+			padding: 28rpx 24rpx;
+			box-sizing: border-box;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			width: 702rpx;
+
+			.zong {
+				width: 654rpx;
+				padding: 22rpx 0 0 0;
+				border-top: 2rpx solid #979797;
+				margin-top: 32rpx;
+
+				.small {
+					font-family: PingFangTC, PingFangTC;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #444444;
+					line-height: 34rpx;
+					text-align: left;
+					font-style: normal;
+				}
+
+				.mon {
+					font-family: HarmonyOS_Sans_Medium;
+					font-size: 28rpx;
+					color: #F83224;
+					line-height: 38rpx;
+					text-align: left;
+					font-style: normal;
+					margin-left: 12rpx;
+				}
+			}
+
+			.back {
+				background: rgba(244, 244, 244, 1);
+				padding: 22rpx 16rpx;
+				box-sizing: border-box;
+				margin-top: 10rpx;
+				margin-bottom: 20rpx;
+			}
+
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 38rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.recommend {
+			margin-top: 20rpx;
+
+			.title {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #222222;
+				line-height: 32rpx;
+				text-align: left;
+				font-style: normal;
+				width: 148rpx;
+			}
+
+			.top {
+				width: 702rpx;
+				height: 64rpx;
+				background: linear-gradient(180deg, #FFE7E3 0%, rgba(255, 255, 255, 1) 100%);
+				border-radius: 16rpx 16rpx 0 0;
+				padding: 24rpx 22rpx;
+				box-sizing: border-box;
+			}
+
+			.bottom {
+				padding: 0 20rpx 22rpx;
+				box-sizing: border-box;
+				background: #fff;
+			}
+		}
+
+		//物流
+		.logistics {
+			width: 702rpx;
+			height: 96rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 28rpx 22rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+
+			.change {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #F83224;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 8rpx;
+			}
+		}
+
+		//商城
+		.shop {
+			width: 702rpx;
+			// height: 322rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 30rpx 24rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+
+			.bu {
+				width: 120rpx;
+				height: 40rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid rgba(151, 151, 151, 0.3);
+			}
+
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 24rpx;
+				color: #F83224;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #222222;
+				line-height: 42rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 10rpx;
+			}
+
+			.weight {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #222222;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 16rpx;
+			}
+		}
+
+		// 地址
+		.address {
+			width: 702rpx;
+			// height: 182rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 32rpx 24rpx;
+			box-sizing: border-box;
+
+			.add {
+				font-family: SFPro, SFPro;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.info {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #555555;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+				margin-top: 20rpx;
+			}
+		}
+	}
+
+	.minus {
+		width: 22px;
+		height: 22px;
+		border-width: 1px;
+		border-color: #E6E6E6;
+		border-style: solid;
+		border-top-left-radius: 100px;
+		border-top-right-radius: 100px;
+		border-bottom-left-radius: 100px;
+		border-bottom-right-radius: 100px;
+		@include flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.input {
+		padding: 0 10px;
+	}
+
+	.plus {
+		width: 22px;
+		height: 22px;
+		background-color: #FF0000;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+</style>

pageA/productdetails.vue

@@ -0,0 +1,674 @@
+<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"></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">
+					<image src="static/images/share.png" style="width: 38rpx;height: 38rpx;" mode=""></image>
+				</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'>折扣价</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">同款低价</text>
+					<view class="title">
+						<text class="title" selectable @longpress="onLongPress">
+							布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼
+						</text>
+					</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">选择</view>
+						<view class="" style="margin-left: 20rpx;">净含量</view>
+					</view>
+					<view class="">
+						<u-icon name="arrow-right" size='16'></u-icon>
+					</view>
+				</view>
+				<view class="top u-flex u-row-between" style="margin-top: 36rpx;">
+					<view class="u-flex" @click="serve=true">
+						<view class="change">服务</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 class="comment">
+				<view class="u-flex u-row-between">
+					<text class="ping">评论</text>
+					<view class="u-flex">
+						<text class="strip">5000+条评论</text>
+						<u-icon name="arrow-right" size='16'></u-icon>
+					</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>
+					<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'>销售量 2384w+</text>
+							<view class="line"></view>
+							<text class='num'>销售量 2384w+</text>
+						</view>
+					</view>
+				</view>
+				<view class="goshop">逛逛</view>
+			</view>
+			<!-- 推荐 -->
+			<view class="recommend">
+				<view class="title">
+					推荐商品
+				</view>
+				<view class="">
+					<image src="" mode=""></image>
+				</view>
+			</view>
+			<view class="recommend">
+				<view class="title">商品详情</view>
+				<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">规格参数</view>
+				<view class="specification">
+					<view class="item u-flex" style='margin-bottom:28rpx'>
+						<view style='width:150rpx;'>主要原料</view>
+						<text style='margin-left:58rpx'>保鲜鸡肉，鸡心，鸡肝</text>
+					</view>
+					<view class="item u-flex" style='margin-bottom:28rpx'>
+						<view style='width:150rpx;'>规格</view>
+						<text style='margin-left:58rpx'>300g</text>
+					</view>
+					<view class="item u-flex" style='margin-bottom:28rpx'>
+						<view style='width:150rpx;'>保质期</view>
+						<text style='margin-left:58rpx'>12个月</text>
+					</view>
+					<view class="item u-flex">
+						<view style='width:150rpx;'>适用对象</view>
+						<text style='margin-left:58rpx'>3个月以上的全猫种</text>
+					</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">客服</view>
+					</view>
+					<view class="u-flex" style="justify-content: center;flex-direction: column;">
+						<image src="../static/cart1.png" style='width:40rpx;height:40rpx' mode=""></image>
+						<view class="ke">购物车</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">关注</view>
+					</view>
+				</view>
+				<!-- 	<view class="join" @click="join">加入购物车</view>
+				<view class="pin">立即拼团</view> -->
+				<view class="tongzhi" @click="inform">
+					到货通知
+				</view>
+			</view>
+		</view>
+		<!-- 加入购物车 -->
+		<u-popup :show="show">
+			<view style="padding:48rpx 28rpx;box-sizing: border-box;">
+				<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>
+						<text class="guige">已选：鸡肉；2kg【单包装】</text>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :show="serve">
+			<view style="padding:48rpx 24rpx;box-sizing: border-box;background-color: #FFF3E7;position: relative;">
+				<view class="u-flex" style="flex-direction: column;justify-content: center;">
+					<image src="../static/images/index/serve.png" style="width: 138rpx;height: 34rpx;" mode=""></image>
+					<text class="info">
+						售前售后 安心无忧购物
+					</text>
+				</view>
+				<view class="" style="position: absolute;top: 48rpx;right:24rpx;" @click="serve = false">
+					<u-icon name="close" style="width: 22rpx;height: 22rpx;"></u-icon>
+				</view>
+				<view class="contenta">
+					<view class="">
+						<view class="title">丢包丢件</view>
+						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					</view>
+					<view class="" style='margin-top:36rpx'>
+						<view class="title">丢包丢件</view>
+						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					</view>
+					<view class="" style='margin-top:36rpx'>
+						<view class="title">丢包丢件</view>
+						<view class="content">快件如果在运输过程中出现损毁，将按照保价</view>
+					</view>
+				</view>
+				<view class="button" @click="serve = false">
+					我知道了
+				</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;">
+					<text class="info" style="font-size: 32rpx;">
+						分享
+					</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="">
+						<image src="../static/images/index/link.png" style="width: 108rpx;height: 108rpx;" mode="">
+						</image>
+						<view class="link">复制链接</view>
+					</view>
+					<view class="">
+						<image src="../static/images/index/image.png" style="width: 108rpx;height: 108rpx;" mode="">
+						</image>
+						<view class="link">生成图片</view>
+					</view>
+				</view>
+				<view class="button" @click="share = false" style="background: #fff;color: #555555;margin-top: 58rpx;">
+					取消
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list1: [{
+					name: '商品',
+				}, {
+					name: '评价',
+				}, {
+					name: '详情'
+				}],
+				current: 0,
+				// 购物车
+				show: false,
+				//服务
+				serve: false,
+				//分享
+				share: false
+			};
+		},
+		methods: {
+			click(item) {
+				this.current = item
+			},
+			join() {
+
+			},
+			//通知
+			inform() {
+				uni.showToast({
+					title: '当该商品有库存并上架时我们会通过微信消息提醒您',
+					icon: 'none',
+					duration: 2000
+				});
+			},
+			//复制
+			onLongPress(e) {
+				// 获取长按的文本内容
+				let text = e.target.innerText;
+				console.log(e);
+				// 执行复制操作
+				uni.setClipboardData({
+					data: text,
+					success: () => {
+						uni.showToast({
+							title: '已复制,快去粘贴吧~',
+							duration: 2000
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							title: '复制失败',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.link {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #555555;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 16rpx;
+	}
+
+	.tongzhi {
+		width: 422rpx;
+		height: 76rpx;
+		background: #FFB515;
+		border-radius: 40rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		line-height: 76rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.info {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #222222;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+		margin-top: 18rpx;
+	}
+
+	.button {
+		// width: 662rpx;
+		height: 88rpx;
+		background: #F83224;
+		border-radius: 44rpx;
+		margin-top: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		line-height: 88rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.contenta {
+		width: 702rpx;
+		// height: 590rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 26rpx;
+		padding: 28rpx 24rpx;
+		box-sizing: border-box;
+
+		.title {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 500;
+			font-size: 30rpx;
+			color: #222222;
+			line-height: 42rpx;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.content {
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #222222;
+			line-height: 36rpx;
+			text-align: left;
+			font-style: normal;
+			margin-top: 20rpx;
+		}
+	}
+
+	.back {
+		background-color: #F4F4F4;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.guige {}
+
+		.fix {
+			width: 750rpx;
+			height: 158rpx;
+			background: #FFFFFF;
+			padding: 14rpx 28rpx;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+
+			.ke {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #333333;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.join {
+				width: 208rpx;
+				height: 76rpx;
+				border-radius: 40rpx;
+				border: 1rpx solid #FF1515;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #F83224;
+				line-height: 76rpx;
+				text-align: left;
+				font-style: normal;
+				text-align: center;
+			}
+
+			.pin {
+				width: 208rpx;
+				height: 76rpx;
+				background: #F83224;
+				border-radius: 40rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #FFFFFF;
+				line-height: 76rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
+
+		// 规格
+		.specification {
+			width: 670rpx;
+			height: 280rpx;
+			background: #F4F4F4;
+			padding: 24rpx 22rpx;
+			box-sizing: border-box;
+
+			.item {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #333333;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		// 推荐
+		.recommend {
+			width: 710rpx;
+			height: 476rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 24rpx 20rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+
+			.title {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		//店铺
+		.store {
+			width: 710rpx;
+			height: 160rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 24rpx 20rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+
+			.line {
+				background: rgba(151, 151, 151, 1);
+				width: 4rpx;
+				height: 20rpx;
+				margin: 0 18rpx;
+			}
+
+			.num {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #777777;
+				line-height: 24rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.goshop {
+				width: 108rpx;
+				height: 52rpx;
+				border-radius: 26rpx;
+				border: 1rpx solid #FF1515;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #F83224;
+				line-height: 52rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
+
+		// 评论
+		.comment {
+			width: 710rpx;
+			height: 356rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+			padding: 24rpx 20rpx;
+			box-sizing: border-box;
+
+			.content {
+				margin-top: 20rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #444444;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+				height: 112rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: wrap;
+				-webkit-line-clamp: 3
+			}
+
+			.name {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #222222;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 16rpx;
+			}
+
+			.ping {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #222222;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.strip {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #444444;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		//服务
+		.serve {
+			width: 710rpx;
+			height: 180rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			padding: 32rpx 20rpx;
+			box-sizing: border-box;
+
+			.top {
+				.change {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+		}
+
+		//折扣
+		.discount {
+			position: relative;
+			height: 312rpx;
+
+			.top {
+				width: 710rpx;
+				height: 124rpx;
+				background: linear-gradient(295deg, #FB6662 0%, #FD403B 100%);
+				border-radius: 16rpx 16rpx 0 0;
+				padding: 20rpx;
+				box-sizing: border-box;
+				line-height: 98rpx;
+
+				.count {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 20rpx;
+					color: #FFFFFF;
+					text-align: left;
+					font-style: normal;
+				}
+
+				.money {
+					font-size: 20rpx;
+					font-family: HarmonyOS_Sans_Medium;
+					font-size: 20rpx;
+					color: #FFFFFF;
+					text-align: left;
+					font-style: normal;
+					margin-left: 8rpx
+				}
+
+				.right {
+					font-family: HarmonyOS_Sans;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					text-align: left;
+					font-style: normal;
+					text-decoration-line: line-through;
+					margin-left: 16rpx
+				}
+			}
+
+			.bottom {
+				width: 710rpx;
+				height: 208rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				position: absolute;
+				top: 104rpx;
+				z-index: 2;
+				padding: 28rpx 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					margin-top: 24rpx;
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #222222;
+					line-height: 44rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.tabs {
+				// width: 104rpx;
+				height: 40rpx;
+				background: rgba(255, 21, 21, 0.1);
+				border-radius: 4rpx;
+				padding: 4rpx 8rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #FF1515;
+				line-height: 40rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
+	}
+</style>

pageA/subsidy.vue

@@ -0,0 +1,131 @@
+<template>
+	<!-- 百万补贴 -->
+	<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'>
+			<view class="u-nav-slot u-flex" slot="left">
+				<u-icon name="arrow-left" size="19"></u-icon>
+				<view class="input">
+					<u-icon name="search" color="rgba(153, 153, 153, 1)" size="32"></u-icon>
+					<input type="text" placeholder="请输入相关商品名称" />
+				</view>
+			</view>
+		</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>
+			<view class="biaopqian" style="margin-top: 20rpx;">
+				<text>品质好货</text>
+				<text style='margin-left:20rpx;margin-right:20rpx'>|</text>
+				<text>每款必省</text>
+				<text style='margin-left:20rpx;margin-right:20rpx'>|</text>
+				<text>买贵必赔</text>
+			</view>
+		</view>
+		<!-- 商品 -->
+		<view class="box">
+			<view class="" style="margin-left: -22rpx;">
+				<u-tabs :activeStyle="{
+            color: 'rgba(248, 53, 39, 1)',
+            fontWeight: 'bold',
+            transform: 'scale(1.05)'
+        }" :list="list1" lineColor='rgba(248, 53, 39, 1)' @click="click"></u-tabs>
+			</view>
+			<view class="item">
+				<image src="../static/images/logo.png" style="width: 232rpx;height: 232rpx;" mode=""></image>
+				<view class="">
+					<text>得宝天然无香抽取式面巾纸9…</text>
+					<view class="">
+						<text class="tabs">
+							买贵必赔
+						</text>
+					</view>
+					<view class="">
+
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list1: [{
+					name: '关注',
+				}, {
+					name: '推荐',
+				}, {
+					name: '电影'
+				}, {
+					name: '科技'
+				}, {
+					name: '音乐'
+				}, {
+					name: '美食'
+				}, {
+					name: '文化'
+				}, {
+					name: '财经'
+				}, {
+					name: '手工'
+				}]
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.box {
+		width: 750rpx;
+		height: 1266rpx;
+		background: #F4F4F4;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+		margin-top: 36rpx;
+		padding: 32rpx;
+		box-sizing: border-box;
+
+		.item {
+			margin-top: 36rpx;
+		}
+
+		.tabs {
+			padding: 0 8rpx;
+			height: 32rpx;
+			border-radius: 4rpx;
+			border: 1rpx solid #E5BC78;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 20rpx;
+			color: #D48700;
+			line-height: 28rpx;
+			text-align: center;
+			font-style: normal;
+		}
+	}
+
+	.input {
+		width: 458rpx;
+		height: 64rpx;
+		background: #FDFCFB;
+		border-radius: 36rpx;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+		margin-left: 16rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.biaopqian {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>

pageC/addressManagement/addressManagement.vue

@@ -15,7 +15,7 @@
 			i18n(){
 				return this.$t('index')
 			}
-		}
+		},
 		methods: {
 			
 		},

pages.json

@@ -50,12 +50,57 @@
 	"subPackages": [{
 			"root": "pageA",
 			"pages": [{
-				"path": "index",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "productdetails",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order",
+					"style": {
+						"navigationBarTitleText": "填写订单",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "balance",
+					"style": {
+						"navigationBarTitleText": "支付订单",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "counter",
+					"style": {
+						"navigationBarTitleText": "物流报价计算器",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "logisticsinfo",
+					"style": {
+						"navigationBarTitleText": "物流详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "subsidy",
+					"style": {
+						"navigationBarTitleText": "百万补贴",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
-			}]
+			]
 		},
 		{
 			"root": "pageB",

pages/index/index.vue

@@ -129,7 +129,7 @@
 					</view>
 				</view>
 				<view class="u-flex u-row-between" style="flex-wrap: wrap;">
-					<view class="bigbox" v-for="(item,index) in 6" style="position: relative;height: 556rpx;">
+					<view class="bigbox" v-for="(item,index) in 6" style="position: relative;height: 556rpx;" @click="todetail">
 						<image src="../../static/images/index/discount.png"
 							style="width: 60rpx;height: 36rpx;position: absolute;left: 12rpx;top: 12rpx;" mode="">
 						</image>
@@ -147,15 +147,27 @@
 								¥2kg
 							</text>
 						</view>
-						<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
+						<view class="u-flex"
+							style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
 							<view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">包邮</view>
-							<view class="taber" style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">以旧换新</view>
+							<view class="taber"
+								style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">以旧换新</view>
 							<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<u-popup :show="show" mode='center' :round='16' bgColor='transparent'>
+			<view style="position: relative;">
+				<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png"
+					style="width: 570rpx;height: 764rpx;border-radius: 16rpx;" mode=""></image>
+				<view class="" style="text-align: center;" @click='show=false'>
+					<image src="../../static/images/index/close.png" mode="" style="width: 70rpx;height: 70rpx;">
+					</image>
+				</view>
+			</view>
+		</u-popup>
 		<kj-tabbar :value1=1></kj-tabbar>
 	</view>
 </template>
@@ -186,7 +198,8 @@
 					'https://cdn.uviewui.com/uview/swiper/swiper1.png',
 					'https://cdn.uviewui.com/uview/swiper/swiper2.png',
 					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
-				]
+				],
+				show: true
 			}
 		},
 		onLoad() {
@@ -197,6 +210,12 @@
 			sectionChange(index) {
 				this.current = index;
 				console.log(index);
+			},
+			//详情
+			todetail(){
+				uni.navigateTo({
+					url:'/pageA/productdetails'
+				})
 			}
 		}
 	}

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

@@ -11,7 +11,13 @@
     {
       "root": "pageA",
       "pages": [
-        "index"
+        "index",
+        "productdetails",
+        "order",
+        "balance",
+        "counter",
+        "logisticsinfo",
+        "subsidy"
       ]
     },
     {

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

@@ -101,22 +101,25 @@ var components
 try {
   components = {
     uNavbar: function () {
-      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 */ 307))
+      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 */ 375))
     },
     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 */ 315))
+      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 */ 383))
     },
     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 */ 323))
+      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 */ 391))
     },
     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 */ 332))
+      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 */ 400))
     },
     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 */ 340))
+      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 */ 408))
+    },
+    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 */ 416))
     },
     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 */ 348))
+      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 */ 424))
     },
   }
 } catch (e) {
@@ -140,6 +143,11 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  if (!_vm._isMounted) {
+    _vm.e0 = function ($event) {
+      _vm.show = false
+    }
+  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -173,7 +181,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -341,6 +349,18 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -362,7 +382,8 @@ var _default = {
         name: '美妆'
       }],
       //轮播图
-      banner: ['https://cdn.uviewui.com/uview/swiper/swiper1.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png']
+      banner: ['https://cdn.uviewui.com/uview/swiper/swiper1.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png'],
+      show: true
     };
   },
   onLoad: function onLoad() {},
@@ -371,10 +392,17 @@ var _default = {
     sectionChange: function sectionChange(index) {
       this.current = index;
       console.log(index);
+    },
+    //详情
+    todetail: function todetail() {
+      uni.navigateTo({
+        url: '/pageA/productdetails'
+      });
     }
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

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

@@ -7,6 +7,7 @@
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
     "u-swiper": "/uview-ui/components/u-swiper/u-swiper",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
     "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
   }
 }

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

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     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 */ 382))
+      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 */ 458))
     },
     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 */ 390))
+      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 */ 466))
     },
   }
 } catch (e) {

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

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     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 */ 348))
+      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 */ 424))
     },
   }
 } catch (e) {
@@ -166,22 +166,22 @@ 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 () {
-    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 354));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 430));
   }).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 () {
-    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 361));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 437));
   }).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 () {
-    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 368));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 444));
   }).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 () {
-    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 375));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 451));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-badge": "/uview-ui/components/u-badge/u-badge"
-  },
-  "component": true
+  }
 }