统一师傅类型名称、颜色

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,
             },

src/core/models/worker.js

@@ -1,26 +1,8 @@
 export default {
-    type: {
+    worketTypeText(type) {
-        NORMAL: 1,
-        SETTLE: 2,
-    },
-    getWorkerTypeTextColor(type) {
         switch (type) {
-            case this.type.NORMAL:
+            case 0: return ['普通师傅', '#bfbfbf'];
-                return '#179C43';
+            case 1: return ['入驻师傅', '#d9a019'];
-            case this.type.SETTLE:
-                return '#D9A019';
-            default:
-                return '#999999';
         }
     },
-    getWorkerTypeText(type) {
+}
-        switch (type) {
-            case this.type.NORMAL:
-                return '普通师傅';
-            case this.type.SETTLE:
-                return '入驻师傅';
-            default:
-                return '未知';
-        }
-    }
-}

src/pages/get/index.vue

@@ -40,6 +40,9 @@
                                     </view>
                                 </order-item>
                             </view>
+                            <view class="loadmore-box">
+                                <load-more :hasMore="item.more" />
+                            </view>
                         </view>
                     </swiper-item>
                 </swiper>
@@ -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 {

src/pages/member/member.vue

@@ -13,11 +13,7 @@
                         <view class="detail">
                             <view class="name">
                                 <text>{{ userInfo.worker.name }}</text>
-                                <text
+                                <text class="type" :style="{ color: typeTextColor }">{{ typeText }}</text>
-                                    class="type"
-                                    :style="{ color: models.worker.getWorkerTypeTextColor(userInfo.worker.type) }"
-                                    >{{ models.worker.getWorkerTypeText(userInfo.worker.type) }}</text
-                                >
                             </view>
                             <view class="line id">ID：{{ userInfo.worker.id }}</view>
                             <view class="line">注册时间：{{ userInfo.createTime }}</view>
@@ -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() {},