From 94a9404b392677c97df254863658d43251f55650 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 28 Jul 2021 10:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=EF=BC=8C=E7=A0=8D=E4=BB=B7=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexDecorate/modelFormItem.vue           |   2 +-
 .../indexDecorate/modelList/seckill.vue       |  85 +-------
 manager/src/views/seller/bill/bill-detail.vue | 185 +++++++++---------
 seller/src/config/index.js                    |  16 +-
 seller/src/views/shop/bill/billDetail.vue     |  27 ++-
 5 files changed, 126 insertions(+), 189 deletions(-)

diff --git a/buyer/src/components/indexDecorate/modelFormItem.vue b/buyer/src/components/indexDecorate/modelFormItem.vue
index 91c6ee17..cc4eb7a0 100644
--- a/buyer/src/components/indexDecorate/modelFormItem.vue
+++ b/buyer/src/components/indexDecorate/modelFormItem.vue
@@ -31,7 +31,7 @@
     </template>
     <!-- 限时秒杀 待完善 -->
     <!-- <template v-if="element.type == 'seckill'">
-      <seckill :data="element"></seckill>
+      <seckill class="mb_20"></seckill>
     </template> -->
     <!-- 折扣广告 -->
     <template v-if="element.type == 'discountAdvert'">
diff --git a/buyer/src/components/indexDecorate/modelList/seckill.vue b/buyer/src/components/indexDecorate/modelList/seckill.vue
index adbf6f5e..79c8af78 100644
--- a/buyer/src/components/indexDecorate/modelList/seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/seckill.vue
@@ -14,29 +14,10 @@
         {{ actStatus == 0 ? "未开始" : "已结束" }}
       </div>
     </div>
-    <div class="section">
-      <swiper ref="mySwiper" :options="swiperOptions">
-        <swiper-slide
-          v-for="(item, index) in options.list[0].goodsList"
-          :key="index"
-          class="swiper-slide"
-        >
-          <div class="content hover-pointer" @click="goPromotion">
-            <img :src="item.img" width="140" height="140" :alt="item.name" />
-            <div class="ellipsis">{{ item.name }}</div>
-            <div>
-              <span>{{ item.price | unitPrice("￥") }}</span>
-              <span>{{ item.originalPrice | unitPrice("￥") }}</span>
-            </div>
-          </div>
-        </swiper-slide>
-      </swiper>
-    </div>
   </div>
 </template>
 <script>
 import { Swiper, SwiperSlide, directive } from 'vue-awesome-swiper';
-// import 'swiper/swiper-bundle.css';
 export default {
   components: {
     Swiper,
@@ -53,7 +34,7 @@ export default {
   },
   data () {
     return {
-      options: this.data.options, // 装修数据
+      list: [], // 秒杀商品
       actStatus: 0, // 0 未开始  1 进行中   2 已结束
       actName: '限时秒杀', // 活动名称
       currHour: '00', // 当前秒杀场
@@ -70,75 +51,13 @@ export default {
       }
     };
   },
-  watch: {
-    diffSeconds (val) {  // 秒杀倒计时
-      const hours = Math.floor(val / 3600);
-      // 当前秒数 / 60，向下取整
-      // 获取到所有分钟数 3600 / 60 = 60分钟
-      // 对60取模，超过小时数的分钟数
-      const minutes = Math.floor(val / 60) % 60;
-      // 当前的秒数 % 60，获取到 超过小时数、分钟数的秒数（秒数）
-      const seconds = val % 60;
-      this.hours = hours < 10 ? '0' + hours : hours;
-      this.minutes = minutes < 10 ? '0' + minutes : minutes;
-      this.seconds = seconds < 10 ? '0' + seconds : seconds;
-
-      if (val === 0) {
-        clearInterval(this.interval);
-        this.hours = 0;
-        this.minutes = 0;
-        this.seconds = 0;
-        this.countDown(this.options.list);
-      }
-    }
-  },
   mounted () {
-    this.countDown(this.options.list);
+    
   },
   beforeDestroy () {
     clearInterval(this.interval);
   },
   methods: {
-    // 倒计时
-    countDown (list) {
-      /**
-       * 默认倒计时两小时
-       * 如果没有开始，则显示未开始
-       * 进行中显示倒计时 + 时间
-       * 今天的秒杀结束则显示已结束
-       */
-      let nowHour = new Date().getHours();
-      if (nowHour < Number(list[0].time)) {
-        // 活动未开始
-        this.currHour = list[0].time;
-        this.actStatus = 0;
-      } else if (nowHour >= Number(list[list.length - 1].time + 2)) {
-        // 活动已结束
-        this.actStatus = 2;
-        this.currHour = list[list.length - 1].time;
-      } else {
-        // 活动进行中
-        this.actStatus = 1;
-        for (let i = 0; i < list.length; i++) {
-          if (nowHour === Number(list[i].time)) {
-            this.currHour = list[i].time;
-          }
-          if (
-            nowHour > Number(list[i].time) &&
-            nowHour < Number(list[i].time + 2)
-          ) {
-            this.currHour = list[i].time;
-          }
-        }
-        // 当前0点时间戳
-        let zeroTime = new Date(new Date().toLocaleDateString()).getTime();
-        // 活动倒计时
-        this.diffSeconds = Math.floor((zeroTime + 3600 * 1000 * (this.currHour + 2) - new Date().getTime()) / 1000);
-        this.interval = setInterval(() => {
-          this.diffSeconds--;
-        }, 1000);
-      }
-    },
     goPromotion () { // 跳转秒杀页面
       let routeUrl = this.$router.resolve({
         path: '/seckill'
diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue
index d3786da9..b8011951 100644
--- a/manager/src/views/seller/bill/bill-detail.vue
+++ b/manager/src/views/seller/bill/bill-detail.vue
@@ -1,99 +1,85 @@
 <template>
   <div>
-    <template>
-      <Row>
-        <i-col span="24">
-          <Card>
-            <p slot="title">商家信息</p>
-            <div class="flex flex_align_item">
-              <p>店铺名称：{{ bill.storeName }}</p>
-              <p>银行开户名：{{ bill.bankAccountName }}</p>
-              <p>银行账号：{{ bill.bankAccountNumber }}</p>
-              <p>开户行支行名称：{{ bill.bankName }}</p>
-              <p>支行联行号：{{ bill.bankCode }}</p>
-            </div>
-          </Card>
-        </i-col>
-      </Row>
-    </template>
-    <template>
-      <Row>
-        <i-col span="24">
-          <Card>
-            <p slot="title">账单详细</p>
+    <Card>
+      <p slot="title">商家信息</p>
+      <div class="flex flex_align_item">
+        <p>店铺名称：{{ bill.storeName }}</p>
+        <p>银行开户名：{{ bill.bankAccountName }}</p>
+        <p>银行账号：{{ bill.bankAccountNumber }}</p>
+        <p>开户行支行名称：{{ bill.bankName }}</p>
+        <p>支行联行号：{{ bill.bankCode }}</p>
+      </div>
+    </Card>
+    <Card class="mt_10 mb_10">
+      <p slot="title">账单详细</p>
 
-            <div class="tips-status">
-              <span>商品状态</span>
+      <div class="tips-status">
+        <span>商品状态</span>
 
-              <span class="theme_color">{{
-                bill.billStatus | unixSellerBillStatus
-              }}</span>
+        <span class="theme_color">{{
+          bill.billStatus | unixSellerBillStatus
+        }}</span>
 
 
-              <Button
-                v-if="bill.billStatus == 'CHECK'"
-                size="mini"
-                type="primary"
-                @click="pass()"
-                >付款</Button
-              >
-            </div>
+        <Button
+          v-if="bill.billStatus == 'CHECK'"
+          size="mini"
+          type="primary"
+          @click="pass()"
+          >付款</Button
+        >
+      </div>
 
-            <i-table :columns="columns" :data="data" stripe></i-table>
-          </Card>
-        </i-col>
-      </Row>
-    </template>
-    <template>
-      <Tabs active-key="key1" @on-click="clickTabs">
-        <Tab-pane label="入账流水" key="key1">
-          <Card>
-            <Table
-              :loading="loading"
-              border
-              :columns="orderColumns"
-              :data="order"
-              ref="table"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="orderParam.pageNumber"
-                :total="orderTotal"
-                :page-size="orderParam.pageSize"
-                @on-change="orderChangePage"
-                @on-page-size-change="orderChangePageSize"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </Row>
-          </Card>
-        </Tab-pane>
-        <Tab-pane label="退款流水" key="key2">
-          <Card>
-            <Table
-              :loading="loading"
-              border
-              :columns="refundColumns"
-              :data="refund"
-              ref="table"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="refundParam.pageNumber"
-                :total="refundTotal"
-                :page-size="refundParam.pageSize"
-                @on-change="getRefund()"
-                @on-page-size-change="getRefund()"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </Row>
-          </Card>
-        </Tab-pane>
-      </Tabs>
-    </template>
+      <i-table :columns="columns" :data="data" stripe></i-table>
+    </Card>
+    <Tabs active-key="key1" @on-click="clickTabs">
+      <Tab-pane label="入账流水" key="key1">
+        <Card>
+          <Table
+            :loading="loading"
+            border
+            :columns="orderColumns"
+            :data="order"
+            ref="table"
+          ></Table>
+          <Row type="flex" justify="end" class="mt_10">
+            <Page
+              :current="orderParam.pageNumber"
+              :total="orderTotal"
+              :page-size="orderParam.pageSize"
+              @on-change="orderChangePage"
+              @on-page-size-change="orderChangePageSize"
+              size="small"
+              show-total
+              show-elevator
+            ></Page>
+          </Row>
+        </Card>
+      </Tab-pane>
+      <Tab-pane label="退款流水" key="key2">
+        <Card>
+          <Table
+            :loading="loading"
+            border
+            :columns="refundColumns"
+            :data="refund"
+            ref="table"
+          ></Table>
+          <Row type="flex" justify="end" class="mt_10">
+            <Page
+              :current="refundParam.pageNumber"
+              :total="refundTotal"
+              :page-size="refundParam.pageSize"
+              @on-change="getRefund()"
+              @on-page-size-change="getRefund()"
+              size="small"
+              show-total
+              show-elevator
+            ></Page>
+          </Row>
+        </Card>
+      </Tab-pane>
+    </Tabs>
   </div>
 </template>
 <script>
@@ -185,6 +171,26 @@ export default {
             );
           },
         },
+        {
+          title: "砍价商品结算价格",
+          key: "kanjiaSettlementPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "积分商品结算价格",
+          key: "pointSettlementPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥")
+            );
+          },
+        },
         {
           title: "平台分佣",
           key: "commissionPrice",
@@ -199,7 +205,6 @@ export default {
         {
           title: "平台优惠券",
           key: "siteCouponPrice",
-          minWidth: 120,
           render: (h, params) => {
             if(params.row.siteCouponPrice == null){
               return h(
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 58601d66..8c06b576 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.101:8890',
-    buyer: 'http://192.168.0.101:8888',
-    seller: 'http://192.168.0.101:8889',
-    manager: 'http://192.168.0.101:8887'
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.101:8890',
+    // buyer: 'http://192.168.0.101:8888',
+    // seller: 'http://192.168.0.101:8889',
+    // manager: 'http://192.168.0.101:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index a4de7017..83cde02b 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -165,17 +165,14 @@ export default {
         {
           title: "入账时间",
           key: "createTime",
-          minWidth: 120
         },
         {
           title: "订单编号",
           key: "sn",
-          minWidth: 120
         },
         {
           title: "订单金额",
           key: "finalPrice",
-          minWidth: 120,
           render: (h, params) => {
             return h(
               "div",
@@ -183,10 +180,29 @@ export default {
             );
           },
         },
+        {
+          title: "砍价商品结算价格",
+          key: "kanjiaSettlementPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "积分商品结算价格",
+          key: "pointSettlementPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥")
+            );
+          },
+        },
         {
           title: "平台分佣",
           key: "commissionPrice",
-          minWidth: 120,
           render: (h, params) => {
             return h(
               "div",
@@ -197,7 +213,6 @@ export default {
         {
           title: "平台优惠券",
           key: "siteCouponPrice",
-          minWidth: 120,
           render: (h, params) => {
             if(params.row.siteCouponPrice == null){
               return h(
@@ -216,7 +231,6 @@ export default {
         {
           title: "分销金额",
           key: "distributionRebate",
-          minWidth: 100,
           render: (h, params) => {
             if(params.row.distributionRebate == null){
               return h(
@@ -235,7 +249,6 @@ export default {
         {
           title: "应结金额",
           key: "billPrice",
-          minWidth: 120,
           render: (h, params) => {
             return h(
               "div",