Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/global/ChooseImg.vue

@@ -10,22 +10,22 @@
         <div class="el-scrollbar" style="height: 450px; width: 100%;">
           <div class="el-scrollbar__wrap" style="margin-bottom: -8px; margin-right: -8px;">
             <div class="el-scrollbar__view">
-              <li :class="PageMsg.GroupId==0?'selectActive' : ''" @click="SelectGroup(0)" class="el-menu-item"
+              <li :class="PageMsg.GroupId == 0 ? 'selectActive' : ''" @click="SelectGroup(0)" class="el-menu-item"
                 style="padding-left: 10px;padding-right: 10px;">
                 <i class="el-icon-tickets"></i>
                 <span>全部</span>
               </li>
-              <li :class="PageMsg.GroupId==item.Id?'selectActive' : ''" @click="SelectGroup(item.Id)"
-                v-for="(item,index) in NewItems" :key="index" class="el-menu-item"
+              <li :class="PageMsg.GroupId == item.Id ? 'selectActive' : ''" @click="SelectGroup(item.Id)"
+                v-for="(item, index) in NewItems" :key="index" class="el-menu-item"
                 style="padding-left: 10px;padding-right: 10px;">
                 <div flex="dir:left box:last">
                   <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
                     <i class="el-icon-tickets"></i>
-                    <span>{{item.Name}}</span>
+                    <span>{{ item.Name }}</span>
                   </el-col>
                   <el-col class="blue" :span="6">
-                    <span v-if="scgroupMsg.Recycled==1" @click.prevent="EditGroup(item)">编辑</span>
-                    | <span v-if="scgroupMsg.Recycled==1" @click.prevent="HsGroup(item)">删除</span>
+                    <span v-if="scgroupMsg.Recycled == 1" @click.prevent="EditGroup(item)">编辑</span>
+                    | <span v-if="scgroupMsg.Recycled == 1" @click.prevent="HsGroup(item)">删除</span>
                   </el-col>
                 </div>
               </li>
@@ -35,7 +35,8 @@
       </el-col>
       <el-col :span="18">
         <div style="margin-top: 10px;margin-left: 20px;" class="appendInput">
-          <el-input size="small" style="width:250px" placeholder="请输入内容" @keyup.enter.native="GetPageList" v-model="PageMsg.Name">
+          <el-input size="small" style="width:250px" placeholder="请输入内容" @keyup.enter.native="GetPageList"
+            v-model="PageMsg.Name">
             <el-button @click="GetPageList" slot="append" icon="el-icon-search"></el-button>
           </el-input>
         </div>
@@ -48,12 +49,12 @@
               </div>
             </el-upload>
           </div>
-          <el-tooltip v-for="(item,index) in PageList" :key="index" class="item" effect="dark"
-            :content="'双击选中【'+item.Name+'】'" placement="top-start">
-            <div @click="PageSelect(item,1)" @dblclick="PageSelect(item,2)" :class="getChecked(item) ? 'selected' :''"
+          <el-tooltip v-for="(item, index) in PageList" :key="index" class="item" effect="dark"
+            :content="'双击选中【' + item.Name + '】'" placement="top-start">
+            <div @click="PageSelect(item, 1)" @dblclick="PageSelect(item, 2)" :class="getChecked(item) ? 'selected' : ''"
               class="el-tooltip item app-attachment-item">
               <img :src="getIconLink(item.Path)" class="app-attachment-img" style="width: 100px; height: 100px;">
-              <div class="app-attachment-name">{{item.Name}}</div>
+              <div class="app-attachment-name">{{ item.Name }}</div>
             </div>
           </el-tooltip>
         </div>
@@ -77,7 +78,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="排序" prop="Sort">
-          <el-input @keyup.native="checkInteger(addGroupMsg,'Sort')" size="small" v-model="addGroupMsg.Sort"></el-input>
+          <el-input @keyup.native="checkInteger(addGroupMsg, 'Sort')" size="small" v-model="addGroupMsg.Sort"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -89,7 +90,7 @@
 </template>
 
 <script>
-  export default {
+export default {
   //是否多选
   props: ["IsMultiple"],
   name: 'ChooseImg',
@@ -152,13 +153,13 @@
         Image: '',
         VideoTime: 0,
         WithHeight: 0,
-          PathType:0
+        PathType: 0
       },
       selectId: -1,
       emitmsg: [],
     }
   },
-    created() {},
+  created() { },
   computed: {
     NewItems() {
       var _this = this;
@@ -221,8 +222,8 @@
     // 新增素材信息
     addPageList() {
       var upInfo = JSON.parse(localStorage.uploadInfo);
-        if(upInfo){
-          this.addpageMsg.PathType=upInfo.StoreType;
+      if (upInfo) {
+        this.addpageMsg.PathType = upInfo.StoreType;
       }
       this.apipost("/api/product/SetGetMaterialInfo", this.addpageMsg, res => {
         if (res.data.resultCode == 1) {
@@ -285,7 +286,7 @@
             }
           }
         );
-        }).catch(() => {});
+      }).catch(() => { });
     },
     EditGroup(item) {
       this.addGroupMsgDig = true;
@@ -341,31 +342,31 @@
       })
     },
   },
-  }
+}
 
 </script>
 
 <style>
-  .ChooseImg .el-input.is-active .el-input__inner,
-  .ChooseImg .el-input__inner:focus {
+.ChooseImg .el-input.is-active .el-input__inner,
+.ChooseImg .el-input__inner:focus {
   border-color: #DCDFE6;
-  }
+}
 
-  .ChooseImg .app-attachment-list .selected {
+.ChooseImg .app-attachment-list .selected {
   box-shadow: 0 0 0 1px #1ed0ff;
   background: #daf5ff;
   border-radius: 5px;
-  }
+}
 
-  .ChooseImg .selectActive .el-icon-tickets {
+.ChooseImg .selectActive .el-icon-tickets {
   color: #409EFF;
-  }
+}
 
-  .ChooseImg .selectActive {
+.ChooseImg .selectActive {
   color: #409EFF;
-  }
+}
 
-  .ChooseImg .app-attachment-name {
+.ChooseImg .app-attachment-name {
   color: #666666;
   margin-top: 5px;
   font-size: 13px;
@@ -375,18 +376,18 @@
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
   overflow: hidden;
-  }
+}
 
-  .ChooseImg .app-attachment-item .app-attachment-img {
+.ChooseImg .app-attachment-item .app-attachment-img {
   display: block;
-  }
+}
 
-  .ChooseImg .app-attachment-upload i {
+.ChooseImg .app-attachment-upload i {
   font-size: 30px;
   color: #909399;
-  }
+}
 
-  .ChooseImg .app-attachment-item {
+.ChooseImg .app-attachment-item {
   display: inline-block;
   cursor: pointer;
   position: relative;
@@ -396,31 +397,30 @@
   margin: 7.5px;
   text-align: center;
   padding: 10px 10px 0;
-  }
+}
 
-  .ChooseImg .app-attachment-upload {
+.ChooseImg .app-attachment-upload {
   box-shadow: none;
   border: 1px dashed #b2b6bd;
   height: 100px;
   width: 100px;
   margin: 17.5px;
   padding: 0;
-  }
+}
 
-  .ChooseImg .app-attachment-list {
+.ChooseImg .app-attachment-list {
   padding: 5px;
   min-height: 475px;
-  }
+}
 
-  .ChooseImg .appendInput .el-input__inner {
+.ChooseImg .appendInput .el-input__inner {
   border-right: none;
 
-  }
+}
 
-  .ChooseImg .appendInput .el-input-group__append {
+.ChooseImg .appendInput .el-input-group__append {
   background-color: #fff !important;
   border-left: none;
   padding: 0 15px;
-  }
-
+}
 </style>

src/components/huimai/happraise.vue

@@ -75,7 +75,7 @@
     </div>
     <!-- 回复 -->
     <el-dialog :title="editTitle" :visible.sync="isShowReplayForm" width="800px">
-      <el-form label-width="150px" :rules="rules" :model="replayMsg">
+      <el-form label-width="150px" :rules="rules" :model="replayMsg" @validate="answerTest">
         <el-form-item label="咨询用户" class="user">
           {{ replayMsg.UserName }}
         </el-form-item>
@@ -198,7 +198,8 @@ export default {
         ReplyContent: [
           { required: true, message: "请输入回复内容", trigger: "blur" }
         ]
-      }
+      },
+      pass: ''
     };
   },
   created() {
@@ -270,6 +271,7 @@ export default {
     },
     //设置咨询回复
     saveData() {
+      if (this.pass) {
         this.assetsApipost("/api/Assess/SetGoodsReply", this.replayMsg, res => {
           if (res.data.resultCode == 1) {
             this.isShowReplayForm = false;
@@ -280,10 +282,15 @@ export default {
           }
         });
       }
+    },
+    //回复验证结果
+    answerTest(res, pass) {
+      this.pass = pass
+    }
   }
 };
 </script>
-<style>
+<style scoped>
 .performanceStatics .content {
   background: #fff;
   margin-top: 10px;

src/components/phoneManage/adminList.vue

@@ -9,16 +9,16 @@
       </div>
       <div class="content">
         <div class="searchInput" style="display:inline-block;width:200px;">
-          <el-select v-model="msg.Source" placeholder="请选择" size="small" @change="(msg.pageIndex = 1),getList()">
+          <el-select v-model="msg.Source" placeholder="请选择" size="small" @change="(msg.pageIndex = 1), getList()">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
         <div class="searchInput">
           <el-input style="display:inline-block;width:260px;height:30px" placeholder="请输入ID/昵称/手机号/备注/联系方式"
-            v-model="msg.Name" size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()"
-            @clear="msg.pageIndex=1,getList()">
-            <i slot="suffix" class="el-input__icon el-icon-search" @click="msg.pageIndex=1,getList()"></i>
+            v-model="msg.Name" size="small" clearable @keyup.enter.native="msg.pageIndex = 1, getList()"
+            @clear="msg.pageIndex = 1, getList()">
+            <i slot="suffix" class="el-input__icon el-icon-search" @click="msg.pageIndex = 1, getList()"></i>
           </el-input>
         </div>
         <br>
@@ -75,7 +75,7 @@
   </div>
 </template>
 <script>
-  export default {
+export default {
   data() {
     return {
       loading: false,
@@ -141,7 +141,7 @@
               if (res.data.resultCode === 1) {
                 that.getList();
                 that.Success(res.data.message);
-                  that.isShowModule=false;
+                that.isShowModule = false;
               } else {
                 that.Error(res.data.message);
               }
@@ -210,69 +210,68 @@
     this.getUserList();
     this.getList();
   },
-  };
+};
 
 </script>
 <style>
-  .CustomPage .app-image {
+.CustomPage .app-image {
   background-position: center center;
   width: 50px;
   height: 50px;
   border-radius: 0%;
   float: left;
   margin-right: 8px;
-  }
+}
 
-  .CustomPage .templat-list {
+.CustomPage .templat-list {
   border: 1px solid #ebeef5;
-  }
+}
 
-  .CustomPage .templat-item {
+.CustomPage .templat-item {
   line-height: 40px;
   height: 40px;
   display: flex;
   font-size: 13px;
-  }
+}
 
-  .templat-item:nth-child(odd) {
+.templat-item:nth-child(odd) {
   background-color: #f7f7f7;
-  }
+}
 
-  .templat-item:nth-child(even) {
+.templat-item:nth-child(even) {
   background-color: #fff;
-  }
+}
 
-  .CustomPage .templat-item div {
+.CustomPage .templat-item div {
   width: 50%;
   padding-left: 20px;
-  }
+}
 
-  .CustomPage .Custom_item {
+.CustomPage .Custom_item {
   border: 1px solid #ebeef5;
   background-color: #fff;
   color: #303133;
   -webkit-transition: 0.3s;
   transition: 0.3s;
   margin-bottom: 10px;
-  }
+}
 
-  .CustomPage .Custom_item>div {
+.CustomPage .Custom_item>div {
   padding: 20px;
-  }
+}
 
-  .CustomPage .content {
+.CustomPage .content {
   background: #fff;
   margin-top: 10px;
   padding: 20px;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  }
+}
 
-  .CustomPage .conten_indder {
+.CustomPage .conten_indder {
   padding: 20px;
   background-color: #fff;
   padding-right: 50%;
   min-width: 1100px;
-  }
-
+}
 </style>