花束花篮

hdApp/src/admin/cg/item.vue

@@ -4,7 +4,7 @@
     <view class="img_box" style="margin-top:30upx;">
       <image :src="flowerUrl" mode="heightFix" class="img_url"></image>
     </view>
-    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花材绿植</view>
+    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">绿植花材</view>
     <div class="confirm-btn">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(flowerUrl)">保存图片</button>
     </div>

hdApp/src/admin/cg/mall.vue

@@ -5,17 +5,17 @@
       <image :src="goodsUrl" mode="heightFix" class="img_url"></image>
     </view>
 
-    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花束商城</view>
+    <view style="margin:20upx auto 20upx auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花束花篮</view>
 
-    <view class="confirm-btn">
+    <view class="confirm-btn" style="margin-top:50upx;">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(goodsUrl)">保存图片</button>
     </view>
 
-    <view class="confirm-btn1">
+    <view class="confirm-btn1" style="margin-top:50upx;">
       <button class="admin-button-com big" style="width:60vw;" @click="goToMallPt('pages/home/category')">直接打开</button>
     </view>
 
-    <view class="confirm-btn1" style="margin-top:100upx;">
+    <view class="confirm-btn1" style="margin-top:50upx;">
       <button class="admin-button-com big" style="width:60vw;" @click="copyLink">复制链接</button>
     </view>
 

hdApp/src/admin/home/apply.vue

@@ -40,7 +40,7 @@ export default {
             ]
         },
         {
-            title:'花材绿植',
+            title:'绿植花材',
             list:[
                 {name: "列表",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/item/list2",pf:1},
                 {name: "分类",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/itemClass/list",pf:1},

hdApp/src/admin/home/workbench.vue

@@ -165,7 +165,7 @@
         <view class="flower-section">
           <view class="section-header">
             <view class="header-line"></view>
-            <view class="header-title">花材绿植</view>
+            <view class="header-title">绿植花材</view>
             <view class="header-line"></view>
           </view>
           <view class="icon-grid">
@@ -209,7 +209,7 @@
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/hcgl2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">花材绿植</view>
+              <view class="icon-text">绿植花材</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/pagesPurchase/order'})">
               <view class="icon-wrapper">

hdApp/src/pages.json

@@ -85,8 +85,8 @@
 		{
 			"root": "admin/item",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "花材绿植"}},
-				{"path": "list2","style": {"navigationBarTitleText": "花材绿植"}},
+				{"path": "list","style": {"navigationBarTitleText": "绿植花材"}},
+				{"path": "list2","style": {"navigationBarTitleText": "绿植花材"}},
 				{"path": "copy","style": {"navigationBarTitleText": "复制新建"}},
 				{"path": "detail","style": {"navigationBarTitleText": "花材详情"}},
 				{"path": "add","style": {"navigationBarTitleText": "添加花材"}},
@@ -116,7 +116,7 @@
 			"pages": [
 				{ "path": "mall", "style": { "navigationBarTitleText": "商城" } },
 				{ "path": "album", "style": { "navigationBarTitleText": "相册" } },
-				{ "path": "item", "style": { "navigationBarTitleText": "花材绿植" } },
+				{ "path": "item", "style": { "navigationBarTitleText": "绿植花材" } },
 				{ "path": "code", "style": { "navigationBarTitleText": "收款码" } },
 				{ "path": "member", "style": { "navigationBarTitleText": "注册会员码" } },
 				{ "path": "alipay", "style": { "navigationBarTitleText": "付款" } }

mallApp/src/pages.json

@@ -1,12 +1,12 @@
 {
     "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我的花店","enablePullDownRefresh":true} },
         { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
-        { "path": "pages/home/category", "style": { "navigationBarTitleText": "花束商城" } },
-        { "path": "pages/home/mall", "style": { "navigationBarTitleText": "花束相册" } },
+        { "path": "pages/home/category", "style": { "navigationBarTitleText": "花束花篮" } },
+        { "path": "pages/home/mall", "style": { "navigationBarTitleText": "相册" } },
         { "path": "pages/home/shop", "style": { "navigationBarTitleText": "门店" } },
         { "path": "pages/home/user", "style": { "navigationBarTitleText": "我的" } },
         { "path": "pages/home/course", "style": { "navigationBarTitleText": "课程"}},
-        { "path": "pages/item/item", "style": { "navigationBarTitleText": "花材绿植"} },
+        { "path": "pages/item/item", "style": { "navigationBarTitleText": "绿植花材"} },
         { "path": "pages/item/detail", "style": { "navigationBarTitleText": "详情"} },
         { "path": "common/redirect", "style": { "navigationBarTitleText": "加载中..." } },
         { "path": "common/webview", "style": { "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } },

mallApp/src/pages/home/category.vue

@@ -18,12 +18,7 @@
 			<view class="buy-flower-container">
 				<button class="buy-material-btn" @click="buyProduct()">
 					<view class="btn-content">
-						<text class="btn-text">🌸 花材绿植</text>
-					</view>
-				</button>
-				<button class="buy-flower-btn" @click="buyAlbum()">
-					<view class="btn-content">
-						<text class="btn-text">📷 花束相册</text>
+						<text class="btn-text">🌸 绿植花材</text>
 					</view>
 				</button>
 			</view>
@@ -39,17 +34,18 @@
     <!-- 搜索结果展示区域 -->
     <scroll-view v-if="isSearchMode" scroll-y class="right-box" @scrolltolower="reachBottom">
       <view class="page-view" v-if="!$util.isEmpty(list.data)" >
-        <view class="goods-list" v-for="(items) in list.data" :key="items.id" @click="toBuy(items)" >
+        <view class="goods-list" v-for="(itemData) in list.data" :key="itemData.id" @click="toBuy(itemData)" >
           <view class="img-blo">
-            <image :src="items.smallCover" mode="aspectFill" ></image>
+            <image :src="itemData.smallCover" mode="aspectFill" ></image>
           </view>
           <view class="goods-det">
             <view class="goods-det-top">
-              <view class="goods-name">{{ items.name }}</view>
-              <view class="goods-sales">已售 {{ items.totalSold }}</view>
+              <view class="goods-name">{{ itemData.name }}</view>
+              <view class="goods-sales">已售 {{ itemData.totalSold }}</view>
             </view>
-            <view class="goods-price">￥{{ items.price?parseFloat(items.price):0 }}</view>
-            <view class="buy-btn">购买</view>
+            <view class="goods-price" v-if="Number(itemData.priceType) == 1">￥{{ itemData.price?parseFloat(itemData.price):0 }}</view>
+            <view class="goods-price" v-else>--</view>
+            <view class="buy-btn">购买{{ itemData.priceType }}</view>
           </view>
         </view>
       </view>
@@ -65,16 +61,17 @@
     <block v-for="(item,index) in tabbar" :key="index" >
       <scroll-view scroll-y class="right-box" @scrolltolower="reachBottom" v-if="!isSearchMode && currentTab==index" >
         <view class="page-view" v-if="!$util.isEmpty(list.data)" >
-          <view class="goods-list" v-for="(items) in list.data" :key="items.id" @click="toBuy(items)" >
+          <view class="goods-list" v-for="(itemData) in list.data" :key="itemData.id" @click="toBuy(itemData)" >
             <view class="img-blo">
-              <image :src="items.smallCover" mode="aspectFill" ></image>
+              <image :src="itemData.smallCover" mode="aspectFill" ></image>
             </view>
             <view class="goods-det">
               <view class="goods-det-top">
-                <view class="goods-name">{{ items.name }}</view>
-                <view class="goods-sales">已售 {{ items.totalSold }}</view>
+                <view class="goods-name">{{ itemData.name }}</view>
+                <view class="goods-sales">已售 {{ itemData.totalSold }}</view>
               </view>
-              <view class="goods-price">￥{{ items.price?parseFloat(items.price):0 }}</view>
+              <view class="goods-price" v-if="Number(itemData.priceType) == 1">￥{{ itemData.price?parseFloat(itemData.price):0 }}</view>
+              <view class="goods-price" v-else>--</view>
               <view class="buy-btn">购买</view>
             </view>
           </view>
@@ -134,7 +131,7 @@ export default {
 	},
   onShareAppMessage(res) {
 		return {
-			title: '花束商城',
+			title: '商城',
 			desc: "",
 			path: "pages/home/category?account="+this.option.account,
 		}

mallApp/src/pages/home/mall.vue

@@ -24,7 +24,7 @@
         <button class="buy-material-btn" @click="buyProduct()">
           <view class="btn-content">
             <text class="material-icon">🌸</text>
-            <text class="btn-text">花材绿植</text>
+            <text class="btn-text">绿植花材</text>
           </view>
         </button>
         <button class="buy-flower-btn" @click="buyHs()">
@@ -194,7 +194,7 @@ export default {
       console.log("---------- params: ", params);
       let account = this.option.account ? this.option.account : 0;
       this.$util.pageTo({
-        url: "/pages/goods/detail", //?id="+item.id+'&hdId='+this.hdId+'&categoryId='+this.categoryId+'&account='+account // 与 query 不能同时存在
+        url: "/pages/goods/detail",
         query: {
           id: item.id, // 商品id
           categoryId: item.categoryId,

mallApp/src/pages/home/recent.vue

@@ -156,13 +156,10 @@
             <!-- 操作按钮组 -->
             <view class="action-buttons">
               <view class="action-btn primary" @click.stop="bug(item)">
-                <text class="btn-text">🌸 花材绿植</text>
-              </view>
-              <view class="action-btn tertiary" @click.stop="tj(item)">
-                <text class="btn-text">📷 花束相册</text>
+                <text class="btn-text">🌸 绿植花材</text>
               </view>
               <view class="action-btn secondary" @click.stop="hs(item)">
-                <text class="btn-text">💐 花束商城</text>
+                <text class="btn-text">💐 花束花篮</text>
               </view>
             </view>
 

mallApp/src/pages/item/item.vue

@@ -15,11 +15,6 @@
 				<app-search-module v-model="py" placeholder="这里搜索" @input="searchFn" />
 			</view>
 			<view class="buy-flower-container">
-				<button class="buy-album-btn" @click="buyAlbum()">
-					<view class="btn-content">
-						<text class="btn-text">📷 花束相册</text>
-					</view>
-				</button>
 				<button class="buy-mall-btn" @click="buyHs()">
 					<view class="btn-content">
 						<text class="btn-text">💐 花束商城</text>
@@ -224,7 +219,7 @@ export default {
 	},
   	onShareAppMessage(res) {
 		return {
-			title: '花材绿植',
+			title: '绿植花材',
 			desc: "",
 			path: "pages/item/item?account="+this.option.account,
 		}