解决运营后台出现的bug

manager/src/config/index.js

@@ -21,10 +21,10 @@ export default {
     // buyer: "https://buyer-api.pickmall.cn",
     // seller: "https://store-api.pickmall.cn",
     // manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.100:8890',
-    buyer: 'http://192.168.0.100:8888',
-    seller: 'http://192.168.0.100:8889',
-    manager: 'http://192.168.0.100:8887'
+    common: 'http://192.168.0.109:8890',
+    buyer: 'http://192.168.0.109:8888',
+    seller: 'http://192.168.0.109:8889',
+    manager: 'http://192.168.0.109:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/order/order/fictitiousOrderList.vue

@@ -94,8 +94,8 @@
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
           pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
+          sort: "", // 默认排序字段
+          order: "", // 默认排序方式
           startDate: "", // 起始时间
           endDate: "", // 终止时间
           orderType: "FICTITIOUS",
@@ -118,8 +118,6 @@
             title: "下单时间",
             key: "createTime",
             width: 200,
-            sortable: true,
-            sortType: "desc",
           },
           {
             title: "订单来源",

manager/src/views/order/order/orderDetail.vue

@@ -37,7 +37,7 @@
               <div class="div-item">
                 <div class="div-item-left">订单来源：</div>
                 <div class="div-item-right">
-                  {{ orderInfo.order.clientType }}
+                  {{ orderInfo.order.clientType  | clientTypeWay}}
                 </div>
               </div>
 

manager/src/views/promotion/coupon/coupon.vue

@@ -101,7 +101,7 @@ export default {
         {
           title: "面额/折扣",
           key: "price",
-          width: 120,
+          width: 100,
           render: (h, params) => {
             if (params.row.price) {
               return h(
@@ -117,14 +117,14 @@ export default {
         {
           title: "领取数量/总数量",
           key: "publishNum",
-          width: 150,
+          width: 130,
           render: (h, params) => {
             return h(
               "div",
               params.row.receivedNum + "/" + params.row.publishNum
             );
           },
-          minWidth: 130,
+
         },
         {
           title: "优惠券类型",

manager/src/views/promotion/seckill/seckill.vue

@@ -24,78 +24,35 @@
       <Row class="operation padding-row">
         <Button type="primary" @click="add">添加活动</Button>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        class="page"
-      >
-        <template slot-scope="{ row }" slot="action">
-          <Button
-            type="info"
-            size="small"
-            class="mr_5"
-            v-if="row.promotionStatus == 'NEW'"
-            @click="edit(row)"
-            >编辑</Button
-          >
+      <Tabs value="list"  @on-click="clickTabPane">
+        <TabPane label="秒杀活动列表" name="list">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="page">
+            <template slot-scope="{ row }" slot="action">
+              <Button type="info" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="edit(row)">编辑</Button>
 
-          <Button
-            type="info"
-            size="small"
-            class="mr_5"
-            v-else
-            @click="manage(row)"
-            >查看</Button
-          >
+              <Button type="info" size="small" class="mr_5" v-else @click="manage(row)">查看</Button>
 
-          <Button
-            type="primary"
-            size="small"
-            class="mr_5"
-            v-if="row.promotionStatus == 'NEW'"
-            @click="manage(row)"
-            >管理</Button
-          >
+              <Button type="primary" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="manage(row)">管理</Button>
 
-          <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
-          <Button
-            type="error"
-            size="small"
-            v-if="
-              row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
-            "
-            class="mr_5"
-            @click="off(row)"
-            >下架</Button
-          >
+              <Button type="error" size="small" v-if="
+                row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
+              " class="mr_5" @click="off(row)">下架</Button>
+              &nbsp;
+              <Button type="error" size="small" v-if="row.promotionStatus == 'CLOSE'" ghost @click="expire(row)">删除</Button>
+            </template>
+          </Table>
+
+          <Row type="flex" justify="end" class="page">
+            <Page style="margin: 20px 0;" :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>
+        </TabPane>
+        <TabPane label="秒杀活动设置" name="setup">
+
+          <setupSeckill v-if="setupFlag"></setupSeckill>
+        </TabPane>
+      </Tabs>
 
-          <Button
-            type="error"
-            size="small"
-            v-if="row.promotionStatus == 'CLOSE'"
-            ghost
-            @click="expire(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]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
     </Card>
   </div>
 </template>
@@ -302,7 +259,7 @@ export default {
 </script>
 <style lang="scss">
 @import "@/styles/table-common.scss";
-.mr_5{
-  margin: 0 4px;
+.mr_5 {
+  margin: 0 5px;
 }
 </style>

manager/src/views/promotion/seckill/setupSeckill.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="templateShow">
     <Form :model="form" :label-width="120">
       <FormItem label="每日场次设置">
         <Row :gutter="16" class="row">
@@ -27,6 +27,7 @@ import { getSetting, setSetting } from "@/api/index";
 export default {
   data() {
     return {
+      templateShow:false,
       submitLoading: false,
       selectedTime: [],
       times: [], //时间集合 1-24点
@@ -81,6 +82,7 @@ export default {
     async init() {
       let result = await getSetting("SECKILL_SETTING");
       if (result.success) {
+        this.templateShow = true
         this.form.seckillRule = result.result.seckillRule;
         this.times=[]
         for (let i = 0; i < 24; i++) {

manager/src/views/statistics/order/orderDetail.vue

@@ -6,7 +6,7 @@
       <div class="shop-item">
         <div class="label-item">
           <span>订单来源</span>
-          <span>{{res.clientType}}</span>
+          <span>{{res.clientType | clientTypeWay}}</span>
         </div>
         <div class="label-item">
           <span>订单状态</span>