FEAT: sass-node 切换为sass

package.json

@@ -100,7 +100,7 @@
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "4.14.1",
+    "sass": "^1.32.13",
     "plop": "2.3.0",
     "runjs": "4.3.2",
     "sass-loader": "8.0.2",

src/components/HeaderSearch/index.vue

@@ -167,7 +167,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

src/components/LemonUI/components/chatrecords/basic.vue

@@ -2,7 +2,7 @@
 <div>
 
     <el-dialog   :visible.sync="dialogVisible" width="70%">
-        <div class="app-container">  
+        <div class="app-container">
              <el-form ref="form" :model="form" :inline="true"  label-width="80px">
                 <el-row>
                     <el-col :span="22">
@@ -21,7 +21,7 @@
              <el-tabs v-model="activeName" @tab-click="handleTabClick">
                 <el-tab-pane label="全部" name="first">
                     <SegRecords :qwUser="qwUser" :conversationId="conversationId" :conversationData="conversationData" :msgType=0  ref="sIMUI0" v-show="!showSearch"></SegRecords>
-                 
+
                     <SegRecords :qwUser="qwUser" :conversationId="conversationId" :conversationData="conversationData" :msgType=0  ref="sIMUI"  @showContextBox="showContextBox"  v-show="showSearch"  ></SegRecords>
                 </el-tab-pane>
 
@@ -37,7 +37,7 @@
                     <SegRecords :qwUser="qwUser" :conversationId="conversationId" :conversationData="conversationData" :msgType=3  ref="sIMUI3"></SegRecords>
                 </el-tab-pane>
             </el-tabs>
-          
+
         </div>
     </el-dialog>
 
@@ -61,7 +61,7 @@
   let pages = {};
   export default {
        name: "ChatRecords",
-       components: {   
+       components: {
           VideoPlayer,
           SegRecords
        },
@@ -98,7 +98,7 @@
                 isFromLogin:false,
                 dialogImgVisible:false,
                 dialogImageUrl: '',
-                dialogVideoVisible:false, 
+                dialogVideoVisible:false,
                 dialogVideoUrl:'',
                 dialogVideoCover:'',
                 imageArr:[],
@@ -132,10 +132,10 @@
            }
        },
        created(){
-           
+
        },
        mounted(){
-           
+
        },
        methods: {
                 handleTabClick(tab, event){
@@ -176,7 +176,7 @@
                     //IMUI.changeContact(this.queryParams.conversationId);
                     //this.getContacts();  //获取联系人信息
                     this.getConversation();   //获取会话信息
-                    ////IMUI.initEmoji(EmojiData); 
+                    ////IMUI.initEmoji(EmojiData);
                 },
                 open(qwUser,conversationId,conversationData){
                      this.dialogVisible=true;
@@ -198,11 +198,11 @@
                         this.roomInfo=response.detail;
                     });
                 },
-                getContacts(){  
+                getContacts(){
                     getContactsByUser(this.qwUser.userId).then(response => {
                         this.contactData = response.data;
                         this.$refs.IMUI.initContacts(this.contactData);
-                        
+
                     });
                 },
                 getConversation(){
@@ -279,7 +279,7 @@
                 },
                 //收到消息后添加消息显示
                 appendMessageAction(msgData){
-                    if(msgData.type=="text" || msgData.type=="image" || msgData.type=="voice"){     //文本   text  image  video  voice 
+                    if(msgData.type=="text" || msgData.type=="image" || msgData.type=="voice"){     //文本   text  image  video  voice
                         const message = {
                                 id: msgData.id,
                                 status: msgData.status,
@@ -324,8 +324,8 @@
                 console.log("Event:menu-avatar-click");
                 },
                 //聊天工具栏点击图片
-                handleImageClick() { 
-                
+                handleImageClick() {
+
                 },
                 //选择图片框确定按钮回调
                 handlePickImageDone(data){
@@ -348,11 +348,11 @@
                         var url=!!message.url?message.url:message.content;
                         this.handlePicturePreview(url);
                     }
-                    else if(message.type=="video"){  
+                    else if(message.type=="video"){
                         this.tooglePlayVideo(message);
                     }
-                    else if(message.type=="file"){  
-                        
+                    else if(message.type=="file"){
+
                     }
                     if (key == "status") {
                         instance.updateMessage({
@@ -490,7 +490,7 @@
        padding-top:0;
     }
     .imui-center{
-        margin-bottom:"60px"; 
+        margin-bottom:"60px";
         display: flex;
         align-items: center;
         justify-content: center;
@@ -523,26 +523,26 @@
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep.el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-form--inline .el-form-item{
+    ::v-deep.el-form--inline .el-form-item{
         display: flex;
     }
-    /deep/.el-form-item--medium .el-form-item__content{
+    ::v-deep.el-form-item--medium .el-form-item__content{
         flex: 1;
         margin-right: 20px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep.el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }
 
-    // /deep/.el-dialog__header{
+    // ::v-deep.el-dialog__header{
     //     padding-bottom: 0;
     // }
-    
+
 </style>
 
 
@@ -555,7 +555,7 @@
         padding:0 0 10px 0;
         .slot-group-notice
            padding: 10px 10px;
-     
+
       .slot-search
            width:calc(100% - 20px) ;
            margin:5px 10px;
@@ -572,11 +572,11 @@
               height: 30px;
               line-height: 30px;
               margin-right:5px;
-              img 
+              img
                 vertical-align: middle;
                 border-style: none;
                 width: 100%;
                 height: 100%;
                 line-height: 30px;
                 border-radius: 50%;
-</style>
+</style>

src/components/LemonUI/components/chatrecords/basic1.vue

@@ -2,7 +2,7 @@
 <div>
 
     <el-dialog   :visible.sync="dialogVisible" width="70%">
-        <div class="app-container">  
+        <div class="app-container">
              <el-form ref="form" :model="form" :inline="true"  label-width="80px">
                 <el-row>
                     <el-col :span="22">
@@ -19,11 +19,11 @@
               </el-form>
 
             <div class="imui-center qq-lemon-imui">
-                <lemon-records  class="lemon-slot"  
+                <lemon-records  class="lemon-slot"
                     :width="windowWidth"
                     :height="windowHeight"
                     :user="UserData"
-                    ref="IMUI"  
+                    ref="IMUI"
                     :theme="theme"
                     :hide-menu="hideMenu"
                     :hide-menu-avatar="hideMenuAvatar"
@@ -54,10 +54,10 @@
                                 <span style="font-size:12px;">
                                 <!-- <span>打开抽屉：</span>
                                 <span style="cursor:pointer;"  @click="openDrawer('right')">
-                                    右侧  | 
+                                    右侧  |
                                 </span>
                                 <span style="cursor:pointer;" @click="openDrawer('rightInside')">
-                                    右侧内部  | 
+                                    右侧内部  |
                                 </span>
                                 <span style="cursor:pointer;" @click="openDrawer('center')">
                                     居中
@@ -70,7 +70,7 @@
                                 <span>相册</span>
                                 <span>文件</span>
                                 <span>活动</span>
-                                <span>设置(左键弹出菜单)</span> 
+                                <span>设置(左键弹出菜单)</span>
                             </div> -->
                         </div>
                     </template>
@@ -78,7 +78,7 @@
 
             </div>
 
-            
+
         </div>
     </el-dialog>
 
@@ -90,10 +90,10 @@
                :close-on-click-modal="false"
                :destroy-on-close="true"
                :width="aplayer.pWidth"
-               :height="aplayer.height" 
+               :height="aplayer.height"
                @close="dialogVideoVisible=false"
                ref="player">
-              <videoPlayer  :width="aplayer.width" :height="aplayer.height"  :videoWidth="aplayer.videoWidth"  :videoHeight="aplayer.videoHeight"   :vid="aplayer.vid"  :autoplay="true" 
+              <videoPlayer  :width="aplayer.width" :height="aplayer.height"  :videoWidth="aplayer.videoWidth"  :videoHeight="aplayer.videoHeight"   :vid="aplayer.vid"  :autoplay="true"
                 :source="dialogVideoUrl" :cover="dialogVideoCover" ref="player">
               </videoPlayer>
        </el-dialog>
@@ -113,7 +113,7 @@
   let pages = {};
   export default {
        name: "ChatRecords",
-       components: {   
+       components: {
           VideoPlayer,
        },
        data(){
@@ -139,7 +139,7 @@
                 isFromLogin:false,
                 dialogImgVisible:false,
                 dialogImageUrl: '',
-                dialogVideoVisible:false, 
+                dialogVideoVisible:false,
                 dialogVideoUrl:'',
                 dialogVideoCover:'',
                 imageArr:[],
@@ -151,7 +151,7 @@
                     height:"900px",
                     videoWidth:"1000px",
                     videoHeight:"900px"
-                    
+
                 },
                 player: null,
                 roomMembers:[],
@@ -174,7 +174,7 @@
            }
        },
         created(){
-           
+
        },
        mounted(){
             this.deviceId=this.qwUser.deviceId;
@@ -185,14 +185,14 @@
        methods: {
                 /** 搜索按钮操作 */
                 handleQuery() {
-                   
+
                 },
                 init(){
                     const IMUI = this.$refs.IMUI;
                     //IMUI.changeContact(this.queryParams.conversationId);
                     //this.getContacts();  //获取联系人信息
                     this.getConversation();   //获取会话信息
-                    ////IMUI.initEmoji(EmojiData); 
+                    ////IMUI.initEmoji(EmojiData);
                 },
                 open(conversationId,conversationData){
                      this.conversationData=conversationData;
@@ -212,11 +212,11 @@
                         this.roomInfo=response.detail;
                     });
                 },
-                getContacts(){  
+                getContacts(){
                     getContactsByUser(this.qwUser.userId).then(response => {
                         this.contactData = response.data;
                         this.$refs.IMUI.initContacts(this.contactData);
-                        
+
                     });
                 },
                 getConversation(){
@@ -293,7 +293,7 @@
                 },
                 //收到消息后添加消息显示
                 appendMessageAction(msgData){
-                    if(msgData.type=="text" || msgData.type=="image" || msgData.type=="voice"){     //文本   text  image  video  voice 
+                    if(msgData.type=="text" || msgData.type=="image" || msgData.type=="voice"){     //文本   text  image  video  voice
                         const message = {
                                 id: msgData.id,
                                 status: msgData.status,
@@ -338,8 +338,8 @@
                 console.log("Event:menu-avatar-click");
                 },
                 //聊天工具栏点击图片
-                handleImageClick() { 
-                
+                handleImageClick() {
+
                 },
                 //选择图片框确定按钮回调
                 handlePickImageDone(data){
@@ -362,11 +362,11 @@
                         var url=!!message.url?message.url:message.content;
                         this.handlePicturePreview(url);
                     }
-                    else if(message.type=="video"){  
+                    else if(message.type=="video"){
                         this.tooglePlayVideo(message);
                     }
-                    else if(message.type=="file"){  
-                        
+                    else if(message.type=="file"){
+
                     }
                     if (key == "status") {
                         instance.updateMessage({
@@ -504,7 +504,7 @@
        padding-top:0;
     }
     .imui-center{
-        margin-bottom:"60px"; 
+        margin-bottom:"60px";
         display: flex;
         align-items: center;
         justify-content: center;
@@ -537,22 +537,22 @@
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep.el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-form--inline .el-form-item{
+    ::v-deep.el-form--inline .el-form-item{
         display: flex;
     }
-    /deep/.el-form-item--medium .el-form-item__content{
+    ::v-deep.el-form-item--medium .el-form-item__content{
         flex: 1;
         margin-right: 20px;
     }
 
-    // /deep/.el-dialog__header{
+    // ::v-deep.el-dialog__header{
     //     padding-bottom: 0;
     // }
-    
+
 </style>
 
 
@@ -565,7 +565,7 @@
         padding:0 0 10px 0;
         .slot-group-notice
            padding: 10px 10px;
-     
+
       .slot-search
            width:calc(100% - 20px) ;
            margin:5px 10px;
@@ -582,11 +582,11 @@
               height: 30px;
               line-height: 30px;
               margin-right:5px;
-              img 
+              img
                 vertical-align: middle;
                 border-style: none;
                 width: 100%;
                 height: 100%;
                 line-height: 30px;
                 border-radius: 50%;
-</style>
+</style>

src/components/LemonUI/components/chatrecords/segrecords.vue

@@ -2,11 +2,11 @@
 <div>
 
     <div class="imui-center qq-lemon-imui">
-        <lemon-records  class="lemon-slot"  
+        <lemon-records  class="lemon-slot"
             :width="windowWidth"
             :height="windowHeight"
             :user="UserData"
-            ref="IMUI"  
+            ref="IMUI"
             :sendText="sendText"
             :theme="theme"
             :show-context="showContext"
@@ -39,10 +39,10 @@
                         <span style="font-size:12px;">
                         <!-- <span>打开抽屉：</span>
                         <span style="cursor:pointer;"  @click="openDrawer('right')">
-                            右侧  | 
+                            右侧  |
                         </span>
                         <span style="cursor:pointer;" @click="openDrawer('rightInside')">
-                            右侧内部  | 
+                            右侧内部  |
                         </span>
                         <span style="cursor:pointer;" @click="openDrawer('center')">
                             居中
@@ -55,7 +55,7 @@
                         <span>相册</span>
                         <span>文件</span>
                         <span>活动</span>
-                        <span>设置(左键弹出菜单)</span> 
+                        <span>设置(左键弹出菜单)</span>
                     </div> -->
                 </div>
             </template>
@@ -67,16 +67,16 @@
         <img style="width:100%;height:auto" :src="dialogImageUrl" alt="" />
     </el-dialog>
 
-     <el-dialog :visible.sync="dialogVideoVisible" 
-                append-to-body 
+     <el-dialog :visible.sync="dialogVideoVisible"
+                append-to-body
                :close-on-click-modal="false"
                :destroy-on-close="true"
                :width="aplayer.pWidth"
-               :height="aplayer.height" 
+               :height="aplayer.height"
                @close="dialogVideoVisible=false"
                ref="player">
-              <videoPlayer  :width="aplayer.width" :height="aplayer.height"  :videoWidth="aplayer.videoWidth"  
-                :videoHeight="aplayer.videoHeight"   :vid="aplayer.vid"  :autoplay="true" 
+              <videoPlayer  :width="aplayer.width" :height="aplayer.height"  :videoWidth="aplayer.videoWidth"
+                :videoHeight="aplayer.videoHeight"   :vid="aplayer.vid"  :autoplay="true"
                 :source="dialogVideoUrl" :cover="dialogVideoCover" ref="player">
               </videoPlayer>
        </el-dialog>
@@ -95,7 +95,7 @@
   let pages = {};
   export default {
        name: "SegRecords",
-       components: {   
+       components: {
           VideoPlayer,
        },
        props: {
@@ -143,7 +143,7 @@
                 },
                 dialogImgVisible:false,
                 dialogImageUrl: '',
-                dialogVideoVisible:false, 
+                dialogVideoVisible:false,
                 dialogVideoUrl:'',
                 dialogVideoCover:'',
                 imageArr:[],
@@ -170,11 +170,11 @@
                 },
                 isLoaded:false,
                 sendText:"",
-               
+
            }
        },
        created(){
-            
+
        },
        mounted(){
             //this.deviceId=this.qwUser.deviceId;
@@ -186,15 +186,15 @@
        methods: {
                 /** 搜索按钮操作 */
                 handleQuery() {
-                   
+
                 },
                 handleClose(){
-                   
-                }, 
+
+                },
                 init(){
                     const IMUI = this.$refs.IMUI;
                     this.getConversation();   //获取会话信息
-                    ////IMUI.initEmoji(EmojiData); 
+                    ////IMUI.initEmoji(EmojiData);
                 },
                 open(converChanged){
                       if(this.isLoaded && !converChanged){
@@ -218,7 +218,7 @@
                     }, 100);
                 },
                 //查看上下文
-                openContextBox(message){ 
+                openContextBox(message){
                       pages=[];
                       this.queryParams.messageId=message.id;
                       this.queryParams.pullAct=0;//下拉刷新
@@ -320,7 +320,7 @@
                 handleChangeContact(contact, instance) {
 
                 },
-            
+
                 handleMenuAvatarClick() {
                    console.log("Event:menu-avatar-click");
                 },
@@ -328,7 +328,7 @@
                     this.dialogVideoVisible=true;
                     this.dialogVideoUrl=data.content;
                     this.dialogVideoCover=data.url;
-                    const player = this.$refs.player.instance 
+                    const player = this.$refs.player.instance
                     player && player.play()
                 },
                 handleMessageClick(e, key, message, instance) {
@@ -338,11 +338,11 @@
                         var url=!!message.url?message.url:message.content;
                         this.handlePicturePreview(url);
                     }
-                    else if(message.type=="video"){  
+                    else if(message.type=="video"){
                         this.tooglePlayVideo(message);
                     }
-                    else if(message.type=="file"){  
-                        
+                    else if(message.type=="file"){
+
                     }
                     if (key == "status") {
                         instance.updateMessage({
@@ -374,7 +374,7 @@
                 changeMessageTimeVisible() {
                    this.hideMessageTime = !this.hideMessageTime;
                 },
-    
+
                 updateContact() {
                     this.$refs.IMUI.updateContact({
                         id: "contact-3",
@@ -403,7 +403,7 @@
        padding-top:0;
     }
     .imui-center{
-        margin-bottom:"60px"; 
+        margin-bottom:"60px";
         display: flex;
         align-items: center;
         justify-content: center;
@@ -436,26 +436,26 @@
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep.el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-form--inline .el-form-item{
+    ::v-deep.el-form--inline .el-form-item{
         display: flex;
     }
-    /deep/.el-form-item--medium .el-form-item__content{
+    ::v-deep.el-form-item--medium .el-form-item__content{
         flex: 1;
         margin-right: 20px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep.el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }
 
-    // /deep/.el-dialog__header{
+    // ::v-deep.el-dialog__header{
     //     padding-bottom: 0;
     // }
-    
+
 </style>
 
 
@@ -468,7 +468,7 @@
         padding:0 0 10px 0;
         .slot-group-notice
            padding: 10px 10px;
-     
+
       .slot-search
            width:calc(100% - 20px) ;
            margin:5px 10px;
@@ -485,11 +485,11 @@
               height: 30px;
               line-height: 30px;
               margin-right:5px;
-              img 
+              img
                 vertical-align: middle;
                 border-style: none;
                 width: 100%;
                 height: 100%;
                 line-height: 30px;
                 border-radius: 50%;
-</style>
+</style>

src/layout/components/TagsView/ScrollPane.vue

@@ -82,7 +82,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep {
     .el-scrollbar__bar {
       bottom: 0px;
     }

src/views/qw/forbiddenMessage/index.vue

@@ -28,7 +28,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <el-form-item label="消息编号" prop="id">
         <el-input
           v-model="queryParams.id"
@@ -360,7 +360,7 @@ export default {
 
 
 <style lang="scss" scoped>
-    /deep/.el-dialog__headerbtn{
+    ::v-deep.el-dialog__headerbtn{
          top:10px;
     }
 

src/views/qw/qwChat/index.vue

@@ -50,7 +50,7 @@
           :width="windowWidth"
           :height="windowHeight"
           :user="UserData"
-          ref="IMUI"  
+          ref="IMUI"
           :theme="theme"
           :hide-menu="hideMenu"
           :hide-menu-avatar="hideMenuAvatar"
@@ -78,7 +78,7 @@
 
         </lemon-chatui>
       </div>
-   
+
        <el-dialog :visible.sync="dialogVisible" append-to-body width="35%">
          <img style="width:100%;height:auto" :src="dialogImageUrl" alt="" />
       </el-dialog>
@@ -87,10 +87,10 @@
                :close-on-click-modal="false"
                :destroy-on-close="true"
                :width="aplayer.pWidth"
-               :height="aplayer.height" 
+               :height="aplayer.height"
                @close="dialogVideoVisible=false"
                ref="player">
-              <videoPlayer  :width="aplayer.width" :height="aplayer.height"  :videoWidth="aplayer.videoWidth"  :videoHeight="aplayer.videoHeight"   :vid="aplayer.vid"  :autoplay="true" 
+              <videoPlayer  :width="aplayer.width" :height="aplayer.height"  :videoWidth="aplayer.videoWidth"  :videoHeight="aplayer.videoHeight"   :vid="aplayer.vid"  :autoplay="true"
                 :source="dialogVideoUrl" :cover="dialogVideoCover" ref="player">
               </videoPlayer>
        </el-dialog>
@@ -123,7 +123,7 @@ import { getCompanyList } from "@/api/company/company";
 let pages = {};
 export default {
   name: "qwChat",
-  components: {   
+  components: {
     Material,
     VideoPlayer,
     ChatRecords,
@@ -156,7 +156,7 @@ export default {
       isFromLogin:false,
       dialogImageUrl: '',
       dialogVisible: false,
-      dialogVideoVisible:false, 
+      dialogVideoVisible:false,
       dialogVideoUrl:'',
       dialogVideoCover:'',
       imageArr:[],
@@ -168,7 +168,7 @@ export default {
         height:"900px",
         videoWidth:"1000px",
         videoHeight:"900px"
-        
+
       },
       player: null,
       roomMembers:[],
@@ -208,7 +208,7 @@ export default {
     // this.setQwUserInfo();
     // this.getContacts();  //获取联系人信息
     // this.getConversation();   //获取会话信息
-   
+
     const IMUI = this.$refs.IMUI;
 
     IMUI.initMenus([
@@ -252,7 +252,7 @@ export default {
       //   },
       //   isBottom: true,
       // }
-      
+
       ,
       {
           name: "custom2",
@@ -267,8 +267,8 @@ export default {
           isBottom: true,
        },
     ]);
-    IMUI.initEmoji(EmojiData); 
-  
+    IMUI.initEmoji(EmojiData);
+
   },
 
   methods: {
@@ -302,7 +302,7 @@ export default {
           this.users = response.data;
         });
     },
-    companyUserChange(companyUserId){  
+    companyUserChange(companyUserId){
        this.queryParams.companyUserId=companyUserId;
        this.qwListAccount();
     },
@@ -338,9 +338,9 @@ export default {
         }
         this.setQwUserInfo();
         this.getContacts();  //获取联系人信息
-        this.getConversation();   //获取会话信息 
+        this.getConversation();   //获取会话信息
     },
-  
+
     setQwUserInfo(){
         this.deviceId=this.qwUser.deviceId;
         this.UserData.id=this.qwUser.userId;
@@ -417,7 +417,7 @@ export default {
                                   getConversation(queryParams).then(response => {
                                         if(response.code==200){
                                             var conversation=response.data;
-                                            IMUI.appendConversation(conversation); 
+                                            IMUI.appendConversation(conversation);
                                             that.appendMessageAction(msgData);
                                         }
                                 });
@@ -425,7 +425,7 @@ export default {
                                 that.appendMessageAction(msgData);
                                 let conversation=IMUI.findConversation(msgData.toContactId);
                                 IMUI.topPopConversations(conversation);
-                                
+
                           }
                       }
                 };
@@ -442,7 +442,7 @@ export default {
              this.roomInfo=response.detail;
         });
     },
-    getContacts(){  
+    getContacts(){
       getContactsByUser(this.qwUser.userId).then(response => {
            this.contactData = response.data;
            this.$refs.IMUI.initContacts(this.contactData);
@@ -458,7 +458,7 @@ export default {
            if(fstConversation){
               IMUI.changeContact(fstConversation.conversationId);
            }
-         
+
       });
     },
     messageTimeFormat(time) {
@@ -520,12 +520,12 @@ export default {
        instance.closeDrawer();
     },
     handleChangeContact(contact, instance) {
-        
+
     },
-    
+
     //收到消息后添加消息显示
     appendMessageAction(msgData){
-          if(msgData.type=="text" || msgData.type=="image" || msgData.type=="voice"){     //文本   text  image  video  voice 
+          if(msgData.type=="text" || msgData.type=="image" || msgData.type=="voice"){     //文本   text  image  video  voice
               const message = {
                     id: msgData.id,
                     status: msgData.status,
@@ -602,14 +602,14 @@ export default {
       console.log("Event:menu-avatar-click");
     },
     //聊天工具栏点击图片
-    handleImageClick() { 
+    handleImageClick() {
       //this.$refs.material.openMaterial(this.qwUser.deviceId);
     },
-    handleMsgRecordsClick() { 
+    handleMsgRecordsClick() {
       console.log("qxj handleMsgRecordsClick");
       this.$refs.chatRecords.open(this.qwUser,this.queryParams.conversationId,this.conversationData);
     },
-    handleExportMsgClick() { 
+    handleExportMsgClick() {
       let that=this;
       this.$confirm('是否确认导出消息记录吗?', "警告", {
             confirmButtonText: "确定",
@@ -643,11 +643,11 @@ export default {
            var url=!!message.url?message.url:message.content;
            this.handlePicturePreview(url);
       }
-      else if(message.type=="video"){  
+      else if(message.type=="video"){
            this.tooglePlayVideo(message);
       }
-      else if(message.type=="file"){  
-           
+      else if(message.type=="file"){
+
       }
       if (key == "status") {
         instance.updateMessage({
@@ -779,7 +779,7 @@ export default {
 
 <style lang="scss" scoped>
     .imui-center{
-        margin-bottom:"60px"; 
+        margin-bottom:"60px";
         display: flex;
         align-items: center;
         justify-content: center;
@@ -812,11 +812,11 @@ export default {
         padding: 0 8px;
     }
 
-    /deep/.el-dialog__headerbtn{
+    ::v-deep.el-dialog__headerbtn{
          top:10px;
     }
 
-    /deep/.el-dialog:not(.is-fullscreen) {
+    ::v-deep.el-dialog:not(.is-fullscreen) {
         margin-top: 0 !important;
     }
 
@@ -838,14 +838,14 @@ export default {
    }
 
 
-   /deep/.el-form-item{
+   ::v-deep.el-form-item{
         margin-bottom: 0;
         vertical-align: middle !important;
    }
 
-  
 
-    
+
+
 </style>
 
 
@@ -858,7 +858,7 @@ export default {
         padding:0 0 10px 0;
         .slot-group-notice
            padding: 10px 10px;
-     
+
       .slot-search
            width:calc(100% - 20px) ;
            margin:5px 10px;
@@ -875,11 +875,11 @@ export default {
               height: 30px;
               line-height: 30px;
               margin-right:5px;
-              img 
+              img
                 vertical-align: middle;
                 border-style: none;
                 width: 100%;
                 height: 100%;
                 line-height: 30px;
                 border-radius: 50%;
-</style>
+</style>

src/views/store/express/index.vue

@@ -139,7 +139,7 @@ export default {
   name: "Express",
   data() {
     return {
-      
+
       formId:null,
         value: [],
         value2:[],
@@ -287,7 +287,7 @@ export default {
       this.allCompanies = data;
     });
     const omsCode = row.omsCode;
-    getCompanyByOmsCode(omsCode).then(response => {      
+    getCompanyByOmsCode(omsCode).then(response => {
       this.value = response.data2
       console.log(this.value);
     });
@@ -380,13 +380,13 @@ export default {
   margin: 0 10px;
 }
 
-/deep/.el-transfer-panel {
+::v-deep.el-transfer-panel {
     width:40%;
 }
-/deep/.el-transfer-panel__body{
+::v-deep.el-transfer-panel__body{
   height: 450px;
 }
-/deep/.el-transfer-panel__list.is-filterable {
+::v-deep.el-transfer-panel__list.is-filterable {
    height: 88%;
 }
 

src/views/store/storeOrder/index.vue

@@ -53,7 +53,7 @@
           size="small"
           @keyup.enter.native="handleQuery"/>
       </el-form-item>
-     
+
       <el-form-item label="员工姓名" prop="companyUserNickName">
         <el-input
           v-model="queryParams.companyUserNickName"
@@ -90,7 +90,7 @@
         </el-select>
       </el-form-item>
 
-      
+
 
       <el-form-item label="物流状态" prop="deliveryStatus">
          <el-select   v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
@@ -160,7 +160,7 @@
             <el-select filterable style="width: 200px" v-model="queryParams.scheduleId" placeholder="请选择档期" clearable size="small" >
               <el-option
                       v-for="item in scheduleOptions"
-                      :key="item.id"  
+                      :key="item.id"
                       :label="item.name"
                       :value="item.id"
                     />
@@ -207,6 +207,7 @@
           v-model="orderItemNum"
           disabled
           size="mini"
+          style="width: 250px !important"
           />
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -287,7 +288,7 @@
               <el-tag prop="status" v-for="(item, index) in deliveryPayStatusOptions"    v-if="scope.row.deliveryPayStatus==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-    
+
       <el-table-column label="操作" fixed="right" width="80px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -305,7 +306,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -469,7 +470,7 @@
        <div class="import-msg" v-html="importMsg">
        </div>
     </el-dialog>
-    
+
   </div>
 </template>
 
@@ -614,7 +615,7 @@ export default {
         isSysDel: null,
         deptId:null,
         isUpload:null,
-     
+
       },
       // 表单参数
       form: {
@@ -629,7 +630,7 @@ export default {
         addressId: [
           { required: true, message: "收货信息不能为空" }
         ],
-        
+
       },
       upload: {
         // 是否显示弹出层（用户导入）
@@ -815,7 +816,7 @@ export default {
       else{
         this.queryParams.deliverySendTimeRange=null;
       }
-      
+
       listStoreOrder(this.queryParams).then(response => {
         this.storeOrderList = response.rows;
         this.total = response.total;
@@ -853,7 +854,7 @@ export default {
       else{
         this.queryParams.deliverySendTimeRange=null;
       }
-      
+
       getOrderItemsNum(this.queryParams).then(response => {
         this.orderItemNum = response.orderItemsNum;
         this.loading = false;
@@ -869,7 +870,7 @@ export default {
       this.form = {
         addressId:null,
         userId:null,
-        
+
       };
       this.resetForm("form");
     },
@@ -919,7 +920,7 @@ export default {
               this.getList();
             }
           });
-       
+
         }
       });
     },
@@ -927,7 +928,7 @@ export default {
     handleDelete(row) {
        this.products.splice(this.products.findIndex(item => item.id === row.id), 1)
        this.compute();
-       
+
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1036,7 +1037,7 @@ export default {
       //   });
       this.getList();
     },
-     
+
         /** 查询部门下拉树结构 */
     getTreeselect() {
         var that=this;
@@ -1078,7 +1079,7 @@ export default {
     max-width: 200px;
     text-align: left;
     .goods-title{
-      
+
       overflow:hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -1101,4 +1102,4 @@ export default {
   }
 
 </style>
- 
+