Merge branch 'ch/ht_3.0' of eta_mini/eta_mini_crm_front into master_ht

src/layout/components/LeftWrap.vue

@@ -170,6 +170,9 @@ function getMenuIcon(item){
 
 <style lang="scss" scoped>
 .left-wrap {
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+  overflow: hidden auto;
   --el-menu-bg-color: #fff;
   --el-menu-hover-bg-color: rgba(255, 255, 255, 0.15);
   --el-menu-text-color: #333;

src/views/customer/components/ReadDialog.vue

@@ -53,7 +53,7 @@ const tableColumns = [
         label:'品种',
         key:'PermissionNames',
         sortable:false,
-        widthsty:100
+        minwidthsty:100
     },{
         label:'最近一次点击时间',
         key:'ClickTime',
@@ -116,8 +116,7 @@ function handleSelectChange(){
   <el-dialog
     v-model="show"
     :close-on-click-modal="false"
-    :modal-append-to-body="false"
-    width="60%"
+    width="75%"
     draggable
     title="阅读详情"
   >

src/views/media/PictureLibrary.vue

@@ -81,13 +81,13 @@ function handlePageChange(page){
 function handleUploadImg(file){
     //图片大小和格式限制
     const {size,type} = file.file
-    const sizeLimit = 500*1024
+    const sizeLimit = 5*1024*1024
     if(!['image/png','image/jpeg'].includes(type)){
         ElMessage.warning('仅支持png、jpg格式的图片')
         return
     }
     if(size>sizeLimit){
-        ElMessage.warning('资源库图片不能超过500kb')
+        ElMessage.warning('资源库图片不能超过5M')
         return
     }
     let form = new FormData();

src/views/media/components/MediaUpload.vue

@@ -184,13 +184,13 @@ async function handleSave(){
 function handleUploadImg(file){
     //图片大小和格式限制
     const {size,type} = file.file
-    const sizeLimit = 500*1024
+    const sizeLimit = 5*1024*1024
     if(!['image/png','image/jpeg'].includes(type)){
         ElMessage.warning('仅支持png、jpg格式的图片')
         return
     }
     if(size>sizeLimit){
-        ElMessage.warning('视频封面不能超过500kb')
+        ElMessage.warning('视频封面不能超过5M')
         return
     }
     let form = new FormData();

src/views/products/components/PackageDialog.vue

@@ -100,13 +100,13 @@ function handleClose() {
 function handleUploadImg(file){
     //图片大小和格式限制
     const {size,type} = file.file
-    const sizeLimit = 500*1024
+    const sizeLimit = 5*1024*1024
     if(!['image/png','image/jpeg'].includes(type)){
         ElMessage.warning('仅支持png、jpg格式的图片')
         return
     }
     if(size>sizeLimit){
-        ElMessage.warning('套餐封面不能超过500kb')
+        ElMessage.warning('套餐封面不能超过5M')
         return
     }
     let form = new FormData();

src/views/system/userList/Index.vue

@@ -184,7 +184,7 @@ function disabledTree(arr){
           <el-table-column label="操作" width="260">
             <template #default="{ row }">
               <el-button
-                v-if="row.SysRoleName!=='admin'"
+                v-if="row.SysUserName!=='admin'"
                 v-permission="'sysuser:userConfig'"
                 type="primary"
                 link