Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

seller/src/api/promotion.js

@@ -1,5 +1,23 @@
 // 统一请求路径前缀在libs/axios.js中修改
-import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+import { getRequest, postRequest, postRequestWithNoForm, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+
+
+// 获取店铺直播间列表
+export const getLivesList = (params) => {
+  return getRequest('/broadcast/studio', params)
+}
+
+// 获取店铺直播商品
+export const getLiveGoods = (params) => {
+  return getRequest('/broadcast/commodity', params)
+}
+
+// 添加店铺直播商品
+export const addLiveGoods = (params) => {
+  return postRequestWithNoForm('/broadcast/commodity', params)
+}
+
+
 
 // 获取拼团列表
 export const getPintuanList = (params) => {
@@ -128,4 +146,4 @@ export const getFullDiscountById = (id) => {
 // 删除满减活动
 export const delFullDiscount = (id) => {
     return deleteRequest(`/promotion/fullDiscount/${id}`)
-}
+}

seller/src/libs/axios.js

@@ -216,19 +216,20 @@ export const postRequestWithNoForm = (url, params) => {
   });
 };
 
-// export const postRequestWithHeaders = (url, params) => {
-//   let accessToken = getStore("accessToken");
-//   return axios({
-//     method: "post",
-//     url: `${url}`,
-//     data: params,
+export const postRequestWithHeaders = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return axios({
+    method: "post",
+    url: `${url}`,
+    data: params,
+
+    headers: {
+      accessToken: accessToken,
+      "Content-Type": "application/x-www-form-urlencoded"
+    }
+  });
+};
 
-//     headers: {
-//       accessToken: accessToken,
-//       "Content-Type": "application/x-www-form-urlencoded"
-//     }
-//   });
-// };
 
 export const putRequest = (url, params,headers) => {
   let accessToken = getStore("accessToken");

seller/src/libs/routerJson.js

@@ -425,6 +425,34 @@ export const result = [
             url: "",
             permTypes: [],
             children: null
+          },
+          {
+            name: "live",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "直播管理",
+            path: "live",
+            component: "promotion/live/live",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "liveGoods",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "直播商品",
+            path: "liveGoods",
+            component: "promotion/live/liveGoods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
           }
         ]
       },
@@ -656,7 +684,7 @@ export const result = [
             showAlways: true,
             level: 2,
             type: 0,
-            title: "自提点管理",
+            title: "自提管理",
             path: "shopAddress",
             component: "shop/shopAddress",
             icon: "md-log-in",

seller/src/router/router.js

@@ -71,6 +71,12 @@ export const otherRouter = {
       name: "add-coupon",
       component: () => import("@/views/promotion/coupon/couponPublish.vue")
     },
+    {
+      path: "add-live",
+      title: "创建直播",
+      name: "add-live",
+      component: () => import("@/views/promotion/live/addLive.vue")
+    },
     {
       path: "bill-detail",
       title: "结算单详情",

seller/src/views/Main.vue

@@ -11,7 +11,7 @@
       <shrinkable-menu></shrinkable-menu>
     </div>
     <!-- 顶部标题栏主体 -->
-    <div class="main-header-con" style="padding-left:240px">
+    <div class="main-header-con">
       <div class="main-header">
         <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
           <!-- 用户头像 -->

seller/src/views/distribution/distributionGoods.vue

@@ -1,56 +1,50 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品名称" prop="goodsName">
-                <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
-              </Form-item>
-              <!-- <Form-item label="店铺名称">
-                  <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable clearable style="width: 200px">
-                      <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
-                  </Select>
-              </Form-item> -->
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="operation padding-row">
-            <Button @click="add" type="primary">添加</Button>
-          <!--  <Button @click="add" type="default">批量删除</Button>-->
-          </Row>
-          <Row>
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 70px; display: flex;">
-                  <div style="">
-                    <img :src="row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
-                  </div>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品名称" prop="goodsName">
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
+          </Form-item>
+          <!-- <Form-item label="店铺名称">
+              <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable clearable style="width: 200px">
+                  <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
+              </Select>
+          </Form-item> -->
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+      <!--  <Button @click="add" type="default">批量删除</Button>-->
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 70px; display: flex;">
+            <div style="">
+              <img :src="row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
     <liliDialog
       ref="liliDialog"
       @selectedGoodsData="selectedGoodsData"

seller/src/views/distribution/distributionOrder.vue

@@ -1,30 +1,24 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="订单编号" prop="orderSn">
-              <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单编号" clearable style="width: 200px" />
-            </Form-item>
-            <Form-item label="订单时间">
-              <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间" style="width: 210px"></DatePicker>
-            </Form-item>
-            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-          </Form>
-        </Row>
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单编号" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="订单时间">
+            <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间" style="width: 210px"></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
 
-        <Row class="padding-row">
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <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>
-      </Col>
-    </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
 
   </div>
 </template>

seller/src/views/goods/goods-seller/addGoods.scss

@@ -222,14 +222,13 @@ div.base-info-item {
 
 /** 底部步骤 */
 .footer {
-  width: 88.7%;
+  width: 100%;
   padding: 10px;
   background-color: #ffc;
-  position: fixed;
+  position: sticky;
   bottom: 0px;
-  left: 10%;
   text-align: center;
-  z-index: 9999;
+  z-index: 9;
 }
 
 /*图片上传组件第一张图设置封面*/

seller/src/views/goods/goods-seller/draftGoods.vue

@@ -1,88 +1,82 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              placeholder="请输入商品名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <span v-if="drop">
+            <Form-item label="状态" prop="status">
+              <Select
+                v-model="searchForm.marketEnable"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+                <Option value="DOWN">下架</Option>
+                <Option value="UPPER">上架</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="商品编号" prop="sn">
+              <Input
+                type="text"
+                v-model="searchForm.sn"
+                placeholder="商品编号"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+          </span>
+          <Form-item style="margin-left: -35px" class="br">
+            <Button @click="handleSearch" type="primary" icon="ios-search"
+              >搜索</Button
             >
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  placeholder="请输入商品名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <span v-if="drop">
-                <Form-item label="状态" prop="status">
-                  <Select
-                    v-model="searchForm.marketEnable"
-                    placeholder="请选择"
-                    clearable
-                    style="width: 200px"
-                  >
-                    <Option value="DOWN">下架</Option>
-                    <Option value="UPPER">上架</Option>
-                  </Select>
-                </Form-item>
-                <Form-item label="商品编号" prop="sn">
-                  <Input
-                    type="text"
-                    v-model="searchForm.sn"
-                    placeholder="商品编号"
-                    clearable
-                    style="width: 200px"
-                  />
-                </Form-item>
-              </span>
-              <Form-item style="margin-left: -35px" class="br">
-                <Button @click="handleSearch" type="primary" icon="ios-search"
-                  >搜索</Button
-                >
-                <Button @click="handleReset">重置</Button>
-                <a class="drop-down" @click="dropDown">
-                  {{ dropDownContent }}
-                  <Icon :type="dropDownIcon"></Icon>
-                </a>
-              </Form-item>
-            </Form>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+            <Button @click="handleReset">重置</Button>
+            <a class="drop-down" @click="dropDown">
+              {{ dropDownContent }}
+              <Icon :type="dropDownIcon"></Icon>
+            </a>
+          </Form-item>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"

seller/src/views/goods/goods-seller/goods.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="search">
-
     <Card>
       <Row @keydown.enter.native="handleSearch">
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@@ -31,7 +30,7 @@
             <DropdownItem name="uppers">批量上架</DropdownItem>
             <DropdownItem name="lowers">批量下架</DropdownItem>
             <DropdownItem name="deleteAll">批量删除</DropdownItem>
-            <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
+            <!-- <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem> -->
           </DropdownMenu>
         </Dropdown>
       </Row>

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="goods-operation">
     <div style="height: 45px">
       <steps
         :current="activestep"
@@ -522,7 +522,7 @@
                 <span slot="append">kg</span>
               </Input>
             </FormItem>
-            <FormItem class="form-item-view-el" label="运费" prop="skuList">
+            <!-- <FormItem class="form-item-view-el" label="运费" prop="skuList">
               <RadioGroup type="button" button-style="solid"
                 @on-change="logisticsTemplateChange"
                 v-model="baseInfoForm.freightPayer"
@@ -534,7 +534,7 @@
                   <span>使用物流规则</span>
                 </Radio>
               </RadioGroup>
-            </FormItem>
+            </FormItem> -->
             <FormItem
               class="form-item-view-el"
               label="物流模板"
@@ -699,7 +699,7 @@ export default {
         this.baseInfoForm = {
           salesModel: "RETAIL",
           goodsParamsList: [],
-          freightPayer: "STORE",
+          // freightPayer: "STORE",
           weight: "",
           goodsGalleryFiles: [],
           release: "true",
@@ -844,7 +844,7 @@ export default {
         /** 商品参数列表 */
         goodsParamsList: [],
         /** 运费承担者 */
-        freightPayer: "STORE",
+        // freightPayer: "STORE",
         /** 商品重量 */
         weight: "",
         /** 商品相册列表 */
@@ -1007,7 +1007,7 @@ export default {
       this.baseInfoForm = {
         salesModel: "RETAIL",
         goodsParamsList: [],
-        freightPayer: "STORE",
+        // freightPayer: "STORE",
         weight: "",
         goodsGalleryFiles: [],
         release: "true",
@@ -1235,14 +1235,14 @@ export default {
         ...response.result,
       };
       console.warn(this.baseInfoForm);
-      if (this.baseInfoForm.freightPayer === "BUYER") {
-        API_Shop.getShipTemplate().then((res) => {
-          if (res.success) {
-            this.logisticsTemplate = res.result;
-          }
-        });
-        this.logisticsTemplateShow = true;
-      }
+      // if (this.baseInfoForm.freightPayer === "BUYER") {
+      //   API_Shop.getShipTemplate().then((res) => {
+      //     if (res.success) {
+      //       this.logisticsTemplate = res.result;
+      //     }
+      //   });
+      //   this.logisticsTemplateShow = true;
+      // }
       this.baseInfoForm.release = "true";
       this.baseInfoForm.recommend = this.baseInfoForm.recommend
         ? "true"
@@ -1840,9 +1840,9 @@ export default {
             return;
           }
           //如果选择的是卖家承担运费 则运费模板重置为0
-          if (this.baseInfoForm.freightPayer !== "BUYER") {
-            this.baseInfoForm.templateId = 0;
-          }
+          // if (this.baseInfoForm.freightPayer !== "BUYER") {
+          //   this.baseInfoForm.templateId = 0;
+          // }
 
           this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
             delete sku._index;

seller/src/views/goods/goods-seller/goodsStock.vue

@@ -68,18 +68,16 @@
               <a class="select-clear" @click="clearSelectAll">清空</a>
             </Alert>
           </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          ></Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchForm.pageNumber"

seller/src/views/lili-dialog/goods-dialog.vue

@@ -41,12 +41,17 @@
 <script>
 import * as API_Goods from "@/api/goods";
 export default {
-  data() {
+  props: {
+    selectedWay: {
+      type: Array,
+      default: new Array()
+    }
+  },
+  data () {
     return {
       type: "multiple", //单选或者多选 single  multiple
 
       cateList: [], // 商品分类列表
-      selectedWay: [], //选中商品集合
       total: "", // 商品总数
       goodsParams: { // 请求商品列表参数
         pageNumber: 1,
@@ -64,18 +69,17 @@ export default {
       loading: false, // 商品加载loading
     };
   },
-  props: ["clearFlag"],
   watch: {
     category(val) {
       this.goodsParams.categoryPath = val[2];
     },
     selectedWay: {
-      handler() {
+      handler(val) {
         this.$emit("selected", this.selectedWay);
       },
       deep: true,
+      immediate: true
     },
-
     "goodsParams.categoryPath": {
       handler: function () {
         this.goodsData = [];
@@ -88,7 +92,7 @@ export default {
     this.init();
   },
   methods: {
-    handleReachBottom() {
+    handleReachBottom() { // 页面触底触发加载
       setTimeout(() => {
         if (
           this.goodsParams.pageNumber * this.goodsParams.pageSize <=
@@ -99,17 +103,24 @@ export default {
         }
       }, 1500);
     },
-    getQueryGoodsList() {
+    getQueryGoodsList() { // 根据商品分类筛选商品
       API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
         this.initGoods(res);
       });
     },
 
-    initGoods(res) {
+    initGoods(res) { // 获取商品列表
       if (res.result.records.length !=0) {
-        res.result.records.forEach((item) => {
+        let data = res.result.records;
+        data.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
+
+          this.selectedWay.forEach(e => {
+            if (e.id === item.id) {
+              item.selected = true 
+            }
+          })
         });
         /**
          * 解决数据请求中，滚动栏会一直上下跳动
@@ -141,7 +152,6 @@ export default {
     deepGroup(val) {
       val.forEach((item) => {
         let childWay = []; //第二级
-        let grandWay = []; //第三级
         // 第二层
         if (item.children) {
           item.children.forEach((child) => {
@@ -196,7 +206,12 @@ export default {
         this.selectedWay.push(val);
       } else {
         val.selected = false;
-        this.selectedWay.splice(index, 1);
+        for (let i = 0; i<this.selectedWay.length; i++ ) {
+          if (this.selectedWay[i].id===val.id) {
+            this.selectedWay.splice(i,1)
+            break;
+          }
+        }
       }
     },
   },

seller/src/views/lili-dialog/index.vue

@@ -10,20 +10,13 @@
     scrollable
   >
     <goodsDialog
-      @selected="
-        (val) => {
-          goodsData = val;
-        }
-      "
+      @selected="(val) => {goodsData = val;}"
+      :selectedWay='goodsData'
       ref="goodsDialog"
       v-if="goodsFlag"
     />
     <linkDialog
-      @selectedLink="
-        (val) => {
-          linkData = val;
-        }
-      "
+      @selectedLink="(val) => {linkData = val;}"
       v-else
       class="linkDialog"
     />
@@ -41,14 +34,11 @@ export default {
     return {
       title: "选择", // 模态框标题
       goodsFlag: false, // 是否商品选择器
-      goodsData: "", //选择的商品
+      goodsData: [], //选择的商品
       linkData: "", //选择的链接
       flag: false, // 控制模态框显隐
     };
   },
-  props: ["types"],
-  watch: {},
-  mounted() {},
   methods: {
     // 关闭弹窗
     clickClose() {
@@ -58,7 +48,6 @@ export default {
 
     // 单选商品
     singleGoods(){
-
       var timer = setInterval(() => {
         if (this.$refs.goodsDialog) {
 
@@ -66,19 +55,16 @@ export default {
          clearInterval(timer);
         }
       }, 100);
-
-
     },
-    clickOK() {
+    clickOK() { // 确定按钮回调，
       if (this.goodsFlag) {
         this.$emit("selectedGoodsData", this.goodsData);
       } else {
         this.$emit("selectedLink", this.linkData);
       }
       this.clickClose();
-      // this.clearFlag = false
     },
-    open(type){
+    open (type) { // 父组件通过ref调用，打开商品选择器
       this.flag = true;
       if(type == 'goods'){
         this.goodsFlag = true;
@@ -87,7 +73,7 @@ export default {
       }
 
     },
-    close(){
+    close(){ // 关闭组件
       this.flag = false;
     }
   },

seller/src/views/logistics/index.vue

@@ -1,51 +1,45 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch"> </Row>
-          <Row class="operation">
-            <Button @click="add" type="primary" icon="md-add">添加</Button>
-            <Button @click="getDataList" icon="md-refresh">刷新</Button>
-            <Button type="dashed" @click="openTip = !openTip">{{
-              openTip ? "关闭提示" : "开启提示"
-            }}</Button>
-          </Row>
-          <Row v-show="openTip">
-            <Alert show-icon>
-              已选择 <span class="select-count">{{ selectCount }}</span> 项
-              <a class="select-clear" @click="clearSelectAll">清空</a>
-            </Alert>
-          </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch"> </Row>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">添加</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "关闭提示" : "开启提示"
+        }}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"

seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue

@@ -5,7 +5,7 @@
 <template>
   <div class="ivu-shrinkable-menu">
     <!-- 一级菜单 -->
-    <Menu ref="sideMenu" width="110px" theme="dark"  :active-name="currNav" @on-select="selectNav">
+    <Menu ref="sideMenu" width="80px" theme="dark"  :active-name="currNav" @on-select="selectNav">
       <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
         {{item.title}}
       </MenuItem>
@@ -14,7 +14,7 @@
     <Menu
       ref="childrenMenu"
       :active-name="$route.name"
-      width="130px"
+      width="100px"
       @on-select="changeMenu"
     >
       <template v-for="item in menuList">

seller/src/views/main-components/shrinkable-menu/styles/menu.scss

@@ -1,6 +1,6 @@
 .ivu-shrinkable-menu{
   height: calc(100% - 60px);
-  width: 240px;
+  width: 180px;
   display: flex;
 }
 .ivu-menu-vertical .ivu-menu-item-group-title {

seller/src/views/main.scss

@@ -52,7 +52,7 @@
     box-sizing: border-box;
     position: fixed;
     display: block;
-    padding-left: 200px;
+    padding-left: 180px;
     width: 100%;
     height: 100px;
     z-index: 20;
@@ -253,14 +253,13 @@
 
   .single-page-con {
     min-width: 740px;
-    left: 240px;
+    left: 180px;
     position: relative;
     top: 100px;
     right: 0;
     bottom: 0;
-    height: calc(100% + 200px);
-    
-    width: calc(100% - 240px);
+    height: calc(100% - 110px);
+    width: calc(100% - 180px);
     background-color: #f0f0f0;
     z-index: 1;
     transition: left 0.3s;

seller/src/views/member/memberComment.vue

@@ -1,79 +1,73 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="商品名称" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  clearable
-                  placeholder="请输入商品名"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="评价" prop="orderStatus">
-                <Select v-model="searchForm.grade" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="GOOD">好评</Option>
-                  <Option value="MODERATE">中评</Option>
-                  <Option value="WORSE">差评</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="评论日期">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="商品名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              clearable
+              placeholder="请输入商品名"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="评价" prop="orderStatus">
+            <Select v-model="searchForm.grade" placeholder="请选择" clearable style="width: 200px">
+              <Option value="GOOD">好评</Option>
+              <Option value="MODERATE">中评</Option>
+              <Option value="WORSE">差评</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="评论日期">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"

seller/src/views/order/after-order/orderComplaint.vue

@@ -1,82 +1,76 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入商品名"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="状态" prop="status">
-                <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="NEW">新投诉</Option>
-                  <Option value="CANCEL">已撤销</Option>
-                  <Option value="WAIT_APPEAL">待申诉</Option>
-                  <Option value="COMMUNICATION">对话中</Option>
-                  <Option value="WAIT_ARBITRATION">等待仲裁</Option>
-                  <Option value="COMPLETE">已完成</Option>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入商品名"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态" prop="status">
+            <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
+              <Option value="NEW">新投诉</Option>
+              <Option value="CANCEL">已撤销</Option>
+              <Option value="WAIT_APPEAL">待申诉</Option>
+              <Option value="COMMUNICATION">对话中</Option>
+              <Option value="WAIT_ARBITRATION">等待仲裁</Option>
+              <Option value="COMPLETE">已完成</Option>
 
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <template slot-scope="{row}" slot="goodsName">
-                <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                  <div slot="content">
-                    <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                  </div>
-                  <img src="../../../assets/qrcode.svg" style="vertical-align:bottom;" class="hover-pointer" width="20" height="20" alt="">
-                </Poptip>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{row}" slot="goodsName">
+          <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+          <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+            <div slot="content">
+              <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+            </div>
+            <img src="../../../assets/qrcode.svg" style="vertical-align:bottom;" class="hover-pointer" width="20" height="20" alt="">
+          </Poptip>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"

seller/src/views/order/after-order/returnGoodsOrder.vue

@@ -1,105 +1,99 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  clearable
-                  placeholder="请输入商品名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
 
-              <Form-item label="申请时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
+          <Form-item label="申请时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
 
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 90px; display: flex;">
-                  <div style="">
-                    <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
-                  </div>
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 90px; display: flex;">
+            <div style="">
+              <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
   </div>
 </template>
 

seller/src/views/order/after-order/returnMoneyOrder.vue

@@ -1,105 +1,99 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="商品" prop="goodsName">
-                <Input
-                  type="text"
-                  v-model="searchForm.goodsName"
-                  clearable
-                  placeholder="请输入商品名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
 
-              <Form-item label="申请时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
+          <Form-item label="申请时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
 
-              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="{row}">
-                <div style="margin-top: 5px;height: 90px; display: flex;">
-                  <div style="">
-                    <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
-                  </div>
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 90px; display: flex;">
+            <div style="">
+              <img :src="row.goodsImage" style="height: 80px;margin-top: 3px">
+            </div>
 
-                  <div style="margin-left: 13px;">
-                    <div class="div-zoom">
-                      <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                    </div>
-                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                      <div slot="content">
-                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                      </div>
-                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                    </Poptip>
-                  </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
                 </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
   </div>
 </template>
 

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

@@ -1,179 +1,173 @@
 <template>
   <div class="search">
-    <Row>
-      <Col style="width:100%;">
-      <Row style="flex-direction: column;width: 100%;">
-        <Card style="height: 60px">
-          <div style="">
-            <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
-            <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址
-            </Button>
-            <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
-            <Button @click="orderLog" type="primary">订单日志</Button>
-            <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
-            <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
-          </div>
-        </Card>
+    <Card style="height: 60px">
+      <div style="">
+        <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
+        <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址
+        </Button>
+        <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
+        <Button @click="orderLog" type="primary">订单日志</Button>
+        <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
+        <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
+      </div>
+    </Card>
 
-          <Card style="height: 400px">
-            <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 }}
-                </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>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <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.order.needReceipt == true && 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" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票内容：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票金额：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
-            </div>
-
-              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-                <div class="div-item-left">是否开票：</div>
-                <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
-              </div>
-            </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">
-              <div class="div-item-left">配送方式：</div>
-              <div class="div-item-right">
-                {{
-                    orderInfo.deliveryMethodValue
-                      ? orderInfo.deliveryMethodValue
-                      : "暂无配送方式"
-                  }}
-              </div>
-            </div>
-          </div>
-        </Card>
-      </Row>
-      </Col>
-
-      <Card>
-        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
-          <!-- 商品栏目格式化 -->
-          <template slot="goodsSlot" slot-scope="{row}">
-            <div style="margin-top: 5px; height: 80px; display: flex">
-              <div style="">
-                <img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
-              </div>
-
-              <div style="margin-left: 13px">
-                <div class="div-zoom">
-                  <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                </div>
-                <span v-for="(item, key) in JSON.parse(row.specs)">
-                  <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
-                    {{key}} : {{item}}
-                  </span>
-                </span>
-                <Poptip trigger="hover" style="display: block;" title="扫码在手机中查看" transfer>
-                  <div slot="content">
-                    <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                  </div>
-                  <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                </Poptip>
-              </div>
-            </div>
-          </template>
-        </Table>
-        <div class="goods-total">
-          <ul>
-            <li>
-              <span class="label">商品总额：</span>
-              <span class="txt">{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
-            </li>
-            <li>
-              <span class="label">优惠金额：</span>
-              <span class="txt">
-                {{
-                  orderInfo.order.priceDetailDTO.couponPrice +
-                  orderInfo.order.priceDetailDTO.discountPrice
-                | unitPrice('￥')}}
-              </span>
-            </li>
-            <li>
-              <span class="label">运费：</span>
-              <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
-            </li>
-            <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
-              <span class="label">使用积分：</span>
-              <span class="txt">{{
-                orderInfo.order.priceDetailDTO.payPoint
-              }}</span>
-            </li>
-
-            <li>
-              <span class="label">应付金额：</span>
-              <span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
-            </li>
-          </ul>
+    <Card style="height: 400px">
+      <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>
-      </Card>
-    </Row>
+        <div class="div-item">
+          <div class="div-item-left">订单来源：</div>
+          <div class="div-item-right">
+            {{ orderInfo.order.clientType }}
+          </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>
+
+      <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+        <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.order.needReceipt == true && 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" v-if="orderInfo.order.needReceipt == true">
+        <div class="div-item-left">发票内容：</div>
+        <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+      </div>
+
+      <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+        <div class="div-item-left">发票金额：</div>
+        <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+      </div>
+
+        <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+          <div class="div-item-left">是否开票：</div>
+          <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+        </div>
+      </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">
+        <div class="div-item-left">配送方式：</div>
+        <div class="div-item-right">
+          {{
+              orderInfo.deliveryMethodValue
+                ? orderInfo.deliveryMethodValue
+                : "暂无配送方式"
+            }}
+        </div>
+      </div>
+    </div>
+  </Card>
+
+    <Card>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px; height: 80px; display: flex">
+            <div style="">
+              <img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
+            </div>
+
+            <div style="margin-left: 13px">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              </div>
+              <span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
+                <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
+                  {{key}} : {{item}}
+                </span>
+              </span>
+              <Poptip trigger="hover" style="display: block;" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
+        </template>
+      </Table>
+      <div class="goods-total">
+        <ul>
+          <li>
+            <span class="label">商品总额：</span>
+            <span class="txt">{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
+          </li>
+          <li>
+            <span class="label">优惠金额：</span>
+            <span class="txt">
+              {{
+                orderInfo.order.priceDetailDTO.couponPrice +
+                orderInfo.order.priceDetailDTO.discountPrice
+              | unitPrice('￥')}}
+            </span>
+          </li>
+          <li>
+            <span class="label">运费：</span>
+            <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
+          </li>
+          <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
+            <span class="label">使用积分：</span>
+            <span class="txt">{{
+              orderInfo.order.priceDetailDTO.payPoint
+            }}</span>
+          </li>
+
+          <li>
+            <span class="label">应付金额：</span>
+            <span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
+          </li>
+        </ul>
+      </div>
+    </Card>
     <Modal v-model="modal" width="530">
       <p slot="header">
         <Icon type="edit"></Icon>

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

@@ -1,84 +1,78 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="buyerName">
-                <Input
-                  type="text"
-                  v-model="searchForm.buyerName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单状态" prop="orderStatus">
-                <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="UNPAID">未付款</Option>
-                  <Option value="PAID">已付款</Option>
-                  <Option value="UNDELIVERED">待发货</Option>
-                  <Option value="DELIVERED">已发货</Option>
-                  <Option value="COMPLETED">已完成</Option>
-                  <Option value="TAKE">待核验</Option>
-                  <Option value="CANCELLED">已取消</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="下单时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="buyerName">
+            <Input
+              type="text"
+              v-model="searchForm.buyerName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单状态" prop="orderStatus">
+            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="UNPAID">未付款</Option>
+              <Option value="PAID">已付款</Option>
+              <Option value="UNDELIVERED">待发货</Option>
+              <Option value="DELIVERED">已发货</Option>
+              <Option value="COMPLETED">已完成</Option>
+              <Option value="TAKE">待核验</Option>
+              <Option value="CANCELLED">已取消</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="下单时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
 
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
   </div>
 </template>
 

seller/src/views/order/receiptManager/receipt.vue

@@ -1,88 +1,82 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="发票抬头" prop="receiptTitle">
-                <Input
-                  type="text"
-                  v-model="searchForm.receiptTitle"
-                  clearable
-                  placeholder="请输入发票抬头"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="状态" prop="receiptStatus">
-                <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="0">未开票</Option>
-                  <Option value="1">已开票</Option>
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            >
-              <!-- 订单详情格式化 -->
-              <template slot="orderSlot" slot-scope="scope">
-                <a
-                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-              </template>
-            </Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              clearable
+              placeholder="请输入订单编号"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              clearable
+              placeholder="请输入会员名称"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="发票抬头" prop="receiptTitle">
+            <Input
+              type="text"
+              v-model="searchForm.receiptTitle"
+              clearable
+              placeholder="请输入发票抬头"
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态" prop="receiptStatus">
+            <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="0">未开票</Option>
+              <Option value="1">已开票</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <!-- 订单详情格式化 -->
+        <template slot="orderSlot" slot-scope="scope">
+          <a
+            @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
   </div>
 </template>
 

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

@@ -55,36 +55,34 @@
         <Button @click="delAll" class="ml_10">批量下架</Button>
         <!-- <Button @click="upAll">批量上架</Button> -->
       </Row>
-      <Row class="padding-row">
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @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 !== 'CLOSE'"
-              type="error"
-              size="small"
-              @click="remove(row)"
-              >下架</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @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 !== 'CLOSE'"
+            type="error"
+            size="small"
+            @click="remove(row)"
+            >下架</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -223,7 +221,7 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
+          width: 100,
           fixed: "right",
           render: (h, params) => {
             let text = "未知",
@@ -250,9 +248,9 @@ export default {
                   },
                 },
                 text
-              ),
+              )
             ]);
-          },
+          }
         },
         {
           title: "操作",
@@ -430,7 +428,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 @import "@/styles/table-common.scss";
 .search-form {
   width: 100% !important;

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

@@ -114,9 +114,8 @@
               v-if="form.scopeType == 'PORTION_GOODS'"
             >
               <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
-                  >选择商品</Button
-                >
+                <Button type="primary" @click="openSkuList"
+                  >选择商品</Button>
                 <Button
                   type="error"
                   ghost
@@ -466,6 +465,14 @@ export default {
         name: "coupon",
       });
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     changeSelect(e) {
       // 已选商品批量选择
       this.selectedGoods = e;
@@ -497,15 +504,9 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
-      console.log(item);
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
@@ -515,9 +516,8 @@ export default {
             sellerName: e.sellerName,
             skuId: e.id,
           });
-        }
       });
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getGoodsCategory(e) {
       // 获取级联选择器商品分类id

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

@@ -47,50 +47,48 @@
       <Row class="operation">
         <Button type="primary" @click="newAct">新增</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-        >
-          <template slot-scope="{ row }" slot="applyEndTime">
-            {{ unixDate(row.applyEndTime) }}
-          </template>
-          <template slot-scope="{ row }" slot="promotionType">
-            {{ row.isFullMinus ? "满减" : "满折" }}
-          </template>
-          <template slot-scope="{ row }" slot="hours">
-            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
-              item
-            }}</Tag>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <div>
-              <Button
-                type="primary"
-                v-if="row.promotionStatus == 'NEW'"
-                size="small"
-                @click="edit(row)"
-                >编辑</Button
-              >&nbsp;
-              <Button type="success" v-else size="small" @click="edit(row)"
-                >查看</Button
-              >&nbsp;
-              <Button
-                type="error"
-                :disabled="row.promotionStatus == 'START'"
-                ghost
-                size="small"
-                @click="del(row)"
-                >删除</Button
-              >
-            </div>
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+      >
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="promotionType">
+          {{ row.isFullMinus ? "满减" : "满折" }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+            item
+          }}</Tag>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <div>
+            <Button
+              type="primary"
+              v-if="row.promotionStatus == 'NEW'"
+              size="small"
+              @click="edit(row)"
+              >编辑</Button
+            >&nbsp;
+            <Button type="success" v-else size="small" @click="edit(row)"
+              >查看</Button
+            >&nbsp;
+            <Button
+              type="error"
+              :disabled="row.promotionStatus == 'START'"
+              ghost
+              size="small"
+              @click="del(row)"
+              >删除</Button
+            >
+          </div>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page operation">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -140,12 +138,12 @@ export default {
         {
           title: "活动类型",
           slot: "promotionType",
-          minWidth: 60,
+          width: 100,
         },
         {
           title: "活动状态",
           key: "promotionStatus",
-          minWidth: 60,
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";

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

@@ -183,7 +183,7 @@
                 style="display: flex; margin-bottom: 10px"
                 v-if="form.promotionStatus == 'NEW'"
               >
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
+                <Button type="primary" @click="openSkuList"
                   >选择商品</Button
                 >
                 <Button
@@ -376,6 +376,14 @@ export default {
       );
       this.$router.go(-1);
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     getDetail() {
       // 获取活动详情
       getFullDiscountById(this.id).then((res) => {
@@ -496,28 +504,20 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
-      console.log(item);
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            thumbnail: e.thumbnail,
-            skuId: e.id,
-          });
-        }
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          quantity: e.quantity,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          thumbnail: e.thumbnail,
+          skuId: e.id,
+        });
       });
-      console.log(list);
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getCouponList(query) {
       // 优惠券列表

seller/src/views/promotion/live/addLive.vue

@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <Card>
+      <Alert type="warning">
+        创建直播
+        <template slot="desc">
+          为了方便在创建直播间时从选择商品，请尽量提前提审直播商品
+        </template>
+      </Alert>
+
+      <Form :model="liveForm" ref="liveForm" :rules="liveRulesForm" :label-width="120">
+        <FormItem label="直播标题" prop="name">
+          <Input v-model="liveForm.name" style="width:460px"></Input>
+          <div class="tips">直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符</div>
+        </FormItem>
+        <FormItem label="主播昵称" prop="anchorName">
+          <Input v-model="liveForm.anchorName" style="width:360px"></Input>
+          <div class="tips">主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符</div>
+        </FormItem>
+        <FormItem label="直播时间" prop="startTime">
+
+          <DatePicker format="yyyy-MM-dd HH:mm" type="datetimerange" @on-change="handleChangeTime" :options="optionsTime" placeholder="直播计划开始时间-直播计划结束时间" style="width: 300px"></DatePicker>
+          <div class="tips">直播开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后</div>
+        </FormItem>
+
+        <FormItem label="主播微信号" prop="anchorWechat">
+          <Input v-model="liveForm.anchorWechat" style="width:360px" placeholder="主播微信号"></Input>
+          <div class="tips">主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行<a target="_black" href="https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh">实名验证</a></div>
+        </FormItem>
+
+        <!-- 分享卡片 -->
+        <FormItem label="分享卡片封面" prop="feedsImg">
+          <div class="upload-list" v-if="liveForm.feedsImg">
+            <template>
+              <img :src="liveForm.feedsImg">
+              <div class="upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(item.name)"></Icon>
+                <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
+              </div>
+            </template>
+
+          </div>
+          <Upload v-if="liveForm.feedsImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleFeedsImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
+            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag" :action="action" :headers="accessToken"
+            style="display: inline-block;width:58px;">
+            <div style="width: 58px;height:58px;line-height: 58px;">
+              <Icon type="ios-camera" size="20"></Icon>
+            </div>
+          </Upload>
+          <div class="tips">
+            直播间分享图，图片规则：建议像素800*640，大小不超过1M；
+          </div>
+        </FormItem>
+
+        <!-- 直播间背景墙 -->
+        <FormItem label="直播间背景墙" prop="coverImg">
+
+          <div class="upload-list" v-if="liveForm.coverImg">
+            <template>
+              <img :src="liveForm.coverImg">
+              <div class="upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(item)"></Icon>
+                <Icon type="ios-trash-outline" @click.native="handleRemove(item,'coverImg')"></Icon>
+              </div>
+            </template>
+          </div>
+          <Upload v-if="liveForm.coverImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleCoverImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
+            :on-format-error="handleFormatError" :max-size="2048" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag" :action="action" :headers="accessToken"
+            style="display: inline-block;width:58px;">
+            <div style="width: 58px;height:58px;line-height: 58px;">
+              <Icon type="ios-camera" size="20"></Icon>
+            </div>
+          </Upload>
+          <div class="tips"> 直播间背景图，图片规则：建议像素1080*1920，大小不超过2M</div>
+        </FormItem>
+        <FormItem label="商品" >
+          <Button type="primary" ghost icon="md-add">添加商品</Button>
+          <Table class="goods-table" :columns="liveColumns" :data="liveData"></Table>
+        </FormItem>
+
+        <FormItem>
+          <Button type="primary" @click="createLives()">保存</Button>
+          <Button style="margin-left: 8px">取消</Button>
+        </FormItem>
+      </Form>
+    </Card>
+    <!-- 浏览图片 -->
+    <Modal title="查看图片" v-model="imageVisible">
+      <img :src="imageSrc" v-if="imageVisible" style="width: 100%">
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import { getLiveGoods } from "@/api/promotion";
+export default {
+  data() {
+    return {
+      imageVisible: false, //查看图片的dailog
+      imageSrc: "", //查看图片的路径
+      action: uploadFile, // 上传地址
+      accessToken: {}, // 验证token
+      // 不能选择今天以前的时间
+      optionsTime: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+      // 直播间数据上传规则
+      liveRulesForm: {
+        name: [
+          { required: true, message: "请输入直播标题", trigger: "blur" },
+          { max: 17, min: 3, message: "直播间名字最短3个汉字，最长17个汉字" },
+        ],
+        anchorName: [
+          { required: true, message: "请输入主播昵称", trigger: "blur" },
+          { max: 15, min: 2, message: "主播昵称最短2个汉字，最长15个汉字" },
+        ],
+        anchorWechat: [
+          { required: true, message: "请输入主播微信号", trigger: "blur" },
+        ],
+        startTime: [
+          {
+            required: true,
+            message: "请输入开始时间以及结束时间",
+            trigger: "blur",
+          },
+        ],
+        feedsImg: [
+          { required: true, message: "分享卡片封面不能为空", trigger: "blur" },
+        ],
+        coverImg: [
+          { required: true, message: "直播间背景墙不能为空", trigger: "blur" },
+        ],
+      },
+      liveForm: {
+        feedsImg: "", //分享卡片封面
+        coverImg: "", //直播间背景墙
+      },
+      // 直播商品表格表头
+      liveColumns: [
+        {
+          title: "商品",
+        },
+        {
+          title: "价格",
+        },
+        {
+          title: "库存",
+        },
+        {
+          title: "链接",
+        },
+        {
+          title: "操作",
+        },
+      ],
+      liveData: [], //直播商品集合
+    };
+  },
+  mounted() {
+    this.accessToken = {
+      accessToken: this.getStore("accessToken"),
+    };
+  },
+  methods: {
+    /**
+     * 上传图片查看图片
+     */
+    handleView(src) {
+      this.imageVisible = true;
+      this.imageSrc = src;
+    },
+
+    /**
+     * 删除上传的图片
+     */
+    handleRemove(val, type) {
+      if (type == "coverImg") {
+        this.liveForm.coverImg = "";
+      } else {
+        this.liveForm.feedsImg = "";
+      }
+    },
+    /**
+     * 直播间背景图上传成功回调
+     */
+    handleCoverImgSuccess(res) {
+      this.liveForm.coverImg = res.result;
+    },
+
+    /**
+     * 分享卡片封面上传成功回调
+     */
+    handleFeedsImgSuccess(res) {
+      this.liveForm.feedsImg = res.result;
+    },
+
+    /**
+     * 直播间背景图
+     */
+    handleCoverImgSuccess(res) {
+      this.liveForm.coverImg.push(res.result);
+    },
+
+    /**
+     * 选择时间后的回调
+     */
+    handleChangeTime(daterange) {
+      this.liveForm.startTime = new Date(daterange[0]).getTime() / 1000;
+      this.liveForm.endTime = new Date(daterange[1]).getTime() / 1000;
+    },
+
+    /**
+     * 对图片错误进行回调
+     */
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "请上传正确的图片格式！",
+        desc: file.name + " 格式不为 jpg or png.",
+      });
+    },
+
+    /**
+     * 对图片的大小进行处理回调
+     */
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "图片超过限制大小！",
+        desc: file.name + "图片超过规定限制大小，请重新上传",
+      });
+    },
+
+    /**
+     * 限制只能上传一张图片
+     */
+    handleBeforeUpload() {
+      const check = this.liveForm.feedsImg.length < 1;
+      if (!check) {
+        this.$Notice.warning({
+          title: "最多上传一张图片",
+        });
+      }
+      return check;
+    },
+    createLives() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.tips {
+  color: #999;
+  font-size: 12px;
+}
+.goods-table {
+  width: 800px;
+  margin: 10px 0;
+}
+.upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 4px;
+}
+.upload-list img {
+  width: 100%;
+  height: 100%;
+}
+.upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.upload-list:hover .upload-list-cover {
+  display: block;
+}
+.upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+</style>

seller/src/views/promotion/live/live.vue

@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="100" class="search-form">
+        <Form-item label="优惠券名称">
+          <Input type="text" v-model="searchForm.couponName" placeholder="请输入优惠券名称" clearable style="width: 200px" />
+        </Form-item>
+        <Form-item label="活动状态" prop="promotionStatus">
+          <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
+            <Option value="NEW">未开始</Option>
+            <Option value="START">已开始/上架</Option>
+            <Option value="END">已结束/下架</Option>
+            <Option value="CLOSE">紧急关闭/作废</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="活动时间">
+          <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+      </Form>
+      <div class="btns">
+        <Button @click="createLive()" type="primary">创建直播</Button>
+      </div>
+      <Tabs>
+        <!-- 标签栏 -->
+        <TabPane v-for="(item,index) in tabs" :key="index" :label="item.title">
+          <Table :columns="liveColumns" :data="liveData"></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>
+        </TabPane>
+
+      </Tabs>
+
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getLivesList } from "@/api/promotion.js";
+export default {
+  data() {
+    return {
+      // 查询数据的总数
+      total: "",
+      // 查询的form
+      searchForm: {
+        pageSize: 10,
+        pageNumber: 1,
+      },
+      // 直播tab选项栏
+      tabs: [
+        {
+          title: "全部",
+        },
+        {
+          title: "直播中",
+        },
+        {
+          title: "未开始",
+        },
+        {
+          title: "已结束",
+        },
+      ],
+      liveColumns: [
+        {
+          title: "直播标题",
+          key: "a",
+        },
+        {
+          title: "直播时间",
+          key: "a",
+        },
+        {
+          title: "主播昵称",
+          key: "a",
+        },
+        {
+          title: "直播状态",
+          key: "a",
+        },
+        {
+          title: "操作",
+          key: "a",
+        },
+      ], //table中显示的title
+      liveData: [], //table中显示的直播数据
+    };
+  },
+  mounted() {
+    this.getStoreLives();
+  },
+  methods: {
+    /**
+     * 获取店铺直播间列表
+     */
+    async getStoreLives() {
+      let result = await getLivesList();
+      if (result.success) {
+        this.liveData = result.records;
+      }
+    },
+
+    /**
+     * 获取
+     */
+
+    /**
+     * 创建直播
+     */
+    createLive(){
+      this.$router.push({path:'/add-live'})
+    },
+
+    /**
+     * 点击分页数据回调
+     */
+    changePageSize() {},
+    /**
+     * 点击分页回调
+     */
+    changePage() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+.btns{
+  margin-top: 10px;
+}
+</style>

seller/src/views/promotion/live/liveGoods.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="wrapper">
+    <Card>
+      <Alert banner type="warning">
+
+        <template slot="desc">
+          由于直播商品需经过小程序直播平台的审核，你需要在此先提审商品，为了不影响直播间选取商品，请提前1天提审商品；
+          每次最多可提审20款商品，每个店铺最多可维护200款商品，每款SPU只需选择其中一款SKU即可；
+        </template>
+
+      </Alert>
+
+      <div>
+        <Tabs :value="params.auditStatus">
+          <TabPane v-for="(item,index) in liveTabWay" :key="index" :label="item.label" :name="item.type">
+
+          </TabPane>
+
+        </Tabs>
+      </div>
+
+      <Button type="primary" style="margin-bottom:10px;" @click="addNewLiveGoods" icon="md-add">选择商品</Button>
+
+      <Table disabled-hover :columns="liveGoodsColumns" :data="liveGoodsData">
+        <template slot-scope="{ row }" slot="goodsName">
+          <div class="flex-goods">
+            <img class="thumbnail" :src="row.thumbnail">
+            {{ row.goodsName }}
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="price">
+          <RadioGroup v-model="row.priceType">
+            <div class="price-item">
+              <Radio label="1">一口价:</Radio> <Input v-if="row.priceType == '1'" style="width:100px" v-model="row.price"></Input>
+            </div>
+            <div class="price-item">
+              <Radio label="2">区间价:</Radio> <span v-if="row.priceType == '2'"><Input style="width:100px" v-model="row.price" />至<Input style="width:100px" v-model="row.price2" /></span>
+            </div>
+            <div class="price-item">
+              <Radio label="3">折扣价:</Radio> <span v-if="row.priceType == '3'">现价<Input style="width:100px" v-model="row.price"></Input>原价<Input style="width:100px" v-model="row.price2" /></span>
+            </div>
+          </RadioGroup>
+        </template>
+
+        <template slot-scope="{ row,index }" slot="action">
+          <Button type="primary" @click="()=>{liveGoodsData.splice(index,1)}">删除</Button>
+        </template>
+      </Table>
+    </Card>
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+    <div class="submit">
+      <Button type="primary" @click="saveLiveGoods">保存商品</Button>
+    </div>
+  </div>
+</template>
+
+<script>
+import skuSelect from "@/views/lili-dialog"; //选择商品组件
+import { addLiveGoods } from "@/api/promotion.js";
+export default {
+  components: {
+    skuSelect,
+  },
+  data() {
+    return {
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+        auditStatus: 0,
+      },
+      // 商品审核状态
+      liveTabWay: [
+        {
+          label: "待提审",
+          type: 0,
+        },
+        {
+          label: "审核中",
+          type: 1,
+        },
+        {
+          label: "已审核",
+          type: 2,
+        },
+        {
+          label: "审核未通过",
+          type: 3,
+        },
+      ],
+
+      // 商品表格columns
+      liveGoodsColumns: [
+        {
+          title: "商品",
+          slot: "goodsName",
+        },
+        {
+          title: "价格",
+          slot: "price",
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          width: 100,
+        },
+
+        {
+          title: "操作",
+          slot: "action",
+          width: 100,
+        },
+      ],
+      // 表格商品详情
+      liveGoodsData: [],
+    };
+  },
+  methods: {
+    /**
+     * 保存直播商品
+     */
+    async saveLiveGoods() {
+      //  this.$Spin.show();
+      let submit = this.liveGoodsData.map((element) => {
+        return {
+          goodsId: element.goodsId, //商品id
+          goodsImage: element.small, //商品图片
+          name: element.goodsName, //商品昵称
+          price: parseInt(element.price), //商品价格
+          price2: element.price2 ? parseInt(element.price2) : "", //商品价格
+          priceType: element.priceType, // priceType  Number  是  价格类型，1：一口价（只需要传入price，price2不传） 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传） 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传）
+          skuId: element.id,
+          url: `/pages/product/goods?id=${element.id}&goodsId=${element.goodsId}`, //小程序地址
+        };
+      });
+
+      let result = await addLiveGoods(submit);
+      if (result.success) {
+        this.$Message.success({
+          content: `添加成功！`,
+        });
+      }
+    },
+
+    /**
+     * 商品选择器回调的商品信息
+     */
+    selectedGoodsData(goods) {
+      goods.map((item) => {
+        return (item.priceType = "1");
+      });
+      this.liveTabWay.map((item,index)=>{
+        return item.type  == 99 && this.liveTabWay.splice(index,1)
+      })
+
+      this.liveGoodsData.push(...goods);
+    },
+
+    /**
+     * 新增商品
+     */
+    addNewLiveGoods() {
+      this.liveTabWay.push({
+        type:99,
+        label:"新增商品"
+      })
+      this.params.auditStatus = 99
+      this.$refs.skuSelect.open("goods");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+  position: relative;
+}
+.thumbnail {
+  width: 100px;
+  height: 100px;
+  border-radius: 0.4em;
+}
+.flex-goods {
+  margin: 10px;
+  display: flex;
+
+  align-items: center;
+  > img {
+    margin-right: 10px;
+  }
+}
+.price-item {
+  margin: 15px 5px;
+  > * {
+    margin: 5px;
+  }
+}
+.submit {
+  box-shadow: 3px 5px 12px rgba(0, 0, 0, 0.1);
+  height: 60px;
+  background: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

seller/src/views/promotion/pintuan/pintuan.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      </Col>
-    </Row>
     <Card>
       <Row>
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@@ -45,66 +41,64 @@
       <Row class="operation padding-row">
         <Button @click="newAct" type="primary">添加</Button>
       </Row>
-      <Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              type="primary"
-              size="small"
-              v-if="row.promotionStatus == 'NEW'"
-              @click="edit(row)"
-              >编辑</Button
-            >&nbsp;
-            <Button
-              type="info"
-              v-if="row.promotionStatus == 'NEW'"
-              size="small"
-              @click="manage(row, 'manager')"
-              >管理</Button
-            >&nbsp;
-            <Button
-              type="info"
-              v-if="row.promotionStatus !== 'NEW'"
-              size="small"
-              @click="manage(row, 'view')"
-              >查看</Button
-            >&nbsp;
-            <Button
-              type="error"
-              size="small"
-              v-if="row.promotionStatus != 'START'"
-              ghost
-              @click="remove(row)"
-              >删除</Button
-            >&nbsp;
-            <Button
-              type="success"
-              v-if="
-                row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'
-              "
-              size="small"
-              @click="open(row)"
-              >开启</Button
-            >
-            <Button
-              type="warning"
-              v-if="row.promotionStatus == 'START'"
-              size="small"
-              @click="close(row)"
-              >关闭</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      >
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            type="primary"
+            size="small"
+            v-if="row.promotionStatus == 'NEW'"
+            @click="edit(row)"
+            >编辑</Button
+          >&nbsp;
+          <Button
+            type="info"
+            v-if="row.promotionStatus == 'NEW'"
+            size="small"
+            @click="manage(row, 'manager')"
+            >管理</Button
+          >&nbsp;
+          <Button
+            type="info"
+            v-if="row.promotionStatus !== 'NEW'"
+            size="small"
+            @click="manage(row, 'view')"
+            >查看</Button
+          >&nbsp;
+          <Button
+            type="error"
+            size="small"
+            v-if="row.promotionStatus != 'START'"
+            ghost
+            @click="remove(row)"
+            >删除</Button
+          >&nbsp;
+          <Button
+            type="success"
+            v-if="
+              row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'
+            "
+            size="small"
+            @click="open(row)"
+            >开启</Button
+          >
+          <Button
+            type="warning"
+            v-if="row.promotionStatus == 'START'"
+            size="small"
+            @click="close(row)"
+            >关闭</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -155,17 +149,15 @@ export default {
         {
           title: "活动开始时间",
           key: "startTime",
-          minWidth: 120
         },
         {
           title: "活动结束时间",
           key: "endTime",
-          minWidth: 120
         },
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";

seller/src/views/promotion/pintuan/pintuanGoods.vue

@@ -16,16 +16,14 @@
         </Alert>
       </Row>
       <h3 class="act-goods">活动商品</h3>
-      <Row class="operation">
-        <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-          <template slot-scope="{ row, index }" slot="price">
-            <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
-          </template>
-          <template slot-scope="{ index }" slot="action">
-            <Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
-          </template>
-        </Table>
-      </Row>
+      <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <template slot-scope="{ row, index }" slot="price">
+          <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
+        </template>
+        <template slot-scope="{ index }" slot="action">
+          <Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page operation">
         <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>
@@ -36,7 +34,7 @@
       </Row>
     </Card>
 
-    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+    <sku-select ref="skuSelect" :goodsData="goodsData" @selectedGoodsData="selectedGoodsData"></sku-select>
   </div>
 </template>
 <script>
@@ -65,7 +63,7 @@ export default {
       data: [], // 表单数据
       total: 0, // 表单数据总数
       status: this.$route.query.status, // 查看还是修改
-      columns: [
+      columns: [ // 活动详情表头
         {
           title: "活动名称",
           key: "promotionName",
@@ -111,7 +109,7 @@ export default {
           },
         },
       ],
-      goodsColumns: [
+      goodsColumns: [ // 活动商品表头
         { type: "selection", width: 60, align: "center" },
         {
           title: "商品名称",
@@ -202,7 +200,6 @@ export default {
 
     handleReset() {
       // 重置
-      // this.$refs.searchForm.resetFields();
       this.searchForm.pageNumber = 0;
       this.searchForm.promotionName = "";
       this.selectDate = null;
@@ -211,7 +208,7 @@ export default {
       this.getDataList();
     },
 
-    clearSelectAll() {
+    clearSelectAll() { // 清空所有已选项
       this.$refs.table.selectAll(false);
     },
     changeSelect(e) {
@@ -220,7 +217,7 @@ export default {
       this.selectCount = e.length;
     },
 
-    getDataList() {
+    getDataList() { // 获取商品列表
       this.loading = true;
       this.searchForm.pintuanId = this.$route.query.id;
 
@@ -233,14 +230,12 @@ export default {
       });
     },
 
-    getPintuanMsg() {
-      // 获取拼团详情
+    getPintuanMsg() { // 获取拼团详情
       getPintuanDetail(this.$route.query.id).then((res) => {
         if (res.success) this.data.push(res.result);
       });
     },
-    delGoods(index) {
-      // 删除商品
+    delGoods(index) { // 删除商品
       this.goodsData.splice(index, 1);
     },
     delAll() { // 批量删除商品
@@ -263,13 +258,9 @@ export default {
       });
     },
     selectedGoodsData(item) { // 选择商品
-      let ids = [];
+      console.log(item);
       let list = [];
-      this.goodsData.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
@@ -281,15 +272,19 @@ export default {
             skuId: e.id,
             categoryPath: e.categoryPath,
           });
-        }
       });
-      this.goodsData.push(...list);
+      this.goodsData = list;
     },
     openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.goodsData))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
   },
-  mounted() {
+  mounted () {
     this.init();
   },
 };

seller/src/views/promotion/seckill/seckill.vue

@@ -45,41 +45,39 @@
         </Form>
       </Row>
 
-      <Row class="padding-row">
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-        >
-          <template slot-scope="{ row }" slot="applyEndTime">
-            {{ unixDate(row.applyEndTime) }}
-          </template>
-          <template slot-scope="{ row }" slot="hours">
-            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
-              item
-            }}</Tag>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <Button
-              v-if="row.promotionStatus === 'NEW'"
-              type="primary"
-              size="small"
-              @click="manage(row)"
-              >管理</Button
-            >
-            <Button
-              v-else
-              type="info"
-              size="small"
-              @click="manage(row)"
-              >查看</Button
-            >
-          </template>
-        </Table>
-      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+      >
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+            item
+          }}</Tag>
+        </template>
+        <template slot-scope="{ row }" slot="action">
+          <Button
+            v-if="row.promotionStatus === 'NEW'"
+            type="primary"
+            size="small"
+            @click="manage(row)"
+            >管理</Button
+          >
+          <Button
+            v-else
+            type="info"
+            size="small"
+            @click="manage(row)"
+            >查看</Button
+          >
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="page">
         <Page
           :current="searchForm.pageNumber + 1"
@@ -134,6 +132,7 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";

seller/src/views/promotion/seckill/seckillGoods.vue

@@ -318,19 +318,19 @@ export default {
     },
     delGoods(index, id) {
       // 删除商品
-      if (id) {
-        removeSeckillGoods(this.$route.query.id, id).then((res) => {
-          if (res.success) {
-            this.goodsList[this.tabIndex].list.splice(index, 1);
-            this.$Message.success("删除成功！");
-          }
-        });
-      } else {
+      // if (id) {
+      //   removeSeckillGoods(this.$route.query.id, id).then((res) => {
+      //     if (res.success) {
+      //       this.goodsList[this.tabIndex].list.splice(index, 1);
+      //       this.$Message.success("删除成功！");
+      //     }
+      //   });
+      // } else {
         this.goodsList[this.tabIndex].list.splice(index, 1);
         this.$Message.success("删除成功！");
-      }
+      // }
     },
-    delAll() {
+    delAll() { // 删除当前时段全部数据
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;
@@ -350,43 +350,46 @@ export default {
           ].list.filter((item) => {
             return !ids.includes(item.id);
           });
-          removeSeckillGoods(this.$route.query.id, ids).then((res) => {
-            if (res.success) {
-              this.$Message.success("删除成功！");
-            }
-          });
+          // removeSeckillGoods(this.$route.query.id, ids).then((res) => {
+          //   if (res.success) {
+          //     this.$Message.success("删除成功！");
+          //   }
+          // });
         },
       });
     },
     selectedGoodsData(item) {
       // 选择器添加商品
-      let ids = [];
       let list = [];
-
-      this.goodsList[this.tabIndex].list.forEach((e) => {
-        ids.push(e.skuId);
-      });
+      console.log(item);
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            promotionApplyStatus: "",
-            quantity: e.quantity,
-            seckillId: this.$route.query.id,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-            timeLine: this.data[0].hours.split(",")[this.tabIndex],
-          });
-        }
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          originalPrice: e.price,
+          promotionApplyStatus: e.promotionApplyStatus || '',
+          quantity: e.quantity,
+          seckillId: this.$route.query.id,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          skuId: e.id,
+          timeLine: this.data[0].hours.split(",")[this.tabIndex],
+
+        });
       });
 
-      this.goodsList[this.tabIndex].list.push(...list);
+      this.goodsList[this.tabIndex].list = list;
+      this.$nextTick(()=> {
+        this.$forceUpdate()
+      })
     },
-    openSkuList() {
+    openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.goodsList[this.tabIndex].list))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
     unixDate(time) {
       // 处理报名截止时间

seller/src/views/shop/bill/accountStatementBill.vue

@@ -1,70 +1,64 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="开始时间" prop="startDay">
-                <DatePicker
-                  type="date"
-                  v-model="searchForm.startDate"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择"
-                  clearable
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Form-item label="结束时间" prop="endDate">
-                <DatePicker
-                  type="date"
-                  v-model="searchForm.endDate"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  di
-                  placeholder="请选择"
-                  clearable
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-              <Button @click="handleReset" class="search-btn">重置</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <Row type="flex" justify="end" class="page">
-            <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>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="开始时间" prop="startDay">
+            <DatePicker
+              type="date"
+              v-model="searchForm.startDate"
+              format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Form-item label="结束时间" prop="endDate">
+            <DatePicker
+              type="date"
+              v-model="searchForm.endDate"
+              format="yyyy-MM-dd HH:mm:ss"
+              di
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        sortable="custom"
+        @on-sort-change="changeSort"
+        @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
   </div>
 </template>
 

seller/src/views/shop/bill/billDetail.vue

@@ -47,15 +47,13 @@
       <Tabs active-key="tab" @on-click="clickTabs">
         <Tab-pane label="订单列表" name="order">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="orderColumns"
-                :data="orderData"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="orderColumns"
+              :data="orderData"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="orderParam.pageNumber"
@@ -72,15 +70,13 @@
         </Tab-pane>
         <Tab-pane label="退单列表" name="refund">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="refundColumns"
-                :data="refundData"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="refundColumns"
+              :data="refundData"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="refundParam.pageNumber"
@@ -97,15 +93,13 @@
         </Tab-pane>
         <Tab-pane label="分销费用列表" name="distribution">
           <Card>
-            <Row>
-              <Table
-                :loading="loading"
-                border
-                :columns="distributionColumns"
-                :data="distributionData"
-                ref="table"
-              ></Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="distributionColumns"
+              :data="distributionData"
+              ref="table"
+            ></Table>
             <Row type="flex" justify="end" class="page">
               <Page
                 :current="distributionParam.pageNumber"

seller/src/views/shop/bill/storeBill.vue

@@ -43,18 +43,16 @@
               <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          ></Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchForm.pageNumber"

seller/src/views/shop/ship/logistics.vue

@@ -1,25 +1,17 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-
-        </Card>
-      </Col>
-    </Row>
-
+    <Card>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
+    </Card>
   </div>
 </template>
 

seller/src/views/shop/ship/shipTemplate.vue

@@ -1,47 +1,41 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row>
-          <Button @click="refresh">刷新</Button>
-          <Button @click="add" type="primary">添加</Button>
-        </Row>
-        <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
-          <TabPane label="运费模板" name="INFO">
-            <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
-              <tbody>
-                <tr>
-                  <td class="sep-row" colspan="20"></td>
-                </tr>
-                <tr>
-                  <th colspan="20">
-                    <h3>{{item.name}}</h3>
-                    <span class="fr m-r-5">
-                      <time style="margin-right: 20px" title="最后编辑时间">
-                        <i class="icon-time"></i>{{item.updateTime}}
-                      </time>
-                      <Button @click="edit(item)" type="info">修改</Button>
-                      <Button @click="remove(item.id)" type="error">删除</Button>
-                    </span>
-                  </th>
-                </tr>
-                <tr>
-                  <td class="w10 bdl"></td>
-                  <td class="cell-area tl">运送到</td>
-                  <td class="w150">首件(重)
-
-                  </td>
-                  <td class="w150">运费</td>
-                  <td class="w150">续件(重)
-
-                  </td>
-                  <td class="w150 bdr">运费</td>
-                </tr>
-
-                <tr v-for="(children,index) in item.freightTemplateChildList">
+    <Card>
+      <Row>
+        <Button @click="refresh">刷新</Button>
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
+        <TabPane label="运费模板" name="INFO">
+          <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
+            <tbody>
+              <tr>
+                <td class="sep-row" colspan="20"></td>
+              </tr>
+              <tr>
+                <th colspan="20">
+                  <span class="temp-name">{{item.name}}</span>
+                  <span class="fr m-r-5">
+                    <time style="margin-right: 20px" title="最后编辑时间">
+                      <i class="icon-time"></i>{{item.updateTime}}
+                    </time>
+                    <Button @click="edit(item)" type="info">修改</Button>
+                    <Button @click="remove(item.id)" type="error">删除</Button>
+                  </span>
+                </th>
+              </tr>
+              <tr v-if="item.pricingMethod!=='FREE'">
+                <td class="w10 bdl"></td>
+                <td class="cell-area tl w150">运送到</td>
+                <td class="w150">首件(重)</td>
+                <td class="w150">运费</td>
+                <td class="w150">续件(重)</td>
+                <td class="w150 bdr">运费</td>
+              </tr>
+              <template v-if="item.pricingMethod!=='FREE'">
+                <tr v-for="(children,index) in item.freightTemplateChildList" :key="index">
                   <td class="bdl"></td>
-                  <td class="cell-area tl" style="width: 60%">{{children.area}}</td>
+                  <td class="cell-area tl w150" style="width: 60%;white-space:normal;">{{children.area}}</td>
                   <td>
                     {{children.firstCompany}}
                   </td>
@@ -55,103 +49,101 @@
                     <span class="yuan">￥</span><span class="integer">{{children.continuedPrice | unitPrice}}</span>
                   </td>
                 </tr>
-              </tbody>
-
-            </table>
-
-          </TabPane>
-          <TabPane v-if="csTab" :label=title :name=operation>
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-              <FormItem label="模板名称" prop="name">
-                <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
-              </FormItem>
-              <FormItem label="计价方式" prop="pricingMethod">
-                <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
-                  <Radio label="WEIGHT">按重量</Radio>
-                  <Radio label="NUM">按件数</Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem label="详细设置">
-                <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
-                  <div class="entity">
-                    <div class="tbl-except">
-                      <table cellspacing="0" class="ncsc-default-table">
-                        <thead>
-                          <tr style="border-bottom: 1px solid #ddd;">
-                            <th class="w10"></th>
-                            <th class="tl">运送到</th>
-                            <th class="w10"></th>
-                            <th class="w50">首件(重)</th>
-                            <th class="w110">首费</th>
-                            <th class="w50">续件(重)</th>
-                            <th class="w110">续费</th>
-                            <th class="w150">操作</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList">
-                            <td></td>
-                            <td class="tl cell-area">
-                              <span class="area-group">
-                                <p style="display:inline-block;white-space:pre;">{{item.area}}</p>
-                              </span>
-                            </td>
-                            <td></td>
-                            <td>
-                              <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
-                            </td>
-                            <td>
-                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable /><em class="add-on">
-                                元
-                              </em>
-                            </td>
-                            <td>
-                              <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
-                            </td>
-                            <td>
-                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable /><em class="add-on">
-                                元
-                              </em>
-                            </td>
-                            <td class="nscs-table-handle">
-                              <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
-                              </Button>
-                              <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
-                              </Button>
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
+              </template>
+            </tbody>
+          </table>
+        </TabPane>
+        <TabPane v-if="csTab" :label="title" :name="operation">
+          <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+            <FormItem label="模板名称" prop="name">
+              <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
+            </FormItem>
+            <FormItem label="计价方式" prop="pricingMethod">
+              <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
+                <Radio label="WEIGHT">按重量</Radio>
+                <Radio label="NUM">按件数</Radio>
+                <Radio label="FREE">包邮</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="详细设置" v-if="form.pricingMethod !== 'FREE'">
+              <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
+                <div class="entity">
+                  <div class="tbl-except">
+                    <table cellspacing="0" class="ncsc-default-table">
+                      <thead>
+                        <tr style="border-bottom: 1px solid #ddd;">
+                          <th class="w10"></th>
+                          <th class="tl">运送到</th>
+                          <th class="w10"></th>
+                          <th class="w50">首件(重)</th>
+                          <th class="w110">首费</th>
+                          <th class="w50">续件(重)</th>
+                          <th class="w110">续费</th>
+                          <th class="w150">操作</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList" :key="index">
+                          <td></td>
+                          <td class="tl cell-area">
+                            <span class="area-group">
+                              <p style="display:inline-block">{{item.area}}</p>
+                            </span>
+                          </td>
+                          <td></td>
+                          <td>
+                            <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
+                          </td>
+                          <td>
+                            <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable >
+                              <span slot="append">元</span>
+                            </Input>
+                          </td>
+                          <td>
+                            <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
+                          </td>
+                          <td>
+                            <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable>
+                              <span slot="append">元</span>
+                            </Input>
+                          </td>
+                          <td class="nscs-table-handle">
+                            <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
+                            </Button>
+                            <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
+                            </Button>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                  <div class="tbl-attach p-5">
+                    <div class="div-error" v-if="saveError">
+                      <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                      <Icon type="ios-information-circle-outline" />
+                      指定地区城市为空或指定错误
+                      <Icon type="ios-information-circle-outline" />
+                      首费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      续费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      首(续)件(重)费应输入大于0的整数
                     </div>
-                    <div class="tbl-attach p-5">
-                      <div class="div-error" v-if="saveError">
-                        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-                        <Icon type="ios-information-circle-outline" />
-                        指定地区城市为空或指定错误
-                        <Icon type="ios-information-circle-outline" />
-                        首费应输入正确的金额
-                        <Icon type="ios-information-circle-outline" />
-                        续费应输入正确的金额
-                        <Icon type="ios-information-circle-outline" />
-                        首(续)件(重)费应输入大于0的整数
-                      </div>
 
-                    </div>
                   </div>
                 </div>
-              </FormItem>
-              <Form-item>
-                <Button @click="addShipTemplateChildren(index)" :loading="submitLoading" icon="ios-create-outline" >为指定城市设置运费模板
-                </Button>
-                <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
-                </Button>
-              </Form-item>
-            </Form>
-          </TabPane>
-        </Tabs>
-      </Card>
-      </Col>
-    </Row>
+              </div>
+            </FormItem>
+            <Form-item>
+              <Button @click="addShipTemplateChildren(index)" v-if="form.pricingMethod !== 'FREE'" icon="ios-create-outline" >为指定城市设置运费模板
+              </Button>
+              <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
+              </Button>
+            </Form-item>
+          </Form>
+        </TabPane>
+      </Tabs>
+    </Card>
     <multiple-region ref="region" @selected="handleSelect" @closed="handleClose">
 
     </multiple-region>
@@ -312,35 +304,39 @@ export default {
         const regNumber = /^\+?[1-9][0-9]*$/;
         const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
         if (valid) {
-          //校验运费模板详细信息
-          for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
-            if (
-              this.form.freightTemplateChildList[i].area == "" ||
-              this.form.freightTemplateChildList[i].firstCompany == "" ||
-              this.form.freightTemplateChildList[i].firstPrice == "" ||
-              this.form.freightTemplateChildList[i].continuedCompany == "" ||
-              this.form.freightTemplateChildList[i].continuedPrice == ""
-            ) {
-              this.saveError = true;
-              return;
-            }
-            if (
-              regNumber.test(
-                this.form.freightTemplateChildList[i].firstCompany
-              ) == false ||
-              regNumber.test(
-                this.form.freightTemplateChildList[i].continuedCompany
-              ) == false ||
-              regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
-                false ||
-              regMoney.test(
-                this.form.freightTemplateChildList[i].continuedPrice
-              ) == false
-            ) {
-              this.saveError = true;
-              return;
+          if (this.form.pricingMethod != 'FREE') {
+            //校验运费模板详细信息
+            for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
+              if (
+                this.form.freightTemplateChildList[i].area == "" ||
+                this.form.freightTemplateChildList[i].firstCompany == "" ||
+                this.form.freightTemplateChildList[i].firstPrice == "" ||
+                this.form.freightTemplateChildList[i].continuedCompany == "" ||
+                this.form.freightTemplateChildList[i].continuedPrice == ""
+              ) {
+                this.saveError = true;
+                return;
+              }
+              if (
+                regNumber.test(
+                  this.form.freightTemplateChildList[i].firstCompany
+                ) == false ||
+                regNumber.test(
+                  this.form.freightTemplateChildList[i].continuedCompany
+                ) == false ||
+                regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
+                  false ||
+                regMoney.test(
+                  this.form.freightTemplateChildList[i].continuedPrice
+                ) == false
+              ) {
+                this.saveError = true;
+                return;
+              }
             }
           }
+          
+
           if (this.operation == "ADD") {
             API_Shop.addShipTemplate(this.form, headers).then((res) => {
               if (res.success) {
@@ -473,13 +469,12 @@ export default {
   border-left: 1px solid #e6e6e6;
 }
 
-.order tbody tr th h3 {
+.order tbody tr th .temp-name {
+  float: left;
   font-size: 14px;
-  line-height: 20px;
   color: #555;
-  vertical-align: middle;
-  display: inline-block;
-  margin: 0 10px;
+  // line-height: 44px;
+  margin: 7px 0 0 10px;
 }
 
 .m-r-5 {
@@ -541,7 +536,8 @@ textarea {
 }
 
 .w60 {
-  width: 80px !important;
+  width: 100px !important;
+  margin: 0 auto;
 }
 
 Input[type="text"],
@@ -555,18 +551,6 @@ Input.password {
   outline: 0 none;
 }
 
-.add-on {
-  line-height: 28px;
-  background-color: #f6f7fb;
-  vertical-align: top;
-  display: inline-block;
-  text-align: center;
-  width: 30px;
-  height: 30px;
-  border: solid #e6e9ee;
-  border-width: 1px 1px 1px 0;
-}
-
 ncsc-default-table {
   line-height: 20px;
   width: 100%;

seller/src/views/shop/shopAddress.vue

@@ -7,17 +7,15 @@
           <Row class="operation">
             <Button @click="add" type="primary">添加</Button>
           </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-selection-change="changeSelect"
+          ></Table>
           <Row type="flex" justify="end" class="page">
             <Page
               :current="searchForm.pageNumber"

seller/src/views/statistics/order.vue

@@ -150,7 +150,6 @@
         </div>
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
-
         </div>
         <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
 

seller/src/views/statistics/order/orderStatistics.vue

@@ -59,17 +59,14 @@
 
 
         <Card style="margin-top: 2px">
-          <Row>
-            <Table :loading="loading"
-                   border
-                   :columns="columns"
-                   :data="data" ref="table"
-                   sortable="custom"
-                   @on-sort-change="changeSort"
-                   @on-selection-change="changeSelect">
-
-            </Table>
-          </Row>
+          <Table :loading="loading"
+            border
+            :columns="columns"
+            :data="data" ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect">
+          </Table>
           <Row type="flex" justify="end" class="page">
             <Page :current="searchForm.pageNumber"
                   :total="total"