fix:家具

Author: fifthThirteen

src/assets/css/furniture/pc/single.less

@@ -65,26 +65,32 @@
     .mt(40px);
     .mb(20px);
     .flex;
+    align-items: stretch;
     gap: 20px;
 
     .u-img {
         box-shadow: 0px 0px 10px 0px #0000001A;
         .pr;
-        .size(240px, 240px);
+        width: 240px;
+        min-height: 240px;
         .r(10px);
         box-sizing: border-box;
         background: #ffffff;
         padding: 10px;
         box-sizing: border-box;
         flex-shrink: 0;
+        .flex;
+        align-items: center;
+        justify-content: center;
 
         .u-img-wrap {
             background-image: url("../../../../assets/img/horse/horse_item_bg_sm.jpg");
             background-position: center;
             background-repeat: no-repeat;
             background-size: cover;
             width: 100%;
-            height: 100%;
+            height: auto;
+            aspect-ratio: 1 / 1;
             .flex;
             align-items: center;
             justify-content: center;
@@ -105,7 +111,8 @@
     .u-info {
         box-shadow: 0px 0px 10px 0px #0000001A;
         .pr;
-        .size(100%, 240px);
+        width: 100%;
+        min-height: 240px;
         background-color: #fff;
         padding: 20px;
         box-sizing: border-box;
@@ -298,8 +305,17 @@
             margin-right: 0;
             width: 100%;
             height: unset;
+            min-height: unset;
             .flex;
+            align-items: center;
             justify-content: center;
+
+            .u-img-wrap {
+                width: 240px;
+                max-width: 100%;
+                height: auto;
+                aspect-ratio: 1 / 1;
+            }
         }
     }
 

src/views/furniture/Index.vue

@@ -171,6 +171,10 @@ export default {
                                     key: "isSet",
                                     value: "庐园广记",
                                 },
+                                {
+                                    key: "isMatch",
+                                    value: "园宅会赛",
+                                },
                             ],
                         },
                     ],

src/views/furniture/Single.vue

@@ -12,17 +12,13 @@
                     {{ data.szName }}
                     <i class="u-interact" v-if="data.bInteract"></i>
                 </div>
-                <!-- <div class="u-attrs">
-                    <span class="u-attr" v-if="data.Attribute1"><span class="u-label blue">观赏</span>{{ data.Attribute1 }}</span>
-                    <span class="u-attr" v-if="data.Attribute2"><span class="u-label pink">实用</span>{{ data.Attribute2 }}</span>
-                    <span class="u-attr" v-if="data.Attribute3"><span class="u-label yellow">坚固</span>{{ data.Attribute3 }}</span>
-                    <span class="u-attr" v-if="data.Attribute4"><span class="u-label green">风水</span>{{ data.Attribute4 }}</span>
-                    <span class="u-attr" v-if="data.Attribute5"><span class="u-label purple">趣味</span>{{ data.Attribute5 }}</span>
-                </div> -->
-                <div class="u-attrs" v-if="data.Record || data.Record === 0">
-                    <span class="u-attr"
+                <div class="u-attrs" v-if="data.Record || data.Record === 0 || furniture_attrs.length">
+                    <span class="u-attr" v-if="data.Record || data.Record === 0"
                         ><span class="u-label score">装修评分</span>{{ data.Record }}</span
                     >
+                    <span class="u-attr" v-for="item in furniture_attrs" :key="item.key"
+                        ><span class="u-label" :class="item.className">{{ item.label }}</span>{{ item.value }}</span
+                    >
                 </div>
                 <div class="u-metas">
                     <span class="u-meta"
@@ -363,13 +359,22 @@ export default {
             return getFurnitureType(this.data, this.category);
         },
         furniture_attrs: function () {
+            const hasAttrValue = (value) => ![undefined, null, ""].includes(value);
+            const useDefaultAttrs =
+                Number(this.data?.nFurnitureType) === 2 &&
+                !this.data?.Attribute1 &&
+                !this.data?.Attribute2 &&
+                !this.data?.Attribute3 &&
+                !this.data?.Attribute4 &&
+                !this.data?.Attribute5;
+
             return [
-                { key: "view", label: "观赏", value: this.data?.Attribute1, className: "blue" },
-                { key: "practical", label: "实用", value: this.data?.Attribute2, className: "pink" },
-                { key: "strong", label: "坚固", value: this.data?.Attribute3, className: "yellow" },
-                { key: "fengshui", label: "风水", value: this.data?.Attribute4, className: "green" },
-                { key: "interest", label: "趣味", value: this.data?.Attribute5, className: "purple" },
-            ].filter((item) => item.value);
+                { key: "view", label: "观赏", value: useDefaultAttrs ? 1 : this.data?.Attribute1, className: "blue" },
+                { key: "practical", label: "实用", value: useDefaultAttrs ? 1 : this.data?.Attribute2, className: "pink" },
+                { key: "strong", label: "坚固", value: useDefaultAttrs ? 1 : this.data?.Attribute3, className: "yellow" },
+                { key: "fengshui", label: "风水", value: useDefaultAttrs ? 1 : this.data?.Attribute4, className: "green" },
+                { key: "interest", label: "趣味", value: useDefaultAttrs ? 1 : this.data?.Attribute5, className: "purple" },
+            ].filter((item) => hasAttrValue(item.value));
         },
 
         has_extend: function () {

src/views/furniture/miniprogram/index.vue

@@ -219,6 +219,11 @@ export default {
                             value: "庐园广记",
                             paramsKey: "isSet",
                         },
+                        {
+                            key: "1",
+                            value: "园宅会赛",
+                            paramsKey: "isMatch",
+                        },
                     ],
                 },
             ],