From 28242dfaf5b8d835dc5fc208881c14c5175d8b11 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Tue, 18 Jan 2022 17:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/orderApi.js                       |  12 +
 common/css/reset.scss                  | 151 ++++++++++
 components/uni-steps/uni-steps.vue     | 268 +++++++++++++++++
 enums/index.js                         |  25 +-
 pages/enterprise-info/index.vue        |   2 +-
 pages/mine/index.vue                   |   1 +
 pages/order-detail/index.vue           | 380 ++++++++++++++++++++++++-
 pages/order-make/index.vue             |  43 ++-
 pages/test/index.vue                   |   4 +-
 static/imgs/order/customer-default.png | Bin 0 -> 14633 bytes
 static/imgs/order/location-icon.png    | Bin 0 -> 782 bytes
 static/imgs/order/status-icon.png      | Bin 0 -> 1037 bytes
 12 files changed, 868 insertions(+), 18 deletions(-)
 create mode 100644 components/uni-steps/uni-steps.vue
 create mode 100644 static/imgs/order/customer-default.png
 create mode 100644 static/imgs/order/location-icon.png
 create mode 100644 static/imgs/order/status-icon.png

diff --git a/apis/orderApi.js b/apis/orderApi.js
index 1cf50be..dab60fe 100644
--- a/apis/orderApi.js
+++ b/apis/orderApi.js
@@ -48,3 +48,15 @@ export const submitClientOrder = (data) => {
     data
   })
 }
+
+/**
+ * 获取客户订单详情
+ * @param {object} data customerOrderId
+ * @returns {Promise<object>}
+ */
+export const getClientOrderInfo = (data) => {
+  return http.get({
+    url: '/base-paper-trading/get/customer/order/details',
+    data
+  })
+}
diff --git a/common/css/reset.scss b/common/css/reset.scss
index 1ce1f6c..8aabfea 100644
--- a/common/css/reset.scss
+++ b/common/css/reset.scss
@@ -45,3 +45,154 @@ button::after {
   clear: both;
   visibility: hidden;
 }
+
+.flex-row-start-start {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.flex-row-start-center {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: center;
+}
+.flex-row-start-end {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: flex-end;
+}
+.flex-row-start-space {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.flex-row-center-start {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+}
+.flex-row-center-center {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+.flex-row-center-end {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-end;
+}
+.flex-row-center-space {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+.flex-row-end-start {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: flex-start;
+}
+.flex-row-end-center {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: center;
+}
+.flex-row-end-end {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+.flex-row-end-space {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: space-between;
+}
+
+.flex-col-start-start {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.flex-col-start-center {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+}
+.flex-col-start-end {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-end;
+}
+.flex-col-start-space {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.flex-col-center-start {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+}
+.flex-col-center-center {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.flex-col-center-end {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-end;
+}
+.flex-col-center-space {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+}
+.flex-col-end-start {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: flex-start;
+}
+.flex-col-end-center {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
+}
+.flex-col-end-end {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+.flex-col-end-space {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: space-between;
+}
+
+.flex-base {
+  flex-grow: 0;
+  flex-shrink: 0;
+}
diff --git a/components/uni-steps/uni-steps.vue b/components/uni-steps/uni-steps.vue
new file mode 100644
index 0000000..1345761
--- /dev/null
+++ b/components/uni-steps/uni-steps.vue
@@ -0,0 +1,268 @@
+<template>
+  <view class="uni-steps">
+    <view :class="[direction === 'column' ? 'uni-steps__column' : 'uni-steps__row']">
+      <view :class="[direction === 'column' ? 'uni-steps__column-container' : 'uni-steps__row-container']">
+        <view :class="[direction === 'column' ? 'uni-steps__column-line-item' : 'uni-steps__row-line-item']" v-for="(item, index) in options" :key="index">
+          <view
+            :class="[
+              direction === 'column' ? 'uni-steps__column-line' : 'uni-steps__row-line',
+              direction === 'column' ? 'uni-steps__column-line--before' : 'uni-steps__row-line--before'
+            ]"
+            :style="{ backgroundColor: index <= active && index !== 0 ? activeColor : index === 0 ? 'transparent' : deactiveColor }"
+          ></view>
+          <view :class="[direction === 'column' ? 'uni-steps__column-check' : 'uni-steps__row-check']" v-if="index === active">
+            <uni-icons :color="activeColor" type="checkbox-filled" size="14"></uni-icons>
+          </view>
+          <view
+            :class="[direction === 'column' ? 'uni-steps__column-circle' : 'uni-steps__row-circle']"
+            v-else
+            :style="{ backgroundColor: index < active ? activeColor : deactiveColor }"
+          ></view>
+          <view
+            :class="[
+              direction === 'column' ? 'uni-steps__column-line' : 'uni-steps__row-line',
+              direction === 'column' ? 'uni-steps__column-line--after' : 'uni-steps__row-line--after'
+            ]"
+            :style="{
+              backgroundColor: index < active && index !== options.length - 1 ? activeColor : index === options.length - 1 ? 'transparent' : deactiveColor
+            }"
+          ></view>
+        </view>
+      </view>
+      <view :class="[direction === 'column' ? 'uni-steps__column-text-container' : 'uni-steps__row-text-container']">
+        <view v-for="(item, index) in options" :key="index" :class="[direction === 'column' ? 'uni-steps__column-text' : 'uni-steps__row-text']">
+          <text
+            :style="{ color: index <= active ? activeColor : deactiveColor }"
+            :class="[direction === 'column' ? 'uni-steps__column-title' : 'uni-steps__row-title']"
+          >
+            {{ item.title }}
+          </text>
+          <text
+            :style="{ color: index <= active ? activeColor : deactiveColor }"
+            :class="[direction === 'column' ? 'uni-steps__column-desc' : 'uni-steps__row-desc']"
+          >
+            {{ item.desc }}
+          </text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+// import uniIcons from '../uni-icons/uni-icons.vue'
+export default {
+  name: 'UniSteps',
+  // components: {
+  // 	uniIcons
+  // },
+  props: {
+    direction: {
+      // 排列方向 row column
+      type: String,
+      default: 'row'
+    },
+    activeColor: {
+      // 激活状态颜色
+      type: String,
+      default: '#1aad19'
+    },
+    deactiveColor: {
+      // 未激活状态颜色
+      type: String,
+      default: '#999999'
+    },
+    active: {
+      // 当前步骤
+      type: Number,
+      default: 0
+    },
+    options: {
+      type: Array,
+      default() {
+        return []
+      }
+    } // 数据
+  },
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.uni-steps {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  width: 100%;
+  /* #endif */
+  /* #ifdef APP-NVUE */
+  flex: 1;
+  /* #endif */
+  flex-direction: column;
+}
+
+.uni-steps__row {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+}
+
+.uni-steps__column {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  // flex-direction: row-reverse;
+}
+
+.uni-steps__row-text-container {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+}
+
+.uni-steps__column-text-container {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  flex: 1;
+}
+
+.uni-steps__row-text {
+  /* #ifndef APP-NVUE */
+  display: inline-flex;
+  /* #endif */
+  flex: 1;
+  flex-direction: column;
+}
+
+.uni-steps__column-text {
+  padding: 6px 0px;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  border-bottom-color: $uni-border-color;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+}
+
+.uni-steps__row-title {
+  font-size: $uni-font-size-base;
+  line-height: 16px;
+  text-align: center;
+}
+
+.uni-steps__column-title {
+  font-size: $uni-font-size-base;
+  text-align: left;
+  line-height: 18px;
+}
+
+.uni-steps__row-desc {
+  font-size: 12px;
+  line-height: 14px;
+  text-align: center;
+}
+
+.uni-steps__column-desc {
+  font-size: $uni-font-size-sm;
+  text-align: left;
+  line-height: 18px;
+}
+
+.uni-steps__row-container {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+}
+
+.uni-steps__column-container {
+  /* #ifndef APP-NVUE */
+  display: inline-flex;
+  /* #endif */
+  width: 30px;
+  flex-direction: column;
+}
+
+.uni-steps__row-line-item {
+  /* #ifndef APP-NVUE */
+  display: inline-flex;
+  /* #endif */
+  flex-direction: row;
+  flex: 1;
+  height: 14px;
+  line-height: 14px;
+  align-items: center;
+  justify-content: center;
+}
+
+.uni-steps__column-line-item {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  flex: 1;
+  align-items: center;
+  justify-content: center;
+}
+
+.uni-steps__row-line {
+  flex: 1;
+  height: 1px;
+  background-color: $uni-text-color-grey;
+}
+
+.uni-steps__column-line {
+  width: 1px;
+  background-color: $uni-text-color-grey;
+}
+
+.uni-steps__row-line--after {
+  transform: translateX(1px);
+}
+
+.uni-steps__column-line--after {
+  flex: 1;
+  transform: translate(0px, 1px);
+}
+
+.uni-steps__row-line--before {
+  transform: translateX(-1px);
+}
+
+.uni-steps__column-line--before {
+  height: 6px;
+  transform: translate(0px, -1px);
+}
+
+.uni-steps__row-circle {
+  width: 5px;
+  height: 5px;
+  border-radius: 100px;
+  background-color: $uni-text-color-grey;
+  margin: 0px 3px;
+}
+
+.uni-steps__column-circle {
+  width: 5px;
+  height: 5px;
+  border-radius: 100px;
+  background-color: $uni-text-color-grey;
+  margin: 4px 0px 5px 0px;
+}
+
+.uni-steps__row-check {
+  margin: 0px 6px;
+}
+
+.uni-steps__column-check {
+  height: 14px;
+  line-height: 14px;
+  margin: 2px 0px;
+}
+</style>
diff --git a/enums/index.js b/enums/index.js
index 1c06a7f..b13be86 100644
--- a/enums/index.js
+++ b/enums/index.js
@@ -176,18 +176,35 @@ export const supplierOrderStatusEnum = {
   REPAYING: 30216,
   CANCELED: 30212
 }
-
+/**
+ * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 已发货在H5客户端显示 待收货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
+ */
 export const supplierOrderStatusMap = {
   [supplierOrderStatusEnum.WAIT_CLIENT_CONFIRM]: '待客户确认',
   [supplierOrderStatusEnum.WAIT_SUPPLIER_CONFIRM]: '待供应商确认',
   [supplierOrderStatusEnum.WAIT_DELIVERY]: '待发货',
   [supplierOrderStatusEnum.WAIT_RECEIVE]: '待收货',
-  [supplierOrderStatusEnum.WAIT_CLIENT_LOAN]: '待客户借款',
+  [supplierOrderStatusEnum.WAIT_CLIENT_LOAN]: '待借款',
   [supplierOrderStatusEnum.PAYING]: '支付中',
-  [supplierOrderStatusEnum.WAIT_CLIENT_PAY]: '待客户支付',
+  [supplierOrderStatusEnum.WAIT_CLIENT_PAY]: '待支付',
   [supplierOrderStatusEnum.PAY_FAIL]: '付款失败',
   [supplierOrderStatusEnum.FINISHED]: '已完成',
-  [supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待客户还款',
+  [supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待还款',
   [supplierOrderStatusEnum.REPAYING]: '还款中',
   [supplierOrderStatusEnum.CANCELED]: '已取消'
 }
+
+/**
+ * 支付方式 1:微信支付 2:月结支付 4:飞算支付
+ */
+export const paymentMethodEnum = {
+  WECHAT_PAY: 1,
+  MONTHLY_PAY: 2,
+  FLY_PAY: 4
+}
+
+export const paymentMethodMap = {
+  [paymentMethodEnum.WECHAT_PAY]: '微信支付',
+  [paymentMethodEnum.MONTHLY_PAY]: '月结支付',
+  [paymentMethodEnum.FLY_PAY]: '飞算支付'
+}
diff --git a/pages/enterprise-info/index.vue b/pages/enterprise-info/index.vue
index 46e3b25..c5f20a3 100644
--- a/pages/enterprise-info/index.vue
+++ b/pages/enterprise-info/index.vue
@@ -281,7 +281,7 @@ export default {
         } else {
           uni.showToast({
             title: '暂无定位公司',
-            icon: 'warn'
+            icon: 'error'
           })
         }
       })
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 0e00aa5..491105f 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -110,6 +110,7 @@
       </view>
     </view>
     <view @click="loginGo2('test')">test</view>
+    <view @click="loginGo2('order-detail')">order-detail</view>
     <view @click="loginGo2('enterprise-info')">enterprise-info</view>
   </view>
 </template>
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index a464a99..290c9d4 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -1,20 +1,394 @@
 <template>
   <view>
     <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="订单详情"></uni-nav-bar>
+    <view class="status-area flex-row-center-start">
+      <image class="flex-base" style="width: 40rpx; height: 40rpx; margin-right: 16rpx" src="/static/imgs/order/status-icon.png"></image>
+      <text style="font-size: 30rpx; color: #ffffff">{{ statusImg[orderInfo.status] }}</text>
+    </view>
+    <view class="address-area">
+      <view class="flex-row-start-start" style="padding: 24rpx 0 40rpx">
+        <image class="flex-base" style="width: 100rpx; height: 100rpx; margin-right: 20rpx" src="/static/imgs/order/customer-default.png"></image>
+        <view class="flex-col-start-start">
+          <text style="font-size: 30rpx; color: #333333; font-weight: 600">{{ orderInfo.customerEnterpriseName }}</text>
+          <text style="font-size: 26rpx; color: #333333; margin-top: 26rpx">
+            联系人: {{ `${orderInfo.deliveryAddress.receiver} ${orderInfo.deliveryAddress.receiverMobile}` }}
+          </text>
+        </view>
+      </view>
+      <view class="flex-row-start-start footer">
+        <image style="width: 32rpx; height: 32rpx; margin-right: 10rpx" src="/static/imgs/order/location-icon.png"></image>
+        <text style="font-size: 26rpx; color: #333333; word-break: break-all">{{ transformAddress(orderInfo.deliveryAddress) }}</text>
+      </view>
+    </view>
+    <view class="order-area" v-for="(supplierOrder, index) in orderInfo.supplierOrder" :key="supplierOrder.supplierOrderId">
+      <view class="flex-row-center-space header">
+        <text style="font-size: 32rpx; font-weight: 600">{{ supplierOrder.supplierEnterpriseName }}</text>
+        <view>
+          <!-- 待收货展示 -->
+          <view v-if="supplierOrder.status == supplierOrderStatusEnum.WAIT_RECEIVE" class="button-item" @click="confirmReceive(supplierOrder)">确认收货</view>
+          <!-- 待借款展示 -->
+          <view v-if="supplierOrder.status == supplierOrderStatusEnum.WAIT_CLIENT_LOAN" class="button-item" @click="goBorrowing(supplierOrder)">去借款</view>
+          <!-- 飞算支付且待还款状态 -->
+          <view
+            v-if="orderInfo.paymentMethod == paymentMethodEnum.FLY_PAY && supplierOrder.status == supplierOrderStatusEnum.WAIT_CLIENT_REPAY"
+            class="button-item"
+            @click="goRepaying(supplierOrder)"
+          >
+            去借款
+          </view>
+          <text v-else style="font-size: 30rpx; color: #ff5368; font-weight: 600">{{ supplierOrderStatusMap[supplierOrder.status] }}</text>
+        </view>
+      </view>
+      <view v-for="order in supplierOrder.orderItems" :key="order.productId">
+        <view style="background-color: #fff; padding-bottom: 20rpx">
+          <view class="order-header flex-row-start-space">
+            <text style="font-size: 30rpx; font-weight: 600">
+              {{ `${order.brandName}${order.productName} | ${order.gramWeight}g | ${order.width}*${order.length} | ${order.pieceQuantity}张` }}
+            </text>
+          </view>
+          <view class="order-row flex-row-center-space">
+            <text>重量(吨):</text>
+            <text>{{ order.buyTon }}</text>
+          </view>
+          <view class="order-row flex-row-center-space">
+            <text>单价(元/吨):</text>
+            <text>{{ order.unitPrice }}</text>
+          </view>
+          <view class="order-row flex-row-center-space">
+            <text>小计(元):</text>
+            <text>{{ order.subtotal }}</text>
+          </view>
+          <view class="order-row flex-row-center-space" style="margin: 0">
+            <text>备注信息:{{ order.remark }}</text>
+          </view>
+        </view>
+        <view style="padding: 24rpx 10rpx">
+          <uni-steps
+            :options="transformStep(order.outboundProcessList)"
+            active-color="#1890FF"
+            :active="order.outboundProcessList.length > 0 ? order.outboundProcessList.length : -1"
+          ></uni-steps>
+        </view>
+      </view>
+      <!-- 送货凭证 -->
+      <view v-if="showSendImgs(supplierOrder.status)" class="footer" :style="showList.includes(`${index}_send`) ? '' : 'height:88rpx;'">
+        <view class="header flex-row-center-space">
+          <text style="font-size: 28rpx; font-weight: 600">送货凭证</text>
+          <view class="flex-row-center-end" @click="changeShowIndex(`${index}_send`)">
+            <text style="font-size: 28rpx; margin-right: 8rpx">{{ showList.includes(`${index}_send`) ? '收起' : '展开' }}</text>
+            <uni-icons :type="showList.includes(`${index}_send`) ? 'top' : 'bottom'" size="16"></uni-icons>
+          </view>
+        </view>
+        <view class="imgs flex-row-start-start">
+          <image style="width: 120rpx; height: 120rpx; margin-right: 12rpx" src=""></image>
+        </view>
+      </view>
+      <!-- 收货凭证 -->
+      <view v-if="showReceiveImgs(supplierOrder.status)" class="footer" :style="showList.includes(`${index}_receive`) ? '' : 'height:88rpx;'">
+        <view class="header flex-row-center-space">
+          <text style="font-size: 28rpx; font-weight: 600">送货凭证</text>
+          <view class="flex-row-center-end" @click="changeShowIndex(`${index}_receive`)">
+            <text style="font-size: 28rpx; margin-right: 8rpx">{{ showList.includes(`${index}_receive`) ? '收起' : '展开' }}</text>
+            <uni-icons :type="showList.includes(`${index}_receive`) ? 'top' : 'bottom'" size="16"></uni-icons>
+          </view>
+        </view>
+        <view class="imgs flex-row-start-start">
+          <image style="width: 120rpx; height: 120rpx; margin-right: 12rpx" src=""></image>
+        </view>
+      </view>
+    </view>
+    <view class="fee flex-row-center-space">
+      <text style="font-size: 28rpx; color: #555555">其他费用: ￥{{ orderInfo.otherFee || 0 }}</text>
+      <view class="flex-row-center-end">
+        <text style="font-size: 28rpx; color: #555555">合计:</text>
+        <text style="font-size: 40rpx; color: #f5222d; font-weight: 600">￥{{ orderInfo.totalOfferPrice || 0 }}</text>
+      </view>
+    </view>
+    <view class="order-footer">
+      <view class="flex-row-center-space order-row">
+        <text class="label">订单编号</text>
+        <view class="flex-row-center-end value">
+          <text>{{ orderInfo.orderId }}</text>
+          <text style="color: #007aff; margin-left: 8rpx" @click="clip(orderInfo.orderId)">复制</text>
+        </view>
+      </view>
+      <view class="flex-row-center-space order-row">
+        <text class="label">下单时间</text>
+        <text class="value">{{ orderInfo.createTime }}</text>
+      </view>
+      <view class="flex-row-center-space order-row">
+        <text class="label">交货时间</text>
+        <text class="value">{{ orderInfo.receivedTime }}</text>
+      </view>
+      <view class="flex-row-center-space order-row" style="border: none">
+        <text class="label">支付方式</text>
+        <text class="value">{{ paymentMethodMap[orderInfo.paymentMethod] || '-' }}</text>
+      </view>
+    </view>
+    <qn-footer fixed height="120rpx">
+      <view class="flex-row-center-end" style="padding: 0 32rpx">
+        <view class="button">查看合同</view>
+      </view>
+    </qn-footer>
   </view>
 </template>
 
 <script>
 import { go2, back } from '@/utils/hook.js'
+import { getClientOrderInfo } from '@/apis/orderApi.js'
+import { orderStatusEnum, supplierOrderStatusMap, supplierOrderStatusEnum, paymentMethodMap, paymentMethodEnum } from '@/enums/index.js'
+const statusImg = {
+  [orderStatusEnum.WAIT_SUPPLIER_CONFIRM]: '待供应商确认',
+  [orderStatusEnum.ORDERED]: '已下单',
+  [orderStatusEnum.FINISHED]: '已完成',
+  [orderStatusEnum.CANCELED]: '已取消'
+}
 export default {
   data() {
-    return {}
+    return {
+      orderInfo: {
+        deliveryAddress: {},
+        supplierOrder: []
+      },
+      statusImg,
+      supplierOrderStatusMap: Object.freeze(supplierOrderStatusMap),
+      paymentMethodMap: Object.freeze(paymentMethodMap),
+      supplierOrderStatusEnum: Object.freeze(supplierOrderStatusEnum),
+      paymentMethodEnum: Object.freeze(paymentMethodEnum),
+      showList: []
+    }
+  },
+  onLoad(option) {
+    if (option.orderId) {
+      getClientOrderInfo({
+        customerOrderId: option.orderId
+      }).then((res) => {
+        if (res) {
+          this.orderInfo = res
+        }
+      })
+    } else {
+      uni.showToast({
+        title: '订单信息错误',
+        icon: 'error',
+        success: () => {
+          setTimeout(() => {
+            back()
+          }, 2000)
+        }
+      })
+    }
   },
   methods: {
     go2,
-    back
+    back,
+    transformAddress(address) {
+      let res = ''
+      if (address) {
+        res = `${address.provinceName}${address.cityName}${address.districtName}${address.detail}`
+      }
+      return res
+    },
+    // 生成步骤条
+    transformStep(list) {
+      // 分切 出库 完成
+      let step1 = [],
+        step2 = [],
+        step3 = []
+      if (list && list.length > 0) {
+        list.forEach((item) => {
+          if (item.status == '30301') {
+            step1.push({
+              title: '分切',
+              desc: item.userName + '\n\r' + item.createTime
+            })
+          } else if (item.status == '30302') {
+            step2.push({
+              title: '出库',
+              desc: item.userName + item.quantity + '\n\r' + item.createTime
+            })
+          } else if (item.status == '30303') {
+            step3.push({
+              title: '完成',
+              desc: '已收货'
+            })
+          }
+        })
+      }
+      if (step1.length == 0) {
+        step1.push({
+          title: '分切',
+          desc: '未完成'
+        })
+      }
+      if (step2.length == 0) {
+        step2.push({
+          title: '出库',
+          desc: '未完成'
+        })
+      }
+      if (step3.length == 0) {
+        step3.push({
+          title: '完成',
+          desc: '未完成'
+        })
+      }
+      return [...step1, ...step2, ...step3]
+    },
+    changeShowIndex(index) {
+      let target = this.showList.indexOf(index)
+      if (target > -1) {
+        this.showList.splice(target, 1)
+      } else {
+        this.showList.push(index)
+      }
+    },
+    // 根据状态是否展示送货凭证
+    showSendImgs(status) {
+      let list = [
+        supplierOrderStatusEnum.WAIT_RECEIVE,
+        supplierOrderStatusEnum.WAIT_CLIENT_LOAN,
+        supplierOrderStatusEnum.PAYING,
+        supplierOrderStatusEnum.WAIT_CLIENT_PAY,
+        supplierOrderStatusEnum.PAY_FAIL,
+        supplierOrderStatusEnum.FINISHED,
+        supplierOrderStatusEnum.WAIT_CLIENT_REPAY,
+        supplierOrderStatusEnum.REPAYING,
+        supplierOrderStatusEnum.CANCELED
+      ]
+      return list.includes(status)
+    },
+    // 根据状态是否展示收货凭证
+    showReceiveImgs(status) {
+      let list = [
+        supplierOrderStatusEnum.WAIT_CLIENT_LOAN,
+        supplierOrderStatusEnum.PAYING,
+        supplierOrderStatusEnum.WAIT_CLIENT_PAY,
+        supplierOrderStatusEnum.PAY_FAIL,
+        supplierOrderStatusEnum.FINISHED,
+        supplierOrderStatusEnum.WAIT_CLIENT_REPAY,
+        supplierOrderStatusEnum.REPAYING,
+        supplierOrderStatusEnum.CANCELED
+      ]
+      return list.includes(status)
+    },
+    // 去借款
+    goBorrowing(order) {},
+    // 确认收货
+    confirmReceive(order) {},
+    goRepaying(order) {},
+    clip(content) {
+      uni.setClipboardData({
+        data: content,
+        success: function () {
+          uni.showToast({
+            title: '复制成功',
+            icon: 'success',
+            duration: 2000
+          })
+        }
+      })
+    }
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.status-area {
+  padding: 24rpx 32rpx;
+  width: 750rpx;
+  background-image: linear-gradient(90deg, #ff4d2e 6%, #ff952f 100%);
+}
+.address-area {
+  padding: 0 32rpx;
+  width: 750rpx;
+  background-color: #ffffff;
+  .footer {
+    padding: 24rpx 32rpx;
+    background-color: #ffffff;
+    border-top: 1px solid #e5e5e5;
+  }
+}
+.order-area {
+  .header {
+    padding: 24rpx 32rpx;
+    word-break: break-all;
+    background: #e5f1ff;
+    width: 750rpx;
+  }
+  .order-header {
+    padding: 24rpx 32rpx;
+    word-break: break-all;
+    background: #fff;
+    width: 750rpx;
+    border-bottom: 2rpx dashed #d8d8d8;
+    margin-bottom: 20rpx;
+  }
+  .order-row {
+    width: 750rpx;
+    padding: 0 32rpx;
+    margin-bottom: 18rpx;
+    font-size: 28rpx;
+    color: #555555;
+  }
+  .footer {
+    background-color: #ffffff;
+    width: 750rpx;
+    overflow: hidden;
+    margin-bottom: 20rpx;
+    .header {
+      padding: 24rpx 32rpx;
+      background-color: #fff;
+    }
+    .imgs {
+      padding: 16rpx 32rpx 32rpx;
+      min-height: 120rpx;
+    }
+  }
+}
+.fee {
+  padding: 24rpx 32rpx;
+  width: 750rpx;
+  background-color: #ffffff;
+  margin: 20rpx 0;
+}
+.order-footer {
+  padding: 0rpx 32rpx;
+  width: 750rpx;
+  background-color: #ffffff;
+  .order-row {
+    padding: 24rpx 0;
+    border-bottom: 2rpx solid #d8d8d8;
+    .label {
+      font-size: 28rpx;
+      color: #000000;
+    }
+    .value {
+      font-size: 28rpx;
+      color: #333333;
+    }
+  }
+}
+.button {
+  height: 88rpx;
+  width: 220rpx;
+  background-color: #fff;
+  line-height: 84rpx;
+  border: 1px solid #007aff;
+  border-radius: 10rpx;
+  text-align: center;
+  font-size: 30rpx;
+  color: #007aff;
+}
+.button-item {
+  padding: 0rpx 24rpx;
+  height: 42rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #007aff;
+  border-radius: 20rpx;
+  font-size: 26rpx;
+  color: #ffffff;
+}
+</style>
diff --git a/pages/order-make/index.vue b/pages/order-make/index.vue
index 707543b..ec89431 100644
--- a/pages/order-make/index.vue
+++ b/pages/order-make/index.vue
@@ -3,7 +3,7 @@
     <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="订单确认"></uni-nav-bar>
     <view class="address-area">
       <view class="header">
-        <image class="img" src="/static/imgs/order/address-icon.png"></image>
+        <image class="img" src="/static/imgs/order/customer-default.png"></image>
         <text class="text">{{ orderInfo.customerEnterpriseName }}</text>
       </view>
       <!-- 送货地址 -->
@@ -82,12 +82,15 @@
           <text v-if="payMap['month'] != null" style="font-size: 28rpx; color: #888888">剩余额度: {{ payMap['month'].availableCreditLine }}</text>
         </view>
         <image
-          v-if="payMap['month'] != null"
+          v-if="payMap['month'] != null && payMap['month'].availableCreditLine > orderInfo.totalOfferPrice"
           @click="selectPayMethod('month')"
           class="img"
           :src="currentPayType == 'month' ? '/static/imgs/order/selected-icon.png' : '/static/imgs/order/select-icon.png'"
         ></image>
-        <text v-else style="font-size: 28rpx; color: #888888">待申请</text>
+        <text v-if="payMap['month'] == null" style="font-size: 28rpx; color: #888888">待申请</text>
+        <text v-if="payMap['month'] != null && payMap['month'].availableCreditLine < orderInfo.totalOfferPrice" style="font-size: 28rpx; color: #888888">
+          余额不足
+        </text>
       </view>
       <view class="pay-item" style="border: none">
         <view class="left">
@@ -96,12 +99,15 @@
           <text v-if="payMap['fs'] != null" style="font-size: 28rpx; color: #888888">剩余额度: {{ payMap['fs'].availableCreditLine }}</text>
         </view>
         <image
-          v-if="payMap['fs'] != null"
+          v-if="payMap['fs'] != null && payMap['fs'].availableCreditLine > orderInfo.totalOfferPrice"
           @click="selectPayMethod('month')"
           class="img"
           :src="currentPayType == 'fs' ? '/static/imgs/order/selected-icon.png' : '/static/imgs/order/select-icon.png'"
         ></image>
-        <text v-else style="font-size: 28rpx; color: #888888">待申请</text>
+        <text v-if="payMap['fs'] == null" style="font-size: 28rpx; color: #888888">待申请</text>
+        <text v-if="payMap['fs'] != null && payMap['fs'].availableCreditLine < orderInfo.totalOfferPrice" style="font-size: 28rpx; color: #888888">
+          余额不足
+        </text>
       </view>
     </view>
     <qn-footer fixed height="120rpx">
@@ -130,7 +136,7 @@ export default {
         receivedTime: null
       },
       deliveryAddress: {},
-      currentPayType: '',
+      currentPayType: null,
       payMap: {
         month: {
           availableCreditLine: 0,
@@ -140,7 +146,8 @@ export default {
           availableCreditLine: 0,
           value: 4
         }
-      }
+      },
+      loading: false
     }
   },
   onLoad(option) {
@@ -155,7 +162,7 @@ export default {
     } else {
       uni.showToast({
         title: '订单信息错误',
-        icon: 'warn',
+        icon: 'error',
         success: () => {
           setTimeout(() => {
             back()
@@ -188,6 +195,10 @@ export default {
         })
         return
       }
+      if (this.loading) {
+        return
+      }
+      this.loading = true
       let itemsRemarkList = []
       // 拼接订单信息
       for (let i = 0; i < this.orderInfo.supplierOrder.length; i++) {
@@ -202,6 +213,22 @@ export default {
         paymentMethod: this.payMap[this.currentPayType].value,
         receivedTime: this.orderInfo.receivedTime
       })
+        .then((res) => {
+          if (res) {
+            uni.showToast({
+              title: '前往签约',
+              icon: 'success',
+              success: () => {
+                setTimeout(() => {
+                  window.location.href = res.signUrl
+                }, 1000)
+              }
+            })
+          }
+        })
+        .finally(() => {
+          this.loading = false
+        })
     },
     init() {
       // 获取月结额度
diff --git a/pages/test/index.vue b/pages/test/index.vue
index 59556a1..ebd908a 100644
--- a/pages/test/index.vue
+++ b/pages/test/index.vue
@@ -24,7 +24,7 @@ export default {
       })
     },
     getDetail() {
-      getPaperDetail({ productId: '678972506887032832' })
+      getPaperDetail({ productId: '680401985190629376' })
     },
     purchase() {
       let form = {
@@ -35,7 +35,7 @@ export default {
             length: 1000,
             mallSupplierId: '678289470268772352',
             pieceQuantity: 10000,
-            productId: '678972506887032832',
+            productId: '680401985190629376',
             productSkuId: '678972507222577152',
             unitPrice: 10000,
             width: 1000
diff --git a/static/imgs/order/customer-default.png b/static/imgs/order/customer-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7cf3f91a39f8bce736f369bf891276cf56cd6b7
GIT binary patch
literal 14633
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

literal 0
HcmV?d00001

diff --git a/static/imgs/order/location-icon.png b/static/imgs/order/location-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..750b4f0916cfeec62fd8b37173b521b0d19182d4
GIT binary patch
literal 782
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&Rm5z*OPs;uvBf
z*c$Bb5t1k{|L48irSo4qJyq;vdVOUf?-G0V-CJgqet4GE&Y{Sxs=YC_a4}z{#|__2
z&aRPOR~AlKyEHj9L7*f+>B2TW$4VWc<~!eOZv0+0bNk-h-W8U6e(t;f=h^pK<IlD&
z^%0*=oick``C9tW*8KI~7XLQa`p3!VJK55FbCI0mcj1F<oyw227<?x#{Kb`-z0fMX
z*WtNF<h@m&nK;WPAG*zUDVQln$+tQ};ppoXPC3;U8GCtLu5qXoe@o??llEw#)3I56
z9*=gf3#?uF#O7h@-c_5+p7}r8^uWt5$%&zfk?9oMNt27aPVOyM(EC`uyx=0s;_lP8
z7EPa<ckqZ7)3&$o9;KvCm^r<{x~`y|`yTt-mzL#=p3X^_Jag9f7_W)^k0zZ86J&Us
zE2`1<(EpL=%QU;QpRTj4eN^il!@x3M`}ch&uf4(#tatrBa@}PO)Assl=^rF{OqC+e
zOSCrpX%kD;Pn#xtSxR~RhsCj1ZtXs?xTcTu&#8@j9b^7HGEZ-CmG)^q#=NJf`A^~(
z5sCDORhf0i_Q?q_-Je(-RbkuXQm%eEa9`w2Ev8Lp)0Ki_LS|*Z_e^^msPyUh9m7X&
z)Gx6vJ9EtJ+B}Wr)Arjfl$ualeQqbilJ+00b_z$*S7i1)G{0!I+V@!G+4aESI>+nR
zWn(36`_21_h4~w`^M_Lw9@k2dJ-PhC!`VwKxZZw!z2?Z;xR|frFV5^LtYhALN1<Lw
z=|F#`(vmA>sViJ+E_itX1NC7xQ^vElUrT=kKX`JsM(RG>?#VkZ1uAy^Rp{4eFsMJt
zcC6NCGMmcJoeKgP_OoP)nP)Ye^kw>Y-r}XVMH=t@_lK9xH{0-S^S+;Xvp{Ll)78&q
Iol`;+003xJW&i*H

literal 0
HcmV?d00001

diff --git a/static/imgs/order/status-icon.png b/static/imgs/order/status-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca39c60690cc6a7da2d36f5936548b6df2c64cd6
GIT binary patch
literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91D4+uX1ONa40RR91C;$Ke0D9(TtN;K5cS%G+R9Fe^m{~|vQ5eS^OT{Q`
zp(2X3mx|C9f&^`cq#`ha7EOwFf|jSY*CKi;qJ<Ws2%!ZktcQxC(jp=X%7=m;BI_kW
zlx)E^mwx|Y?sVpQoVj<#aps{9ex7r_bH4BV=bSUgxi^r}1J>EuIg~UjpacT&1TF^x
zfkw*I7^1SE9BSY<xa|*)8?Xejdrc*iO@hPF2wts;fyZEKQiU?XNVo;<5U;%=a0iS?
zNGu7og$rStI}yGD*bko|UTY)pCM<&-_Z;1}8Eo6am-sh9e>0G_KEzVE4;>J%eJ1cE
z6r1_ObvklkE7U_Y`$p#}m>docRq&04gP`-4h`k|LN8sOL(3lNh!H+#<@EXW9#nR4!
zDtHX>+Aji^n|U*EXca3!=R#M6SJU<!fe8@_Y2Yh_<In=JOh@Dq=qL?#=Za`EU>IzJ
zXW+*)K_x^SdfNS99XtoOy~eQz@*_lq8UZ@0sSkmRP{Zxt8tMxc^pB&m5~^TK&>8zr
z6GP6!Y4W`_hm%it;abo<7wE5d^=HwZ4;9d?Z7}aNeF>_e4EneN^<hdu-?nD(V%oNQ
zP-f<`)frO)C&2uYwYde-AGVLw4#5<6LVVe<7_P!k=+1Q5ufsfd4z=-*hkfu4Y}Ou4
zpc$ZZvKvObC&D)nHb5P;!jDir>S1ThDu`tr5~ywPY8opc>mkn~HWPoQ#XkVQ1l@+<
z{YJSRVwrD&W<qW46(|QC><E(&7QrRZ$~rbk18F2(pfjP$_b|~>NWBOez-E2~cHItV
z5}&2+u$@NCF6sqFJMOB^i+%z3gpD$in03SLzuM(M`%jVFh*S#nv~wvD$Tvqnf;W0u
z`@UWV_3)U7<SX);GZic7S)4vZDg=66yx_S10(~u)Ww2JT#o|vFSMXomope!S(eXhm
zxCLHVI@7^*Hj`%pJwMEaGtia}szMs7DGz7`GZ6U&bh8)2HThC#y2$6CXEn52b?~pK
z7;3?f)j7!s(ywm6R!hJvCx@q!fCW$wUMyaL4@mA$n5mv%J#Ok%Mgv4MzXBy}ra4za
zb&}~(Q_m6Iy}0x$P;bI!BqSzUFv<0VwimvGX|+xqPTLvO1N?MnOwvmx8xDFg<h-9g
z>P(9795{BDN~zP=>m`%tgC0G@FN~<?!Dg_(knDApNu2O6E;LI%2XhwK00000NkvXX
Hu0mjfP%pPI

literal 0
HcmV?d00001