售后信息展示，单价展示问题处理

2021-08-25 14:18:35 +08:00 · 2021-08-25 14:18:35 +08:00 · 589b7fc7c5
parent b59da2c101
commit 589b7fc7c5
2 changed files with 75 additions and 50 deletions
--- a/buyer/src/pages/home/orderCenter/AfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@ -4,7 +4,7 @@
    <card _Title="我的售后" :_Size="16"></card>
    <!-- 搜索 筛选 -->
    <div class="mb_20 box">
-      <div class="global_float_right" >
+      <div class="global_float_right">
        <Input
          class="width_300"
          search
@ -16,15 +16,15 @@
      </div>
    </div>
    <!-- 列表 -->
-    <empty v-if="orderList.length === 0" />
+    <empty v-if="orderList.length === 0"/>
    <div class="order-content" v-else>
      <template v-for="(order, onderIndex) in orderList">
        <div class="order-list" :key="onderIndex">
          <div class="order-header">
            <div>
-              <div v-if="order.serviceStatus">{{filterOrderStatus(order.serviceStatus)}}</div>
+              <div v-if="order.serviceStatus">{{ filterOrderStatus(order.serviceStatus) }}</div>
              <div>
-                售后单号：{{ order.sn }} &nbsp; &nbsp; &nbsp;{{order.createTime}}
+                售后单号：{{ order.sn }} &nbsp; &nbsp; &nbsp;{{ order.createTime }}
                &nbsp; &nbsp;{{ order.memberName | secrecyMobile }}
              </div>
            </div>
@ -34,14 +34,11 @@
          </div>
          <div class="order-body">
            <div class="goods-list">
-              <img @click="goodsDetail(order.skuId, order.goodsId)" class="hover-color" :src="order.goodsImage" alt="" />
+              <img @click="goodsDetail(order.skuId, order.goodsId)" class="hover-color" :src="order.goodsImage" alt=""/>

              <div>
                <div class="hover-color" @click="goodsDetail(order.skuId, order.goodsId)">{{ order.goodsName }}</div>
-                <div class="mt_10">
-                  <span class="global_color"
-                    >{{ order.flowPrice | unitPrice("￥") }} </span
-                  >x {{ order.num }}
+                <div class="mt_10"> x {{ order.num }}
                </div>
              </div>
            </div>
@ -54,8 +51,11 @@
              <Button @click="openModal(order)"
                      v-if="order.serviceStatus == 'PASS' &&
                order.serviceType != 'RETURN_MONEY'"
-                type="warning" size="small">提交物流</Button>
-              <Button @click="cancel(order.sn)" type="error" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
+                      type="warning" size="small">提交物流
+              </Button>
+              <Button @click="cancel(order.sn)" type="error" v-if="order.afterSaleAllowOperationVO.cancel" size="small">
+                取消售后
+              </Button>
            </div>
          </div>
        </div>
@ -76,9 +76,12 @@
      </p>
      <div>
        <div class="goods-list modal-goods">
-          <img @click="goodsDetail(singleOrder.skuId, singleOrder.goodsId)" class="hover-color" :src="singleOrder.goodsImage" alt="" />
+          <img @click="goodsDetail(singleOrder.skuId, singleOrder.goodsId)" class="hover-color"
+               :src="singleOrder.goodsImage" alt=""/>
          <div>
-            <div class="hover-color" @click="goodsDetail(singleOrder.skuId, singleOrder.goodsId)">{{ singleOrder.goodsName }}</div>
+            <div class="hover-color" @click="goodsDetail(singleOrder.skuId, singleOrder.goodsId)">
+              {{ singleOrder.goodsName }}
+            </div>
            <div class="mt_10">
              <span class="global_color"
              >{{ singleOrder.flowPrice | unitPrice("￥") }} </span
@ -96,7 +99,8 @@
            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
          </FormItem>
          <FormItem label="发货时间" prop="mDeliverTime">
-            <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>
+            <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime"
+                        format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>
          </FormItem>
        </Form>
      </div>
@ -109,12 +113,13 @@
 </template>

 <script>
-import { afterSaleList, cancelAfterSale } from '@/api/member.js';
-import { afterSaleDelivery, getLogisticsCompany } from '@/api/order.js';
-import { afterSaleStatusList } from '../enumeration.js'
+import {afterSaleList, cancelAfterSale} from '@/api/member.js';
+import {afterSaleDelivery, getLogisticsCompany} from '@/api/order.js';
+import {afterSaleStatusList} from '../enumeration.js'
+
 export default {
  name: 'AfterSale',
-  data () {
+  data() {
    return {
      orderList: [], // 订单列表
      params: { // 请求参数
@ -138,24 +143,24 @@ export default {
        mDeliverTime: ''
      },
      rules: { // 必填校验
-        logisticsId: [{ required: true, message: '请选择物流公司' }],
-        logisticsNo: [{ required: true, message: '请填写物流编号' }],
-        mDeliverTime: [{ required: true, message: '请选择发货时间' }]
+        logisticsId: [{required: true, message: '请选择物流公司'}],
+        logisticsNo: [{required: true, message: '请填写物流编号'}],
+        mDeliverTime: [{required: true, message: '请选择发货时间'}]
      },
      submitLoading: false // 提交加载状态
    };
  },
-  mounted () {
+  mounted() {
    this.getList();
  },
  methods: {
-    goDetail (sn) { // 跳转售后详情
+    goDetail(sn) { // 跳转售后详情
      this.$router.push({
        name: 'AfterSaleDetail',
        query: {sn}
      })
    },
-    cancel (sn) { // 取消售后申请
+    cancel(sn) { // 取消售后申请
      this.$Modal.confirm({
        title: '取消',
        content: '<p>确定取消此次售后申请吗？</p>',
@ -167,26 +172,27 @@ export default {
            }
          })
        },
-        onCancel: () => {}
+        onCancel: () => {
+        }
      });
    },
-    goodsDetail (skuId, goodsId) {
+    goodsDetail(skuId, goodsId) {
      // 跳转商品详情
      let routeUrl = this.$router.resolve({
        path: '/goodsDetail',
-        query: { skuId, goodsId }
+        query: {skuId, goodsId}
      });
      window.open(routeUrl.href, '_blank');
    },
    // 跳转店铺首页
-    shopPage (id) {
+    shopPage(id) {
      let routeUrl = this.$router.resolve({
        path: '/Merchant',
-        query: { id: id }
+        query: {id: id}
      });
      window.open(routeUrl.href, '_blank');
    },
-    getList () { // 获取售后列表
+    getList() { // 获取售后列表
      this.spinShow = true;
      let params = JSON.parse(JSON.stringify(this.params))
      afterSaleList(params).then(res => {
@ -197,21 +203,23 @@ export default {
        }
      });
    },
-    changePageNum (val) { // 修改页码
+    changePageNum(val) { // 修改页码
      this.params.pageNumber = val;
      this.getList()
    },
-    changePageSize (val) { // 修改页数
+    changePageSize(val) { // 修改页数
      this.params.pageNumber = 1;
      this.params.pageSize = val;
      this.getList()
    },
-    filterOrderStatus (status) { // 获取订单状态中文
-      const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
+    filterOrderStatus(status) { // 获取订单状态中文
+      const ob = this.afterSaleStatusList.filter(e => {
+        return e.status === status
+      });
      return ob[0].name
    },
    // 获取物流公司列表
-    getCompany () {
+    getCompany() {
      getLogisticsCompany().then(res => {
        if (res.success) {
          this.companyList = res.result
@ -219,7 +227,7 @@ export default {
      })
    },
    // 提交物流信息
-    submitDelivery () {
+    submitDelivery() {
      this.submitLoading = true
      afterSaleDelivery(this.form).then(res => {
        if (res.success) {
@ -233,7 +241,7 @@ export default {
      })
    },
    // 提交物流modal
-    openModal (row) {
+    openModal(row) {
      console.log(row);
      this.singleOrder = row;
      this.form.afterSaleSn = row.sn
@ -244,7 +252,7 @@ export default {
      }
    },
    // 格式化时间
-    changeTime (time) {
+    changeTime(time) {
      this.form.mDeliverTime = time;
    }
  }
@ -255,25 +263,31 @@ export default {
 .wrapper {
  margin-bottom: 40px;
 }
+
 .box {
  overflow: hidden;
 }
+
 .page-size {
  margin: 15px 0px;
  display: flex;
  justify-content: flex-end;
  align-items: center;
 }
+
 /** 订单列表 */
 .order-list {
  border: 1px solid #ddd;
  border-radius: 3px;
  margin-bottom: 10px;

-  &:hover{
-    .del-btn{visibility: visible;}
+  &:hover {
+    .del-btn {
+      visibility: visible;
    }
-  .del-btn{
+  }
+
+  .del-btn {
    visibility: hidden;
  }

@ -283,12 +297,14 @@ export default {
    padding: 10px;
    justify-content: space-between;
    border-bottom: 1px solid #ddd;
+
    > div:nth-child(1) > div:nth-child(2) {
      font-size: 12px;
      color: #999;
      margin-top: 3px;
    }
  }
+
  .order-body {
    display: flex;
    justify-content: space-between;
@ -298,16 +314,20 @@ export default {
    > div:nth-child(2) {
      width: 150px;
      text-align: center;
+
      span {
        color: #438cde;
        cursor: pointer;
+
        &:hover {
          color: $theme_color;
        }
      }
+
      .ivu-icon {
        color: #ff8f23;
        cursor: pointer;
+
        &:hover {
          color: $theme_color;
        }
@ -316,26 +336,31 @@ export default {

    > div:nth-child(3) {
      width: 100px;
+
      .ivu-btn {
        margin-bottom: 10px;
      }
    }
  }
 }
+
 .goods-list {
  width: 500px;
  display: flex;
  margin-bottom: 10px;
+
  img {
    width: 60px;
    height: 60px;
    margin-right: 10px;
  }
+
  > div {
    flex: 1;
  }
 }
-.modal-goods{
+
+.modal-goods {
  padding: 5px;
  background-color: #eee;
 }
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@ -619,13 +619,13 @@ export default {
          key: "unitPrice",
          minWidth: 100,
          render: (h, params) => {
-            if (!params.row.priceDetailDTO.unitPrice) {
+            if (!params.row.unitPrice) {
              return h("div", this.$options.filters.unitPrice(0, "￥"));
            }
            return h(
              "div",
              this.$options.filters.unitPrice(
-                params.row.priceDetailDTO.unitPrice,
+                params.row.unitPrice,
                "￥"
              )
            );