drew před 5 roky
rodič
revize
2e5a4301aa

+ 2 - 1
.eslintignore

@@ -1,3 +1,4 @@
 node_modules
 dist-*
-src/native
+src/native
+src/vant

+ 214 - 214
src/components/OrderCard.vue

@@ -1,214 +1,214 @@
-<template>
-    <div class="orderCard" @click="goDetail">
-        <div class="top2" v-if="isBack">
-            <span class="code">退单号: {{ backInfo.backCode }}</span>
-            <span class="status">{{ backStatusText }}</span>
-        </div>
-        <div class="top">
-            <span class="code">订单号: {{ info.code }}</span>
-            <template v-if="!isBack">
-                <span class="status">{{ statusText }}</span>
-                <span class="warning yellow" v-if="loantxt">{{ loantxt }}</span>
-                <span class="warning" v-if="backOrderStatus">{{ backOrderStatus }}</span>
-            </template>
-        </div>
-
-        <div class="carCenter">
-            <van-image width="89" height="89" :src="car.mobileUrl" />
-            <div class="content">
-                <div class="text1">
-                    <span>{{ car.name }}</span>
-                    <span class="money">
-                        {{ totalPrice }}
-                    </span>
-                </div>
-
-                <div class="sub">
-                    <span>
-                        {{ text }}
-                    </span>
-
-                    <span>×1</span>
-                </div>
-            </div>
-        </div>
-
-        <div class="totalMoney">订金: {{ depositPrice }}</div>
-        <div class="btnList" v-if="isBack">
-            <van-button :color="$colors.prim" size="small" round @click.stop="toProgress">
-                退订详情
-            </van-button>
-        </div>
-        <div class="btnList" v-else>
-            <template v-if="info.status === '1'">
-                <van-button size="small" round type="default" @click.stop="cancelOrder" v-if="info.status === '1'"
-                    >取消订单</van-button
-                >
-                <van-button :color="$colors.prim" size="small" round @click.stop="toPay">
-                    支付定金
-                </van-button>
-            </template>
-            <template v-else-if="info.status === '2'">
-                <van-button :color="$colors.prim" size="small" v-if="info.payType === '1'" round @click.stop="toPay">
-                    支付尾款
-                </van-button>
-                <template v-else-if="info.payType === '2'">
-                    <van-button
-                        size="small"
-                        round
-                        @click.stop="discloseInformation"
-                        :color="$colors.prim"
-                        v-if="info.canFillLoanData"
-                        >提交贷款资料</van-button
-                    >
-                    <van-button
-                        @click="toPay"
-                        square
-                        block
-                        :color="$colors.prim"
-                        v-if="!info.backOrdering && '5' === info.loanStatus"
-                        >支付首付</van-button
-                    >
-                </template>
-            </template>
-            <template v-if="info.backOrdering">
-                <van-button size="small" round type="default" @click.stop="transparentFactory">生产状态查询</van-button>
-                <van-button size="small" round type="default" @click.stop="loadLogistics">物流状态查询</van-button>
-            </template>
-            <van-button
-                v-if="info.isSend && info.failReason"
-                size="small"
-                round
-                @click.stop="showFailReason"
-                color="#e76850"
-                >预审核失败</van-button
-            >
-            <van-button size="small" round type="default" @click.stop="toBackMoeny" v-if="info.canBackDeposit"
-                >退订金</van-button
-            >
-        </div>
-        <van-dialog id="van-dialog" />
-    </div>
-</template>
-
-<script>
-import Order from '../mixins/Order';
-export default {
-    props: ['info', 'backInfo', 'isBack'],
-    mixins: [Order]
-};
-</script>
-
-<style lang="less">
-.orderCard {
-    background: #ffffff;
-    border: 1px solid #ebebeb;
-    border-radius: 5px;
-    box-shadow: 0 0 10px 2px #ebebeb;
-    padding: 16px 10px;
-}
-.btnList {
-    display: flex;
-    justify-content: flex-end;
-    ._van-button + ._van-button {
-        margin-left: 10px;
-    }
-}
-.top2 {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    padding-bottom: 5px;
-    .code {
-        font-size: 12px;
-        color: #959595;
-        line-height: 18px;
-    }
-
-    .status {
-        font-size: 13px;
-        color: #6e6e76;
-        line-height: 18px;
-    }
-}
-.top {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    padding-bottom: 16px;
-
-    .code {
-        font-size: 12px;
-        color: #959595;
-        line-height: 18px;
-    }
-
-    .status {
-        font-size: 13px;
-        color: #6e6e76;
-        line-height: 18px;
-    }
-
-    .warning {
-        width: 100%;
-        text-align: right;
-        font-size: 13px;
-        color: #e76850;
-        line-height: 18px;
-        margin-top: 9px;
-
-        &.yellow {
-            color: #e76850;
-        }
-    }
-}
-
-.carCenter {
-    display: flex;
-    .content {
-        flex-grow: 1;
-        margin-left: 20px;
-
-        .text1 {
-            font-size: 13px;
-            font-weight: bold;
-            color: #333333;
-            line-height: 18px;
-            display: flex;
-            justify-content: space-between;
-        }
-
-        .sub {
-            font-size: 12px;
-            color: #868686;
-            line-height: 18px;
-            display: flex;
-            justify-content: space-between;
-            margin-top: 19px;
-            span {
-                &:first-child {
-                    width: 140px;
-                }
-            }
-        }
-    }
-}
-
-.totalMoney {
-    font-size: 18px;
-    font-weight: bold;
-    color: #333333;
-    line-height: 35px;
-    text-align: right;
-    padding-top: 16px;
-    padding-bottom: 18px;
-}
-
-.dialog-index--custom-class-name {
-    .dialog-index--van-dialog__confirm {
-        color: @prim !important;
-    }
-}
-</style>
+<template>
+    <div class="orderCard" @click="goDetail">
+        <div class="top2" v-if="isBack">
+            <span class="code">退单号: {{ backInfo.backCode }}</span>
+            <span class="status">{{ backStatusText }}</span>
+        </div>
+        <div class="top">
+            <span class="code">订单号: {{ info.code }}</span>
+            <template v-if="!isBack">
+                <span class="status">{{ statusText }}</span>
+                <span class="warning yellow" v-if="loantxt">{{ loantxt }}</span>
+                <span class="warning" v-if="backOrderStatus">{{ backOrderStatus }}</span>
+            </template>
+        </div>
+
+        <div class="carCenter">
+            <van-image width="89" height="89" :src="car.mobileUrl" />
+            <div class="content">
+                <div class="text1">
+                    <span>{{ car.name }}</span>
+                    <span class="money">
+                        {{ totalPrice }}
+                    </span>
+                </div>
+
+                <div class="sub">
+                    <span>
+                        {{ text }}
+                    </span>
+
+                    <span>×1</span>
+                </div>
+            </div>
+        </div>
+
+        <div class="totalMoney">订金: {{ depositPrice }}</div>
+        <div class="btnList" v-if="isBack">
+            <van-button :color="$colors.prim" size="small" round @click.stop="toProgress">
+                退订详情
+            </van-button>
+        </div>
+        <div class="btnList" v-else>
+            <template v-if="info.status === '1'">
+                <van-button size="small" round type="default" @click.stop="cancelOrder" v-if="info.status === '1'"
+                    >取消订单</van-button
+                >
+                <van-button :color="$colors.prim" size="small" round @click.stop="toPay">
+                    支付定金
+                </van-button>
+            </template>
+            <template v-else-if="info.status === '2'">
+                <van-button :color="$colors.prim" size="small" v-if="info.payType === '1'" round @click.stop="toPay">
+                    支付尾款
+                </van-button>
+                <template v-else-if="info.payType === '2'">
+                    <van-button
+                        size="small"
+                        round
+                        @click.stop="discloseInformation"
+                        :color="$colors.prim"
+                        v-if="info.canFillLoanData"
+                        >提交贷款资料</van-button
+                    >
+                    <van-button
+                        @click="toPay"
+                        square
+                        block
+                        :color="$colors.prim"
+                        v-if="!info.backOrdering && '5' === info.loanStatus"
+                        >支付首付</van-button
+                    >
+                </template>
+            </template>
+            <template v-if="info.backOrdering">
+                <van-button size="small" round type="default" @click.stop="transparentFactory">生产状态查询</van-button>
+                <van-button size="small" round type="default" @click.stop="loadLogistics">物流状态查询</van-button>
+            </template>
+            <van-button
+                v-if="info.isSend && info.failReason"
+                size="small"
+                round
+                @click.stop="showFailReason"
+                color="#e76850"
+                >预审核失败</van-button
+            >
+            <van-button size="small" round type="default" @click.stop="toBackMoeny" v-if="info.canBackDeposit"
+                >退订金</van-button
+            >
+        </div>
+        <van-dialog id="van-dialog" />
+    </div>
+</template>
+
+<script>
+import Order from '../mixins/Order';
+export default {
+    props: ['info', 'backInfo', 'isBack'],
+    mixins: [Order]
+};
+</script>
+
+<style lang="less">
+.orderCard {
+    background: #ffffff;
+    border: 1px solid #ebebeb;
+    border-radius: 5px;
+    box-shadow: 0 0 10px 2px #ebebeb;
+    padding: 16px 10px;
+}
+.btnList {
+    display: flex;
+    justify-content: flex-end;
+    ._van-button + ._van-button {
+        margin-left: 10px;
+    }
+}
+.top2 {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    padding-bottom: 5px;
+    .code {
+        font-size: 12px;
+        color: #959595;
+        line-height: 18px;
+    }
+
+    .status {
+        font-size: 13px;
+        color: #6e6e76;
+        line-height: 18px;
+    }
+}
+.top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    padding-bottom: 16px;
+
+    .code {
+        font-size: 12px;
+        color: #959595;
+        line-height: 18px;
+    }
+
+    .status {
+        font-size: 13px;
+        color: #6e6e76;
+        line-height: 18px;
+    }
+
+    .warning {
+        width: 100%;
+        text-align: right;
+        font-size: 13px;
+        color: #e76850;
+        line-height: 18px;
+        margin-top: 9px;
+
+        &.yellow {
+            color: #e76850;
+        }
+    }
+}
+
+.carCenter {
+    display: flex;
+    .content {
+        flex-grow: 1;
+        margin-left: 20px;
+
+        .text1 {
+            font-size: 13px;
+            font-weight: bold;
+            color: #333333;
+            line-height: 18px;
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .sub {
+            font-size: 12px;
+            color: #868686;
+            line-height: 18px;
+            display: flex;
+            justify-content: space-between;
+            margin-top: 19px;
+            span {
+                &:first-child {
+                    width: 140px;
+                }
+            }
+        }
+    }
+}
+
+.totalMoney {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333333;
+    line-height: 35px;
+    text-align: right;
+    padding-top: 16px;
+    padding-bottom: 18px;
+}
+
+.dialog-index--custom-class-name {
+    .dialog-index--van-dialog__confirm {
+        color: @prim !important;
+    }
+}
+</style>

+ 203 - 203
src/mixins/Order.js

@@ -1,203 +1,203 @@
-import { statusMap } from '../utils/AppState';
-import Dialog from '../vant/dialog/dialog';
-export default {
-    data() {
-        return {
-            statusMap,
-            backStatusMap: {
-                '1': '待审核',
-                '2': '退款发放中',
-                '3': '审核不通过',
-                '4': '已退款'
-            },
-            loanStatusMap: {
-                '0': '',
-                '1': '贷款资料待提交',
-                '2': '线上审核通过',
-                '3': '线上审核不通过',
-                '4': '线下待审核',
-                '5': '线下审核通过',
-                '6': '线下审核不通过'
-            },
-            isExamineTxt: { '0': ' ', '1': ' ' }
-        };
-    },
-    computed: {
-        backStatusText() {
-            if (this.isBack) {
-                return this.backStatusMap[this.backInfo.status];
-            } else {
-                return '';
-            }
-        },
-        statusText() {
-            return this.statusMap[this.info.status];
-        },
-        pickedCar() {
-            return this.info.pickedCar || {};
-        },
-        text() {
-            let list = [...(this.pickedCar.carOptionalPackageList || [])];
-
-            if (this.pickedCar.carColor) {
-                const _list = [
-                    this.pickedCar.carColor,
-                    this.pickedCar.carWheelHub,
-                    this.pickedCar.carCaliper,
-                    this.pickedCar.catUpholstery,
-                    this.pickedCar.carSeat
-                ];
-                list = [..._list, ...list];
-            }
-            return list
-                .map(item => {
-                    return item.value;
-                })
-                .join('|');
-        },
-        loantxt() {
-            var str =
-                this.info.loanStatus != '0'
-                    ? this.info.isExamine
-                        ? this.isExamineTxt[this.info.isExamine]
-                        : ' '
-                    : ' ';
-            if (this.info.loanStatus) {
-                str = this.loanStatusMap[this.info.loanStatus] + str;
-            }
-            return str;
-        },
-        backOrderStatus() {
-            if (this.info.backOrdering && this.info.status != '5') {
-                return '退定处理中';
-            } else {
-                return '';
-            }
-        },
-        totalPrice() {
-            return (
-                '¥' +
-                (this.info.totalPrice || 0).toLocaleString(undefined, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                })
-            );
-        },
-        depositPrice() {
-            return (
-                '¥' +
-                (this.info.depositPrice || 0).toLocaleString(undefined, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                })
-            );
-        },
-        downPaymentPrice() {
-            return (
-                '¥' +
-                (this.info.downPaymentPrice || 0).toLocaleString(undefined, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                })
-            );
-        },
-        loanPrice() {
-            return (
-                '¥' +
-                (this.info.loanPrice || 0).toLocaleString(undefined, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                })
-            );
-        },
-        monthlyInstallmentPaymentPrice() {
-            return (
-                '¥' +
-                (this.info.monthlyInstallmentPaymentPrice || 0).toLocaleString(undefined, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                })
-            );
-        },
-        car() {
-            return this.info.car || {};
-        },
-        failReason() {
-            if (this.info.isSend == '1' && this.info.failReason) {
-                return this.info.failReason;
-            } else {
-                return '';
-            }
-        }
-    },
-    methods: {
-        //退定金
-        toBackMoeny() {
-            this.goNext('/pages/order/backMoney?orderId=' + this.info.id + '&money=' + this.info.depositPrice);
-        },
-        //去支付
-        toPay() {
-            console.log('aaaa');
-            this.goNext('/pages/order/payonlyforcar?carOrderId=' + this.info.id);
-        },
-        cancelOrder() {
-            this.goNext('/pages/order/cancelOrder?orderId=' + this.info.id);
-        },
-        //提交资料
-        discloseInformation() {
-            console.log(this.info.url);
-            wx.downloadFile({
-                url: '	https://upage.imtt.qq.com/m_imtt/m_download_back/index_page.html', //仅为示例,并非真实的资源
-                success(res) {
-                    const filePath = res.tempFilePath;
-                    wx.openDocument({
-                        filePath: filePath,
-                        success: function(res) {
-                            console.log('打开文档成功');
-                        }
-                    });
-                }
-            });
-        },
-        //查看配置订单
-        toConfigurationInfo() {
-            console.log('aaaa');
-            this.goNext('/pages/order/configurationinfo?orderId=' + this.info.id);
-        },
-        goDetail() {
-            this.goNext('/pages/order/orderDetail?orderId=' + this.info.id);
-        },
-        //透明工厂
-        transparentFactory() {
-            this.$http
-                .get('http://factory.jetour.com.cn/getDeliveryInfo?callback=?&orderNo=' + this.info.code)
-                .then(res => {
-                    if (res.data.length === 0) {
-                        this.showToastError('暂无信息,请耐心等待');
-                    } else {
-                        this.goNext('/pages/order/transparent?orderNo=' + this.info.code);
-                    }
-                });
-        },
-        //物流信息
-        loadLogistics() {
-            this.$http
-                .get('http://factory.jetour.com.cn/getCarNodeInfo?callback=?&orderNo=' + this.info.code)
-                .then(res => {
-                    if (res.data.length === 0 || !res.data.listRecord || res.data.listRecord.length === 0) {
-                        this.showToastError('暂无信息,请耐心等待');
-                    } else {
-                        this.goNext('/pages/order/logistics?orderNo=' + this.info.code);
-                    }
-                });
-        },
-        showFailReason() {
-            Dialog.alert({
-                title: this.failReason,
-                className: 'custom-class-name'
-            }).then(() => {
-                this.navigateBack(500);
-            });
-        }
-    }
-};
+import { statusMap } from '../utils/AppState';
+import Dialog from '../vant/dialog/dialog';
+export default {
+    data() {
+        return {
+            statusMap,
+            backStatusMap: {
+                '1': '待审核',
+                '2': '退款发放中',
+                '3': '审核不通过',
+                '4': '已退款'
+            },
+            loanStatusMap: {
+                '0': '',
+                '1': '贷款资料待提交',
+                '2': '线上审核通过',
+                '3': '线上审核不通过',
+                '4': '线下待审核',
+                '5': '线下审核通过',
+                '6': '线下审核不通过'
+            },
+            isExamineTxt: { '0': ' ', '1': ' ' }
+        };
+    },
+    computed: {
+        backStatusText() {
+            if (this.isBack) {
+                return this.backStatusMap[this.backInfo.status];
+            } else {
+                return '';
+            }
+        },
+        statusText() {
+            return this.statusMap[this.info.status];
+        },
+        pickedCar() {
+            return this.info.pickedCar || {};
+        },
+        text() {
+            let list = [...(this.pickedCar.carOptionalPackageList || [])];
+
+            if (this.pickedCar.carColor) {
+                const _list = [
+                    this.pickedCar.carColor,
+                    this.pickedCar.carWheelHub,
+                    this.pickedCar.carCaliper,
+                    this.pickedCar.catUpholstery,
+                    this.pickedCar.carSeat
+                ];
+                list = [..._list, ...list];
+            }
+            return list
+                .map(item => {
+                    return item.value;
+                })
+                .join('|');
+        },
+        loantxt() {
+            var str =
+                this.info.loanStatus != '0'
+                    ? this.info.isExamine
+                        ? this.isExamineTxt[this.info.isExamine]
+                        : ' '
+                    : ' ';
+            if (this.info.loanStatus) {
+                str = this.loanStatusMap[this.info.loanStatus] + str;
+            }
+            return str;
+        },
+        backOrderStatus() {
+            if (this.info.backOrdering && this.info.status != '5') {
+                return '退定处理中';
+            } else {
+                return '';
+            }
+        },
+        totalPrice() {
+            return (
+                '¥' +
+                (this.info.totalPrice || 0).toLocaleString(undefined, {
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2
+                })
+            );
+        },
+        depositPrice() {
+            return (
+                '¥' +
+                (this.info.depositPrice || 0).toLocaleString(undefined, {
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2
+                })
+            );
+        },
+        downPaymentPrice() {
+            return (
+                '¥' +
+                (this.info.downPaymentPrice || 0).toLocaleString(undefined, {
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2
+                })
+            );
+        },
+        loanPrice() {
+            return (
+                '¥' +
+                (this.info.loanPrice || 0).toLocaleString(undefined, {
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2
+                })
+            );
+        },
+        monthlyInstallmentPaymentPrice() {
+            return (
+                '¥' +
+                (this.info.monthlyInstallmentPaymentPrice || 0).toLocaleString(undefined, {
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2
+                })
+            );
+        },
+        car() {
+            return this.info.car || {};
+        },
+        failReason() {
+            if (this.info.isSend == '1' && this.info.failReason) {
+                return this.info.failReason;
+            } else {
+                return '';
+            }
+        }
+    },
+    methods: {
+        //退定金
+        toBackMoeny() {
+            this.goNext('/pages/order/backMoney?orderId=' + this.info.id + '&money=' + this.info.depositPrice);
+        },
+        //去支付
+        toPay() {
+            console.log('aaaa');
+            this.goNext('/pages/order/payonlyforcar?carOrderId=' + this.info.id);
+        },
+        cancelOrder() {
+            this.goNext('/pages/order/cancelOrder?orderId=' + this.info.id);
+        },
+        //提交资料
+        discloseInformation() {
+            console.log(this.info.url);
+            wx.downloadFile({
+                url: '	https://upage.imtt.qq.com/m_imtt/m_download_back/index_page.html', //仅为示例,并非真实的资源
+                success(res) {
+                    const filePath = res.tempFilePath;
+                    wx.openDocument({
+                        filePath: filePath,
+                        success: function(res) {
+                            console.log('打开文档成功');
+                        }
+                    });
+                }
+            });
+        },
+        //查看配置订单
+        toConfigurationInfo() {
+            console.log('aaaa');
+            this.goNext('/pages/order/configurationinfo?orderId=' + this.info.id);
+        },
+        goDetail() {
+            this.goNext('/pages/order/orderDetail?orderId=' + this.info.id);
+        },
+        //透明工厂
+        transparentFactory() {
+            this.$http
+                .get('http://factory.jetour.com.cn/getDeliveryInfo?callback=?&orderNo=' + this.info.code)
+                .then(res => {
+                    if (res.data.length === 0) {
+                        this.showToastError('暂无信息,请耐心等待');
+                    } else {
+                        this.goNext('/pages/order/transparent?orderNo=' + this.info.code);
+                    }
+                });
+        },
+        //物流信息
+        loadLogistics() {
+            this.$http
+                .get('http://factory.jetour.com.cn/getCarNodeInfo?callback=?&orderNo=' + this.info.code)
+                .then(res => {
+                    if (res.data.length === 0 || !res.data.listRecord || res.data.listRecord.length === 0) {
+                        this.showToastError('暂无信息,请耐心等待');
+                    } else {
+                        this.goNext('/pages/order/logistics?orderNo=' + this.info.code);
+                    }
+                });
+        },
+        showFailReason() {
+            Dialog.alert({
+                title: this.failReason,
+                className: 'custom-class-name'
+            }).then(() => {
+                this.navigateBack(500);
+            });
+        }
+    }
+};

+ 63 - 63
src/mixins/OrderList.js

@@ -1,63 +1,63 @@
-export default {
-    data() {
-        return {
-            pageNum: 0,
-            pageSize: 10,
-            loading: false,
-            finish: false,
-            empty: false,
-            list: []
-        };
-    },
-    watch: {
-        queryData() {
-            this.pageNum = 0;
-            this.pageSize = 10;
-            this.finish = false;
-            this.empty = false;
-            this.getList();
-        }
-    },
-    onLoad() {
-        this.getList();
-    },
-    methods: {
-        getList() {
-            this.loading = true;
-            this.empty = false;
-            console.log(this.url);
-            if (this.pageNum == 0) {
-                this.list = [];
-            }
-            this.$http
-                .post(this.url, {
-                    pageNum: this.pageNum,
-                    pageSize: this.pageSize,
-                    ...this.queryData
-                })
-                .then(res => {
-                    this.list = [...this.list, ...res.data.data];
-                    this.empty = res.data.recordsTotal === 0;
-                    this.finish = this.empty ? true : res.data.totalPage === this.pageNum + 1;
-                })
-                .finally(() => {
-                    this.loading = false;
-                });
-        }
-    },
-    onReachBottom() {
-        console.log('aaaa');
-        if (!this.finish && !this.loading) {
-            this.pageNum++;
-            this.getList();
-        }
-    },
-    onPullDownRefresh() {
-        console.log('aaaa');
-        this.pageNum = 0;
-        this.pageSize = 10;
-        this.finish = false;
-        this.empty = false;
-        this.getList();
-    }
-};
+export default {
+    data() {
+        return {
+            pageNum: 0,
+            pageSize: 10,
+            loading: false,
+            finish: false,
+            empty: false,
+            list: []
+        };
+    },
+    watch: {
+        queryData() {
+            this.pageNum = 0;
+            this.pageSize = 10;
+            this.finish = false;
+            this.empty = false;
+            this.getList();
+        }
+    },
+    onLoad() {
+        this.getList();
+    },
+    methods: {
+        getList() {
+            this.loading = true;
+            this.empty = false;
+            console.log(this.url);
+            if (this.pageNum == 0) {
+                this.list = [];
+            }
+            this.$http
+                .post(this.url, {
+                    pageNum: this.pageNum,
+                    pageSize: this.pageSize,
+                    ...this.queryData
+                })
+                .then(res => {
+                    this.list = [...this.list, ...res.data.data];
+                    this.empty = res.data.recordsTotal === 0;
+                    this.finish = this.empty ? true : res.data.totalPage === this.pageNum + 1;
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
+        }
+    },
+    onReachBottom() {
+        console.log('aaaa');
+        if (!this.finish && !this.loading) {
+            this.pageNum++;
+            this.getList();
+        }
+    },
+    onPullDownRefresh() {
+        console.log('aaaa');
+        this.pageNum = 0;
+        this.pageSize = 10;
+        this.finish = false;
+        this.empty = false;
+        this.getList();
+    }
+};

+ 24 - 24
src/mixins/ToastEvent.js

@@ -1,24 +1,24 @@
-export default {
-    methods: {
-        showToastError(title, icon = 'none', duration = 1500) {
-            wx.showToast({
-                icon: icon,
-                title: title,
-                mask: true,
-                duration: duration
-            });
-        },
-        navigateBack(timeOut = 0, delta = 1) {
-            setTimeout(function() {
-                wx.navigateBack({
-                    delta: delta
-                });
-            }, timeOut);
-        },
-        goNext(url) {
-            wx.navigateTo({
-                url: url
-            });
-        }
-    }
-};
+export default {
+    methods: {
+        showToastError(title, icon = 'none', duration = 1500) {
+            wx.showToast({
+                icon: icon,
+                title: title,
+                mask: true,
+                duration: duration
+            });
+        },
+        navigateBack(timeOut = 0, delta = 1) {
+            setTimeout(function() {
+                wx.navigateBack({
+                    delta: delta
+                });
+            }, timeOut);
+        },
+        goNext(url) {
+            wx.navigateTo({
+                url: url
+            });
+        }
+    }
+};

+ 119 - 119
src/pages/order/backMoney.vue

@@ -1,119 +1,119 @@
-<config>
-{
-'navigationBarTitleText': '退订金申请',
-"disableScroll": true,
-}
-</config>
-<template>
-    <div>
-        <div class="tips">
-            退订金的原因
-        </div>
-        <van-radio-group :value="result" @change="result = $event.detail">
-            <van-cell-group>
-                <van-cell title="72小时内无理由退订" clickable data-name="1" @click="choose">
-                    <van-radio slot="right-icon" name="1" :checked-color="$colors.prim" />
-                </van-cell>
-                <van-cell title="订单信息有误" clickable data-name="2" @click="choose">
-                    <van-radio slot="right-icon" name="2" :checked-color="$colors.prim" />
-                </van-cell>
-                <van-cell title="贷款审核不通过" clickable data-name="3" @click="choose">
-                    <van-radio slot="right-icon" name="3" :checked-color="$colors.prim" />
-                </van-cell>
-                <van-cell title="其他" clickable data-name="4" @click="choose" :border="false">
-                    <van-radio slot="right-icon" name="4" :checked-color="$colors.prim" />
-                </van-cell>
-            </van-cell-group>
-        </van-radio-group>
-
-        <div class="btnList">
-            <van-button @click="cancel" square block :color="$colors.prim">取消订单</van-button>
-        </div>
-        <van-dialog id="van-dialog" />
-    </div>
-</template>
-<script>
-import Dialog from '../../vant/dialog/dialog';
-export default {
-    data() {
-        return {
-            result: ''
-        };
-    },
-    onShow() {},
-    methods: {
-        choose(event) {
-            const { name } = event.currentTarget.dataset;
-            this.result = name;
-        },
-        cancel() {
-            if (!this.result) {
-                this.showToastError('请选择取消原因');
-                return;
-            }
-            Dialog.alert({
-                title: '退订金申请即将提交',
-                showCancelButton: true,
-                className: 'custom-class-name'
-            })
-                .then(() => {
-                    this.$http
-                        .post(
-                            '/applets/backorder/addbackdepositorder',
-                            {
-                                orderId: this.$mp.query.orderId,
-                                reason: this.result
-                            },
-                            {
-                                header: {
-                                    'content-type': 'application/json'
-                                }
-                            }
-                        )
-                        .then(res => {
-                            if (res.data === 1) {
-                                Dialog.alert({
-                                    title: '退订金申请已提交',
-                                    message: '系统正在审核',
-                                    className: 'custom-class-name'
-                                }).then(() => {
-                                    this.navigateBack(500);
-                                });
-                            } else {
-                                this.showToastError(res.message);
-                            }
-                        });
-                })
-                .catch(() => {});
-        }
-    }
-};
-</script>
-<style lang="less">
-page {
-    background: @bg2;
-}
-
-.tips {
-    font-size: 15px;
-    color: #6e6e76;
-    line-height: 12px;
-    padding: 40px 17px 10px;
-}
-.btnList {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-
-    .van-button {
-        height: 55px;
-    }
-}
-
-.dialog-index--custom-class-name {
-    .dialog-index--van-dialog__confirm {
-        color: @prim !important;
-    }
-}
-</style>
+<config>
+{
+'navigationBarTitleText': '退订金申请',
+"disableScroll": true,
+}
+</config>
+<template>
+    <div>
+        <div class="tips">
+            退订金的原因
+        </div>
+        <van-radio-group :value="result" @change="result = $event.detail">
+            <van-cell-group>
+                <van-cell title="72小时内无理由退订" clickable data-name="1" @click="choose">
+                    <van-radio slot="right-icon" name="1" :checked-color="$colors.prim" />
+                </van-cell>
+                <van-cell title="订单信息有误" clickable data-name="2" @click="choose">
+                    <van-radio slot="right-icon" name="2" :checked-color="$colors.prim" />
+                </van-cell>
+                <van-cell title="贷款审核不通过" clickable data-name="3" @click="choose">
+                    <van-radio slot="right-icon" name="3" :checked-color="$colors.prim" />
+                </van-cell>
+                <van-cell title="其他" clickable data-name="4" @click="choose" :border="false">
+                    <van-radio slot="right-icon" name="4" :checked-color="$colors.prim" />
+                </van-cell>
+            </van-cell-group>
+        </van-radio-group>
+
+        <div class="btnList">
+            <van-button @click="cancel" square block :color="$colors.prim">取消订单</van-button>
+        </div>
+        <van-dialog id="van-dialog" />
+    </div>
+</template>
+<script>
+import Dialog from '../../vant/dialog/dialog';
+export default {
+    data() {
+        return {
+            result: ''
+        };
+    },
+    onShow() {},
+    methods: {
+        choose(event) {
+            const { name } = event.currentTarget.dataset;
+            this.result = name;
+        },
+        cancel() {
+            if (!this.result) {
+                this.showToastError('请选择取消原因');
+                return;
+            }
+            Dialog.alert({
+                title: '退订金申请即将提交',
+                showCancelButton: true,
+                className: 'custom-class-name'
+            })
+                .then(() => {
+                    this.$http
+                        .post(
+                            '/applets/backorder/addbackdepositorder',
+                            {
+                                orderId: this.$mp.query.orderId,
+                                reason: this.result
+                            },
+                            {
+                                header: {
+                                    'content-type': 'application/json'
+                                }
+                            }
+                        )
+                        .then(res => {
+                            if (res.data === 1) {
+                                Dialog.alert({
+                                    title: '退订金申请已提交',
+                                    message: '系统正在审核',
+                                    className: 'custom-class-name'
+                                }).then(() => {
+                                    this.navigateBack(500);
+                                });
+                            } else {
+                                this.showToastError(res.message);
+                            }
+                        });
+                })
+                .catch(() => {});
+        }
+    }
+};
+</script>
+<style lang="less">
+page {
+    background: @bg2;
+}
+
+.tips {
+    font-size: 15px;
+    color: #6e6e76;
+    line-height: 12px;
+    padding: 40px 17px 10px;
+}
+.btnList {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .van-button {
+        height: 55px;
+    }
+}
+
+.dialog-index--custom-class-name {
+    .dialog-index--van-dialog__confirm {
+        color: @prim !important;
+    }
+}
+</style>

+ 86 - 86
src/pages/order/cancelOrder.vue

@@ -1,86 +1,86 @@
-<config>
-{
-'navigationBarTitleText': '取消订单',
-"disableScroll": true,
-}
-</config>
-<template>
-    <div>
-        <div class="tips">
-            取消订单的原因
-        </div>
-        <van-radio-group :value="result" @change="result = $event.detail">
-            <van-cell-group>
-                <van-cell title="不想买了" clickable data-name="1" @click="choose">
-                    <van-radio slot="right-icon" name="1" :checked-color="$colors.prim" />
-                </van-cell>
-                <van-cell title="车辆配置内容错误" clickable data-name="2" @click="choose">
-                    <van-radio slot="right-icon" name="2" :checked-color="$colors.prim" />
-                </van-cell>
-                <van-cell title="地址信息填写错误" clickable data-name="3" @click="choose">
-                    <van-radio slot="right-icon" name="3" :checked-color="$colors.prim" />
-                </van-cell>
-                <van-cell title="其他" clickable data-name="4" @click="choose" :border="false">
-                    <van-radio slot="right-icon" name="4" :checked-color="$colors.prim" />
-                </van-cell>
-            </van-cell-group>
-        </van-radio-group>
-
-        <div class="btnList">
-            <van-button @click="cancel" square block :color="$colors.prim">取消订单</van-button>
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            result: ''
-        };
-    },
-    onShow() {},
-    methods: {
-        choose(event) {
-            const { name } = event.currentTarget.dataset;
-            this.result = name;
-        },
-        cancel() {
-            if (!this.result) {
-                this.showToastError('请选择取消原因');
-                return;
-            }
-            this.$http
-                .get('/applets/carorder/cancelcarorder', {
-                    carOrderId: this.$mp.query.orderId,
-                    cancelReason: this.result
-                })
-                .then(res => {
-                    this.showToastError('订单已取消', 'success');
-                    this.navigateBack(500);
-                });
-        }
-    }
-};
-</script>
-<style lang="less">
-page {
-    background: @bg2;
-}
-
-.tips {
-    font-size: 15px;
-    color: #6e6e76;
-    line-height: 12px;
-    padding: 40px 17px 10px;
-}
-.btnList {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-
-    .van-button {
-        height: 55px;
-    }
-}
-</style>
+<config>
+{
+'navigationBarTitleText': '取消订单',
+"disableScroll": true,
+}
+</config>
+<template>
+    <div>
+        <div class="tips">
+            取消订单的原因
+        </div>
+        <van-radio-group :value="result" @change="result = $event.detail">
+            <van-cell-group>
+                <van-cell title="不想买了" clickable data-name="1" @click="choose">
+                    <van-radio slot="right-icon" name="1" :checked-color="$colors.prim" />
+                </van-cell>
+                <van-cell title="车辆配置内容错误" clickable data-name="2" @click="choose">
+                    <van-radio slot="right-icon" name="2" :checked-color="$colors.prim" />
+                </van-cell>
+                <van-cell title="地址信息填写错误" clickable data-name="3" @click="choose">
+                    <van-radio slot="right-icon" name="3" :checked-color="$colors.prim" />
+                </van-cell>
+                <van-cell title="其他" clickable data-name="4" @click="choose" :border="false">
+                    <van-radio slot="right-icon" name="4" :checked-color="$colors.prim" />
+                </van-cell>
+            </van-cell-group>
+        </van-radio-group>
+
+        <div class="btnList">
+            <van-button @click="cancel" square block :color="$colors.prim">取消订单</van-button>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            result: ''
+        };
+    },
+    onShow() {},
+    methods: {
+        choose(event) {
+            const { name } = event.currentTarget.dataset;
+            this.result = name;
+        },
+        cancel() {
+            if (!this.result) {
+                this.showToastError('请选择取消原因');
+                return;
+            }
+            this.$http
+                .get('/applets/carorder/cancelcarorder', {
+                    carOrderId: this.$mp.query.orderId,
+                    cancelReason: this.result
+                })
+                .then(res => {
+                    this.showToastError('订单已取消', 'success');
+                    this.navigateBack(500);
+                });
+        }
+    }
+};
+</script>
+<style lang="less">
+page {
+    background: @bg2;
+}
+
+.tips {
+    font-size: 15px;
+    color: #6e6e76;
+    line-height: 12px;
+    padding: 40px 17px 10px;
+}
+.btnList {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .van-button {
+        height: 55px;
+    }
+}
+</style>

+ 185 - 185
src/pages/order/configurationinfo.vue

@@ -1,185 +1,185 @@
-<config>
-{
-'navigationBarTitleText': '车辆详细配置',
-}
-</config>
-<template>
-    <div class="container">
-        <div class="card">
-            <div class="orderName">
-                {{ car.name }}
-            </div>
-            <div class="hr"></div>
-            <div class="minisub">全部选择配置</div>
-            <div class="moreInfo">
-                <div class="more-item" :key="index" v-for="(item, index) in settings">
-                    <div class="name">{{ item.name }}</div>
-
-                    <div class="val">¥{{ item.value }}</div>
-                </div>
-            </div>
-            <div class="hr"></div>
-            <div class="bottomContent">
-                <div class="more-item main">
-                    <div class="name">订金</div>
-                    <div class="val color" id="price">¥{{ include(info.depositPrice) }}</div>
-                </div>
-                <div class="more-item little">
-                    <div class="name">预计交付时间</div>
-                    <div class="val color">45个工作日</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            info: {}
-        };
-    },
-    computed: {
-        pickedCar() {
-            return this.info.pickedCar || {};
-        },
-        car() {
-            return this.info.car || {};
-        },
-        settings() {
-            var list = [];
-
-            if (this.pickedCar.carSeat) {
-                list.push({
-                    name: this.pickedCar.carSeat.value,
-                    value: this.include(this.pickedCar.carSeat.price)
-                });
-                list.push({
-                    name: this.pickedCar.carColor.value,
-                    value: this.include(this.pickedCar.carColor.price)
-                });
-                list.push({
-                    name: this.pickedCar.carWheelHub.value,
-                    value: this.include(this.pickedCar.carWheelHub.price)
-                });
-                list.push({
-                    name: this.pickedCar.carCaliper.value,
-                    value: this.include(this.pickedCar.carCaliper.price)
-                });
-                list.push({
-                    name: this.pickedCar.catUpholstery.value,
-                    value: this.include(this.pickedCar.catUpholstery.price)
-                });
-                list.push({
-                    name: '总价',
-                    value: this.include(this.info.totalPrice)
-                });
-            }
-
-            return list;
-        }
-    },
-    onShow() {
-        if (this.$mp.query.orderId) {
-            this.$http
-                .get('/applets/carorder/findbyid', {
-                    carOrderId: this.$mp.query.orderId
-                })
-                .then(res => {
-                    this.info = res.data;
-                    console.log(this.info);
-                });
-        }
-    },
-    methods: {
-        include(price) {
-            if (!price) {
-                return 0;
-            } else {
-                return price.toLocaleString(undefined, {
-                    minimumFractionDigits: 2,
-                    maximumFractionDigits: 2
-                });
-            }
-        }
-    }
-};
-</script>
-<style lang="less">
-page {
-    background: @bg2;
-}
-
-.container {
-    padding: 15px;
-}
-
-.card {
-    border: 1px solid #ebebeb;
-    border-radius: 5px;
-    background: #ffffff;
-    box-shadow: 0 0 10px 2px #ebebeb;
-    padding: 0 10px;
-}
-
-.hr {
-    height: 1px;
-    background: #ebebeb;
-}
-
-.orderName {
-    font-size: 18px;
-    color: #000000;
-    line-height: 47px;
-}
-
-.minisub {
-    font-size: 12px;
-    color: #6e6e76;
-    line-height: 36px;
-}
-.moreInfo {
-    padding: 20px 15px;
-}
-.more-item {
-    display: flex;
-    justify-content: space-between;
-
-    line-height: 40px;
-
-    .name {
-        font-size: 15px;
-        color: #343434;
-    }
-
-    .val {
-        font-size: 15px;
-        color: #6e6e76;
-    }
-
-    &.main {
-        line-height: 24px;
-        .val {
-            font-size: 18px;
-            font-weight: bold;
-            color: #00a29a;
-        }
-    }
-
-    &.little {
-        line-height: 24px;
-
-        .name {
-            font-size: 12px;
-        }
-        .val {
-            font-size: 12px;
-            color: #00a29a;
-        }
-    }
-}
-
-.bottomContent {
-    padding: 10px 15px 20px;
-}
-</style>
+<config>
+{
+'navigationBarTitleText': '车辆详细配置',
+}
+</config>
+<template>
+    <div class="container">
+        <div class="card">
+            <div class="orderName">
+                {{ car.name }}
+            </div>
+            <div class="hr"></div>
+            <div class="minisub">全部选择配置</div>
+            <div class="moreInfo">
+                <div class="more-item" :key="index" v-for="(item, index) in settings">
+                    <div class="name">{{ item.name }}</div>
+
+                    <div class="val">¥{{ item.value }}</div>
+                </div>
+            </div>
+            <div class="hr"></div>
+            <div class="bottomContent">
+                <div class="more-item main">
+                    <div class="name">订金</div>
+                    <div class="val color" id="price">¥{{ include(info.depositPrice) }}</div>
+                </div>
+                <div class="more-item little">
+                    <div class="name">预计交付时间</div>
+                    <div class="val color">45个工作日</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            info: {}
+        };
+    },
+    computed: {
+        pickedCar() {
+            return this.info.pickedCar || {};
+        },
+        car() {
+            return this.info.car || {};
+        },
+        settings() {
+            var list = [];
+
+            if (this.pickedCar.carSeat) {
+                list.push({
+                    name: this.pickedCar.carSeat.value,
+                    value: this.include(this.pickedCar.carSeat.price)
+                });
+                list.push({
+                    name: this.pickedCar.carColor.value,
+                    value: this.include(this.pickedCar.carColor.price)
+                });
+                list.push({
+                    name: this.pickedCar.carWheelHub.value,
+                    value: this.include(this.pickedCar.carWheelHub.price)
+                });
+                list.push({
+                    name: this.pickedCar.carCaliper.value,
+                    value: this.include(this.pickedCar.carCaliper.price)
+                });
+                list.push({
+                    name: this.pickedCar.catUpholstery.value,
+                    value: this.include(this.pickedCar.catUpholstery.price)
+                });
+                list.push({
+                    name: '总价',
+                    value: this.include(this.info.totalPrice)
+                });
+            }
+
+            return list;
+        }
+    },
+    onShow() {
+        if (this.$mp.query.orderId) {
+            this.$http
+                .get('/applets/carorder/findbyid', {
+                    carOrderId: this.$mp.query.orderId
+                })
+                .then(res => {
+                    this.info = res.data;
+                    console.log(this.info);
+                });
+        }
+    },
+    methods: {
+        include(price) {
+            if (!price) {
+                return 0;
+            } else {
+                return price.toLocaleString(undefined, {
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2
+                });
+            }
+        }
+    }
+};
+</script>
+<style lang="less">
+page {
+    background: @bg2;
+}
+
+.container {
+    padding: 15px;
+}
+
+.card {
+    border: 1px solid #ebebeb;
+    border-radius: 5px;
+    background: #ffffff;
+    box-shadow: 0 0 10px 2px #ebebeb;
+    padding: 0 10px;
+}
+
+.hr {
+    height: 1px;
+    background: #ebebeb;
+}
+
+.orderName {
+    font-size: 18px;
+    color: #000000;
+    line-height: 47px;
+}
+
+.minisub {
+    font-size: 12px;
+    color: #6e6e76;
+    line-height: 36px;
+}
+.moreInfo {
+    padding: 20px 15px;
+}
+.more-item {
+    display: flex;
+    justify-content: space-between;
+
+    line-height: 40px;
+
+    .name {
+        font-size: 15px;
+        color: #343434;
+    }
+
+    .val {
+        font-size: 15px;
+        color: #6e6e76;
+    }
+
+    &.main {
+        line-height: 24px;
+        .val {
+            font-size: 18px;
+            font-weight: bold;
+            color: #00a29a;
+        }
+    }
+
+    &.little {
+        line-height: 24px;
+
+        .name {
+            font-size: 12px;
+        }
+        .val {
+            font-size: 12px;
+            color: #00a29a;
+        }
+    }
+}
+
+.bottomContent {
+    padding: 10px 15px 20px;
+}
+</style>

+ 105 - 105
src/pages/order/logistics.vue

@@ -1,105 +1,105 @@
-<config>
-{
-'navigationBarTitleText': '物流状态',
-"usingComponents": {
-  "van-steps": "../../vant/steps/index"
-}
-}
-</config>
-<template>
-    <div class="info">
-        <div class="card">
-            <div class="cardTop">订单编号:{{ orderNo }}</div>
-
-            <div class="shouhuo">
-                <div class="box">收</div>
-                <div class="name">安徽省芜湖市鸠江区捷途官抖 街道,捷途4S店</div>
-            </div>
-            <van-steps :steps="steps" :active="active" direction="vertical" :active-color="$colors.prim" />
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            active: 0,
-            orderNo: '',
-            steps: [
-                {
-                    text: '安徽省芜湖市捷途营业点',
-                    desc: '2019-06-30 12:39'
-                },
-                {
-                    text: '安徽省芜湖市捷途营业点',
-                    desc: '2019-06-30 12:39'
-                },
-                {
-                    text: '安徽省芜湖市捷途营业点',
-                    desc: '2019-06-30 12:39'
-                },
-                {
-                    text: '安徽省芜湖市捷途营业点',
-                    desc: '2019-06-30 12:39'
-                }
-            ]
-        };
-    },
-    onShow() {
-        if (this.$mp.query.orderNo) {
-            this.orderNo = this.$mp.query.orderNo;
-        }
-    }
-};
-</script>
-<style lang="less">
-page {
-    background: @bg2;
-}
-
-.info {
-    padding: 15px;
-}
-
-.card {
-    border: 1px solid #ebebeb;
-    border-radius: 5px;
-    background: #ffffff;
-    box-shadow: 0 0 10px 2px #ebebeb;
-    padding: 15px 10px;
-}
-
-.cardTop {
-    font-size: 10px;
-    color: #6e6e76;
-    line-height: 24px;
-    padding-bottom: 11px;
-    border-bottom: 1px solid #ececec;
-}
-
-.shouhuo {
-    display: flex;
-    align-items: center;
-    padding: 10px 20px 0 0;
-    .box {
-        width: 33px;
-        height: 33px;
-        background: #c0c0c0;
-        border: 1px solid #ffffff;
-        border-radius: 50%;
-
-        font-size: 13px;
-        font-weight: bold;
-        color: #ffffff;
-        line-height: 33px;
-        text-align: center;
-    }
-
-    .name {
-        font-size: 13px;
-        color: #343434;
-        line-height: 15px;
-        margin-left: 7px;
-    }
-}
-</style>
+<config>
+{
+'navigationBarTitleText': '物流状态',
+"usingComponents": {
+  "van-steps": "../../vant/steps/index"
+}
+}
+</config>
+<template>
+    <div class="info">
+        <div class="card">
+            <div class="cardTop">订单编号:{{ orderNo }}</div>
+
+            <div class="shouhuo">
+                <div class="box">收</div>
+                <div class="name">安徽省芜湖市鸠江区捷途官抖 街道,捷途4S店</div>
+            </div>
+            <van-steps :steps="steps" :active="active" direction="vertical" :active-color="$colors.prim" />
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            active: 0,
+            orderNo: '',
+            steps: [
+                {
+                    text: '安徽省芜湖市捷途营业点',
+                    desc: '2019-06-30 12:39'
+                },
+                {
+                    text: '安徽省芜湖市捷途营业点',
+                    desc: '2019-06-30 12:39'
+                },
+                {
+                    text: '安徽省芜湖市捷途营业点',
+                    desc: '2019-06-30 12:39'
+                },
+                {
+                    text: '安徽省芜湖市捷途营业点',
+                    desc: '2019-06-30 12:39'
+                }
+            ]
+        };
+    },
+    onShow() {
+        if (this.$mp.query.orderNo) {
+            this.orderNo = this.$mp.query.orderNo;
+        }
+    }
+};
+</script>
+<style lang="less">
+page {
+    background: @bg2;
+}
+
+.info {
+    padding: 15px;
+}
+
+.card {
+    border: 1px solid #ebebeb;
+    border-radius: 5px;
+    background: #ffffff;
+    box-shadow: 0 0 10px 2px #ebebeb;
+    padding: 15px 10px;
+}
+
+.cardTop {
+    font-size: 10px;
+    color: #6e6e76;
+    line-height: 24px;
+    padding-bottom: 11px;
+    border-bottom: 1px solid #ececec;
+}
+
+.shouhuo {
+    display: flex;
+    align-items: center;
+    padding: 10px 20px 0 0;
+    .box {
+        width: 33px;
+        height: 33px;
+        background: #c0c0c0;
+        border: 1px solid #ffffff;
+        border-radius: 50%;
+
+        font-size: 13px;
+        font-weight: bold;
+        color: #ffffff;
+        line-height: 33px;
+        text-align: center;
+    }
+
+    .name {
+        font-size: 13px;
+        color: #343434;
+        line-height: 15px;
+        margin-left: 7px;
+    }
+}
+</style>

+ 293 - 293
src/pages/order/orderDetail.vue

@@ -1,293 +1,293 @@
-<config>
-{
-	'navigationBarTitleText': '订单详情',
-}
-</config>
-<template>
-    <div class="orderDetail">
-        <div class="card">
-            <div class="orderTop">
-                <span>订单状态:</span>
-                <span>{{ statusText }}</span>
-            </div>
-            <div class="hr"></div>
-            <div class="content">
-                <div class="order-item">
-                    订单编号:<span>{{ info.code }}</span>
-                </div>
-                <div class="order-item">
-                    订单日期:<span>{{ info.createTime }}</span>
-                </div>
-            </div>
-        </div>
-        <div class="card">
-            <div class="cardName">车辆配置</div>
-
-            <van-image width="100%" height="323" :src="car.mobileUrl" />
-
-            <div class="orderName">
-                {{ car.name }}
-            </div>
-            <div class="orderSub">
-                {{ text }}
-            </div>
-            <div class="orderMoneySub">总价: {{ totalPrice }}</div>
-            <div class="orderMoney">订金: {{ depositPrice }}</div>
-            <div class="showMore" @click.stop="toConfigurationInfo">
-                点击查看配置详情
-            </div>
-        </div>
-        <div class="card">
-            <div class="cardName">车主信息</div>
-            <div class="hr"></div>
-            <div class="info-content">
-                <div class="info-item">
-                    <span class="name">姓名:</span>
-                    <span class="val">{{ info.name }}</span>
-                </div>
-
-                <div class="info-item">
-                    <span class="name"> 手机号:</span>
-                    <span class="val">{{ info.mobile }}</span>
-                </div>
-
-                <div class="info-item">
-                    <span class="name"> 取车城市:</span>
-                    <span class="val">{{ info.pickCity }}</span>
-                </div>
-
-                <div class="info-item">
-                    <span class="name">经销商:</span>
-                    <span class="val">{{ info.carSupplier }}</span>
-                </div>
-            </div>
-        </div>
-
-        <div class="card">
-            <div class="cardName">
-                <span>付款信息</span>
-                <span class="payType">{{ info.payType == '1' ? '全款购车' : '仅供参考' }}</span>
-            </div>
-            <div class="hr"></div>
-            <div class="info-content">
-                <div class="info-item" v-if="info.payType === '1'">
-                    <span class="name"> 全款金额:</span>
-                    <span class="val">{{ totalPrice }}</span>
-                </div>
-
-                <template v-else-if="info.payType === '2'">
-                    <div class="info-item">
-                        <span class="name">贷款方案:</span>
-                        <span class="val">{{ info.loanInstalmentCount }}期</span>
-                    </div>
-
-                    <div class="info-item">
-                        <span class="name"> 首付款:</span>
-                        <span class="val">{{ downPaymentPrice }} </span>
-                    </div>
-
-                    <div class="info-item">
-                        <span class="name"> 贷款总额:</span>
-                        <span class="val">{{ loanPrice }} </span>
-                    </div>
-
-                    <div class="info-item">
-                        <span class="name">月供金额:</span>
-                        <span class="val">{{ monthlyInstallmentPaymentPrice }}</span>
-                    </div>
-                </template>
-            </div>
-        </div>
-        <div class="btn"></div>
-        <div class="btnList">
-            <template v-if="info.status === '1'">
-                <van-button block @click="cancelOrder" square color="#000">取消订单</van-button>
-                <van-button @click="toPay" block square :color="$colors.prim">支付订金</van-button>
-            </template>
-            <template v-else-if="info.status === '2'">
-                <van-button block @click="toPay" square :color="$colors.prim" v-if="info.payType === '1'"
-                    >支付尾款</van-button
-                >
-                <template v-else-if="info.payType === '2'">
-                    <van-button
-                        @click="discloseInformation"
-                        square
-                        block
-                        :color="$colors.prim"
-                        v-if="info.canFillLoanData"
-                        >提交贷款资料</van-button
-                    >
-                    <van-button
-                        @click="toPay"
-                        square
-                        block
-                        :color="$colors.prim"
-                        v-if="!info.backOrdering && '5' === info.loanStatus"
-                        >支付首付</van-button
-                    >
-                </template>
-            </template>
-
-            <van-button @click="toBackMoeny" block square color="#000" v-if="info.canBackDeposit">退订金</van-button>
-        </div>
-    </div>
-</template>
-<script>
-import Order from '../../mixins/Order';
-export default {
-    data() {
-        return {
-            info: {}
-        };
-    },
-    mixins: [Order],
-    onShow() {
-        if (this.$mp.query.orderId) {
-            this.$http
-                .get('/applets/carorder/findbyid', {
-                    carOrderId: this.$mp.query.orderId
-                })
-                .then(res => {
-                    this.info = res.data;
-                    console.log(this.info);
-                });
-        }
-    }
-};
-</script>
-<style lang="less">
-page {
-    background: @bg2;
-}
-
-.btnList {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    display: flex;
-
-    ._van-button {
-        flex-grow: 1;
-    }
-    .van-button {
-        height: 55px;
-    }
-}
-</style>
-<style lang="less" scoped>
-.orderDetail {
-    padding: 15px;
-}
-
-.btn {
-    height: 55px;
-}
-.card {
-    border: 1px solid #ebebeb;
-    border-radius: 5px;
-    background: #ffffff;
-    box-shadow: 0 0 10px 2px #ebebeb;
-    padding: 0 10px;
-}
-
-.hr {
-    height: 1px;
-    background: #ebebeb;
-}
-.card + .card {
-    margin-top: 10px;
-}
-
-.orderTop {
-    font-size: 18px;
-    color: #000000;
-    line-height: 47px;
-    font-weight: bold;
-    display: flex;
-    justify-content: space-between;
-}
-.content {
-    padding: 5px 0 10px;
-}
-.order-item {
-    font-size: 12px;
-    color: #707070;
-    line-height: 18px;
-    padding: 5px 0;
-}
-
-.cardName {
-    font-size: 13px;
-    font-weight: bold;
-    color: #333333;
-    line-height: 42px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.orderName {
-    font-size: 18px;
-    color: #000000;
-    line-height: 17px;
-    padding-top: 20px;
-}
-
-.orderSub {
-    font-size: 12px;
-    color: #868686;
-    line-height: 18px;
-    padding-top: 15px;
-}
-
-.orderMoneySub {
-    font-size: 13px;
-    font-weight: bold;
-    color: #6e6e76;
-    line-height: 16px;
-    padding-top: 13px;
-}
-
-.orderMoney {
-    font-size: 18px;
-    font-weight: bold;
-    color: #333333;
-    line-height: 20px;
-    padding-top: 10px;
-}
-
-.showMore {
-    font-size: 13px;
-    color: #00a29a;
-    line-height: 18px;
-    padding-top: 18px;
-    padding-bottom: 20px;
-}
-.info-content {
-    padding: 20px 0;
-}
-.info-item {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .name {
-        font-size: 13px;
-        color: #6e6e76;
-        line-height: 30px;
-    }
-
-    .val {
-        font-size: 15px;
-        color: #333333;
-        line-height: 30px;
-    }
-}
-.payType {
-    font-size: 13px;
-    font-weight: bold;
-    color: #00a29a;
-    line-height: 36px;
-}
-</style>
+<config>
+{
+	'navigationBarTitleText': '订单详情',
+}
+</config>
+<template>
+    <div class="orderDetail">
+        <div class="card">
+            <div class="orderTop">
+                <span>订单状态:</span>
+                <span>{{ statusText }}</span>
+            </div>
+            <div class="hr"></div>
+            <div class="content">
+                <div class="order-item">
+                    订单编号:<span>{{ info.code }}</span>
+                </div>
+                <div class="order-item">
+                    订单日期:<span>{{ info.createTime }}</span>
+                </div>
+            </div>
+        </div>
+        <div class="card">
+            <div class="cardName">车辆配置</div>
+
+            <van-image width="100%" height="323" :src="car.mobileUrl" />
+
+            <div class="orderName">
+                {{ car.name }}
+            </div>
+            <div class="orderSub">
+                {{ text }}
+            </div>
+            <div class="orderMoneySub">总价: {{ totalPrice }}</div>
+            <div class="orderMoney">订金: {{ depositPrice }}</div>
+            <div class="showMore" @click.stop="toConfigurationInfo">
+                点击查看配置详情
+            </div>
+        </div>
+        <div class="card">
+            <div class="cardName">车主信息</div>
+            <div class="hr"></div>
+            <div class="info-content">
+                <div class="info-item">
+                    <span class="name">姓名:</span>
+                    <span class="val">{{ info.name }}</span>
+                </div>
+
+                <div class="info-item">
+                    <span class="name"> 手机号:</span>
+                    <span class="val">{{ info.mobile }}</span>
+                </div>
+
+                <div class="info-item">
+                    <span class="name"> 取车城市:</span>
+                    <span class="val">{{ info.pickCity }}</span>
+                </div>
+
+                <div class="info-item">
+                    <span class="name">经销商:</span>
+                    <span class="val">{{ info.carSupplier }}</span>
+                </div>
+            </div>
+        </div>
+
+        <div class="card">
+            <div class="cardName">
+                <span>付款信息</span>
+                <span class="payType">{{ info.payType == '1' ? '全款购车' : '仅供参考' }}</span>
+            </div>
+            <div class="hr"></div>
+            <div class="info-content">
+                <div class="info-item" v-if="info.payType === '1'">
+                    <span class="name"> 全款金额:</span>
+                    <span class="val">{{ totalPrice }}</span>
+                </div>
+
+                <template v-else-if="info.payType === '2'">
+                    <div class="info-item">
+                        <span class="name">贷款方案:</span>
+                        <span class="val">{{ info.loanInstalmentCount }}期</span>
+                    </div>
+
+                    <div class="info-item">
+                        <span class="name"> 首付款:</span>
+                        <span class="val">{{ downPaymentPrice }} </span>
+                    </div>
+
+                    <div class="info-item">
+                        <span class="name"> 贷款总额:</span>
+                        <span class="val">{{ loanPrice }} </span>
+                    </div>
+
+                    <div class="info-item">
+                        <span class="name">月供金额:</span>
+                        <span class="val">{{ monthlyInstallmentPaymentPrice }}</span>
+                    </div>
+                </template>
+            </div>
+        </div>
+        <div class="btn"></div>
+        <div class="btnList">
+            <template v-if="info.status === '1'">
+                <van-button block @click="cancelOrder" square color="#000">取消订单</van-button>
+                <van-button @click="toPay" block square :color="$colors.prim">支付订金</van-button>
+            </template>
+            <template v-else-if="info.status === '2'">
+                <van-button block @click="toPay" square :color="$colors.prim" v-if="info.payType === '1'"
+                    >支付尾款</van-button
+                >
+                <template v-else-if="info.payType === '2'">
+                    <van-button
+                        @click="discloseInformation"
+                        square
+                        block
+                        :color="$colors.prim"
+                        v-if="info.canFillLoanData"
+                        >提交贷款资料</van-button
+                    >
+                    <van-button
+                        @click="toPay"
+                        square
+                        block
+                        :color="$colors.prim"
+                        v-if="!info.backOrdering && '5' === info.loanStatus"
+                        >支付首付</van-button
+                    >
+                </template>
+            </template>
+
+            <van-button @click="toBackMoeny" block square color="#000" v-if="info.canBackDeposit">退订金</van-button>
+        </div>
+    </div>
+</template>
+<script>
+import Order from '../../mixins/Order';
+export default {
+    data() {
+        return {
+            info: {}
+        };
+    },
+    mixins: [Order],
+    onShow() {
+        if (this.$mp.query.orderId) {
+            this.$http
+                .get('/applets/carorder/findbyid', {
+                    carOrderId: this.$mp.query.orderId
+                })
+                .then(res => {
+                    this.info = res.data;
+                    console.log(this.info);
+                });
+        }
+    }
+};
+</script>
+<style lang="less">
+page {
+    background: @bg2;
+}
+
+.btnList {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+
+    ._van-button {
+        flex-grow: 1;
+    }
+    .van-button {
+        height: 55px;
+    }
+}
+</style>
+<style lang="less" scoped>
+.orderDetail {
+    padding: 15px;
+}
+
+.btn {
+    height: 55px;
+}
+.card {
+    border: 1px solid #ebebeb;
+    border-radius: 5px;
+    background: #ffffff;
+    box-shadow: 0 0 10px 2px #ebebeb;
+    padding: 0 10px;
+}
+
+.hr {
+    height: 1px;
+    background: #ebebeb;
+}
+.card + .card {
+    margin-top: 10px;
+}
+
+.orderTop {
+    font-size: 18px;
+    color: #000000;
+    line-height: 47px;
+    font-weight: bold;
+    display: flex;
+    justify-content: space-between;
+}
+.content {
+    padding: 5px 0 10px;
+}
+.order-item {
+    font-size: 12px;
+    color: #707070;
+    line-height: 18px;
+    padding: 5px 0;
+}
+
+.cardName {
+    font-size: 13px;
+    font-weight: bold;
+    color: #333333;
+    line-height: 42px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.orderName {
+    font-size: 18px;
+    color: #000000;
+    line-height: 17px;
+    padding-top: 20px;
+}
+
+.orderSub {
+    font-size: 12px;
+    color: #868686;
+    line-height: 18px;
+    padding-top: 15px;
+}
+
+.orderMoneySub {
+    font-size: 13px;
+    font-weight: bold;
+    color: #6e6e76;
+    line-height: 16px;
+    padding-top: 13px;
+}
+
+.orderMoney {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333333;
+    line-height: 20px;
+    padding-top: 10px;
+}
+
+.showMore {
+    font-size: 13px;
+    color: #00a29a;
+    line-height: 18px;
+    padding-top: 18px;
+    padding-bottom: 20px;
+}
+.info-content {
+    padding: 20px 0;
+}
+.info-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .name {
+        font-size: 13px;
+        color: #6e6e76;
+        line-height: 30px;
+    }
+
+    .val {
+        font-size: 15px;
+        color: #333333;
+        line-height: 30px;
+    }
+}
+.payType {
+    font-size: 13px;
+    font-weight: bold;
+    color: #00a29a;
+    line-height: 36px;
+}
+</style>

+ 16 - 16
src/pages/order/orderList.vue

@@ -1,16 +1,16 @@
-<config>
-{
-'navigationBarTitleText': 'COUPE订单',
-}
-</config>
-<template>
-    <div></div>
-</template>
-<script>
-export default {
-    data() {
-        return {};
-    },
-    onShow() {}
-};
-</script>
+<config>
+{
+'navigationBarTitleText': 'COUPE订单',
+}
+</config>
+<template>
+    <div></div>
+</template>
+<script>
+export default {
+    data() {
+        return {};
+    },
+    onShow() {}
+};
+</script>

+ 97 - 97
src/pages/order/orderListCoupe.vue

@@ -1,97 +1,97 @@
-<config>
-{
-	'navigationBarTitleText': 'COUPE订单',
-	'enablePullDownRefresh':true
-}
-</config>
-
-<template>
-    <div class="order">
-        <van-sticky>
-            <van-tabs
-                :active="active"
-                :color="$colors.prim"
-                line-height="2px"
-                @change="active = $event.detail.name"
-                tab-active-class="activeTab"
-                tab-class="tab"
-            >
-                <van-tab :title="item.name" v-for="item in types" :key="item.payType"></van-tab>
-            </van-tabs>
-        </van-sticky>
-
-        <div class="loading" v-if="loading">
-            <van-loading size="24px">加载中...</van-loading>
-        </div>
-
-        <van-empty description="无数据" v-if="empty" />
-
-        <div class="list">
-            <order-card
-                v-for="item in list"
-                :key="item.id"
-                :backInfo="item"
-                :isBack="active === 2"
-                :info="active !== 2 ? item : item.carOrder"
-            ></order-card>
-        </div>
-    </div>
-</template>
-<script>
-import OrderList from '../../mixins/OrderList';
-import OrderCard from '../../components/OrderCard.vue';
-export default {
-    mixins: [OrderList],
-    data() {
-        return {
-            active: 2,
-            types: [
-                { name: '贷款订单', payType: '2', url: '/applets/carorder/findmycarorderlist' },
-                { name: '全款订单', payType: '1', url: '/applets/carorder/findmycarorderlist' },
-                { name: '退订订单', payType: '', url: '/applets/backorder/querycarbckorderlist' }
-            ]
-        };
-    },
-    computed: {
-        queryData() {
-            return {
-                payType: this.types[this.active].payType
-            };
-        },
-        url() {
-            return this.types[this.active].url;
-        }
-    },
-    components: {
-        'order-card': OrderCard
-    }
-};
-</script>
-
-<style lang="less">
-.order {
-    .tab {
-        color: #666666;
-        font-weight: bold;
-        font-size: 15px;
-
-        &.activeTab {
-            color: @prim;
-        }
-    }
-}
-
-.loading {
-    padding: 10px;
-    display: flex;
-    justify-content: center;
-}
-
-.list {
-    padding: 15px;
-
-    .orderCard + .orderCard {
-        margin-top: 15px;
-    }
-}
-</style>
+<config>
+{
+	'navigationBarTitleText': 'COUPE订单',
+	'enablePullDownRefresh':true
+}
+</config>
+
+<template>
+    <div class="order">
+        <van-sticky>
+            <van-tabs
+                :active="active"
+                :color="$colors.prim"
+                line-height="2px"
+                @change="active = $event.detail.name"
+                tab-active-class="activeTab"
+                tab-class="tab"
+            >
+                <van-tab :title="item.name" v-for="item in types" :key="item.payType"></van-tab>
+            </van-tabs>
+        </van-sticky>
+
+        <div class="loading" v-if="loading">
+            <van-loading size="24px">加载中...</van-loading>
+        </div>
+
+        <van-empty description="无数据" v-if="empty" />
+
+        <div class="list">
+            <order-card
+                v-for="item in list"
+                :key="item.id"
+                :backInfo="item"
+                :isBack="active === 2"
+                :info="active !== 2 ? item : item.carOrder"
+            ></order-card>
+        </div>
+    </div>
+</template>
+<script>
+import OrderList from '../../mixins/OrderList';
+import OrderCard from '../../components/OrderCard.vue';
+export default {
+    mixins: [OrderList],
+    data() {
+        return {
+            active: 2,
+            types: [
+                { name: '贷款订单', payType: '2', url: '/applets/carorder/findmycarorderlist' },
+                { name: '全款订单', payType: '1', url: '/applets/carorder/findmycarorderlist' },
+                { name: '退订订单', payType: '', url: '/applets/backorder/querycarbckorderlist' }
+            ]
+        };
+    },
+    computed: {
+        queryData() {
+            return {
+                payType: this.types[this.active].payType
+            };
+        },
+        url() {
+            return this.types[this.active].url;
+        }
+    },
+    components: {
+        'order-card': OrderCard
+    }
+};
+</script>
+
+<style lang="less">
+.order {
+    .tab {
+        color: #666666;
+        font-weight: bold;
+        font-size: 15px;
+
+        &.activeTab {
+            color: @prim;
+        }
+    }
+}
+
+.loading {
+    padding: 10px;
+    display: flex;
+    justify-content: center;
+}
+
+.list {
+    padding: 15px;
+
+    .orderCard + .orderCard {
+        margin-top: 15px;
+    }
+}
+</style>

+ 177 - 177
src/pages/order/transparent.vue

@@ -1,177 +1,177 @@
-<config>
-{
-'navigationBarTitleText': '生产状态',
-"usingComponents": {
-  "van-steps": "../../vant/steps/index"
-}
-}
-</config>
-<template>
-    <div class="info">
-        <div class="card">
-            <div class="cardTop">订单编号:{{ orderNo }}</div>
-
-            <div class="steps">
-                <div class="step-info" v-for="(item, index) in steps" :key="index">
-                    <div class="step-name">
-                        {{ item.text }}
-                        <span>已完成</span>
-                    </div>
-
-                    <div class="step-imgs">
-                        <div
-                            @click="showIndex(imgIndex, item.imgs)"
-                            v-for="(img, imgIndex) in item.imgs"
-                            :key="imgIndex"
-                            class="imgBox"
-                        >
-                            <van-image width="70" height="70" fit="cover" :src="img" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            orderNo: '',
-            steps: [
-                {
-                    text: '生产零部件准备',
-                    imgs: [
-                        'http://shopimg.jetour.com.cn/20190831/1567214392516.jpg',
-                        'http://shopimg.jetour.com.cn/20190831/1567214392516.jpg',
-                        'http://shopimg.jetour.com.cn/20190831/1567214392516.jpg'
-                    ]
-                },
-                {
-                    text: '生产计划导入',
-                    imgs: ['http://shopimg.jetour.com.cn/20190831/1567214392516.jpg']
-                },
-                {
-                    text: '焊装',
-                    imgs: ['http://shopimg.jetour.com.cn/20190831/1567214392516.jpg']
-                }
-            ]
-        };
-    },
-    onShow() {
-        if (this.$mp.query.orderNo) {
-            this.orderNo = this.$mp.query.orderNo;
-        }
-    },
-    methods: {
-        showIndex(index, imgs) {
-            wx.previewImage({
-                current: imgs[index], // 当前显示图片的http链接
-                urls: imgs // 需要预览的图片http链接列表
-            });
-        }
-    }
-};
-</script>
-<style lang="less">
-page {
-    background: @bg2;
-}
-
-.info {
-    padding: 15px;
-}
-
-.card {
-    border: 1px solid #ebebeb;
-    border-radius: 5px;
-    background: #ffffff;
-    box-shadow: 0 0 10px 2px #ebebeb;
-    padding: 15px 10px;
-}
-
-.cardTop {
-    font-size: 10px;
-    color: #6e6e76;
-    line-height: 24px;
-    padding-bottom: 11px;
-    border-bottom: 1px solid #ececec;
-}
-
-.shouhuo {
-    display: flex;
-    align-items: center;
-    padding: 10px 20px 0 0;
-    .box {
-        width: 33px;
-        height: 33px;
-        background: #c0c0c0;
-        border: 1px solid #ffffff;
-        border-radius: 50%;
-
-        font-size: 13px;
-        font-weight: bold;
-        color: #ffffff;
-        line-height: 33px;
-        text-align: center;
-    }
-
-    .name {
-        font-size: 13px;
-        color: #343434;
-        line-height: 15px;
-        margin-left: 7px;
-    }
-}
-
-.step-info {
-    position: relative;
-    padding: 15px 30px;
-    &:not(:last-child) {
-        &::before {
-            content: '';
-            width: 1px;
-            height: 100%;
-            position: absolute;
-            top: 28px;
-            left: 9.5px;
-            background-color: #c0c0c0;
-        }
-    }
-
-    .step-name {
-        font-size: 13px;
-        color: #343434;
-        line-height: 15px;
-        position: relative;
-
-        span {
-            font-size: 10px;
-            color: #9a9a9a;
-            line-height: 15px;
-            margin-left: 10px;
-        }
-
-        &::before {
-            content: '';
-            position: absolute;
-            top: 5px;
-            left: -25px;
-            width: 10px;
-            height: 10px;
-            background: #00a29a;
-            border-radius: 100%;
-        }
-    }
-}
-
-.step-imgs {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    .imgBox {
-        flex-shrink: 0;
-        margin-left: 10px;
-    }
-}
-</style>
+<config>
+{
+'navigationBarTitleText': '生产状态',
+"usingComponents": {
+  "van-steps": "../../vant/steps/index"
+}
+}
+</config>
+<template>
+    <div class="info">
+        <div class="card">
+            <div class="cardTop">订单编号:{{ orderNo }}</div>
+
+            <div class="steps">
+                <div class="step-info" v-for="(item, index) in steps" :key="index">
+                    <div class="step-name">
+                        {{ item.text }}
+                        <span>已完成</span>
+                    </div>
+
+                    <div class="step-imgs">
+                        <div
+                            @click="showIndex(imgIndex, item.imgs)"
+                            v-for="(img, imgIndex) in item.imgs"
+                            :key="imgIndex"
+                            class="imgBox"
+                        >
+                            <van-image width="70" height="70" fit="cover" :src="img" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            orderNo: '',
+            steps: [
+                {
+                    text: '生产零部件准备',
+                    imgs: [
+                        'http://shopimg.jetour.com.cn/20190831/1567214392516.jpg',
+                        'http://shopimg.jetour.com.cn/20190831/1567214392516.jpg',
+                        'http://shopimg.jetour.com.cn/20190831/1567214392516.jpg'
+                    ]
+                },
+                {
+                    text: '生产计划导入',
+                    imgs: ['http://shopimg.jetour.com.cn/20190831/1567214392516.jpg']
+                },
+                {
+                    text: '焊装',
+                    imgs: ['http://shopimg.jetour.com.cn/20190831/1567214392516.jpg']
+                }
+            ]
+        };
+    },
+    onShow() {
+        if (this.$mp.query.orderNo) {
+            this.orderNo = this.$mp.query.orderNo;
+        }
+    },
+    methods: {
+        showIndex(index, imgs) {
+            wx.previewImage({
+                current: imgs[index], // 当前显示图片的http链接
+                urls: imgs // 需要预览的图片http链接列表
+            });
+        }
+    }
+};
+</script>
+<style lang="less">
+page {
+    background: @bg2;
+}
+
+.info {
+    padding: 15px;
+}
+
+.card {
+    border: 1px solid #ebebeb;
+    border-radius: 5px;
+    background: #ffffff;
+    box-shadow: 0 0 10px 2px #ebebeb;
+    padding: 15px 10px;
+}
+
+.cardTop {
+    font-size: 10px;
+    color: #6e6e76;
+    line-height: 24px;
+    padding-bottom: 11px;
+    border-bottom: 1px solid #ececec;
+}
+
+.shouhuo {
+    display: flex;
+    align-items: center;
+    padding: 10px 20px 0 0;
+    .box {
+        width: 33px;
+        height: 33px;
+        background: #c0c0c0;
+        border: 1px solid #ffffff;
+        border-radius: 50%;
+
+        font-size: 13px;
+        font-weight: bold;
+        color: #ffffff;
+        line-height: 33px;
+        text-align: center;
+    }
+
+    .name {
+        font-size: 13px;
+        color: #343434;
+        line-height: 15px;
+        margin-left: 7px;
+    }
+}
+
+.step-info {
+    position: relative;
+    padding: 15px 30px;
+    &:not(:last-child) {
+        &::before {
+            content: '';
+            width: 1px;
+            height: 100%;
+            position: absolute;
+            top: 28px;
+            left: 9.5px;
+            background-color: #c0c0c0;
+        }
+    }
+
+    .step-name {
+        font-size: 13px;
+        color: #343434;
+        line-height: 15px;
+        position: relative;
+
+        span {
+            font-size: 10px;
+            color: #9a9a9a;
+            line-height: 15px;
+            margin-left: 10px;
+        }
+
+        &::before {
+            content: '';
+            position: absolute;
+            top: 5px;
+            left: -25px;
+            width: 10px;
+            height: 10px;
+            background: #00a29a;
+            border-radius: 100%;
+        }
+    }
+}
+
+.step-imgs {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    .imgBox {
+        flex-shrink: 0;
+        margin-left: 10px;
+    }
+}
+</style>

+ 9 - 9
src/utils/AppState.js

@@ -1,9 +1,9 @@
-const statusMap = {
-    '1': '待支付订金',
-    '2': '已支付订金',
-    '3': '已完成',
-    '4': '交易关闭',
-    '5': '交易关闭'
-};
-
-export { statusMap };
+const statusMap = {
+    '1': '待支付订金',
+    '2': '已支付订金',
+    '3': '已完成',
+    '4': '交易关闭',
+    '5': '交易关闭'
+};
+
+export { statusMap };