Merge branch 'zhongqi-discount' of git.huaml.com:zhh/front-end into zhongqi-discount

hdApp/src/admin/cg/mall.vue

@@ -5,7 +5,7 @@
       <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" style="margin-top:60upx;">
       <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(goodsUrl)">保存图片</button>

hdApp/src/admin/home/apply.vue

@@ -29,7 +29,7 @@ export default {
     return {
       menuList: [
         {
-            title:'🌹 绿植花束',
+            title:'🌹 花束',
             list:[
                 { name: "列表", emoji: "📋", url: "/admin/goods/list",pf:1},
                 { name: "分类", emoji: "📂", url: "/admin/goods/category",pf:1},
@@ -38,7 +38,7 @@ export default {
             ]
         },
         {
-            title:'🌿 花材',
+            title:'🌿 花材绿植',
             list:[
                 {name: "列表", emoji: "📋", url: "/admin/item/list2",pf:1},
                 {name: "分类", emoji: "📂", url: "/admin/itemClass/list",pf:1},

hdApp/src/admin/home/mall.vue

@@ -60,7 +60,7 @@
         <!-- 花束 -->
         <view class="flower-section">
           <view class="section-header">
-            <view class="header-title">🌹 绿植花束</view>
+            <view class="header-title">🌹 花束</view>
           </view>
           <view class="icon-grid">
             <view class="icon-item" @click="goPage({url: '/admin/cg/mall'})">
@@ -103,7 +103,7 @@
               <view class="icon-wrapper">
                 <view class="icon-emoji">🌸</view>
               </view>
-              <view class="icon-text">绿植花束</view>
+              <view class="icon-text">花束</view>
             </view>
             <view class="icon-item" @click="goPage({url: '/admin/goods/add'})">
               <view class="icon-wrapper">
@@ -117,7 +117,7 @@
         <!-- 花材 -->
         <view class="flower-section">
           <view class="section-header">
-            <view class="header-title">🌿 花材</view>
+            <view class="header-title">🌿 花材绿植</view>
           </view>
           <view class="icon-grid">
             <view class="icon-item" @click="goPage({url: '/admin/cg/item'})">

hdApp/src/admin/shop/sk.vue

@@ -75,7 +75,7 @@
 
           <view style="border: 1px solid #2bb931;margin:20upx 10upx;background-color: white;">
             <view class="action-btn" style="margin-top:20upx;margin-bottom:10upx;background-color: white;">
-              <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
+              <text style="font-size: 30upx;font-weight: bold;">【零售-花材绿植】跑腿费计算方式</text>
             </view>
             <view style="display: flex; align-items: center; margin-left:30upx;">
               <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
@@ -105,7 +105,7 @@
 
 
           <view style="border: 1px solid #2bb931;margin:20upx 10upx;background-color: white;">
-            <view class="section-title" style="margin-bottom:10upx;background-color: white;">【零售-绿植花束】跑腿费计算方式</view>
+            <view class="section-title" style="margin-bottom:10upx;background-color: white;">【零售-花束】跑腿费计算方式</view>
             <tui-list-cell class="line-cell" :hover="false">
               <view class="tui-title">包配送的</view>
               <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />

hdApp/src/pages.json

@@ -297,7 +297,7 @@
 		{
 			"root": "admin/goods",
 			"pages": [
-				{ "path": "list", "style": { "navigationBarTitleText": "绿植花束" } },
+				{ "path": "list", "style": { "navigationBarTitleText": "花束" } },
 				{ "path": "lz", "style": { "navigationBarTitleText": "绿植" } },
 				{ "path": "category", "style": { "navigationBarTitleText": "分类" } },
 				{ "path": "kind", "style": { "navigationBarTitleText": "花束品类" } },

hdApp/src/pages_app.json

@@ -297,7 +297,7 @@
 		{
 			"root": "admin/goods",
 			"pages": [
-				{ "path": "list", "style": { "navigationBarTitleText": "绿植花束" } },
+				{ "path": "list", "style": { "navigationBarTitleText": "花束" } },
 				{ "path": "lz", "style": { "navigationBarTitleText": "绿植" } },
 				{ "path": "category", "style": { "navigationBarTitleText": "分类" } },
 				{ "path": "kind", "style": { "navigationBarTitleText": "花束品类" } },

mallApp/src/pages.json

@@ -1,7 +1,7 @@
 {
     "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我的花店","enablePullDownRefresh":true} },
         { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
-        { "path": "pages/home/category", "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": "我的" } },

mallApp/src/pages/home/mall.vue

@@ -24,13 +24,13 @@
         <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()">
           <view class="btn-content">
             <text class="flower-icon">💐</text>
-            <text class="btn-text">绿植花束</text>
+            <text class="btn-text">花束</text>
           </view>
         </button>
       </view>

mallApp/src/pages/home/recent.vue

@@ -154,10 +154,10 @@
             <!-- 操作按钮组 -->
             <view class="action-buttons">
               <view class="action-btn secondary" :class="{ disabled: item.openShop === 0 }" @click.stop="bug(item)">
-                <text class="btn-text">🌸 花材</text>
+                <text class="btn-text">🌸 花材绿植</text>
               </view>
               <view class="action-btn secondary" :class="{ disabled: item.openShop === 0 }" @click.stop="hs(item)">
-                <text class="btn-text">💐 绿植花束</text>
+                <text class="btn-text">💐 花束</text>
               </view>
             </view>
 

mallApp/src/pages/item/item.vue

@@ -17,7 +17,7 @@
 			<view class="buy-flower-container">
 				<button class="buy-mall-btn" @click="buyHs()">
 					<view class="btn-content">
-						<text class="btn-text">买绿植花束</text>
+						<text class="btn-text">买花束</text>
 					</view>
 				</button>
 				<button @click="scanCode()" style="background: linear-gradient(135deg, #ff6b6b 0%, #ee5a24 100%);border: none;">