jufubao-admin-library 1.1.133 → 1.1.135

package/library/viewModules/viewWalking/schemas/walking.js

@@ -228,7 +228,8 @@ module.exports = {
       isRule: false,
       data: {
         id:['点位ID', 'string', '必填'],
-        map_point_color:['map_point_color', 'string', '必填'],
+        map_point_color:['地图点位颜色（已到达点位）', 'string', '必填'],
+        map_point_color_for_no_arrived:['地图点位颜色（未到达点位）', 'string', '必填'],
       },
       disabled: true,
       role: '',

package/library/viewModules/viewWalking/viewWalking/config.vue

@@ -30,8 +30,12 @@
           ></el-slider>
         </div>
         <div class="btn-item">
-          <span>点位颜色:</span>
-          <el-color-picker v-model="color" size="small" @change="handleColorChange"></el-color-picker>
+          <span>未到达点位颜色:</span>
+          <el-color-picker v-model="noArriveColor" size="small" @change="e => handleColorChange(e)"></el-color-picker>
+        </div>
+        <div class="btn-item">
+          <span>到达点位颜色:</span>
+          <el-color-picker v-model="color" size="small" @change="e => handleColorChange(e)"></el-color-picker>
         </div>
       </div>
       <div class="right">
@@ -120,6 +124,7 @@ export default {
 
       //页面可编辑数据
       color:'rgb(52, 152, 219)',
+      noArriveColor:'#999999',
       name:'',
       status:'Y',
       backgroundImage:'',
@@ -247,6 +252,7 @@ export default {
         this.getImageInfo(backgroundImage,()=>{
           this.radius = info['map_point_size'] || 43;
           this.color = info['map_point_color'] || '#3498db';
+          this.noArriveColor = info['map_point_color_for_no_arrived'] || '#999999';
           this.name = info['map_name'];
           this.backgroundImage = backgroundImage;
           loading.close()
@@ -482,7 +488,12 @@ export default {
     handleColorChange(e){
       console.log(e,'eee')
       if(e){
-        this.walkingPointColor({id:this.map_id,map_point_color:e})
+        let data = {
+          id: this.map_id,
+          map_point_color_for_no_arrived: this.noArriveColor,
+          map_point_color: this.color
+        };
+        this.walkingPointColor(data)
         .then(res=>{
           this.$message.success('修改点位颜色成功')
         })

package/library/viewModules/viewsMaterial/viewsMaterial/common/common.scss

@@ -1,7 +1,3 @@
-.el-icon-circle-check {
-  display: none !important;
-}
-
 .text-overflow {
   overflow: hidden;
   white-space: nowrap;

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/company.vue

@@ -24,6 +24,7 @@
             v-model="file_name"
             placeholder="请输入素材名称"
             clearable
+            class="main-content-search"
           >
             <el-button type="primary" slot="append" icon="el-icon-search" @click="handleSearch()"></el-button>
           </el-input>
@@ -335,9 +336,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.main-content-search ::v-deep .el-input__validateIcon {
+  display: none !important;
+}
 .active {
   border: 2px solid #409eff;
   position: relative;
   overflow: hidden;
 }
+.el-icon-circle-check {
+  display: none !important;
+}
 </style>

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/detail.vue

@@ -1135,6 +1135,9 @@ export default {
   display: flex;
   justify-content: center;
 }
+.el-icon-circle-check {
+  display: none !important;
+}
 .el-empty {
   display: flex;
   justify-content: center;

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/my.vue

@@ -24,6 +24,7 @@
             v-model="file_name"
             placeholder="请输入素材名称"
             clearable
+            class="main-content-search"
           >
             <el-button type="primary" slot="append" icon="el-icon-search" @click="handleSearch()"></el-button>
           </el-input>
@@ -352,9 +353,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.main-content-search ::v-deep .el-input__validateIcon {
+  display: none !important;
+}
 .active {
   border: 2px solid #409eff;
   position: relative;
   overflow: hidden;
 }
+.el-icon-circle-check {
+  display: none !important;
+}
 </style>

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/platform.vue

@@ -19,6 +19,7 @@
               placeholder="请输入素材名称"
               clearable
               @clear="handleClearSearch"
+              class="main-content-search"
             >
               <el-button type="primary" slot="append" icon="el-icon-search" @click="handleNameSearch()"></el-button>
             </el-input>
@@ -335,6 +336,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.main-content-search ::v-deep .el-input__validateIcon {
+  display: none !important;
+}
 .platform-content {
   height: calc(100% - 114px);
   display: flex;
@@ -434,4 +438,8 @@ export default {
   width: auto!important;
 }
 
+.el-icon-circle-check {
+  display: none !important;
+}
+
 </style>

package/library/viewModules/viewsMaterial/viewsMaterial/dialog/component/share.vue

@@ -24,6 +24,7 @@
             style="width: 264px"
             v-model="file_name"
             placeholder="请输入素材名称"
+            class="main-content-search"
           >
             <el-button type="primary" slot="append" icon="el-icon-search" @click="handleSearch()"></el-button>
           </el-input>
@@ -238,9 +239,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.main-content-search ::v-deep .el-input__validateIcon {
+  display: none !important;
+}
 .active {
   border: 2px solid #409eff;
   position: relative;
   overflow: hidden;
 }
+.el-icon-circle-check {
+  display: none !important;
+}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.133",
+  "version": "1.1.135",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {