diff --git a/src/core/apis.js b/src/core/apis.js
index aa61502..2910c00 100644
--- a/src/core/apis.js
+++ b/src/core/apis.js
@@ -99,17 +99,17 @@ const apis = {
order: {
list: {
t1: {
- url: "/user/workerorderc/myorderlist",
+ url: "/user/workerorderb/getmyorderb",
showLoading: true,
auth: true,
},
t2: {
- url: "/user/workerorder/getmycarorder",
+ url: "/user/workerorderc/myorderlist",
showLoading: true,
auth: true,
},
t3: {
- url: "/user/workerorderc/myorderlist",
+ url: "/user/workerorder/getmycarorder",
showLoading: true,
auth: true,
},
diff --git a/src/core/models/worker.js b/src/core/models/worker.js
index 2417af0..a1a0389 100644
--- a/src/core/models/worker.js
+++ b/src/core/models/worker.js
@@ -1,26 +1,8 @@
export default {
- type: {
- NORMAL: 1,
- SETTLE: 2,
- },
- getWorkerTypeTextColor(type) {
+ worketTypeText(type) {
switch (type) {
- case this.type.NORMAL:
- return '#179C43';
- case this.type.SETTLE:
- return '#D9A019';
- default:
- return '#999999';
+ case 0: return ['普通师傅', '#bfbfbf'];
+ case 1: return ['入驻师傅', '#d9a019'];
}
},
- getWorkerTypeText(type) {
- switch (type) {
- case this.type.NORMAL:
- return '普通师傅';
- case this.type.SETTLE:
- return '入驻师傅';
- default:
- return '未知';
- }
- }
-}
\ No newline at end of file
+}
diff --git a/src/pages/get/index.vue b/src/pages/get/index.vue
index e0ce768..6c585cb 100644
--- a/src/pages/get/index.vue
+++ b/src/pages/get/index.vue
@@ -40,6 +40,9 @@
+
+
+
@@ -64,6 +67,7 @@ import AppLayout from "@/components/layout/layout";
import GetAction from "@/components/get/action";
import OrderItem from "@/components/order/item";
import GetPostPrice from "@/components/get/post-price";
+import LoadMore from "@/components/widgets/loadmore";
export default {
name: "get-index",
data() {
@@ -103,6 +107,7 @@ export default {
GetAction,
OrderItem,
GetPostPrice,
+ LoadMore,
},
onLoad() {},
onShow() {
@@ -290,6 +295,9 @@ export default {
flex-shrink: 0;
}
}
+ .loadmore-box {
+ padding: 20rpx 0;
+ }
}
.common-bottom-components {
.setting-btn {
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
index 139ec12..171bdfe 100644
--- a/src/pages/member/member.vue
+++ b/src/pages/member/member.vue
@@ -13,11 +13,7 @@
{{ userInfo.worker.name }}
- {{ models.worker.getWorkerTypeText(userInfo.worker.type) }}
+ {{ typeText }}
ID:{{ userInfo.worker.id }}
注册时间:{{ userInfo.createTime }}
@@ -122,6 +118,8 @@ export default {
safePt: 0,
backgroundImage: require("@/static/temp/1.png"),
acceptOrderState: false,
+ typeText: "",
+ typeTextColor: "",
serviceData: {
times: 0,
favorableRate: "0",
@@ -154,6 +152,9 @@ export default {
this.$models.user.serviceData().then((data) => {
this.serviceData = data;
});
+ let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.userInfo.worker.type);
+ this.typeText = typeText;
+ this.typeTextColor = typeTextColor;
}
},
onReady() {},