6.28

commont/messages.js

@@ -13,7 +13,6 @@ export default {
 			platform: "平台规则",
 			merchant: "商户入驻申请协议",
 			layout: "退出登录",
-			accountBalance:"账户余额",
 			setup: "账号设置",
 			information: "个人信息",
 			headerImg: "头像",
@@ -27,8 +26,6 @@ export default {
 			delete: "删除",
 			wx: "微信导入",
 			add: "新增地址",
-			myBalance:"我的余额",
-			withdrawal:"提现",
 			contacts: "联系人信息",
 			wxAddress: "微信地址薄",
 			newAddress: "新建地址",
@@ -166,7 +163,6 @@ export default {
 			yes: '是',
 			Bottomprice: '最低价',
 			highestprice: '最高价',
-
 			Discounted: '折扣价',
 			service: '服务',
 			Netcontent: '净含量',
@@ -247,7 +243,6 @@ export default {
 			Ordertime: '下单时间',
 			// switch: '更换',
 			Popularshipment: '热门寄件',
-
 			manage: '管理',
 			complete: '完成',
 			selectall: '全选',
@@ -255,7 +250,13 @@ export default {
 			GotoResult: '去结算',
 			orderpaysforitself: '坏单包赔',
 			Soldout: '已售',
-
+			//账户余额
+			accountBalance:"账户余额",
+			myBalance:"我的余额",
+			withdrawal:"提现",
+			recharge:'充值',
+			balanceDetails:"余额明细",
+			
 		}
 	},
 	"en-US": {
@@ -375,7 +376,6 @@ export default {
 			Fill: 'Fill out',
 			senderinfo: 'Sender information',
 			addressee: 'Indicare il nome del destinatario',
-
 			enter: 'confirm',
 			shoptype: 'type of merchandise',
 			estimated: 'estimated weight',
@@ -390,7 +390,6 @@ export default {
 			details: 'View details',
 			Normal: 'General goods',
 			special: 'Special goods',
-
 			orderSearch: 'Please enter the order number to search',
 			orderWeight: 'The total weight of the order currently loaded on the page',
 			purchase: 'Platform purchase',
@@ -402,7 +401,6 @@ export default {
 			total: 'total',
 			selfPost: 'self-post',
 			receiveGoods: 'Wait for the platform to receive the goods',
-
 			TrackingNumber: 'Tracking number',
 			trackingNumber: 'Enter the tracking number to quickly add to my package',
 			Expresscompany: 'Express company',
@@ -412,7 +410,6 @@ export default {
 			Addparcel: 'Add parcel',
 			Packlist: 'Pack list',
 			classification: 'Commodity classification',
-
 			synthesis: 'synthesis',
 			sell: 'sell',
 			Pricea: 'Price',
@@ -450,7 +447,6 @@ export default {
 			Copylink: 'Copy link',
 			Generatepicture: 'Generate picture',
 			Cancel: 'Cancel',
-
 			Paymentsuccess: 'Payment success',
 			MyOrder: 'It can be viewed in "Personal Center - My Order"',
 			Vieworder: 'View order',
@@ -464,7 +460,6 @@ export default {
 			Copiedpaste: 'Copied, go paste ~',
 			Replicationfailure: 'Replication failure',
 			shelves: 'We will alert you via wechat message when the item is in stock and on the shelves',
-
 			Actual: 'Actual amount paid',
 			Balancepayment: 'Balance payment',
 			Currentbalance: 'Current balance',
@@ -492,7 +487,6 @@ export default {
 			Saveeverything: 'Save everything',
 			willpay: 'If you buy, you will pay',
 			Subsidized: 'Subsidized price',
-
 			typeof: 'Type',
 			weight: 'Weight',
 			number: 'Number',
@@ -508,7 +502,6 @@ export default {
 			Ordertime: 'Order Time',
 			// switch: 'Switch',
 			Popularshipment: 'Popular Shipment',
-
 			manage: 'Management',
 			complete: 'Complete',
 			selectall: 'Select All',
@@ -636,13 +629,11 @@ export default {
 			Fill: 'Por favor, rellene',
 			senderinfo: 'Rellene la información del remitente',
 			addressee: 'Por favor ingrese el nombre del destinatario',
-
 			enter: 'determinar',
 			shoptype: 'Tipo de mercancía',
 			estimated: 'Peso estimado estimado',
 			piece: 'algo',
 			rule: 'Entender las reglas de facturación',
-
 			Starting: 'incipiente',
 			destination: 'destino',
 			Commodity: 'Peso de mercancía',
@@ -652,7 +643,6 @@ export default {
 			details: 'Ver los detalles',
 			Normal: 'Bienes comunes',
 			special: 'Mercancía especial',
-
 			orderSearch: 'Por favor, introduzca el número de pedido buscar',
 			orderWeight: 'Peso total del pedido cargado por la página actual',
 			purchase: 'Plataforma de compra propia',
@@ -664,7 +654,6 @@ export default {
 			total: 'total',
 			selfPost: 'Postal desde',
 			receiveGoods: 'A recibir en la plataforma',
-
 			TrackingNumber: 'Número de seguimiento',
 			trackingNumber: 'Ingrese el número de seguimiento para agregar rápidamente a mi paquete',
 			Expresscompany: 'Empresa de mensajería',
@@ -674,7 +663,6 @@ export default {
 			Addparcel: 'Añadir un paquete',
 			Packlist: 'Lista de paquetes',
 			classification: 'Clasificación de mercancías',
-
 			synthesis: 'integrado',
 			sell: 'venta',
 			Pricea: 'precio',
@@ -687,7 +675,6 @@ export default {
 			yes: 'es',
 			Bottomprice: 'Precio más bajo',
 			highestprice: 'Precio máximo',
-
 			Discounted: 'Precio con descuento',
 			service: 'servicios',
 			Netcontent: 'Contenido neto',
@@ -713,7 +700,6 @@ export default {
 			Copylink: 'Copiar el enlace',
 			Generatepicture: 'Generar una imagen',
 			Cancel: 'cancelación',
-
 			Paymentsuccess: 'Pago realizado con éxito',
 			MyOrder: 'Disponible en personal center - mis pedidos',
 			Vieworder: 'Ver el pedido',
@@ -727,7 +713,6 @@ export default {
 			Copiedpaste: 'Ya copiado, ir y pegar',
 			Replicationfailure: 'Falla en copiar',
 			shelves: 'Le recordaremos a través del mensaje de wechat cuando el artículo está en stock y en estante',
-
 			Actual: 'Cantidad a pagar',
 			Balancepayment: 'Pago del saldo',
 			Currentbalance: 'Balance actual',
@@ -755,7 +740,6 @@ export default {
 			Saveeverything: 'Cada estilo debe ahorrar',
 			willpay: 'Comprar caro, pagar',
 			Subsidized: 'Precio subvencionado',
-
 			typeof: 'tipo',
 			weight: 'peso',
 			number: 'número',
@@ -771,7 +755,6 @@ export default {
 			Ordertime: 'hora del pedido',
 			// switch: 'cambio',
 			Popularshipment: 'envío popular',
-
 			manage: 'gestionar',
 			complete: 'completar',
 			selectall: 'seleccionar todo',
@@ -899,13 +882,11 @@ export default {
 			Fill: 'Per piacere',
 			senderinfo: 'Compilare le informazioni inviate ai mittenti',
 			addressee: 'Indicare il nome del destinatario',
-
 			enter: 'definire',
 			shoptype: 'Tipo di merce',
 			estimated: 'Peso stimato',
 			piece: 'cosa',
 			rule: 'Conoscenza delle norme di fatturazione',
-
 			Starting: 'Verso l’alto',
 			destination: 'destinazione',
 			Commodity: 'Peso delle merci',
@@ -915,7 +896,6 @@ export default {
 			details: 'Esaminare i dettagli',
 			Normal: 'Merci comuni',
 			special: 'Prodotti speciali',
-
 			orderSearch: 'Digitare il numero d’ordine per effettuare la ricerca',
 			orderWeight: 'Peso totale delle ordinazioni attualmente caricate',
 			purchase: 'Acquisto di piattaforme',
@@ -927,7 +907,6 @@ export default {
 			total: 'totale',
 			selfPost: 'Inviata dal',
 			receiveGoods: 'Lascia alla piattaforma il carico',
-
 			TrackingNumber: 'Numero del corriere espresso',
 			trackingNumber: 'Inserire il numero d’ordine del corriere rapido e completare rapidamente il pacco',
 			Expresscompany: 'Società di corriere rapido',
@@ -937,7 +916,6 @@ export default {
 			Addparcel: 'Aggiunta di pacchi',
 			Packlist: 'Elenco degli statuti',
 			classification: 'Classificazione delle merci',
-
 			synthesis: 'integrato',
 			sell: 'vendita',
 			Pricea: 'prezzi',
@@ -950,7 +928,6 @@ export default {
 			yes: 'è',
 			Bottomprice: 'Prezzo più basso',
 			highestprice: 'Prezzo massimo',
-
 			Discounted: 'Prezzo ridotto',
 			service: 'servizi',
 			Netcontent: 'Tenore netto',
@@ -971,14 +948,11 @@ export default {
 			Salesvolume: 'Volume delle vendite',
 			stroll: 'gira',
 			article: 'articolo',
-
 			know: 'Io so che',
 			shar: 'condividere',
 			Copylink: 'Riproduzione di un link',
 			Generatepicture: 'Creazione di immagini',
 			Cancel: 'soppressione',
-
-			Paymentsuccess: 'Pagamenti eseguiti',
 			MyOrder: 'Disponibile presso il centro personale',
 			Vieworder: 'Controllare l’ordine',
 			Backtohomepage: 'Ritorno alla pagina iniziale',
@@ -991,7 +965,6 @@ export default {
 			Copiedpaste: 'Già copiato. Andiamo a fare affissione',
 			Replicationfailure: 'Fallimento della riproduzione',
 			shelves: 'Vi ricorderemo tramite wechat quando la merce è in stock e si mette sul mercato',
-
 			Actual: 'Importo versato',
 			Balancepayment: 'Pagamenti del saldo',
 			Currentbalance: 'Saldo delle partite correnti',
@@ -1019,7 +992,6 @@ export default {
 			Saveeverything: 'Ogni contributo sarà provinciale',
 			willpay: 'L’acquisto è a pagamento',
 			Subsidized: 'Prezzo sovvenzionato',
-
 			typeof: 'tipo',
 			weight: 'peso',
 			number: 'numero',

pageC/applicationRefund/applicationRefund.vue

@@ -106,6 +106,11 @@
 				this.refundText = value
 				this.show = false
 			}
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title:"申请退款"
+			})
 		}
 	}
 </script>

pageC/ensureMoney/ensureMoney.vue

@@ -75,7 +75,7 @@
 			//跳转充值页面
 			toRecharge() {
 				uni.navigateTo({
-					url: '/pageC/recharge/recharge'
+					url: '/pageD/ensureRecharge/ensureRecharge'
 				})
 			},
 			//跳转提现页面

pageC/mineFollow/mineFollow.vue

@@ -12,7 +12,7 @@
 		</u-navbar>
 		<!-- 关注商品列表 -->
 		<view class="content" v-if="follow==1">
-			<view class="commodity-detail" v-for="item in commodityList">
+			<view class="commodity-detail" v-for="item in commodityList" @click="toDetail(item)">
 				<image :src="item.img" class="commodity-img" mode=""></image>
 				<view class="commodity-right">
 					<view class="commodity-title">
@@ -50,7 +50,7 @@
 
 						</view>
 					</view>
-					<button class="check">查看主页</button>
+					<button class="check" @click="toHomepage">查看主页</button>
 				</view>
 			</view>
 		</view>
@@ -86,6 +86,16 @@
 			},
 			rightClick() {
 				console.log(111)
+			},
+			toHomepage(){
+				uni.navigateTo({
+					url:"/pageD/homepage/homepage"
+				})
+			},
+			toDetail(item){
+				uni.navigateTo({
+					url:'/pageA/productdetails'
+				})
 			}
 		}
 	}

pageC/orderForm/orderForm.vue

@@ -19,7 +19,7 @@
 					拼团中
 				</view>
 				<view :class="{commodity:follow==4}" class="tab" @click="tabSwitch(4)">
-					代发货
+					待发货
 				</view>
 				<view :class="{commodity:follow==5}" class="tab" @click="tabSwitch(5)">
 					待收货
@@ -93,6 +93,9 @@
 				return this.$t("index")
 			}
 		},
+		onLoad(option) {
+			this.follow = option.followId
+		},
 		methods: {
 			rightClick() {
 				console.log(111)

pageC/orderFormDetail/orderFormDetail.vue

@@ -96,7 +96,7 @@
 			<view style="margin-right: 40rpx; color: #777;font-size: 28rpx;" v-if="status == 8" @click="more">更多</view>
 			<button class="status-1" v-if="status == 8">查看物流</button>
 			<button class="status-1" v-if="status == 8">再来一单</button>
-			<button class="status-2" v-if="status == 8">评价</button>
+			<button class="status-2" v-if="status == 8" @click.stop="toEvaluate">评价</button>
 		</view>
 
 		<u-transition :show="show">
@@ -130,11 +130,17 @@
 					}
 				})
 			},
+			//跳转评论
+			toEvaluate() {
+				uni.navigateTo({
+					url: "/pageD/evaluate/evaluate"
+				})
+			},
 			more() {
 				this.show = true
 			},
-			closeShow(e){
-				if(e._relatedInfo.anchorTargetText != "更多" && e._relatedInfo.anchorTargetText != "删除订单"){
+			closeShow(e) {
+				if (e._relatedInfo.anchorTargetText != "更多" && e._relatedInfo.anchorTargetText != "删除订单") {
 					this.show = false
 				}
 			}

pageD/ensureRecharge/ensureRecharge.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="withdrawal">
+		<!-- 头部 -->
+		<view class="withdrawal-top">
+			<view class="title">
+				支付方式
+			</view>
+			<view class="wx">
+				<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
+				<text>微信余额</text>
+			</view>
+		</view>
+			<!-- 充值头部 -->
+		<view class="content">
+			<view class="money">
+				充值金额
+			</view>
+			<view class="inp">
+				<text>￥</text>
+				<input type="text" />
+			</view>
+			<button class="immediately">立即充值</button>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			toWithdrawalDetail(){
+				uni.navigateTo({
+					url:"/pageC/withdrawalDetail/withdrawalDetail"
+				})
+			}
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title:"保证金充值"
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.withdrawal {
+		padding: 20rpx 24rpx 0;
+		
+		.withdrawal-top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 104rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
+			.title {
+				font-size: 30rpx;
+			}
+
+			.wx {
+				display: flex;
+				align-items: center;
+				height: 50rpx;
+				.wx-logo {
+					width: 40rpx;
+					height: 40rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+		.content{
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-top: 16rpx;
+			padding: 32rpx 24rpx 46rpx;
+			.money{
+				font-size: 30rpx;
+			}
+			.inp{
+				display: flex;
+				height: 110rpx;
+				align-items: center;
+				border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
+				margin-bottom: 18rpx;
+			}
+			.all-money{
+				font-size: 24rpx;
+				color: #555;
+			}
+			.immediately{
+				box-shadow: 0rpx 12rpx 28rpx -12rpx #F83224;
+				border-radius: 44rpx;
+				background-color: #F83224;
+				color: #fff;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+				
+			}
+			.detail{
+				text-align: center;
+				font-size: 26rpx;
+				opacity: 0.6;
+				color: #131415;
+			}
+		}
+	}
+</style>

pageD/evaluate/evaluate.vue

@@ -1,6 +1,23 @@
 <template>
 	<view>
-	评价
+		<view class="content">
+			<view class="rate">
+				<view class="_label">
+					商品评价
+				</view>
+				<u-rate :count="count" v-model="value" size="22"></u-rate>
+			</view>
+			<view class="_text">
+				<u--textarea border='none' v-model="value1" height="150" placeholder="展开说说对商品的想法"></u--textarea>
+			</view>
+			<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10">
+				<view class="upload-photo">
+					<u-icon name="camera" size="26"></u-icon>
+					<text>添加图片/视频</text>
+				</view>
+			</u-upload>
+		</view>
+		<button class="btn-1">提交评价</button>
 	</view>
 </template>
 
@@ -8,17 +25,116 @@
 	export default {
 		data() {
 			return {
-				
+				count: 5,
+				value: 1,
+				value1: "",
+				fileList1: [],
 			};
 		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				console.log(event)
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'file',
+						formData: {
+							user: 'test'
+						},
+						success: (res) => {
+							setTimeout(() => {
+								resolve(res.data.data)
+							}, 1000)
+						}
+					});
+				})
+			},
+		},
 		mounted() {
 			uni.setNavigationBarTitle({
-				title:'评价'
+				title: '评价'
 			})
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.content {
+		background-color: #fff;
+		padding: 40rpx 24rpx;
+
+		.rate {
+			display: flex;
+			align-items: center;
+
+			._label {
+				font-size: 32rpx;
+				font-weight: 600;
+				margin-right: 22rpx;
+			}
+		}
+
+		._text {
+			margin-top: 32rpx;
+			padding-top: 26rpx;
+			border-top: 2rpx solid rgba(151, 151, 151, .1);
+
+		}
+
+		.upload-photo {
+			width: 180rpx;
+			height: 180rpx;
+			border: 2rpx dashed #979797;
+			border-radius: 8rpx;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			justify-content: center;
+			font-size: 24rpx;
+			color: rgba(34, 34, 34, .8);
+		}
 
-</style>
+		::v-deep .u-textarea {
+			background-color: #fff;
+		}
+	}
+	.btn-1{
+		background-color: #f83224;
+		color: #fff;
+		border-radius: 40rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		width: 90%;
+		margin: 0 auto;
+		margin-top: 70rpx;
+		font-size: 32rpx;
+	}
+</style>

pageD/homepage/component/goodsCard.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="card" @click="$emit('toDetail')">
+		<image class="goods-img"
+			src="https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226275/13/1657/110111/6547bda8F6d14df48/a73646abeaea625a.jpg.avif"
+			mode=""></image>
+		<view class="describe">
+			布兰德软罐头猫咪主食包0内脏 混合口味 实发400…
+		</view>
+		<view class="price-sale">
+			<view class="price">
+					<text style="font-size: 20rpx;">￥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+			</view>
+			<view class="sale">
+				销量 500+
+			</view>
+		</view>
+		<view class="evaluate">
+			<view style="margin-right: 12rpx;">
+				500+评价
+			</view>
+			<view>
+				95%好评
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.card {
+		width: 324rpx;
+		margin-bottom: 20rpx;
+		.goods-img {
+			width: 324rpx;
+			height: 324rpx;
+			border-radius: 16rpx;
+		}
+
+		.describe {
+			font-size: 28rpx;
+			color: #333;
+			font-weight: 600;
+			width: 100%;
+			white-space: normal;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			margin-top: 20rpx;
+		}
+		.price-sale{
+			display: flex;
+			margin-top: 16rpx;
+			align-items: flex-end;
+			.price{
+				color: #f83224;
+				font-weight: 600;
+			}
+			.sale{
+				font-size: 20rpx;
+				color: #333;
+				opacity: .8;
+				margin-bottom: 4rpx;
+				margin-left: 10rpx;
+			}
+		}
+		.evaluate{
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			color: #777;
+			margin-top: 16rpx;
+		}
+	}
+</style>

pageD/homepage/homepage.vue

@@ -0,0 +1,254 @@
+<template>
+	<view class="page">
+		<!-- 页面渐变色背景 -->
+		<view class="shadow">
+		</view>
+		<!-- 页面渐变色背景 -->
+		<view class="content">
+			<view class="top-information">
+				<image class="user-header"
+					src="https://q3.itc.cn/q_70/images03/20240519/1b4e7565b46241b68288ae482412a866.jpeg" mode="">
+				</image>
+				<view class="btn-list">
+					<button class="btn-1"><u-icon color="#f83224" size="14" name="kefu-ermai"></u-icon>客服</button>
+					<button v-if="isShow " class="btn-1"><u-icon color="#f83224" size="14" name="plus"></u-icon>关注</button>
+				</view>
+				<view class="name">
+					小萌优选🔥（每天0元秒杀）
+				</view>
+
+				<view class="score">
+					<u-rate count="5" disabled :allowHalf="true" :gutter="1" inactiveColor="#ffacab"
+						activeColor="#FF1515" v-model="value" :size='12'></u-rate>
+					<text class="num">{{value}}</text>
+				</view>
+				<view class="sale">
+					<view class="">
+						销售量 <text space="nbsp">{{"&nbsp;"}} 2354w+</text>
+					</view>
+					<text space="nbsp" class="shu">{{"&nbsp;&nbsp;"}} | {{"&nbsp;&nbsp;"}}</text>
+					<view class="">
+						评价总数 <text space="nbsp">{{"&nbsp;"}} 4w+</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="goods-list">
+				<view class="tab-list">
+					<view :class="{tab:selectTab==1}" @click="switchTab(1)">
+						默认
+					</view>
+					<view :class="{tab:selectTab==2}" @click="switchTab(2)">新品</view>
+					<view :class="{tab:selectTab==3}" @click="switchTab(3)">销量</view>
+					<view class="price" :class="{tab:selectTab==4}" @click="switchTab(4)">价格 <view style="display: flex;flex-direction: column;
+					justify-content: center;
+					margin-left: 6rpx;margin-top: 4rpx;">
+							<u-icon name="arrow-up-fill" size="6" :color=" iconUp==1?'#f83224': '#303133'"></u-icon><u-icon :color=" iconUp==2?'#f83224': '#303133'"
+								size="6" name="arrow-down-fill"></u-icon>
+						</view>
+					</view>
+				</view>
+				<view class="goods">
+					<GoodsCard @toDetail="toDetail" />
+					<GoodsCard @toDetail="toDetail"/>
+					<GoodsCard @toDetail="toDetail"/>
+					<GoodsCard @toDetail="toDetail"/>
+				</view>
+				
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import GoodsCard from './component/goodsCard.vue';
+	export default {
+		components:{
+			GoodsCard
+		},
+		data() {
+			return {
+				value: 4,
+				selectTab: 0,
+				iconUp:0,
+				isShow:true
+			};
+		},
+		onLoad(option) {
+			this.isShow =JSON.parse(option.page)
+		},
+		methods: {
+			switchTab(num) {
+				this.selectTab = num
+				if(num == 4){
+					// this.iconUp = this.iconUp == 0 ? 1:2 
+					// if(this.iconUp == 2){
+					// 	this.iconUp =1
+					// }
+					switch(this.iconUp){
+						case 1:
+						this.iconUp = 2;
+						break;
+						case 0:
+						this.iconUp = 1;
+						break;
+						case 2:
+						this.iconUp = 1;
+						break;
+					}
+				}else{
+					this.iconUp = 0
+				}
+			},
+			toDetail(item){
+				uni.navigateTo({
+					url:"/pageA/productdetails"
+				})
+			}
+		},
+		mounted() {
+			//设置顶部导航栏颜色
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#f74639'
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		.shadow {
+			position: absolute;
+			top: 0;
+			height: 300px;
+			width: 100%;
+			background: linear-gradient(#f74639, #f4f4f4);
+			z-index: -1;
+		}
+
+		.content {
+			padding: 20rpx 24rpx;
+			margin-top: 76rpx;
+
+			.top-information {
+				position: relative;
+				border-radius: 20rpx;
+				background-color: #fff;
+				padding: 28rpx 24rpx;
+				
+				::v-deep .u-icon__icon {
+					color: #f83224 !important;
+				}
+				
+				.user-header {
+					width: 164rpx;
+					height: 164rpx;
+					border-radius: 50%;
+					border: 2rpx solid #fff;
+					position: absolute;
+					top: -80rpx;
+					left: 28rpx;
+				}
+
+				.btn-list {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+
+					.btn-1 {
+						border: 2rpx solid #f83224;
+						background-color: #fff;
+						color: #f83224;
+						padding: 0;
+						margin: 0;
+						display: flex;
+						justify-content: space-around;
+						align-items: center;
+						height: 52rpx;
+						border-radius: 24rpx;
+						line-height: 52rpx;
+						font-size: 26rpx;
+						padding: 0 28rpx;
+						margin-left: 20rpx;
+					}
+				}
+
+				.name {
+					margin-top: 28rpx;
+					font-weight: 600;
+					font-size: 32rpx;
+					color: #333333;
+				}
+
+				.score {
+					width: 148rpx;
+					height: 28rpx;
+					background-color: rgba(255, 27, 0, 0.1);
+					display: flex;
+					border-radius: 12rpx;
+					margin-top: 16rpx;
+					justify-content: space-around;
+
+					.num {
+						font-size: 22rpx;
+						color: #ff1515;
+						font-weight: 600;
+					}
+				}
+
+				.sale {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: #777;
+					margin-top: 20rpx;
+
+					.shu {
+						font-size: 16rpx;
+						color: #979797;
+						opacity: .2;
+					}
+				}
+
+			}
+		}
+
+		.goods-list {
+			border-radius: 20rpx;
+			background-color: #fff;
+			padding: 0 20rpx;
+			margin-top: 20rpx;
+
+			.tab-list {
+				height: 96rpx;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				font-size: 26rpx;
+				color: #333333;
+				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+				margin-bottom: 20rpx;
+				.tab {
+					color: #000;
+					font-weight: 600;
+				}
+
+				.price {
+					display: flex;
+					align-items: center;
+				}
+			}
+			.goods{
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+			}
+		}
+
+	}
+
+
+</style>

pageD/orderDetail/component/commodityDetail.vue

@@ -0,0 +1,181 @@
+<template>
+	<view class="detail">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img"
+					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
+					mode=""></image>
+				<text>张三</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+						<view class="commodity-price">
+							<text style="font-size: 20rpx;">￥</text>
+							<text>133</text>.
+							<text style="font-size: 20rpx;">22</text>
+						</view>
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn-list">
+			<text space="nbsp" style="font-size: 24rpx;">共1件商品 {{"&nbsp;"}}</text>
+			<text style="font-size: 28rpx;">买家实付</text>
+			<view style="color: #222; font-weight: 600;">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">订单备注</text>
+			<view class="_title-right">
+				买家急用，仓库尽早发货
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			status:{
+				typeof:Number,
+				default:0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods:{
+			application(){
+				uni.navigateTo({
+					url:"/pageC/applicationRefund/applicationRefund"
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+
+					.commodity-title {
+						width: 328rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
+
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
+		.last{
+			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			padding-bottom: 20rpx;
+		}
+		.btn-list{
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+		}
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin-top: 34rpx;
+			._label{
+				font-size: 28rpx;
+				color: #333;
+			}
+			._title-right{
+				font-size: 28rpx;
+				color: #333;
+				opacity: .6;
+			}
+		}
+	}
+</style>

pageD/orderDetail/orderDetail.vue

@@ -0,0 +1,295 @@
+<template>
+	<view class="page" >
+		<!-- 订单状态 -->
+		<view class="title">
+			<view>
+				<view class="payment">
+					{{title}}
+				</view>
+			</view>
+
+		</view>
+		<!-- 订单状态 -->
+
+		<!-- 地址信息 -->
+		<view class="address">
+			<view class="name-phone">
+				<u-icon name="map" size="22"></u-icon>
+				<view style="margin: 0 20rpx;font-size: 32rpx;">陈曦</view>
+				<text class="phone">17800000000</text>
+			</view>
+			<view class="address-detail">
+				江苏省淮安市清江浦区北京南路99号（青浦大桥南侧200
+				米）淮安恒大名都3号楼一单元1602
+			</view>
+			
+			<view class="logistics" v-if="status == 3||status == 4">
+				<text class="_label">物流单号</text>
+				<view class="num">
+					<text>圆通快递</text>
+					<text >{{"&nbsp;"+"|"+"&nbsp;"}}</text>
+					<text>123456789</text>
+					<image class="cope-icon" src="../../static/mine/349.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+
+		<commodityDetailVue :status="status" />
+
+		<view class="order">
+			<view class="order-number">
+				<text>
+					订单编号
+				</text>
+				<view>
+					8998391920137645 | <text decode @click="cope('111')">{{"&nbsp;"+"复制"}}</text>
+				</view>
+			</view>
+			<view class="order-number">
+				<text>
+					支付方式
+				</text>
+				<view>
+					微信支付
+				</view>
+			</view>
+			<view class="order-number">
+				<text>
+					支付时间
+				</text>
+				<view>
+					2023-12-08 22:40:03
+				</view>
+			</view>
+			<view class="order-number">
+				<text>
+					创建时间
+				</text>
+				<view>
+					2023-12-08 22:40:03
+				</view>
+			</view>
+			<view class="order-number">
+				<text>
+					运输方式
+				</text>
+				<view>
+					海运
+				</view>
+			</view>
+			<view class="order-number">
+				<text>
+					包裹数量
+				</text>
+				<view>
+					210
+				</view>
+			</view>
+		</view>
+		<view class="footer" v-if="status != 3">
+			<button class="status-2" v-if="status == 1">缴纳保证金</button>
+			<button class="status-1" v-if="status == 2">备注</button>
+			<button class="status-2" v-if="status == 2">立即发货</button>
+			<button class="status-1" v-if="status == 4">查看物流</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import commodityDetailVue from './component/commodityDetail.vue'
+	export default {
+		components: {
+			commodityDetailVue
+		},
+		data() {
+			return {
+				status: 6,
+				show: false,
+				title:""
+			}
+		},
+		onLoad(option) {
+			this.status = option.orderStatus
+			if(option.orderStatus == 1){
+				this.title = "待缴纳保证金"
+			}else if(option.orderStatus == 2){
+				this.title = "待团长发货"
+			}else if(option.orderStatus == 3){
+				this.title = "待总部发货"
+			}else if(option.orderStatus == 4){
+				this.title = "总部已发货"
+			}
+		},
+
+		methods: {
+			//复制
+			cope(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none"
+						})
+					}
+				})
+			},
+
+		},
+		created() {
+
+			//设置顶部标题栏颜色
+			uni.setNavigationBarColor({
+				frontColor: '#000000',
+				backgroundColor: '#f4f4f4'
+			})
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		padding: 20rpx 24rpx 180rpx;
+
+		.title {
+			.payment {
+				font-size: 44rpx;
+				font-weight: 600;
+				margin-bottom: 20rpx;
+			}
+
+			.timer {
+				font-size: 28rpx;
+				color: #666;
+			}
+		}
+
+		.address {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 34rpx 24rpx 28rpx;
+			margin-top: 24rpx;
+
+			.name-phone {
+				display: flex;
+				align-items: center;
+				align-items: flex-end;
+
+				.phone {
+					font-size: 26rpx;
+					color: #666;
+				}
+			}
+
+			.address-detail {
+				margin-top: 20rpx;
+				font-size: 24rpx;
+				color: #444;
+				margin-left: 60rpx;
+			}
+			.logistics{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 28rpx;
+				padding-top: 20rpx;
+				border-top: 2rpx solid #F4F4F4;
+				margin-top: 20rpx;
+				._label{
+					color: #222;
+				}
+				.num{
+					color: #555;
+					display: flex;
+					align-items: center;
+				}
+				.cope-icon{
+					width: 28rpx;
+					height: 28rpx;
+					margin-left: 6rpx;
+				}
+			}
+		}
+
+		.order {
+			background-color: #fff;
+			border-radius: 16rpx;
+			color: rgba(54, 54, 54, .7);
+			font-size: 28rpx;
+			margin-top: 20rpx;
+			padding: 20rpx 20rpx;
+
+			.order-number {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 32rpx;
+			}
+		}
+
+		.contact {
+			padding: 20rpx 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+			margin-bottom: 160rpx;
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			padding-top: 20rpx;
+			padding-bottom: 80rpx;
+			height: 66rpx;
+			width: 100%;
+
+			.status-1 {
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #222;
+				width: 168rpx;
+				height: 68rpx;
+				margin-right: 20rpx;
+				border: 2rpx solid #979797;
+			}
+
+			.status-2 {
+				background-color: #ffffff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #f83224;
+				height: 68rpx;
+				border: 2rpx solid #f83224;
+				margin-right: 24rpx;
+				line-height: 68rpx;
+				padding: 0 34rpx;
+				
+			}
+		}
+
+		.transition {
+			width: 164rpx;
+			height: 88rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx -6rpx rgba(0, 0, 0, 0.3);
+			position: fixed;
+			bottom: 160rpx;
+			text-align: center;
+			line-height: 88rpx;
+			font-size: 26rpx;
+			color: #222;
+		}
+	}
+</style>

pageD/orderFormManage/component/detailCard.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="card">
+	<view class="card" @click="$emit('toInformation',itemInfo)">
 		<view class="user-name">
 			<view class="name">
 				<image class="header-img"

pageD/orderFormManage/orderFormManage.vue

@@ -26,7 +26,7 @@
 		</view>
 		<view class="center">
 			<view v-for="item in orderList" :key="item.status">
-				<DetailCard  :itemInfo="item" />
+				<DetailCard  :itemInfo="item" @toInformation="toInformation" />
 			</view>
 
 		</view>
@@ -109,6 +109,12 @@
 			tabSwitch(num) {
 				this.follow = num
 			},
+			toInformation(item){
+				if(item.status == 0) return;
+				uni.navigateTo({
+					url:`/pageD/orderDetail/orderDetail?orderStatus=${item.status}`
+				})
+			}
 		},
 		computed: {
 			i18n() {

pageD/orderInformation/orderInformation.vue

@@ -163,7 +163,6 @@
 
 		},
 		onLoad(options) {
-			console.log(options)
 			this.orderStauts = options.orderStatus
 			if (this.orderStauts == 0) {
 				//设置顶部标题栏颜色

pages.json

@@ -599,6 +599,27 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "homepage/homepage",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "ensureRecharge/ensureRecharge",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "orderDetail/orderDetail",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]

pages/mine/component/mallOrderForm.vue

@@ -2,28 +2,28 @@
 	<!-- 商城订单 -->
 	<view class="mall">
 		<view class="mall-top"> <text class="mall-title">{{i18n.mallOrders}}</text>
-			<view class="all" @click="toOrderFrom"> <text>{{i18n.whole}}</text>
+			<view class="all" @click="toOrderFrom(1)"> <text>{{i18n.whole}}</text>
 				<image class="right" src='../../../static/mine/right.png' mode=""></image>
 			</view>
 		</view>
 		<view class="order-form">
-			<view class="icon-center">
+			<view class="icon-center" @click="toOrderFrom(2)">
 				<image class="form-icon" src='../../../static/mine/310.png' mode=""></image>
 				<view class="characters">{{i18n.pendingPayment}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toOrderFrom(3)">
 				<image class="form-icon" src='../../../static/mine/311.png' mode=""></image>
 				<view class="characters">{{i18n.joiningGroups}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toOrderFrom(4)">
 				<image class="form-icon" src='../../../static/mine/312.png' mode=""></image>
 				<view class="characters">{{i18n.toBeShipped}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toOrderFrom(5)">
 				<image class="form-icon" src='../../../static/mine/313.png' mode=""></image>
 				<view class="characters">{{i18n.toBeReceived}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toOrderFrom(7)">
 				<image class="form-icon" src='../../../static/mine/314.png' mode=""></image>
 				<view class="characters">{{i18n.refund}}</view>
 			</view>
@@ -42,9 +42,9 @@
 			}
 		},
 		methods:{
-			toOrderFrom(){
+			toOrderFrom(num){
 				uni.navigateTo({
-					url:"/pageC/orderForm/orderForm"
+					url:`/pageC/orderForm/orderForm?followId=${num}`
 				})
 			}
 		}

pages/mine/mine.vue

@@ -9,7 +9,7 @@
 				<view class="name">姓名：张三</view>
 				<text class="user-id">ID:123455</text>
 			</view>
-			<view class="user-home" >{{i18n.homepage}} <text class="home-right"></text> </view>
+			<view v-if="isTeam" class="user-home" @click="toHome">{{i18n.homepage}} <text class="home-right"></text> </view>
 		</view>
 		<!-- 头部个人信息 -->
 		
@@ -56,6 +56,13 @@
 				isTeam:true,//用来判断当前用户是不是团长
 			};
 		},
+		methods:{
+			toHome(){
+				uni.navigateTo({
+					url:"/pageD/homepage/homepage?page=false"
+				})
+			}
+		},
 		created() {
 			//设置顶部标题栏颜色
 			uni.setNavigationBarColor({
@@ -72,12 +79,12 @@
 		padding-left: 10px;
 		background-color: #f4f4f4;
 		padding-right: 10px;
+		position: relative;
 	}
 
 	.mine-top {
 		display: flex;
 		align-items: center;
-		position: relative;
 
 		.header-img {
 			height: 54px;
@@ -100,7 +107,7 @@
 		.user-home {
 			position: absolute;
 			right: 0;
-			// width: 72px;
+			min-width: 72px;
 			height: 28px;
 			background-color: #eee;
 			text-align: center;
@@ -115,7 +122,7 @@
 				background-image: url('../../static/mine/right.png');
 				background-size: 100% 100%;
 				background-repeat: no-repeat;
-				margin-right: 4px;
+				// margin-right: 4px;
 			}
 		}
 	}

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

@@ -94,7 +94,10 @@
         "afterSalesDetail/afterSalesDetail",
         "sending/sending",
         "deliverGoods/deliverGoods",
-        "evaluate/evaluate"
+        "evaluate/evaluate",
+        "homepage/homepage",
+        "ensureRecharge/ensureRecharge",
+        "orderDetail/orderDetail"
       ]
     }
   ],

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

@@ -101,28 +101,28 @@ 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 */ 743))
+      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 */ 769))
     },
     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 */ 851))
+      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 */ 877))
     },
     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 */ 859))
+      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 */ 885))
     },
     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 */ 865))
+      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 */ 891))
     },
     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 */ 877))
+      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 */ 903))
     },
     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 */ 885))
+      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 */ 911))
     },
     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 */ 759))
+      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 */ 785))
     },
     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 */ 792))
+      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 */ 818))
     },
   }
 } catch (e) {

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

@@ -101,25 +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 */ 743))
+      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 */ 769))
     },
     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 */ 751))
+      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 */ 777))
     },
     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 */ 828))
+      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 */ 854))
     },
     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 */ 836))
+      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 */ 862))
     },
     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 */ 784))
+      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 */ 810))
     },
     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 */ 844))
+      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 */ 870))
     },
     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 */ 792))
+      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 */ 818))
     },
   }
 } catch (e) {

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

@@ -101,25 +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 */ 743))
+      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 */ 769))
     },
     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 */ 751))
+      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 */ 777))
     },
     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 */ 759))
+      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 */ 785))
     },
     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 */ 768))
+      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 */ 794))
     },
     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 */ 776))
+      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 */ 802))
     },
     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 */ 784))
+      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 */ 810))
     },
     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 */ 792))
+      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 */ 818))
     },
   }
 } catch (e) {

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 */ 851))
+      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 */ 877))
     },
     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 */ 877))
+      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 */ 903))
     },
   }
 } 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 */ 792))
+      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 */ 818))
     },
   }
 } 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 */ 800));
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 826));
   }).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 */ 807));
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 833));
   }).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 */ 814));
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 840));
   }).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 */ 821));
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 847));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -201,6 +201,14 @@ var _default = {
       isTeam: true //用来判断当前用户是不是团长
     };
   },
+
+  methods: {
+    toHome: function toHome() {
+      uni.navigateTo({
+        url: "/pageD/homepage/homepage?page=false"
+      });
+    }
+  },
   created: function created() {
     //设置顶部标题栏颜色
     uni.setNavigationBarColor({

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

@@ -1 +1 @@
-<view class="mine"><view class="mine-top"><image class="header-img" src="https://c-ssl.dtstatic.com/uploads/blog/202201/23/20220123222213_2899a.thumb.1000_0.jpeg" alt></image><view class="user-info"><view class="name">姓名：张三</view><text class="user-id">ID:123455</text></view><view class="user-home">{{i18n.homepage+''}}<text class="home-right"></text></view></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{isTeam}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{4}}" bind:__l="__l"></kj-tabbar></view>
+<view class="mine"><view class="mine-top"><image class="header-img" src="https://c-ssl.dtstatic.com/uploads/blog/202201/23/20220123222213_2899a.thumb.1000_0.jpeg" alt></image><view class="user-info"><view class="name">姓名：张三</view><text class="user-id">ID:123455</text></view><block wx:if="{{isTeam}}"><view data-event-opts="{{[['tap',[['toHome',['$event']]]]]}}" class="user-home" bindtap="__e">{{i18n.homepage+''}}<text class="home-right"></text></view></block></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{isTeam}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{4}}" bind:__l="__l"></kj-tabbar></view>

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

@@ -101,13 +101,13 @@ 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 */ 743))
+      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 */ 769))
     },
     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 */ 768))
+      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 */ 794))
     },
     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 */ 792))
+      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 */ 818))
     },
   }
 } catch (e) {