From 5e4f3aced67f0285c169953a09b8dedf3a614a44 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 26 Aug 2024 16:55:16 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
 =?UTF-8?q?=EF=BC=9A=E6=96=87=E5=8C=96=E7=9A=84=E5=9B=BE=E7=89=87=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=9D=A0=E5=B7=A6=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/v12-style.less                | 41 +++++++++++-------------
 pkg_product/views/famousQianxianShop.vue |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 3c1ff9a..5fdf542 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -2,30 +2,22 @@
 @primary-color: #C52733;
 @dark-color: #333333;
 @white-color: #fff;
+
+@colors: #C52733, #333333, #fff;
+@classnames: primary, dark, white;
 /*=====================================*/ 
 
-.v12-primary{
-  background-color: @primary-color;
-  background: @primary-color;
-}
-.v12-primary-text{
-  color: @primary-color;
-}
-.v12-dark{
-  background: @dark-color !important;
-  background-color: @dark-color !important;
-}
-.v12-dark-text{
-  color: @dark-color !important;
-}
-.v12-white{
-  background-color: @white-color;
-  background: @white-color;
-}
-.v12-white-color{
-  background-color: @white-color;
-  background: @white-color;
-}
+each(@colors, {
+  @color: extract(@colors, @index);
+  @classname: extract(@classnames, @index);
+  .v12-@{classname} {
+    background-color: @color !important;
+    background: @color !important;
+  }
+  .v12-@{classname}-text{
+    color: @color !important;
+  }
+});
 
 .generateFontSize(@i) when (@i <= 80) {
   .v12-font-@{i} {
@@ -48,6 +40,11 @@
   display: flex;
   justify-content: center;
 }
+.v12-d-grid-columns-2 {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+}
+
 
 
 
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 1a8afe9..b26881d 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -240,7 +240,7 @@
             <view class="title">
               图片
             </view>
-            <view class="pic-list">
+            <view class="pic-list v12-d-grid-columns-2">
               <view
                 v-for="(item, index) in inn.countyImages"
                 :key="index"
@@ -1358,12 +1358,12 @@ export default {
     }
   }
   .pic-list {
-    display: flex;
-    flex-wrap: wrap;
+    // display: flex;
+    // flex-wrap: wrap;
     width: 100%;
     padding: 30rpx 0 0 0;
     .item {
-      width: calc(50% - 10rpx);
+      // width: calc(50% - 10rpx);
       margin: 0 20rpx 20rpx 0;
       .img {
         display: block;