From d5fa115a37a49909a641c93229455a935a775352 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 18 Nov 2024 23:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
service-uniapp-client/pages.json | 7 +
service-uniapp-client/pages/index/center.vue | 14 +
service-uniapp-client/pages/mine/merchant.vue | 320 +++++++++++++++++++++++
service-uniapp-client/pages/mine/setting.vue | 6 +-
service-uniapp-client/plugins/api.js | 5 +-
service-uniapp-technician/pages.json | 6 +
service-uniapp-technician/pages/index/center.vue | 12 +-
service-uniapp-technician/pages/index/order.vue | 16 +-
service-uniapp-technician/pages/mine/setting.vue | 208 +++++++++++++++
service-uniapp-technician/plugins/api.js | 2 +
service-uniapp-technician/static/icons/icon8.png | Bin 1337 -> 1685 bytes
11 files changed, 586 insertions(+), 10 deletions(-)
create mode 100644 service-uniapp-client/pages/mine/merchant.vue
create mode 100644 service-uniapp-technician/pages/mine/setting.vue
diff --git a/service-uniapp-client/pages.json b/service-uniapp-client/pages.json
index b650b3d..6beea02 100644
--- a/service-uniapp-client/pages.json
+++ b/service-uniapp-client/pages.json
@@ -173,6 +173,13 @@
{
"navigationBarTitleText" : "钱包提现"
}
+ },
+ {
+ "path" : "pages/mine/merchant",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
}
],
"globalStyle": {
diff --git a/service-uniapp-client/pages/index/center.vue b/service-uniapp-client/pages/index/center.vue
index ea8f04d..eade11f 100644
--- a/service-uniapp-client/pages/index/center.vue
+++ b/service-uniapp-client/pages/index/center.vue
@@ -96,6 +96,13 @@
+
+
+
+ 商家入驻
+
+
+
@@ -183,6 +190,13 @@
})
},
+ // 跳转页面
+ toUrl(){
+ uni.navigateTo({
+ url: '/pages/mine/merchant'
+ })
+ },
+
//跳转我的钱包页面
clickWallet() {
uni.navigateTo({
diff --git a/service-uniapp-client/pages/mine/merchant.vue b/service-uniapp-client/pages/mine/merchant.vue
new file mode 100644
index 0000000..cf1ff8b
--- /dev/null
+++ b/service-uniapp-client/pages/mine/merchant.vue
@@ -0,0 +1,320 @@
+
+
+
+
+
+
+
+
+
+
+ 商家招募
+
+ 打造专业的技术服务
+ 立即联系我们>>
+
+
+
+
+
+
+ 商家姓名
+
+
+
+
+ 联系方式
+
+
+
+
+ 请上传营业执照
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/service-uniapp-client/pages/mine/setting.vue b/service-uniapp-client/pages/mine/setting.vue
index 4d7ab29..4962bfe 100644
--- a/service-uniapp-client/pages/mine/setting.vue
+++ b/service-uniapp-client/pages/mine/setting.vue
@@ -164,7 +164,7 @@
.item-line .before {
width: 8rpx;
height: 30rpx;
- background: #4fd3bc;
+ background: #6e3009;
border-radius: 4rpx;
margin: 15rpx 12rpx 15rpx 0;
}
@@ -194,7 +194,7 @@
width: 596rpx;
height: 90rpx;
line-height: 90rpx;
- background: linear-gradient(180deg, #6fdfbe, #5ac796);
+ background: linear-gradient(178deg, #ffe6ed, #ecb978);
border-radius: 46rpx;
margin: 40rpx auto;
@@ -203,7 +203,7 @@
font-family: PingFang SC, PingFang SC-Regular;
font-weight: 400;
text-align: center;
- color: #ffffff;
+ color: #6e3009;
}
}
\ No newline at end of file
diff --git a/service-uniapp-client/plugins/api.js b/service-uniapp-client/plugins/api.js
index d8cce6e..75494a6 100644
--- a/service-uniapp-client/plugins/api.js
+++ b/service-uniapp-client/plugins/api.js
@@ -84,8 +84,11 @@ const config = {
getTenRealName : { url : '/order/getTenRealName' , method : 'GET' , auth : true},
//获取我推荐的技师记录
getTenFans : { url : '/order/getTenFans' , method : 'GET' , auth : true },
- //立即支付
+ //待支付订单,立即支付
immediatelyPay : { url : '/order/immediatelyPay' , method : 'POST' , auth : true },
+
+ //商家入驻
+ addOrUpdateShop : { url : '/post/addOrUpdateShop' , method : 'POST' , auth : true },
diff --git a/service-uniapp-technician/pages.json b/service-uniapp-technician/pages.json
index d819f5f..9e3691a 100644
--- a/service-uniapp-technician/pages.json
+++ b/service-uniapp-technician/pages.json
@@ -18,6 +18,12 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "pages/mine/setting",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "pages/login/login",
"style": {
diff --git a/service-uniapp-technician/pages/index/center.vue b/service-uniapp-technician/pages/index/center.vue
index ea8e3ad..df357ed 100644
--- a/service-uniapp-technician/pages/index/center.vue
+++ b/service-uniapp-technician/pages/index/center.vue
@@ -11,10 +11,12 @@
{{ userInfo.notes }}
-
-
+
+
+
+
@@ -107,6 +109,12 @@
}
})
},
+ //跳转设置页面
+ toSetting() {
+ uni.navigateTo({
+ url: '/pages/mine/setting'
+ })
+ },
getConfig() {
this.$api('getConfig', {}, res => {
if (res.code == 200) {
diff --git a/service-uniapp-technician/pages/index/order.vue b/service-uniapp-technician/pages/index/order.vue
index e0b36cd..322f0f6 100644
--- a/service-uniapp-technician/pages/index/order.vue
+++ b/service-uniapp-technician/pages/index/order.vue
@@ -33,22 +33,22 @@
-
+
- {{ completedQuantity }}
+
已完成
- {{ confirmedQuantity }}
+
待确认
- {{ numberOfVisits }}
+
待上门
@@ -313,6 +313,14 @@
background-color: #f3f3f3;
font-family: PingFang SC;
}
+
+ .Quantity{
+ &>view{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ }
.rr {
height: 52rpx;
diff --git a/service-uniapp-technician/pages/mine/setting.vue b/service-uniapp-technician/pages/mine/setting.vue
new file mode 100644
index 0000000..923f64c
--- /dev/null
+++ b/service-uniapp-technician/pages/mine/setting.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改昵称
+
+
+ 用户昵称
+
+
+ 立即修改
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/service-uniapp-technician/plugins/api.js b/service-uniapp-technician/plugins/api.js
index db5857a..baf6338 100644
--- a/service-uniapp-technician/plugins/api.js
+++ b/service-uniapp-technician/plugins/api.js
@@ -108,6 +108,8 @@ const config = {
queryTerProject : { url : '/ter/queryTerProject' , method : 'POST' , auth : true },
//技师端-提现
giveWithdrawal : { url : '/order/giveWithdrawal' , method : 'POST' , auth : true },
+ //修改用户信息
+ editUserInfo : { url : '/ter/updateUser' , method : 'POST' , auth : true },
}
diff --git a/service-uniapp-technician/static/icons/icon8.png b/service-uniapp-technician/static/icons/icon8.png
index b7206a1c0a6ddcff8bc7c166e9db6fef045083be..1097450f8a2629a563d57a60b077a96d50b25d26 100644
GIT binary patch
literal 1685
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