完善订单详情

src/components/order/item.vue

@@ -57,7 +57,7 @@
                         "
                     >
                         <view class="worker-item-box">
-                            <worker-item :data="{ ...order.worker, price: order.price }" />
+                            <worker-item :data="order.worker" />
                         </view>
                     </block>
                 </view>

src/components/worker/item.vue

@@ -13,7 +13,7 @@
             </view>
             <view class="detail">
                 <text class="section-text">服务{{ data.times || 0 }}次</text>
-                <text class="section-text">好评率{{ data.favorable_rate || 0 }}%</text>
+                <text class="section-text">好评率{{ data.favorableRate || 0 }}%</text>
                 <text class="section-text">评分{{ data.grade || 0 }}/5.0 </text>
             </view>
         </view>
@@ -44,9 +44,9 @@ export default {
     components: {},
     created() {},
     mounted() {
-        // let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.data.type);
+        let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.data.type);
-        // this.typeText = typeText;
+        this.typeText = typeText;
-        // this.typeTextColor = typeTextColor;
+        this.typeTextColor = typeTextColor;
     },
     destroyed() {},
     methods: {},

src/core/apis.js

@@ -191,7 +191,9 @@ export default {
             },
             // 报/议价订单
             t2: {
-                url: ""
+                url: "/wxapp/orderb/getmyorderbbyid",
+                showLoading: true,
+                auth: true,
             },
             // 货运订单
             t3: {

src/core/models/order.js

@@ -98,9 +98,48 @@ export default {
             prototype.$request(options.request).then(response => {
                 if (response.code == 1) {
                     let list = [];
+                    if (options.listType == 't1' || options.listType == 't2') {
                         response.data.forEach((item) => {
-                        let worker = {};
+                            let order = {
-                        list.push({
+                                listType: options.listType,
+                                id: item.id,
+                                orderId: item.order,
+                                cate: "待返数据",
+                                content: item.desc,
+                                createTime: item.time,
+                                serviceTime: item.times,
+                                orderType: item.types,
+                                price: item.money,
+                                state: item.status,
+                                workerList: [],
+                            };
+                            if (item.shifu) {
+                                order.worker = {
+                                    id: item.shifu.id,
+                                    name: item.shifu.name,
+                                    avatar: item.shifu.avatar,
+                                    type: item.shifu.status,
+                                    times: item.shifu_date.count,
+                                    favorableRate: item.shifu_date.good,
+                                    grade: item.shifu_date.score,
+                                    price: item.money,
+                                }
+                            }
+                            if (options.listType == 't2' && item.shifus.length > 0) {
+                                item.shifus.forEach(worker => {
+                                    order.workerList.push({
+                                        id: worker.id,
+                                        name: worker.name,
+                                        avatar: worker.avatar,
+                                        price: worker.money,
+                                    })
+                                });
+                            }
+                            list.push(order);
+                        });
+                    } else if (options.listType == 't3') {
+                        response.data.forEach((item) => {
+                            let order = {
                                 listType: options.listType,
                                 id: item.id,
                                 orderId: item.order,
@@ -113,8 +152,10 @@ export default {
                                 state: item.status,
                                 worker: item.shifu,
                                 workerList: [],
+                            };
+                            list.push(order);
                         });
-                    });
+                    }
                     return resolve(list);
                 }
                 return reject(response.msg);
@@ -128,7 +169,9 @@ export default {
         return new Promise((resolve, reject) => {
             prototype.$request(options.request).then(response => {
                 if (response.code == 1) {
-                    return resolve({
+                    let order = {};
+                    if (options.listType == 't1' || options.listType == 't2') {
+                        order = {
                             id: response.data.id,
                             address: response.data.address,
                             orderId: response.data.order,
@@ -138,10 +181,25 @@ export default {
                             serviceTime: response.data.times,
                             orderType: response.data.types,
                             state: response.data.status,
-                        images: [],
+                            images: response.data.img,
-                        worker: [],
                             workerList: [],
-                    });
+                        };
+                    } else if (options.listType == 't3') {
+                        order = {
+                            id: response.data.id,
+                            address: response.data.address,
+                            orderId: response.data.order,
+                            cate: "待返数据",
+                            content: response.data.desc,
+                            createTime: response.data.time,
+                            serviceTime: response.data.times,
+                            orderType: response.data.types,
+                            state: response.data.status,
+                            images: response.data.img,
+                            workerList: [],
+                        };
+                    }
+                    return resolve(order);
                 }
                 return reject(response.msg);
             }).catch(e => { });

src/pages/order/detail.vue

@@ -78,11 +78,13 @@
                                     <text class="iconfont icon-dingwei"></text>
                                     <view>
                                         <view class="contact limit-line clamp-1">
-                                            <text class="name">测试(先生)</text>
+                                            <text class="name">
-                                            <text class="mobile">13108196080</text>
+                                                {{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }})
+                                            </text>
+                                            <text class="mobile">{{ order.address.mobil }}</text>
                                         </view>
                                         <view class="detail">
-                                            <text>四川省成都市涪城区剑门门路西段书亦烧 仙草(成都七中店) 测试</text>
+                                            <text>{{ order.address.address }}{{ order.address.doorplate }}</text>
                                         </view>
                                     </view>
                                 </view>
@@ -138,7 +140,9 @@ export default {
             id: 0,
             listType: "",
             orderType: 0,
-            order: {},
+            order: {
+                address: {},
+            },
         };
     },
     components: {
@@ -232,11 +236,12 @@ export default {
             this.$models.order
                 .orderDetail({
                     request: {
-                        api: "order.detail.t1",
+                        api: "order.detail." + this.listType,
                         data: {
                             id: this.id,
                         },
                     },
+                    listType: this.listType,
                 })
                 .then((detail) => {
                     let [stateText, stateDesc, stateTextColor] = this.$models.order.stateText(
@@ -247,10 +252,7 @@ export default {
                     this.stateText = stateText;
                     this.stateDesc = stateDesc;
                     this.stateTextColor = stateTextColor;
-                    this.order = {
+                    this.order = detail;
-                        ...detail,
-                        listType: this.listType,
-                    };
                 })
                 .catch((e) => {
                     this.$utils.toast(e).then(() => {