diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index 6430ff5e..378a1c36 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -87,6 +87,7 @@ export default {
     },
   },
   methods: {
+    // 初始化方法
     init() {
       // 菜单
       let pathArr = util.setCurrentPath(this, this.$route.name);
@@ -103,25 +104,7 @@ export default {
         this.sliceNum = 2;
       }
     },
-    selectNav(name) {
-      this.$store.commit("setCurrNav", name);
-      this.setStore("currNav", name);
-      // 清空所有已打开标签
-      // this.$store.commit("clearAllTags");
-      if (this.$route.name != "home_index") {
-        this.$router.push({
-          name: "home_index",
-        });
-      }
-      util.initRouter(this);
-    },
-    toggleClick() {
-      this.shrink = !this.shrink;
-    },
-    handleLanDropdown(name) {
-      this.$i18n.locale = name;
-      this.$store.commit("switchLang", name);
-    },
+    // 用户头像下拉
     handleClickUserDropdown(name) {
       if (name == "ownSpace") {
         util.openNewPage(this, "personal-enter");
@@ -142,6 +125,7 @@ export default {
         this.$router.push({ path: "/login" });
       }
     },
+    // 快捷页签选中状态
     checkTag(name) {
       let openpageHasTag = this.pageTagsList.some((item) => {
         if (item.name == name) {
@@ -158,7 +142,7 @@ export default {
         );
       }
     },
-
+    // 宽度变化
     resize() {
       let currWidth = document.body.clientWidth;
       let count = currWidth / 300;
diff --git a/seller/src/views/goods/goods-manage/category.vue b/seller/src/views/goods/goods-manage/category.vue
index a6278c62..7a5b2271 100644
--- a/seller/src/views/goods/goods-manage/category.vue
+++ b/seller/src/views/goods/goods-manage/category.vue
@@ -75,13 +75,11 @@
 import * as API_Goods from "@/api/goods";
 
 import TreeTable from "@/views/my-components/tree-table/Table/Table";
-import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
 export default {
   name: "lili-components",
   components: {
-    TreeTable,
-    uploadPicInput
+    TreeTable
   },
   data() {
     return {
diff --git a/seller/src/views/lili-components/multiple-region.vue b/seller/src/views/lili-components/multiple-region.vue
index 91d509d7..21f07bdc 100644
--- a/seller/src/views/lili-components/multiple-region.vue
+++ b/seller/src/views/lili-components/multiple-region.vue
@@ -191,7 +191,6 @@ export default {
 
             this.selectedWay.push({ name: data.title, id: data.id });
           });
-          console.log(this.data);
           this.$store.state.regions = this.data;
         }
       });
diff --git a/seller/src/views/my-components/map/index.vue b/seller/src/views/my-components/map/index.vue
index 6b79b88b..3685e12b 100644
--- a/seller/src/views/my-components/map/index.vue
+++ b/seller/src/views/my-components/map/index.vue
@@ -1,183 +1,185 @@
 <template>
   <div class="map">
-    <Modal
-        v-model="showMap"
-        title="选择地址"
-        width="800"
-        >
-        <div class="address">{{addrContent.address}}</div>
-        <div id="map-container"></div>
+    <Modal v-model="showMap" title="选择地址" width="800">
+      <div class="address">{{ addrContent.address }}</div>
+      <div id="map-container"></div>
 
-        <div class="search-con">
-            <Input placeholder="输入关键字搜索" id="input-map" v-model="mapSearch"/>
-            <ul>
-                <li v-for="(tip, index) in tips" :key="index" @click="selectAddr(tip.location)">
-                    <p>{{tip.name}}</p>
-                    <p>{{tip.district + tip.address}}</p>
-                </li>
-            </ul>
-        </div>
-        <div slot="footer">
-            <Button type="default" @click="showMap = false">取消</Button>
-            <Button type="primary" :loading="loading" @click="ok">确定</Button>
-        </div>
+      <div class="search-con">
+        <Input
+          placeholder="输入关键字搜索"
+          id="input-map"
+          v-model="mapSearch"
+        />
+        <ul>
+          <li
+            v-for="(tip, index) in tips"
+            :key="index"
+            @click="selectAddr(tip.location)"
+          >
+            <p>{{ tip.name }}</p>
+            <p>{{ tip.district + tip.address }}</p>
+          </li>
+        </ul>
+      </div>
+      <div slot="footer">
+        <Button type="default" @click="showMap = false">取消</Button>
+        <Button type="primary" :loading="loading" @click="ok">确定</Button>
+      </div>
     </Modal>
   </div>
 </template>
 <script>
-import AMapLoader from '@amap/amap-jsapi-loader';
-import {getRegion} from '@/api/common.js'
+import AMapLoader from "@amap/amap-jsapi-loader";
+import { getRegion } from "@/api/common.js";
 export default {
-name:'map',
-data() {
+  name: "map",
+  data() {
     return {
-        showMap:false, // 地图显隐
-        mapSearch:'', // 地图搜索
-        map:null, // 初始化地图
-        autoComplete:null, // 初始化搜索方法
-        geocoder:null, // 初始化地理、坐标转化
-        positionPicker:null, // 地图拖拽选点
-        tips:[], //搜索关键字列表
-        addrContent:{}, // 回显地址信息
-        loading:false, // 加载状态
+      showMap: false, // 地图显隐
+      mapSearch: "", // 地图搜索
+      map: null, // 初始化地图
+      autoComplete: null, // 初始化搜索方法
+      geocoder: null, // 初始化地理、坐标转化
+      positionPicker: null, // 地图拖拽选点
+      tips: [], //搜索关键字列表
+      addrContent: {}, // 回显地址信息
+      loading: false, // 加载状态
     };
-},
-watch:{
-    mapSearch:function(val){
-        this.searchOfMap(val)
-    }
-},
-methods: {
-    ok(){ // 确定选择
-
-         this.loading = true
-
-         const codeObj = {}
-         const params = {
-             cityCode: this.addrContent.regeocode.addressComponent.citycode,
-             townName: this.addrContent.regeocode.addressComponent.township
-         }
-      getRegion(params).then(res=>{
-             if(res.success) {
-                  this.addrContent.addr = res.result.name.replace(/,/g," ")
-                  this.addrContent.addrId = res.result.id
-                  this.loading = false
-                  this.showMap = false;
-                  this.$emit('getAddress',this.addrContent);
-
-             }
-         })
-
+  },
+  watch: {
+    mapSearch: function (val) {
+      this.searchOfMap(val);
+    },
+  },
+  methods: {
+    ok() {
+      // 确定选择
+      this.loading = true;
+      const params = {
+        cityCode: this.addrContent.regeocode.addressComponent.citycode,
+        townName: this.addrContent.regeocode.addressComponent.township,
+      };
+      getRegion(params).then((res) => {
+        if (res.success) {
+          this.addrContent.addr = res.result.name.replace(/,/g, " ");
+          this.addrContent.addrId = res.result.id;
+          this.loading = false;
+          this.showMap = false;
+          this.$emit("getAddress", this.addrContent);
+        }
+      });
     },
     init() {
-        AMapLoader.load({
-            key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
-            version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-            plugins: [
-            "AMap.ToolBar",
-            "AMap.Autocomplete",
-            "AMap.PlaceSearch",
-            "AMap.Geolocation",
-            'AMap.Geocoder'
-            ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-            "AMapUI": {             // 是否加载 AMapUI，缺省不加载
-                "version": '1.1',   // AMapUI 缺省 1.1
-                "plugins":['misc/PositionPicker'],       // 需要加载的 AMapUI ui插件
-            },
-        })
+      AMapLoader.load({
+        key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: [
+          "AMap.ToolBar",
+          "AMap.Autocomplete",
+          "AMap.PlaceSearch",
+          "AMap.Geolocation",
+          "AMap.Geocoder",
+        ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        AMapUI: {
+          // 是否加载 AMapUI，缺省不加载
+          version: "1.1", // AMapUI 缺省 1.1
+          plugins: ["misc/PositionPicker"], // 需要加载的 AMapUI ui插件
+        },
+      })
         .then((AMap) => {
-            let that = this;
-            this.map = new AMap.Map("map-container",{
-                zoom:12
-            });
-            that.map.addControl(new AMap.ToolBar());
-            that.map.addControl(new AMap.Autocomplete());
-            that.map.addControl(new AMap.PlaceSearch());
-            that.map.addControl(new AMap.Geocoder());
+          let that = this;
+          this.map = new AMap.Map("map-container", {
+            zoom: 12,
+          });
+          that.map.addControl(new AMap.ToolBar());
+          that.map.addControl(new AMap.Autocomplete());
+          that.map.addControl(new AMap.PlaceSearch());
+          that.map.addControl(new AMap.Geocoder());
 
-            // 实例化Autocomplete
-            let autoOptions = {
-                city: "全国"
-            };
-            that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
-            that.geocoder = new AMap.Geocoder(autoOptions)
-
-
-            that.positionPicker = new AMapUI.PositionPicker({ // 拖拽选点
-                mode: 'dragMap',
-                map:that.map
-            });
-            that.positionPicker.start()
-            /**
-             *
-             * 所有回显数据，都在positionResult里面
-             * 需要字段可以查找
-             *
-             */
-            that.positionPicker.on('success', function(positionResult) {
-                that.addrContent = positionResult;
-            });
+          // 实例化Autocomplete
+          let autoOptions = {
+            city: "全国",
+          };
+          that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
+          that.geocoder = new AMap.Geocoder(autoOptions);
 
+          that.positionPicker = new AMapUI.PositionPicker({
+            // 拖拽选点
+            mode: "dragMap",
+            map: that.map,
+          });
+          that.positionPicker.start();
+          /**
+           *
+           * 所有回显数据，都在positionResult里面
+           * 需要字段可以查找
+           *
+           */
+          that.positionPicker.on("success", function (positionResult) {
+            that.addrContent = positionResult;
+          });
         })
         .catch((e) => {});
     },
-    searchOfMap(val) { // 地图搜索
-        let that = this;
-        this.autoComplete.search(val, function (status, result) {
-            // 搜索成功时，result即是对应的匹配数据
-            if(status == 'complete' && result.info == 'OK'){
-                that.tips = result.tips;
-            }else {
-                that.tips = []
-            }
-        });
-    },
-    selectAddr(location) { // 选择坐标
-        if(!location){
-            this.$Message.warning('请选择正确点位')
-            return false;
+    searchOfMap(val) {
+      // 地图搜索
+      let that = this;
+      this.autoComplete.search(val, function (status, result) {
+        // 搜索成功时，result即是对应的匹配数据
+        if (status == "complete" && result.info == "OK") {
+          that.tips = result.tips;
+        } else {
+          that.tips = [];
         }
-        const lnglat = [location.lng,location.lat]
-        this.positionPicker.start(lnglat)
-    }
-},
-mounted() {
-    this.init()
-},
+      });
+    },
+    selectAddr(location) {
+      // 选择坐标
+      if (!location) {
+        this.$Message.warning("请选择正确点位");
+        return false;
+      }
+      const lnglat = [location.lng, location.lat];
+      this.positionPicker.start(lnglat);
+    },
+  },
+  mounted() {
+    this.init();
+  },
 };
 </script>
 <style lang="scss" scoped>
-    #map-container{
-        width: 500px;
-        height: 400px;
-    }
+#map-container {
+  width: 500px;
+  height: 400px;
+}
 
-    .search-con{
-        position: absolute;
-        right: 20px;
-        top: 64px;
-        width: 260px;
-        ul{
-            width: 260px;
-            height: 400px;
-            overflow: scroll;
-            li{
-                padding: 5px;
-                p:nth-child(2){
-                    color: #999;
-                    font-size: 12px;
-                }
-                &:hover{
-                    background-color:#eee;
-                    cursor: pointer;
-                }
-            }
-        }
+.search-con {
+  position: absolute;
+  right: 20px;
+  top: 64px;
+  width: 260px;
+  ul {
+    width: 260px;
+    height: 400px;
+    overflow: scroll;
+    li {
+      padding: 5px;
+      p:nth-child(2) {
+        color: #999;
+        font-size: 12px;
+      }
+      &:hover {
+        background-color: #eee;
+        cursor: pointer;
+      }
     }
+  }
+}
 
-    .address{
-        margin-bottom: 10px;
-        // color: $theme_color;
-        font-weight: bold;
-    }
+.address {
+  margin-bottom: 10px;
+  // color: $theme_color;
+  font-weight: bold;
+}
 </style>
diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue
index d4ad014d..b20a21d4 100644
--- a/seller/src/views/order/after-order/orderComplaint.vue
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@@ -17,12 +17,12 @@
               type="text"
               v-model="searchForm.orderSn"
               clearable
-              placeholder="请输入商品名"
+              placeholder="请输入订单号"
               style="width: 200px"
             />
           </Form-item>
           <Form-item label="状态" prop="status">
-            <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
+            <Select v-model="searchForm.status" placeholder="请选择订单状态" clearable style="width: 200px">
               <Option value="NEW">新投诉</Option>
               <Option value="CANCEL">已撤销</Option>
               <Option value="WAIT_APPEAL">待申诉</Option>
@@ -43,9 +43,6 @@
         :data="data"
         class="mt_10"
         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>
@@ -72,56 +69,6 @@
         ></Page>
       </Row>
     </Card>
-    <Modal
-      :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>{{content}}</span>
-        </FormItem>
-        <FormItem label="评价图片">
-          <upload-pic-thumb
-                            v-model="image"
-                            :disable="true"
-                            :remove="false"
-          ></upload-pic-thumb>
-        </FormItem>
-        <FormItem label="回复内容" prop="reply">
-          <Input v-if="replyStatus == false"
-            v-model="form.reply"
-            type="textarea"
-            maxlength="200"
-            :rows="4"
-            clearable
-            style="width:260px"
-          />
-          <span v-else>
-            {{form.reply}}
-          </span>
-        </FormItem>
-        <FormItem label="回复图片" prop="replyImage">
-          <upload-pic-thumb v-if="replyStatus == false"
-            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
-        >
-      </div>
-    </Modal>
   </div>
 </template>
 
@@ -137,14 +84,7 @@
     },
     data() {
       return {
-        image:[],//评价图片
-        replyStatus:false,//回复状态
-        modalType: 0, // 添加或编辑标识
-        modalVisible: false, // 添加或编辑显示
-        modalTitle: "", // 添加或编辑标题
-        openTip: true, // 显示提示
         loading: true, // 表单加载状态
-        content: "",//评价内容
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
@@ -152,10 +92,6 @@
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
-        form: {}, // 表单数据
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           // 表头
           {
@@ -213,9 +149,8 @@
                     "Button",
                     {
                       props: {
-                        type: "primary",
-                        size: "small",
-                        icon: "ios-create-outline",
+                        type: "info",
+                        size: "small"
                       },
                       style: {
                         marginRight: "5px",
@@ -236,8 +171,7 @@
                     {
                       props: {
                         type: "primary",
-                        size: "small",
-                        icon: "ios-create-outline",
+                        size: "small"
                       },
                       style: {
                         marginRight: "5px",
@@ -262,60 +196,34 @@
       };
     },
     methods: {
-      init() {
+      // 初始化数据
+      init() { 
         this.getDataList();
       },
+      // 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 改变页数
       changePageSize(v) {
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      // 重置
       handleReset() {
         this.searchForm = {}
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      dropDown() {
-        if (this.drop) {
-          this.dropDownContent = "展开";
-          this.dropDownIcon = "ios-arrow-down";
-        } else {
-          this.dropDownContent = "收起";
-          this.dropDownIcon = "ios-arrow-up";
-        }
-        this.drop = !this.drop;
-      },
+      // 获取数据
       getDataList() {
         this.loading = true;
         API_Order.getComplainPage(this.searchForm).then((res) => {
@@ -328,21 +236,6 @@
         this.total = this.data.length;
         this.loading = false;
       },
-      //回复
-      handleSubmit() {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            API_Member.replyMemberReview(this.form.id, this.form).then((res) => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("回复成功");
-                this.getDataList();
-                this.modalVisible = false;
-              }
-            });
-          }
-        });
-      },
       //投诉详情
       detail(v) {
         let id = v.id;
diff --git a/seller/src/views/order/after-order/orderComplaintDetail.vue b/seller/src/views/order/after-order/orderComplaintDetail.vue
index c59c4d34..8425eb6b 100644
--- a/seller/src/views/order/after-order/orderComplaintDetail.vue
+++ b/seller/src/views/order/after-order/orderComplaintDetail.vue
@@ -1,257 +1,245 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <div class="main-content">
-          <div class="div-flow-left">
-            <div class="div-form-default">
-              <h3>投诉信息</h3>
-              <dl>
-                <dt>投诉商品</dt>
-                <dd>{{ complaintInfo.goodsName }}</dd>
-              </dl>
-              <dl>
-                <dt>投诉状态</dt>
-                <dd v-if="complaintInfo.complainStatus =='NEW'">新投诉</dd>
-                <dd v-if="complaintInfo.complainStatus =='CANCEL'">已撤销</dd>
-                <dd v-if="complaintInfo.complainStatus =='WAIT_APPEAL'">待申诉</dd>
-                <dd v-if="complaintInfo.complainStatus =='COMMUNICATION'">对话中</dd>
-                <dd v-if="complaintInfo.complainStatus =='WAIT_ARBITRATION'">等待仲裁</dd>
-                <dd v-if="complaintInfo.complainStatus =='COMPLETE'">已完成</dd>
-              </dl>
-              <dl>
-                <dt>投诉时间</dt>
-                <dd>{{ complaintInfo.createTime }}</dd>
-              </dl>
-              <dl>
-                <dt>投诉主题</dt>
-                <dd>{{ complaintInfo.complainTopic }}</dd>
-              </dl>
-              <dl>
-                <dt>投诉内容</dt>
-                <dd>{{ complaintInfo.content }}</dd>
-              </dl>
-              <dl>
-                <dt>投诉凭证</dt>
-                <dd v-if="images === ''">
-                  暂无投诉凭证
-                </dd>
-                <dd v-else>
-                  <div class="div-img" v-for="(item, index) in images">
-                    <img class="complain-img" :src=item>
-                  </div>
-                </dd>
-              </dl>
-            </div>
-            <div class="div-form-default" v-if="complaintInfo.complainStatus !== 'WAIT_APPEAL'">
-              <h3>商家申诉信息</h3>
-              <dl>
-                <dt>申诉时间</dt>
-                <dd>{{ complaintInfo.appealTime }}</dd>
-              </dl>
-              <dl>
-                <dt>申诉内容</dt>
-                <dd>{{ complaintInfo.appealContent }}</dd>
-              </dl>
-              <dl>
-                <dt>申诉凭证</dt>
-                <dd v-if="appealImages == ''">
-                  暂无申诉凭证
-                </dd>
-                <dd v-else>
-                  <div class="div-img" v-for="(item, index) in appealImages">
-                    <img class="complain-img" :src=item>
-                  </div>
-                </dd>
-              </dl>
-            </div>
+    <Card>
+      <div class="main-content">
+        <div class="div-flow-left">
+          <div class="div-form-default">
+            <h3>投诉信息</h3>
+            <dl>
+              <dt>投诉商品</dt>
+              <dd>{{ complaintInfo.goodsName }}</dd>
+            </dl>
+            <dl>
+              <dt>投诉状态</dt>
+              <dd v-if="complaintInfo.complainStatus =='NEW'">新投诉</dd>
+              <dd v-if="complaintInfo.complainStatus =='CANCEL'">已撤销</dd>
+              <dd v-if="complaintInfo.complainStatus =='WAIT_APPEAL'">待申诉</dd>
+              <dd v-if="complaintInfo.complainStatus =='COMMUNICATION'">对话中</dd>
+              <dd v-if="complaintInfo.complainStatus =='WAIT_ARBITRATION'">等待仲裁</dd>
+              <dd v-if="complaintInfo.complainStatus =='COMPLETE'">已完成</dd>
+            </dl>
+            <dl>
+              <dt>投诉时间</dt>
+              <dd>{{ complaintInfo.createTime }}</dd>
+            </dl>
+            <dl>
+              <dt>投诉主题</dt>
+              <dd>{{ complaintInfo.complainTopic }}</dd>
+            </dl>
+            <dl>
+              <dt>投诉内容</dt>
+              <dd>{{ complaintInfo.content }}</dd>
+            </dl>
+            <dl>
+              <dt>投诉凭证</dt>
+              <dd v-if="images === ''">
+                暂无投诉凭证
+              </dd>
+              <dd v-else>
+                <div class="div-img" v-for="(item, index) in images" :key="index">
+                  <img class="complain-img" :src=item>
+                </div>
+              </dd>
+            </dl>
+          </div>
+          <div class="div-form-default" v-if="complaintInfo.complainStatus !== 'WAIT_APPEAL'">
+            <h3>商家申诉信息</h3>
+            <dl>
+              <dt>申诉时间</dt>
+              <dd>{{ complaintInfo.appealTime }}</dd>
+            </dl>
+            <dl>
+              <dt>申诉内容</dt>
+              <dd>{{ complaintInfo.appealContent }}</dd>
+            </dl>
+            <dl>
+              <dt>申诉凭证</dt>
+              <dd v-if="appealImages == ''">
+                暂无申诉凭证
+              </dd>
+              <dd v-else>
+                <div class="div-img" v-for="(item, index) in appealImages" :key="index">
+                  <img class="complain-img" :src=item>
+                </div>
+              </dd>
+            </dl>
+          </div>
 
-            <div class="div-form-default" v-if="complaintInfo.complainStatus === 'WAIT_APPEAL'">
-              <h3>商家申诉</h3>
-              <dl>
-                <dt>申诉内容</dt>
-                <dd>
-                  <Input v-model="appeal.appealContent" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
-                </dd>
-              </dl>
-              <dl>
-                <dt>申诉凭证</dt>
-                <dd>
-                  <div class="complain-upload-list" :key="index" v-for="(item,index) in appeal.appealImages">
-                    <template v-if="item.status === 'finished'">
-                      <img class="complain-img" :src="item.url">
-                      <div class="complain-upload-list-cover">
-                        <Icon type="ios-eye-outline" @click.native="handleView(item.url)"></Icon>
-                        <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
-                      </div>
-                    </template>
-                    <template v-else>
-                      <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
-                    </template>
-                  </div>
-                  <Upload ref="upload" :show-upload-list="false" :on-format-error="handleFormatError" :action="uploadFileUrl" :headers="accessToken" :on-success="handleSuccessGoodsPicture"
-                    :format="['jpg','jpeg','png']" :max-size="2048" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag"
-                    style="display: inline-block;width:58px;">
-                    <div style="width: 58px;height:58px;line-height: 58px;">
-                      <Icon type="ios-camera" size="20"></Icon>
+          <div class="div-form-default" v-if="complaintInfo.complainStatus === 'WAIT_APPEAL'">
+            <h3>商家申诉</h3>
+            <dl>
+              <dt>申诉内容</dt>
+              <dd>
+                <Input v-model="appeal.appealContent" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+              </dd>
+            </dl>
+            <dl>
+              <dt>申诉凭证</dt>
+              <dd>
+                <div class="complain-upload-list" :key="index" v-for="(item,index) in appeal.appealImages">
+                  <template v-if="item.status === 'finished'">
+                    <img class="complain-img" :src="item.url">
+                    <div class="complain-upload-list-cover">
+                      <Icon type="ios-eye-outline" @click.native="handleView(item.url)"></Icon>
+                      <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
                     </div>
-                  </Upload>
-                  <Modal title="View Image" v-model="visible">
-                    <img :src="imgName" v-if="visible" style="width: 100%">
-                  </Modal>
+                  </template>
+                  <template v-else>
+                    <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+                  </template>
+                </div>
+                <Upload ref="upload" :show-upload-list="false" :on-format-error="handleFormatError" :action="uploadFileUrl" :headers="accessToken" :on-success="handleSuccessGoodsPicture"
+                  :format="['jpg','jpeg','png']" :max-size="2048" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag"
+                  style="display: inline-block;width:58px;">
+                  <div style="width: 58px;height:58px;line-height: 58px;">
+                    <Icon type="ios-camera" size="20"></Icon>
+                  </div>
+                </Upload>
+                <Modal title="View Image" v-model="visible">
+                  <img :src="imgName" v-if="visible" style="width: 100%">
+                </Modal>
+              </dd>
+            </dl>
+            <dl>
+              <dt></dt>
+              <dd>
+                <Button type="primary" :loading="submitLoading" @click="appealSubmit()" style="margin-left: 5px">
+                  提交申诉
+                </Button>
+              </dd>
+            </dl>
+          </div>
 
-                  <!-- <Input v-model="appeal.appealImages" type="textarea" maxlength="200" :rows="4" clearable
-                           style="width:260px"/> -->
-                </dd>
-              </dl>
-              <dl>
-                <dt></dt>
-                <dd>
-                  <Button type="primary" :loading="submitLoading" @click="appealSubmit()" style="margin-left: 5px">
-                    提交申诉
+          <div class="div-form-default">
+            <h3>对话详情</h3>
+            <dl>
+              <dt>对话记录</dt>
+              <dd>
+                <div class="div-content">
+                  <p v-for="(item, index) in complaintInfo.orderComplaintCommunications" :key="index">
+                    <span v-if="item.owner === 'STORE'">商家[{{ item.createTime }}]</span>
+                    <span v-if="item.owner === 'BUYER'">买家[{{ item.createTime }}]</span>
+                    <span v-if="item.owner === 'PLATFORM'">平台[{{ item.createTime }}]</span>
+                    {{ item.content }}
+                  </p>
+                </div>
+
+              </dd>
+            </dl>
+            <dl v-if="complaintInfo.complainStatus!='COMPLETE'">
+              <dt>发送对话</dt>
+              <dd>
+                <Input v-model="params.content" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+              </dd>
+            </dl>
+            <dl>
+              <dt></dt>
+              <dd v-if="complaintInfo.complainStatus != 'COMPLETE'">
+                <div style="text-align: right;width: 45%;margin-top: 10px">
+                  <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                    回复
                   </Button>
-                </dd>
-              </dl>
-            </div>
-
-            <div class="div-form-default">
-              <h3>对话详情</h3>
-              <dl>
-                <dt>对话记录</dt>
-                <dd>
-                  <div class="div-content">
-                    <p v-for="(item, index) in complaintInfo.orderComplaintCommunications">
-                      <span v-if="item.owner === 'STORE'">商家[{{ item.createTime }}]</span>
-                      <span v-if="item.owner === 'BUYER'">买家[{{ item.createTime }}]</span>
-                      <span v-if="item.owner === 'PLATFORM'">平台[{{ item.createTime }}]</span>
-                      {{ item.content }}
-                    </p>
-                  </div>
-
-                </dd>
-              </dl>
-              <dl v-if="complaintInfo.complainStatus!='COMPLETE'">
-                <dt>发送对话</dt>
-                <dd>
-                  <Input v-model="params.content" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
-                </dd>
-              </dl>
-              <dl>
-                <dt></dt>
-                <dd v-if="complaintInfo.complainStatus != 'COMPLETE'">
-                  <div style="text-align: right;width: 45%;margin-top: 10px">
-                    <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
-                      回复
-                    </Button>
-                    <Button type="primary" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
-                      返回列表
-                    </Button>
-                  </div>
-                </dd>
-              </dl>
-            </div>
-            <div class="div-form-default" v-if="complaintInfo.complainStatus === 'COMPLETE'">
-              <h3>仲裁结果</h3>
-              <dl>
-                <dt>仲裁意见</dt>
-                <dd>
-                  {{ complaintInfo.arbitrationResult }}
-                </dd>
-              </dl>
-            </div>
+                  <Button type="default" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
+                    返回列表
+                  </Button>
+                </div>
+              </dd>
+            </dl>
           </div>
-          <div class="div-flow-center">
-
-          </div>
-          <div class="div-flow-right">
-            <div class="div-form-default">
-              <h3>相关商品交易信息</h3>
-              <dl>
-                <dt>
-                  <img :src="complaintInfo.goodsImage" height="60px">
-                </dt>
-                <dd>
-                  <a>{{ complaintInfo.goodsName }}</a><br>
-                  <span>￥{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量)</span>
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default">
-              <h3>订单相关信息</h3>
-              <dl>
-                <dt>
-                  订单编号
-                </dt>
-                <dd>
-                  {{ complaintInfo.orderSn }}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  下单时间
-                </dt>
-                <dd>
-                  {{ complaintInfo.orderTime }}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  订单金额
-                </dt>
-                <dd>
-                  {{ complaintInfo.orderPrice | unitPrice('￥')}}
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default">
-              <h3>收件人信息</h3>
-              <dl>
-                <dt>
-                  收货人
-                </dt>
-                <dd>
-                  {{ complaintInfo.consigneeName }}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货地址
-                </dt>
-                <dd>
-                  {{ complaintInfo.consigneeAddressPath }}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货人手机
-                </dt>
-                <dd>
-                  {{ complaintInfo.consigneeMobile }}
-                </dd>
-              </dl>
-            </div>
-
+          <div class="div-form-default" v-if="complaintInfo.complainStatus === 'COMPLETE'">
+            <h3>仲裁结果</h3>
+            <dl>
+              <dt>仲裁意见</dt>
+              <dd>
+                {{ complaintInfo.arbitrationResult }}
+              </dd>
+            </dl>
           </div>
         </div>
+        <div class="div-flow-center">
 
-      </Card>
-      </Col>
-    </Row>
+        </div>
+        <div class="div-flow-right">
+          <div class="div-form-default">
+            <h3>相关商品交易信息</h3>
+            <dl>
+              <dt>
+                <img :src="complaintInfo.goodsImage" height="60px">
+              </dt>
+              <dd>
+                <a>{{ complaintInfo.goodsName }}</a><br>
+                <span>￥{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量)</span>
+              </dd>
+            </dl>
+
+          </div>
+          <div class="div-form-default">
+            <h3>订单相关信息</h3>
+            <dl>
+              <dt>
+                订单编号
+              </dt>
+              <dd>
+                {{ complaintInfo.orderSn }}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                下单时间
+              </dt>
+              <dd>
+                {{ complaintInfo.orderTime }}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                订单金额
+              </dt>
+              <dd>
+                {{ complaintInfo.orderPrice | unitPrice('￥')}}
+              </dd>
+            </dl>
+
+          </div>
+          <div class="div-form-default">
+            <h3>收件人信息</h3>
+            <dl>
+              <dt>
+                收货人
+              </dt>
+              <dd>
+                {{ complaintInfo.consigneeName }}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                收货地址
+              </dt>
+              <dd>
+                {{ complaintInfo.consigneeAddressPath }}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                收货人手机
+              </dt>
+              <dd>
+                {{ complaintInfo.consigneeMobile }}
+              </dd>
+            </dl>
+          </div>
+
+        </div>
+      </div>
+    </Card>
   </div>
 </template>
 
 <script>
 import * as API_Order from "@/api/order";
-import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 import * as API_GOODS from "@/api/goods";
 export default {
   name: "orderComplaint",
-  components: {
-    uploadPicThumb,
-  },
   data() {
     return {
       //展示图片层
@@ -284,15 +272,18 @@ export default {
     },
   },
   methods: {
+    // 预览图片
     handleView(name) {
       this.imgName = name;
       this.visible = true;
     },
+    // 移除回复图片
     handleRemove(file) {
       this.appeal.appealImages = this.appeal.appealImages.filter(
         (i) =>  i.url !== file.url
       );
     },
+    // 上传成功回调
     handleSuccessGoodsPicture(res, file) {
       if (file.response) {
         file.url = file.response.result;
@@ -300,6 +291,7 @@ export default {
         this.appeal.appealImages.push(file);
       }
     },
+    // 上传之前钩子
     handleBeforeUpload() {
       const check =
         this.images.images !== undefined && this.images.images.length > 5;
@@ -310,6 +302,7 @@ export default {
       }
       return !check;
     },
+    // 上传格式错误
     handleFormatError(file) {
       this.$Notice.warning({
         title: "图片格式不正确",
@@ -319,12 +312,14 @@ export default {
           " is incorrect, please select jpg or png.",
       });
     },
+    // 上传大小限制
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "超过文件大小限制",
         desc: "图片  " + file.name + " 不能超过2mb",
       });
     },
+    // 获取详情
     getDetail() {
       this.loading = true;
       API_Order.getComplainDetail(this.id).then((res) => {
@@ -358,7 +353,7 @@ export default {
         }
       });
     },
-    //回复
+    //申诉
     appealSubmit() {
 
       if (this.appeal.appealContent === "") {
@@ -376,7 +371,7 @@ export default {
       });
     },
   },
-  mounted() {
+  activated () {
     this.id = this.$route.query.id;
     this.getDetail();
     this.accessToken = {
diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue
index 0b720392..d9d20c97 100644
--- a/seller/src/views/order/after-order/returnGoodsOrder.vue
+++ b/seller/src/views/order/after-order/returnGoodsOrder.vue
@@ -53,9 +53,6 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       >
 
         <!-- 商品栏目格式化 -->
@@ -121,19 +118,6 @@
           goodsName:""
         },
         selectDate: null,
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
 
           {
@@ -236,33 +220,27 @@
       };
     },
     methods: {
-      dropDown() {
-        if (this.drop) {
-          this.dropDownContent = "展开";
-          this.dropDownIcon = "ios-arrow-down";
-        } else {
-          this.dropDownContent = "收起";
-          this.dropDownIcon = "ios-arrow-up";
-        }
-        this.drop = !this.drop;
-      },
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 改变页数
       changePageSize(v) {
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      // 重置
       handleReset() {
         this.searchForm = {};
         this.selectDate = ''
@@ -270,28 +248,14 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
+      // 范围时间选择格式化
       selectDateRange(v) {
         if (v) {
           this.searchForm.startDate = v[0];
           this.searchForm.endDate = v[1];
         }
       },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         API_Order.afterSaleOrderPage(this.searchForm).then((res) => {
@@ -304,7 +268,7 @@
         this.total = this.data.length;
         this.loading = false;
       },
-
+      // 退货订单详情
       detail(v) {
         let sn = v.sn;
         this.$router.push({
diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue
index 53e8c087..4cf82ba0 100644
--- a/seller/src/views/order/after-order/returnMoneyOrder.vue
+++ b/seller/src/views/order/after-order/returnMoneyOrder.vue
@@ -53,9 +53,6 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       >
 
         <!-- 商品栏目格式化 -->
@@ -103,7 +100,6 @@
 
   export default {
     name: "returnMoneyOrder",
-    components: {},
     data() {
       return {
         loading: true, // 表单加载状态
@@ -121,19 +117,7 @@
           goodsName:""
         },
         selectDate: null,
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
         submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           // 表头
           {
@@ -232,24 +216,27 @@
       };
     },
     methods: {
-
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 改变页数
       changePageSize(v) {
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      // 重置
       handleReset() {
         this.selectDate = ''
         this.searchForm = {}
@@ -257,27 +244,14 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
+      // 范围时间重新赋值
       selectDateRange(v) {
         if (v) {
           this.searchForm.startDate = v[0];
           this.searchForm.endDate = v[1];
         }
       },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         API_Order.afterSaleOrderPage(this.searchForm).then((res) => {
@@ -290,7 +264,7 @@
         this.total = this.data.length;
         this.loading = false;
       },
-
+      // 退款订单详情
       detail(v) {
         let sn = v.sn;
         this.$router.push({
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
index e6ccb29a..9a7b90c7 100644
--- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -9,18 +9,9 @@
                 <h3>售后申请</h3>
                 <dl>
                   <dt>售后状态</dt>
-                  <dd v-if="afterSaleInfo.serviceStatus =='APPLY'">申请售后</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='PASS'">申请通过</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='REFUSE'">申请拒绝</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">买家退货，待卖家收货</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">商家换货</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='SELLER_CONFIRM'">卖家确认收货</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='SELLER_TERMINATION'">卖家终止售后</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CONFIRM'">买家确认收货</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CANCEL'">买家取消售后</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='WAIT_REFUND'">等待平台退款</dd>
-                  <dd v-if="afterSaleInfo.serviceStatus =='COMPLETE'">已完成</dd>
+                  <dd>{{filterStatus(afterSaleInfo.serviceStatus)}}</dd>
                 </dl>
+                
                 <dl>
                   <dt>退货退款编号</dt>
                   <dd>{{ afterSaleInfo.sn }}</dd>
@@ -296,7 +287,7 @@
       </div>
 
       <div slot="footer" style="text-align: right">
-        <Button size="large" @click="orderDeliverCancel">取消</Button>
+        <Button size="large" @click="modalVisible = false">取消</Button>
         <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
 
       </div>
@@ -337,7 +328,7 @@
       </div>
 
       <div slot="footer" style="text-align: right">
-        <Button @click="logisticsClose">取消</Button>
+        <Button @click="logisticsModal = false">取消</Button>
       </div>
     </Modal>
   </div>
@@ -387,13 +378,24 @@ export default {
         remark: "",
         actualRefundPrice: 0,
       },
+      // 售后状态
+      afterSaleStatus: [
+        {status: 'APPLY', label: '申请售后'},
+        {status: 'PASS', label: '申请通过'},
+        {status: 'REFUSE', label: '申请拒绝'},
+        {status: 'BUYER_RETURN', label: '买家退货，待卖家收货'},
+        {status: 'SELLER_RE_DELIVERY', label: '商家换货'},
+        {status: 'SELLER_CONFIRM', label: '卖家确认收货'},
+        {status: 'SELLER_TERMINATION', label: '卖家终止售后'},
+        {status: 'BUYER_CONFIRM', label: '买家确认收货'},
+        {status: 'BUYER_CANCEL', label: '买家取消售后'},
+        {status: 'WAIT_REFUND', label: '等待平台退款'},
+        {status: 'COMPLETE', label: '已完成'},
+      ]
     };
   },
-  watch: {
-    $route(to, from) {
-    },
-  },
   methods: {
+    // 获取售后详情
     getDetail() {
       this.loading = true;
       API_Order.afterSaleOrderDetail(this.sn).then((res) => {
@@ -415,9 +417,6 @@ export default {
         }
       });
     },
-    orderDeliverCancel() {
-      this.modalVisible = false;
-    },
     //商家确认收货
     sellerConfirmSubmit(type) {
       let title = "确认收货";
@@ -463,10 +462,6 @@ export default {
         }
       });
     },
-    //关闭物流弹出框
-    logisticsClose() {
-      this.logisticsModal = false;
-    },
 
     //换货发货
     orderDeliverySubmit() {
@@ -497,12 +492,23 @@ export default {
         }
       });
     },
+    // 返回售后状态中文描述
+    filterStatus (status) {
+      let label = ''
+      for (let i = 0; i< this.afterSaleStatus.length; i++) {
+        const obj = this.afterSaleStatus[i]
+        if (obj.status === status) {
+          label = obj.label
+          break;
+        }
+      }
+      return label
+    }
   },
-
-  mounted() {
+  activated () {
     this.sn = this.$route.query.sn;
     this.getDetail();
-  },
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue
index cc2ba500..a48bf3fa 100644
--- a/seller/src/views/order/order/exportOrderDeliver.vue
+++ b/seller/src/views/order/order/exportOrderDeliver.vue
@@ -76,7 +76,6 @@ export default {
   },
   mounted() {
     this.accessToken.accessToken = this.getStore("accessToken");
-    console.log(this.accessToken.accessToken);
   },
   methods: {
     // 点击选择步骤
@@ -89,19 +88,19 @@ export default {
         val.checked = true;
       }
     },
-
+    // 上传数据
     handleUpload(file) {
       this.file = file;
       this.upload();
       return false;
     },
-
+    // 跳转订单列表
     navigationToGoodsOrder() {
       this.$router.push({
         path: "/order/orderList",
       });
     },
-
+    // 关闭页面
     close() {
       this.$store.commit("removeTag", "export-order-deliver");
       localStorage.storeOpenedList = JSON.stringify(
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 1a20b75b..91b78839 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -5,7 +5,7 @@
         <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 @click="orderLogModal = true" type="primary">订单日志</Button>
         <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
         <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
       </div>
@@ -46,65 +46,65 @@
           <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">
+          <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"><span v-if="orderInfo.receipt.receiptPrice">￥</span>{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice}}</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.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 class="div-item-left">发票内容：</div>
+          <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
         </div>
 
-        <div class="div-item">
-          <div class="div-item-left">买家留言：</div>
-          <div class="div-item-right">{{ orderInfo.order.remark }}</div>
+        <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+          <div class="div-item-left">发票金额：</div>
+          <div class="div-item-right"><span v-if="orderInfo.receipt.receiptPrice">￥</span>{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice}}</div>
         </div>
 
-      <div class="div-item" v-if="orderInfo.order.orderType != 'VIRTUAL'">
-        <div class="div-item-left">配送方式：</div>
-        <div class="div-item-right">
-          {{
-              orderInfo.deliveryMethodValue
-                ? orderInfo.deliveryMethodValue
-                : "暂无配送方式"
-            }}
+          <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" v-if="orderInfo.order.orderType != 'VIRTUAL'">
+          <div class="div-item-left">配送方式：</div>
+          <div class="div-item-right">
+            {{
+                orderInfo.deliveryMethodValue
+                  ? orderInfo.deliveryMethodValue
+                  : "暂无配送方式"
+              }}
+          </div>
         </div>
       </div>
-    </div>
-  </Card>
+    </Card>
 
     <Card>
       <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
@@ -242,7 +242,7 @@
       </div>
 
       <div slot="footer" style="text-align: right">
-        <Button @click="handelCancel">取消</Button>
+        <Button @click="orderLogModal = false">取消</Button>
       </div>
     </Modal>
     <!-- 查询物流 -->
@@ -282,7 +282,7 @@
       </div>
 
       <div slot="footer" style="text-align: right">
-        <Button @click="logisticsClose">取消</Button>
+        <Button @click="logisticsModal = false">取消</Button>
       </div>
     </Modal>
     <!-- 订单发货 -->
@@ -330,10 +330,8 @@ export default {
       region: [], //地区
       regionId: [], //地区id
       showRegion: false,
-      orderLogInfo: [], //订单日志数据
       orderLogModal: false, //弹出调整价格框
       logisticsModal: false, //弹出查询物流框
-      receiptModal: false, //开发票弹出框
       orderDeliverModal: false, //订单发货弹出框
       orderTakeModal: false, //订单核销弹出框
       checkedLogistics: [], //选中的物流公司集合
@@ -348,10 +346,6 @@ export default {
         },
       },
       modal: false, //弹出调整价格框
-      searchForm: {
-        pageNumber: 1, // 当前页数
-        pageSize: 100, // 页面大小
-      },
       //调整价格表单
       modifyPriceForm: {
         orderPrice: 0,
@@ -488,7 +482,7 @@ export default {
           },
         },
       ],
-      data: [], // 表单数据
+      data: [], // 商品表单数据
       orderLogColumns: [
         // 表头
         {
@@ -512,6 +506,7 @@ export default {
           minWidth: 200,
         },
       ],
+      // 订单日志数据
       orderLogData: [],
     };
   },
@@ -553,7 +548,7 @@ export default {
         }
       });
     },
-
+    // 修改订单金额
     modifyPrice() {
       //默认要修改的金额为订单总金额
       this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
@@ -589,10 +584,6 @@ export default {
         }
       });
     },
-    //关闭物流弹出框
-    logisticsClose() {
-      this.logisticsModal = false;
-    },
     //订单发货
     orderDeliver() {
       API_Order.getLogisticsChecked().then((res) => {
@@ -606,27 +597,16 @@ export default {
     orderDeliverySubmit() {
       this.$refs.orderDeliveryForm.validate((valid) => {
         if (valid) {
-          API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then(
-            (res) => {
-              if (res.success) {
-                this.$Message.success("订单发货成功");
-                this.orderDeliverModal = false;
-                this.getDataDetail();
-              }
+          API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then((res) => {
+            if (res.success) {
+              this.$Message.success("订单发货成功");
+              this.orderDeliverModal = false;
+              this.getDataDetail();
             }
-          );
+          });
         }
       });
     },
-
-    //订单日志
-    orderLog() {
-      this.orderLogModal = true;
-    },
-    //订单日志取消
-    handelCancel() {
-      this.orderLogModal = false;
-    },
     //弹出修改收货地址框
     editAddress() {
       this.addressModal = true;
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 3240bbbd..4943b7ec 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -63,7 +63,6 @@ export default {
   },
   data() {
     return {
-      orderCode: "", // 虚拟订单核验码
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
@@ -79,15 +78,6 @@ export default {
         orderType: "NORMAL",
       },
       selectDate: null,
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
-      submitLoading: false, // 添加或编辑提交状态
       columns: [
         {
           title: "订单号",
@@ -200,19 +190,6 @@ export default {
     };
   },
   methods: {
-    /**
-     * 核验订单
-     */
-    async orderVerification() {
-      let result = await verificationCode(this.orderCode);
-
-      if (result.success) {
-        this.$router.push({
-          name: "order-detail",
-          query: { sn: result.result.sn || this.orderCode },
-        });
-      }
-    },
     /**
      * 批量发货
      */
@@ -312,9 +289,6 @@ export default {
       });
     },
   },
-  mounted() {
-    this.init();
-  },
   activated() {
     this.init();
   },
diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue
index 5d84e8cb..9a5f7e81 100644
--- a/seller/src/views/order/order/virtualOrderList.vue
+++ b/seller/src/views/order/order/virtualOrderList.vue
@@ -56,7 +56,7 @@ export default {
   name: "virtualOrderList",
   data() {
     return {
-      orderCode: "",
+      orderCode: "", // 核验码
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
@@ -72,19 +72,6 @@ export default {
         orderType: "VIRTUAL",
       },
       selectDate: null,
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
-      // 表单验证规则
-      formValidate: {},
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         {
           title: "订单号",
@@ -206,22 +193,27 @@ export default {
         });
       }
     },
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
     },
+    // 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    // 重置
     handleReset() {
       this.searchForm = {};
       this.searchForm.pageNumber = 1;
@@ -233,6 +225,7 @@ export default {
       // 重新加载数据
       this.getDataList();
     },
+    // 表格排序
     changeSort(e) {
       this.searchForm.sort = e.key;
       this.searchForm.order = e.order;
@@ -241,17 +234,14 @@ export default {
       }
       this.getDataList();
     },
-
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 时间段重新赋值
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取商品列表
     getDataList() {
       this.loading = true;
       API_Order.getOrderList(this.searchForm).then((res) => {
@@ -262,7 +252,7 @@ export default {
         }
       });
     },
-
+    // 跳转详情
     detail(v) {
       let sn = v.sn;
       this.$router.push({
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index a9e4ffc7..896aff61 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -40,8 +40,7 @@
 import * as API_Order from "@/api/order";
 
 export default {
-  name: "storeBill",
-  components: {},
+  name: "receipt",
   data() {
     return {
       loading: true, // 表单加载状态
@@ -53,19 +52,6 @@ export default {
         order: "desc", // 默认排序方式
         receiptStatus: "", // 起始时间
       },
-      form: {
-        // 添加或编辑表单对象初始化数据
-        sn: "",
-        sellerName: "",
-        startTime: "",
-        endTime: "",
-        billPrice: "",
-      },
-      // 表单验证规则
-      formValidate: {},
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         {
           title: "订单号",
@@ -213,50 +199,41 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getData();
     },
+    // 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getData();
-      this.clearSelectAll();
     },
+    // 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getData();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getData();
     },
+    // 重置搜索条件
     handleReset() {
       this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getData();
     },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getData();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 时间段从新赋值
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取数据
     getData() {
       this.loading = true;
       API_Order.getReceiptPage(this.searchForm).then((res) => {
@@ -287,9 +264,6 @@ export default {
       });
     },
   },
-  mounted() {
-    this.init();
-  },
   activated() {
     this.init();
   },
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 18b0b187..e5a813cd 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -24,9 +24,8 @@
       <Row class="operator padding-row">
         <Button @click="add" type="primary">添加</Button>
         <Button @click="delAll" class="ml_10">批量下架</Button>
-        <!-- <Button @click="upAll">批量上架</Button> -->
       </Row>
-      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
         <template slot-scope="{ row }" slot="action">
           <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 10px" @click="edit(row)">编辑</Button>
           <Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
@@ -55,17 +54,6 @@ export default {
         sort: "startTime", // 默认排序字段
         order: "desc", // 默认排序方式
       },
-      form: {
-        // 添加或编辑表单对象初始化数据
-        promotionName: "",
-      },
-      // 表单验证规则
-      formValidate: {
-        promotionName: [
-          { required: true, message: "不能为空", trigger: "blur" },
-        ],
-      },
-      submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
       columns: [
@@ -238,15 +226,6 @@ export default {
       this.searchForm.pageNumber = 0;
       this.getDataList();
     },
-
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
     clearSelectAll() {
       this.$refs.table.selectAll(false);
     },
@@ -254,6 +233,7 @@ export default {
       this.selectList = e;
       this.selectCount = e.length;
     },
+    // 获取列表数据
     getDataList() {
       this.loading = true;
       if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@@ -263,7 +243,6 @@ export default {
         this.searchForm.startTime = null;
         this.searchForm.endTime = null;
       }
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       getShopCouponList(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
@@ -274,14 +253,14 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
-
+    // 跳转编辑优惠券页面
     edit(v) {
       this.$router.push({ name: "add-coupon", query: { id: v.id } });
     },
+    // 下架优惠券
     remove(v) {
       this.$Modal.confirm({
         title: "确认下架",
-        // 记得确认修改此处
         content: "确认要下架此优惠券么?",
         loading: true,
         onOk: () => {
@@ -290,7 +269,6 @@ export default {
             couponIds: v.id,
             promotionStatus: "CLOSE",
           };
-          // 批量删除
           updateCouponStatus(params).then((res) => {
             this.$Modal.remove();
             if (res.success) {
@@ -302,44 +280,15 @@ export default {
         },
       });
     },
-    upAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("请选择要上架的优惠券");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认上架",
-        content: "您确认要上架所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = [];
-          this.selectList.forEach(function (e) {
-            ids.push(e.id);
-          });
-          let params = {
-            couponIds: ids.toString(),
-            promotionStatus: "START",
-          };
-          // 批量上架
-          updateCouponStatus(params).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("上架成功");
-              this.clearSelectAll();
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
+    // 批量下架
     delAll() {
       if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要作废的优惠券");
+        this.$Message.warning("您还未选择要下架的优惠券");
         return;
       }
       this.$Modal.confirm({
-        title: "确认作废",
-        content: "您确认要作废所选的 " + this.selectCount + " 条数据?",
+        title: "确认下架",
+        content: "您确认要下架所选的 " + this.selectCount + " 条数据?",
         loading: true,
         onOk: () => {
           let ids = [];
@@ -351,7 +300,6 @@ export default {
             couponIds: ids.toString(),
             promotionStatus: "CLOSE",
           };
-          // 批量删除
           updateCouponStatus(params).then((res) => {
             this.$Modal.remove();
             if (res.success) {
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
index 371d4f73..2c372537 100644
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -33,7 +33,7 @@
 
             <FormItem label="发放数量" v-if="form.getType == 'FREE'" prop="publishNum">
               <Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px" />
-              <div class="tips">如果发放数量为0时,则代表不限制发放数量</div>
+              <span class="tips ml_10">如果发放数量为0时,则代表不限制发放数量</span>
             </FormItem>
           </div>
           <h4>使用限制</h4>
@@ -43,7 +43,7 @@
             </FormItem>
             <FormItem label="领取限制" v-if="form.getType == 'FREE'" prop="couponLimitNum">
               <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
-              <div class="tips">如果领取限制为0时,则代表不限制领取数量</div>
+              <span class="tips ml_10">如果领取限制为0时,则代表不限制领取数量</span>
             </FormItem>
             <FormItem label="有效期" prop="rangeTime">
               <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
@@ -125,7 +125,6 @@ export default {
 
     return {
       modalType: 0, // 判断是新增还是编辑优惠券 0 新增  1 编辑
-      categoryId: 0, // 分类id
       form: {
         /** 店铺承担比例 */
         sellerCommission: 0,
@@ -148,12 +147,6 @@ export default {
       submitLoading: false, // 添加或编辑提交状态
       selectedGoods: [], // 已选商品列表，便于删除
       goodsCategoryList: [], // 商品分类列表
-      shopCategoryList: [], // 店铺分类列表
-      cascaderProps: {
-        multiple: true,
-        label: "name",
-        value: "id",
-      }, // 级联选择器配置项
       formRule: {
         promotionName: [{ required: true, message: "活动名称不能为空" }],
         couponName: [{ required: true, message: "优惠券名称不能为空" }],
@@ -241,6 +234,7 @@ export default {
           },
         },
       ],
+      // 时间选择器可选范围
       options: {
         disabledDate(date) {
           return date && date.valueOf() < Date.now() - 86400000;
@@ -257,6 +251,7 @@ export default {
     }
   },
   methods: {
+    // 获取回显数据
     getCoupon() {
       getShopCoupon(this.id).then((res) => {
         let data = res.result;
@@ -292,7 +287,7 @@ export default {
         this.form = data;
       });
     },
-    /** 保存平台优惠券 */
+    /** 保存优惠券 */
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
diff --git a/seller/src/views/promotion/fullCut/fullCut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
index bfd2a8fa..884b9cf0 100644
--- a/seller/src/views/promotion/fullCut/fullCut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -1,49 +1,49 @@
 <template>
   <div class="full-cut">
     <Card>
-      <Row>
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
-          <Form-item label="活动名称">
-            <Input
-              type="text"
-              v-model="searchForm.promotionName"
-              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
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        :label-width="70"
+        class="search-form"
+      >
+        <Form-item label="活动名称">
+          <Input
+            type="text"
+            v-model="searchForm.promotionName"
+            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>
+        <Form-item>
+          <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="ml_10">重置</Button>
-        </Form>
-      </Row>
+        </Form-item>
+      </Form>
       <Row class="operation">
         <Button type="primary" @click="newAct">新增</Button>
       </Row>
@@ -184,29 +184,31 @@ export default {
     };
   },
   methods: {
+    // 改变页码
     newAct() {
-      // 新增活动
       this.$router.push({ name: "full-cut-detail" });
     },
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 改变页数
     changePage(v) {
-      // 改变页数
       this.searchForm.pageNumber = v - 1;
       this.getDataList();
     },
+    // 改变页码
     changePageSize(v) {
-      // 改变页码
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
-      // 搜索
       this.searchForm.pageNumber = 0;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    // 重置
     handleReset() {
       this.selectDate = ''
       this.searchForm = {}
@@ -214,11 +216,11 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-
+    //  编辑
     edit(row) {
-      //  编辑
       this.$router.push({ name: "full-cut-detail", query: { id: row.id } });
     },
+    // 删除
     del(row) {
       this.$Modal.confirm({
         title: "提示",
@@ -237,6 +239,7 @@ export default {
         },
       });
     },
+    // 获取列表数据
     getDataList() {
       this.loading = true;
       if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
index 3f4c4d9f..707492b0 100644
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -259,7 +259,7 @@ import skuSelect from "@/views/lili-dialog";
 export default {
   name: "addFullCut",
   components: {
-    skuSelect,
+    skuSelect
   },
   data() {
     const checkPrice = (rule, value, callback) => {
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue
index 22d51d12..1b8c4689 100644
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -131,7 +131,6 @@
 
         <FormItem>
           <Button type="primary" v-if="liveStatus=='NEW'" @click="createLives()">保存</Button>
-
         </FormItem>
       </Form>
     </Card>
@@ -162,7 +161,7 @@ export default {
   },
   data() {
     return {
-      spinShow: false,
+      spinShow: false, // loading加载
       liveGoodsVisible: false, //选择商品
       imageVisible: false, //查看图片的dailog
       imageSrc: "", //查看图片的路径
@@ -172,7 +171,6 @@ export default {
       // 不能选择今天以前的时间
       optionsTime: {
         disabledDate(date) {
-          // console.log(data)
           return date && date.valueOf() < Date.now() - 86400000;
         },
       },
@@ -237,8 +235,7 @@ export default {
           width: 250,
         },
       ],
-      liveData: [], //直播商品集合
-      commodityList: "", //商品集合
+      liveData: [] //直播商品集合
     };
   },
   mounted() {
@@ -285,7 +282,6 @@ export default {
         // 将选择的商品回调给表格
 
         this.liveData = data.commodityList;
-        this.commodityList = data.commodityList;
 
         // 将时间格式化
         this.$set(
diff --git a/seller/src/views/promotion/live/live.vue b/seller/src/views/promotion/live/live.vue
index b07f5b54..60dbc3a8 100644
--- a/seller/src/views/promotion/live/live.vue
+++ b/seller/src/views/promotion/live/live.vue
@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       // 查询数据的总数
-      total: "",
+      total: 0,
       // 查询的form
       searchForm: {
         pageSize: 10,
diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue
index 9d5b4162..e79ab4b4 100644
--- a/seller/src/views/promotion/live/liveGoods.vue
+++ b/seller/src/views/promotion/live/liveGoods.vue
@@ -144,6 +144,7 @@ export default {
       ],
       // 表格商品详情
       liveGoodsData: [],
+      // 已选商品
       selectedGoods: [],
     };
   },
@@ -208,18 +209,6 @@ export default {
      * 回调参数补充
      */
     selectedLiveGoods(val, index) {
-      // if (!val.___selected) {
-      //   val.___selected = true;
-      //   this.$set(this.liveGoodsData[index], "___selected", true);
-      //   this.selectedGoods.push(this.liveGoodsData[index]);
-      // } else {
-      //   this.$nextTick(() => {
-      //     val.___selected = false;
-
-      //     this.$set(this.liveGoodsData[index], "___selected", true);
-      //     this.selectedGoods.splice(index, 1);
-      //   });
-      // }
 
       this.$emit("selectedGoods", val);
     },
diff --git a/seller/src/views/promotion/pintuan/newPintuan.vue b/seller/src/views/promotion/pintuan/newPintuan.vue
index ad8e3dbe..412954b4 100644
--- a/seller/src/views/promotion/pintuan/newPintuan.vue
+++ b/seller/src/views/promotion/pintuan/newPintuan.vue
@@ -130,6 +130,7 @@ export default {
       );
       this.$router.go(-1);
     },
+    // 提交活动
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
@@ -167,6 +168,7 @@ export default {
         }
       });
     },
+    // 获取详情
     getDetail() {
       getPintuanDetail(this.id).then((res) => {
         if (res.success) {
diff --git a/seller/src/views/promotion/pintuan/pintuan.scss b/seller/src/views/promotion/pintuan/pintuan.scss
deleted file mode 100644
index c80994d4..00000000
--- a/seller/src/views/promotion/pintuan/pintuan.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.search {
-  .operation {
-    margin-bottom: 2vh;
-  }
-  .page {
-    margin-top: 2vh;
-  }
-}
-.row {
-  margin-bottom: 5px;
-}
diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue
index e05ff24a..37c4c7f9 100644
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="search">
+  <div class="pintuan">
     <Card>
       <Row>
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@@ -47,9 +47,6 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       >
         <template slot-scope="{ row }" slot="action">
           <div  class="row">
@@ -128,7 +125,6 @@ import {
 } from "@/api/promotion";
 export default {
   name: "pintuan",
-  components: {},
   data() {
     return {
       loading: true, // 表单加载状态
@@ -140,8 +136,6 @@ export default {
         order: "desc", // 默认排序方式
       },
       selectDate: null, // 选择的时间
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         {
           title: "活动名称",
@@ -191,23 +185,27 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v - 1;
       this.getDataList();
-      this.clearSelectAll();
     },
+    // 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 0;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    // 重置
     handleReset() {
       this.searchForm = {}
       this.selectDate = ''
@@ -215,20 +213,14 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 时间段分别赋值
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取列表数据
     getDataList() {
       this.loading = true;
       if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@@ -238,7 +230,6 @@ export default {
         this.searchForm.startTime = null;
         this.searchForm.endTime = null;
       }
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       getPintuanList(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
@@ -247,15 +238,19 @@ export default {
         }
       });
     },
+    // 新建拼团
     newAct() {
       this.$router.push({ name: "new-pintuan" });
     },
+    // 编辑拼团
     edit(v) {
       this.$router.push({ name: "new-pintuan", query: { id: v.id } });
     },
+    // 管理拼团商品
     manage(v, status) {
       this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } });
     },
+    // 手动开启拼团活动
     open(v) {
       this.$Modal.confirm({
         title: "确认开启",
@@ -298,6 +293,7 @@ export default {
         },
       });
     },
+    // 关闭拼团活动
     close(v) {
       this.$Modal.confirm({
         title: "确认关闭",
@@ -314,6 +310,7 @@ export default {
         },
       });
     },
+    // 删除拼团活动
     remove(v) {
       this.$Modal.confirm({
         title: "确认删除",
@@ -338,6 +335,5 @@ export default {
 };
 </script>
 <style lang="scss">
-@import "pintuan.scss";
 @import "@/styles/table-common.scss";
 </style>
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index b782cf57..90ddd36d 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -146,6 +146,7 @@ export default {
       );
       this.$router.go(-1);
     },
+    // 保存商品
     save() {
       if (this.goodsData.length == 0) {
         this.$Modal.warning({ title: "提示", content: "请选择活动商品" });
@@ -203,8 +204,6 @@ export default {
       this.searchForm.pageNumber = 0;
       this.searchForm.promotionName = "";
       this.selectDate = null;
-
-      // 重新加载数据
       this.getDataList();
     },
 
@@ -229,7 +228,6 @@ export default {
         }
       });
     },
-
     getPintuanMsg() { // 获取拼团详情
       getPintuanDetail(this.$route.query.id).then((res) => {
         if (res.success) this.data.push(res.result);
diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue
index fa0c6ed9..b912778f 100644
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/seller/src/views/promotion/seckill/seckill.vue
@@ -28,6 +28,7 @@
         :columns="columns"
         :data="data"
         ref="table"
+        class="mt_10"
         sortable="custom"
       >
         <template slot-scope="{ row }" slot="applyEndTime">
@@ -141,22 +142,27 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v - 1;
       this.getDataList();
     },
+    // 分页 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 0;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    // 重置
     handleReset() {
       this.searchForm = {};
       this.selectDate = "";
@@ -164,10 +170,11 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-
+    // 管理
     manage(row) {
       this.$router.push({ name: "seckill-goods", query: { id: row.id } });
     },
+    // 获取列表数据
     getDataList() {
       this.loading = true;
       if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@@ -201,10 +208,7 @@ export default {
   },
   activated() {
     this.init();
-  },
-  mounted() {
-    this.init();
-  },
+  }
 };
 </script>
 <style lang="scss"  scoped>
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
index e20cda2b..72ab5695 100644
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -16,11 +16,6 @@
           <Button @click="delAll">批量删除</Button>
         </template>
       </Row>
-      <Row v-show="openTip"  v-if="promotionStatus == 'NEW'">
-        <Alert show-icon>
-          已选择 <span class="select-count">{{ selectCount }}</span> 项
-        </Alert>
-      </Row>
       <Row class="operation">
         <Tabs type="card" v-model="tabIndex">
           <TabPane
@@ -136,7 +131,6 @@ import {
   seckillGoodsList,
   seckillDetail,
   setSeckillGoods,
-  removeSeckillGoods,
 } from "@/api/promotion.js";
 import skuSelect from "@/views/lili-dialog";
 export default {
@@ -146,7 +140,6 @@ export default {
   data() {
     return {
       promotionStatus: "", // 活动状态
-      openTip: true,
       loading: false, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
@@ -204,10 +197,6 @@ export default {
           slot: "promotionApplyStatus",
           minWidth: 30,
         },
-        // {
-        //   title: "商品二维码",
-        //   slot: "QRCode",
-        // },
         {
           title: "操作",
           slot: "action",
@@ -217,7 +206,6 @@ export default {
       goodsList: [] // 商品列表
     };
   },
-  computed: {},
   methods: {
     // 关闭当前页面
     closeCurrentPage() {
@@ -227,18 +215,8 @@ export default {
       );
       this.$router.go(-1);
     },
+    // 提交秒杀商品
     save() {
-      // 提交
-      // for(let i=0;i<this.goodsData.length;i++){
-      //     let data = this.goodsData[i]
-      //     if(!data.price){
-      //         this.$Modal.warning({
-      //             title:'提示',
-      //             content:`请填写【${data.goodsName}】的价格`
-      //         })
-      //         return
-      //     }
-      // }
 
       let list = JSON.parse(JSON.stringify(this.goodsList));
       let params = {
@@ -260,10 +238,11 @@ export default {
         }
       });
     },
+    // 初始化数据
     init() {
       this.getSeckillMsg();
     },
-
+    // 清除选中状态 
     clearSelectAll() {
       this.$refs.table.selectAll(false);
     },
@@ -316,19 +295,10 @@ export default {
         }
       });
     },
-    delGoods(index, id) {
+    delGoods(index) {
       // 删除商品
-      // 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("删除成功！");
-      // }
+      this.goodsList[this.tabIndex].list.splice(index, 1);
+      this.$Message.success("删除成功！");
     },
     delAll() { // 删除当前时段全部数据
       if (this.selectCount <= 0) {
@@ -350,11 +320,6 @@ export default {
           ].list.filter((item) => {
             return !ids.includes(item.id);
           });
-          // removeSeckillGoods(this.$route.query.id, ids).then((res) => {
-          //   if (res.success) {
-          //     this.$Message.success("删除成功！");
-          //   }
-          // });
         },
       });
     },
@@ -406,22 +371,20 @@ export default {
       }
       return [];
     },
+    // 格式化申请状态
     promotionApplyStatus(key) {
       switch (key) {
         case "APPLY":
           return "申请";
-          break;
         case "PASS":
           return "通过";
-          break;
         case "REFUSE":
           return "拒绝";
-          break;
         default:
           return "未申请";
-          break;
       }
     },
+    // 展示审核拒绝原因
     showReason(reason) {
       this.$Modal.info({
         title: "拒绝原因",
diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue
index 3615d108..67e08541 100644
--- a/seller/src/views/shop/bill/accountStatementBill.vue
+++ b/seller/src/views/shop/bill/accountStatementBill.vue
@@ -30,7 +30,7 @@
               style="width: 200px"
             ></DatePicker>
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
@@ -41,9 +41,6 @@
         :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
@@ -68,7 +65,6 @@
 
   export default {
     name: "accountStatementBill",
-    components: {},
     data() {
       return {
         loading: true, // 表单加载状态
@@ -81,25 +77,13 @@
           startDate: "", // 起始时间
           endDate: "", // 终止时间
         },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "账单号",
             key: "sn",
             minWidth: 250,
-            tooltip: true          },
+            tooltip: true          
+          },
           {
             title: "生成时间",
             key: "createTime",
@@ -178,50 +162,34 @@
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      // 重置
       handleReset() {
         this.searchForm = {}
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         this.searchForm.billStatus = "OUT"
@@ -235,7 +203,7 @@
         this.total = this.data.length;
         this.loading = false;
       },
-
+      // 查看详情
       detail(v) {
         let id = v.id;
         this.$router.push({
@@ -245,7 +213,7 @@
 
       },
     },
-    mounted() {
+    activated() {
       this.init();
     },
   };
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index d513fb03..a4de7017 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -1,52 +1,38 @@
 <template>
-  <div>
-    <template>
-      <Row>
-        <i-col span="24">
-          <Card>
-            <p slot="title">商家信息</p>
-            <div class="flex flex_align_item">
-              <p>店铺名称：{{ bill.storeName }}</p>
-              <p>银行开户名：{{ bill.bankAccountName }}</p>
-              <p>银行账号：{{ bill.bankAccountNumber }}</p>
-              <p>开户行支行名称：{{ bill.bankName }}</p>
-              <p>支行联行号：{{ bill.bankCode }}</p>
-            </div>
-          </Card>
-        </i-col>
-      </Row>
-    </template>
-    <template>
-      <Row>
-        <i-col span="24">
-          <Card>
-            <p slot="title">账单详细</p>
+  <div class="bill-detail">
+    <Card>
+      <p slot="title">商家信息</p>
+      <div class="flex flex_align_item">
+        <p>店铺名称：{{ bill.storeName }}</p>
+        <p>银行开户名：{{ bill.bankAccountName }}</p>
+        <p>银行账号：{{ bill.bankAccountNumber }}</p>
+        <p>开户行支行名称：{{ bill.bankName }}</p>
+        <p>支行联行号：{{ bill.bankCode }}</p>
+      </div>
+    </Card>
+    <Card class="mt_10">
+      <p slot="title">账单详细</p>
 
-            <div class="tips-status">
-              <span>商品状态</span>
+      <div class="tips-status">
+        <span>商品状态</span>
 
-              <span class="theme_color">{{
-                bill.billStatus | unixSellerBillStatus
-              }}</span>
+        <span class="theme_color">{{
+          bill.billStatus | unixSellerBillStatus
+        }}</span>
 
-              <Button
-                v-if="bill.billStatus == 'OUT'"
-                size="mini"
-                @click="reconciliation()"
-                type="primary"
-                >对账</Button
-              >
-            </div>
-
-            <i-table :columns="columns" :data="data" stripe></i-table>
-          </Card>
-        </i-col>
-      </Row>
-    </template>
-    <template>
-      <Tabs active-key="tab" @on-click="clickTabs">
+        <Button
+          v-if="bill.billStatus == 'OUT'"
+          size="mini"
+          @click="reconciliation()"
+          type="primary"
+          >对账</Button
+        >
+      </div>
+      <i-table :columns="columns" :data="data" stripe></i-table>
+    </Card>
+    <Card class="mt_10">
+      <Tabs active-key="tab" type="card" @on-click="clickTabs">
         <Tab-pane label="订单列表" name="order">
-          <Card>
             <Table
               :loading="loading"
               border
@@ -66,10 +52,8 @@
                 show-elevator
               ></Page>
             </Row>
-          </Card>
         </Tab-pane>
         <Tab-pane label="退单列表" name="refund">
-          <Card>
             <Table
               :loading="loading"
               border
@@ -89,10 +73,8 @@
                 show-elevator
               ></Page>
             </Row>
-          </Card>
         </Tab-pane>
         <Tab-pane label="分销费用列表" name="distribution">
-          <Card>
             <Table
               :loading="loading"
               border
@@ -112,10 +94,9 @@
                 show-elevator
               ></Page>
             </Row>
-          </Card>
         </Tab-pane>
       </Tabs>
-    </template>
+    </Card>
   </div>
 </template>
 <script>
@@ -550,6 +531,7 @@ export default {
         }
       });
     },
+    // 账单详细
     initTable() {
       let bill = this.bill;
       this.data[0].name = "结算单号";
@@ -613,6 +595,9 @@ export default {
     margin: 15px 0;
   }
 }
+.page{
+  margin-top: 10px;
+}
 .tips-status {
   padding: 18px;
   > span {
diff --git a/seller/src/views/shop/bill/storeBill.vue b/seller/src/views/shop/bill/storeBill.vue
index ef66258b..6a4eab5b 100644
--- a/seller/src/views/shop/bill/storeBill.vue
+++ b/seller/src/views/shop/bill/storeBill.vue
@@ -1,46 +1,45 @@
 <template>
-  <div class="search">
+  <div class="store-bill">
     <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>
-          <Form-item label="状态" prop="orderStatus">
-            <Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
-              <Option value="OUT">已出账</Option>
-              <Option value="CHECK">已对账</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>
+      <Form
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        :label-width="70"
+        class="search-form"
+        @keydown.enter.native="handleSearch"
+      >
+        <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>
+        <Form-item label="状态" prop="orderStatus">
+          <Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
+            <Option value="OUT">已出账</Option>
+            <Option value="CHECK">已对账</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>
       <Table
         :loading="loading"
         border
@@ -48,9 +47,6 @@
         :data="data"
         ref="table"
         class="mt_10"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       ></Table>
       <Row type="flex" justify="end" class="page">
         <Page
@@ -75,7 +71,6 @@
 
   export default {
     name: "storeBill",
-    components: {},
     data() {
       return {
         loading: true, // 表单加载状态
@@ -88,25 +83,13 @@
           startDate: "", // 起始时间
           endDate: "", // 终止时间
         },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "账单号",
             key: "sn",
             minWidth: 250,
-            tooltip: true          },
+            tooltip: true
+          },
           {
             title: "生成时间",
             key: "createTime",
@@ -185,50 +168,34 @@
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      // 重置
       handleReset() {
         this.searchForm = {}
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         API_Shop.getBillPage(this.searchForm).then((res) => {
@@ -241,7 +208,7 @@
         this.total = this.data.length;
         this.loading = false;
       },
-
+      // 跳转结算详情
       detail(v) {
         let id = v.id;
         this.$router.push({
diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index c9479e2d..826e3b9c 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="search">
+  <div class="logistics">
     <Card>
         <Table
           :loading="loading"
@@ -9,7 +9,6 @@
           ref="table"
           sortable="custom"
           @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
         ></Table>
     </Card>
   </div>
@@ -20,7 +19,6 @@
 
   export default {
     name: "logistics",
-    components: {},
     data() {
       return {
         loading: true, // 表单加载状态
@@ -31,21 +29,7 @@
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          sn: "",
-          sellerName: "",
-          startTime: "",
-          endTime: "",
-          billPrice: "",
-        },
-        // 表单验证规则
-        formValidate: {},
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
-
           {
             title: "物流公司",
             key: "name",
@@ -85,7 +69,7 @@
                       },
                       on: {
                         click: () => {
-                          this.checked(params.row);
+                          this.open(params.row);
                         },
                       },
                     },
@@ -106,7 +90,7 @@
                       },
                       on: {
                         click: () => {
-                          this.unChecked(params.row);
+                          this.close(params.row);
                         },
                       },
                     },
@@ -122,9 +106,11 @@
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 变更排序
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;
@@ -133,10 +119,7 @@
         }
         this.getDataList();
       },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
+      // 获取数据
       getDataList() {
         this.loading = true;
         API_Shop.getLogistics().then((res) => {
@@ -147,8 +130,8 @@
         });
         this.loading = false;
       },
-      //物流公司选中
-      checked(v) {
+      // 开启
+      open(v) {
         this.$Modal.confirm({
           title: "确认开启",
           // 记得确认修改此处
@@ -165,11 +148,10 @@
           }
         });
       },
-      //物流公司取消选中
-      unChecked(v){
+      // 关闭
+      close(v){
         this.$Modal.confirm({
           title: "确认关闭",
-          // 记得确认修改此处
           content: "您确认关闭此物流公司?",
           loading: true,
           onOk: () => {
@@ -189,29 +171,3 @@
     },
   };
 </script>
-<style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-  // @import "@/styles/table-common.scss";
-  .search {
-    .operation {
-      margin-bottom: 2vh;
-    }
-
-    .select-count {
-      font-weight: 600;
-      color: #40a9ff;
-    }
-
-    .select-clear {
-      margin-left: 10px;
-    }
-
-    .page {
-      margin-top: 2vh;
-    }
-
-    .drop-down {
-      margin-left: 5px;
-    }
-  }
-</style>
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index 83b0261c..d17690e9 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -15,6 +15,7 @@
               <tr>
                 <th colspan="20">
                   <span class="temp-name">{{item.name}}</span>
+                  <Tag v-if="item.pricingMethod==='FREE'" class="baoyou" color="warning">包邮</Tag>
                   <span class="fr m-r-5">
                     <time style="margin-right: 20px" title="最后编辑时间">
                       <i class="icon-time"></i>{{item.updateTime}}
@@ -160,7 +161,6 @@ export default {
   components: {
     multipleRegion,
   },
-
   data() {
     return {
       selectedIndex: 0, //选中的地址模板下标
@@ -201,6 +201,7 @@ export default {
     },
   },
   methods: {
+    // 初始化数据
     init() {
       this.getData();
     },
@@ -278,7 +279,6 @@ export default {
         this.shipInfo = res.result;
       });
     },
-
     /**
      * 选择地址回调
      */
@@ -604,4 +604,7 @@ em {
   font-size: 15px;
   color: #f00;
 }
+.baoyou {
+  margin: 6px 10px 0;
+}
 </style>
diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue
index 707a635c..198693e2 100644
--- a/seller/src/views/shop/shopAddress.vue
+++ b/seller/src/views/shop/shopAddress.vue
@@ -1,38 +1,30 @@
 <template>
-  <div class="search">
-    <Row>
-      <Col>
-        <Card>
-
-          <Row class="operation">
-            <Button @click="add" type="primary">添加</Button>
-          </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"
-              :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>
+  <div class="self-address">
+    <Card>
+      <Button @click="add" type="primary">添加</Button>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        style="margin-top:10px"
+      ></Table>
+      <Row type="flex" justify="end" style="margin-top:10px;">
+        <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"
@@ -84,7 +76,6 @@
           pageNumber: 1, // 当前页数
           pageSize: 10, // 页面大小
         },
-        selectDate: null,
         form: {
           // 添加或编辑表单对象初始化数据
           addressName: "",
@@ -135,8 +126,6 @@
           ],
         },
         submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           // 表头
           {
@@ -208,44 +197,39 @@
       };
     },
     methods: {
-      init() {
+      init() { // 初始化数据
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      // 重置
       handleReset() {
         this.$refs.searchForm.resetFields();
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
-        // 重新加载数据
         this.getDataList();
       },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
       //获取地址
       getAddress(item){
-
         this.$set(this.form, 'address', item.addr)
         this.form.address = item.address
         this.form.center = item.position.lat + "," + item.position.lng
       },
+      // 获取数据
       getDataList() {
         this.loading = true;
         API_Shop.getShopAddress(this.searchForm).then((res) => {
@@ -308,7 +292,7 @@
           }
         });
       },
-      //删除提交
+      //删除
       deleteSubmit(v){
         this.$Modal.confirm({
           title: "确认删除",
@@ -332,29 +316,4 @@
     },
   };
 </script>
-<style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-  // @import "@/styles/table-common.scss";
-  .search {
-    .operation {
-      margin-bottom: 2vh;
-    }
 
-    .select-count {
-      font-weight: 600;
-      color: #40a9ff;
-    }
-
-    .select-clear {
-      margin-left: 10px;
-    }
-
-    .page {
-      margin-top: 2vh;
-    }
-
-    .drop-down {
-      margin-left: 5px;
-    }
-  }
-</style>
diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue
index 43297f99..ec564399 100644
--- a/seller/src/views/shop/shopSetting.vue
+++ b/seller/src/views/shop/shopSetting.vue
@@ -187,6 +187,7 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getShopInfo();
     },
diff --git a/seller/src/views/statistics/goods.vue b/seller/src/views/statistics/goods.vue
index 6c923c19..98ef9e6b 100644
--- a/seller/src/views/statistics/goods.vue
+++ b/seller/src/views/statistics/goods.vue
@@ -20,9 +20,11 @@
   </div>
 </template>
 <script>
+import affixTime from "@/views/lili-components/affix-time";
 import * as API_Goods from "@/api/goods";
 import Cookies from "js-cookie";
 export default {
+  components: { affixTime },
   data() {
     return {
       params: { // 请求参数
@@ -56,11 +58,12 @@ export default {
     };
   },
   methods: {
+    // tab切换
     handleClickType(name) {
       this.params.type = name;
       this.getData();
     },
-
+    // 时间筛选
     clickBreadcrumb(item, index) {
       let callback = item;
       let type = this.params.type;
@@ -68,6 +71,7 @@ export default {
       this.params.type = type;
       this.getData();
     },
+    // 获取数据
     getData() {
       Promise.all([API_Goods.goodsStatistics(this.params)]).then((res) => {
         if (res[0].result) {
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 173ca2f0..6f823319 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -499,7 +499,7 @@ export default {
         });
       this.orderChart.render();
     },
-
+    // 时间筛选
     clickBreadcrumb(item, index) {
       let callback = JSON.parse(JSON.stringify(item));
 
diff --git a/seller/src/views/statistics/order/orderDetail.vue b/seller/src/views/statistics/order/orderDetail.vue
index 3d445e01..b8a17740 100644
--- a/seller/src/views/statistics/order/orderDetail.vue
+++ b/seller/src/views/statistics/order/orderDetail.vue
@@ -1,6 +1,5 @@
 <template>
-  <div class="wrapper">
-
+  <div>
     <div class="shop">
       <h3>订单详情</h3>
       <div class="shop-item">
@@ -69,7 +68,6 @@
         </div>
       </div>
     </div>
-
   </div>
 </template>
 <script>
@@ -91,8 +89,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.wrapper {
-}
 .shop {
   padding: 10px 0;
   background: #fff;
diff --git a/seller/src/views/statistics/order/orderStatistics.vue b/seller/src/views/statistics/order/orderStatistics.vue
deleted file mode 100644
index 642bdb22..00000000
--- a/seller/src/views/statistics/order/orderStatistics.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-  <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Form
-            label-position="left"
-            ref="searchForm"
-            :model="params"
-            inline
-            :label-width="100"
-          >
-            <Form-item label="选择时间类型" prop="sn">
-              <Select v-model="params.timeType" style="width: 200px">
-                <Option
-                  v-for="item in typeList"
-                  :value="item.value"
-                  :key="item.value"
-                >{{ item.label }}
-                </Option
-                >
-              </Select>
-            </Form-item>
-            <Form-item label="按年查询" prop="year">
-              <DatePicker
-                type="year"
-                style="width: 200px"
-                v-model="year"
-                @on-change="changeYear"
-              ></DatePicker>
-            </Form-item>
-            <Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
-              <InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
-            </Form-item>
-          </Form>
-        </Card>
-
-        <Card style="margin-top: 2px;height: 130px">
-          <h3>订单统计</h3>
-          <div class="ant-row">
-            <div class="ant-col-4">
-              <p class="static-menu">
-                <span style="font-size: 14px;">总数</span>
-              </p>
-              <p class="static-num">
-                {{priceData.totalNum}}
-              </p>
-            </div>
-            <div>
-              <p class="static-menu">
-                <span style="font-size: 14px;">总金额</span>
-              </p>
-              <p class="static-num">
-                {{ priceData.price | unitPrice('￥') }}
-              </p>
-            </div>
-          </div>
-        </Card>
-
-
-        <Card style="margin-top: 2px">
-          <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
-                  how-sizer></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
-  </div>
-</template>
-
-<script>
-  import * as API_Statistics from "@/api/statistics";
-
-  export default {
-    name: "goodsStatistics",
-    components: {},
-    data() {
-      return {
-        searchForm: [],
-        params: {
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          type: "NUM",
-          timeType: "YEAR",
-          year:'',
-        },
-        year:'',
-
-        priceData:{
-          totalNum:0,
-          price:0
-        },
-        loading: true, // 表单加载状态
-        typeList: [
-          {
-            value: "YEAR",
-            label: "年",
-          },
-          {
-            value: "MONTH",
-            label: "月",
-          },
-        ],
-        columns: [
-          {
-            title: "店铺",
-            key: "sellerName",
-          },
-          {
-            title: "订单编号",
-            key: "orderItemSn",
-          },
-          {
-            title: "购买人",
-            key: "memberName",
-          },
-          {
-            title: "订单金额",
-            key: "finalPrice",
-          },
-          {
-            title: "创建时间",
-            key: "createTime",
-          },
-        ],
-        data: [],
-        total: 0 // 表单数据总数
-      };
-    },
-    watch: {
-      params: {
-        handler(val) {
-          this.init();
-        },
-        deep: true,
-      }
-    },
-    methods: {
-      //初始化
-      init() {
-        this.getDataPage()
-      },
-      getDataPage() {
-        this.loading = true;
-        API_Statistics.getOrderStatistics(this.params).then((res) => {
-          this.loading = false;
-          this.data = res.result.records
-          this.total = res.result.total
-        });
-        API_Statistics.getOrderStatisticsPrice(this.params).then((res) => {
-          this.loading = false;
-          this.priceData.totalNum  = res.result.num
-          this.priceData.price  = res.result.price?res.result.price:0
-        });
-      },
-      changeYear(item){
-        this.params.year = item;
-      }
-    },
-    mounted() {
-      let nowDate = new Date();
-      this.params.year = this.year = nowDate.getFullYear() + ''
-      this.init();
-    },
-
-  };
-</script>
-<style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-  @import "@/styles/table-common.scss";
-
-  .ant-row {
-    position: relative;
-    height: auto;
-    margin-right: 0;
-    margin-left: 0;
-    zoom: 1;
-    display: block;
-    box-sizing: border-box;
-    margin-left: 30px;
-    margin-top: 10px;
-  }
-
-
-  .ant-col-4 {
-    display: block;
-    box-sizing: border-box;
-    width: 11%;
-    flex: 0 0 auto;
-    float: left;
-  }
-
-  .static-num {
-    color: rgb(51, 51, 51);
-    font-size: 16px;
-    padding: 5px;
-  }
-
-  .static-menu {
-    color: rgb(51, 51, 51);
-    font-size: 16px;
-    padding: 5px;
-  }
-</style>
diff --git a/seller/src/views/statistics/order/refundOrder.vue b/seller/src/views/statistics/order/refundOrder.vue
index 1967b0b8..d9d9fbfb 100644
--- a/seller/src/views/statistics/order/refundOrder.vue
+++ b/seller/src/views/statistics/order/refundOrder.vue
@@ -1,6 +1,5 @@
 <template>
-  <div class="wrapper">
-
+  <div>
     <div class="shop">
       <h3>售后详情</h3>
       <div class="shop-item">
@@ -111,8 +110,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.wrapper {
-}
 .shop {
   padding: 10px 0;
   background: #fff;
diff --git a/seller/src/views/statistics/traffic.vue b/seller/src/views/statistics/traffic.vue
index 131f30f0..00d8ed16 100644
--- a/seller/src/views/statistics/traffic.vue
+++ b/seller/src/views/statistics/traffic.vue
@@ -1,9 +1,8 @@
 <template>
-  <div class="wrapper">
+  <div>
     <Affix :offset-top="100">
       <Card class="card fixed-bottom">
         <affixTime @selected="clickBreadcrumb" />
-
       </Card>
     </Affix>
     <Card class="card">
@@ -45,11 +44,8 @@
       <div>
         <h4>客户增长报表</h4>
         <Table class="table" stripe :columns="columns" :data="data"></Table>
-
       </div>
     </Card>
-
-  </div>
   </div>
 </template>
 <script>
@@ -186,13 +182,13 @@ export default {
 
       this.orderChart.render();
     },
-
+    // 时间筛选
     clickBreadcrumb(item, index) {
       let callback = JSON.parse(JSON.stringify(item));
 
       this.params = callback;
     },
-
+    // 初始化
     init() {
       API_Member.getStatisticsList(this.params).then((res) => {
         if (res.result) {