t

src/views/map/components/popup/MapTextEdit.vue

@@ -47,18 +47,18 @@ export default {
       fillColor: '#ff003f',
       strokeColor: '#ff003f',
       colorArr: [
-        {color: '#fb6557', t: '专本科'}, 
+        {color: '#ff0', t: '新楼盘'}, 
+        {color: '#9f7df4', t: '二手房'}, 
+        {color: '#e8d0e6', t: '还建房'}, 
         {color: '#ff9149', t: '幼儿园'}, 
-        // {color: '#9f7df4'}, 
-        {color: '#60c68b', t: ''}, 
-        // {color: '#4da4ee'}, 
-        {color: '#e77ad4', t: ''}
+        {color: '#ff7fbf', t: '小初中'}, 
+        // {color: '#60c68b', t: ''}, 
+        {color: '#e77ad4', t: '高中'},
+        {color: '#fb6557', t: '专本科'}, 
       ],
       colorArr2: [
-        {color: '#ff0', t: '新楼盘'}, 
-        {color: '#9f7df4', t: '二手房'}, 
-        {color: '#ff7fbf', t: '中小学'}, 
-        {color: '#ff003f', t: '商业'}, 
+        {color: '#ff003f', t: '纯商业'},
+        {color: '#999', t: '商综合'},
         {color: '#007299', t: '公共'}, 
         {color: '#00ff3f', t: '公园'}, 
         {color: '#4da4ee', t: '医院'}, 
@@ -158,7 +158,7 @@ export default {
           pri_image: valObj.pri_image,
           price_range: valObj.price_range,
           product_type: valObj.product_type,
-          property_type: valObj.property_type,
+          // property_type: valObj.property_type,
           // area_type: valObj.area_type,
           // metro_type: valObj.metro_type,
           // metro_line: valObj.metro_line,

src/views/map/dtl.vue

@@ -300,12 +300,15 @@ export default {
           const estateObj = cObj.estateObj ? JSON.parse(cObj.estateObj) : {}
           const schoolObj = cObj.schoolObj ? JSON.parse(cObj.schoolObj) : {}
           const typeObj = {
-            '#fb6557': '专本科',
-            '#ff9149': '幼儿园',
             '#ff0': '新楼盘',
             '#9f7df4': '二手房',
-            '#ff7fbf': '教育用地',
-            '#ff003f': '商业用地',
+            '#e8d0e6': '还建房',
+            '#ff9149': '幼儿园',
+            '#ff7fbf': '小学初中',
+            '#e77ad4': '高中',
+            '#fb6557': '中大专本科',
+            '#ff003f': '纯商业',
+            '#999': '商业综合体',
             '#007299': '公用设施',
             '#00ff3f': '公园用地',
             '#4da4ee': '医院用地',
@@ -321,16 +324,15 @@ export default {
             const productTypeStr = ptStrArr.join(',')
             that.winObj.content = `
               <div style="border-radius: 6px;overflow:hidden;background:#fff;box-shadow: 0 0 3px #ccc;">
-                <div style="font-weight: bold;color:#fff;padding: 10px 10px;background:#409eff;user-select: none;margin-bottom: 10px;text-align: left;">${cObj.text}</div>
-                <div style="display: flex;padding-left: 10px;">
-                  <div style="width: 100px;">
-                    <img style="width: 100px;height: auto;" src="${estateObj.pri_image}_xs" />
+                <div style="font-weight: bold;color:#fff;padding: 6px;background:#409eff;user-select: none;margin-bottom: 6px;text-align: left;font-size: 12px;">${cObj.text}</div>
+                <div style="display: flex;padding-left: 6px;">
+                  <div style="width: 80px;">
+                    <img style="width: 80px;height: auto;" src="${estateObj.pri_image}_xs" />
                   </div>
-                  <div style="width: 160px;">
-                    <div style="padding: 0 10px 6px;color: #999;font-size: 12px;color: #f00;font-weight: bold;">价格：￥${estateObj.price_range}</div>
-                    <div style="padding: 0 10px 6px;color: #999;font-size: 12px;">类型：${typeObj[cObj.fillColor] || '其它'}</div>
-                    <div style="padding: 0 10px 6px;color: #999;font-size: 12px;">物业：${estateObj.property_type}</div>
-                    <div style="padding: 0 10px 6px;color: #999;font-size: 12px;">产品：${productTypeStr}</div>
+                  <div style="width: 140px;">
+                    <div style="padding: 0 6px 6px;color: #999;font-size: 12px;color: #f00;font-weight: bold;">价格：￥${estateObj.price_range}</div>
+                    <div style="padding: 0 6px 6px;color: #999;font-size: 12px;">类型：${typeObj[cObj.fillColor] || '其它'}</div>
+                    <div style="padding: 0 6px 6px;color: #999;font-size: 12px;">产品：${productTypeStr}</div>
                   </div>
                 </div>
               </div>
@@ -340,14 +342,14 @@ export default {
             const stObj = arrToObj(that.$dictData.school_type)
             that.winObj.content = `
               <div style="border-radius: 6px;overflow:hidden;background:#fff;box-shadow: 0 0 3px #ccc;">
-                <div style="font-weight: bold;color:#fff;padding: 10px 10px;background:#409eff;user-select: none;margin-bottom: 10px;text-align: left;">${cObj.text}</div>
-                <div style="display: flex;padding-left: 10px;">
-                  <div style="width: 100px;">
-                    <img style="width: 100px;height: auto;" src="${schoolObj.pri_image}_xs" />
+                <div style="font-weight: bold;color:#fff;padding: 6px;background:#409eff;user-select: none;margin-bottom: 6px;text-align: left;font-size: 12px;">${cObj.text}</div>
+                <div style="display: flex;padding-left: 6px;">
+                  <div style="width: 80px;">
+                    <img style="width: 80px;height: auto;" src="${schoolObj.pri_image}_xs" />
                   </div>
                   <div style="width: 260px;">
-                    <div style="padding: 0 10px 6px;color: #999;font-size: 12px;color: #f00;font-weight: bold;">${saObj[schoolObj.school_attrib]}、${stObj[schoolObj.school_type]}</div>
-                    <div style="padding: 0 10px 6px;color: #999;font-size: 12px;">备注：${schoolObj.remarked}</div>
+                    <div style="padding: 0 6px 6px;color: #999;font-size: 12px;color: #f00;font-weight: bold;">${saObj[schoolObj.school_attrib]}、${stObj[schoolObj.school_type]}</div>
+                    <div style="padding: 0 6px 6px;color: #999;font-size: 12px;">备注：${schoolObj.remarked}</div>
                   </div>
                 </div>
               </div>
@@ -355,9 +357,9 @@ export default {
           } else {
             that.winObj.content = `
               <div style="border-radius: 6px;overflow:hidden;background:#fff;box-shadow: 0 0 3px #ccc;">
-                <div style="font-weight: bold;color:#fff;padding: 10px 10px;background:#409eff;user-select: none;margin-bottom: 10px;text-align: center;">${cObj.text}</div>
-                <div style="padding: 0 10px 10px;color: #999;">类型：${typeObj[cObj.fillColor] || '其它'}</div>
-                <div style="padding: 0 10px 10px;color: #999;">状态：${cObj.strokeStyle === 'dashed' ? '规划中' : '已规划'}</div>
+                <div style="font-weight: bold;color:#fff;padding: 6px;background:#409eff;user-select: none;margin-bottom: 6px;text-align: left;font-size: 12px;">${cObj.text}</div>
+                <div style="padding: 0 6px 6px;color: #999;font-size: 12px;">类型：${typeObj[cObj.fillColor] || '其它'}</div>
+                <div style="padding: 0 6px 6px;color: #999;font-size: 12px;">状态：${cObj.strokeStyle === 'dashed' ? '规划中' : '已规划'}</div>
               </div>
             `
           }
@@ -711,7 +713,7 @@ export default {
           const data = JSON.parse(res.data)
           this.winObj = {
             content: `
-            <div style="font-weight: bold;color:#409eff;padding: 10px 10px;background:#fff;border-radius: 6px;user-select: none;">${data.mapDiyObj.title}</div>
+            <div style="font-weight: bold;color:#409eff;padding: 6px;background:#fff;border-radius: 6px;user-select: none;font-size: 12px;">${data.mapDiyObj.title}</div>
             `,
             position: [data.mapDiyObj.center[0], data.mapDiyObj.center[1]],
           }