用户页面的页面设计

jiaoyu_mp/App.vue

@@ -58,9 +58,6 @@
 		font-family: Arial, Helvetica, sans-serif;
 		background: #F5F5F5;
 	}
-	view{
-			box-sizing: border-box;
-	}
 	// 到底了
 	.to_bottom{
 		height: 40rpx;

jiaoyu_mp/pages.json

@@ -204,6 +204,20 @@
 					{
 						"navigationBarTitleText" : "我的订单"
 					}
+				},
+				{
+					"path" : "user/favorites",
+					"style" : 
+					{
+						"navigationBarTitleText" : "我的收藏"
+					}
+				},
+				{
+					"path" : "user/usercoupon",
+					"style" : 
+					{
+						"navigationBarTitleText" : "我的优惠卷"
+					}
 				}]
 		}
 	],

jiaoyu_mp/pages/index/index.vue

@@ -28,12 +28,12 @@
 				<!-- Vue3 项目部分小程序端事件延迟或调用失败 在执行事件的元素上添加 data-eventsync="true" 属性以解决此问题 -->
 				<view @click="toDetail(item)" data-eventsync="true" class="product_item" v-for="(item,index) in productList" :key="index">
 					<view class="product_left">
-						<image class="product_image" src="" mode=""></image>
+						<image class="product_image" :src="item.thumb" mode=""></image>
 					</view>
 					<view class="product_right">
 						<view class="product_title">
 							<view class="product_text">
-								<text>少儿直播学习课堂，今日限购</text>
+								<text>{{item.name}}</text>
 							</view>
 							<view class="time">
 								<text>距今日结束08：02：56</text>
@@ -41,7 +41,7 @@
 						</view>
 						<view class="stock_price">
 							<view class="product_price" >
-								<span style="font-size: 26rpx;">￥</span><text >100 </text>
+								<span style="font-size: 26rpx;">￥</span><text >{{item.price}}</text>
 							</view>
 							<view class="product_order_but">
 								<button>立即购买</button>
@@ -309,7 +309,7 @@
 						width: 224rpx;
 						height: 200rpx;
 						border-radius: 20rpx;
-						background-color: aqua;
+
 					}
 				}
 				.product_right{

jiaoyu_mp/pages/product/index.vue

@@ -10,7 +10,7 @@
 		<view class="product_info">
 			<view class="product_title_info">
 				<view class="product_title">
-					<text>我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题我是主标题</text>
+					<text>{{productInfo.name}}</text>
 				</view>
 				<view class="product_subtitle">
 					<text>我是副标题</text>

jiaoyu_mp/pagesA/course/index.vue

@@ -192,10 +192,9 @@
 					margin: 20rpx 0rpx;
 					justify-content: space-between;
 					.course_make_btn{
-
 						width: 300rpx;
 						height: 60rpx;
-						line-height: 60rpx;
+						// line-height: 60rpx;
 						text-align: center;
 						padding: 10rpx;
 						background-color: #1fbe7e;
@@ -203,10 +202,9 @@
 						border-radius: 20rpx;
 					}
 					.user_course_btn{
-
 						width: 300rpx;
 						height: 60rpx;
-						line-height: 60rpx;
+						// line-height: 60rpx;
 						text-align: center;
 						padding: 10rpx;
 						background-color: #1fbe7e;

jiaoyu_mp/pagesA/course/usercourse.vue

@@ -134,7 +134,7 @@
 				</view>
 			</view>
 		</view>
-		<uni-popup ref="cancelPopup" type="top">
+		<uni-popup ref="cancelPopup">
 			<view class="cancel_layout">
 				<view class="cancel_title">
 					取消预约
@@ -144,10 +144,10 @@
 				</view>
 				<view class="cancel_btn">
 					<view class="btn_1">
-						<button>在想想</button>
+						在想想
 					</view>
 					<view class="btn_2">
-						<button>确认</button>
+						确认
 					</view>
 				</view>
 			</view>
@@ -302,36 +302,26 @@
 			padding:30rpx;
 		}
 		.cancel_btn{
-			// border-top: 2rpx solid #d3d3d3;
+			border-top: 2rpx solid #d3d3d3;
 			display: flex;
 			justify-content: space-between;
-			margin-top: 20rpx;
+			margin-top: 60rpx;
 			.btn_1{
 				display: inline-flex;
 				justify-content: center;
 				align-items: center;
-				height: 130rpx;
+				height: 100rpx;
 				flex: 1;
 				font-size: 30rpx;
-
-				button{
-					height: 100%;
-					flex: 1;
-					color: #51bf81;
-				}
+				color: #51bf81;
 			}
 			.btn_2{
 				display: inline-flex;
 				justify-content: center;
 				align-items: center;
 				flex: 1;
-				height: 130rpx;
+				height: 100rpx;
 				font-size: 30rpx;
-				button{
-					height: 100%;
-					flex: 1;
-					color: #b2b2b2;
-				}
 			}
 		}
 	}

jiaoyu_mp/pagesA/user/favorites.vue

@@ -0,0 +1,202 @@
+<template>
+	<view>
+		<view class="product_list" >
+			<!-- Vue3 项目部分小程序端事件延迟或调用失败 在执行事件的元素上添加 data-eventsync="true" 属性以解决此问题 -->
+			<view data-eventsync="true" class="product_item" v-for="(item,index) in 10" :key="index">
+				<view class="product_left">
+					<image class="product_image" src="" mode=""></image>
+				</view>
+				<view class="product_right">
+					<view class="product_title">
+						<view class="product_text">
+							<text>少儿直播学习课堂，今日限购</text>
+						</view>
+						<view class="time">
+							<text>距今日结束08：02：56</text>
+						</view>
+					</view>
+					<view class="stock_price">
+						<view class="product_price" >
+							<span style="font-size: 26rpx;">￥</span><text >100 </text>
+						</view>
+						<view class="cancel_but"  @click="cancelPopup()">
+							取消收藏
+						</view>
+						<view class="product_order_but">
+							立即购买
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="cancelPopup">
+			<view class="cancel_layout">
+				<view class="cancel_title">
+					取消收藏
+				</view>
+				<view class="cancel_text">
+					是否确认取消收藏？取消后可能找不回来咯
+				</view>
+				<view class="cancel_btn">
+					<view class="btn_1">
+						在想想
+					</view>
+					<view class="btn_2">
+						确认
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<view class="to_bottom" > -----到底啦-----</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			cancelPopup(){
+				this.$refs.cancelPopup.open("center");
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+		.product_list{
+			display: block;
+			overflow: hidden;
+			margin: 0rpx auto;
+			.product_item{
+				width: 690rpx;
+				display: block;
+				overflow: hidden;
+				margin: 20rpx 0rpx;
+				margin-right: 20rpx;
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
+				.product_left{
+					float: left;
+					.product_image{
+						margin: 20rpx 20rpx;
+						width: 224rpx;
+						height: 200rpx;
+						border-radius: 20rpx;
+						background-color: aqua;
+					}
+				}
+				.product_right{
+					float: left;
+					width: 380rpx;
+					margin: 20rpx 20rpx;
+					.product_title{
+						line-height: 1.5;
+						.product_text{
+							font-size: 30rpx;
+							font-weight: 600;
+						}
+						.time{
+							font-size: 24rpx;
+						}
+					}
+					.stock_price{
+						color: #dddddd;
+						height: 100rpx;
+						font-size: 20rpx;
+						line-height: 30rpx;
+						padding: 0rpx 10rpx;
+						margin-top: 40rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						.product_price{
+							color: red;
+							font-size: 50rpx;
+							font-weight: 600;
+							line-height: 100rpx;
+						}
+						.cancel_but{
+							display: inline-flex;
+							width: 150rpx;
+							height: 64rpx;
+							align-items: center;
+							justify-content: center;
+							margin: 0rpx 10rpx;
+							border-radius: 40rpx;
+							border: 2rpx solid #1fbe7e;
+							color: #000000;
+						}
+						.product_order_but{
+								display: inline-flex;
+								width: 150rpx;
+								height: 64rpx;
+								font-size: 24rpx;
+								background-color: #1fbe7e;
+								border-radius: 40rpx;
+								color: #FFFFFF;
+								align-items: center;
+								justify-content: center;
+						}
+					}
+				}
+			}
+			.product_item:nth-child(even){
+				margin-right: 0rpx;
+			}
+		}
+		.cancel_layout{
+			background-color: #FFFFFF;
+			width: 690rpx;
+			height: 30vh;
+			border-radius: 40rpx;
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+			.cancel_title{
+				display: inline-flex;
+				justify-content: center;
+				align-items: center;
+				padding: 10rpx;
+				margin: 30rpx;
+				font-size: 40rpx;
+				font-weight: bold;
+				color: #000000;
+			}
+			.cancel_text{
+				display: inline-flex;
+				justify-content: center;
+				align-items: center;
+				margin: 30rpx auto;
+				width: 576rpx;
+				height: 50rpx;
+				padding:30rpx;
+			}
+			.cancel_btn{
+				border-top: 2rpx solid #d3d3d3;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 60rpx;
+				.btn_1{
+					display: inline-flex;
+					justify-content: center;
+					align-items: center;
+					height: 100rpx;
+					flex: 1;
+					font-size: 30rpx;
+					color: #51bf81;
+				}
+				.btn_2{
+					display: inline-flex;
+					justify-content: center;
+					align-items: center;
+					flex: 1;
+					height: 100rpx;
+					font-size: 30rpx;
+				}
+			}
+		}
+</style>

jiaoyu_mp/pagesA/user/index.vue

@@ -144,10 +144,10 @@
 			display: flex;
 			flex-wrap: wrap;
 			padding: 35rpx 0rpx;
-			margin: 30rpx auto;
+			margin: 0rpx auto;
 			.navigator_item{
 				height: 180rpx;
-				margin: 20rpx;
+				margin: 25rpx;
 				text-align: center;
 				.navigator_image_box{
 					background-color: #ffac1e;

jiaoyu_mp/pagesA/user/usercoupon.vue

@@ -0,0 +1,102 @@
+<template>
+	<view class="coupon_layout">
+		<view class="coupon_list">
+			<view class="coupon_item">
+				<view class="coupon_header">
+					<text class="coupon_title">商家满减优惠券</text>
+					<text class="coupon_price">¥10</text>
+				</view>
+			    <view class="coupon_body">
+					<text class="coupon_valid_date">有效期至2024.10.25 23:56</text>
+					<text class="coupon_remaining">满59可用</text>
+			    </view>
+				<view class="coupon_footer">
+					<text class="coupon_rule">使用规则：必须在本商城使用</text>
+					<view class="coupon_use">
+						去使用
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="to_bottom" v-if="isLast"> -----到底啦-----</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="less">
+.coupon_layout{
+	width: 690rpx;
+	margin: 30rpx auto;
+	.coupon_list {
+	  width: 690rpx;
+	  display: flex;
+	  flex-direction: column;
+	  margin: 30rpx auto;
+	   gap: 20rpx;
+	  .coupon_item {
+	    display: flex;
+	    flex-direction: column;
+		background: linear-gradient(to right,#ec3c35, #e8610e,#a51cd7);
+	    color: white;
+	    padding: 20rpx;
+	    border-radius: 10rpx;
+		
+		.coupon_header {
+		  display: flex;
+		  justify-content: space-between;
+		  .coupon_title {
+		    font-size: 32rpx;
+		  }
+		  .coupon_price {
+		    font-size: 40rpx;
+		  }
+		
+		}
+		.coupon_body {
+		  display: flex;
+		  justify-content: space-between;
+		  margin-top: 10rpx;
+		  .coupon_valid_date {
+		    font-size: 24rpx;
+		  }
+		  .coupon_remaining {
+		    font-size: 32rpx;
+		  }
+		  
+		}
+		.coupon_footer {
+		  display: flex;
+		  justify-content: space-between;
+		  margin-top: 10rpx;
+		  .coupon_rule {
+			font-size: 24rpx;
+		  }
+		  .coupon_use{
+			  width: 120rpx;
+			  color: #000000;
+			  text-align: center;
+			  font-size: 24rpx;
+			  background-color: #FFFFFF;
+			  border-radius: 20rpx;
+			  padding: 6rpx;
+		  }
+		  
+		}
+		
+	  }
+	}
+}
+
+</style>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/app.js

@@ -33,6 +33,8 @@ if (!Math) {
   "./pagesA/score/product.js";
   "./pagesA/user/index.js";
   "./pagesA/orders/userorder.js";
+  "./pagesA/user/favorites.js";
+  "./pagesA/user/usercoupon.js";
 }
 const _sfc_main = {
   onLaunch: function() {

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

@@ -32,7 +32,9 @@
         "score/index",
         "score/product",
         "user/index",
-        "orders/userorder"
+        "orders/userorder",
+        "user/favorites",
+        "user/usercoupon"
       ]
     }
   ],

jiaoyu_mp/unpackage/dist/dev/mp-weixin/app.wxss

@@ -3,9 +3,6 @@ page {
   font-family: Arial, Helvetica, sans-serif;
   background: #F5F5F5;
 }
-view {
-  box-sizing: border-box;
-}
 .to_bottom {
   height: 40rpx;
   color: #999999;

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

@@ -135,8 +135,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, !$data.productList.length ? {} : {}, {
     c: common_vendor.f($data.productList, (item, index, i0) => {
       return {
-        a: common_vendor.o(($event) => $options.toDetail(item), index),
-        b: index
+        a: item.thumb,
+        b: common_vendor.t(item.name),
+        c: common_vendor.t(item.price),
+        d: common_vendor.o(($event) => $options.toDetail(item), index),
+        e: index
       };
     }),
     d: common_vendor.p({

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view><view class="banner_box"><view class="banner_list"><swiper class="banner_swiper" autoplay="{{true}}"><swiper-item wx:for="{{a}}" wx:for-item="item" wx:key="c"><image src="{{item.a}}" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view><view class="product_box"><view wx:if="{{b}}" class="to_bottom"> -----还没有产品啦-----</view><view class="product_list"><view wx:for="{{c}}" wx:for-item="item" wx:key="b" bindtap="{{item.a}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{''}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>少儿直播学习课堂，今日限购</text></view><view class="time"><text>距今日结束08：02：56</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">￥</label><text>100 </text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><view class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="406c9705-0" bind:__l="__l" u-p="{{d}}"></uni-icons><uni-icons wx:if="{{e}}" class="search_btn" u-i="406c9705-1" bind:__l="__l" u-p="{{e}}"></uni-icons></view></view><view wx:if="{{f}}" class="to_bottom"> -----到底啦-----</view></view>
+<view><view class="banner_box"><view class="banner_list"><swiper class="banner_swiper" autoplay="{{true}}"><swiper-item wx:for="{{a}}" wx:for-item="item" wx:key="c"><image src="{{item.a}}" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view><view class="product_box"><view wx:if="{{b}}" class="to_bottom"> -----还没有产品啦-----</view><view class="product_list"><view wx:for="{{c}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{item.a}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>{{item.b}}</text></view><view class="time"><text>距今日结束08：02：56</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">￥</label><text>{{item.c}}</text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><view class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="406c9705-0" bind:__l="__l" u-p="{{d}}"></uni-icons><uni-icons wx:if="{{e}}" class="search_btn" u-i="406c9705-1" bind:__l="__l" u-p="{{e}}"></uni-icons></view></view><view wx:if="{{f}}" class="to_bottom"> -----到底啦-----</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -100,7 +100,6 @@
   width: 224rpx;
   height: 200rpx;
   border-radius: 20rpx;
-  background-color: aqua;
 }
 .product_box .product_list .product_item .product_right {
   float: left;

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

@@ -499,39 +499,40 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     c: $data.StatusBarHeight + "px",
     d: common_vendor.o((...args) => $options.goBack && $options.goBack(...args)),
     e: $data.productInfo.thumb,
-    f: common_vendor.t($data.productInfo.price),
-    g: common_vendor.t($data.productInfo.stock),
-    h: common_assets._imports_0$1,
-    i: common_assets._imports_1$1,
-    j: common_vendor.o(($event) => $options.showSpecPopup(2)),
-    k: $data.specBtnType == 1
+    f: common_vendor.t($data.productInfo.name),
+    g: common_vendor.t($data.productInfo.price),
+    h: common_vendor.t($data.productInfo.stock),
+    i: common_assets._imports_0$1,
+    j: common_assets._imports_1$1,
+    k: common_vendor.o(($event) => $options.showSpecPopup(2)),
+    l: $data.specBtnType == 1
   }, $data.specBtnType == 1 ? common_vendor.e({
-    l: !$data.checkedAddr.id
+    m: !$data.checkedAddr.id
   }, !$data.checkedAddr.id ? {} : {}, {
-    m: common_vendor.t($data.checkedAddr.contact_name),
-    n: common_vendor.t($data.checkedAddr.contact_phone),
-    o: common_vendor.t($data.checkedAddr.contact_province),
-    p: common_vendor.t($data.checkedAddr.contact_city),
-    q: common_vendor.t($data.checkedAddr.contact_area),
-    r: common_vendor.t($data.checkedAddr.contact_addr),
-    s: common_vendor.o(($event) => $options.showAddrPopup())
+    n: common_vendor.t($data.checkedAddr.contact_name),
+    o: common_vendor.t($data.checkedAddr.contact_phone),
+    p: common_vendor.t($data.checkedAddr.contact_province),
+    q: common_vendor.t($data.checkedAddr.contact_city),
+    r: common_vendor.t($data.checkedAddr.contact_area),
+    s: common_vendor.t($data.checkedAddr.contact_addr),
+    t: common_vendor.o(($event) => $options.showAddrPopup())
   }) : {}, {
-    t: $data.productInfo.thumb,
-    v: common_vendor.t($data.productInfo.name),
-    w: $data.isShowPrice
+    v: $data.productInfo.thumb,
+    w: common_vendor.t($data.productInfo.name),
+    x: $data.isShowPrice
   }, $data.isShowPrice ? {
-    x: common_vendor.t($data.productInfo.price),
-    y: common_vendor.t($data.productInfo.market_price)
+    y: common_vendor.t($data.productInfo.price),
+    z: common_vendor.t($data.productInfo.market_price)
   } : {}, {
-    z: common_assets._imports_2,
-    A: common_vendor.o(($event) => $options.changeQuantity(-1)),
-    B: common_vendor.o(($event) => $options.changeQuantity(0)),
-    C: $data.quantity,
-    D: common_vendor.o(($event) => $data.quantity = $event.detail.value),
-    E: common_assets._imports_3,
-    F: common_vendor.o(($event) => $options.changeQuantity(1)),
-    G: common_vendor.t($data.productInfo.stock),
-    H: common_vendor.f($data.productInfo.product_attr, (spec, spec_index, i0) => {
+    A: common_assets._imports_2,
+    B: common_vendor.o(($event) => $options.changeQuantity(-1)),
+    C: common_vendor.o(($event) => $options.changeQuantity(0)),
+    D: $data.quantity,
+    E: common_vendor.o(($event) => $data.quantity = $event.detail.value),
+    F: common_assets._imports_3,
+    G: common_vendor.o(($event) => $options.changeQuantity(1)),
+    H: common_vendor.t($data.productInfo.stock),
+    I: common_vendor.f($data.productInfo.product_attr, (spec, spec_index, i0) => {
       return {
         a: common_vendor.t(spec.spec_name),
         b: common_vendor.f(spec.attr_list, (option, attr_index, i1) => {
@@ -545,31 +546,31 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         c: spec_index
       };
     }),
-    I: $data.specBtnType == 1
+    J: $data.specBtnType == 1
   }, $data.specBtnType == 1 ? {
-    J: common_vendor.t($data.couponUsed),
-    K: common_vendor.o(($event) => $options.openCoupon())
+    K: common_vendor.t($data.couponUsed),
+    L: common_vendor.o(($event) => $options.openCoupon())
   } : {}, {
-    L: $data.specBtnType == 1
+    M: $data.specBtnType == 1
   }, $data.specBtnType == 1 ? {
-    M: common_vendor.t($data.priceTotal)
+    N: common_vendor.t($data.priceTotal)
   } : {}, {
-    N: $data.specBtnType == 1
+    O: $data.specBtnType == 1
   }, $data.specBtnType == 1 ? {
-    O: common_vendor.o(($event) => $options.createOrder())
+    P: common_vendor.o(($event) => $options.createOrder())
   } : {}, {
-    P: $data.specBtnType == 2
+    Q: $data.specBtnType == 2
   }, $data.specBtnType == 2 ? {
-    Q: common_vendor.o(($event) => $options.createCart())
+    R: common_vendor.o(($event) => $options.createCart())
   } : {}, {
-    R: common_vendor.sr("specPopup", "618774e2-1"),
-    S: common_vendor.o($options.popupChange),
-    T: common_vendor.p({
+    S: common_vendor.sr("specPopup", "618774e2-1"),
+    T: common_vendor.o($options.popupChange),
+    U: common_vendor.p({
       show: true,
       type: "bottom",
       ["background-color"]: "#FFFFFF"
     }),
-    U: common_vendor.f($data.couponList, (item, index, i0) => {
+    V: common_vendor.f($data.couponList, (item, index, i0) => {
       return common_vendor.e({
         a: item.rebate_type == 1
       }, item.rebate_type == 1 ? {
@@ -607,12 +608,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         s: index
       });
     }),
-    V: common_vendor.sr("couponPopup", "618774e2-2"),
-    W: common_vendor.p({
+    W: common_vendor.sr("couponPopup", "618774e2-2"),
+    X: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"
     }),
-    X: common_vendor.f($data.addrList, (item, index, i0) => {
+    Y: common_vendor.f($data.addrList, (item, index, i0) => {
       return common_vendor.e({
         a: item.id == $data.checkedAddr.id ? "../../static/icon/radioed.png" : "../../static/icon/radio.png",
         b: common_vendor.t(item.contact_name),
@@ -627,20 +628,20 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         j: common_vendor.o(($event) => $options.checkedAddrItem(item), index)
       });
     }),
-    Y: common_vendor.sr("addrPopup", "618774e2-3"),
-    Z: common_vendor.p({
+    Z: common_vendor.sr("addrPopup", "618774e2-3"),
+    aa: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"
     }),
-    aa: common_vendor.o(($event) => $options.closeAddFollow()),
-    ab: $data.followQrcode
-  }, $data.followQrcode ? {
+    ab: common_vendor.o(($event) => $options.closeAddFollow()),
     ac: $data.followQrcode
+  }, $data.followQrcode ? {
+    ad: $data.followQrcode
   } : {}, {
-    ad: common_vendor.o(($event) => $options.saveImage()),
-    ae: common_vendor.sr("addFollow", "618774e2-4"),
-    af: common_vendor.o($options.popupChange),
-    ag: common_vendor.p({
+    ae: common_vendor.o(($event) => $options.saveImage()),
+    af: common_vendor.sr("addFollow", "618774e2-4"),
+    ag: common_vendor.o($options.popupChange),
+    ah: common_vendor.p({
       type: "center"
     })
   });

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/index.wxss

@@ -88,7 +88,6 @@
 .course_layout .course_list .course_item .btn_title .btn .course_make_btn {
   width: 300rpx;
   height: 60rpx;
-  line-height: 60rpx;
   text-align: center;
   padding: 10rpx;
   background-color: #1fbe7e;
@@ -98,7 +97,6 @@
 .course_layout .course_list .course_item .btn_title .btn .user_course_btn {
   width: 300rpx;
   height: 60rpx;
-  line-height: 60rpx;
   text-align: center;
   padding: 10rpx;
   background-color: #1fbe7e;

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.js

@@ -25,10 +25,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     a: common_vendor.o(($event) => $options.cancelPopup()),
     b: common_vendor.o(($event) => $options.cancelPopup()),
     c: common_vendor.o(($event) => $options.cancelPopup()),
-    d: common_vendor.sr("cancelPopup", "110bae46-0"),
-    e: common_vendor.p({
-      type: "top"
-    })
+    d: common_vendor.sr("cancelPopup", "110bae46-0")
   };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxss

@@ -117,21 +117,18 @@
   padding: 30rpx;
 }
 .cancel_layout .cancel_btn {
+  border-top: 2rpx solid #d3d3d3;
   display: flex;
   justify-content: space-between;
-  margin-top: 20rpx;
+  margin-top: 60rpx;
 }
 .cancel_layout .cancel_btn .btn_1 {
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  height: 130rpx;
+  height: 100rpx;
   flex: 1;
   font-size: 30rpx;
-}
-.cancel_layout .cancel_btn .btn_1 button {
-  height: 100%;
-  flex: 1;
   color: #51bf81;
 }
 .cancel_layout .cancel_btn .btn_2 {
@@ -139,11 +136,6 @@
   justify-content: center;
   align-items: center;
   flex: 1;
-  height: 130rpx;
+  height: 100rpx;
   font-size: 30rpx;
 }
-.cancel_layout .cancel_btn .btn_2 button {
-  height: 100%;
-  flex: 1;
-  color: #b2b2b2;
-}

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/favorites.js

@@ -0,0 +1,33 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {
+  data() {
+    return {};
+  },
+  methods: {
+    cancelPopup() {
+      this.$refs.cancelPopup.open("center");
+    }
+  }
+};
+if (!Array) {
+  const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
+  _easycom_uni_popup2();
+}
+const _easycom_uni_popup = () => "../../uni_modules/uni-popup/components/uni-popup/uni-popup.js";
+if (!Math) {
+  _easycom_uni_popup();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.f(10, (item, index, i0) => {
+      return {
+        a: common_vendor.o(($event) => $options.cancelPopup(), index),
+        b: index
+      };
+    }),
+    b: common_vendor.sr("cancelPopup", "1ed72e40-0")
+  };
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+wx.createPage(MiniProgramPage);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/favorites.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "我的收藏",
+  "usingComponents": {
+    "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
+}

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/favorites.wxml

@@ -0,0 +1 @@
+<view><view class="product_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="b" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{''}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>少儿直播学习课堂，今日限购</text></view><view class="time"><text>距今日结束08：02：56</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">￥</label><text>100 </text></view><view class="cancel_but" bindtap="{{item.a}}"> 取消收藏 </view><view class="product_order_but"> 立即购买 </view></view></view></view></view><uni-popup class="r" u-s="{{['d']}}" u-r="cancelPopup" u-i="1ed72e40-0" bind:__l="__l"><view class="cancel_layout"><view class="cancel_title"> 取消收藏 </view><view class="cancel_text"> 是否确认取消收藏？取消后可能找不回来咯 </view><view class="cancel_btn"><view class="btn_1"> 在想想 </view><view class="btn_2"> 确认 </view></view></view></uni-popup><view class="to_bottom"> -----到底啦-----</view></view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/favorites.wxss

@@ -0,0 +1,132 @@
+.product_list {
+  display: block;
+  overflow: hidden;
+  margin: 0rpx auto;
+}
+.product_list .product_item {
+  width: 690rpx;
+  display: block;
+  overflow: hidden;
+  margin: 20rpx 0rpx;
+  margin-right: 20rpx;
+  background-color: #FFFFFF;
+  border-radius: 20rpx;
+}
+.product_list .product_item .product_left {
+  float: left;
+}
+.product_list .product_item .product_left .product_image {
+  margin: 20rpx 20rpx;
+  width: 224rpx;
+  height: 200rpx;
+  border-radius: 20rpx;
+  background-color: aqua;
+}
+.product_list .product_item .product_right {
+  float: left;
+  width: 380rpx;
+  margin: 20rpx 20rpx;
+}
+.product_list .product_item .product_right .product_title {
+  line-height: 1.5;
+}
+.product_list .product_item .product_right .product_title .product_text {
+  font-size: 30rpx;
+  font-weight: 600;
+}
+.product_list .product_item .product_right .product_title .time {
+  font-size: 24rpx;
+}
+.product_list .product_item .product_right .stock_price {
+  color: #dddddd;
+  height: 100rpx;
+  font-size: 20rpx;
+  line-height: 30rpx;
+  padding: 0rpx 10rpx;
+  margin-top: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.product_list .product_item .product_right .stock_price .product_price {
+  color: red;
+  font-size: 50rpx;
+  font-weight: 600;
+  line-height: 100rpx;
+}
+.product_list .product_item .product_right .stock_price .cancel_but {
+  display: inline-flex;
+  width: 150rpx;
+  height: 64rpx;
+  align-items: center;
+  justify-content: center;
+  margin: 0rpx 10rpx;
+  border-radius: 40rpx;
+  border: 2rpx solid #1fbe7e;
+  color: #000000;
+}
+.product_list .product_item .product_right .stock_price .product_order_but {
+  display: inline-flex;
+  width: 150rpx;
+  height: 64rpx;
+  font-size: 24rpx;
+  background-color: #1fbe7e;
+  border-radius: 40rpx;
+  color: #FFFFFF;
+  align-items: center;
+  justify-content: center;
+}
+.product_list .product_item:nth-child(even) {
+  margin-right: 0rpx;
+}
+.cancel_layout {
+  background-color: #FFFFFF;
+  width: 690rpx;
+  height: 30vh;
+  border-radius: 40rpx;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+.cancel_layout .cancel_title {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  padding: 10rpx;
+  margin: 30rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #000000;
+}
+.cancel_layout .cancel_text {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  margin: 30rpx auto;
+  width: 576rpx;
+  height: 50rpx;
+  padding: 30rpx;
+}
+.cancel_layout .cancel_btn {
+  border-top: 2rpx solid #d3d3d3;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 60rpx;
+}
+.cancel_layout .cancel_btn .btn_1 {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  height: 100rpx;
+  flex: 1;
+  font-size: 30rpx;
+  color: #51bf81;
+}
+.cancel_layout .cancel_btn .btn_2 {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  flex: 1;
+  height: 100rpx;
+  font-size: 30rpx;
+}

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/index.wxss

@@ -45,11 +45,11 @@
   display: flex;
   flex-wrap: wrap;
   padding: 35rpx 0rpx;
-  margin: 30rpx auto;
+  margin: 0rpx auto;
 }
 .navigator_content .navigator_list .navigator_item {
   height: 180rpx;
-  margin: 20rpx;
+  margin: 25rpx;
   text-align: center;
 }
 .navigator_content .navigator_list .navigator_item .navigator_image_box {

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/usercoupon.js

@@ -0,0 +1,15 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {
+  data() {
+    return {};
+  },
+  methods: {}
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.isLast
+  }, _ctx.isLast ? {} : {});
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+wx.createPage(MiniProgramPage);

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/usercoupon.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的优惠卷",
+  "usingComponents": {}
+}

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/usercoupon.wxml

@@ -0,0 +1 @@
+<view class="coupon_layout"><view class="coupon_list"><view class="coupon_item"><view class="coupon_header"><text class="coupon_title">商家满减优惠券</text><text class="coupon_price">¥10</text></view><view class="coupon_body"><text class="coupon_valid_date">有效期至2024.10.25 23:56</text><text class="coupon_remaining">满59可用</text></view><view class="coupon_footer"><text class="coupon_rule">使用规则：必须在本商城使用</text><view class="coupon_use"> 去使用 </view></view></view></view></view><view wx:if="{{a}}" class="to_bottom"> -----到底啦-----</view>

jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/user/usercoupon.wxss

@@ -0,0 +1,57 @@
+.coupon_layout {
+  width: 690rpx;
+  margin: 30rpx auto;
+}
+.coupon_layout .coupon_list {
+  width: 690rpx;
+  display: flex;
+  flex-direction: column;
+  margin: 30rpx auto;
+  gap: 20rpx;
+}
+.coupon_layout .coupon_list .coupon_item {
+  display: flex;
+  flex-direction: column;
+  background: linear-gradient(to right, #ec3c35, #e8610e, #a51cd7);
+  color: white;
+  padding: 20rpx;
+  border-radius: 10rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_header {
+  display: flex;
+  justify-content: space-between;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_header .coupon_title {
+  font-size: 32rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_header .coupon_price {
+  font-size: 40rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_body {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 10rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_body .coupon_valid_date {
+  font-size: 24rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_body .coupon_remaining {
+  font-size: 32rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_footer {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 10rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_footer .coupon_rule {
+  font-size: 24rpx;
+}
+.coupon_layout .coupon_list .coupon_item .coupon_footer .coupon_use {
+  width: 120rpx;
+  color: #000000;
+  text-align: center;
+  font-size: 24rpx;
+  background-color: #FFFFFF;
+  border-radius: 20rpx;
+  padding: 6rpx;
+}

jiaoyu_mp/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,14 +9,14 @@
       "list": [
         {
           "name": "pages/product/index",
-          "pathName": "pagesA/orders/userorder",
+          "pathName": "pages/user/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
           "name": "pagesA/course/index",
-          "pathName": "pagesA/orders/userorder",
+          "pathName": "pagesA/user/index",
           "query": "",
           "launchMode": "default",
           "scene": null