shish před 7 měsíci
rodič
revize
df76a942e3

+ 0 - 3
ghsApp/src/admin/item/xj.vue

@@ -81,9 +81,6 @@ export default {
 	},
 	},
 	onPullDownRefresh() {
 	onPullDownRefresh() {
 	},
 	},
-	onShow(){
-		this.init()
-	},
 	methods: {
 	methods: {
 		goChange(){
 		goChange(){
 			let productId = this.option.productId ? this.option.productId : 0
 			let productId = this.option.productId ? this.option.productId : 0

+ 27 - 34
ghsPad/src/pages/home/components/selectFlowerGrid.vue

@@ -2,9 +2,9 @@
     <view class="flower-grid-popup">
     <view class="flower-grid-popup">
         <!-- 标题栏 -->
         <!-- 标题栏 -->
         <view class="popup-header">
         <view class="popup-header">
-            <text class="popup-title">多颜色</text>
-            <view class="close-btn" @tap="handleCancel">
-                <text>✕</text>
+            <view class="header-content">
+                <text>剩7扎 单价:</text>
+                <input class="price-input" @focus="option.price=''" v-model="option.price" type="digit" />
             </view>
             </view>
         </view>
         </view>
 
 
@@ -14,18 +14,13 @@
                 <view v-for="item in flowerList" :key="item.id" class="flower-grid-item">
                 <view v-for="item in flowerList" :key="item.id" class="flower-grid-item">
                     <!-- 商品图片 -->
                     <!-- 商品图片 -->
                     <view class="flower-img-box">
                     <view class="flower-img-box">
-                        <image 
-                            :src="item.cover"
-                            mode="aspectFill"
-                            class="flower-img"
-                            lazy-load="false">
-                        </image>
+                        <image :src="item.cover" mode="aspectFill" class="flower-img" lazy-load="false"> </image>
                     </view>
                     </view>
 
 
                     <!-- 商品信息 -->
                     <!-- 商品信息 -->
                     <view class="flower-info">
                     <view class="flower-info">
                         <text class="flower-name">{{item.name}}</text>
                         <text class="flower-name">{{item.name}}</text>
-
+                        <text style="color:#615e5e;width:100%;font-size:12upx;text-align:center;">剩{{item.stock?parseFloat(item.stock):0}}</text>
                         <!-- 数量调整器 -->
                         <!-- 数量调整器 -->
                         <view class="quantity-controller">
                         <view class="quantity-controller">
                             <view class="qty-btn minus-btn" @tap="decreaseQty(item)">
                             <view class="qty-btn minus-btn" @tap="decreaseQty(item)">
@@ -157,36 +152,35 @@ export default {
     overflow: hidden;
     overflow: hidden;
     box-shadow: 0 4upx 16upx rgba(0, 0, 0, 0.15);
     box-shadow: 0 4upx 16upx rgba(0, 0, 0, 0.15);
 
 
-    // 头部 - 再缩小 1/2 (总计 33.33%)
     .popup-header {
     .popup-header {
-        height: 27.78upx;
+        height: 50upx;
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
-        justify-content: space-between;
-        padding: 0 11.11upx;
+        justify-content: center;
+        padding: 0 30upx;
         border-bottom: 2upx solid #eeeeee;
         border-bottom: 2upx solid #eeeeee;
         background-color:#c3cfe2;
         background-color:#c3cfe2;
 
 
-        .popup-title {
-            font-size: 14upx;
-            font-weight: bold;
-            color: #333333;
-            letter-spacing: 0.28upx;
-        }
-
-        .close-btn {
-            width: 16upx;
-            height: 16upx;
+        .header-content {
             display: flex;
             display: flex;
             align-items: center;
             align-items: center;
-            justify-content: center;
-            border-radius: 50%;
-            background-color: #ffffff;
-            transition: all 0.3s;
-            box-shadow: 0 2upx 8upx rgba(0, 0, 0, 0.1);
+
             text {
             text {
-                font-size: 9upx;
-                color: #666666;
+                font-size: 18upx;
+                color: #333333;
+                font-weight: 500;
+                margin-right: 10upx;
+            }
+
+            .price-input {
+                border: 1upx solid black;
+                width: 90upx;
+                height: 32upx;
+                padding: 0 8upx;
+                box-sizing: border-box;
+                border-radius: 3upx;
+                font-size: 16upx;
+                text-align: center;
             }
             }
         }
         }
     }
     }
@@ -265,11 +259,10 @@ export default {
                 align-items: center;
                 align-items: center;
 
 
                 .flower-name {
                 .flower-name {
-                    font-size: 11upx;
+                    font-size: 12upx;
                     font-weight: 500;
                     font-weight: 500;
-                    color: #333333;
+                    color: black;
                     text-align: center;
                     text-align: center;
-                    margin-bottom: 7.97upx;
                     display: -webkit-box;
                     display: -webkit-box;
                     -webkit-line-clamp: 1;
                     -webkit-line-clamp: 1;
                     -webkit-box-orient: vertical;
                     -webkit-box-orient: vertical;