TBtools-订单详情接口

htmldev/TBTools/src/views/modules/mine/order/order-check-order.vue

@@ -14,14 +14,14 @@
           end-placeholder="创建时间结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item prop="region">
-        <el-select v-model="dataForm.region" placeholder="平台来源">
+      <el-form-item prop="orderMiandan">
+        <el-select v-model="dataForm.orderMiandan" placeholder="平台来源">
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="orderId">
-        <el-input v-model="dataForm.orderId" placeholder="订单编号" clearable></el-input>
+      <el-form-item prop="orderNumber">
+        <el-input v-model="dataForm.orderNumber" placeholder="订单编号" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getDataList()">查询</el-button>
@@ -33,66 +33,68 @@
       v-loading="dataListLoading"
       style="width: 100%">
       <el-table-column
-        prop="id"
+        prop="orderNumber"
         header-align="center"
         align="center"
         width="80"
         label="订单编号">
       </el-table-column>
       <el-table-column
-        prop="username"
+        prop="orderName"
         header-align="center"
         align="center"
-        label="礼品信息">
+        label="订单名称">
       </el-table-column>
       <el-table-column
-        prop="operation"
+        prop="orderMiandan"
         header-align="center"
         align="center"
-        label="包裹数">
+        label="订单来源">
       </el-table-column>
       <el-table-column
-        prop="method"
+        prop="orderPrice"
         header-align="center"
         align="center"
         width="150"
         :show-overflow-tooltip="true"
-        label="平台来源">
+        label="订单总价">
       </el-table-column>
       <el-table-column
-        prop="params"
+        prop="createdAt"
         header-align="center"
         align="center"
         width="150"
         :show-overflow-tooltip="true"
-        label="发货仓库">
+        label="创建时间">
       </el-table-column>
       <el-table-column
-        prop="time"
-        header-align="center"
-        align="center"
-        label="财务备注">
-      </el-table-column>
-      <el-table-column
-        prop="ip"
+        prop="orderStatus"
         header-align="center"
         align="center"
         width="150"
-        label="消费点券">
+        :show-overflow-tooltip="true"
+        label="订单状态">
+        <template slot-scope="scope">
+          <p>{{ ['未支付', '已支付', '已取消'][scope.row.orderStatus] }}</p>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="createDate"
+        prop="orderPayAt"
         header-align="center"
         align="center"
-        width="180"
-        label="支付时间">
+        label="订单支付时间">
       </el-table-column>
       <el-table-column
         fixed="right"
         label="操作"
         width="100">
         <template slot-scope="scope">
-          <el-button @click="handleClick(scope.row)" type="text" size="small">查看包裹</el-button>
+          <el-button @click="handleClick(scope.row)" type="text" size="small" v-if="scope.row.orderStatus === '1'">
+            查看包裹
+          </el-button>
+          <el-button @click="handleClick(scope.row)" type="text" size="small" v-else>
+            {{ scope.row.orderStatus === '0' ? '去支付' : '查看订单详情'}}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -114,9 +116,9 @@ export default {
   data () {
     return {
       dataForm: {
-        time: '',
-        region: '',
-        orderId: ''
+        time: [],
+        orderMiandan: '',
+        orderNumber: ''
       },
       pickerOptions: {
         disabledDate (time) {
@@ -132,7 +134,7 @@ export default {
     }
   },
   created () {
-    // this.getDataList()
+    this.getDataList()
   },
   methods: {
     // 设置data-picker默认值
@@ -154,19 +156,24 @@ export default {
     handleClick () {},
     // 获取数据列表
     getDataList () {
+      const { time, orderMiandan, orderNumber } = this.dataForm
       this.dataListLoading = true
       this.$http({
-        url: this.$http.adornUrl('/sys/log/list'),
+        url: this.$http.adornUrl('/gift/order/list'),
         method: 'get',
         params: this.$http.adornParams({
           'page': this.pageIndex,
-          'limit': this.pageSize,
-          'key': this.dataForm.key
+          'pageSize': this.pageSize,
+          'startCreateTime': time.length ? time[0] : '',
+          'endStartTime': time.length ? time[1] : '',
+          'orderNumber': orderNumber,
+          'orderMiandan': orderMiandan
         })
       }).then(({ data }) => {
-        if (data && data.code === 0) {
-          this.dataList = data.page.list
-          this.totalPage = data.page.totalCount
+        if (data.status) {
+          const { total, list } = data.data
+          this.dataList = list
+          this.totalPage = total
         } else {
           this.dataList = []
           this.totalPage = 0

htmldev/TBTools/src/views/modules/mine/order/order-check-package.vue

@@ -14,20 +14,20 @@
           end-placeholder="创建时间结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="包裹状态：" prop="status">
-        <el-select v-model="dataForm.status" placeholder="平台来源">
+      <el-form-item label="包裹状态：" prop="productStatus">
+        <el-select v-model="dataForm.productStatus" placeholder="请选择包裹状态">
           <el-option :label="item.label" :value="item.value" v-for="(item, index) in optionOfPackageStatus"
                      :key="index"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="手机号：" prop="phone">
-        <el-input type="tel" v-model="dataForm.phone" placeholder="手机号" clearable></el-input>
+      <el-form-item label="手机号：" prop="receiverPhone">
+        <el-input type="tel" v-model="dataForm.receiverPhone" placeholder="手机号" clearable></el-input>
       </el-form-item>
-      <el-form-item label="平台订单号：" prop="orderId">
-        <el-input v-model="dataForm.orderId" placeholder="平台订单号" clearable></el-input>
+      <el-form-item label="平台订单号：" prop="orderNumber">
+        <el-input v-model="dataForm.orderNumber" placeholder="平台订单号" clearable></el-input>
       </el-form-item>
-      <el-form-item label="快递单号：" prop="expressId">
-        <el-input v-model="dataForm.expressId" placeholder="快递单号" clearable></el-input>
+      <el-form-item label="快递单号：" prop="productExpressCode">
+        <el-input v-model="dataForm.productExpressCode" placeholder="快递单号" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getDataList()">查询</el-button>
@@ -39,33 +39,32 @@
       v-loading="dataListLoading"
       style="width: 100%">
       <el-table-column
-        prop="id"
+        prop="orderNumber"
         header-align="center"
         align="center"
         width="80"
-        label="包裹编号">
+        label="订单编号">
       </el-table-column>
       <el-table-column
-        prop="id"
+        prop="receiverName"
         header-align="center"
         align="center"
-        width="80"
-        label="订单编号">
+        label="收货人姓名">
       </el-table-column>
       <el-table-column
-        prop="username"
+        prop="receiverPhone"
         header-align="center"
         align="center"
-        label="收货人姓名">
+        label="收货人手机">
       </el-table-column>
       <el-table-column
-        prop="operation"
+        prop="receiverAddress"
         header-align="center"
         align="center"
-        label="收货人手机">
+        label="收货人地址">
       </el-table-column>
       <el-table-column
-        prop="method"
+        prop="productPrice"
         header-align="center"
         align="center"
         width="150"
@@ -73,46 +72,55 @@
         label="商品费用">
       </el-table-column>
       <el-table-column
-        prop="params"
+        prop="warehousePrice"
         header-align="center"
         align="center"
         width="150"
         :show-overflow-tooltip="true"
-        label="运输费用">
+        label="快递费用">
       </el-table-column>
       <el-table-column
-        prop="time"
+        prop="productStatus"
         header-align="center"
         align="center"
-        label="创建时间">
+        width="150"
+        :show-overflow-tooltip="true"
+        label="商品状态">
+        <template slot-scope="scope">
+          <p>{{ ['待支付', '已支付', '已发货', '已取消'][scope.row.productStatus] }}</p>
+        </template>
       </el-table-column>
       <el-table-column
-        prop="ip"
+        prop="productExpressCode"
         header-align="center"
         align="center"
-        width="150"
         label="快递单号">
       </el-table-column>
       <el-table-column
-        prop="createDate"
+        prop="productExpressName"
         header-align="center"
         align="center"
-        width="180"
+        width="150"
         label="快递公司">
       </el-table-column>
       <el-table-column
-        prop="createDate"
+        prop="createdAt"
         header-align="center"
         align="center"
         width="180"
-        label="包裹状态">
+        label="创建时间">
       </el-table-column>
       <el-table-column
         fixed="right"
         label="操作"
         width="100">
         <template slot-scope="scope">
-          <el-button @click="handleClick(scope.row)" type="text" size="small">查看包裹</el-button>
+          <el-button @click="handleClick(scope.row)" type="text" size="small"
+                     v-if="scope.row.productStatus === '1' || scope.row.productStatus === '2'">查看包裹
+          </el-button>
+          <el-button @click="handleClick(scope.row)" type="text" size="small" v-else>
+            {{ scope.row.productStatus === '0' ? '去支付' : '查看订单详情'}}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -134,12 +142,11 @@ export default {
   data () {
     return {
       dataForm: {
-        time: '',
-        status: 0,
-        phone: '',
-        region: '',
-        orderId: '',
-        expressId: ''
+        time: [],
+        productStatus: 0, // 包裹状态
+        receiverPhone: '', // 收件人手机号
+        orderNumber: '', // 订单编号
+        productExpressCode: '' // 快递单号
       },
       pickerOptions: {
         disabledDate (time) {
@@ -177,7 +184,7 @@ export default {
     }
   },
   created () {
-    // this.getDataList()
+    this.getDataList()
   },
   methods: {
     // 设置data-picker默认值
@@ -199,19 +206,26 @@ export default {
     handleClick () {},
     // 获取数据列表
     getDataList () {
+      const { time, productStatus, receiverPhone, orderNumber, productExpressCode } = this.dataForm
       this.dataListLoading = true
       this.$http({
-        url: this.$http.adornUrl('/sys/log/list'),
+        url: this.$http.adornUrl('/gift/order/package/list'),
         method: 'get',
         params: this.$http.adornParams({
           'page': this.pageIndex,
-          'limit': this.pageSize,
-          'key': this.dataForm.key
+          'pageSize': this.pageSize,
+          'startCreateTime': time.length ? time[0] : '',
+          'endStartTime': time.length ? time[1] : '',
+          'orderNumber': orderNumber,
+          'productStatus': productStatus,
+          'receiverPhone': receiverPhone,
+          'productExpressCode': productExpressCode
         })
       }).then(({ data }) => {
-        if (data && data.code === 0) {
-          this.dataList = data.page.list
-          this.totalPage = data.page.totalCount
+        if (data.status) {
+          const { total, list } = data.data
+          this.dataList = list
+          this.totalPage = total
         } else {
           this.dataList = []
           this.totalPage = 0