liujq 3 lat temu
rodzic
commit
e1655a5e3f

Plik diff jest za duży
+ 0 - 0
dist/index.html


Plik diff jest za duży
+ 0 - 0
dist/static/css/chunk-374bbc82.b00f12a4.css


Plik diff jest za duży
+ 0 - 0
dist/static/css/chunk-73b363de.3c743d36.css


Plik diff jest za duży
+ 0 - 0
dist/static/css/chunk-7efe769e.ac78615f.css


Plik diff jest za duży
+ 0 - 0
dist/static/css/chunk-a2adc568.53105d3e.css


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.859d45f8.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-374bbc82.dfc09383.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-73b363de.7394d532.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-7efe769e.9fd7b958.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-a2adc568.d0041fd1.js


+ 3 - 1
src/views/area/components/popup/IndexEdit.vue

@@ -98,6 +98,7 @@ export default {
       this.formData = [
         { label: '区域名', key: 'area_name'},
         { label: '区域图', key: 'pri_image', type: 'uploads', class: 'c-2' },
+        { label: '背景图', key: 'bg_image', type: 'uploads', class: 'c-2' },
         { label: '上级区域', key: 'parent_id', type: 'selectRemote', class: 'c-2', disabled,
           remoteParams: { skey: 'area_name', api: `other.admareainfolist`, opKey: 'area_name', opVal: 'id' },
           remoteOptions: [{ keyRO: params.parent_name, valRO: params.parent_id }]
@@ -159,7 +160,7 @@ export default {
   }
 }
 ::v-deep .img-upload {
-  height: 180px;
+  width: 182px;
   height: 110px;
   overflow: hidden;
   .icon {
@@ -169,6 +170,7 @@ export default {
   }
   .img {
     width: 180px;
+    height: 110px;
   }
 }
 

+ 1 - 0
src/views/area/index.vue

@@ -61,6 +61,7 @@ export default {
         { label: '层级', prop: 'level' },
         { label: '区域', prop: 'area_name' },
         { label: '区域图', prop: 'pri_image', type: 'img' },
+        { label: '背景图', prop: 'bg_image', type: 'img' },
         { label: '描述', prop: 'remark' },
         { label: '预设1', prop: 'option1' },
         { label: '预设2', prop: 'option2' },

+ 1 - 1
src/views/base/components/popup/ThemeDtlEdit.vue

@@ -59,7 +59,7 @@ export default {
         params = {...this.$refs.ruleForm.baseForm, ...params}
       }
       if (!params.hide_status) params.hide_status = '1'
-      if (!params.type) params.type = 'top_random_entry'
+      if (!params.type) params.type = 'top_entry_2'
       this.formData = [
         { label: '分类', key: 'type', class: 'c-2', type: 'select', options: this.$dictData.app_theme_type, rules: 1},
         { label: '排序', key: 'sort', class: 'c-2', rules: 1},

+ 9 - 1
src/views/map/dtl.vue

@@ -69,6 +69,8 @@
         <template v-if="mapDiyObj.isSchoolShow === '1'">
           <el-amap-marker class="scoped-m-box" v-for="(marker, index) in schoolList" :key="3000 + index"
             icon="https://img2.honglounews.com/20220110041435-6276.png"
+            width="20"
+            height="20"
             :position="marker.position"
             :events="schoolEvents"
             :title="marker.school_name"
@@ -956,7 +958,10 @@ export default {
 ::v-deep .amap-copyright {
   opacity:0;
 }
-
+::v-deep .amap-icon img {
+  width: 20px !important;
+  height: 20px !important;
+}
 
 .scoped-marker-area {
   background: #369af7;
@@ -1016,4 +1021,7 @@ export default {
   }
 }
 
+
+
+
 </style>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików