shish 11 luni în urmă
părinte
comite
10b1e217c7

+ 1 - 1
hdApp/src/admin/goods/price-increase.vue

@@ -42,7 +42,7 @@
 					</tui-list-cell>
 				</block>
 			</div>
-			<div class="prompt-text">涨价只对花束商城生效,花材和花束图集无效</div>
+			<div class="prompt-text">涨价只对花束商城生效,花材和花束相册无效</div>
 		</block>
 		<div class="button-group">
 			<button class="admin-button-com default big cancel-btn" @click="goBack">取消</button>

+ 4 - 4
hdApp/src/admin/home/workbench.vue

@@ -83,7 +83,7 @@
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/shop2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">图集</view>
+              <view class="icon-text">相册</view>
             </view>
             <view class="icon-item" @click="goHsKd">
               <view class="icon-wrapper">
@@ -870,7 +870,7 @@ export default {
       if(this.urlNo == 1){
         url = 'pages/home/category'
       }
-      //图集
+      //相册
       if(this.urlNo == 2){
         url = 'pages/home/mall'
       }
@@ -890,10 +890,10 @@ export default {
         currentShortUrl = this.shortUrlList['goodsUrl']
         text = "点击下面链接,打开商城\n\n"+currentShortUrl
       }
-      //图集
+      //相册
       if(this.urlNo == 2){
         currentShortUrl = this.shortUrlList['imgUrl']
-        text = "点击下面链接,打开图集\n\n"+currentShortUrl
+        text = "点击下面链接,打开相册\n\n"+currentShortUrl
       }
       //绿植花材商城
       if(this.urlNo == 3){

+ 102 - 3
mallApp/src/pages/home/category.vue

@@ -10,7 +10,7 @@
 			</view>
 		</view>
 
-		<!-- 搜索框和花材绿植按钮区域 -->
+		<!-- 搜索框和按钮区域 -->
 		<view class="search-wrap">
 			<view class="search-bar">
 				<app-search-module 
@@ -21,7 +21,13 @@
 					:fontSize="28"
 				/>
 			</view>
-			<view class="buy-material-container">
+			<view class="buy-flower-container">
+				<button class="buy-flower-btn" @click="buyAlbum()">
+					<view class="btn-content">
+						<view class="flower-icon-css"></view>
+						<text class="btn-text">花束图集</text>
+					</view>
+				</button>
 				<button class="buy-material-btn" @click="buyProduct()">
 					<view class="btn-content">
 						<text class="btn-text">花材绿植</text>
@@ -177,6 +183,10 @@ export default {
       let account = this.option.account?this.option.account:0
       this.$util.pageTo({url:"/pages/item/item?account="+account+'&hdId='+this.hdId,type:2})
     },
+    buyAlbum(){
+      let account = this.option.account ? this.option.account : 0
+      this.$util.pageTo({url: "/pages/home/mall?account="+account+'&hdId='+this.hdId,type:2})
+    },
     loginTo() {
       let account = this.option.account?this.option.account:0
       this.$util.pageTo({url:"/pages/login/index?needBack=1&account="+account})
@@ -564,8 +574,85 @@ page {
 	}
 }
 
-.buy-material-container {
+.buy-flower-container {
 	flex-shrink: 0;
+	display: flex;
+	gap: 10upx;
+}
+
+.buy-flower-btn {
+	position: relative;
+	background: linear-gradient(135deg, #ff6b6b, #ff8e8e, #ffa8a8);
+	border: none;
+	border-radius: 50upx;
+	padding: 0;
+	height: 80upx;
+	min-width: 200upx;
+	box-shadow: 0 8upx 20upx rgba(255, 107, 107, 0.3);
+	overflow: hidden;
+	animation: pulse 2s infinite;
+
+	&:active {
+		box-shadow: 0 4upx 10upx rgba(255, 107, 107, 0.4);
+	}
+
+	.btn-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		position: relative;
+		z-index: 1;
+		text-align: center;
+	}
+
+	.flower-icon-css {
+		width: 24upx;
+		height: 24upx;
+		margin-right: 8upx;
+		position: relative;
+
+		&::before {
+			content: '';
+			position: absolute;
+			width: 16upx;
+			height: 16upx;
+			background: #fff;
+			border-radius: 50%;
+			top: 4upx;
+			left: 4upx;
+			box-shadow: 
+				0 -8upx 0 -2upx #fff,
+				8upx -6upx 0 -2upx #fff,
+				8upx 6upx 0 -2upx #fff,
+				0 8upx 0 -2upx #fff,
+				-8upx 6upx 0 -2upx #fff,
+				-8upx -6upx 0 -2upx #fff;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			width: 8upx;
+			height: 8upx;
+			background: #ffeb3b;
+			border-radius: 50%;
+			top: 8upx;
+			left: 8upx;
+		}
+	}
+
+	.btn-text {
+		color: white;
+		font-size: 28upx;
+		font-weight: bold;
+		text-shadow: 0 2upx 4upx rgba(0, 0, 0, 0.2);
+		margin-right: 8upx;
+		text-align: center;
+		line-height: 1;
+		display: flex;
+		align-items: center;
+	}
 }
 
 .buy-material-btn {
@@ -602,6 +689,18 @@ page {
 	}
 }
 
+@keyframes pulse {
+	0% {
+		box-shadow: 0 8upx 20upx rgba(255, 107, 107, 0.3);
+	}
+	50% {
+		box-shadow: 0 12upx 30upx rgba(255, 107, 107, 0.4);
+	}
+	100% {
+		box-shadow: 0 8upx 20upx rgba(255, 107, 107, 0.3);
+	}
+}
+
 @keyframes fadeInFrames {
 	0% {
 		opacity: 0;

+ 102 - 3
mallApp/src/pages/home/mall.vue

@@ -10,7 +10,7 @@
 			</view>
 		</view>
 
-		<!-- 搜索框和花材绿植按钮区域 -->
+		<!-- 搜索框和按钮区域 -->
 		<view class="search-wrap">
 			<view class="search-bar">
 				<app-search-module 
@@ -21,7 +21,13 @@
 					:fontSize="28"
 				/>
 			</view>
-			<view class="buy-material-container">
+			<view class="buy-flower-container">
+				<button class="buy-flower-btn" @click="buyHs()">
+					<view class="btn-content">
+						<view class="flower-icon-css"></view>
+						<text class="btn-text">花束花礼</text>
+					</view>
+				</button>
 				<button class="buy-material-btn" @click="buyProduct()">
 					<view class="btn-content">
 						<text class="btn-text">花材绿植</text>
@@ -175,6 +181,10 @@ export default {
       let account = this.option.account?this.option.account:0
       this.$util.pageTo({url:"/pages/item/item?account="+account+'&hdId='+this.hdId,type:2})
     },
+    buyHs(){
+      let account = this.option.account ? this.option.account : 0
+      this.$util.pageTo({url: "/pages/home/category?account="+account+'&hdId='+this.hdId,type:2})
+    },
     loginTo() {
       let account = this.option.account?this.option.account:0
       this.$util.pageTo({url:"/pages/login/index?needBack=1&account="+account})
@@ -550,8 +560,85 @@ page {
 	}
 }
 
-.buy-material-container {
+.buy-flower-container {
 	flex-shrink: 0;
+	display: flex;
+	gap: 10upx;
+}
+
+.buy-flower-btn {
+	position: relative;
+	background: linear-gradient(135deg, #ff6b6b, #ff8e8e, #ffa8a8);
+	border: none;
+	border-radius: 50upx;
+	padding: 0;
+	height: 80upx;
+	min-width: 200upx;
+	box-shadow: 0 8upx 20upx rgba(255, 107, 107, 0.3);
+	overflow: hidden;
+	animation: pulse 2s infinite;
+
+	&:active {
+		box-shadow: 0 4upx 10upx rgba(255, 107, 107, 0.4);
+	}
+
+	.btn-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		position: relative;
+		z-index: 1;
+		text-align: center;
+	}
+
+	.flower-icon-css {
+		width: 24upx;
+		height: 24upx;
+		margin-right: 8upx;
+		position: relative;
+
+		&::before {
+			content: '';
+			position: absolute;
+			width: 16upx;
+			height: 16upx;
+			background: #fff;
+			border-radius: 50%;
+			top: 4upx;
+			left: 4upx;
+			box-shadow: 
+				0 -8upx 0 -2upx #fff,
+				8upx -6upx 0 -2upx #fff,
+				8upx 6upx 0 -2upx #fff,
+				0 8upx 0 -2upx #fff,
+				-8upx 6upx 0 -2upx #fff,
+				-8upx -6upx 0 -2upx #fff;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			width: 8upx;
+			height: 8upx;
+			background: #ffeb3b;
+			border-radius: 50%;
+			top: 8upx;
+			left: 8upx;
+		}
+	}
+
+	.btn-text {
+		color: white;
+		font-size: 28upx;
+		font-weight: bold;
+		text-shadow: 0 2upx 4upx rgba(0, 0, 0, 0.2);
+		margin-right: 8upx;
+		text-align: center;
+		line-height: 1;
+		display: flex;
+		align-items: center;
+	}
 }
 
 .buy-material-btn {
@@ -588,6 +675,18 @@ page {
 	}
 }
 
+@keyframes pulse {
+	0% {
+		box-shadow: 0 8upx 20upx rgba(255, 107, 107, 0.3);
+	}
+	50% {
+		box-shadow: 0 12upx 30upx rgba(255, 107, 107, 0.4);
+	}
+	100% {
+		box-shadow: 0 8upx 20upx rgba(255, 107, 107, 0.3);
+	}
+}
+
 @keyframes fadeInFrames {
 	0% {
 		opacity: 0;