1、优化发布java代码流程，开源不易，开源统计请大家配合，谢谢。

2、修复bug
3、优化sql文件
4、短信回执

admin/package.json

@@ -2,7 +2,7 @@
   "name": "vue-element-admin",
   "version": "4.2.1",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
-  "author": "Pan <panfree23@gmail.com>",
+  "author": "CRMEB",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

admin/src/components/Category/list.vue

@@ -9,7 +9,6 @@
         :default-checked-keys="selectModelKeys"
         @check="handleSelectionChange"
       />
-      <!--        {{biztype}}-->
     </template>
     <template v-else>
       <div class="divBox">
@@ -88,7 +87,7 @@
               <el-table-column label="操作" min-width="200" fixed="right">
                 <template slot-scope="scope">
                   <el-button
-                    v-if="biztype.value!==3"
+                    v-if="biztype.value!==3 && scope.row.pid === 0"
                     type="text"
                     size="small"
                     @click="handleAddMenu(scope.row)"

admin/src/components/goodList/index.vue

@@ -7,6 +7,8 @@
             <el-cascader v-model="tableFrom.cateId" :options="merCateList" :props="props" clearable class="selWidth mr20" @change="getList"/>
           </el-form-item>
           <el-form-item label="商品搜索：">
+            <!--<el-input v-model="tableFrom.keywords" placeholder="请输入内容"></el-input>-->
+
             <el-input v-model="tableFrom.keywords" @input="onInput()" placeholder="请输入商品名称，关键字，产品编号" class="selWidth">
               <el-button slot="append" icon="el-icon-search" @click="getList"/>
             </el-input>
@@ -50,7 +52,7 @@
         label="ID"
         min-width="50"
       />
-      <el-table-column label="商品图" min-width="80">
+      <el-table-column label="商品图" width="80">
         <template slot-scope="scope">
           <div class="demo-image__preview">
             <el-image
@@ -64,17 +66,20 @@
       <el-table-column
         prop="storeName"
         label="商品名称"
-        min-width="250"
+        min-width="180"
       />
       <el-table-column
-      prop="cateId"
       label="商品分类"
-      min-width="90"
-      />
+      min-width="150"
+      >
+        <template slot-scope="scope">
+          <span v-for="(item, index) in scope.row.cateValues.split(',')" :key="index" class="mr10">{{ item }}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="block mb20">
       <el-pagination
-        :page-sizes="[5, 10, 20, 30]"
+        :page-sizes="[10, 20, 30, 40]"
         :page-size="tableFrom.limit"
         :current-page="tableFrom.page"
         layout="total, sizes, prev, pager, next, jumper"
@@ -120,7 +125,7 @@ export default {
       },
       tableFrom: {
         page: 1,
-        limit: 5,
+        limit: 10,
         cateId: '',
         keywords: '',
         type: '1'

admin/src/styles/styles.scss

@@ -206,7 +206,7 @@ table .el-image{
   margin-left: 40px !important;
 }
 .mr5{
-  margin-right: 5px;
+  margin-right: 5px !important;
 }
 .font14{
   font-size: 14px;

admin/src/views/dashboard/components/baseInfo.vue

@@ -155,7 +155,7 @@
   .down, .el-icon-caret-bottom {
     color: #39C15B;
     font-size: 12px;
-    opacity: 100% !important;
+    /*opacity: 100% !important;*/
   }
 
   .baseInfo {

admin/src/views/maintain/formConfig/index.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <div class="container">
-          <el-form inline size="small">
+          <el-form inline size="small" @submit.native.prevent>
             <el-form-item label="关键字">
               <el-input v-model="listPram.keywords" placeholder="请输入id，名称，描述" clearable class="selWidth" size="small">
                 <el-button slot="append" icon="el-icon-search" size="small" @click="handlerSearch" />

admin/src/views/marketing/coupon/list/index.vue

@@ -33,7 +33,7 @@
         <el-table-column
           prop="name"
           label="名称"
-          min-width="120"
+          min-width="180"
         />
         <el-table-column
           label="类型"

admin/src/views/store/index.vue

@@ -277,6 +277,16 @@ export default {
 </script>
 
 <style scoped lang="scss">
+  .demo-table-expand{
+    /deep/ label{
+      width: 82px;
+    }
+  }
+  .demo-table-expand{
+    /deep/ .el-form-item__content{
+      width: 77%;
+    }
+  }
   .selWidth{
     width: 350px !important;
   }

admin/src/views/systemSetting/administratorAuthority/adminList/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form ref="pram" :model="pram" :rules="rules" label-width="100px">
+    <el-form ref="pram" :model="pram" :rules="rules" label-width="100px" @submit.native.prevent>
       <el-form-item label="管理员账号" prop="account">
         <el-input v-model="pram.account" placeholder="管理员账号" />
       </el-form-item>

admin/src/views/systemSetting/administratorAuthority/adminList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <el-form inline size="small">
+      <el-form inline size="small" @submit.native.prevent>
         <el-form-item>
           <el-select v-model="listPram.roles" placeholder="身份" clearable class="selWidth">
             <el-option
@@ -39,43 +39,45 @@
           <el-button size="mini" type="primary" @click="handleSearch">查询</el-button>
         </el-form-item>
       </el-form>
-      <el-form inline>
+      <el-form inline @submit.native.prevent>
         <el-form-item>
           <el-button size="mini" type="primary" @click="handlerOpenEdit(0)">添加管理员</el-button>
         </el-form-item>
       </el-form>
       <el-table :data="listData.list" size="mini">
-        <el-table-column label="姓名" prop="realName" />
-        <el-table-column label="账号" prop="account" />
-        <el-table-column label="身份" prop="realName">
+        <el-table-column
+          prop="id"
+          label="ID"
+          width="50"
+        />
+        <el-table-column label="姓名" prop="realName" min-width="120"/>
+        <el-table-column label="账号" prop="account" min-width="120"/>
+        <el-table-column label="身份" prop="realName" min-width="230">
           <template slot-scope="scope">
-          <span v-for="item in roleList.list" :key="item.id">
-            <el-tag v-if="scope.row.roles.includes(item.id)" type="info">{{ item.roleName }}</el-tag>
-            <!--              <span>{{ scope.row }}</span>-->
-          </span>
+            <el-tag size="small" type="info" v-for="(item, index) in scope.row.roleNames.split(',')" class="mr5">{{ item }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="最后登录时间" prop="lastTime">
+        <el-table-column label="最后登录时间" prop="lastTime" min-width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.updateTime | filterEmpty }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="最后登录IP" prop="lastIp">
+        <el-table-column label="最后登录IP" prop="lastIp" min-width="150">
           <template slot-scope="scope">
             <span>{{ scope.row.lastIp | filterEmpty }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="状态" prop="status" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.status | filterShowOrHide }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="删除标记" prop="status" width="100">
+        <el-table-column label="删除标记" prop="status" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.isDel | filterYesOrNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" min-width="130"  fixed="right">
           <template slot-scope="scope">
             <template v-if="scope.row.isDel">
               <span>-</span>

admin/src/views/systemSetting/administratorAuthority/identityManager/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form ref="pram" :model="pram" label-width="100px">
+    <el-form ref="pram" :model="pram" label-width="100px" @submit.native.prevent>
       <el-form-item label="身份名称" prop="roleName" :rules="[{required:true,message:'请填写身份名称', trigger:['blur','change']}]">
         <el-input v-model="pram.roleName" placeholder="身份名称" />
       </el-form-item>

admin/src/views/systemSetting/administratorAuthority/identityManager/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <el-form inline size="small">
+      <el-form inline size="small" @submit.native.prevent>
         <el-form-item>
           <el-select v-model="listPram.status" placeholder="状态" clearable class="selWidth">
             <el-option
@@ -19,7 +19,7 @@
           <el-button size="mini" type="primary" @click.native="handleGetRoleList">查询</el-button>
         </el-form-item>
       </el-form>
-      <el-form inline>
+      <el-form inline @submit.native.prevent>
         <el-form-item>
           <el-button size="mini" type="primary" @click="handlerOpenEdit(0)">添加身份</el-button>
         </el-form-item>

admin/src/views/systemSetting/logistics/companyList/index.vue

@@ -57,6 +57,7 @@
             <el-switch
               v-model="scope.row.isShow"
               class="demo"
+              :active-value="1" :inactive-value="0"
               active-text="开启"
               inactive-text="关闭"
               @change="bindStatus(scope.row)"
@@ -158,6 +159,7 @@ export default {
         sort: item.sort
       }).then(res => {
         this.$message.success('操作成功')
+        this.getExpressList()
       }).catch(() => {
         item.isShow = !item.isShow
       })

admin/src/views/systemSetting/systemStore/clerkList/addClerk.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="id?'修改核销员':'添加核销员'"  :visible.sync="dialogFormVisible" width="750px" @close="cancel">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm" @submit.native.prevent>
       <el-form-item label="商城用户：" prop="avatar">
         <div class="publicPicBox" @click="upImg">
           {{ruleForm.avatar}}

admin/src/views/systemSetting/systemStore/clerkList/index.vue

@@ -3,7 +3,7 @@
     <el-card  class="box-card">
       <div slot="header" class="clearfix">
         <div class="container">
-          <el-form ref="form" inline :model="artFrom" size="small">
+          <el-form ref="form" inline :model="artFrom" size="small" @submit.native.prevent>
             <el-form-item label="提货点名称：">
               <el-select v-model="artFrom.storeId" placeholder="请选择" class="selWidth" clearable @change="search">
                 <el-option

admin/src/views/systemSetting/systemStore/point/addPoint.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="id?'修改提货点':'添加提货点'" :visible.sync="dialogFormVisible" width="750px" @close="cancel">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm" @submit.native.prevent>
       <el-form-item label="提货点名称：" prop="name">
         <el-input v-model="ruleForm.name" placeholder="请输入提货点名称" class="dialogWidth"></el-input>
       </el-form-item>

admin/src/views/systemSetting/systemStore/point/index.vue

@@ -7,7 +7,7 @@
            <el-tab-pane :label="'隐藏中的提货点('+ headerCount.hide +')'" name="0"></el-tab-pane>
            <el-tab-pane :label="'回收站的提货点('+ headerCount.recycle +')'" name="2"></el-tab-pane>
          </el-tabs>
-         <el-form ref="form" inline :model="artFrom">
+         <el-form ref="form" inline :model="artFrom" @submit.native.prevent>
            <el-form-item label="关键字：">
              <el-input v-model="artFrom.keywords" placeholder="请输入提货点名称/电话" class="selWidth" size="small">
                <el-button slot="append" icon="el-icon-search" @click="search" />