diff --git a/甲情_甲意/.mini-ide/compileMode.json b/甲情_甲意/.mini-ide/compileMode.json
index 3e0c7d4..0f6fcb8 100644
--- a/甲情_甲意/.mini-ide/compileMode.json
+++ b/甲情_甲意/.mini-ide/compileMode.json
@@ -34,6 +34,16 @@
       "title": "认证美甲师",
       "page": "pages/meijiashirenzheng/meijiashirenzheng",
       "launchMode": "common"
+    },
+    {
+      "title": "我的评价",
+      "page": "pages/wodepingjia/wodepingjia",
+      "launchMode": "common"
+    },
+    {
+      "title": "评价",
+      "page": "pages/pingjia/pingjia",
+      "launchMode": "common"
     }
   ]
 }
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/app.acss b/甲情_甲意/miniprogram/app.acss
index e805934..da00b23 100644
--- a/甲情_甲意/miniprogram/app.acss
+++ b/甲情_甲意/miniprogram/app.acss
@@ -95,5 +95,5 @@
 page{
     width: 100vw; /* 或者 750rpx */
     height: auto;
-    overflow: hidden; /* 防止溢出 */
+    overflow:hidden; /* 防止溢出 */
 }
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/app.json b/甲情_甲意/miniprogram/app.json
index 0521818..da1fcb4 100644
--- a/甲情_甲意/miniprogram/app.json
+++ b/甲情_甲意/miniprogram/app.json
@@ -33,7 +33,8 @@
     "pages/dianpuzhuye/dianpuzhuye",
     "pages/index",
     "pages/test/test",
-    "pages/meijiashirenzheng/meijiashirenzheng"
+    "pages/meijiashirenzheng/meijiashirenzheng",
+    "pages/pingjia/pingjia"
   ],
   "window": {
     "defaultTitle": "甲情甲意",
@@ -53,20 +54,20 @@
       {
         "pagePath": "pages/shouye/shouye",
         "name": "首页",
-        "icon": "pages/image/首页.png",
-        "activeIcon": "pages/image/首页.png"
+        "icon": "pages/image/shouye.png",
+        "activeIcon": "pages/image/shouye.png"
       },
       {
         "pagePath": "pages/gouwuche/gouwuche",
         "name": "购物车",
-        "icon": "pages/image/购物车.png",
-        "activeIcon": "pages/image/购物车.png"
+        "icon": "pages/image/gouwuche.png",
+        "activeIcon": "pages/image/gouwuche.png"
       },
       {
         "pagePath": "pages/wode/wode",
         "name": "我的",
-        "icon": "pages/image/我的.png",
-        "activeIcon": "pages/image/我的.png"
+        "icon": "pages/image/my.png",
+        "activeIcon": "pages/image/my.png"
       }
     ]
   },
diff --git a/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.acss b/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.acss
index 90225f0..867221b 100644
--- a/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.acss
+++ b/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.acss
@@ -1,27 +1,30 @@
 /* 搜索框 */
+.Box1{
+  width: 100%;
+  height: 60px;
+}
 .box1{
   width: 330px;
   height: 40px;
-  top:5px;
-  left: 35px;
-  position: absolute;
-  background-color: darkgray;
+  margin-top:15px;
+  margin-left: 35px;
+  border: 1px solid #de868f;
   border-radius: 20px;
+  overflow:hidden;
 }
 /* 框内信息 */
 .box2{
-  width: 328px;
-  height: 37px;
-  top:1px;
-  left: 1px;
-  position: absolute;
+  width: 100%;
+  height: 30px;
   background-color:#ffffff;
   border-radius: 20px;
 }
-.box2 image{
+
+
+.image{
   width: 25px;
   height: 25px;
-  position: absolute;
+  position: relative;
   top:6px;
   left: 5px;
 }
@@ -31,7 +34,7 @@
   position: absolute;
 }
 /* 地区选择 */
-.h1 image{
+.image1{
   width: 15px;
   height: 20px;
   position: absolute;
@@ -83,131 +86,6 @@
   left:5px;
   border-radius: 20px;
 }
-/* b店铺 */
-.bdianpu{
-  width: 344px;
-  height: 120px;
-  position: absolute;
-  left: 22px;
-  top: 220px;
-  margin: auto;
-  border: 3px #de868f solid;
-  border-radius: 20px;
-}
-
-/* b店铺名称 */
-.bname{
-  font-size: 15px;
-  font-weight: bold;
-  left: 110px;
-  top: 15px;
-  position: absolute;
-  color: black;
-}
-
-/* b店铺图片 */
-.t2 image{
-  width: 100px;
-  height: 100px;
-  position: absolute;
-  top:10px;
-  left:5px;
-  border-radius: 20px;
-}
-
-/* c店铺 */
-.cdianpu{
-  width: 344px;
-  height: 120px;
-  position: absolute;
-  left: 0px;
-  top: 128px;
-  margin: auto;
-  border: 3px #de868f solid;
-  border-radius: 20px;
-}
-
-/* c店铺名称 */
-.cname{
-  font-size: 15px;
-  font-weight: bold;
-  left: 110px;
-  top: 15px;
-  position: absolute;
-  color: black;
-}
-
-/* c店铺图片 */
-.t3 image{
-  width: 100px;
-  height: 100px;
-  position: absolute;
-  top:10px;
-  left:5px;
-  border-radius: 20px;
-}
-/* d店铺 */
-.ddianpu{
-  width: 344px;
-  height: 120px;
-  position: absolute;
-  left: 0px;
-  top: 130px;
-  margin: auto;
-  border: 3px #de868f solid;
-  border-radius: 20px;
-}
-
-/* d店铺名称 */
-.dname{
-  font-size: 15px;
-  font-weight: bold;
-  left: 110px;
-  top: 15px;
-  position: absolute;
-  color: black;
-}
-
-/* d店铺图片 */
-.t4 image{
-  width: 100px;
-  height: 100px;
-  position: absolute;
-  top:10px;
-  left:5px;
-  border-radius: 20px;
-}
-/* e店铺 */
-.edianpu{
-  width: 344px;
-  height: 120px;
-  position: absolute;
-  left: 0px;
-  top: 130px;
-  margin: auto;
-  border: 3px #de868f solid;
-  border-radius: 20px;
-}
-
-/* e店铺名称 */
-.ename{
-  font-size: 15px;
-  font-weight: bold;
-  left: 110px;
-  top: 15px;
-  position: absolute;
-  color: black;
-}
-
-/* e店铺图片 */
-.t5 image{
-  width: 100px;
-  height: 100px;
-  position: absolute;
-  top:10px;
-  left:5px;
-  border-radius: 20px;
-}
 /* 可预定小框 */
 .ksm{
   width: 70px;
@@ -281,7 +159,7 @@
   padding: 8px;
   border-bottom: 1px solid #ddd;
   position: relative;
-  bottom: 6rpx;
+  bottom: 60rpx;
   left: 40rpx;
   width: 560rpx;
 }
@@ -312,4 +190,9 @@
   display: flex;
   flex-wrap: wrap; /* 允许换行 */
   justify-content: space-between; /* 使子元素分布更均匀 */
+  position: relative;
+}
+.Box2{
+  position: relative;
+
 }
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.axml b/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.axml
index bb8869a..7edc9d4 100644
--- a/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.axml
+++ b/甲情_甲意/miniprogram/pages/daodianfuwu/daodianfuwu.axml
@@ -3,7 +3,7 @@
   <view class="Box1">
     <view class="box1">
       <view class="box2">
-        <image mode="scaleToFill" src="../image/搜索.png" />
+        <image class="image" mode="scaleToFill" src="../image/sousuo.png" />
         <view class="search-outer">
           <input
             class="search-input"
@@ -21,10 +21,9 @@
 <view class="Box2">
   <!-- 地区选择 -->
   <view class="h1">
-    <image mode="scaleToFill" src="../image/地点.png" />
+    <image class="image1" mode="scaleToFill" src="../image/didian.png" />
     <view class="h2">
       <text class="z2">哈尔滨华德学院</text>
-      <image mode="scaleToFill" src="../image/降序.png" />
     </view>
   </view>
   <!-- 综合排序 -->
diff --git a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss
index ac32ae3..e6450ab 100644
--- a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss
+++ b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.acss
@@ -3,40 +3,35 @@
 /* 店铺名框 */
 .Box2
 {
-  width: 380px;
+  width: 100%;
   height: 150px;
   background-color: white;
   position: relative;
-  left:5px;
-  top:50px;
+  top:30px;
   border-radius: 15px;
 } 
 /* 店铺名 */
 .z2{
   font-size: 25px;
   font-weight: bolder;
-  left: 50rpx;
-  bottom: 130rpx;
   position: relative;
 }
 .image1{
   width: 80px;
   height: 20px;
-  position: relative;
-  right: 230rpx;
-  bottom: 50rpx;
+  margin-left: 10rpx;
+  margin-top: 20rpx;
 }
 .z3{
   position: relative;
+  left: 30rpx;
+  bottom: 8rpx;
   color: rgb(194, 53, 53);
-  bottom:95rpx;
-  left: 230px;
 }
 .z4{
   position: relative;
-  left: 480rpx;
-  bottom: 95rpx;
-  
+  left: 80rpx;
+  bottom:10rpx;
 }
 
 /* 相册框按钮 */
@@ -101,7 +96,6 @@
 /* 推荐项目 */
 .zt1{
   font-size: 18px;
-  top:130rpx;
   left: 10px;
   position: relative;
 }
@@ -114,17 +108,21 @@
 }
 .zt2{
   font-size: 20px;
-  position: relative;
-  top:10rpx;
-  left: 30rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  
+
 }
 .zt3{
   color: #E89709;
   font-size: 19px;
   font-weight: bolder;
-  position: relative;
-  top:10rpx;
-  left: 100rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 
 .zt4{
@@ -165,45 +163,46 @@
 /* 推荐美甲师 */
 .wz1{
   font-size: 18px;
-  position: absolute;
-  top:505px;
+  position: relative;
   left: 10px;
 }
 /* 第一个美甲师 */
 
 /* 底部框 */
 .Box6{
-  width: 390px;
-  height: 80px;
+  width: 100%;
+  height: 70px;
   height: #ffffffe9;
-  position: absolute;
-  top:700px;
+  top:1300rpx;
+  position: fixed;
 }
 .image12{
   width: 35px;
   height: 30px;
-  position: absolute;
+  position: relative;
   top:15px;
-  left: 20px;
+  left: 20rpx;
 }
 .box5{
-  width: 390px;
+  width: 100%;
   height: 1px;
   background-color: darkgray;
+  position: relative;
+  bottom: 45rpx;
 }
 .t1{
-  position: absolute;
-  top:20px;
-  left: 60px;
+  position: relative;
+  left: 90rpx;
+  bottom: 25rpx;
 }
 .box6{
   width: 130px;
   height: 40px;
   background-color: #eec2c7;
-  position: absolute;
-  top:11px;
-  left: 240px;
+  position: relative;
+  left: 480rpx;
   border-radius: 20px;
+  bottom: 70rpx;
 }
 .t2{
   font-size: 20px;
@@ -214,23 +213,23 @@
 .image{
   width: 200rpx;
   height: 200rpx;
-  position: relative;
-  left: 20rpx;
   border-radius: 10%;
+  margin-left: 20rpx;
 }
 .h1{
-  margin-left: 10rpx;
+  width: 100%;
+  height: 200px;
+  white-space: nowrap;
+  margin-top: 20rpx;
+  overflow:hidden;
   display: flex;
-  position:relative;
-  top: 160rpx;
-  
 }
 .box7 {
   width: 100%;
   flex-direction: column; /* 垂直方向弹性布局 */
   white-space: nowrap; /* 强制内容不换行，确保图片在一行显示 */
   position:relative;
-  top: 260rpx;
+  top: 20rpx;
 }
 
 .image-container {
@@ -249,3 +248,10 @@
  margin-left: 60rpx;
  margin-top: 50rpx;
 }
+.box8{
+  width: 500rpx;
+  height: 200rpx;
+  position: relative;
+  left: 230rpx;
+  bottom: 200rpx;
+}
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml
index 731ac65..1c97f78 100644
--- a/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml
+++ b/甲情_甲意/miniprogram/pages/dianpuzhuye/dianpuzhuye.axml
@@ -2,35 +2,44 @@
   <!-- 店铺名框 -->
   <view class="Box2" >
     <image class="image"  mode="scaleToFill" src="{{businessAvatar}}" />
-    <text class="z2">{{businessName}}</text>
-    <image mode="scaleToFill" class="image1" src="../image/星级.png" />
-    <text class="z3">4.9</text>
-    <text class="z4">500条</text>
+    <view class="box8">
+      <text class="z2">{{businessName}}</text>
+      <view style="margin-top:10rpx">
+        <image mode="scaleToFill" class="image1" src="../image/xingji.png" />
+        <text class="z3">4.9</text>
+        <text class="z4">500条</text>
+      </view>
+    </view>
   </view>
     <!-- 营业时间 -->
-    <view>
+    <view style="width:100%;height:100px">
       <text class="z6" a:if="{{storeStatus === '0'}}">已休息</text>
     <text class="z6" a:if="{{storeStatus === '1'}}">营业中</text>
     <text class="z7">营业时间：{{startBusiness}}-{{endBusiness}}</text>
-    <view class="box3"></view>
-    <!-- 地址 -->
     <view>
+      <view class="box3"></view>
+    </view>
+    <!-- 地址 -->
+    <view style="width:100%">
       <text class="z8">{{address}}</text>
       <image class="image3" mode="scaleToFill" src="../image/地点.png" />
-      <view class="box4"></view>
+      <view>
+        <view class="box4"></view>
+      </view>
     </view>
     </view>
     <!-- 推荐项目 -->
-    <view>
       <text class="zt1">推荐项目</text>
-    </view>
-    
     <!-- 第一个项目 -->
     <view class="h1" >
-      <view  a:for="{{ tuijian }}" a:key="index"data-num="{{item}}" onTap="shangpinjiemian">
+      <view style="width:200px;margin-left:10rpx"  a:for="{{ tuijian }}" a:key="index"data-num="{{item}}" onTap="shangpinjiemian">
       <image class="image2" mode="scaleToFill" src="{{item.commoditiesImage}}" />
-      <text class="zt2">{{item.commoditiesName}}</text>
-      <text class="zt3">￥{{item.commoditiesPrice}}</text> 
+      <view style="height:50px;width:180px">
+        <text class="zt2">{{item.commoditiesName}}</text>
+        <view>
+          <text class="zt3">￥{{item.commoditiesPrice}}</text>
+        </view>
+      </view>
       </view>
     </view>
     <!-- 推荐美甲师 -->
@@ -45,7 +54,6 @@
       </view>
      
     </view>
-    
     <!-- 底部框 -->
     <view class="Box6">
       <image class="image12" mode="scaleToFill" src="../image/pingjia.png" />
diff --git a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.acss b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.acss
index 9adf479..071ed93 100644
--- a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.acss
+++ b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.acss
@@ -3,6 +3,9 @@
   min-height: 100vh; /* 确保容器至少占满屏幕的高度 */
   background-color: #eec2c7;
   overflow-y: auto; /* 允许竖直方向滚动 */
+  width: 100vw; /* 或者 750rpx */
+  height: auto;
+  overflow:hidden; /* 防止溢出 */
 }
 
 .box3 {
@@ -39,6 +42,7 @@
 }
 
 .box5 {
+  height: 50px;
   position: relative;
   left: 40px;
   top:30px;
@@ -60,7 +64,7 @@
   position: relative;
   border-radius: 30px;
   background-color: rgb(162, 12, 12);
-  left: 140px;
+  left: 280rpx;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -84,5 +88,10 @@
 }
 .text2 {
   position: relative;
-  left: 85px;
+  left: 185rpx;
+}
+.text3{
+  height: 20px;
+  position: absolute;
+  left: 60rpx;
 }
diff --git a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.axml b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.axml
index 6df41f6..2bec782 100644
--- a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.axml
+++ b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.axml
@@ -3,6 +3,7 @@
   <view class="box3">
     <block a:for="{{productList}}" a:key="id">
       <view class="box1">
+        
         <view class="box4">
           <!-- 给每个复选框绑定 data-index -->
           <ant-checkbox 
@@ -13,7 +14,9 @@
           </ant-checkbox>
         </view>
         <image class="image" mode="scaleToFill" src="{{item.commoditiesImage}}" />
+        <!-- <text class="text3" onTap="yichu">移除</text> -->
         <view class="box5">
+          
           <view>
             <text class="text" style="font-size:20px">{{item.commoditiesName}}</text>
           </view>
diff --git a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.js b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.js
index d275ef3..2d1ecd2 100644
--- a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.js
+++ b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.js
@@ -33,6 +33,51 @@ Page({
                 const cartItems = res.data.data;
                 this.fetchProductDetails(cartItems);
               }
+              console.log(res);
+              console.log(this.data.id);
+            },
+            fail: (error) => {
+              console.error('请求失败: ', JSON.stringify(error));
+              my.alert({ content: '请求失败，请稍后重试' });
+            },
+          });
+        } else {
+          my.alert({
+            content: '您未登录，请先登录。',
+            success: () => {
+              my.navigateTo({
+                url: '/pages/denglu/denglu',
+              });
+            },
+          });
+        }
+      },
+    });
+  },
+  yichu(){
+    my.getStorage({
+      key: 'userInfo',
+      success: (res) => {
+        const userInfo = res.data;
+        this.setData({
+          id: userInfo.id, // 获取 id
+        });
+
+        if (userInfo && userInfo.cookie) {
+          my.request({
+            url: url + '/api/cart/delete',
+            method: 'POST',
+            data: {
+              id: item.commoditiesId,
+            },
+            headers: {
+              'content-type': 'application/json',
+              'Cookie': userInfo.cookie,
+            },
+            dataType: 'json',
+            success: (res) => {
+              alert('成功移除商品')
+              console.log(res);
             },
             fail: (error) => {
               console.error('请求失败: ', JSON.stringify(error));
@@ -59,11 +104,16 @@ Page({
         my.request({
           url: url + '/api/commodities/getById/commodities',
           method: 'GET',
-          data: { id: this.data.id },
+          data: { 
+            id:item.commoditiesId  
+          },
           headers: { 'content-type': 'application/json' },
           success: (res) => {
             if (res.data.code === 0) {
               resolve(res.data.data);
+              console.log(res);
+              console.log('ajsdhjasoijdkas');
+              console.log(this.data.id)
             } else {
               reject(`商品信息获取失败: ${res.data.message}`);
             }
diff --git a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.json b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.json
index 1de445e..5662f87 100644
--- a/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.json
+++ b/甲情_甲意/miniprogram/pages/gouwuche/gouwuche.json
@@ -4,6 +4,7 @@
     "ant-checkbox": "antd-mini/es/Checkbox/index",
     "stepper": "antd-mini/es/Stepper/index",
     "ant-checkbox-group": "antd-mini/es/Checkbox/CheckboxGroup/index",
+    "ant-swipe-action": "antd-mini/es/SwipeAction/index",
     "ant-stepper": "antd-mini/es/Stepper/index"
   },
   "styleIsolation": "apply-shared"
diff --git a/甲情_甲意/miniprogram/pages/image/didian.png b/甲情_甲意/miniprogram/pages/image/didian.png
new file mode 100644
index 0000000..8dc11d3
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/didian.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/gouwuche.png b/甲情_甲意/miniprogram/pages/image/gouwuche.png
new file mode 100644
index 0000000..dd34bd5
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/gouwuche.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/jiantou.png b/甲情_甲意/miniprogram/pages/image/jiantou.png
new file mode 100644
index 0000000..6bfe8fb
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/jiantou.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/my.png b/甲情_甲意/miniprogram/pages/image/my.png
new file mode 100644
index 0000000..3ed4a06
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/my.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/shangjiaruzu.png b/甲情_甲意/miniprogram/pages/image/shangjiaruzu.png
new file mode 100644
index 0000000..3546a81
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/shangjiaruzu.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/shouye.png b/甲情_甲意/miniprogram/pages/image/shouye.png
new file mode 100644
index 0000000..6bc216b
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/shouye.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/sousuo.png b/甲情_甲意/miniprogram/pages/image/sousuo.png
new file mode 100644
index 0000000..55b279b
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/sousuo.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/tuichudenglu.png b/甲情_甲意/miniprogram/pages/image/tuichudenglu.png
new file mode 100644
index 0000000..17438c2
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/tuichudenglu.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/wodedingdan.png b/甲情_甲意/miniprogram/pages/image/wodedingdan.png
new file mode 100644
index 0000000..8c3a124
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/wodedingdan.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/wodepingjia.png b/甲情_甲意/miniprogram/pages/image/wodepingjia.png
new file mode 100644
index 0000000..3bcedee
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/wodepingjia.png differ
diff --git a/甲情_甲意/miniprogram/pages/image/xingji.png b/甲情_甲意/miniprogram/pages/image/xingji.png
new file mode 100644
index 0000000..685482d
Binary files /dev/null and b/甲情_甲意/miniprogram/pages/image/xingji.png differ
diff --git a/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.acss b/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.acss
index 6fa2bfa..95f8097 100644
--- a/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.acss
+++ b/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.acss
@@ -78,10 +78,13 @@
   padding: 10px 20px;
   text-align: center;
   font-size: 16px;
-  width: 320px;
+  width: 300px;
+  margin-top: 20px;
+  cursor: pointer; /* 鼠标悬停时显示为点击样式 */
+  position: relative;
+  left: 20px;
 }
 .box{
   position: relative;
   right: 13px;
-  margin-right: 90px;
 }
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.axml b/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.axml
index 56ae056..be0be4d 100644
--- a/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.axml
+++ b/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.axml
@@ -3,7 +3,7 @@
     <view class="section-title">认证信息</view>
     <view class="input-row">
       <text class="label">姓名</text>
-      <input class="input" placeholder="请输入姓名" onInput="businessName" />
+      <input class="input" placeholder="请输入姓名" onInput="businessName"/>
     </view>
     <view class="input-row">
       <text class="label">电子邮箱</text>
diff --git a/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.js b/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.js
index c1775e0..d75f5a4 100644
--- a/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.js
+++ b/甲情_甲意/miniprogram/pages/meijiashirenzheng/meijiashirenzheng.js
@@ -1,35 +1,71 @@
+import {url} from '../request'
 import cityList from './city';
 Page({
   data: {
     cityList,
         cascaderValue: ['34', '330'],
         cascaderVisible: false,
+        businessName:'',
+        person:'',
+        phone:'',
+        idcard:'',
+        selectedOption:''
   },
   onLoad() {},
   ruzhu(){
-    // my.request({
-    //   url: url+'/api/business/add',
-    //   method: 'POST',
-    //   data: {
-       
-    //   },
-    //   headers: {
-    //     'content-type': 'application/json', //默认值
-    //   },
-    //   dataType: 'json',
-    //   success: (res)=> {
-    //     my.alert({ content: 'success' });
-    //   },
-    //   fail: function (error) {
-    //     console.error('fail: ', JSON.stringify(error));
-    //   },
-    //   complete: function (res) {
-    //     my.hideLoading();
-    //     my.alert({ content: 'complete' });
-    //   },
-    // });
-    my.alert({ content: '正在审核中，请耐心等待' });
-    my.navigateBack()
+    if (!this.validateForm()) {
+      return;  // 验证未通过，阻止提交
+    }
+    my.getStorage({
+      key: 'userInfo',
+      success: (res) => {
+        const userInfo = res.data;
+        this.setData({
+          id: userInfo.id, // 获取 id
+        });
+
+        if (userInfo && userInfo.cookie) {
+          my.request({
+            url: url + '/api/manicurist/add',
+            method: 'POST',
+            data: {
+                certificate_path: this.data.businessName,
+                certification_number: this.data.idcard,
+                email: this.data.person,
+                gender: 0,
+                issuing_authority: "hhh",
+                manicuristName: this.data.selectedOption,
+                phone: this.data.phone,
+                specialties: "hhh"
+            },
+            headers: {
+              'content-type': 'application/json',
+              'Cookie': userInfo.cookie,
+            },
+            dataType: 'json',
+            success: (res) => {
+              console.log(res);
+              my.navigateBack()
+              my.alert({ content: '正在审核中，请耐心等待' });
+            },
+            fail: (error) => {
+              console.error('请求失败: ', JSON.stringify(error));
+              my.alert({ content: '请求失败，请稍后重试' });
+            },
+          });
+        } else {
+          my.alert({
+            content: '您未登录，请先登录。',
+            success: () => {
+              my.navigateTo({
+                url: '/pages/denglu/denglu',
+              });
+            },
+          });
+        }
+      },
+    });
+    
   },
   businessName(e) {
     this.setData({
@@ -61,11 +97,75 @@ Page({
 },
 handleCascaderOnOk(cascaderValue, selectedOption, e) {
   console.log('cityOk', cascaderValue, selectedOption, e);
+  const selectedCityLabels = selectedOption.map(option => option.label).join(' ');  
+
+  this.setData({
+    selectedOption: selectedCityLabels  
+  });
+
+  console.log('Selected cities:', this.data.selectedOption);
 },
+
 handleDismiss(e) {
   my.showToast({
-      content: '取消操作，关闭 picker',
+      content: '取消操作',
   });
   console.log(e);
 },
+validateForm() {
+  // 验证姓名（非空）
+  if (!this.data.businessName) {
+    my.showToast({
+      content: '姓名不能为空',
+      type: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+
+  // 验证邮箱（简单的正则校验）
+  const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/;
+  if (!this.data.person || !emailRegex.test(this.data.person)) {
+    my.showToast({
+      content: '请输入有效的电子邮箱',
+      type: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+
+  // 验证电话（简单的正则校验）
+  const phoneRegex = /^1[3-9]\d{9}$/;
+  if (!this.data.phone || !phoneRegex.test(this.data.phone)) {
+    my.showToast({
+      content: '请输入有效的手机号码',
+      type: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+
+  // 验证身份证号（简单的正则校验）
+  const idcardRegex = /^\d{17}(\d|X)$/;
+  if (!this.data.idcard || !idcardRegex.test(this.data.idcard)) {
+    my.showToast({
+      content: '请输入有效的身份证号',
+      type: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+
+  // 验证是否选择了城市
+  if (!this.data.selectedOption) {
+    my.showToast({
+      content: '请选择省市',
+      type: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+
+  return true; // 所有验证通过
+},
 });
diff --git a/甲情_甲意/miniprogram/pages/pingjia/pingjia.acss b/甲情_甲意/miniprogram/pages/pingjia/pingjia.acss
new file mode 100644
index 0000000..e69de29
diff --git a/甲情_甲意/miniprogram/pages/pingjia/pingjia.axml b/甲情_甲意/miniprogram/pages/pingjia/pingjia.axml
new file mode 100644
index 0000000..f788f95
--- /dev/null
+++ b/甲情_甲意/miniprogram/pages/pingjia/pingjia.axml
@@ -0,0 +1,15 @@
+<view>
+  <view >
+    <ant-notice
+    type="primary"
+    icon="https://files.superbed.cn/proxy/7569696d6e2732326a766d75726972337e7973337f7e787f726e337e7270327f2424247c242d2c297e2d252b782d2b252b7e252a782c7f2c2f2d252a7f7b292d7c792c7e7f2a7c33776d7a.png"
+    style="margin-bottom: 8px"
+    mode="link"
+  >
+  提交评价或建议，鼓励美甲师和商家做得更好~
+  </ant-notice>
+  <view>
+    
+  </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/pages/pingjia/pingjia.js b/甲情_甲意/miniprogram/pages/pingjia/pingjia.js
new file mode 100644
index 0000000..cb73536
--- /dev/null
+++ b/甲情_甲意/miniprogram/pages/pingjia/pingjia.js
@@ -0,0 +1,4 @@
+Page({
+  data: {},
+  onLoad() {},
+});
diff --git a/甲情_甲意/miniprogram/pages/pingjia/pingjia.json b/甲情_甲意/miniprogram/pages/pingjia/pingjia.json
new file mode 100644
index 0000000..25dc82d
--- /dev/null
+++ b/甲情_甲意/miniprogram/pages/pingjia/pingjia.json
@@ -0,0 +1,7 @@
+{
+  "defaultTitle": "评价",
+  "usingComponents": {
+    "ant-notice": "antd-mini/es/NoticeBar/index"
+  },
+  "styleIsolation": "apply-shared"
+}
diff --git a/甲情_甲意/miniprogram/pages/request.js b/甲情_甲意/miniprogram/pages/request.js
index c0fc9a9..58be89b 100644
--- a/甲情_甲意/miniprogram/pages/request.js
+++ b/甲情_甲意/miniprogram/pages/request.js
@@ -1 +1 @@
-export const url='http://localhost:8080';
+export const url='http://154.8.193.216:1107';
diff --git a/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.acss b/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.acss
index 6fa2bfa..95f8097 100644
--- a/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.acss
+++ b/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.acss
@@ -78,10 +78,13 @@
   padding: 10px 20px;
   text-align: center;
   font-size: 16px;
-  width: 320px;
+  width: 300px;
+  margin-top: 20px;
+  cursor: pointer; /* 鼠标悬停时显示为点击样式 */
+  position: relative;
+  left: 20px;
 }
 .box{
   position: relative;
   right: 13px;
-  margin-right: 90px;
 }
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.axml b/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.axml
index cd0953c..8f0b699 100644
--- a/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.axml
+++ b/甲情_甲意/miniprogram/pages/shangjiaruzhu/shangjiaruzhu.axml
@@ -58,6 +58,7 @@
         onRemove="onRemove"
       />
     </view>
+    <view class="button" onTap="ruzhu">提交申请</view>
   </view>
-  <view class="button" onTap="ruzhu">提交申请</view>
+  
 </view>
diff --git a/甲情_甲意/miniprogram/pages/shouye/shouye.axml b/甲情_甲意/miniprogram/pages/shouye/shouye.axml
index a625ec9..6670704 100644
--- a/甲情_甲意/miniprogram/pages/shouye/shouye.axml
+++ b/甲情_甲意/miniprogram/pages/shouye/shouye.axml
@@ -13,7 +13,7 @@
         duration="{{duration}}"
       >
         <swiper-item a:for="{{background}}" key="{{item}}" >
-          <image mode="scaleToFill" src="{{item.image}}"  style="width:390px;height:260px;"  />
+          <image mode="scaleToFill" src="{{item.image}}"  style="width:100%;height:260px;"  />
         </swiper-item>
       </swiper>
     </view>
diff --git a/甲情_甲意/miniprogram/pages/wode/wode.acss b/甲情_甲意/miniprogram/pages/wode/wode.acss
index f89a007..756e0ab 100644
--- a/甲情_甲意/miniprogram/pages/wode/wode.acss
+++ b/甲情_甲意/miniprogram/pages/wode/wode.acss
@@ -1,6 +1,6 @@
 /* 头像盒子 */
 .box1 {
-  width: 390px;
+  width: 100%;
   height: 120px;
   background-color: #eec2c7;
   position: relative;
diff --git a/甲情_甲意/miniprogram/pages/wode/wode.axml b/甲情_甲意/miniprogram/pages/wode/wode.axml
index 2ac0798..1e8e0b7 100644
--- a/甲情_甲意/miniprogram/pages/wode/wode.axml
+++ b/甲情_甲意/miniprogram/pages/wode/wode.axml
@@ -1,5 +1,5 @@
  <!-- 头像盒子 -->
- <view>
+ <view style="width:100%">
   <view class="box1"onTap="login" >
    <image  mode="aspectFill" src="{{avatarUrl}}"></image>
    <text class="text1">{{username}}</text>
@@ -7,45 +7,47 @@
 </view>
 <!-- 信息盒子 -->
 <!--我的订单  -->
+<view style="width:100%">
+  <view class="box3" onTap="dingdan">
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/wodedingdan.png"></image>
+   <image class="image1" style="top:23rpx;left:600rpx;" mode="aspectFill" src="/pages/image/jiantou.png"></image>
+   <text class="z1" style="top:18rpx">我的订单</text>
+  </view>
+  <!--  我的评价-->
+  <view class="box3" onTap="pingjia">
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/wodepingjia.png"></image>
+   <image class="image1" style="top:23rpx;left:600rpx;" mode="aspectFill" src="/pages/image/jiantou.png"></image>
+   <text class="z1" style="top:18rpx">我的评价</text>
+  </view>
+  <!-- 个人信息 -->
+  <!-- <view class="box3" onTap="xinxi">
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/我的个人信息.png"></image>
+   <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
+   <text class="z1" style="top:18rpx">个人信息</text>
+  </view> -->
+  <!-- 我的收藏 -->
+  <view class="box3" onTap="shoucang">
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/shoucang.png"></image>
+   <image class="image1" style="top:23rpx;left:600rpx;" mode="aspectFill" src="/pages/image/jiantou.png"></image>
+   <text class="z1" style="top:18rpx">我的收藏</text>
+  </view>
+  <!-- 商家入驻 -->
+  <view class="box3" onTap="ruzhu">
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/shangjiaruzu.png"></image>
+   <image class="image1" style="top:23rpx;left:600rpx;" mode="aspectFill" src="/pages/image/jiantou.png"></image>
+   <text class="z1" style="top:18rpx">商家入驻</text>
+  </view>
+  <!-- 认证美甲师 -->
+  <view class="box3" onTap="meijishi" >
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/meijishirenzheng.png"></image>
+   <image class="image1" style="top:23rpx;left:600rpx;" mode="aspectFill" src="/pages/image/jiantou.png"></image>
+   <text class="z1" style="top:18rpx">认证美甲师</text>
+  </view>
+  <!-- 退出登录 -->
+  <view class="box3" >
+    <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/tuichudenglu.png"></image>
+   <image class="image1" style="top:23rpx;left:600rpx;" mode="aspectFill" src="/pages/image/jiantou.png"></image>
+   <text class="z1" style="top:18rpx">退出登录</text>
+  </view>
+</view>
 
-<view class="box3" onTap="dingdan">
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/我的订单.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">我的订单</text>
-</view>
-<!--  我的评价-->
-<view class="box3" onTap="pingjia">
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/我的评价.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">我的评价</text>
-</view>
-<!-- 个人信息 -->
-<view class="box3" onTap="xinxi">
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/我的个人信息.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">个人信息</text>
-</view>
-<!-- 我的收藏 -->
-<view class="box3" onTap="shoucang">
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/shoucang.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">我的收藏</text>
-</view>
-<!-- 商家入驻 -->
-<view class="box3" onTap="ruzhu">
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/商家入驻.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">商家入驻</text>
-</view>
-<!-- 认证美甲师 -->
-<view class="box3" onTap="meijishi" >
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/meijishirenzheng.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">认证美甲师</text>
-</view>
-<!-- 退出登录 -->
-<view class="box3" >
-  <image class="image1"style="left:40rpx;top:25rpx" mode="aspectFill" src="/pages/image/退出登录.png"></image>
- <image class="image1" style="top:23rpx;left:560rpx;" mode="aspectFill" src="/pages/image/跳转按钮.png"></image>
- <text class="z1" style="top:18rpx">退出登录</text>
-</view>
diff --git a/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.axml b/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.axml
index dbb001d..5436e7e 100644
--- a/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.axml
+++ b/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.axml
@@ -18,28 +18,27 @@
       a:key="{{ index }}">
       <!-- 全部-->
       <swiper-item>
-        <view  class="containercontent"> 
-          <container a:for="{{ dingdan }}"
-          title={{item.number}}>
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index"> 
+          <container title={{item.businessVO.businessName}}>
             <view >
-              <view class="container">
-                <image class="left" mode="scaleToFill" src="{{item.image}}" />
-                <view class="content">
+              <view class="container"a:for="{{item.orderItemsVOList}}" a:key="index">
+                <image class="left" mode="scaleToFill" src="{{item.commoditiesVO.commoditiesImage}}" />
+                <view class="content" >
                   <view  class="title1">
-                    {{item.name}}
+                    {{item.commoditiesVO.commoditiesName}}
                   </view>
                   <view class="title2">
-                    {{item.interpretation}}
+                    {{item.sddcreateTime}}
                   </view>
                   <view class="title2">
                     
-                    下单时间：{{item.dingdannumber}}
+                    下单时间：{{item.createTime}}
                   </view>
                   <view class="title2">
                     <!-- <ant-icon type="LocationFill" />
                      {{item.address}} -->
                      <view class="title2right"> 
-                      ￥{{item.price}}
+                      ￥{{item.commoditiesVO.commoditiesPrice}}
                       <view style="margin-left:10px;font-size:12px;color:gray" >
                          共1件
                       </view>
@@ -57,28 +56,27 @@
       </swiper-item>
       <!-- 待支付 -->
       <swiper-item>
-        <view  class="containercontent"> 
-          <container a:for="{{ dingdan }}"
-          title={{item.number}}>
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index"> 
+          <container title={{item.businessVO.businessName}}>
             <view >
-              <view class="container">
-                <image class="left" mode="scaleToFill" src="{{item.image}}" />
-                <view class="content">
+              <view class="container"a:for="{{item.orderItemsVOList}}" a:key="index">
+                <image class="left" mode="scaleToFill" src="{{item.commoditiesVO.commoditiesImage}}" />
+                <view class="content" >
                   <view  class="title1">
-                    {{item.name}}
+                    {{item.commoditiesVO.commoditiesName}}
                   </view>
                   <view class="title2">
-                    {{item.interpretation}}
+                    {{item.sddcreateTime}}
                   </view>
                   <view class="title2">
                     
-                    下单时间：{{item.dingdannumber}}
+                    下单时间：{{item.createTime}}
                   </view>
                   <view class="title2">
                     <!-- <ant-icon type="LocationFill" />
                      {{item.address}} -->
                      <view class="title2right"> 
-                      ￥{{item.price}}
+                      ￥{{item.commoditiesVO.commoditiesPrice}}
                       <view style="margin-left:10px;font-size:12px;color:gray" >
                          共1件
                       </view>
@@ -100,32 +98,30 @@
             </view>
           </container>
         </view>
-
       </swiper-item>
       <!-- 待使用 -->
       <swiper-item>
-        <view  class="containercontent"> 
-          <container a:for="{{ dingdan }}"
-          title={{item.number}}>
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index"> 
+          <container title={{item.businessVO.businessName}}>
             <view >
-              <view class="container">
-                <image class="left" mode="scaleToFill" src="{{item.image}}" />
-                <view class="content">
+              <view class="container"a:for="{{item.orderItemsVOList}}" a:key="index">
+                <image class="left" mode="scaleToFill" src="{{item.commoditiesVO.commoditiesImage}}" />
+                <view class="content" >
                   <view  class="title1">
-                    {{item.name}}
+                    {{item.commoditiesVO.commoditiesName}}
                   </view>
                   <view class="title2">
-                    {{item.interpretation}}
+                    {{item.sddcreateTime}}
                   </view>
                   <view class="title2">
                     
-                    下单时间：{{item.dingdannumber}}
+                    下单时间：{{item.createTime}}
                   </view>
                   <view class="title2">
                     <!-- <ant-icon type="LocationFill" />
                      {{item.address}} -->
                      <view class="title2right"> 
-                      ￥{{item.price}}
+                      ￥{{item.commoditiesVO.commoditiesPrice}}
                       <view style="margin-left:10px;font-size:12px;color:gray" >
                          共1件
                       </view>
@@ -150,28 +146,27 @@
       </swiper-item>
       <!-- 已完成 -->
       <swiper-item>
-        <view  class="containercontent"> 
-          <container a:for="{{ dingdan }}"
-          title={{item.number}}>
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index"> 
+          <container title={{item.businessVO.businessName}}>
             <view >
-              <view class="container">
-                <image class="left" mode="scaleToFill" src="{{item.image}}" />
-                <view class="content">
+              <view class="container"a:for="{{item.orderItemsVOList}}" a:key="index">
+                <image class="left" mode="scaleToFill" src="{{item.commoditiesVO.commoditiesImage}}" />
+                <view class="content" >
                   <view  class="title1">
-                    {{item.name}}
+                    {{item.commoditiesVO.commoditiesName}}
                   </view>
                   <view class="title2">
-                    {{item.interpretation}}
+                    {{item.sddcreateTime}}
                   </view>
                   <view class="title2">
                     
-                    下单时间：{{item.dingdannumber}}
+                    下单时间：{{item.createTime}}
                   </view>
                   <view class="title2">
                     <!-- <ant-icon type="LocationFill" />
                      {{item.address}} -->
                      <view class="title2right"> 
-                      ￥{{item.price}}
+                      ￥{{item.commoditiesVO.commoditiesPrice}}
                       <view style="margin-left:10px;font-size:12px;color:gray" >
                          共1件
                       </view>
@@ -189,28 +184,27 @@
       </swiper-item>
       <!-- 已取消 -->
       <swiper-item>
-        <view  class="containercontent"> 
-          <container a:for="{{ dingdan }}"
-          title={{item.number}}>
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index"> 
+          <container title={{item.businessVO.businessName}}>
             <view >
-              <view class="container">
-                <image class="left" mode="scaleToFill" src="{{item.image}}" />
-                <view class="content">
+              <view class="container"a:for="{{item.orderItemsVOList}}" a:key="index">
+                <image class="left" mode="scaleToFill" src="{{item.commoditiesVO.commoditiesImage}}" />
+                <view class="content" >
                   <view  class="title1">
-                    {{item.name}}
+                    {{item.commoditiesVO.commoditiesName}}
                   </view>
                   <view class="title2">
-                    {{item.interpretation}}
+                    {{item.sddcreateTime}}
                   </view>
                   <view class="title2">
                     
-                    下单时间：{{item.dingdannumber}}
+                    下单时间：{{item.createTime}}
                   </view>
                   <view class="title2">
                     <!-- <ant-icon type="LocationFill" />
                      {{item.address}} -->
                      <view class="title2right"> 
-                      ￥{{item.price}}
+                      ￥{{item.commoditiesVO.commoditiesPrice}}
                       <view style="margin-left:10px;font-size:12px;color:gray" >
                          共1件
                       </view>
@@ -228,28 +222,27 @@
       </swiper-item>
       <!-- 退款 -->
       <swiper-item>
-        <view  class="containercontent"> 
-          <container a:for="{{ dingdan }}"
-          title={{item.number}}>
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index"> 
+          <container title={{item.businessVO.businessName}}>
             <view >
-              <view class="container">
-                <image class="left" mode="scaleToFill" src="{{item.image}}" />
-                <view class="content">
+              <view class="container"a:for="{{item.orderItemsVOList}}" a:key="index">
+                <image class="left" mode="scaleToFill" src="{{item.commoditiesVO.commoditiesImage}}" />
+                <view class="content" >
                   <view  class="title1">
-                    {{item.name}}
+                    {{item.commoditiesVO.commoditiesName}}
                   </view>
                   <view class="title2">
-                    {{item.interpretation}}
+                    {{item.sddcreateTime}}
                   </view>
                   <view class="title2">
                     
-                    下单时间：{{item.dingdannumber}}
+                    下单时间：{{item.createTime}}
                   </view>
                   <view class="title2">
                     <!-- <ant-icon type="LocationFill" />
                      {{item.address}} -->
                      <view class="title2right"> 
-                      ￥{{item.price}}
+                      ￥{{item.commoditiesVO.commoditiesPrice}}
                       <view style="margin-left:10px;font-size:12px;color:gray" >
                          共1件
                       </view>
diff --git a/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.js b/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.js
index 9265d6a..245fd12 100644
--- a/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.js
+++ b/甲情_甲意/miniprogram/pages/wodedingdan/wodedingdan.js
@@ -2,6 +2,7 @@ import { url } from '../request';
 Page({
   data: {
       current: 0,
+      businessName:'',
       items: [
           {
               title: '全部',
@@ -51,10 +52,10 @@ Page({
             method: 'POST',
             data: {
               claimStatus: 0,
-              current: 0,
+              current: 1,
               endTime: "",
-              id: this.id,
-              pageSize: 1000,
+              id: "",
+              pageSize: 10,
               paymentStatus: 0,
               sortField: "",
               sortOrder: "",
@@ -68,10 +69,13 @@ Page({
             success: (res) => {
               if(res.data&&res.data.data){
                 this.setData({
-                  dingdan:res.data.data
+                  dingdan:res.data.data.records,
+                  
                 })
               }
-              console.log(this.data.dingdan); 
+              console.log(res); 
+              console.log(this.data.dingdan);
+              console.log(this.data.dingdan);
             },
             fail: (error) => {
               console.error('请求失败: ', JSON.stringify(error));
diff --git a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.acss b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.acss
index f991ce6..36d8a63 100644
--- a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.acss
+++ b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.acss
@@ -1,48 +1,107 @@
-/* 顶部 */
-.box1{
-  width: 390px;
-  height: 50px;
-  background-color: #eec2c7;
+.list {
+  display: flex;
+  flex-direction: column;
+}
+page{
+  background-color:  #f7f7f7;
+}
+.left{
+  padding: 8px;
+  width:80px;
+  height: 80px;
+  border-radius: 10px;
   position: relative;
+  left: 20px;
+  top: 10px;
 }
-.text1{
-  font-size: 24px;
-  position: absolute;
-  left:140px;
-  top:10px;
+
+.containercontent{
+  margin: 15px 15px 0 15px;
+  border: 1px solid #eec2c7;
+  border-radius: 10px;
 }
-/* 界面信息 */
-.z1:hover{
-  color: rgb(251, 142, 187);
+.container{
+  
+  color: #333333;
+  border-radius: 10px;
+  height: 120px;
 }
-.z1{
-  font-size: 20px;
-  position: absolute;
-  left:50px;
-  top:60px;
+.content {
+  margin-left: 10px;
+  line-height:  1.6;
+  width: 70%;
 }
-.z2:hover{
-  color: rgb(251, 142, 187);
+.title1{
+  font-size: 18px;
 }
-.z2{
-  font-size: 20px;
-  position: absolute;
-  left:160px;
-  top:60px;
+.title2{
+  font-size: 14px;
+  color: gray;
 }
-.z3:hover{
-  color: rgb(251, 142, 187);
+.title2right{
+  float: right;
+  color: rgb(24, 23, 23);
+  font-size: 16px;
+  position: relative;
+  bottom: 50px;
 }
-.z3{
-  font-size: 20px;
-  position: absolute;
-  left:290px;
-  top:60px;
+.tar{
+  width: 100%;
+  padding-bottom: 15px;
+}
+.tab1 {
+  width: 50px;
+  height: 20px;
+  border: 1px solid #eec2c7;
+  border-radius: 30px;
+  text-align: center; /* 水平居中 */
+  line-height: 20px;  /* 垂直居中 */
+}
+
+.tab2 {
+  margin-left: 10px; /* 给tab2添加一些间距 */
+  width: 50px;
+  height: 20px;
+  border: 1px solid #eec2c7;
+  border-radius: 30px;
+  text-align: center; /* 水平居中 */
+  line-height: 20px;  /* 垂直居中 */
+  background-color: #eec2c7;
+}
+.box{
+  display: flex;
+  position: relative;
+  left: 120px;
+  top: 20px;
+}
+.image{
+  width: 80rpx;
+   height: 80rpx;
+   border-radius: 50%;
+   margin-right: 10rpx;
+   margin-top: 10rpx;
+   margin-left: 20rpx;
+}
+.text{
+  position: relative;
+  
+}
+.swiper-item {
+  display: flex;              /* 启用 Flexbox 布局 */
+  flex-direction: column;     /* 设置为竖直方向排列子元素 */
+  height: 100%;               /* 确保swiper-item的高度占满父容器 */
+}
+.tab1 {
+  width: 50px;
+  height: 20px;
+  border: 1px solid #eec2c7;
+  border-radius: 30px;
+  text-align: center; /* 水平居中 */
+  line-height: 20px;  /* 垂直居中 */
+}
+.box{
+  display: flex;
+  position: relative;
+  left: 170px;
+  top: 30px;
 }
-/* 底部 */
-.text2{
-  color: dimgray;
-  position: absolute;
-  left:160px;
-  top:100px;
-}
\ No newline at end of file
diff --git a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.axml b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.axml
index 8dc6c6f..0478123 100644
--- a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.axml
+++ b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.axml
@@ -1,16 +1,71 @@
-<!-- 顶部 -->
-<view>
-  <view class="box1">
-    <text class="text1">我的评价</text>
-  </view>
- </view>
- <!-- 界面信息 -->
- <view>
-   <text class="z1">全部</text>
-   <text class="z2">待评价</text>
-   <text class="z3">回复</text>
- </view>
- <!-- 底部 -->
- <view>
-   <text class="text2">暂无订单</text>
- </view>
\ No newline at end of file
+<view  class="tar">
+  <ant-tabs
+  type="primary"
+    items="{{ items }}"
+    current="{{ current }}" 
+    onChange="onChange"/>
+
+  <swiper
+    current="{{ current }}"
+    autoplay="{{ false }}"
+    vertical="{{ false }}"
+    circular="{{ false }}"
+    onChange="onSwipeChange">
+    <block
+      a:for="{{ items }}"
+      a:for-index="index"
+      a:for-item="item"
+      a:key="{{ index }}">
+      <!-- 全部-->
+      <swiper-item class="swiper-item">
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index">
+          <view style="height:200px">
+            <view style="display:flex">
+              <image class="image" mode="scaleToFill" src="{{item.image}}" />
+              <text class="text"style="top:8px;left: 10px;">CC</text>
+              <text class="text"style="top: 25px;right:10px">2024-12-01评价</text>
+            </view> 
+              <view >
+                <view class="container">
+                  <image class="left" mode="scaleToFill" src="/pages/image/meijia3.jpg" />
+                  <view style="margin-top:10px;margin-left:20px">
+                    <text style="font-size:12px">综合评分:5星 | 款式：【半贴短甲彩绘款】</text>
+                  </view>
+              </view>      
+          </view>
+          </view>
+          
+        </view>
+      </swiper-item>
+      <!-- 待评价 -->
+      <swiper-item class="swiper-item">
+        <view  class="containercontent" a:for="{{ dingdan }}"a:key="index">
+          <view style="height:200px">
+            <view style="height:30px">
+              <text class="text"style="top:8px;left: 20px;font-size:18px;font-weight: bold;">晓得美甲店</text>
+            </view> 
+              <view>
+                <view class="container">
+                  <image class="left" mode="scaleToFill" src="/pages/image/meijia3.jpg" />
+                  <view class="text"style="left:130px;bottom:80px">
+                    <text style="font-size:15px">下单时间：2024-12-02</text>
+                    <view style="margin-top:10px">
+                      <text style="color:#57a8fa">分享一下你真实体验吧</text>
+                    </view>
+                    <view class="box">
+                      <view class="tab1">
+                        <text>评价</text>
+                      </view>
+                     </view>
+                  </view>
+              </view>      
+          </view>
+          </view>
+          
+        </view>
+      </swiper-item>
+      
+    </block>
+  </swiper>
+
+</view>
diff --git a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.js b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.js
index cb73536..6072397 100644
--- a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.js
+++ b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.js
@@ -1,4 +1,117 @@
+import { url } from '../request';
 Page({
-  data: {},
-  onLoad() {},
+  data: {
+      current: 0,
+      businessName:'',
+      items: [
+          {
+              title: '全部',
+          },
+          {
+              title: '待评价',
+          },
+          
+      ],
+      dingdan:[
+        {
+          image:'https://c-ssl.dtstatic.com/uploads/blog/202305/08/20230508112951_78480.thumb.400_0.jpeg'
+        }
+      ],
+      // dingdan:[
+      //   {
+      //     number:'晓得美甲店',
+      //     name:'半贴短甲彩绘',
+      //     interpretation:'到店服务',
+      //     dingdannumber:'2024-12-01',
+      //     image:'https://th.bing.com/th/id/R.325f6147c21a518cbb7bb0b5f9f73c51?rik=I4jbDvbv9vOsfQ&riu=http%3a%2f%2fwww.guangyuanol.cn%2fuploads%2fallimg%2f200806%2f1505123236-7.jpg&ehk=vpA2a11wMlcWSGrdKXF93H0nahTK2ptXlnbudoulA9Y%3d&risl=&pid=ImgRaw&r=0',
+      //     adress:' 思明区湖苑里24号',
+      //     price:'100',
+      //     state:'待确认',
+      //   },
+      // ]
+  },
+  // onShow(){
+  //   my.getStorage({
+  //     key: 'userInfo',
+  //     success: (res) => {
+  //       const userInfo = res.data;
+  //       this.setData({
+  //         id: userInfo.id, // 获取 id
+  //       });
+
+  //       if (userInfo && userInfo.cookie) {
+  //         my.request({
+  //           url: url + '/api/orders/my/page',
+  //           method: 'POST',
+  //           data: {
+  //             claimStatus: 0,
+  //             current: 1,
+  //             endTime: "",
+  //             id: "",
+  //             pageSize: 10,
+  //             paymentStatus: 0,
+  //             sortField: "",
+  //             sortOrder: "",
+  //             startTime: ""
+  //           },
+  //           headers: {
+  //             'content-type': 'application/json',
+  //             'Cookie': userInfo.cookie,
+  //           },
+  //           dataType: 'json',
+  //           success: (res) => {
+  //             if(res.data&&res.data.data){
+  //               this.setData({
+  //                 dingdan:res.data.data.records,
+                  
+  //               })
+  //             }
+  //             console.log(res); 
+  //             console.log(this.data.dingdan);
+  //             console.log(this.data.dingdan);
+  //           },
+  //           fail: (error) => {
+  //             console.error('请求失败: ', JSON.stringify(error));
+  //             my.alert({ content: '请求失败，请稍后重试' });
+  //           },
+  //         });
+  //       } else {
+  //         my.alert({
+  //           content: '您未登录，请先登录。',
+  //           success: () => {
+  //             my.navigateTo({
+  //               url: '/pages/denglu/denglu',
+  //             });
+  //           },
+  //         });
+  //       }
+  //     },
+  //   });
+  // },
+  // tab栏
+  onSwipeChange(e) {
+      this.setData({
+          current: e.detail.current,
+      });
+  },
+  onChange(current) {
+      this.setData({
+          current,
+      });
+  },
+handleChange(current) {
+    this.setData({
+        current,
+    });
+},
+onPlus() {
+    this.alert('plus');
+},
+alert(content) {
+    my.alert({
+        title: content,
+    });
+},
+
 });
+
diff --git a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.json b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.json
index 89bb81c..de1bcbd 100644
--- a/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.json
+++ b/甲情_甲意/miniprogram/pages/wodepingjia/wodepingjia.json
@@ -1,4 +1,9 @@
 {
-  "usingComponents": {},
+  "defaultTitle": "我的评价",
+  "usingComponents": {
+    "ant-icon": "antd-mini/es/Icon/index",
+    "container": "antd-mini/es/Container/index",
+    "ant-tabs": "antd-mini/es/Tabs/index"
+  },
   "styleIsolation": "apply-shared"
-}
+}
\ No newline at end of file