diff --git a/src/api/brand.js b/src/api/brand.js
index 6c62b7e..86998d1 100644
--- a/src/api/brand.js
+++ b/src/api/brand.js
@@ -1,53 +1,64 @@
 import request from '@/utils/request'
 export function fetchList(params) {
-  return request({
-    url:'/pms/PmsBrand/list',
-    method:'get',
-    params:params
-  })
+    return request({
+        url: '/pms/PmsBrand/list',
+        method: 'get',
+        params: params
+    })
 }
 export function createBrand(data) {
-  return request({
-    url:'/pms/PmsBrand/create',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/pms/PmsBrand/create',
+        method: 'post',
+        data: data
+    })
 }
+
+export function updateDelivery(data) {
+    return request({
+        url: '/pms/PmsBrand/update/delivery',
+        method: 'post',
+        params: data,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+}
+
 export function updateShowStatus(data) {
-  return request({
-    url:'/pms/PmsBrand/update/showStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/pms/PmsBrand/update/showStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function updateFactoryStatus(data) {
-  return request({
-    url:'/pms/PmsBrand/update/factoryStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/pms/PmsBrand/update/factoryStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function deleteBrand(id) {
-  return request({
-    url:'/pms/PmsBrand/delete/'+id,
-    method:'get',
-  })
+    return request({
+        url: '/pms/PmsBrand/delete/' + id,
+        method: 'get',
+    })
 }
 
 export function getBrand(id) {
-  return request({
-    url:'/pms/PmsBrand/'+id,
-    method:'get',
-  })
-}
-
-export function updateBrand(id,data) {
-  return request({
-    url:'/pms/PmsBrand/update/'+id,
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/pms/PmsBrand/' + id,
+        method: 'get',
+    })
 }
 
+export function updateBrand(id, data) {
+    return request({
+        url: '/pms/PmsBrand/update/' + id,
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/api/invoiceReview/invoiceReview.js b/src/api/invoiceReview/invoiceReview.js
index 30be512..5ec13c5 100644
--- a/src/api/invoiceReview/invoiceReview.js
+++ b/src/api/invoiceReview/invoiceReview.js
@@ -1,30 +1,31 @@
 import request from '@/utils/request'
 
 export default {
-	
-	// 查询分页列表
-	listPage: function(params) {
-	  return request({
-	    url: '/invoicerecords/listPage',
-	    method: 'post',
-	    data: params,
-	  })
-	},
-	
-	//   获取订单详情
-	getOrderDetails: function(params) {
-	  return request({
-	    url: '/empsreservoorder/OrderDetailsNew/'+params,
-	    method: 'get'
-	  })
-	},
-	
-	//   审核发票
-	toExamine: function(params) {
-	  return request({
-	    url: '/invoicerecords/toExamine',
-	    method: 'post',
-	    data: params,
-	  })
-	},
+
+    // 查询分页列表
+    listPage: function(params) {
+        return request({
+            url: '/invoicerecords/listPage',
+            method: 'post',
+            data: params,
+        })
+    },
+
+    //   获取订单详情
+    getOrderDetails: function(params) {
+        return request({
+            // url: '/empsreservoorder/OrderDetailsNew/'+params,
+            url: '/order/OrderDetailsNew/' + params,
+            method: 'get'
+        })
+    },
+
+    //   审核发票
+    toExamine: function(params) {
+        return request({
+            url: '/invoicerecords/toExamine',
+            method: 'post',
+            data: params,
+        })
+    },
 }
\ No newline at end of file
diff --git a/src/assets/home/bj_new.jpg b/src/assets/home/bj_new.jpg
new file mode 100644
index 0000000..e0d6f27
Binary files /dev/null and b/src/assets/home/bj_new.jpg differ
diff --git a/src/views/appletBanner/appletBannerAdd.vue b/src/views/appletBanner/appletBannerAdd.vue
index 7009bf4..bf38be8 100644
--- a/src/views/appletBanner/appletBannerAdd.vue
+++ b/src/views/appletBanner/appletBannerAdd.vue
@@ -1,281 +1,299 @@
 <template>
-  <div>
-
-    <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>轮播图信息</div>
-      <!-- start 添加修改按钮 -->
-      <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-      </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
-    </div>
-
-    <div class="listconadd">
-
-      <el-card class="box-card">
-
-        <div class="item">
-          <span class="item_text">标题：</span>
-          <el-input v-model="formobj.title" placeholder="" class="item_input" clearable />
+    <div>
+
+        <div class="tab-header webtop">
+            <!-- 标题 -->
+            <div>轮播图信息</div>
+            <!-- start 添加修改按钮 -->
+            <div>
+                <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+                <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+            </div>
+            <!-- end 添加修改按钮 -->
+            <!-- end 详情按钮 -->
         </div>
 
-        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-          <span class="item_text">轮播图图片：</span>
-          <upload
-            ref="uploadImg2"
-            v-model="imgList"
-            style="margin-top: 20px;"
-            class="item_input"
-            :limit="1"
-            bucket="map"
-            :class="{ hide: hideUploadBtn }"
-            :upload-data="{ type: '0001' }"
-            @change="backData"
-          />
-        </div>
-        <div class="item">
-          <span class="item_text">发布人：</span>
-          <el-input v-model="formobj.publisher" placeholder="" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">发布日期：</span>
-          <el-date-picker v-model="formobj.releaseTime" type="date" class="item_input" value-format="yyyy-MM-dd" placeholder="选择日期" />
-        </div>
-        <div class="item">
-          <span class="item_text">时效开始日期：</span>
-          <el-date-picker v-model="formobj.startDate" type="date" class="item_input" value-format="yyyy-MM-dd" placeholder="选择日期" />
-        </div>
-        <div class="item">
-          <span class="item_text">时效结束日期：</span>
-          <el-date-picker v-model="formobj.endDate" type="date" class="item_input" value-format="yyyy-MM-dd" placeholder="选择日期" />
-        </div>
-
-        <!-- 	<div class="item2">
+        <div class="listconadd">
+
+            <el-card class="box-card">
+
+                <div class="item">
+                    <span class="item_text">标题：</span>
+                    <el-input v-model="formobj.title" placeholder="" class="item_input" clearable />
+                </div>
+
+                <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+                    <span class="item_text">轮播图图片：</span>
+                    <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
+                        bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }"
+                        @change="backData" />
+                </div>
+
+                <div class="item">
+                    <span class="item_text">发布人：</span>
+                    <el-input v-model="formobj.publisher" placeholder="" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">发布日期：</span>
+                    <el-date-picker v-model="formobj.releaseTime" type="date" class="item_input"
+                        value-format="yyyy-MM-dd" placeholder="选择日期" />
+                </div>
+                <div class="item">
+                    <span class="item_text">时效开始日期：</span>
+                    <el-date-picker v-model="formobj.startDate" type="date" class="item_input" value-format="yyyy-MM-dd"
+                        placeholder="选择日期" />
+                </div>
+                <div class="item">
+                    <span class="item_text">时效结束日期：</span>
+                    <el-date-picker v-model="formobj.endDate" type="date" class="item_input" value-format="yyyy-MM-dd"
+                        placeholder="选择日期" />
+                </div>
+
+                <!-- 	<div class="item2">
 					<span class="item_text">内容：</span>
 					<el-input v-model="formobj.content" type="textarea" :rows="6" placeholder="商品简介" class="item_input"
 						clearable />
 
 				</div> -->
 
-        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-          <span class="item_text">内容图片：</span>
-          <upload
-            ref="uploadImg3"
-            v-model="imgListnr"
-            style="margin-top: 20px;"
-            class="item_input"
-            :limit="1"
-            bucket="map"
-            :class="{ hide: hideUploadBtnNr }"
-            :upload-data="{ type: '0001' }"
-            @change="backDataNr"
-          />
-        </div>
-        <div class="item2">
-          <span class="item_text">轮播图内容：</span>
-          <editor class="item_input" :height="300" :min-height="100" :value="formobj.content" @input="editinput" />
-        </div>
+                <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+                    <span class="item_text">内容图片：</span>
+                    <upload ref="uploadImg3" v-model="imgListnr" style="margin-top: 20px;" class="item_input" :limit="1"
+                        bucket="map" :class="{ hide: hideUploadBtnNr }" :upload-data="{ type: '0001' }"
+                        @change="backDataNr" />
+                </div>
+                <div class="item2">
+                    <span class="item_text">轮播图内容：</span>
+                    <editor class="item_input" :height="300" :min-height="100" :value="formobj.content"
+                        @input="editinput" />
+                </div>
 
-      </el-card>
+            </el-card>
 
-    </div>
+        </div>
 
-  </div>
+    </div>
 </template>
 
 <script>
-  import req from '@/api/lpk/banner.js'
-  import Editor from '@/components/Editor'
-  import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
-
-  export default {
-    components: {
-      upload,
-      Editor
-    },
-    data() {
-      return {
-        imgList: [],
-        imgListnr: [],
-        hideUploadBtn: false,
-        hideUploadBtnNr: false,
-        submitdisabled: false,
-        formobj: {
-          sid: '',
-          title: '',
-          publisher: '',
-          releaseTime: '',
-          startDate: '',
-          endDate: '',
-          content: '',
-          bannerUrl: '',
-          bannerPath: '',
-          contentUrl: ''
-        }
-      }
-    },
-    methods: {
-      editinput(text) {
-        this.formobj.content = text
-      },
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-        req.saveNotice(this.formobj)
-          .then(resp => {
-            if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
-              this.handleReturn('true')
-            } else {
-              // 根据resp.code进行异常情况处理
+    import req from '@/api/lpk/banner.js'
+    import Editor from '@/components/Editor'
+    import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
+
+    export default {
+        components: {
+            upload,
+            Editor
+        },
+        data() {
+            return {
+                imgList: [],
+                imgListnr: [],
+                hideUploadBtn: true,
+                hideUploadBtnNr: false,
+                submitdisabled: false,
+                formobj: {
+                    sid: '',
+                    title: '',
+                    publisher: '',
+                    releaseTime: '',
+                    startDate: '',
+                    endDate: '',
+                    content: '',
+                    bannerUrl: '',
+                    bannerPath: '',
+                    contentUrl: ''
+                }
             }
-          })
-          .catch(() => {})
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-          sid: '',
-          title: '',
-          publisher: '',
-          releaseTime: '',
-          startDate: '',
-          endDate: '',
-          content: '',
-          bannerUrl: '',
-          bannerPath: '',
-          contentUrl: ''
-        }
-        this.$emit('doback')
-      },
-      showAdd() {},
-      showEdit(row) {
-        req.noticeInit(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-              this.imgList[0].url = resp.data.bannerUrl
+        },
+        methods: {
+            editinput(text) {
+                this.formobj.content = text
+            },
+            saveOrUpdate() {
+                console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+                req.saveNotice(this.formobj)
+                    .then(resp => {
+                        if (resp.success) {
+                            this.$message({
+                                showClose: true,
+                                type: 'success',
+                                message: resp.msg
+                            })
+                            this.handleReturn('true')
+                        } else {
+                            // 根据resp.code进行异常情况处理
+                        }
+                    })
+                    .catch(() => {})
+            },
+            handleReturn(isreload) {
+                if (isreload === 'true') this.$emit('reloadlist')
+                this.imgList = []
+                this.imgListnr = []
+                this.hideUploadBtn = true
+                this.hideUploadBtnNr = true
+                this.formobj = {
+                    sid: '',
+                    title: '',
+                    publisher: '',
+                    releaseTime: '',
+                    startDate: '',
+                    endDate: '',
+                    content: '',
+                    bannerUrl: '',
+                    bannerPath: '',
+                    contentUrl: ''
+                }
+                this.$emit('doback')
+            },
+            showAdd() {},
+            showEdit(row) {
+                req.noticeInit(row.sid)
+                    .then(resp => {
+                        if (resp.success) {
+                            this.formobj = resp.data
+
+                            this.imgList = []
+                            if (resp.data.bannerUrl != '') {
+                                this.imgList.push({
+                                    url: resp.data.bannerUrl
+                                })
+                            }
+                            this.hideUploadBtn = this.imgList.length != 0
+
+                            this.imgListnr = []
+                            if (resp.data.contentUrl != '') {
+                                this.imgListnr.push({
+                                    url: resp.data.contentUrl
+                                })
+                            }
+                            this.hideUploadBtnNr = this.imgListnr.length != 0
+
+
+                        }
+                    })
+                    .catch(e => {
+                        this.formobj = row
+                        this.imgList = []
+                        this.imgListnr = []
+                    })
+            },
+            backData(value) {
+                console.log('backData》》》》', value)
+                console.log('imgList', this.imgList)
+
+                if (this.imgList.length > 0) {
+                    this.formobj.bannerUrl = this.imgList[0].url
+                } else {
+                    this.formobj.bannerUrl = ''
+                }
+
+                this.hideUploadBtn = this.imgList.length != 0
+
+            },
+            backDataNr(value) {
+                if (this.imgListnr.length > 0) {
+                    this.formobj.contentUrl = this.imgListnr[0].url
+                } else {
+                    this.formobj.contentUrl = ''
+                }
+
+                this.hideUploadBtnNr = this.imgListnr.length !== 0
             }
-          })
-          .catch(e => {
-            this.formobj = row
-          })
-      },
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-
-        if (this.imgList.length > 0) {
-          this.formobj.bannerUrl = this.imgList[0].url
-        } else {
-          this.formobj.bannerUrl = ''
-        }
-
-        this.hideUploadBtn = this.imgList.length !== 0
-        console.log('this.hideUploadBtn', this.hideUploadBtn)
-      },
-      backDataNr(value) {
-        if (this.imgListnr.length > 0) {
-          this.formobj.contentUrl = this.imgListnr[0].url
-        } else {
-          this.formobj.contentUrl = ''
         }
-
-        this.hideUploadBtnNr = this.imgListnr.length !== 0
-      }
     }
-  }
 </script>
 <style lang="scss" scoped>
-  // 隐藏上传组件
-
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-    height: auto;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
+    // 隐藏上传组件
+
+    ::v-deep .hide {
+        .el-upload--picture-card {
+            display: none !important;
         }
+    }
+
+    .box-card {
+        margin-left: 60px;
+        margin-right: 60px;
+        min-width: 70%;
+        margin-top: 20px;
+        height: auto;
+
+        .item {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-top: 15px;
+            height: 40px;
+            line-height: 40px;
+
+            .item_text {
+                flex: 0.8;
+                font-size: 18px;
+                text-align: right;
+            }
+
+            .item_input {
+                flex: 4;
+                font-size: 16px;
+                margin-left: 10px;
+                margin-right: 80px;
+            }
+
+            .item_left_input {
+                width: 20%;
+            }
+
+            .item_left_text {
+                height: 30px;
+                margin-left: 20px;
+                line-height: 30px;
+                color: #018AD2;
+                padding: 0px 15px;
+                border: 1.5px solid #018AD2;
+                border-radius: 5px;
+
+            }
+
+            .item_right {
+                flex: 1;
+                justify-items: center;
+
+                .item_right_list_text {
+                    font-size: 16px;
+                }
+
+                .item_right_list_delect {
+                    color: #5E94FF;
+                    margin-left: 20px;
+                    font-size: 16px;
+                    text-decoration: underline;
+                }
+            }
 
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
         }
-      }
 
-    }
+        .item2 {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-top: 15px;
+
+            .item_text {
+                flex: 0.8;
+                font-size: 18px;
+                text-align: right;
+            }
 
-    .item2 {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
+            .item_input {
+                flex: 4;
+                font-size: 16px;
+                margin-left: 10px;
+                margin-right: 80px;
+            }
 
-    }
+        }
 
-  }
-</style>
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/commodity/commodityAdd.vue b/src/views/commodity/commodityAdd.vue
index 71bc729..dd49c5e 100644
--- a/src/views/commodity/commodityAdd.vue
+++ b/src/views/commodity/commodityAdd.vue
@@ -45,11 +45,11 @@
                         oninput="value=value.replace(/[^0-9]/g,'')" />
                 </div>
                 <div class="item">
-                    <span class="item_text">价格 (元/斤)：</span>
+                    <span class="item_text">包装单价：</span>
                     <el-input v-model="formobj.price" placeholder="" class="item_input" clearable
                         oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
                 </div>
-                <div class="item">
+                <!-- <div class="item">
                     <span class="item_text">阶梯重量(斤)：</span>
                     <el-input v-model="formobj.stepWeight" placeholder="" class="item_input" clearable
                         oninput="value=value.replace(/[^0-9]/g,'')" />
@@ -58,31 +58,30 @@
                     <span class="item_text">阶梯价格 (元/斤)：</span>
                     <el-input v-model="formobj.stepPrice" placeholder="" class="item_input" clearable
                         oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
-                </div>
+                </div> -->
                 <div class="item">
-                    <span class="item_text">商品单位：</span>
-                    <el-input v-model="formobj.specificationUnit" placeholder="例如：斤/瓶/袋/箱/盒" class="item_input"
-                        clearable />
+                    <span class="item_text">金额单位：</span>
+                    <el-input v-model="formobj.specificationUnit" placeholder="例如：元" class="item_input" clearable />
                 </div>
                 <div class="item">
-                    <span class="item_text">规格 (斤/份)：</span>
+                    <span class="item_text">单价：</span>
                     <el-input v-model="formobj.weight" placeholder="例如：30" class="item_input" clearable
                         oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
                 </div>
                 <div class="item">
-                    <span class="item_text">规格单位：</span>
+                    <span class="item_text">基础单位：</span>
                     <el-input v-model="formobj.unitName" placeholder="例如：份" class="item_input" clearable />
                 </div>
                 <div class="item">
                     <span class="item_text">规格描述：</span>
                     <el-input v-model="formobj.remarks" placeholder="例如：一份30斤" class="item_input" clearable />
                 </div>
-                <div class="item">
+                <!-- <div class="item">
                     <span class="item_text">提货截止日：</span>
                     <el-date-picker v-model="formobj.periodValidity" type="date" class="item_input"
                         value-format="yyyy-MM-dd" placeholder="选择日期">
                     </el-date-picker>
-                </div>
+                </div> -->
                 <div class="item">
                     <span class="item_text">商品简介：</span>
                     <el-input v-model="formobj.content" placeholder="商品简介" class="item_input" clearable />
@@ -138,7 +137,7 @@
                     stepWeight: '',
                     stepPrice: '',
                     unitName: '份',
-                    specificationUnit: '',
+                    specificationUnit: '元',
                     weight: '',
                     remarks: '',
                     content: '',
@@ -148,7 +147,7 @@
                     brandName: '',
                     categoryId: '',
                     categoryName: '',
-                    periodValidity: ""
+                    periodValidity: "2099-12-31"
                 },
                 brandList: [],
                 cateList: [],
@@ -211,7 +210,7 @@
                     stepWeight: '',
                     stepPrice: '',
                     unitName: '份',
-                    specificationUnit: '',
+                    specificationUnit: '元',
                     weight: '',
                     remarks: '',
                     content: '',
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 44e6839..9d6f8a2 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -1,189 +1,189 @@
 <template>
-  <div class="login">
-    <div class="logoTitle" style="margin-left: 50px;margin-top: 50px;">
-     <!-- <img src="../../assets/loginImg/shgf.png"
+    <div class="login">
+        <div class="logoTitle" style="margin-left: 50px;margin-top: 50px;">
+            <!-- <img src="../../assets/loginImg/shgf.png"
         style="width: 50px;height: 50px; margin-right: 10px;" /><span>惠享</span>
       <p class="title" style="margin-top: 5px;">惠享管理平台</p> -->
-    </div>
-    <div class="main">
-      <div class="content">
-        <el-form ref="loginForm" :model="loginForm" class="login-form">
-          <h3 class="title1">用户登录</h3>
-          <el-form-item>
-            <el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号" prefix-icon="el-icon-user">
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码" prefix-icon="el-icon-lock"
-              show-password>
-            </el-input>
-            <!-- <span class="nopsw register" @click="forgetPwd = true">忘记密码 ？</span> -->
-          </el-form-item>
-          <el-form-item v-show="showMsg" style="margin-bottom:0;">
-            <span class="text-danger">提示：用户名或密码错误，请重试！</span>
-          </el-form-item>
+        </div>
+        <div class="main">
+            <div class="content">
+                <el-form ref="loginForm" :model="loginForm" class="login-form">
+                    <h3 class="title1">用户登录</h3>
+                    <el-form-item>
+                        <el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号"
+                            prefix-icon="el-icon-user">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码"
+                            prefix-icon="el-icon-lock" show-password>
+                        </el-input>
+                        <!-- <span class="nopsw register" @click="forgetPwd = true">忘记密码 ？</span> -->
+                    </el-form-item>
+                    <el-form-item v-show="showMsg" style="margin-bottom:0;">
+                        <span class="text-danger">提示：用户名或密码错误，请重试！</span>
+                    </el-form-item>
 
-          <el-form-item>
-            <el-button type="primary" class="login-btn" v-loading="loading" @click="login">登 录</el-button>
-            <!--  <el-popover placement="top" width="400" trigger="click" v-model="loginCode" @show="codeShow">
+                    <el-form-item>
+                        <el-button type="primary" class="login-btn" v-loading="loading" @click="login">登 录</el-button>
+                        <!--  <el-popover placement="top" width="400" trigger="click" v-model="loginCode" @show="codeShow">
               <imgCodeRole @login="login" ref="imgCodeRole"></imgCodeRole>
               <el-button slot="reference" type="primary" class="login-btn" v-loading="loading">登 录</el-button>
             </el-popover> -->
-            <!--<router-link :to="{name: 'registUser'}"  target="_blank"  tag="a" class="register fl">个人注册</router-link>
+                        <!--<router-link :to="{name: 'registUser'}"  target="_blank"  tag="a" class="register fl">个人注册</router-link>
 						<router-link :to="{name: 'registOrg'}"  target="_blank"  tag="a" class="register fr">单位注册</router-link>-->
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
 
-    <el-dialog title="忘记密码" :visible.sync="forgetPwd">
-      <el-form :model="nopassword">
-        <el-form-item label="手机号">
-          <el-input v-model="nopassword.userPhone" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="用户名">
-          <el-input v-model="nopassword.userName" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="forgetPwd = false">取 消</el-button>
-        <el-button type="primary" @click="reGetPwd()">确 定</el-button>
-      </div>
-    </el-dialog>
+        <el-dialog title="忘记密码" :visible.sync="forgetPwd">
+            <el-form :model="nopassword">
+                <el-form-item label="手机号">
+                    <el-input v-model="nopassword.userPhone" autocomplete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="用户名">
+                    <el-input v-model="nopassword.userName" autocomplete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="forgetPwd = false">取 消</el-button>
+                <el-button type="primary" @click="reGetPwd()">确 定</el-button>
+            </div>
+        </el-dialog>
 
-  </div>
+    </div>
 </template>
 
 <script>
-  import {
-    doLogin,
-    getUserById,
-    imgCode
-  } from '@/api/user.js'
-  import user from '@/api/User/login.js'
-  import {
-    setToken,
-    getToken,
-    setSession
-  } from '@/utils/auth'
-  import imgCodeRole from '@/components/imgCodeRole/index.vue'
-  import qs from 'qs'
-  export default {
-    components: {
-      imgCodeRole
-    },
-    data() {
-      return {
-        loginForm: {
-          userName: '',
-          password: '',
+    import {
+        doLogin,
+        getUserById,
+        imgCode
+    } from '@/api/user.js'
+    import user from '@/api/User/login.js'
+    import {
+        setToken,
+        getToken,
+        setSession
+    } from '@/utils/auth'
+    import imgCodeRole from '@/components/imgCodeRole/index.vue'
+    import qs from 'qs'
+    export default {
+        components: {
+            imgCodeRole
         },
-        imgCode: '',
-        loading: false,
-        loginCode: false,
-        showMsg: false,
-        forgetPwd: false,
-        nopassword: {
-          userPhone: '',
-          userName: '',
+        data() {
+            return {
+                loginForm: {
+                    userName: '',
+                    password: '',
+                },
+                imgCode: '',
+                loading: false,
+                loginCode: false,
+                showMsg: false,
+                forgetPwd: false,
+                nopassword: {
+                    userPhone: '',
+                    userName: '',
+                },
+            }
         },
-      }
-    },
-    methods: {
-      login() {
-        console.log(66);
-        doLogin(this.loginForm).then((response) => {
-          if (response.code == 200) {
-            this.$router.push({
-              path: '/index'
-            })
-            this.loading = true
-            // this.getUserInfo(response.data.loginId)
-            window.sessionStorage.setItem('tokenName', response.data.tokenName)
-            window.sessionStorage.setItem('tokenValue', response.data.tokenValue)
-          }
+        methods: {
+            login() {
+                console.log(66);
+                doLogin(this.loginForm).then((response) => {
+                    if (response.code == 200) {
+                        this.$router.push({
+                            path: '/index'
+                        })
+                        this.loading = true
+                        // this.getUserInfo(response.data.loginId)
+                        window.sessionStorage.setItem('tokenName', response.data.tokenName)
+                        window.sessionStorage.setItem('tokenValue', response.data.tokenValue)
+                    }
 
-        }).catch(() => {
-          this.loading = true
-        })
+                }).catch(() => {
+                    this.loading = true
+                })
 
-      },
-      getUserInfo(id) {
-        getUserById(id).then((response) => {
-          if (response.code == 200) {
-            console.log(" response", response)
-              let user = response.data
-               // 结果存入缓存
-               window.sessionStorage.setItem('staffSid', user.staffSid)
-               window.sessionStorage.setItem('sid', user.sid)
-               window.sessionStorage.setItem('userName', user.userName)
-          }
+            },
+            getUserInfo(id) {
+                getUserById(id).then((response) => {
+                    if (response.code == 200) {
+                        console.log(" response", response)
+                        let user = response.data
+                        // 结果存入缓存
+                        window.sessionStorage.setItem('staffSid', user.staffSid)
+                        window.sessionStorage.setItem('sid', user.sid)
+                        window.sessionStorage.setItem('userName', user.userName)
+                    }
 
-        }).catch(() => {
-        })
+                }).catch(() => {})
 
-      },
-      codeShow() {
-        if (this.loginForm.password == '' || this.loginForm.userName == '') {
-          this.loginCode = false
-          this.showMsg = true
-          return
-        }
-        this.$refs.imgCodeRole.getCodeImage()
-      },
-      reGetPwd() {
-        user.reGetPwd(this.nopassword).then((res) => {})
-      },
-    },
-  }
+            },
+            codeShow() {
+                if (this.loginForm.password == '' || this.loginForm.userName == '') {
+                    this.loginCode = false
+                    this.showMsg = true
+                    return
+                }
+                this.$refs.imgCodeRole.getCodeImage()
+            },
+            reGetPwd() {
+                user.reGetPwd(this.nopassword).then((res) => {})
+            },
+        },
+    }
 </script>
 
 
 <style lang="scss">
-  .login {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-size: 100% 100%;
-    background-image: url(../../assets/home/bj.jpg);
-    background-position: center;
-    overflow: hidden;
+    .login {
+        position: relative;
+        width: 100%;
+        height: 100%;
+        background-size: 100% 100%;
+        background-image: url(../../assets/home/bj_new.jpg);
+        background-position: center;
+        overflow: hidden;
 
-    .logoTitle {
-      margin: 30px;
+        .logoTitle {
+            margin: 30px;
 
-      img {
-        width: 70px;
-      }
+            img {
+                width: 70px;
+            }
 
-      span {
-        font-size: 40px;
-        color: #191919;
-      }
+            span {
+                font-size: 40px;
+                color: #191919;
+            }
 
-      .title {
-        font-size: 25px;
-        font-family: Source Han Sans CN;
-        font-weight: 500;
-        color: #191919;
-        margin: 0;
-      }
-    }
+            .title {
+                font-size: 25px;
+                font-family: Source Han Sans CN;
+                font-weight: 500;
+                color: #191919;
+                margin: 0;
+            }
+        }
 
-    .main {
-      width: 30%;
-      /*height: 640px;*/
-      background: #ffffff;
-      box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
-      opacity: 0.8;
-      border-radius: 20px;
-      position: absolute;
-      right: 15%;
-	  top:35%;
+        .main {
+            width: 30%;
+            /*height: 640px;*/
+            background: #ffffff;
+            box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
+            opacity: 0.8;
+            border-radius: 20px;
+            position: absolute;
+            right: 15%;
+            top: 35%;
 
-      .content {
-        position: relative;
-        /*.title-h3{
+            .content {
+                position: relative;
+                /*.title-h3{
 					width: 100%;
 					text-align: center;
 					color: #FFFFFF;
@@ -193,87 +193,87 @@
 					top: -65px;
 
 				}*/
-      }
+            }
+        }
     }
-  }
 
-  .login-form {
-    padding: 30px 50px;
+    .login-form {
+        padding: 30px 50px;
 
-    .title1 {
-      margin: 0px auto 30px auto;
-      text-align: center;
-      font-size: 20px;
-      color: #191919;
-      font-size: 23px;
-      font-weight: 500;
-    }
+        .title1 {
+            margin: 0px auto 30px auto;
+            text-align: center;
+            font-size: 20px;
+            color: #191919;
+            font-size: 23px;
+            font-weight: 500;
+        }
 
-    .el-input {
-      border: none;
-      background-color: transparent;
-    }
+        .el-input {
+            border: none;
+            background-color: transparent;
+        }
 
-    .code {
-      position: absolute;
-      top: 3px;
-      right: 5px;
-      width: 35%;
-      height: 35px;
-      cursor: pointer;
-      z-index: 9;
-    }
+        .code {
+            position: absolute;
+            top: 3px;
+            right: 5px;
+            width: 35%;
+            height: 35px;
+            cursor: pointer;
+            z-index: 9;
+        }
 
-    .nopsw {
-      position: absolute;
-      bottom: -30px;
-      right: 5px;
-      color: #018ad2;
-      font-size: 15px;
-      line-height: 30px;
-    }
+        .nopsw {
+            position: absolute;
+            bottom: -30px;
+            right: 5px;
+            color: #018ad2;
+            font-size: 15px;
+            line-height: 30px;
+        }
 
-    .register {
-      color: #EE640C;
-    }
+        .register {
+            color: #155B2D;
+        }
 
-    .register:hover,
-    .nopsw:hover {
-      cursor: pointer;
-    }
+        .register:hover,
+        .nopsw:hover {
+            cursor: pointer;
+        }
 
-    .btn-eye {
-      cursor: pointer;
-    }
+        .btn-eye {
+            cursor: pointer;
+        }
 
-    .text-danger {
-      color: #f56c6c;
-    }
+        .text-danger {
+            color: #57B545;
+        }
 
-    .login-btn {
-      margin: 10px 0 10px 0;
-      width: 100%;
-      background-color: #EE640C;
-      border: 0;
-    }
+        .login-btn {
+            margin: 10px 0 10px 0;
+            width: 100%;
+            background-color: #57B545;
+            border: 0;
+        }
 
-    .login-btn:hover {
-      background-color: #EE640C;
-      border: 0;
-    }
+        .login-btn:hover {
+            background-color: #155B2D;
+            border: 0;
+        }
 
-    .el-input--prefix .el-input__inner {
-      border: 1px solid #EE640C;
-      background: transparent;
-      color: #333 !important;
-    }
+        .el-input--prefix .el-input__inner {
+            border: 1px solid #57B545;
+            background: transparent;
+            color: #333 !important;
+        }
 
-    .el-form-item {
-      margin-bottom: 40px;
-    }
+        .el-form-item {
+            margin-bottom: 40px;
+        }
 
-    .el-loading-mask {
-      background-color: rgba(255, 255, 255, 0.6);
+        .el-loading-mask {
+            background-color: rgba(255, 255, 255, 0.6);
+        }
     }
-  }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/orderreserve/index.vue b/src/views/orderreserve/index.vue
index 1479d75..f6b2c61 100644
--- a/src/views/orderreserve/index.vue
+++ b/src/views/orderreserve/index.vue
@@ -1,21 +1,35 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="预约单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">
-            {{ searchxianshitit }}
-          </el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header">
-              <el-form-item label="预约开始日期">
-                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="预约结束日期">
-                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="所属支行">
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="预约单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约日期">
+                                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                                至
+                                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+
+                            <el-form-item label="收货地址">
+                                <el-input v-model="page.params.userAddress" placeholder="" clearable />
+                            </el-form-item>
+                            <el-form-item label="客户名称">
+                                <el-input v-model="page.params.userName" placeholder="" clearable />
+                            </el-form-item>
+                            <el-form-item label="联系电话">
+                                <el-input v-model="page.params.userPhone" placeholder="" clearable />
+                            </el-form-item>
+                            <el-form-item label="商品名称">
+                                <el-input v-model="page.params.goodsName" placeholder="" clearable />
+                            </el-form-item>
+                            <!--  <el-form-item label="所属支行">
                 <el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%" @change="bankSelect">
                   <el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
                 </el-select>
@@ -29,251 +43,260 @@
                 <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
                   <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
-              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </div>
-          </div>
-        </div>
-        <!-- Start 项目列表头部 -->
-        <div class="listtop">
-          <div class="tit">预约单列表</div>
-        </div>
-        <!-- End 项目列表头部 -->
-        <!-- Start 项目列表 -->
-        <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <!--            <el-table-column label="操作" align="center" width="120">
+              </el-form-item> -->
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">预约单列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!--            <el-table-column label="操作" align="center" width="120">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
               </template>
             </el-table-column> -->
-            <el-table-column prop="reserveDate" label="预约日期" align="center" />
-            <el-table-column prop="bankName" label="所属支行" align="center" />
-            <el-table-column prop="storeName" label="提货点" align="center" />
-            <el-table-column prop="brandName" label="菜窖分类" align="center" />
-            <el-table-column prop="userName" label="用户名称" align="center" />
-            <el-table-column prop="userPhone" label="联系电话" align="center" />
-            <el-table-column prop="goodsName" label="商品名称" align="center" />
-            <el-table-column prop="goodsNumber" label="商品数量" align="center" />
-            <el-table-column prop="customerBank" label="客户所属支行" align="center" />
-          </el-table>
-        </div>
-        <!-- End 项目列表 -->
-        <div class="pages">
-          <div class="tit" />
-          <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current" :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <!-- <el-table-column prop="bankName" label="所属支行" align="center" /> -->
+                        <!-- <el-table-column prop="storeName" label="提货点" align="center" />
+                        <el-table-column prop="brandName" label="菜窖分类" align="center" /> -->
+                        <el-table-column prop="userAddress" label="收货地址" align="left" header-align="center"
+                            width="400" />
+                        <el-table-column prop="userName" label="客户名称" align="center" />
+                        <el-table-column prop="userPhone" label="联系电话" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="left" header-align="center" width="250" />
+                        <el-table-column prop="gg" label="商品规格" align="center" />
+                        <el-table-column prop="remarks" label="包装规格" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <!-- <el-table-column prop="customerBank" label="客户所属支行" align="center" /> -->
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     </div>
-    <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-  </div>
 </template>
 
 <script>
-  import req from '@/api/lpk/reserveorder.js'
-  import reqBank from '@/api/lpk/bank.js'
-	import reqMall from '@/api/adminmallapi.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import divAdd from './indexInfo.vue'
-  export default {
-    name: 'OrderreserveIndex',
-    components: {
-      ButtonBar,
-      Pagination,
-      divAdd
-    },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'success',
-            size: 'small',
-            icon: 'export',
-            btnKey: 'build',
-            btnLabel: '导出'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        page: {
-          total: 0, // 默认数据总数
-          current: 1, // 默认开始页面
-          size: 10, // 每页的数据条数
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            bankSid: '',
-            cardType: ''
-          }
+    import req from '@/api/lpk/reserveorder.js'
+    import reqBank from '@/api/lpk/bank.js'
+    import reqMall from '@/api/adminmallapi.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import divAdd from './indexInfo.vue'
+    export default {
+        name: 'OrderreserveIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            divAdd
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        userAddress: '',
+                        userName: '',
+                        userPhone: '',
+                        goodsName: '',
+                    }
+                },
+                brandList: [],
+                bankList: [],
+                storeList: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            // this.initBank()
+            // this.initStore()
+            // this.initBrand()
+            // this.getAllStore()
+            // this.loadList()
+            // this.getBankList()
         },
-        brandList: [],
-        bankList: [],
-        storeList: []
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.initBank()
-      this.initStore()
-      this.initBrand()
-      // this.getAllStore()
-      // this.loadList()
-      // this.getBankList()
-    },
-    methods: {
-      initBank() {
-        reqBank.listBankAll()
-          .then(resp => {
-            this.bankList = resp.data
-          })
-      },
-      initStore() {
-        reqBank.listStoreOfBank(this.page.params.bankSid)
-          .then(resp => {
-            this.storeList = resp.data
-          })
-      },
-      initBrand() {
-        reqMall.listAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-      },
+        methods: {
+            initBank() {
+                reqBank.listBankAll()
+                    .then(resp => {
+                        this.bankList = resp.data
+                    })
+            },
+            initStore() {
+                reqBank.listStoreOfBank(this.page.params.bankSid)
+                    .then(resp => {
+                        this.storeList = resp.data
+                    })
+            },
+            initBrand() {
+                reqMall.listAllBrand().then(resp => {
+                    this.brandList = resp.data
+                })
+            },
 
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'build': // 导出
-            this.doBuild()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
-        }
-      },
-      bankSelect(val) {
-        console.log('>>>>>>>>>bankSelect', val)
-        this.page.params.bankSid = val
-        this.page.params.store = ''
-        this.initStore()
-      },
-      loadList() {
-        this.tableLoading = true
-        req.pageOfCustomer(this.page).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.page.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.page.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+                this.page.params.store = ''
+                this.initStore()
+            },
+            loadList() {
+                this.tableLoading = true
+                req.pageOfCustomer(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.page.current - 1) * this.page.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.page.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.page = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            bankSid: '',
-            cardType: ''
-          }
-        }
-        this.loadList()
-      },
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        userAddress: '',
+                        userName: '',
+                        userPhone: '',
+                        goodsName: '',
+                    }
+                }
+                this.loadList()
+            },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-      // 导出
-      doBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
-        req.expExcelOfCustomer(this.page.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
-          const fileName = '预约单明细_' + this.page.params.startDate + '.xlsx'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
-      }
+                req.expExcelOfCustomer(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    })
+                    const fileName = '预约单明细_' + this.page.params.startDate + '.xlsx'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            }
 
+        }
     }
-  }
 </script>
 <style scoped>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/pms/brand/components/BrandDetail.vue b/src/views/pms/brand/components/BrandDetail.vue
index b4a0526..9df8e2f 100644
--- a/src/views/pms/brand/components/BrandDetail.vue
+++ b/src/views/pms/brand/components/BrandDetail.vue
@@ -1,171 +1,177 @@
 <template>
-  <div class="main-content">
-    <el-card class="form-container" shadow="never">
-      <el-form ref="brandFrom" :model="brand" :rules="rules" label-width="150px">
-        <el-form-item label="品牌名称：" prop="name">
-          <el-input v-model="brand.name" />
-        </el-form-item>
-        <el-form-item label="品牌首字母：">
-          <el-input v-model="brand.firstLetter" />
-        </el-form-item>
-        <el-form-item label="品牌LOGO：" prop="logo">
-          <single-upload v-model="brand.logo" />
-        </el-form-item>
-        <el-form-item label="品牌专区大图：">
-          <single-upload v-model="brand.bigPic" />
-        </el-form-item>
-        <el-form-item label="品牌故事：">
-          <el-input v-model="brand.brandStory" placeholder="请输入内容" type="textarea" :autosize="true" />
-        </el-form-item>
-        <el-form-item label="排序：" prop="sort">
-          <el-input v-model.number="brand.sort" />
-        </el-form-item>
-        <el-form-item label="是否显示：">
-          <el-radio-group v-model="brand.showStatus">
-            <el-radio :label="1">是</el-radio>
-            <el-radio :label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="品牌制造商：">
-          <el-radio-group v-model="brand.factoryStatus">
-            <el-radio :label="1">是</el-radio>
-            <el-radio :label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="起始销售数量：">
-          <el-input v-model="brand.qssl" />
-        </el-form-item>
-        <el-form-item label="订购协议：">
-          <el-input v-model="brand.dgxy" type="textarea" :rows="6" />
-		  <!-- <textarea v-model="brand.dgxy" style="width: 100%;" :rows="6"></textarea> -->
-        </el-form-item>
-		<el-form-item label="起订协议：">
-		  <el-input v-model="brand.qdxy" type="textarea" :rows="6" />
-		    <!-- <textarea v-model="brand.qdxy"></textarea> -->
-		</el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit('brandFrom')">提交</el-button>
-          <el-button type="primary" @click="onClose('brandFrom')">关闭</el-button>
-          <el-button v-if="!isEdit" @click="resetForm('brandFrom')">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </div>
+    <div class="main-content">
+        <el-card class="form-container" shadow="never">
+            <el-form ref="brandFrom" :model="brand" :rules="rules" label-width="150px">
+                <el-form-item label="品牌名称：" prop="name">
+                    <el-input v-model="brand.name" />
+                </el-form-item>
+                <el-form-item label="品牌首字母：">
+                    <el-input v-model="brand.firstLetter" />
+                </el-form-item>
+                <el-form-item label="品牌LOGO：" prop="logo">
+                    <single-upload v-model="brand.logo" />
+                </el-form-item>
+                <el-form-item label="品牌专区大图：">
+                    <single-upload v-model="brand.bigPic" />
+                </el-form-item>
+                <el-form-item label="品牌故事：">
+                    <el-input v-model="brand.brandStory" placeholder="请输入内容" type="textarea" :autosize="true" />
+                </el-form-item>
+                <el-form-item label="排序：" prop="sort">
+                    <el-input v-model.number="brand.sort" />
+                </el-form-item>
+                <el-form-item label="是否配送：">
+                    <el-radio-group v-model="brand.delivery">
+                        <el-radio :label="'1'">配送</el-radio>
+                        <el-radio :label="'0'">不配送</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="是否显示：">
+                    <el-radio-group v-model="brand.showStatus">
+                        <el-radio :label="1">是</el-radio>
+                        <el-radio :label="0">否</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!--   <el-form-item label="品牌制造商：">
+                    <el-radio-group v-model="brand.factoryStatus">
+                        <el-radio :label="1">是</el-radio>
+                        <el-radio :label="0">否</el-radio>
+                    </el-radio-group>
+                </el-form-item> -->
+                <el-form-item label="起始销售数量：">
+                    <el-input v-model="brand.qssl" />
+                </el-form-item>
+                <el-form-item label="订购协议：">
+                    <el-input v-model="brand.dgxy" type="textarea" :rows="6" />
+                    <!-- <textarea v-model="brand.dgxy" style="width: 100%;" :rows="6"></textarea> -->
+                </el-form-item>
+                <el-form-item label="起订协议：">
+                    <el-input v-model="brand.qdxy" type="textarea" :rows="6" />
+                    <!-- <textarea v-model="brand.qdxy"></textarea> -->
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="onSubmit('brandFrom')">提交</el-button>
+                    <el-button type="primary" @click="onClose('brandFrom')">关闭</el-button>
+                    <el-button v-if="!isEdit" @click="resetForm('brandFrom')">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+    </div>
 </template>
 <script>
-  import {
-    createBrand,
-    getBrand,
-    updateBrand
-  } from '@/api/brand'
-  import SingleUpload from '@/components/Upload/singleUpload'
-  const defaultBrand = {
-    bigPic: '',
-    brandStory: '',
-    factoryStatus: 0,
-    firstLetter: '',
-    logo: '',
-    name: '',
-    showStatus: 0,
-    sort: 0,
-    qssl: 0,
-    dgxy: ''
-  }
-  export default {
-    name: 'BrandDetail',
-    components: {
-      SingleUpload
-    },
-    props: {
-      isEdit: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data() {
-      return {
-        brand: Object.assign({}, defaultBrand),
-        rules: {
-          name: [{
-              required: true,
-              message: '请输入品牌名称',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 140,
-              message: '长度在 2 到 140 个字符',
-              trigger: 'blur'
+    import {
+        createBrand,
+        getBrand,
+        updateBrand
+    } from '@/api/brand'
+    import SingleUpload from '@/components/Upload/singleUpload'
+    const defaultBrand = {
+        bigPic: '',
+        brandStory: '',
+        factoryStatus: 0,
+        firstLetter: '',
+        logo: '',
+        name: '',
+        showStatus: 0,
+        sort: 0,
+        qssl: 0,
+        dgxy: ''
+    }
+    export default {
+        name: 'BrandDetail',
+        components: {
+            SingleUpload
+        },
+        props: {
+            isEdit: {
+                type: Boolean,
+                default: false
             }
-          ],
+        },
+        data() {
+            return {
+                brand: Object.assign({}, defaultBrand),
+                rules: {
+                    name: [{
+                            required: true,
+                            message: '请输入品牌名称',
+                            trigger: 'blur'
+                        },
+                        {
+                            min: 2,
+                            max: 140,
+                            message: '长度在 2 到 140 个字符',
+                            trigger: 'blur'
+                        }
+                    ],
 
-          sort: [{
-            type: 'number',
-            message: '排序必须为数字'
-          }]
-        }
-      }
-    },
-    created() {
-      if (this.isEdit) {
-        getBrand(this.$route.query.id).then(response => {
-          this.brand = response.data
-        })
-      } else {
-        this.brand = Object.assign({}, defaultBrand)
-      }
-    },
-    methods: {
-      onSubmit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.$confirm('是否提交数据', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              if (this.isEdit) {
-                updateBrand(this.$route.query.id, this.brand).then(response => {
-                  this.$refs[formName].resetFields()
-                  this.$message({
-                    message: '修改成功',
-                    type: 'success',
-                    duration: 1000
-                  })
-                  this.$router.back()
+                    sort: [{
+                        type: 'number',
+                        message: '排序必须为数字'
+                    }]
+                }
+            }
+        },
+        created() {
+            if (this.isEdit) {
+                getBrand(this.$route.query.id).then(response => {
+                    this.brand = response.data
                 })
-              } else {
-                createBrand(this.brand).then(response => {
-                  this.$refs[formName].resetFields()
-                  this.brand = Object.assign({}, defaultBrand)
-                  this.$message({
-                    message: '提交成功',
-                    type: 'success',
-                    duration: 1000
-                  })
+            } else {
+                this.brand = Object.assign({}, defaultBrand)
+            }
+        },
+        methods: {
+            onSubmit(formName) {
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        this.$confirm('是否提交数据', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            if (this.isEdit) {
+                                updateBrand(this.$route.query.id, this.brand).then(response => {
+                                    this.$refs[formName].resetFields()
+                                    this.$message({
+                                        message: '修改成功',
+                                        type: 'success',
+                                        duration: 1000
+                                    })
+                                    this.$router.back()
+                                })
+                            } else {
+                                createBrand(this.brand).then(response => {
+                                    this.$refs[formName].resetFields()
+                                    this.brand = Object.assign({}, defaultBrand)
+                                    this.$message({
+                                        message: '提交成功',
+                                        type: 'success',
+                                        duration: 1000
+                                    })
+                                })
+                            }
+                        })
+                    } else {
+                        this.$message({
+                            message: '验证失败',
+                            type: 'error',
+                            duration: 1000
+                        })
+                        return false
+                    }
                 })
-              }
-            })
-          } else {
-            this.$message({
-              message: '验证失败',
-              type: 'error',
-              duration: 1000
-            })
-            return false
-          }
-        })
-      },
-      resetForm(formName) {
-        this.$refs[formName].resetFields()
-        this.brand = Object.assign({}, defaultBrand)
-      },
-	  onClose(){
-		  this.$store.dispatch('tagsView/delView', this.$route)
-		  this.$router.go(-1)
-	  }
+            },
+            resetForm(formName) {
+                this.$refs[formName].resetFields()
+                this.brand = Object.assign({}, defaultBrand)
+            },
+            onClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            }
+        }
     }
-  }
 </script>
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 4aebb36..afeac8c 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -1,313 +1,292 @@
 <template>
-  <div class="app-container">
-    <div class="main-content">
-      <el-card class="filter-container" shadow="never">
-        <div>
-          <i class="el-icon-search" />
-          <span>筛选搜索</span>
-          <el-button
-            style="float: right"
-            type="primary"
-            size="small"
-            @click="searchBrandList()"
-          >
-            查询结果
-          </el-button>
+    <div class="app-container">
+        <div class="main-content">
+            <el-card class="filter-container" shadow="never">
+                <div>
+                    <i class="el-icon-search" />
+                    <span>筛选搜索</span>
+                    <el-button style="float: right" type="primary" size="small" @click="searchBrandList()">
+                        查询结果
+                    </el-button>
+                </div>
+                <div style="margin-top: 15px">
+                    <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+                        <el-form-item label="输入搜索：">
+                            <el-input v-model="listQuery.name" style="width: 203px" placeholder="品牌名称/关键字" />
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </el-card>
+            <el-card class="operate-container" shadow="never">
+                <i class="el-icon-tickets" />
+                <span>数据列表</span>
+                <el-button class="btn-add" size="mini" @click="addBrand()">
+                    添加
+                </el-button>
+            </el-card>
+            <div class="table-container">
+                <el-table ref="brandTable" v-loading="listLoading" :data="list" style="width: 100%" border
+                    @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="60" align="center" />
+                    <el-table-column label="编号" width="100" align="center">
+                        <template slot-scope="scope">{{ scope.row.id }}</template>
+                    </el-table-column>
+                    <el-table-column label="品牌名称" align="center">
+                        <template slot-scope="scope">{{ scope.row.name }}</template>
+                    </el-table-column>
+                    <el-table-column label="品牌首字母" width="150" align="center">
+                        <template slot-scope="scope">{{ scope.row.firstLetter }}</template>
+                    </el-table-column>
+                    <el-table-column label="排序" width="100" align="center">
+                        <template slot-scope="scope">{{ scope.row.sort }}</template>
+                    </el-table-column>
+                    <el-table-column label="是否配送" width="180" align="center">
+                        <template slot-scope="scope">
+                            <el-switch v-model="scope.row.delivery" active-text="配送" inactive-text="不配送"
+                                :active-value="'1'" :inactive-value="'0'"
+                                @change="handleDeliveryChange(scope.$index, scope.row)" />
+                        </template>
+                    </el-table-column>
+                    <!--   <el-table-column label="品牌制造商" width="150" align="center">
+                        <template slot-scope="scope">
+                            <el-switch v-model="scope.row.factoryStatus" :active-value="1" :inactive-value="0"
+                                @change="handleFactoryStatusChange(scope.$index, scope.row)" />
+                        </template>
+                    </el-table-column> -->
+                    <el-table-column label="是否显示" width="100" align="center">
+                        <template slot-scope="scope">
+                            <el-switch v-model="scope.row.showStatus" :active-value="1" :inactive-value="0"
+                                @change="handleShowStatusChange(scope.$index, scope.row)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="相关" width="220" align="center">
+                        <template slot-scope="scope">
+                            <span>商品：</span>
+                            <el-button size="mini" type="text" @click="getProductList(scope.$index, scope.row)">100
+                            </el-button>
+                            <span>评价：</span>
+                            <el-button size="mini" type="text"
+                                @click="getProductCommentList(scope.$index, scope.row)">1000
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="200" align="center">
+                        <template slot-scope="scope">
+                            <el-button size="mini" @click="handleUpdate(scope.$index, scope.row)">编辑
+                            </el-button>
+                            <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <!-- <div class="batch-operate-container">
+                <el-select v-model="operateType" size="small" placeholder="批量操作">
+                    <el-option v-for="item in operates" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+                <el-button style="margin-left: 20px" class="search-button" type="primary" size="small"
+                    @click="handleBatchOperate()">
+                    确定
+                </el-button>
+            </div> -->
+            <div class="pagination-container">
+                <el-pagination background layout="total, sizes,prev, pager, next,jumper" :page-size="listQuery.pageSize"
+                    :page-sizes="[5,10,15]" :current-page.sync="listQuery.pageNum" :total="total"
+                    @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+            </div>
         </div>
-        <div style="margin-top: 15px">
-          <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-            <el-form-item label="输入搜索：">
-              <el-input v-model="listQuery.name" style="width: 203px" placeholder="品牌名称/关键字" />
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
-      <el-card class="operate-container" shadow="never">
-        <i class="el-icon-tickets" />
-        <span>数据列表</span>
-        <el-button
-          class="btn-add"
-          size="mini"
-          @click="addBrand()"
-        >
-          添加
-        </el-button>
-      </el-card>
-      <div class="table-container">
-        <el-table
-          ref="brandTable"
-          v-loading="listLoading"
-          :data="list"
-          style="width: 100%"
-          border
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="60" align="center" />
-          <el-table-column label="编号" width="100" align="center">
-            <template slot-scope="scope">{{ scope.row.id }}</template>
-          </el-table-column>
-          <el-table-column label="品牌名称" align="center">
-            <template slot-scope="scope">{{ scope.row.name }}</template>
-          </el-table-column>
-          <el-table-column label="品牌首字母" width="100" align="center">
-            <template slot-scope="scope">{{ scope.row.firstLetter }}</template>
-          </el-table-column>
-          <el-table-column label="排序" width="100" align="center">
-            <template slot-scope="scope">{{ scope.row.sort }}</template>
-          </el-table-column>
-          <el-table-column label="品牌制造商" width="100" align="center">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.factoryStatus"
-                :active-value="1"
-                :inactive-value="0"
-                @change="handleFactoryStatusChange(scope.$index, scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="是否显示" width="100" align="center">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.showStatus"
-                :active-value="1"
-                :inactive-value="0"
-                @change="handleShowStatusChange(scope.$index, scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="相关" width="220" align="center">
-            <template slot-scope="scope">
-              <span>商品：</span>
-              <el-button
-                size="mini"
-                type="text"
-                @click="getProductList(scope.$index, scope.row)"
-              >100
-              </el-button>
-              <span>评价：</span>
-              <el-button
-                size="mini"
-                type="text"
-                @click="getProductCommentList(scope.$index, scope.row)"
-              >1000
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="200" align="center">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                @click="handleUpdate(scope.$index, scope.row)"
-              >编辑
-              </el-button>
-              <el-button
-                size="mini"
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="batch-operate-container">
-        <el-select
-          v-model="operateType"
-          size="small"
-          placeholder="批量操作"
-        >
-          <el-option
-            v-for="item in operates"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-        <el-button
-          style="margin-left: 20px"
-          class="search-button"
-          type="primary"
-          size="small"
-          @click="handleBatchOperate()"
-        >
-          确定
-        </el-button>
-      </div>
-      <div class="pagination-container">
-        <el-pagination
-          background
-          layout="total, sizes,prev, pager, next,jumper"
-          :page-size="listQuery.pageSize"
-          :page-sizes="[5,10,15]"
-          :current-page.sync="listQuery.pageNum"
-          :total="total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
-      </div>
     </div>
-  </div>
 </template>
 <script>
-  import { fetchList, updateShowStatus, updateFactoryStatus, deleteBrand } from '@/api/brand'
+    import {
+        fetchList,
+        updateDelivery,
+        updateShowStatus,
+        updateFactoryStatus,
+        deleteBrand
+    } from '@/api/brand'
 
-  export default {
-    name: 'BrandList',
-    data() {
-      return {
-        operates: [
+    export default {
+        name: 'BrandList',
+        data() {
+            return {
+                operates: [
 
-        ],
-        operateType: null,
-        listQuery: {
-          keyword: null,
-          pageNum: 1,
-          pageSize: 10
+                ],
+                operateType: null,
+                listQuery: {
+                    keyword: null,
+                    pageNum: 1,
+                    pageSize: 10
+                },
+                list: null,
+                total: null,
+                listLoading: true,
+                multipleSelection: []
+            }
         },
-        list: null,
-        total: null,
-        listLoading: true,
-        multipleSelection: []
-      }
-    },
-    created() {
-      this.getList()
-    },
-    methods: {
-      getList() {
-        this.listLoading = true
-        fetchList(this.listQuery).then(response => {
-          this.listLoading = false
-          this.list = response.data.records
-          this.total = response.data.total
-          this.totalPage = response.data.pages
-          this.pageSize = response.data.size
-        })
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val
-      },
-      handleUpdate(index, row) {
-        this.$router.push({ path: '/pms/updateBrand', query: { id: row.id }})
-      },
-      handleDelete(index, row) {
-        this.$confirm('是否要删除该品牌', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteBrand(row.id).then(response => {
-            this.$message({
-              message: '删除成功',
-              type: 'success',
-              duration: 1000
-            })
+        created() {
             this.getList()
-          })
-        })
-      },
-      getProductList(index, row) {
-        console.log(index, row)
-      },
-      getProductCommentList(index, row) {
-        console.log(index, row)
-      },
-      handleFactoryStatusChange(index, row) {
-        var data = new URLSearchParams()
-        data.append('ids', row.id)
-        data.append('factoryStatus', row.factoryStatus)
-        updateFactoryStatus(data).then(response => {
-          this.$message({
-            message: '修改成功',
-            type: 'success',
-            duration: 1000
-          })
-        }).catch(error => {
-          if (row.factoryStatus === 0) {
-            row.factoryStatus = 1
-          } else {
-            row.factoryStatus = 0
-          }
-        })
-      },
-      handleShowStatusChange(index, row) {
-        const data = new URLSearchParams()
+        },
+        methods: {
+            getList() {
+                this.listLoading = true
+                fetchList(this.listQuery).then(response => {
+                    this.listLoading = false
+                    this.list = response.data.records
+                    this.total = response.data.total
+                    this.totalPage = response.data.pages
+                    this.pageSize = response.data.size
+                })
+            },
+            handleSelectionChange(val) {
+                this.multipleSelection = val
+            },
+            handleUpdate(index, row) {
+                this.$router.push({
+                    path: '/pms/updateBrand',
+                    query: {
+                        id: row.id
+                    }
+                })
+            },
+            handleDelete(index, row) {
+                this.$confirm('是否要删除该品牌', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    deleteBrand(row.id).then(response => {
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success',
+                            duration: 1000
+                        })
+                        this.getList()
+                    })
+                })
+            },
+            getProductList(index, row) {
+                console.log(index, row)
+            },
+            getProductCommentList(index, row) {
+                console.log(index, row)
+            },
+            handleDeliveryChange(index, row) {
+                var data = new URLSearchParams()
+                data.append('ids', row.id)
+                data.append('delivery', row.delivery)
+                updateDelivery(data).then(response => {
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 1000
+                    })
+                }).catch(error => {
+                    if (row.delivery === 0) {
+                        row.delivery = 1
+                    } else {
+                        row.delivery = 0
+                    }
+                })
+            },
+            handleFactoryStatusChange(index, row) {
+                var data = new URLSearchParams()
+                data.append('ids', row.id)
+                data.append('factoryStatus', row.factoryStatus)
+                updateFactoryStatus(data).then(response => {
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 1000
+                    })
+                }).catch(error => {
+                    if (row.factoryStatus === 0) {
+                        row.factoryStatus = 1
+                    } else {
+                        row.factoryStatus = 0
+                    }
+                })
+            },
+            handleShowStatusChange(index, row) {
+                const data = new URLSearchParams()
 
-        data.append('ids', row.id)
-        data.append('showStatus', row.showStatus)
-        updateShowStatus(data).then(response => {
-          this.$message({
-            message: '修改成功',
-            type: 'success',
-            duration: 1000
-          })
-        }).catch(error => {
-          if (row.showStatus === 0) {
-            row.showStatus = 1
-          } else {
-            row.showStatus = 0
-          }
-        })
-      },
-      handleSizeChange(val) {
-        this.listQuery.pageNum = 1
-        this.listQuery.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.listQuery.pageNum = val
-        this.getList()
-      },
-      searchBrandList() {
-        this.listQuery.pageNum = 1
-        this.getList()
-      },
-      handleBatchOperate() {
-        console.log(this.multipleSelection)
-        if (this.multipleSelection < 1) {
-          this.$message({
-            message: '请选择一条记录',
-            type: 'warning',
-            duration: 1000
-          })
-          return
-        }
-        let showStatus = 0
-        if (this.operateType === 'showBrand') {
-          showStatus = 1
-        } else if (this.operateType === 'hideBrand') {
-          showStatus = 0
-        } else {
-          this.$message({
-            message: '请选择批量操作类型',
-            type: 'warning',
-            duration: 1000
-          })
-          return
+                data.append('ids', row.id)
+                data.append('showStatus', row.showStatus)
+                updateShowStatus(data).then(response => {
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 1000
+                    })
+                }).catch(error => {
+                    if (row.showStatus === 0) {
+                        row.showStatus = 1
+                    } else {
+                        row.showStatus = 0
+                    }
+                })
+            },
+            handleSizeChange(val) {
+                this.listQuery.pageNum = 1
+                this.listQuery.pageSize = val
+                this.getList()
+            },
+            handleCurrentChange(val) {
+                this.listQuery.pageNum = val
+                this.getList()
+            },
+            searchBrandList() {
+                this.listQuery.pageNum = 1
+                this.getList()
+            },
+            handleBatchOperate() {
+                console.log(this.multipleSelection)
+                if (this.multipleSelection < 1) {
+                    this.$message({
+                        message: '请选择一条记录',
+                        type: 'warning',
+                        duration: 1000
+                    })
+                    return
+                }
+                let showStatus = 0
+                if (this.operateType === 'showBrand') {
+                    showStatus = 1
+                } else if (this.operateType === 'hideBrand') {
+                    showStatus = 0
+                } else {
+                    this.$message({
+                        message: '请选择批量操作类型',
+                        type: 'warning',
+                        duration: 1000
+                    })
+                    return
+                }
+                const ids = []
+                for (let i = 0; i < this.multipleSelection.length; i++) {
+                    ids.push(this.multipleSelection[i].id)
+                }
+                const data = new URLSearchParams()
+                data.append('ids', ids)
+                data.append('showStatus', showStatus)
+                updateShowStatus(data).then(response => {
+                    this.getList()
+                    this.$message({
+                        message: '修改成功',
+                        type: 'success',
+                        duration: 1000
+                    })
+                })
+            },
+            addBrand() {
+                this.$router.push({
+                    path: '/pms/addBrand'
+                })
+            }
         }
-        const ids = []
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          ids.push(this.multipleSelection[i].id)
-        }
-        const data = new URLSearchParams()
-        data.append('ids', ids)
-        data.append('showStatus', showStatus)
-        updateShowStatus(data).then(response => {
-          this.getList()
-          this.$message({
-            message: '修改成功',
-            type: 'success',
-            duration: 1000
-          })
-        })
-      },
-      addBrand() {
-        this.$router.push({ path: '/pms/addBrand' })
-      }
     }
-  }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 
-</style>
-
+</style>
\ No newline at end of file