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

manager/src/views/member/list/memberRecycle.vue

@@ -40,7 +40,6 @@
           ref="table"
           class="mt_10"
           sortable="custom"
-          @on-sort-change="changeSort"
           @on-selection-change="changeSelect"
         >
         </Table>

manager/src/views/statistics/order.vue

@@ -149,8 +149,8 @@
         <h4>订退单统计</h4>
         <div class="breadcrumb" style="margin-bottom:20px;">
           <RadioGroup v-model="orderOrRefund" type="button" size="small" button-style="solid">
-            <Radio :label="true">订单</Radio>
+            <Radio :label="1">订单</Radio>
-            <Radio :label="false">退单</Radio>
+            <Radio :label="0">退单</Radio>
           </RadioGroup>
         </div>
         <div>
@@ -177,7 +177,7 @@ export default {
 
   data() {
     return {
-      orderOrRefund: true, // 订单还是单
+      orderOrRefund: 1, // 订单还是单
       total: "0", // 总数
       // 订单状态
       orderStatusList: {
@@ -456,7 +456,7 @@ export default {
     },
     orderOrRefund:{ // 订单还是退单
       handler (val) {
-        if (val) {
+        if (val == 1) {
           this.getOrderList();
         } else {
           this.getOrderRefundList();

seller/public/index.html

@@ -19,7 +19,6 @@
   <script src="https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js"></script>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/styles/iview.css">
   <script src="https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/iview.min.js"></script>
-
   <script src="https://cdn.jsdelivr.net/npm/vue-lazyload@1.3.3/vue-lazyload.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/xlsx@0.15.3/dist/xlsx.full.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/dplayer@1.25.0/dist/DPlayer.min.js"></script>

seller/src/main.js

@@ -6,7 +6,7 @@ import "./styles/theme.less";
 
 import "core-js/stable";
 // import "regenerator-runtime/runtime";
-import vueQr from 'vue-qr'
+import vueQr from "vue-qr";
 
 import App from "./App";
 import { router } from "./router/index";
@@ -43,7 +43,7 @@ Vue.use(ViewUI, {
 });
 
 Vue.use(VueClipboard);
-Vue.component(vueQr)
+Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件
 
 // 挂载全局使用的方法
 Vue.prototype.getRequest = getRequest;
@@ -56,13 +56,18 @@ Vue.prototype.setStore = setStore;
 Vue.prototype.getStore = getStore;
 Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
-const buyerUrlPC = 'https://pc-b2b2c.pickmall.cn' // 跳转买家端地址 pc端
+const buyerUrlPC = "https://pc-b2b2c.pickmall.cn"; // 跳转买家端地址 pc端
-const buyerUrlWap = 'https://m-b2b2c.pickmall.cn' // 跳转买家端地址 wap端
+const buyerUrlWap = "https://m-b2b2c.pickmall.cn"; // 跳转买家端地址 wap端
-Vue.prototype.linkTo = function (goodsId, skuId) {  // 跳转买家端商品
+Vue.prototype.linkTo = function(goodsId, skuId) {
-  window.open(`${buyerUrlPC}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+  // 跳转买家端商品
+  window.open(
+    `${buyerUrlPC}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`,
+    "_blank"
+  );
 };
-Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码
+Vue.prototype.wapLinkTo = function(goodsId, skuId) {
-  return `${buyerUrlWap}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
+  // app端二维码
+  return `${buyerUrlWap}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`;
 };
 
 Array.prototype.remove = function(from, to) {

seller/src/views/distribution/distributionGoods.vue

@@ -12,7 +12,7 @@
       <Row class="operation padding-row">
         <Button @click="add" type="primary">添加</Button>
       </Row>
-      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
+      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" >
         <!-- 商品栏目格式化 -->
         <template slot="goodsSlot" slot-scope="{row}">
           <div style="margin-top: 5px;height: 70px; display: flex;">
@@ -107,11 +107,6 @@ export default {
           }],
       },
       columns: [ // 表格表头
-        {
-          type: "selection",
-          width: 60,
-          align: "center"
-        },
         {
           title: "商品名称",
           key: "goodsName",

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

@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <Card>
       <div class="operation">
         <Button @click="addParent">添加一级分类</Button>
@@ -60,7 +59,7 @@
             <Input v-model="formAdd.labelName" maxlength="12" clearable style="width:100%"/>
           </FormItem>
           <FormItem label="排序值" prop="sortOrder" style="width:345px">
-            <InputNumber v-model="formAdd.sortOrder" min="1"></InputNumber>
+            <InputNumber v-model="formAdd.sortOrder" :min="1"></InputNumber>
           </FormItem>
         </Form>
         <div slot="footer">

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

@@ -55,6 +55,7 @@
               </div>
               <Poptip trigger="hover" title="扫码在手机中查看" transfer>
                 <div slot="content">
+                  <!-- <vueQr>123</vueQr> -->
                   <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="">
@@ -73,7 +74,7 @@
     <Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
       <Tabs value="updateStock">
         <TabPane label="手动规格更新" name="updateStock">
-          <Table class="mt_10" :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
+          <Table class="mt_10" :columns="updateStockColumns" :data="stockList" border ></Table>
         </TabPane>
         <TabPane label="批量规格更新" name="stockAll">
           <Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
@@ -117,6 +118,7 @@ import {
 import * as API_Shop from "@/api/shops";
 
 export default {
+ 
   name: "goods",
   data() {
     return {

seller/src/views/lili-components/region.vue

@@ -4,11 +4,10 @@
       :data="data"
       :load-data="loadData"
       change-on-select
-      v-model="dd"
       @on-visible-change="handleChangeOnSelect"
       @on-change="change"
     ></Cascader>
-    {{ dd }}
+  
   </div>
 </template>
 <script>
@@ -17,6 +16,7 @@ import * as API_Setup from "@/api/common.js";
 export default {
   data() {
     return {
+      dd:"",
       data: [], // 地区数据
       selected: [], // 已选地区
       changeOnSelect: false, // 选择时的变化

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

@@ -4,8 +4,8 @@
       <div class="query-wrapper">
         <div class="query-item">
           <div>搜索范围</div>
-          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName='';  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; getQueryGoodsList();}" clearable
+          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName='';  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; getQueryGoodsList();}" clearable style="width: 150px"
-            style="width: 150px" v-model="goodsParams.goodsName" />
+            v-model="goodsParams.goodsName" />
         </div>
         <div class="query-item">
           <Cascader v-model="category" placeholder="请选择商品分类" style="width: 150px" :data="cateList"></Cascader>
@@ -44,16 +44,19 @@ export default {
   props: {
     selectedWay: {
       type: Array,
-      default: new Array()
+      default: () => {
-    }
+        return [];
+      },
+    },
   },
-  data () {
+  data() {
     return {
       type: "multiple", //单选或者多选 single  multiple
 
       cateList: [], // 商品分类列表
       total: "", // 商品总数
-      goodsParams: { // 请求商品列表参数
+      goodsParams: {
+        // 请求商品列表参数
         pageNumber: 1,
         pageSize: 18,
         order: "desc",
@@ -78,7 +81,7 @@ export default {
         this.$emit("selected", this.selectedWay);
       },
       deep: true,
-      immediate: true
+      immediate: true,
     },
     "goodsParams.categoryPath": {
       handler: function () {
@@ -92,7 +95,8 @@ export default {
     this.init();
   },
   methods: {
-    handleReachBottom() { // 页面触底触发加载
+    handleReachBottom() {
+      // 页面触底触发加载
       setTimeout(() => {
         if (
           this.goodsParams.pageNumber * this.goodsParams.pageSize <=
@@ -103,31 +107,32 @@ 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) {
+      // 获取商品列表
+      if (res.result.records.length != 0) {
         let data = res.result.records;
         data.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
 
-          this.selectedWay.forEach(e => {
+          this.selectedWay.forEach((e) => {
             if (e.id === item.id) {
-              item.selected = true 
+              item.selected = true;
             }
-          })
+          });
         });
         /**
          * 解决数据请求中，滚动栏会一直上下跳动
          */
         this.total = res.result.total;
         this.goodsData.push(...res.result.records);
-
       } else {
         this.empty = true;
       }
@@ -206,9 +211,9 @@ export default {
         this.selectedWay.push(val);
       } else {
         val.selected = false;
-        for (let i = 0; i<this.selectedWay.length; i++ ) {
+        for (let i = 0; i < this.selectedWay.length; i++) {
-          if (this.selectedWay[i].id===val.id) {
+          if (this.selectedWay[i].id === val.id) {
-            this.selectedWay.splice(i,1)
+            this.selectedWay.splice(i, 1);
             break;
           }
         }

seller/src/views/member/memberComment.vue

@@ -3,22 +3,10 @@
     <Card>
       <Form ref="searchForm" :model="searchForm" @keydown.enter.native="handleSearch" inline :label-width="70" class="search-form">
         <Form-item label="会员名称" prop="memberName">
-          <Input
+          <Input type="text" v-model="searchForm.memberName" clearable placeholder="请输入会员名称" style="width: 200px" />
-            type="text"
-            v-model="searchForm.memberName"
-            clearable
-            placeholder="请输入会员名称"
-            style="width: 200px"
-          />
         </Form-item>
         <Form-item label="商品名称" prop="goodsName">
-          <Input
+          <Input type="text" v-model="searchForm.goodsName" clearable placeholder="请输入商品名" style="width: 200px" />
-            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">
@@ -28,112 +16,45 @@
           </Select>
         </Form-item>
         <Form-item label="评论日期">
-          <DatePicker
+          <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></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" class="search-btn">搜索</Button>
         <Button @click="handleReset" class="search-btn">重置</Button>
       </Form>
-      <Table
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        class="mt_10"
-      ></Table>
       <Row type="flex" justify="end" class="mt_10">
-        <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"
-          :current="searchForm.pageNumber"
+          show-total show-elevator show-sizer></Page>
-          :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
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
-      :title="modalTitle"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
       <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
         <FormItem label="评价内容">
           <span v-if="!content">暂无评价</span>
           <span v-else>
             <div>
-              <Input
+              <Input v-model="content" type="textarea" maxlength="200" disabled :rows="4" clearable style="width:90%" />
-                v-model="content"
-                type="textarea"
-                maxlength="200"
-                disabled
-                :rows="4"
-                clearable
-                style="width:90%"
-              />
             </div>
           </span>
         </FormItem>
         <FormItem label="评价图片" style="padding-top: 10px" v-if="detailInfo.haveImage == 1">
-          <upload-pic-thumb
+          <upload-pic-thumb v-model="image" :disable="true" :remove="false" :isView="true"></upload-pic-thumb>
-            v-model="image"
-            :disable="true"
-            :remove="false"
-            :isView="true"
-          ></upload-pic-thumb>
         </FormItem>
         <FormItem label="回复内容" prop="reply">
-          <Input v-if="replyStatus == false"
+          <Input v-if="replyStatus == false" v-model="form.reply" type="textarea" maxlength="200" :rows="4" clearable style="width:90%" />
-                 v-model="form.reply"
-                 type="textarea"
-                 maxlength="200"
-                 :rows="4"
-                 clearable
-                 style="width:90%"
-          />
           <span v-else>
-            <Input
+            <Input v-model="form.reply" type="textarea" maxlength="200" disabled :rows="4" clearable style="width:90%" />
-              v-model="form.reply"
-              type="textarea"
-              maxlength="200"
-              disabled
-              :rows="4"
-              clearable
-              style="width:90%"
-            />
           </span>
         </FormItem>
-        <FormItem label="回复图片" prop="replyImage" style="padding-top: 18px"
+        <FormItem label="回复图片" prop="replyImage" style="padding-top: 18px" v-if="detailInfo.haveReplyImage == 1 || replyStatus == false">
-                  v-if="detailInfo.haveReplyImage == 1 || replyStatus == false">
+          <upload-pic-thumb v-if="replyStatus == false" v-model="form.replyImage" :limit="5"></upload-pic-thumb>
-          <upload-pic-thumb v-if="replyStatus == false"
+          <upload-pic-thumb v-else v-model="form.replyImage" :disable="true" :remove="false"></upload-pic-thumb>
-                            v-model="form.replyImage"
-                            :limit="5"
-          ></upload-pic-thumb>
-          <upload-pic-thumb v-else
-                            v-model="form.replyImage"
-                            :disable="true"
-                            :remove="false"
-          ></upload-pic-thumb>
         </FormItem>
       </Form>
       <div slot="footer">
         <Button type="text" @click="modalVisible = false">取消</Button>
         <Button v-if="replyStatus == false" type="primary" :loading="submitLoading" @click="handleSubmit">回复
-        </Button
+        </Button>
-        >
       </div>
     </Modal>
   </div>
@@ -146,17 +67,17 @@ import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 export default {
   name: "memberComment",
   components: {
-    uploadPicThumb
+    uploadPicThumb,
   },
   data() {
     return {
       detailInfo: {}, // 详情信息
-      image: [],//评价图片
+      image: [], //评价图片
-      replyStatus: false,//回复状态
+      replyStatus: false, //回复状态
       modalVisible: false, // 添加或编辑显示
       modalTitle: "", // 添加或编辑标题
       loading: true, // 表单加载状态
-      content: "",//评价内容
+      content: "", //评价内容
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -169,13 +90,11 @@ export default {
       selectDate: null,
       form: {
         replyImage: [],
-        reply: ""
+        reply: "",
       },
       // 表单验证规则
       formValidate: {
-        reply: [
+        reply: [{ required: true, message: "请输入回复内容", trigger: "blur" }],
-          {required: true, message: '请输入回复内容', trigger: 'blur'}
-        ],
       },
       submitLoading: false, // 添加或编辑提交状态
       columns: [
@@ -184,20 +103,19 @@ export default {
           title: "会员名称",
           key: "memberName",
           minWidth: 150,
-          tooltip: true
+          tooltip: true,
         },
         {
           title: "商品名称",
           key: "goodsName",
           minWidth: 150,
-          tooltip: true
+          tooltip: true,
         },
         {
           title: "评价内容",
           key: "content",
           minWidth: 300,
-          tooltip: true
+          tooltip: true,
-
         },
         {
           title: "评价",
@@ -205,13 +123,13 @@ export default {
           width: 100,
           render: (h, params) => {
             if (params.row.grade == "GOOD") {
-              return h("Tag", {props: {color: "green",},}, "好评");
+              return h("Tag", { props: { color: "green" } }, "好评");
             } else if (params.row.grade == "MODERATE") {
-              return h("Tag", {props: {color: "orange",},}, "中评");
+              return h("Tag", { props: { color: "orange" } }, "中评");
             } else {
-              return h("Tag", {props: {color: "red",},}, "差评");
+              return h("Tag", { props: { color: "red" } }, "差评");
             }
-          }
+          },
         },
         {
           title: "状态",
@@ -219,9 +137,9 @@ export default {
           width: 100,
           render: (h, params) => {
             if (params.row.status === "OPEN") {
-              return h("Tag", {props: {color: "green"}},"展示")
+              return h("Tag", { props: { color: "green" } }, "展示");
             } else {
-              return h("Tag", {props: {color: "red"}},"隐藏")
+              return h("Tag", { props: { color: "red" } }, "隐藏");
             }
           },
         },
@@ -231,9 +149,9 @@ export default {
           width: 110,
           render: (h, params) => {
             if (params.row.replyStatus) {
-              return h("Tag", {props: {color: "green"}},"已回复")
+              return h("Tag", { props: { color: "green" } }, "已回复");
             } else {
-              return h("Tag", {props: {color: "blue"}},"未回复")
+              return h("Tag", { props: { color: "blue" } }, "未回复");
             }
           },
         },
@@ -248,6 +166,7 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
+          fixed: 'right',
           width: 120,
           render: (h, params) => {
             return h("div", [
@@ -272,14 +191,14 @@ export default {
             ]);
           },
         },
-
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
     };
   },
   methods: {
-    init() { // 初始化数据
+    init() {
+      // 初始化数据
       this.getDataList();
     },
     // 改变页数
@@ -301,7 +220,7 @@ export default {
     },
     // 重置
     handleReset() {
-      this.searchForm = {}
+      this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
@@ -345,26 +264,26 @@ export default {
     },
     // 获取详情
     detail(v) {
-      this.form.replyImage = []
+      this.form.replyImage = [];
       this.loading = true;
       API_Member.getMemberInfoReview(v.id).then((res) => {
         this.loading = false;
         if (res.success) {
           //赋值
-          this.form.id = res.result.id
+          this.form.id = res.result.id;
-          this.content = res.result.content
+          this.content = res.result.content;
-          this.form.reply = res.result.reply
+          this.form.reply = res.result.reply;
-          this.replyStatus = res.result.replyStatus
+          this.replyStatus = res.result.replyStatus;
           if (res.result.images) {
             this.image = (res.result.images || "").split(",");
           }
           if (res.result.replyImage) {
             this.form.replyImage = (res.result.replyImage || "").split(",");
           }
-          this.detailInfo = res.result
+          this.detailInfo = res.result;
           //弹出框
-          this.modalVisible = true
+          this.modalVisible = true;
-          this.modalTitle = "详细"
+          this.modalTitle = "详细";
         }
       });
     },

seller/src/views/my-components/lili/upload-pic-thumb.vue

@@ -64,7 +64,7 @@ export default {
   },
   props: {
     value: { // 默认值
-      type: Object
+      type:null
     },
     draggable: { // 是否可拖拽改变位置
       type: Boolean,

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

@@ -156,6 +156,7 @@
           },
           {
             title: "状态",
+            align: "center",
             key: "serviceStatus",
             width: 200,
             render: (h, params) => {
@@ -189,6 +190,7 @@
             title: "操作",
             key: "action",
             align: "center",
+            fixed: 'right',
             width: 120,
             render: (h, params) => {
               return h("div", [

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

@@ -46,6 +46,7 @@ export default {
   name: "coupon",
   data() {
     return {
+      selectDate:[],
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象

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

@@ -118,6 +118,8 @@ export default {
   name: 'full-cut',
   data() {
     return {
+      total:0,
+      selectDate:[],
       loading: false, // 表单加载状态
       searchForm: { // 列表请求参数
         pageNumber: 1,

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

@@ -43,8 +43,8 @@
             </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']"
+          <Upload v-if="liveForm.feedsImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleFeedsImgSuccess" :format="['jpg','jpeg','png']" :on-format-error="handleFormatError"
-            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :max-size="1024" :on-exceeded-size="handleMaxSize" 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>
@@ -66,8 +66,8 @@
               </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']"
+          <Upload v-if="liveForm.coverImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleCoverImgSuccess" :format="['jpg','jpeg','png']" :on-format-error="handleFormatError"
-            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :max-size="1024" :on-exceeded-size="handleMaxSize" 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>
@@ -87,8 +87,8 @@
               </div>
             </template>
           </div>
-          <Upload v-if="liveForm.shareImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleShareImgSuccess" :default-file-list="defaultImgList" :format="['jpg','jpeg','png']"
+          <Upload v-if="liveForm.shareImg.length ==0" ref="upload" :show-upload-list="false" :on-success="handleShareImgSuccess" :format="['jpg','jpeg','png']" :on-format-error="handleFormatError"
-            :on-format-error="handleFormatError" :max-size="1024" :on-exceeded-size="handleMaxSize" type="drag" :action="action" :headers="accessToken" style="display: inline-block;width:58px;">
+            :max-size="1024" :on-exceeded-size="handleMaxSize" 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>
@@ -235,7 +235,7 @@ export default {
           width: 250,
         },
       ],
-      liveData: [] //直播商品集合
+      liveData: [], //直播商品集合
     };
   },
   mounted() {
@@ -496,7 +496,7 @@ export default {
             this.liveForm.commodityList = JSON.stringify(
               this.liveForm.commodityList
             );
-            delete this.liveForm.updateTime
+            delete this.liveForm.updateTime;
             // 将当前直播间修改
             editLive(this.liveForm).then((res) => {
               if (res.success) {

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

@@ -14,7 +14,7 @@
 
       <div>
         <Tabs v-model="params.auditStatus">
-          <TabPane v-for="(item,index) in liveTabWay" :key="index" :label="item.label" :name="item.type">
+          <TabPane v-for="(item,index) in liveTabWay" :key="index" :label="item.label" :name="item.type+''">
           </TabPane>
         </Tabs>
       </div>
@@ -63,7 +63,7 @@
           <template slot-scope="{ row,index }" slot="action">
             <Button v-if="params.auditStatus == 99" type="primary" @click="()=>{liveGoodsData.splice(index,1)}">删除</Button>
             <Button v-if="params.auditStatus != 99 && !reviewed" ghost type="primary" @click="()=>{$router.push({path:'/goods-operation-edit',query:{id:row.goodsId}})}">查看</Button>
-            <Button v-if="reviewed" :type="row.___selected ? 'primary' : ''" @click="selectedLiveGoods(row,index)">{{row.___selected ? '已':''}}选择</Button>
+            <Button v-if="reviewed" :type="row.___selected ? 'primary' : 'default'" @click="selectedLiveGoods(row,index)">{{row.___selected ? '已':''}}选择</Button>
           </template>
         </Table>
         <div class="flex">
@@ -90,7 +90,7 @@ export default {
   },
   data() {
     return {
-      goodsTotal: "", //商品总数
+      goodsTotal: 0, //商品总数
       saveGoodsLoading: false, //保存商品加载
       tableLoading: false, //表格是否加载
       params: {
@@ -209,7 +209,6 @@ export default {
      * 回调参数补充
      */
     selectedLiveGoods(val, index) {
-
       this.$emit("selectedGoods", val);
     },
     /**

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

@@ -9,65 +9,43 @@
           </div>
         </FormItem>
         <FormItem label="活动时间" prop="rangeTime">
-          <DatePicker
+          <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
-            type="datetimerange"
-            v-model="form.rangeTime"
-            format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择"
-            :options="options"
-            style="width: 260px"
-          >
           </DatePicker>
         </FormItem>
 
         <FormItem label="参团人数" prop="requiredNum" :label-width="130">
           <Input v-model="form.requiredNum" style="width: 260px" max="8">
-            <span slot="append">人</span>
+          <span slot="append">人</span>
           </Input>
-          <span style="color: #cccccc"
+          <span style="color: #cccccc">参团人数不少于2人，不得超过10人。</span>
-            >参团人数不少于2人，不得超过10人。</span
-          >
         </FormItem>
         <FormItem label="限购数量" prop="limitNum" :label-width="130">
           <Input v-model="form.limitNum" type="number" style="width: 260px">
-            <span slot="append">件/人</span>
+          <span slot="append">件/人</span>
           </Input>
           <span style="color: #cccccc">如果设置为0则视为不限制购买数量</span>
         </FormItem>
         <FormItem label="虚拟成团" prop="fictitious">
           <RadioGroup type="button" button-style="solid" v-model="form.fictitious">
-            <Radio title="开启" :label="true">
+            <Radio title="开启" :label="1">
               <span>开启</span>
             </Radio>
-            <Radio title="关闭" :label="false">
+            <Radio title="关闭" :label="0">
               <span>关闭</span>
             </Radio>
           </RadioGroup>
           <br />
-          <span style="color: #cccccc"
+          <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高</span>
-            >开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高</span
-          >
         </FormItem>
         <FormItem label="拼团规则" prop="pintuanRule">
-          <Input
+          <Input v-model="form.pintuanRule" type="textarea" :rows="4" clearable maxlength="255" style="width: 260px" />
-            v-model="form.pintuanRule"
-            type="textarea"
-            :rows="4"
-            clearable
-            maxlength="255"
-            style="width: 260px"
-          />
           <br />
-          <span style="color: #cccccc"
+          <span style="color: #cccccc">拼团规则描述不能为空且不能大于255个字，会在WAP拼团详情页面显示</span>
-            >拼团规则描述不能为空且不能大于255个字，会在WAP拼团详情页面显示</span
-          >
         </FormItem>
       </Form>
       <div>
         <Button type="text" @click="closeCurrentPage">返回</Button>
-        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-          >提交</Button
-        >
       </div>
     </Card>
   </div>
@@ -84,7 +62,7 @@ export default {
         promotionTitle: "",
         pintuanRule: "",
         requiredNum: "",
-        fictitious: false,
+        fictitious: 0,
         limitNum: "",
         startTime: "",
         endTime: "",
@@ -109,7 +87,8 @@ export default {
         rangeTime: [{ required: true, message: "请选择活动时间" }],
       },
       submitLoading: false, // 添加或编辑提交状态
-      options: { // 不可选取时间
+      options: {
+        // 不可选取时间
         disabledDate(date) {
           return date && date.valueOf() < Date.now() - 86400000;
         },
@@ -136,7 +115,10 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
-          let params = JSON.parse(JSON.stringify(this.form))
+          let params = JSON.parse(JSON.stringify(this.form));
+          params.fictitious
+            ? (params.fictitious = true)
+            : (params.fictitious = false);
           params.startTime = this.$options.filters.unixToDate(
             this.form.rangeTime[0] / 1000
           );
@@ -144,18 +126,18 @@ export default {
           params.endTime = this.$options.filters.unixToDate(
             this.form.rangeTime[1] / 1000
           );
-          if(params.startTime === '' || params.endTime ===''){
+          if (params.startTime === "" || params.endTime === "") {
             this.$Message.error("活动时间不能为空");
             this.submitLoading = false;
-            return
+            return;
           }
-          if(params.startTime < new Date()){
+          if (params.startTime < new Date()) {
             this.$Message.error("拼团活动开始时间不能小于当前时间");
             this.submitLoading = false;
-            return
+            return;
           }
 
-          delete params.rangeTime
+          delete params.rangeTime;
           if (!this.id) {
             // 添加 避免编辑后传入id等数据 记得删除
             delete params.id;
@@ -189,14 +171,17 @@ export default {
           data.rangeTime = [];
           data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
           this.form = data;
-        }
+          // 此处将值转换为 1 true ，0 false 不然ivew radio组件会报错
+          this.form.fictitious ? this.$set(this.form, "fictitious", 1)  : this.$set(this.form, "fictitious", 0);
+    
+       }
       });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .ivu-form-item{
+/deep/ .ivu-form-item {
   padding: 18px 10px !important;
 }
 </style>

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

@@ -68,6 +68,7 @@ export default {
   components: {},
   data() {
     return {
+      selectDate:[],
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象

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

@@ -22,7 +22,7 @@
             v-for="(tab, tabIndex) in goodsList"
             :key="tabIndex"
             :label="tab.hour"
-            :name="tabIndex"
+            :name="tabIndex + ''"
           >
             <Table
               :loading="loading"

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

@@ -20,18 +20,13 @@
           bill.billStatus | unixSellerBillStatus
         }}</span>
 
-        <Button
+        <Button v-if="bill.billStatus == 'OUT'" size="mini" @click="reconciliation()" type="primary">对账</Button>
-          v-if="bill.billStatus == 'OUT'"
-          size="mini"
-          @click="reconciliation()"
-          type="primary"
-          >对账</Button
-        >
       </div>
       <table>
         <tbody>
           <tr v-for="(item,index) in data" :key="index">
-            <td>{{item.name}}</td><td>{{item.value}}</td>
+            <td>{{item.name}}</td>
+            <td>{{item.value}}</td>
           </tr>
         </tbody>
       </table>
@@ -58,12 +53,12 @@
             <p>退单产生退还佣金金额</p>
             <p class="increase-color">+{{bill.refundCommissionPrice || 0  | unitPrice('￥')}}</p>
           </span>
-          
+
           <span>
             <p>退单分销返现返还</p>
             <p class="increase-color">+{{bill.distributionRefundCommission || 0  | unitPrice('￥')}}</p>
           </span>
-          
+
           <span>
             <p>退单平台优惠券返还</p>
             <p class="increase-color">+{{bill.siteCouponRefundCommission || 0  | unitPrice('￥')}}</p>
@@ -82,67 +77,25 @@
     <Card class="mt_10">
       <Tabs active-key="tab" type="card" @on-click="clickTabs">
         <Tab-pane label="订单列表" name="order">
-            <Table
+          <Table :loading="loading" border :columns="orderColumns" :data="orderData" ref="table"></Table>
-              :loading="loading"
+          <Row type="flex" justify="end" class="mt_10">
-              border
+            <Page :current="orderParam.pageNumber" :total="orderTotal" :page-size="orderParam.pageSize" @on-change="orderChangePage" @on-page-size-change="orderChangePageSize" size="small" show-total
-              :columns="orderColumns"
+              show-elevator></Page>
-              :data="orderData"
+          </Row>
-              ref="table"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="orderParam.pageNumber"
-                :total="orderTotal"
-                :page-size="orderParam.pageSize"
-                @on-change="orderChangePage"
-                @on-page-size-change="orderChangePageSize"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </Row>
         </Tab-pane>
         <Tab-pane label="退单列表" name="refund">
-            <Table
+          <Table :loading="loading" border :columns="refundColumns" :data="refundData" ref="table"></Table>
-              :loading="loading"
+          <Row type="flex" justify="end" class="mt_10">
-              border
+            <Page :current="refundParam.pageNumber" :total="refundTotal" :page-size="refundParam.pageSize" @on-change="refundChangePage" @on-page-size-change="refundChangePageSize" size="small"
-              :columns="refundColumns"
+              show-total show-elevator></Page>
-              :data="refundData"
+          </Row>
-              ref="table"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="refundParam.pageNumber"
-                :total="refundTotal"
-                :page-size="refundParam.pageSize"
-                @on-change="refundChangePage"
-                @on-page-size-change="refundChangePageSize"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </Row>
         </Tab-pane>
         <Tab-pane label="分销费用列表" name="distribution">
-            <Table
+          <Table :loading="loading" border :columns="distributionColumns" :data="distributionData" ref="table"></Table>
-              :loading="loading"
+          <Row type="flex" justify="end" class="mt_10">
-              border
+            <Page :current="distributionParam.pageNumber" :total="distributionTotal" :page-size="distributionParam.pageSize" @on-change="distributionChangePage"
-              :columns="distributionColumns"
+              @on-page-size-change="distributionChangePageSize" size="small" show-total show-elevator></Page>
-              :data="distributionData"
+          </Row>
-              ref="table"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="distributionParam.pageNumber"
-                :total="distributionTotal"
-                :page-size="distributionParam.pageSize"
-                @on-change="distributionChangePage"
-                @on-page-size-change="distributionChangePageSize"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </Row>
         </Tab-pane>
       </Tabs>
     </Card>
@@ -155,6 +108,7 @@ export default {
   name: "bill-detail",
   data() {
     return {
+      loading: true,
       columns: [
         {
           title: "项目",
@@ -166,7 +120,8 @@ export default {
           key: "value",
         },
       ],
-      data: [ // 账单数据
+      data: [
+        // 账单数据
         {
           name: "计算中",
           value: 0,
@@ -199,7 +154,7 @@ export default {
         {
           name: "计算公式",
           value: 0,
-        }
+        },
       ],
       id: "", // 账单id
       bill: {}, // 商家信息
@@ -236,10 +191,13 @@ export default {
             if (params.row.kanjiaSettlementPrice) {
               return h(
                 "div",
-                this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥")
+                this.$options.filters.unitPrice(
+                  params.row.kanjiaSettlementPrice,
+                  "￥"
+                )
               );
             } else {
-              return h('div','￥0.00')
+              return h("div", "￥0.00");
             }
           },
         },
@@ -247,13 +205,16 @@ export default {
           title: "积分商品结算价格",
           key: "pointSettlementPrice",
           render: (h, params) => {
-            if (params.row.pointSettlementPrice){
+            if (params.row.pointSettlementPrice) {
               return h(
                 "div",
-                this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥")
+                this.$options.filters.unitPrice(
+                  params.row.pointSettlementPrice,
+                  "￥"
+                )
               );
             } else {
-              return h('div','￥0.00')
+              return h("div", "￥0.00");
             }
           },
         },
@@ -271,36 +232,34 @@ export default {
           title: "平台优惠券",
           key: "siteCouponPrice",
           render: (h, params) => {
-            if(params.row.siteCouponPrice == null){
+            if (params.row.siteCouponPrice == null) {
+              return h("div", "-");
+            } else {
               return h(
                 "div",
-                "-"
+                this.$options.filters.unitPrice(
-              );
+                  params.row.siteCouponPrice,
-            }else{
+                  "￥"
-              return h(
+                )
-                "div",
-                this.$options.filters.unitPrice(params.row.siteCouponPrice, "￥")
               );
             }
-
           },
         },
         {
           title: "分销金额",
           key: "distributionRebate",
           render: (h, params) => {
-            if(params.row.distributionRebate == null){
+            if (params.row.distributionRebate == null) {
+              return h("div", "-");
+            } else {
               return h(
                 "div",
-                "-"
+                this.$options.filters.unitPrice(
-              );
+                  params.row.distributionRebate,
-            }else{
+                  "￥"
-              return h(
+                )
-                "div",
-                this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
               );
             }
-
           },
         },
         {
@@ -313,7 +272,6 @@ export default {
             );
           },
         },
-
       ],
       orderData: [], // 订单列表
       orderTotal: 0, // 订单数量
@@ -329,17 +287,17 @@ export default {
         {
           title: "退款时间",
           key: "createTime",
-          minWidth: 120
+          minWidth: 120,
         },
         {
           title: "退款流水编号",
           key: "sn",
-          minWidth: 130
+          minWidth: 130,
         },
         {
           title: "订单编号",
           key: "sn",
-          minWidth: 120
+          minWidth: 120,
         },
         {
           title: "退款金额",
@@ -357,16 +315,16 @@ export default {
           key: "commissionPrice",
           minWidth: 120,
           render: (h, params) => {
-            if(params.row.commissionPrice){
+            if (params.row.commissionPrice) {
               return h(
                 "div",
-                this.$options.filters.unitPrice(params.row.commissionPrice, "￥")
+                this.$options.filters.unitPrice(
-              );
+                  params.row.commissionPrice,
-            }else{
+                  "￥"
-              return h(
+                )
-                "div",
-                this.$options.filters.unitPrice(0, "￥")
               );
+            } else {
+              return h("div", this.$options.filters.unitPrice(0, "￥"));
             }
           },
         },
@@ -374,25 +332,24 @@ export default {
         {
           title: "退还平台优惠券",
           key: "siteCouponCommission",
-          minWidth: 140
+          minWidth: 140,
         },
         {
           title: "退还分销",
           key: "distributionRebate",
           minWidth: 120,
           render: (h, params) => {
-            if(params.row.distributionRebate == null){
+            if (params.row.distributionRebate == null) {
+              return h("div", "-");
+            } else {
               return h(
                 "div",
-                "-"
+                this.$options.filters.unitPrice(
-              );
+                  params.row.distributionRebate,
-            }else{
+                  "￥"
-              return h(
+                )
-                "div",
-                this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
               );
             }
-
           },
         },
 
@@ -401,18 +358,14 @@ export default {
           key: "billPrice",
           minWidth: 120,
           render: (h, params) => {
-            if(params.row.billPrice == null){
+            if (params.row.billPrice == null) {
-              return h(
+              return h("div", "-");
-                "div",
+            } else {
-                "-"
-              );
-            }else{
               return h(
                 "div",
                 this.$options.filters.unitPrice(params.row.billPrice, "￥")
               );
             }
-
           },
         },
       ],
@@ -429,18 +382,18 @@ export default {
         {
           title: "订单编号",
           key: "sn",
-          minWidth: 120
+          minWidth: 120,
         },
         {
           title: "交易金额",
           key: "finalPrice",
-          minWidth: 120
+          minWidth: 120,
         },
         {
           title: "商品名称",
           key: "goodsName",
           minWidth: 120,
-          tooltip: true
+          tooltip: true,
         },
         {
           title: "规格",
@@ -456,7 +409,7 @@ export default {
         {
           title: "店铺名称",
           key: "storeName",
-          minWidth: 120
+          minWidth: 120,
         },
 
         {
@@ -464,53 +417,55 @@ export default {
           key: "distributionRebate",
           minWidth: 120,
           render: (h, params) => {
-           if(params.row.flowType === "退款" ){
+            if (params.row.flowType === "退款") {
-             return h(
+              return h(
-               "div",
+                "div",
-               this.$options.filters.unitPrice("-"+params.row.distributionRebate, "￥")
+                this.$options.filters.unitPrice(
-             );
+                  "-" + params.row.distributionRebate,
-           }else{
+                  "￥"
-             if(params.row.distributionRebate){
+                )
-               return h(
+              );
-                 "div",
+            } else {
-                 this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+              if (params.row.distributionRebate) {
-               );
+                return h(
-             }else{
+                  "div",
-               return h(
+                  this.$options.filters.unitPrice(
-                 "div",
+                    params.row.distributionRebate,
-                 this.$options.filters.unitPrice(0, "￥")
+                    "￥"
-               );
+                  )
-             }
+                );
-           }
+              } else {
+                return h("div", this.$options.filters.unitPrice(0, "￥"));
+              }
+            }
           },
         },
         {
           title: "时间",
           key: "createTime",
-          minWidth: 120
+          minWidth: 120,
         },
       ],
       distributionData: [], // 分销数据
       distributionTotal: 0, // 分销总数
-
     };
   },
   watch: {
-    '$route.query.id': function (val) {
+    "$route.query.id": function (val) {
       this.id = val;
       this.getBill();
-    }
+    },
   },
   methods: {
     clickTabs(v) {
       if (v == "order") {
         this.orderParam.flowType = "PAY";
-        this.getOrderList()
+        this.getOrderList();
-      } else if(v === "refund"){
+      } else if (v === "refund") {
         this.orderParam.flowType = "REFUND";
-        this.getRefundList()
+        this.getRefundList();
-      }else{
+      } else {
-        this.getDistributionList()
+        this.getDistributionList();
       }
     },
     //核对结算单
@@ -528,7 +483,7 @@ export default {
               this.init();
             }
           });
-        }
+        },
       });
     },
 
@@ -539,15 +494,16 @@ export default {
     //订单列表部分
     orderChangePage(v) {
       this.orderParam.pageNumber = v;
-      this.getOrderList()
+      this.getOrderList();
     },
     orderChangePageSize(v) {
       this.orderParam.pageSize = v;
-      this.getOrderList()
+      this.getOrderList();
     },
-    getOrderList(){
+    getOrderList() {
-      API_Shop.getSellerFlow(this.id,this.orderParam).then((res) => {
+      API_Shop.getSellerFlow(this.id, this.orderParam).then((res) => {
         if (res.success) {
+          this.loading = false;
           this.orderData = res.result.records;
           this.orderTotal = res.result.total;
         }
@@ -556,11 +512,11 @@ export default {
     //退单部分
     refundChangePage(v) {
       this.refundParam.pageNumber = v;
-      this.getRefundList()
+      this.getRefundList();
     },
     refundChangePageSize(v) {
       this.refundParam.pageSize = v;
-      this.getRefundList()
+      this.getRefundList();
     },
     getRefundList() {
       API_Shop.getSellerFlow(this.id, this.refundParam).then((res) => {
@@ -574,23 +530,25 @@ export default {
     //分销费用列表
     distributionChangePage(v) {
       this.distributionParam.pageNumber = v;
-      this.getDistributionList()
+      this.getDistributionList();
     },
     distributionChangePageSize(v) {
       this.distributionParam.pageSize = v;
-      this.getDistributionList()
+      this.getDistributionList();
     },
     getDistributionList() {
-      API_Shop.getDistributionFlow(this.id, this.distributionParam).then((res) => {
+      API_Shop.getDistributionFlow(this.id, this.distributionParam).then(
-        this.loading = false;
+        (res) => {
-        if (res.result) {
+          this.loading = false;
-          this.distributionData = res.result.records;
+          if (res.result) {
-          this.distributionTotal = res.result.total;
+            this.distributionData = res.result.records;
+            this.distributionTotal = res.result.total;
+          }
         }
-      });
+      );
     },
     //获取结算单详细
-    getBill(){
+    getBill() {
       API_Shop.getBillDetail(this.id).then((res) => {
         if (res.success) {
           this.bill = res.result;
@@ -623,22 +581,27 @@ export default {
       this.data[5].value = bill.payTime === null ? "未付款" : bill.payTime;
 
       this.data[6].name = "订单付款总金额";
-      this.data[6].value = filters.unitPrice(bill.orderPrice?bill.orderPrice:0, "¥");
+      this.data[6].value = filters.unitPrice(
+        bill.orderPrice ? bill.orderPrice : 0,
+        "¥"
+      );
       this.data[7].name = "结算金额";
-      this.data[7].value = filters.unitPrice(bill.billPrice?bill.billPrice:0, "¥");
+      this.data[7].value = filters.unitPrice(
+        bill.billPrice ? bill.billPrice : 0,
+        "¥"
+      );
     },
-
   },
   mounted() {
     this.init();
   },
   // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
-  beforeRouteLeave(to, from, next){
+  beforeRouteLeave(to, from, next) {
-    if(to.name === 'accountStatementBill' || to.name === 'storeBill') {
+    if (to.name === "accountStatementBill" || to.name === "storeBill") {
-      to.meta.keepAlive = true
+      to.meta.keepAlive = true;
     }
-    next()
+    next();
-  }
+  },
 };
 </script>
 
@@ -651,7 +614,7 @@ export default {
     margin: 15px 0;
   }
 }
-.page{
+.page {
   margin-top: 10px;
 }
 .tips-status {
@@ -665,33 +628,32 @@ export default {
     color: $theme_color;
   }
 }
-table{
+table {
   font-size: 14px;
   margin-left: 20px;
-  tr{
+  tr {
     height: 40px;
     padding: 10px;
-    td:nth-child(1){
+    td:nth-child(1) {
       width: 120px;
     }
   }
 }
-.bill-detail-price{
+.bill-detail-price {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
   padding: 10px;
-  >span{
+  > span {
-    
     font-size: 14px;
     text-align: center;
     width: 200px;
     margin-bottom: 10px;
   }
-  .theme_color{
+  .theme_color {
     color: $theme_color;
   }
-  .increase-color{
+  .increase-color {
     color: green;
   }
 }

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

@@ -145,7 +145,7 @@
         </TabPane>
       </Tabs>
     </Card>
-    <multiple-region ref="region" @selected="handleSelect" @closed="handleClose">
+    <multiple-region ref="region" @selected="handleSelect" >
 
     </multiple-region>
 

seller/src/views/shop/shopSetting.vue

@@ -1,70 +1,69 @@
 <template>
   <div class="search">
- 
-      <Card style="margin-left: 10px">
-        <Tabs @on-click="handleClickType">
-          <TabPane label="基本信息" name="INFO">
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-              <FormItem label="店铺名称">
-                <Input v-model="storeName" disabled clearable style="width: 20%" />
-              </FormItem>
-              <FormItem label="店铺地址" prop="address">
-                <Input v-model="form.address" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 20%" />
-              </FormItem>
-              <FormItem label="详细地址" prop="shopAddressDetail">
-                <Input v-model="form.storeAddressDetail" clearable style="width: 20%" maxlength="50" />
-              </FormItem>
-              <FormItem label="店铺LOGO：">
-                <upload-pic-thumb v-model="form.storeLogo" :multiple="false"></upload-pic-thumb>
-              </FormItem>
-              <FormItem label="店铺简介" prop="content" class="wangEditor">
-                <Input type="textarea" :rows="8" v-model="form.storeDesc" style="width: 30%"></Input>
-              </FormItem>
-              <Form-item>
-                <Button @click="handleSubmit" :loading="submitLoading" type="primary"  style="margin-right:5px">修改
-                </Button>
-              </Form-item>
-            </Form>
-          </TabPane>
-          <TabPane label="退货地址" name="REFUND_GOODS_ADDRESS">
-            <Form ref="addressForm" :model="addressForm" :label-width="100" :rules="afterFormValidate">
-              <FormItem label="收货人" prop="salesConsigneeName">
-                <Input v-model="addressForm.salesConsigneeName" maxlength="11" clearable style="width: 20%" />
-              </FormItem>
-              <FormItem label="收货人电话" prop="salesConsigneeMobile">
-                <Input v-model="addressForm.salesConsigneeMobile" maxlength="11" style="width: 20%" />
-              </FormItem>
-              <FormItem label="售后地址">
-                <Input v-model="region" disabled style="width: 20%" v-if="showRegion == false" />
-                <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary"  style="margin-left:8px">修改
-                </Button>
-                <region style="width: 20%" @selected="selectedRegion" v-if="showRegion == true" />
-              </FormItem>
-              <FormItem label="详细地址" prop="salesConsigneeDetail">
-                <Input v-model="addressForm.salesConsigneeDetail" clearable style="width: 20%" maxlength="50" />
-              </FormItem>
 
-              <Form-item>
+    <Card style="margin-left: 10px">
-                <Button @click="afterHandleSubmit" :loading="submitLoading" type="primary"  style="margin-right:5px">修改
+      <Tabs v-model="type" @on-click="handleClickType">
-                </Button>
+        <TabPane label="基本信息" name="INFO">
-              </Form-item>
+          <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-            </Form>
+            <FormItem label="店铺名称">
-          </TabPane>
+              <Input v-model="storeName" disabled clearable style="width: 20%" />
-          <TabPane label="库存预警" name="STOCK_WARNING">
+            </FormItem>
+            <FormItem label="店铺地址" prop="address">
+              <Input v-model="form.address" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 20%" />
+            </FormItem>
+            <FormItem label="详细地址" prop="shopAddressDetail">
+              <Input v-model="form.storeAddressDetail" clearable style="width: 20%" maxlength="50" />
+            </FormItem>
+            <FormItem label="店铺LOGO：">
+              <upload-pic-thumb v-model="form.storeLogo" :multiple="false"></upload-pic-thumb>
+            </FormItem>
+            <FormItem label="店铺简介" prop="content" class="wangEditor">
+              <Input type="textarea" :rows="8" v-model="form.storeDesc" style="width: 30%"></Input>
+            </FormItem>
+            <Form-item>
+              <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">修改
+              </Button>
+            </Form-item>
+          </Form>
+        </TabPane>
+        <TabPane label="退货地址" name="REFUND_GOODS_ADDRESS">
+          <Form ref="addressForm" :model="addressForm" :label-width="100" :rules="afterFormValidate">
+            <FormItem label="收货人" prop="salesConsigneeName">
+              <Input v-model="addressForm.salesConsigneeName" maxlength="11" clearable style="width: 20%" />
+            </FormItem>
+            <FormItem label="收货人电话" prop="salesConsigneeMobile">
+              <Input v-model="addressForm.salesConsigneeMobile" maxlength="11" style="width: 20%" />
+            </FormItem>
+            <FormItem label="售后地址">
+              <Input v-model="region" disabled style="width: 20%" v-if="showRegion == false" />
+              <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary" style="margin-left:8px">修改
+              </Button>
+              <regionMap style="width: 20%" @selected="selectedRegion" v-if="showRegion == true" />
+            </FormItem>
+            <FormItem label="详细地址" prop="salesConsigneeDetail">
+              <Input v-model="addressForm.salesConsigneeDetail" clearable style="width: 20%" maxlength="50" />
+            </FormItem>
 
-            <Form ref="stockWarningForm" :model="stockWarningForm" :label-width="100" :rules="stockWarningFormValidate">
+            <Form-item>
-              <FormItem label="预警数" prop="stockWarning">
+              <Button @click="afterHandleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">修改
-                <Input v-model="stockWarningForm.stockWarning" type="number" maxlength="6" clearable style="width: 20%" />
+              </Button>
-              </FormItem>
+            </Form-item>
-              <Form-item>
+          </Form>
-                <Button @click="stockWarningHandleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">修改
+        </TabPane>
-                </Button>
+        <TabPane label="库存预警" name="STOCK_WARNING">
-              </Form-item>
+
-            </Form>
+          <Form ref="stockWarningForm" :model="stockWarningForm" :label-width="100" :rules="stockWarningFormValidate">
-          </TabPane>
+            <FormItem label="预警数" prop="stockWarning">
-        </Tabs>
+              <Input v-model="stockWarningForm.stockWarning" type="number" maxlength="6" clearable style="width: 20%" />
-      </Card>
+            </FormItem>
-   
+            <Form-item>
+              <Button @click="stockWarningHandleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">修改
+              </Button>
+            </Form-item>
+          </Form>
+        </TabPane>
+      </Tabs>
+    </Card>
 
     <liliMap ref="liliMap" @getAddress="getAddress"></liliMap>
   </div>
@@ -74,31 +73,30 @@
 import * as API_Shop from "@/api/shops";
 import { validateMobile } from "@/libs/validate";
 import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
-import editor from "@/views/my-components/lili/editor";
 import liliMap from "@/views/my-components/map/index";
-import region from "@/views/lili-components/region";
+import regionMap from "@/views/lili-components/region";
 import * as RegExp from "@/libs/RegExp.js";
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
-
 export default {
   name: "shopSetting",
   components: {
     uploadPicThumb,
-    editor,
     liliMap,
-    region,
+    regionMap,
   },
   data() {
     return {
+      type: "INFO",
       showRegion: false, // 选择地址模态框显隐
       storeName: "", //店铺名称
-      region: [], // 地区名称
+      region: "", // 地区名称
       regionId: [], // 地区id
-      addressForm: { // 退货地址
+      addressForm: {
+        // 退货地址
         salesConsigneeName: "", // 收货人姓名
         salesConsigneeMobile: "", // 收货人电话
         salesConsigneeAddressId: "", // 售后地址id,逗号分割
-        salesConsigneeAddressPath: "",// 售后地址，逗号分割
+        salesConsigneeAddressPath: "", // 售后地址，逗号分割
         salesConsigneeDetail: "", // 详细地址
       },
       //库存预警form
@@ -201,7 +199,7 @@ export default {
           //库存预警数赋值
 
           this.$nextTick(() => {
-            this.stockWarningForm.stockWarning = res.result.stockWarning+"";
+            this.stockWarningForm.stockWarning = res.result.stockWarning + "";
           });
         }
       });

seller/src/views/statistics/order.vue

@@ -149,8 +149,8 @@
         <h4>订退单统计</h4>
         <div class="breadcrumb" style="margin-bottom:20px;">
           <RadioGroup v-model="orderOrRefund" type="button" size="small" button-style="solid">
-            <Radio :label="true">订单</Radio>
+            <Radio :label="1">订单</Radio>
-            <Radio :label="false">退单</Radio>
+            <Radio :label="0">退单</Radio>
           </RadioGroup>
         </div>
         <div>
@@ -175,8 +175,8 @@ export default {
 
   data() {
     return {
-      orderOrRefund: true, // 订单还是退单
+      orderOrRefund: 1, // 订单还是退单
-      total: "0", // 订单总数
+      total:0, // 订单总数
       // 订单状态
       orderStatusList: {
         UNDELIVERED: "待发货",
@@ -457,15 +457,16 @@ export default {
       },
       deep: true,
     },
-    orderOrRefund:{ // 订单还是退单
+    orderOrRefund: {
-      handler (val) {
+      // 订单还是退单
-        if (val) {
+      handler(val) {
+        if (val == 1) {
           this.getOrderList();
         } else {
           this.getOrderRefundList();
         }
-      }
+      },
-    }
+    },
   },
   methods: {
     // 订单图