clean: remove unrelated order pages

src/store/index.js

@@ -3,7 +3,6 @@ import Vuex from 'vuex'
 import cloneDeep from 'lodash/cloneDeep'
 import common from './modules/common'
 import user from './modules/user'
-import prod from './modules/prod'
 
 Vue.use(Vuex)
 
@@ -11,11 +10,10 @@ export default new Vuex.Store({
   modules: {
     common,
     user,
-    prod
   },
   mutations: {
     // 重置vuex本地储存状态
-    resetStore (state) {
+    resetStore(state) {
       Object.keys(state).forEach((key) => {
         state[key] = cloneDeep(process.env.VUE_APP_RESOURCES_URL['storeState'][key])
       })

src/store/modules/prod.js

@@ -1,35 +0,0 @@
-export default {
-  namespaced: true,
-  state: {
-    id: 0,
-    skuTags: [],
-    defalutSku: {
-      price: 0, // 销售价
-      oriPrice: 0, // 市场价
-      stocks: 0, // 库存
-      properties: '', // 销售属性组合字符串
-      skuName: '', // sku名称
-      prodName: '', // 商品名称
-      weight: 0, // 商品重量
-      volume: 0, // 商品体积
-      status: 1 // 0 禁用 1 启用
-    }
-  },
-  mutations: {
-    updateSkuTags (state, skuTags) {
-      state.skuTags = skuTags
-    },
-    addSkuTag (state, skuTag) {
-      state.skuTags.push(skuTag)
-    },
-    removeSkuTag (state, tagIndex) {
-      state.skuTags.splice(tagIndex, 1)
-    },
-    removeSkuTagItem (state, {tagIndex, tagItemIndex}) {
-      state.skuTags[tagIndex].tagItems.splice(tagItemIndex, 1)
-    },
-    addSkuTagItem (state, {tagIndex, tagItem}) {
-      state.skuTags[tagIndex].tagItems.push(tagItem)
-    }
-  }
-}

src/utils/currency.ts

@@ -1,4 +1,4 @@
-import { toInteger, toSafeInteger } from "lodash"
+import { toInteger } from "lodash"
 
 export type DatabaseCurrency = number
 // 因为数据库表内价格是以分为单位的整数，因此在展示与请求时需要转换

src/views/modules/order/consignment-info.vue

@@ -1,81 +0,0 @@
-<template>
-  <!-- 发货信息，用于导出代发货订单的excel交给快递公司 -->
-  <el-dialog :modal="false"
-             title="请输入发货信息"
-             :close-on-click-modal="false"
-             :visible.sync="visible"
-             width="38%">
-    <el-form :model="dataForm"
-             :rules="dataRule"
-             ref="dataForm"
-             @keyup.enter.native="dataFormSubmit()"
-             label-width="120px">
-      <el-form-item label="发件人姓名"
-                    prop="consignmentName">
-        <el-input v-model="dataForm.consignmentName"
-                  controls-position="right"
-                  label="发件人姓名"></el-input>
-      </el-form-item>
-      <el-form-item label="发货人手机号"
-                    prop="consignmentMobile">
-        <el-input v-model="dataForm.consignmentMobile"
-                  controls-position="right"
-                  label="发货人手机号"></el-input>
-      </el-form-item>
-      <el-form-item label="发货地址"
-                    prop="consignmentAddr">
-        <el-input v-model="dataForm.consignmentAddr"
-                  controls-position="right"
-                  label="发货地址"></el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer"
-          class="dialog-footer">
-      <el-button size="small" @click="visible = false">取消</el-button>
-      <el-button type="primary" size = "small"
-                 @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-<script>
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        consignmentName: '',
-        consignmentMobile: '',
-        consignmentAddr: ''
-      },
-      dataRule: {
-        consignmentName: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        consignmentMobile: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        consignmentAddr: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init (orderNumber, dvyId, dvyFlowId) {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
-    },
-    // 表单提交
-    dataFormSubmit () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.visible = false
-          this.$emit('inputCallback', this.dataForm)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/modules/order/order-add-or-update.vue

@@ -1,400 +0,0 @@
-<template>
-    <el-dialog :title="!dataForm.orderId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" width="80%">
-        <div class="main">
-            <div class="content">
-                <!-- 订单编号 -->
-                <div class="order-number">
-                    <div class="num-cont">
-                        <span class="number-text">订单编号：</span>
-                        <span class="text">007007007007007</span>
-                        <div class="steps">
-                                <el-steps :active="2" align-center>
-                                    <el-step title="提交订单" description="2018/11/2 18:06:22"></el-step>
-                                    <el-step title="买家已付款" description="2018/11/2 18:06:22"></el-step>
-                                    <el-step title="卖家已发货" description="2018/11/2 18:06:22"></el-step>
-                                    <el-step title="买家已收货" description="2018/11/2 18:06:22"></el-step>
-                                </el-steps>
-                        </div>
-                    </div>
-                </div>
-                <!-- 订单编号end -->
-
-                 <!-- 订单状态 -->
-                <div class="order-state">
-                    <div class="state-cont">
-                        <!-- 状态标题 -->
-                        <div class="state-title">
-                            <div class="title-left">
-                                    <span>订单状态:</span>
-                            <span class="text">待支付</span>
-                            </div>
-                            <span class="title-mid">
-                                    <img src="~@/assets/img/time.png" alt="">
-                                    <span class="mid-text">倒计时2天21时21分21秒</span>
-                            <span class="text">，如果客户不付款订单自动关闭</span>
-                            </span>
-                            <span class="title-right">
-                                    <!-- <button>修改</button>
-                                    <button>取消</button>
-                                    <button>打印</button> -->
-                                    <el-row>
-                                        <el-button type="primary" plain>修改</el-button>
-                                        <el-button plain>取消</el-button>
-                                        <el-button type="info" plain>打印</el-button>
-                                    </el-row>
-
-                                </span>
-                        </div>
-                        <!-- 状态标题end -->
-
-                        <!-- 买家信息 -->
-                        <div class="order-info">
-                            <div class="order-details">
-                                <div class="detail-title">
-                                    <img src="~@/assets/img/car.png" alt="">
-                                    <span class="prompt">买家付款后才可以发货</span>
-                                </div>
-                                <div class="detail-cont">
-                                    <div class="detail01">
-                                        <img src="~@/assets/img/address.png" alt="">
-                                        <div class="text-width">
-                                            <span>配送方式：快递发货</span>
-                                            <span class="revise-addr" onclick="window.location.href='#'"><img src="~@/assets/img/revise.png" alt="">修改地址</span>
-                                            <br>
-                                            <span>收货人：柠檬仔</span><br>
-                                            <span>手机：13726888888</span><br>
-                                            <span>收货地址：广州市大学城北创业大厦美好的家美好的家加加加加加加加家居加加加加加加</span>
-                                        </div>
-                                    </div>
-                                    <div class="detail01">
-                                        <img src="~@/assets/img/invoice.png" alt="">
-                                        <span>不开发票</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="buyers">
-                                <div class="detail-title">
-                                    <img src="~@/assets/img/buyer.png" alt="">
-                                    <span class="prompt">买家：13726888888</span>
-                                </div>
-                                <div class="buyers-info">
-                                    <div class="detail02">
-                                        <img src="~@/assets/img/message.png" alt="">
-                                        <div class="text-width">
-                                            <span>买家备注：</span>
-                                            <span class="revise-remarks" onclick="window.location.href='#'"><img src="~@/assets/img/revise.png"  alt="">修改备注</span>
-                                            <br>
-                                            <span>给我加多点香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜</span><br>
-                                        </div>
-                                    </div>
-                                    <div class="detail02">
-                                        <img src="~@/assets/img/remarks.png" alt="" width="18">
-                                        <div class="text-width">
-                                            <span>卖家备注：</span><br>
-                                            <span>给我加多点香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜香菜</span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- 买家信息end -->
-
-                        <!-- 商品列表 -->
-                        <div class="item-list">
-                            <el-table :data="tableData" border>
-                                <el-table-column prop="" label="商品">
-                                      <template slot-scope="scope">
-                                        <img src="~@/assets/img/remarks.png" width="100" height="100"/>
-                                        <span>{{scope.row.name}}</span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column prop="price" label="单价" width="180" align="center">
-                                </el-table-column>
-                                <el-table-column prop="count" label="数量" width="180" align="center">
-                                </el-table-column>
-                                <el-table-column prop="totalPrice" label="总价" width="180" align="center">
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <!-- 商品列表end -->
-
-                         <!-- 价格详情 -->
-                        <div class="item-info">
-                            <span>商品总价：<span class="text">￥15.00</span></span><br>
-                            <span>店铺优惠：<span class="text">-￥0.00</span></span><br>
-                            <span>积分抵扣：<span class="text">-￥0.00</span></span><br>
-                            <span>发票费用：<span class="text">￥0.00</span></span><br>
-                            <span>配送费用：<span class="text">￥0.00</span></span><br>
-                            <span>应付金额：<span class="amount text">￥15.00</span></span>
-                        </div>
-                         <!-- 价格详情end -->
-                    </div>
-                </div>
-                 <!-- 订单状态end -->
-
-                 <!-- 订单日志 -->
-                <div class="order-log">
-                    <div class="log-title">
-                        <span>订单日志</span>
-                    </div>
-                    <div class="log-cont">
-                        <div>2018-11-2 14:19:00 13726888888 创建订单（成功）</div>
-                        <div>2018-11-2 14:19:00 13726888888 创建订单（成功）</div>
-                    </div>
-                </div>
-                <!-- 订单日志end -->
-            </div>
-        </div>
-    </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      var validateUrl = (rule, value, callback) => {
-        if (this.dataForm.type === 1 && !/\S/.test(value)) {
-          callback(new Error('菜单URL不能为空'))
-        } else {
-          callback()
-        }
-      }
-      return {
-        visible: false,
-        dataForm: {
-          orderId: 0,
-          remarks: '',
-          prodName: '',
-          total: 0,
-          actualTotal: 0,
-          dvyType: '',
-          orderNumber: '',
-          status: 1,
-          userAddrOrder: []
-        },
-        dataRule: {
-          name: [
-            {
-              required: true,
-              message: '菜单名称不能为空',
-              trigger: 'blur'
-            }
-          ],
-          url: [
-            {
-              validator: validateUrl,
-              trigger: 'blur'
-            }
-          ]
-        },
-        tableData: [
-          {
-            name: 'iphone xs max',
-            price: '8699',
-            count: '2',
-            totalPrice: '12000'
-          }
-        ]
-      }
-    },
-    methods: {
-      init (orderNumber) {
-        this.dataForm.orderNumber = orderNumber || 0
-        this.visible = true
-      },
-      // 表单提交
-      dataFormSubmit () {
-
-      }
-    }
-  }
-</script>
-
-
-<style>
-.main {
-  height: 100%;
-  width: 100%;
-  font: 14px Arial, "PingFang SC", "Hiragino Sans GB", STHeiti,
-    "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
-  color: #495060;
-}
-
-.content {
-  margin: 0 20px;
-}
-
-.content .steps {
-  margin-top: 50px;
-}
-
-.order-number .number-text {
-  font-weight: bold;
-}
-
-.order-number .text {
-  font-size: 14px;
-  color: #8a8a8a;
-}
-
-.order-state .state-title {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.title-left span {
-  font-weight: bold;
-}
-
-.title-left .text {
-  color: red;
-}
-
-.state-title .title-mid {
-  display: flex;
-  align-items: center;
-}
-
-.title-mid img {
-  width: 18px;
-  height: 18px;
-}
-
-.title-mid .mid-text {
-  color: red;
-}
-
-.title-mid .text {
-  color: #8a8a8a;
-}
-
-.content .order-state {
-  position: relative;
-  margin-top: 50px;
-  border-bottom: 1px solid #e9eaec;
-}
-
-.order-state .order-info {
-  width: 100%;
-  border-top: 1px solid #e9eaec;
-  margin: 50px 0;
-  display: flex;
-}
-
-.order-info img {
-  width: 18px !important;
-  height: 18px !important;
-  margin-right: 15px;
-}
-
-.order-info .detail-title {
-  height: 50px;
-  line-height: 50px;
-  display: flex;
-  align-items: center;
-}
-
-.order-info .order-details {
-  width: 50%;
-  border-right: 1px solid #e9eaec;
-}
-
-.order-info .detail-cont {
-  position: relative;
-}
-
-.detail-cont .detail01 {
-  display: flex;
-  height: 100%;
-  line-height: 25px;
-  margin-top: 15px;
-}
-
-.detail01 .text-width {
-  width: 100%;
-}
-
-.detail02 .text-width {
-  width: 100%;
-}
-
-.detail-cont .revise-addr {
-  color: #4395ff;
-  position: absolute;
-  top: 15px;
-  right: 0;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
-
-.order-info .detail-cont {
-  border-top: 1px dashed #e9eaec;
-  margin: 15px 20px 0 0;
-}
-
-.order-info .buyers {
-  width: 50%;
-  margin-left: 20px;
-}
-
-.buyers .buyers-info {
-  border-top: 1px dashed #e9eaec;
-  margin-top: 15px;
-  position: relative;
-}
-
-.buyers .detail02 {
-  display: flex;
-  height: 100%;
-  line-height: 25px;
-  margin-top: 15px;
-}
-
-.buyers .revise-remarks {
-  color: #4395ff;
-  position: absolute;
-  top: 15px;
-  right: 0;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
-
-.order-state .item-info {
-  padding-left: 70%;
-  margin: 25px 0;
-}
-
-.item-info span {
-  margin-bottom: 15px;
-  line-height: 30px;
-}
-
-.item-info .text {
-  position: absolute;
-  right: 0;
-}
-
-.item-info .amount {
-  font-size: 18px;
-  color: red;
-}
-
-.order-log .log-title {
-  height: 50px;
-  width: 100%;
-  line-height: 50px;
-  font-weight: bold;
-  border-bottom: 1px dashed #e9eaec;
-}
-
-.order-log .log-cont {
-  margin-top: 15px;
-  color: #4395ff;
-}
-</style>
-
-
-

src/views/modules/order/order-addr.vue

@@ -1,80 +0,0 @@
-<template>
-  <el-dialog
-    title="修改"
-    :modal="false"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item v-if="dataForm.type !== 2" label="排序号" prop="seq">
-        <el-input-number v-model="dataForm.seq" controls-position="right" :min="0" label="排序号"></el-input-number>
-      </el-form-item>
-      <el-form-item label="状态" size="mini" prop="status">
-        <el-radio-group v-model="dataForm.status">
-          <el-radio :label="0">下线</el-radio>
-          <el-radio :label="1">正常</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-<script>
-import { Debounce } from '@/utils/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        addrOrderId: 0,
-        receiver: '',
-        province: '',
-        mobile: ''
-      }
-    }
-  },
-  methods: {
-    init (addrOrderId) {
-      this.dataForm.addrOrderId = addrOrderId
-      this.$http({
-        url: this.$http.adornUrl(`/prod/category/listCategory/${this.dataForm.addrOrderId}`),
-        method: 'get',
-        params: this.$http.adornParams()
-      }).then(({data}) => {
-        this.dataForm = data
-      }).then(() => {
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-        })
-      })
-    },
-      // 表单提交
-    dataFormSubmit: Debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.$http({
-            url: this.$http.adornUrl(`/prod/category`),
-            method: this.dataForm.currentId ? 'put' : 'post',
-            data: this.$http.adornData({
-              'categoryId': this.dataForm.currentId || undefined
-            })
-          }).then(({data}) => {
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.visible = false
-                this.$emit('refreshDataList')
-              }
-            })
-          })
-        }
-      })
-    })
-  }
-}
-</script>

src/views/modules/order/order-devy.vue

@@ -1,96 +0,0 @@
-<template>
-  <el-dialog
-    :modal="false"
-    title="选择发货地址"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="快递公司">
-        <el-select v-model="dataForm.dvyId" placeholder="请选择">
-          <el-option
-            v-for="item in dataForm.dvyNames"
-            :key="item.dvyId"
-            :label="item.dvyName"
-            :value="item.dvyId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="快递单号" prop="dvyFlowId">
-        <el-input v-model="dataForm.dvyFlowId" controls-position="right" :min="0" label="快递单号"></el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-<script>
-  export default {
-    data () {
-      var validDvyFlowId = (rule, value, callback) => {
-        if (!value.trim()) {
-          callback(new Error('不能为空'))
-        } else {
-          callback()
-        }
-      }
-      return {
-        visible: false,
-        dataForm: {
-          dvyId: '',
-          dvyFlowId: 0,
-          dvyNames: [],
-          orderNumber: 0
-        },
-        dataRule: {
-          dvyFlowId: [
-            { required: true, message: '不能为空', trigger: 'blur' },
-            { validator: validDvyFlowId, trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (orderNumber, dvyId, dvyFlowId) {
-        this.visible = true
-        this.dataForm.orderNumber = orderNumber || ''
-        this.dataForm.dvyId = dvyId || ''
-        this.dataForm.dvyFlowId = dvyFlowId || ''
-        this.$http({
-          url: this.$http.adornUrl('/admin/delivery/list'),
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({data}) => {
-          this.dataForm.dvyNames = data
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/order/order/delivery`),
-              method: 'put',
-              data: this.$http.adornData({
-                'orderNumber': this.dataForm.orderNumber,
-                'dvyId': this.dataForm.dvyId,
-                'dvyFlowId': this.dataForm.dvyFlowId
-              })
-            }).then(({data}) => {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.visible = false
-                  this.$emit('refreshDataList')
-                }
-              })
-            })
-          }
-        })
-      }
-    }
-  }
-</script>

src/views/modules/order/orderInfo.vue

@@ -1,490 +0,0 @@
-<template>
-  <el-dialog :title="!dataForm.orderNumber ? '新增' : '查看'" :close-on-click-modal="false" :visible.sync="visible" width="80%">
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <div class="main">
-        <div class="content">
-          <div class="order-number">
-            <div class="num-cont">
-              <el-form-item label="订单编号:">
-                <span class="text">{{dataForm.orderNumber}}</span>
-              </el-form-item>
-              <el-form-item>
-                <el-steps :active="stepsStatus" align-center :process-status="dataForm.status == 6 ? 'error':'wait'">
-                  <el-step title="提交订单" :description="dataForm.orderTime"></el-step>
-                  <el-step title="买家已付款" :description="dataForm.payTime"></el-step>
-                  <el-step title="卖家已发货" v-if="dataForm.orderType !== 1" :description="dataForm.dvyTime"></el-step>
-                  <el-step title="买家已收货" v-if="dataForm.orderType !== 1" :description="dataForm.finallyTime"></el-step>
-                </el-steps>
-              </el-form-item>
-            </div>
-          </div>
-          <div class="order-state">
-            <div class="state-cont">
-              <div class="state-title">
-                <el-form-item label="订单状态:">
-                  <template slot-scope="scope">
-                    <el-tag v-if="dataForm.status === 1" size="small" type="warning">待付款</el-tag>
-                    <el-tag v-if="dataForm.status === 2 && dataForm.orderType !== 1" size="small" type="warning">待发货</el-tag>
-                    <el-tag v-if="dataForm.status === 3 && dataForm.orderType !== 1" size="small" type="warning">待收货</el-tag>
-                    <el-tag v-if="dataForm.status === 4 && dataForm.orderType !== 1" size="small" type="warning">待评价</el-tag>
-                    <el-tag v-if="dataForm.status === 5" size="small" type="success">成功</el-tag>
-                    <el-tag v-if="dataForm.status === 6" size="small" type="danger">失败</el-tag>
-                  </template>
-                </el-form-item>
-                <el-form-item>
-                  <el-row>
-                    <el-button type="primary" v-if="dataForm.status === 2 && dataForm.orderType !== 1" plain @click="changeOrder(dataForm.orderNumber)">发货</el-button>
-                    <!-- <el-button type="info" plain>打印</el-button> -->
-                  </el-row>
-                </el-form-item>
-              </div>
-              <div class="order-info">
-                <div class="order-details">
-                  <div class="detail-title">
-                    <img src="~@/assets/img/car.png" alt="">
-                    <span class="prompt">买家付款后才可以发货</span>
-                  </div>
-                  <div class="detail-cont">
-                    <div class="detail01">
-                      <img src="~@/assets/img/address.png" alt="">
-                      <div class="text-width">
-                        <!-- <span class="revise-addr" @click="changeAddr(dataForm.addrOrderId)">
-                          <img src="~@/assets/img/revise.png" alt=""/>修改地址
-                        </span> -->
-                        <el-form-item label="收货人:">
-                          <span>{{dataForm.userAddrOrder.receiver}}</span>
-                        </el-form-item>
-                        <el-form-item label="手机:">
-                          <span>{{dataForm.userAddrOrder.mobile}}</span>
-                        </el-form-item>
-                        <el-form-item label="收货地址">
-                          <span>{{dataForm.userAddrOrder.province}}{{dataForm.userAddrOrder.city}}{{dataForm.userAddrOrder.area}}{{dataForm.userAddrOrder.addr}}</span>
-                        </el-form-item>
-                      </div>
-                    </div>
-                    <div class="detail01">
-                      <img src="~@/assets/img/invoice.png" alt="">
-                      <span>不开发票</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="buyers">
-                  <div class="detail-title">
-                    <img src="~@/assets/img/buyer.png" alt="" style="margin-right:15px">
-                    <el-form-item label="买家:" style="margin-top:22px" label-width="44px">
-                      <span>{{dataForm.nickName}}</span>
-                    </el-form-item>
-                  </div>
-                  <div class="buyers-info">
-                    <div class="detail02">
-                      <img src="~@/assets/img/message.png" alt="">
-                      <div class="text-width">
-                        <span>买家备注:</span>
-                        <br>
-                        <span>{{dataForm.remarks}}</span>
-                      </div>
-                    </div>
-                    <!-- <div class="detail02">
-                      <img src="~@/assets/img/remarks.png" alt="" width="18">
-                      <div class="text-width">
-                        <span>卖家备注：</span><br>
-                        <span>给我加多点香菜</span>
-                      </div>
-                    </div> -->
-                  </div>
-                </div>
-              </div>
-              <div class="item-list">
-                <el-table :data="dataForm.orderItems" border>
-                  <el-table-column prop="" label="商品">
-                    <template slot-scope="scope">
-                      <div class="prod-con">
-                        <img :src="resourcesUrl + scope.row.pic" class="prod-img"/>
-                        <span>{{scope.row.prodName}}</span>
-                      </div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="price" label="单价" width="180" align="center">
-                    <template slot-scope="scope">
-                      <span>{{scope.row.price}}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="count" label="数量" width="180" align="center">
-                    <template slot-scope="scope">
-                      <span>{{scope.row.prodCount}}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="totalPrice" label="总价" width="180" align="center">
-                    <template slot-scope="scope">
-                      <span>{{scope.row.productTotalAmount}}</span>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-              <div class="item-info">
-                <el-form-item label="商品总价:">
-                  <span class="text">￥{{dataForm.total}}</span>
-                </el-form-item>
-                <!-- <el-form-item label="店铺优惠:">
-                <span class="text">￥15.00</span>
-                </el-form-item> -->
-                <!-- <el-form-item label="积分抵扣:">
-                <span class="text">￥15.00</span>
-                </el-form-item> -->
-                <!-- <el-form-item label="发票费用:">
-                <span class="text">￥15.00</span>
-                </el-form-item> -->
-                <el-form-item label="配送费用:" v-if="dataForm.freightAmount">
-                  <span class="text">￥{{dataForm.freightAmount}}</span>
-                </el-form-item>
-                <el-form-item label="应付金额:">
-                  <span class="text">￥{{dataForm.actualTotal}}</span>
-                </el-form-item>
-              </div>
-            </div>
-          </div>
-          <div class="order-log">
-            <div class="log-title">
-              <span>订单日志</span>
-            </div>
-            <div class="log-cont">
-              <el-form-item v-if="dataForm.orderTime" label-width="10px">
-                <span>{{dataForm.orderTime}} {{dataForm.nickName}} 创建订单（成功）</span>
-              </el-form-item>
-              <el-form-item v-if="dataForm.updateTime" label-width="10px">
-                <span>{{dataForm.updateTime}} {{dataForm.nickName}} 订单更新（成功）</span>
-              </el-form-item>
-              <el-form-item v-if="dataForm.payTime" label-width="10px">
-                <span>{{dataForm.payTime}} {{dataForm.nickName}} 订单付款（成功）</span>
-              </el-form-item>
-              <el-form-item v-if="dataForm.dvyTime" label-width="10px">
-                <span>{{dataForm.dvyTime}} {{dataForm.nickName}} 订单发货（成功）</span>
-              </el-form-item>
-              <el-form-item v-if="dataForm.finallyTime" label-width="10px">
-                <span>{{dataForm.finallyTime}} {{dataForm.nickName}} 完成订单（成功）</span>
-              </el-form-item>
-              <el-form-item v-if="dataForm.cancelTime" label-width="10px">
-                <span>{{dataForm.cancelTime}} {{dataForm.nickName}} 取消订单（成功）</span>
-              </el-form-item>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-form>
-    <!-- 弹窗, 新增 / 修改 -->
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
-    <devy-add v-if="devyVisible" ref="devyAdd"  @refreshDataList="getDataList"></devy-add>
-  </el-dialog>
-</template>
-
-<script>
-  // import AddOrUpdate from './order-addr'
-  import DevyAdd from './order-devy'
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          orderId: 0,
-          orderNumber: '',
-          remarks: '',
-          total: 0,
-          actualTotal: 0,
-          dvyType: '',
-          status: 1,
-          addrOrderId: 0,
-          nickName: '',
-          orderItems: [],
-          orderTime: '',
-          updateTime: '',
-          payTime: '',
-          dvyTime: '',
-          finallyTime: '',
-          cancelTime: '',
-          userAddrOrder: {}
-        },
-        resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
-        addOrUpdateVisible: false,
-        devyVisible: false
-      }
-    },
-    components: {
-      // AddOrUpdate,
-      DevyAdd
-    },
-    watch: {
-      visible: function () {
-        if (!this.visible) {
-          this.devyVisible = false
-          this.addOrUpdateVisible = false
-        }
-      }
-    },
-    computed: {
-      stepsStatus: function () {
-        if (this.dataForm.finallyTime) {
-          return 4
-        }
-        if (this.dataForm.dvyTime) {
-          return 3
-        }
-        if (this.dataForm.payTime) {
-          return 2
-        }
-        if (this.dataForm.orderTime) {
-          return 1
-        }
-      }
-    },
-    methods: {
-      init (orderNumber) {
-        this.dataForm.orderNumber = orderNumber || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-        })
-        if (this.dataForm.orderNumber) {
-          // 修改
-          this.$http({
-            url: this.$http.adornUrl(`/order/order/orderInfo/${this.dataForm.orderNumber}`),
-            method: 'get',
-            params: this.$http.adornParams()
-          }).then(({data}) => {
-            this.dataForm = data
-          })
-        }
-      },
-      getDataList () {
-        this.$http({
-          url: this.$http.adornUrl(`/order/order/orderInfo/${this.dataForm.orderNumber}`),
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({data}) => {
-          this.dataForm = data
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-      },
-      // 发货
-      changeOrder (orderNumber) {
-        this.devyVisible = true
-        this.$nextTick(() => {
-          this.$refs.devyAdd.init(orderNumber, this.dataForm.dvyId, this.dataForm.dvyFlowId)
-        })
-      },
-      // 修改备注
-      changeRemarks () {
-      },
-      // 修改地址
-      changeAddr (val) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val)
-        })
-      }
-    }
-  }
-</script>
-
-
-<style>
-.main {
-  height: 100%;
-  width: 100%;
-  font: 14px Arial, "PingFang SC", "Hiragino Sans GB", STHeiti,
-    "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
-  color: #495060;
-}
-
-.content {
-  margin: 0 20px;
-}
-
-.content .steps {
-  margin-top: 50px;
-}
-
-.order-number .number-text {
-  font-weight: bold;
-}
-
-.order-number .text {
-  font-size: 14px;
-  color: #8a8a8a;
-}
-
-.order-state .state-title {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.title-left span {
-  font-weight: bold;
-}
-
-.title-left .text {
-  color: red;
-}
-
-.state-title .title-mid {
-  display: flex;
-  align-items: center;
-}
-
-.title-mid img {
-  width: 18px;
-  height: 18px;
-}
-
-.title-mid .mid-text {
-  color: red;
-}
-
-.title-mid .text {
-  color: #8a8a8a;
-}
-
-.content .order-state {
-  position: relative;
-  margin-top: 50px;
-  border-bottom: 1px solid #e9eaec;
-}
-
-.order-state .order-info {
-  width: 100%;
-  border-top: 1px solid #e9eaec;
-  margin: 50px 0;
-  display: flex;
-}
-
-.order-info img {
-  width: 18px !important;
-  height: 18px !important;
-  margin-right: 15px;
-}
-
-.order-info .detail-title {
-  height: 50px;
-  line-height: 50px;
-  display: flex;
-  align-items: center;
-}
-
-.order-info .order-details {
-  width: 50%;
-  border-right: 1px solid #e9eaec;
-}
-
-.order-info .detail-cont {
-  position: relative;
-}
-
-.detail-cont .detail01 {
-  display: flex;
-  height: 100%;
-  line-height: 25px;
-  margin-top: 15px;
-}
-
-.detail01 .text-width {
-  width: 100%;
-}
-
-.detail02 .text-width {
-  width: 100%;
-}
-
-.detail-cont .revise-addr {
-  color: #4395ff;
-  position: absolute;
-  top: 15px;
-  right: 0;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
-
-.order-info .detail-cont {
-  border-top: 1px dashed #e9eaec;
-  margin: 15px 20px 0 0;
-}
-
-.order-info .buyers {
-  width: 50%;
-  margin-left: 20px;
-}
-
-.buyers .buyers-info {
-  border-top: 1px dashed #e9eaec;
-  margin-top: 15px;
-  position: relative;
-}
-
-.buyers .detail02 {
-  display: flex;
-  height: 100%;
-  line-height: 25px;
-  margin-top: 15px;
-}
-
-.buyers .revise-remarks {
-  color: #4395ff;
-  position: absolute;
-  top: 15px;
-  right: 0;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
-
-.order-state .item-info {
-  padding-left: 80%;
-  margin: 25px 0;
-}
-
-.item-info span {
-  margin-bottom: 15px;
-  line-height: 30px;
-}
-
-.item-info .text {
-  position: absolute;
-  right: 0;
-}
-
-.item-info .amount {
-  font-size: 18px;
-  color: red;
-}
-
-.order-log .log-title {
-  height: 50px;
-  width: 100%;
-  line-height: 50px;
-  font-weight: bold;
-  /* border-bottom: 1px dashed #e9eaec; */
-}
-
-.order-log .log-cont {
-  /* margin-top: 15px; */
-  color: #4395ff;
-}
-.order-log .log-cont .el-form-item__content {
-  line-height: 1.5em;
-}
-
-.item-list .prod-con {
-  display: flex;
-}
-.item-list .prod-con .prod-img {
-  width: 100px;
-  height: 100px;
-  margin-right: 8px;
-}
-</style>
-
-
-