买家优惠券页面调整，订单导出添加参数，订单详情样式调整

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",

seller/src/views/order/order/orderDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="search">
     <Card style="height: 60px">
-      <div style="">
+      <div>
         <Button
           v-if="allowOperation.editPrice"
           @click="modifyPrice"
@@ -30,127 +30,124 @@
       </div>
     </Card>
 
-    <Card style="height: 400px" class="mt_10">
-      <div style="width: 30%; float: left; margin-left: 20px">
-        <div class="div-item">
-          <div class="div-item-left">订单号：</div>
-          <div class="div-item-right">{{ orderInfo.order.sn }}</div>
-        </div>
-        <div class="div-item">
-          <div class="div-item-left">订单来源：</div>
-          <div class="div-item-right">
-            {{ orderInfo.order.clientType | clientTypeWay }}
-          </div>
-        </div>
-      </div>
-
-      <div class="div-item">
-        <div class="div-item-left">订单状态：</div>
-        <div class="div-item-right">
-          {{ orderInfo.orderStatusValue }}
-        </div>
-      </div>
-
-      <div class="div-item">
-        <div class="div-item-left">下单时间：</div>
-        <div class="div-item-right">
-          {{ orderInfo.order.createTime }}
-        </div>
-      </div>
-
-      <div style="width: 30%; float: left; margin-left: 20px">
-        <div class="div-item" v-if="orderInfo.order.needReceipt == false">
-          <div class="div-item-left">发票信息：</div>
-          <div class="div-item-right">暂无发票信息</div>
-        </div>
-        <template v-if="orderInfo.order.needReceipt == true && orderInfo.receipt">
+    <Card class="mt_10">
+      <Row>
+        <Col span="12">
           <div class="div-item">
-            <div class="div-item-left">发票抬头：</div>
+            <div class="div-item-left">订单号：</div>
+            <div class="div-item-right">{{ orderInfo.order.sn }}</div>
+          </div>
+          <div class="div-item">
+            <div class="div-item-left">订单来源：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.clientType | clientTypeWay }}
+            </div>
+          </div>
+          <div class="div-item">
+            <div class="div-item-left">订单状态：</div>
+            <div class="div-item-right">
+              {{ orderInfo.orderStatusValue }}
+            </div>
+          </div>
+
+          <div class="div-item">
+            <div class="div-item-left">下单时间：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.createTime }}
+            </div>
+          </div>
+          <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+            <div class="div-item-left">发票信息：</div>
+            <div class="div-item-right">暂无发票信息</div>
+          </div>
+          <template v-if="orderInfo.order.needReceipt == true && orderInfo.receipt">
+            <div class="div-item">
+              <div class="div-item-left">发票抬头：</div>
+              <div class="div-item-right">
+                {{
+                  orderInfo.receipt.receiptTitle
+                    ? orderInfo.receipt.receiptTitle
+                    : "暂无"
+                }}
+              </div>
+            </div>
+
+            <div class="div-item" v-if="orderInfo.receipt.taxpayerId">
+              <div class="div-item-left">发票税号：</div>
+              <div class="div-item-right">
+                {{
+                  orderInfo.receipt.taxpayerId
+                    ? orderInfo.receipt.taxpayerId
+                    : "暂无"
+                }}
+              </div>
+            </div>
+
+            <div class="div-item">
+              <div class="div-item-left">发票内容：</div>
+              <div class="div-item-right">
+                {{
+                  orderInfo.receipt.receiptContent
+                    ? orderInfo.receipt.receiptContent
+                    : "暂无"
+                }}
+              </div>
+            </div>
+
+            <div class="div-item">
+              <div class="div-item-left">发票金额：</div>
+              <div class="div-item-right">
+                <span v-if="orderInfo.receipt.receiptPrice">￥</span
+                >{{
+                  orderInfo.receipt.receiptPrice
+                    ? orderInfo.receipt.receiptPrice
+                    : "暂无" | unitPrice
+                }}
+              </div>
+            </div>
+
+            <div class="div-item">
+              <div class="div-item-left">是否开票：</div>
+              <div class="div-item-right">
+                {{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
+              </div>
+            </div>  
+          </template>
+        </Col>
+        <Col span="12">
+          <div class="div-item">
+            <div class="div-item-left">收货信息：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.consigneeName }}
+              {{ orderInfo.order.consigneeMobile }}
+              {{ orderInfo.order.consigneeAddressPath }}
+              {{ orderInfo.order.consigneeDetail }}
+            </div>
+          </div>
+          <div class="div-item">
+            <div class="div-item-left">支付方式：</div>
+            <div class="div-item-right">
+              {{ orderInfo.paymentMethodValue }}
+            </div>
+          </div>
+
+          <div class="div-item">
+            <div class="div-item-left">买家留言：</div>
+            <div class="div-item-right">{{ orderInfo.order.remark }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.orderType != 'VIRTUAL'">
+            <div class="div-item-left">配送方式：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptTitle
-                  ? orderInfo.receipt.receiptTitle
-                  : "暂无"
+                orderInfo.deliveryMethodValue
+                  ? orderInfo.deliveryMethodValue
+                  : "暂无配送方式"
               }}
             </div>
           </div>
-
-          <div class="div-item" v-if="orderInfo.receipt.taxpayerId">
-            <div class="div-item-left">发票税号：</div>
-            <div class="div-item-right">
-              {{
-                orderInfo.receipt.taxpayerId
-                  ? orderInfo.receipt.taxpayerId
-                  : "暂无"
-              }}
-            </div>
-          </div>
-
-          <div class="div-item">
-            <div class="div-item-left">发票内容：</div>
-            <div class="div-item-right">
-              {{
-                orderInfo.receipt.receiptContent
-                  ? orderInfo.receipt.receiptContent
-                  : "暂无"
-              }}
-            </div>
-          </div>
-
-          <div class="div-item">
-            <div class="div-item-left">发票金额：</div>
-            <div class="div-item-right">
-              <span v-if="orderInfo.receipt.receiptPrice">￥</span
-              >{{
-                orderInfo.receipt.receiptPrice
-                  ? orderInfo.receipt.receiptPrice
-                  : "暂无" | unitPrice
-              }}
-            </div>
-          </div>
-
-          <div class="div-item">
-            <div class="div-item-left">是否开票：</div>
-            <div class="div-item-right">
-              {{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
-            </div>
-          </div>  
-        </template>
-        
-      </div>
-      <div style="width: 36%; float: left">
-        <div class="div-item">
-          <div class="div-item-left">收货信息：</div>
-          <div class="div-item-right">
-            {{ orderInfo.order.consigneeName }}
-            {{ orderInfo.order.consigneeMobile }}
-            {{ orderInfo.order.consigneeAddressPath }}
-            {{ orderInfo.order.consigneeDetail }}
-          </div>
-        </div>
-        <div class="div-item">
-          <div class="div-item-left">支付方式：</div>
-          <div class="div-item-right">
-            {{ orderInfo.paymentMethodValue }}
-          </div>
-        </div>
-
-        <div class="div-item">
-          <div class="div-item-left">买家留言：</div>
-          <div class="div-item-right">{{ orderInfo.order.remark }}</div>
-        </div>
-
-        <div class="div-item" v-if="orderInfo.order.orderType != 'VIRTUAL'">
-          <div class="div-item-left">配送方式：</div>
-          <div class="div-item-right">
-            {{
-              orderInfo.deliveryMethodValue
-                ? orderInfo.deliveryMethodValue
-                : "暂无配送方式"
-            }}
-          </div>
-        </div>
-      </div>
+        </Col>
+      </Row>
     </Card>
 
     <Card class="mt_10">

seller/src/views/order/order/orderList.vue

@@ -53,7 +53,6 @@
 
 <script>
 import * as API_Order from "@/api/order";
-import { verificationCode } from "@/api/order";
 import JsonExcel from "vue-json-excel";
 import Cookies from "js-cookie";
 export default {
@@ -186,6 +185,12 @@ export default {
         '收货人': 'consigneeName',
         '收货人联系电话': 'consigneeMobile',
         '收货地址': 'consigneeAddress',
+        '商品名称': 'goodsName',
+        '商品价格': 'goodsPrice',
+        '订单金额': 'flowPrice',
+        '商品数量': 'num',
+        '店铺名称': 'storeName',
+        '创建时间': 'createTime'
       }
     };
   },
@@ -275,6 +280,8 @@ export default {
           res.result[i].index = i+1;
           res.result[i].consigneeAddress = 
             res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
+          res.result[i].goodsPrice = this.$options.filters.unitPrice(res.result[i].goodsPrice,'￥')
+          res.result[i].flowPrice = this.$options.filters.unitPrice(res.result[i].flowPrice,'￥')
         }
         return res.result
       } else {

seller/src/views/promotion/coupon/coupon.vue

@@ -27,12 +27,12 @@
       </Row>
       <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
         <template slot-scope="{ row }" slot="action">
-          <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 10px" @click="edit(row)">编辑</Button>
+          <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 5px" @click="edit(row)">编辑</Button>
           <Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">
-        <Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
           size="small" show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
@@ -49,7 +49,7 @@ export default {
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
         sort: "startTime", // 默认排序字段
         order: "desc", // 默认排序方式
@@ -135,7 +135,7 @@ export default {
           title: "活动时间",
 
           render: (h, params) => {
-            if (params.row.getType === "ACTIVITY") {
+            if (params.row.rangeDayType !== "FIXEDTIME") {
               return h("div", "长期有效");
             } else {
               return h("div", {
@@ -208,7 +208,7 @@ export default {
       this.$router.push({ name: "platform-coupon-info", query: { id: v.id } });
     },
     changePage(v) {
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
       this.getDataList();
       this.clearSelectAll();
     },
@@ -217,13 +217,13 @@ export default {
       this.getDataList();
     },
     handleSearch() {
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.getDataList();
     },
     handleReset() {
       this.searchForm = {};
       this.selectDate = "";
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.getDataList();
     },
     clearSelectAll() {

seller/src/views/promotion/fullCut/newFullCut.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Card>
-      <Form ref="form" :model="form" :label-width="120" :rules="formRule" class="search-form">
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
         <div class="base-info-item">
           <h4>基本信息</h4>
           <div class="form-item-view">
@@ -389,6 +389,7 @@ export default {
     getDetail() {
       // 获取活动详情
       getFullDiscountById(this.id).then((res) => {
+        console.log(res);
         let data = res.result;
         if (data.number == -1) {
           data.promotionGoodsList = [];
@@ -400,7 +401,7 @@ export default {
           data.discountType = "isFullMinus";
           delete data.isFullMinus;
         } else {
-          data.discountType = "isFullMinus";
+          data.discountType = "isFullRate";
           delete data.isFullRate;
         }
         data.rangeTime = [];