From 4dce4df8cb1cbe4319a2431894a80565fe1e2d4a Mon Sep 17 00:00:00 2001 From: Ling53666 <14656070+ling53666@user.noreply.gitee.com> Date: Tue, 3 Dec 2024 19:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 甲情_甲意/.mini-ide/compileMode.json | 10 ++ 甲情_甲意/miniprogram/app.acss | 2 +- 甲情_甲意/miniprogram/app.json | 15 +- .../pages/daodianfuwu/daodianfuwu.acss | 159 +++--------------- .../pages/daodianfuwu/daodianfuwu.axml | 5 +- .../pages/dianpuzhuye/dianpuzhuye.acss | 90 +++++----- .../pages/dianpuzhuye/dianpuzhuye.axml | 38 +++-- .../miniprogram/pages/gouwuche/gouwuche.acss | 13 +- .../miniprogram/pages/gouwuche/gouwuche.axml | 3 + .../miniprogram/pages/gouwuche/gouwuche.js | 52 +++++- .../miniprogram/pages/gouwuche/gouwuche.json | 1 + 甲情_甲意/miniprogram/pages/image/didian.png | Bin 0 -> 288 bytes .../miniprogram/pages/image/gouwuche.png | Bin 0 -> 1171 bytes 甲情_甲意/miniprogram/pages/image/jiantou.png | Bin 0 -> 280 bytes 甲情_甲意/miniprogram/pages/image/my.png | Bin 0 -> 1148 bytes .../miniprogram/pages/image/shangjiaruzu.png | Bin 0 -> 397 bytes 甲情_甲意/miniprogram/pages/image/shouye.png | Bin 0 -> 1321 bytes 甲情_甲意/miniprogram/pages/image/sousuo.png | Bin 0 -> 952 bytes .../miniprogram/pages/image/tuichudenglu.png | Bin 0 -> 478 bytes .../miniprogram/pages/image/wodedingdan.png | Bin 0 -> 371 bytes .../miniprogram/pages/image/wodepingjia.png | Bin 0 -> 631 bytes 甲情_甲意/miniprogram/pages/image/xingji.png | Bin 0 -> 588 bytes .../meijiashirenzheng/meijiashirenzheng.acss | 7 +- .../meijiashirenzheng/meijiashirenzheng.axml | 2 +- .../pages/meijiashirenzheng/meijiashirenzheng.js | 148 +++++++++++++--- .../miniprogram/pages/pingjia/pingjia.acss | 0 .../miniprogram/pages/pingjia/pingjia.axml | 15 ++ .../miniprogram/pages/pingjia/pingjia.js | 4 + .../miniprogram/pages/pingjia/pingjia.json | 7 + 甲情_甲意/miniprogram/pages/request.js | 2 +- .../pages/shangjiaruzhu/shangjiaruzhu.acss | 7 +- .../pages/shangjiaruzhu/shangjiaruzhu.axml | 3 +- .../miniprogram/pages/shouye/shouye.axml | 2 +- 甲情_甲意/miniprogram/pages/wode/wode.acss | 2 +- 甲情_甲意/miniprogram/pages/wode/wode.axml | 86 +++++----- .../pages/wodedingdan/wodedingdan.axml | 115 ++++++------- .../miniprogram/pages/wodedingdan/wodedingdan.js | 14 +- .../pages/wodepingjia/wodepingjia.acss | 137 ++++++++++----- .../pages/wodepingjia/wodepingjia.axml | 87 ++++++++-- .../miniprogram/pages/wodepingjia/wodepingjia.js | 117 ++++++++++++- .../pages/wodepingjia/wodepingjia.json | 9 +- 41 files changed, 743 insertions(+), 409 deletions(-) create mode 100644 甲情_甲意/miniprogram/pages/image/didian.png create mode 100644 甲情_甲意/miniprogram/pages/image/gouwuche.png create mode 100644 甲情_甲意/miniprogram/pages/image/jiantou.png create mode 100644 甲情_甲意/miniprogram/pages/image/my.png create mode 100644 甲情_甲意/miniprogram/pages/image/shangjiaruzu.png create mode 100644 甲情_甲意/miniprogram/pages/image/shouye.png create mode 100644 甲情_甲意/miniprogram/pages/image/sousuo.png create mode 100644 甲情_甲意/miniprogram/pages/image/tuichudenglu.png create mode 100644 甲情_甲意/miniprogram/pages/image/wodedingdan.png create mode 100644 甲情_甲意/miniprogram/pages/image/wodepingjia.png create mode 100644 甲情_甲意/miniprogram/pages/image/xingji.png create mode 100644 甲情_甲意/miniprogram/pages/pingjia/pingjia.acss create mode 100644 甲情_甲意/miniprogram/pages/pingjia/pingjia.axml create mode 100644 甲情_甲意/miniprogram/pages/pingjia/pingjia.js create mode 100644 甲情_甲意/miniprogram/pages/pingjia/pingjia.json 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 @@ - + - + 哈尔滨华德学院 - 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 @@ - {{businessName}} - - 4.9 - 500条 + + {{businessName}} + + + 4.9 + 500条 + + - + 已休息 营业中 营业时间：{{startBusiness}}-{{endBusiness}} - - + + + + {{address}} - + + + - 推荐项目 - - - + - {{item.commoditiesName}} - ￥{{item.commoditiesPrice}} + + {{item.commoditiesName}} + + ￥{{item.commoditiesPrice}} + + @@ -45,7 +54,6 @@ - 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 @@ + + + {{item.commoditiesName}} 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 0000000000000000000000000000000000000000..8dc11d36d5cd344fd3f2e7d954fee95615a99f93 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^{6H+s!3HG#4~4G+QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0V%Nb>ae+I*DEjt^1x#6jOL)v2Itw%oXUBdnj(j3n e^3+bVp1~ugbXlI_v^by#7(8A5T-G@yGywo5+i80M literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/gouwuche.png b/甲情_甲意/miniprogram/pages/image/gouwuche.png new file mode 100644 index 0000000000000000000000000000000000000000..dd34bd5b51e06637b8b8855b42c03dbf48c28c5a GIT binary patch literal 1171 zcmV;E1Z?|>P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&1Sm;FK~#8N?U}JI zH9-`|zemuBh=zvB8+ZbRL?s?Tv^pBm=!8-!ArjG`P$|5D2%RVt5*3ALZZ}{4l1(<_ zf8AYs&g|LQQ~a8HXYS6-Z|BT8bN>wngW%Z2mZ-qPQ4 zMpH`;b_J6#3hX5Id(Q8u?wkVOL4Tu`oZ`G;0!9Hr>^Gg^)J_NhB>e`$7!%~XryhTj zQw3yhu^c~p>Y*kFyTs)*Lro6CTPz2=iM4e&F2^uxasV>4SWvEDu0Zl;L{$z;3i<#f zA#$)ase{W=0)m>B4ytm7)jNFwg4nuLCApj;Hs?k>&w?grkgA+M)jGp&Mj(#0uR?M; zxSL~bbAXi(X65v;)`>%$SvjCQ(58d!0-cg0IoK{xo-1e)#?|GpT8FjE0rqEP=j7!2 zzYfdR%%;+S4LDah>|f$0*Ep@nk-QwVM0~yi)~+h*a{5$=#`6TMT~%6Dlaphuqa6)gP6JpnAeE_sWO6_}k*?P|EE$k2 z50c7ZwGM076*Mz7(7GJS12iR?Hv;dwY9fb8|CXUS85R zDKH}kGFZC0y}eD_Yw-U59@f^@evDyydOBQPUC}<8n2>XQef?uW%Ixp&(|*z*Rc6mG zkiMQ7g$X%JOG|Vy%CLTtJU%|s=axa3V|}$~UC!Iv8(oN)o0}WjUy6f+1Nz)Dv$M0b zuNJM#d3boB3lVdAdP@6Cv9+~DpIc^PVuJS7!bDhO3la15^hEngadB}$pIc^md71Xr z!i1ciogKOu1uH8nw4XGSlauuM1!rexw4W9xPz z>gp=(qlpPQ1t|PxW@f$@V`^&Z`y69#CdVGBRdmM9fbK&Udh_=LLv+L4Wtji~002ovPDHLkV1g%*Bd!1d literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/jiantou.png b/甲情_甲意/miniprogram/pages/image/jiantou.png new file mode 100644 index 0000000000000000000000000000000000000000..6bfe8fb7908344d4f240a5df6fefc6a9cd19589d GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^%0R5h!3HFQ1%*HYjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONaIL3{V@QPi+iM#+SrkQFFKQn2T64rJ=Lm>g zbL1(np9ar9X`XIzomHceT{*bMYDOsg=2!Lxmd^vT=bA6e_2GDEw{(i-$J@s^ z9Gln7UFi6YX|jU!Vhw?&Ko*X}8saTUQ!Q^_@BLc U_3J}NfDUKyboFyt=akR{0C-4Y+5i9m literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/my.png b/甲情_甲意/miniprogram/pages/image/my.png new file mode 100644 index 0000000000000000000000000000000000000000..3ed4a06c3cdf22c6cfc554184ac518c12706d6a3 GIT binary patch literal 1148 zcmV-?1cUpDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&1QAI@K~#8N?V8(d z<1i3Kw}dp}M%+jmNh5B=jieF(d2tLdFo-LOlK8l?=Hmbxn^dSd-CTC@9)=Ve9t&F-;u+LA;?L>*Vk7u zm&@ff&t1|X#SmB(^fe?w>iP~GO3eL!e+5(pdMmDi4kM<`Zj6;oqd=00sF%DgsL(2|UVpOZzd$+31ae6VTRqdVM^TH3O zfAR;_0E~QB25M|;?8K;4((BZyO)(;kft?tY&Y<=Cs;Sd5B8`Ea7*L%Nr>0eqrZ&T< z(*l-a2$U+qeAeQDQ>8Fy@w-Z~6a(tiKutMZXG%)z)VYMM7*LG>AZKsjrfLfGes)q= zi<#TefS|RlbjdZIm~(g(MCu<{g4ecSZw%C_n)4 zZ$3xHsMjl7_y{qdNQf~d#F!FdOtBY3VW(*K!lhfY6q8!vrB^7eaA>Km#3UgqSR+6X zt@a2(7Gm6lD)pMA1vo5HSeh2Gxz{q}|$!(z?dDmV&y9Su2Foq^{E% zUhkB?gJYd*|5#T-7cmG~bEBh#Dle< zVU3`@a+-)KkwS{#M%8?GSa-=iB2mpRp^2Ee^u-MwRY=Z~AmX6rmC!_tTI44Q$(a+h zHBDC+Ljlhh$D-BPPow6&hnR|lm>s0FL-Vl&#hd$4*HMI+9pq~(p>+KrW+Q5CC6sno zA!Z|VNcq}ID19CYF*{%_`TFKq^JXH%?1ToO1T}Y#5MxS+F(t&95@JjVF{XqVQ$ma> zA;uJIG3vDkuQb#H+^1nJh6Uz}J2S{qaatn8G=_MnI4x0K45%Z0M(qBV43JyZV$Z@J zDbP#|q=LvI&jK5AYx;VpshD6pA;y#tV@ilICB&E#VoV7!ri2(v9?$>Jja^FEL1vl& O0000|k1|%Oc%$NbB7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcX91fH32|H2Dgk1|?4y$B+p3w^JKAn;m#ut(zuWbWYyU0U|9< zP7VL{P(y9!HHF-r?2d+J-}R1FX~(;XcfD{D+^@N1UAE-$k0m*`zpcr*tg=Pt^h2ii zZnG{-H7VCn4ze;iUo6?Cs5`^GKcGYDvWab3xmn2R!=g#%A`9&f>wv~bCiopw=)=OAGf@IA~X5U`-?gyVrOH;Hvv5ptMRD5bxr*p|HoS<*vU%@ n)|x4Z?3$$~@-fwE=^e&(9lx2QrmqSE1|fr|tDnm{r-UW|3LT<9 literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/shouye.png b/甲情_甲意/miniprogram/pages/image/shouye.png new file mode 100644 index 0000000000000000000000000000000000000000..6bc216bf41873552f974878c1fc5af96923714d3 GIT binary patch literal 1321 zcmeAS@N?(olHy`uVBq!ia0vp^e>iJy{z$H- zOgZm}dH6%OJ16d${bu42n7aK*z@PcG?fe{@ge+(ItE4kMJ^!?5C)a$Bb;&B%4JW;p zI9b~B#LBHmR(WUN#F*ni;X9}Q{{6f6-=9A*_V)Jc)0`}_H=`q*Pmo)z8Qm@BnF+v?B!h7sp~&Wv8V^2xQFQm>POJyZK$-?UJk>Gp1o=<8EW%O}j9>`+#p z9hN(_?eyELuckDGa#reWv)z$4%_)1uoqKEjG*@%VDT#YZ0p*fJdEAcQi`AQSSm@w^ z$m7Q(c;_9AQt!D_y6e>3l~*-Y-3`L5)}=q*vSfD5`u`U8n;+;E6$>4BH-GLN@$JhW zJSz&%EcI$M`4;1@up@lo)sS~tK+^?yD&I(c{~~n9MNh8iYS?m-)d?4V-CTWoYo33? zH6ZuNfvEH?cebuN_4UfDDU+0Ugf0yAU3Wcf`IL!Gt52M*WGLHT?zYwIXi;I>28aGN z_g+n5%GA*ZS`fA{RONeM)r}~J52sIapS?IQs>%PP>x8h4=g*%n>2ZJh`}gc;oq<{w z(d$a9Z&q9>{w8NB%c_w%b<>k)Y-}p#OVar^KiSk7?2&gua_56HTxO@YPW$YxV*X@J z%zx__#NkmQZC8E$cQ_lHsHvKpkQg3`*{gW68;bY2CI#4T?~_lyo>$vvGI2Ni y>V>R1>%=zf^iKS|Wx>uELq3!eW_!%KdPbwwS`#1KudN3bZw#KUelF{r5}E+kD{_ng literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/sousuo.png b/甲情_甲意/miniprogram/pages/image/sousuo.png new file mode 100644 index 0000000000000000000000000000000000000000..55b279b980ed276b1380ddb478521c3525304487 GIT binary patch literal 952 zcmV;p14sOcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&15HUpK~!i%?U+GM z!E$e=ZP|Mivey)BF&8)0zuep^*j9rS0#C5=!HTkTQxX#tr&{So! zn`RTGK5In>wQd~X9rZ?Mz64@OSaIu z6UYM{0q)73!Gb+KJ=x!Sgf&C5Fn7jAVL|k%yHr>+EL&g)dUh;>F|zhwBCJ^~3+yrz z?LC7CawJ;bpQFN>Rb(SYzAQiiG2rjixNB=oo@_3y+VF zR`~t>{l8kxLCQiDzP!A&b(({fh3Dtz&xhR2&CT@o_GW7|2QAxz=2!NZ(44O9vFC(j ar|B<#`bSj}moB{k0000;vjb?hIQv;UIIBR>5jgR3=A9l zx&I`x0{NT;9+AZi3_>L!%y=(Nz5=Ad)5S3)!u{=(#@=QF0hVBJw$Z1cv3(mW}&9-dY)TUsL={zhP9K2V8qo4+C$akp-icZs zmA^Cm$zC>Ri=(VT!XED`)1{MTx9@qq(@k+sl2{)1wfApMGz1FkvGXLYQ9icu?qWyh zBX_NYw8hsMf0hZ@(za>7>1>wbOPwW6uWf8M+~a()Gr2e9ipP{goa_3tA`8w7ZsOdU z_m}Y;``WW6M}Mp?X^A_`ZV`~b_*yidQldxi^^dy?w3j}-+qfnq{J-!eMn9L*Emp77 zW1<76{|Z~q9qt{Qt{18DptLG>hu)dcm3_9~MgE+s^#1iWy7b}tE87ow|785vQ4ra0 S8+rs7Ck&phelF{r5}E*F=Er&f literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/wodedingdan.png b/甲情_甲意/miniprogram/pages/image/wodedingdan.png new file mode 100644 index 0000000000000000000000000000000000000000..8c3a12428ba7ce79883ad43668033111a188a110 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^DnP8r!3HEZp5@dAQjEnx?oJHr&dIz4a#+$GeI0>P z{oH>NS%G}c0*}aI1_q%L5N5oWCSL*6z~SlQ7!u+BcIs>1W&<8JYo^HtoRc?jfJg(+ zRjad3K51n3y%P4xGpyd^Z&6`PMT`95R-Kp=hgx-n7UteQWa67Bb3D)VeDRI%fA>C~ z=+Yt2bNIt5ixr_0_v)OkKCaw3VVdULM|vgkpI!#_1uNQdW-`i7%y~6Qz`& zoltJKd3h;S@xiGrSFUQO>^aD)54QE}t5_T<3)tSZ3*|I54>s>@=p3?!*OABw+%a@4m zYUYmIG2v)E_etjUk$^2#~Rhn!-uu{W{`mOKFl6oaR$ KpUXO@geCxYhLlSH literal 0 HcmV?d00001 diff --git a/甲情_甲意/miniprogram/pages/image/wodepingjia.png b/甲情_甲意/miniprogram/pages/image/wodepingjia.png new file mode 100644 index 0000000000000000000000000000000000000000..3bcedeeac8e4a41c53d4f8fbf15491f3e4eda8bf GIT binary patch literal 631 zcmV--0*L*IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0t`t+K~z{r?Ug-_ z!Y~kp_XwPTj)DSCLd6j%X`n-tRNR6FL5JuN5)BgK8c0;3rJx@4h+pE3Y&`a6CA8Wn zjl3C$$>;g;e#r;x@4~HCE1A#dG8_)2*XzAjJfBV{xn8g4t#n1h0jS&UN~6&T8h`LU*PYu6liRI-TM}yWP%sMb77Q;cqsZ#+z$8ofdne(a3nq zo=$>um36=0OS|2c$z)wdpWzu$kwyWMWaTV^h)tZZ1#U6dm2 zz&YXAu%T&66)Tf;l|USdy0gcAs}7t?UN~*)W5uj#{_}X@Ae;_?>JododK38Mg^NkQ zMyy0kykJ>56j))gJ&5wLl(7eWI}j`ZR@(p`g0!Jv+EUtb!m*?@^a`>DC_?jtFzjOw ztG&;6G|lgl7mh%#3^6MJslw3k`&1~(ThPx#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0pUqRK~z{r?UX%E z1ThSSISdz|q^73i0CZe{f-Ars_6$hWNc;#^bTo8SR20A!27O3I597okLE0w8r=3mw zV*5EWTW?o)%lq~H@^Q1C{DEm)C)2o2rg5F5#=Wdo;d%?N=NDf@dl{S3LW?#v?sji? zc|JQ0_cESNj+e)y!*DNSQ(8>B+}Tdes~TsAJRIzY`x%(tQbfdv7G19v)6w!9?Hg6& zm|AZU+)~qKMR;srJz8sgBrg|*!PR>HHjZx@i2%dYG~ggxCq`di5|}>H0>zjXv?#B& z+Xg&)t>&c;)oM=Y$;%o#uhsAUj~f>yjv#>^0{qv8Yfyx0X{J@{^J3h8=OvCkasg|Y zsM=qzDxz8;{s5)L0N=P$)3R66vObd6Ul=o(e(dIXP56z|?~_7t8dsv!gudP-DAMa% z^45mdl2^?$GW0jAzcnaLkM1Q{xcoB(nx6 z(qhqRL8a*#+Pv3hw`L?SSS+CB40`7|iVux5u};bi%o;G$HI8$v8IARzL930jW=&|U zXC$u;j2w0`_~k$A(PasZQ^OPvDD4@w>1LDX?5Id+8CbLqEqP0QmG(m8COOl%PNs2P atd~z;F^an1+NRC`0000认证信息 姓名 - + 电子邮箱 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 @@ + + + + 提交评价或建议，鼓励美甲师和商家做得更好~ + + + + + + \ 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" /> + 提交申请 - 提交申请 + 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}}" > - + 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 @@ - + {{username}} @@ -7,45 +7,47 @@ + + + + + 我的订单 + + + + + + 我的评价 + + + + + + + + 我的收藏 + + + + + + 商家入驻 + + + + + + 认证美甲师 + + + + + + 退出登录 + + - - - - 我的订单 - - - - - - 我的评价 - - - - - - 个人信息 - - - - - - 我的收藏 - - - - - - 商家入驻 - - - - - - 认证美甲师 - - - - - - 退出登录 - 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 }}"> - - + + - - - + + + - {{item.name}} + {{item.commoditiesVO.commoditiesName}} - {{item.interpretation}} + {{item.sddcreateTime}} - 下单时间：{{item.dingdannumber}} + 下单时间：{{item.createTime}} - ￥{{item.price}} + ￥{{item.commoditiesVO.commoditiesPrice}} 共1件 @@ -57,28 +56,27 @@ - - + + - - - + + + - {{item.name}} + {{item.commoditiesVO.commoditiesName}} - {{item.interpretation}} + {{item.sddcreateTime}} - 下单时间：{{item.dingdannumber}} + 下单时间：{{item.createTime}} - ￥{{item.price}} + ￥{{item.commoditiesVO.commoditiesPrice}} 共1件 @@ -100,32 +98,30 @@ - - - + + - - - + + + - {{item.name}} + {{item.commoditiesVO.commoditiesName}} - {{item.interpretation}} + {{item.sddcreateTime}} - 下单时间：{{item.dingdannumber}} + 下单时间：{{item.createTime}} - ￥{{item.price}} + ￥{{item.commoditiesVO.commoditiesPrice}} 共1件 @@ -150,28 +146,27 @@ - - + + - - - + + + - {{item.name}} + {{item.commoditiesVO.commoditiesName}} - {{item.interpretation}} + {{item.sddcreateTime}} - 下单时间：{{item.dingdannumber}} + 下单时间：{{item.createTime}} - ￥{{item.price}} + ￥{{item.commoditiesVO.commoditiesPrice}} 共1件 @@ -189,28 +184,27 @@ - - + + - - - + + + - {{item.name}} + {{item.commoditiesVO.commoditiesName}} - {{item.interpretation}} + {{item.sddcreateTime}} - 下单时间：{{item.dingdannumber}} + 下单时间：{{item.createTime}} - ￥{{item.price}} + ￥{{item.commoditiesVO.commoditiesPrice}} 共1件 @@ -228,28 +222,27 @@ - - + + - - - + + + - {{item.name}} + {{item.commoditiesVO.commoditiesName}} - {{item.interpretation}} + {{item.sddcreateTime}} - 下单时间：{{item.dingdannumber}} + 下单时间：{{item.createTime}} - ￥{{item.price}} + ￥{{item.commoditiesVO.commoditiesPrice}} 共1件 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 @@ - - - - 我的评价 - - - - - 全部 - 待评价 - 回复 - - - - 暂无订单 - \ No newline at end of file + + + + + + + + + + + + CC + 2024-12-01评价 + + + + + + 综合评分:5星 | 款式：【半贴短甲彩绘款】 + + + + + + + + + + + + + 晓得美甲店 + + + + + + 下单时间：2024-12-02 + + 分享一下你真实体验吧 + + + + 评价 + + + + + + + + + + + + + + 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