Merge branch 'dev' of http://www.lockingos.org:3000/yiyun-fe/yiyunjianzhu-vue into dev

dist/static/css/main.css

@@ -3354,9 +3354,11 @@ button:focus {
 
 .admin_contentBox_bodyPain {
 	margin: 10px;
-	min-width: 600px;
+	min-width: 666px;
+}
+.el-form-item__error{
+	background-color: none;
 }
-
 .el-table th {
 	height: 27px;
 	background-color: #EBEBF2;
@@ -8855,9 +8857,10 @@ h5.dulilabel{
     display: inline-block;
     width: 28px;
     height: 28px;
-		background-color: #ccc;
+	background-color: #ccc;
     background: url(/static/img/icon_pic_01.png) no-repeat -180px 0px;
 }
+
 .selfupdate .webuploader-pick{
   width: 120px
 }

public/static/css/main.css

@@ -8859,6 +8859,16 @@ h5.dulilabel{
 		background-color: #ccc;
     background: url(/static/img/icon_pic_01.png) no-repeat -180px 0px;
 }
+
+.el-icon-error::before{
+	content: "";
+    display: inline-block;
+    width: 28px;
+    height: 28px;
+	background-color: #ccc;
+    background: url(/static/img/严重警示.svg) no-repeat;
+}
+
 .selfupdate .webuploader-pick{
   width: 120px
 }

src/components/app-header/app-header.vue

@@ -41,12 +41,12 @@
       </div>
       <div class="app-header-content-right">
         <slot name="right"></slot>
-          <span @click="toRecycle" v-if="showUserCenter">
+          <!-- <span @click="toRecycle" v-if="showUserCenter">
             <i
               class="Cicon icon font_family icon-icon_huishouzhan"
               :class="{inRecycle:isInRecycle}"
             />
-          </span>
+          </span> -->
         <user-center v-if="showUserCenter" />
       </div>
     </div>

src/views/manage_system/template/index.vue

@@ -2144,10 +2144,10 @@ export default {
         setTimeout(() => {
           this.$refs.tree.setCurrentKey(targetTemlate.id || 'default');
         }, 0);
-        debugger;
+        //debugger;
       } else {
         this.getTempNameAndData(listTemplateTree[0]);
-        debugger;
+        //debugger;
         setTimeout(() => {
           this.$refs.tree.setCurrentKey('default');
         }, 0);
@@ -2641,7 +2641,6 @@ export default {
     },
     //确定导入模板操作
     enterImport: function () {
-      debugger;
       var firstIndustryID = "";
       var detailIndustryID = "";
       if (
@@ -3184,7 +3183,7 @@ export default {
       // 	}
       // }
       if (!value) return true;
-      debugger;
+      //debugger;
       return data.label.indexOf(value) !== -1;
     },
     /**