商品有价格和无价格的优化

hdApp/src/admin/goods/add.vue

@@ -52,10 +52,10 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">存放位置</view>
+          <view class="tui-title">价格类型</view>
           <view class="btn-group">
-            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">相册</button>
-            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">商城</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">无价</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">有价</button>
           </view>
         </tui-list-cell>
 
@@ -78,12 +78,12 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">用花支数</view>
+          <view class="tui-title">用花支数</view>
           <input v-model="form.flowerNum" placeholder-class="phcolor" @focus="onFlowerNumFocus" @blur="onFlowerNumBlur" class="tui-input" name="flowerNum" placeholder="用于判断花束大小" maxlength="5" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">重量</view>
+          <view class="tui-title">重量</view>
           <input v-model="form.weight" placeholder-class="phcolor" @focus="onWeightFocus" @blur="onWeightBlur" class="tui-input" name="weight" placeholder="公斤，可输入小数" maxlength="10" type="digit" />
         </tui-list-cell>
 
@@ -161,8 +161,8 @@ export default {
         stock: 0,
         stockSet: '0', // 默认库存充足
         priceType: '0', // 默认没价格
-        flowerNum: "",
-        weight: "",
+        flowerNum: 0,
+        weight: 1,
         catIds: [],
         autoRise: "1",
         needSend: "0",

hdApp/src/admin/goods/categorySort.vue

@@ -11,11 +11,12 @@
               transition: isDragging ? 'none' : 'transform 0.3s ease',
               zIndex: draggedIndex === index ? 999 : 1
             }"
+            @click="navigateToGoodsSort(item.id)"
           >
-            <view class="list-img" @click="navigateToGoodsSort(item.id)">
+            <view class="list-img">
               <image :src="item.img" mode="aspectFit"></image>
             </view>
-            <view class="list-det" @click="navigateToGoodsSort(item.id)">
+            <view class="list-det">
               <view class="app-size-28 app-color-0" style="font-size: 30rpx; font-weight: bold">{{ item.categoryName }}</view>
             </view>
 
@@ -29,6 +30,7 @@
 						<text style="right:125rpx;" class="move-btn" @click.stop="downFn(item.id)">↓</text>
 						-->
 
+            <!-- 这个页面不显示，影响用户使用，这个做到分类页去
             <view
               style="position: absolute; top: 50rpx; right: 188rpx; cursor: move"
               class="drag-handle"
@@ -40,8 +42,10 @@
             >
               <text style="color: #333333; font-size: 45rpx">≡</text>
             </view>
+            -->
+
             <view class="confirm-btn">
-              <button class="admin-button-com middle blue" style="position:absolute;top:50rpx;right: 10rpx" @click="navigateToGoodsSort(item.id)">去排序</button>
+              <button class="admin-button-com middle blue" style="position:absolute;top:50rpx;right: 10rpx">去排序</button>
             </view>
           </view>
         </block>

hdApp/src/admin/goods/detail.vue

@@ -56,10 +56,10 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">存放位置</view>
+          <view class="tui-title">价格类型</view>
           <view class="btn-group">
-            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">相册</button>
-            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">商城</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '0' ? '' : 'default']" @click="setPriceType('0')">无价</button>
+            <button class="admin-button-com middle" :class="[form.priceType === '1' ? '' : 'default']" @click="setPriceType('1')">有价</button>
           </view>
         </tui-list-cell>
 
@@ -88,12 +88,12 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">用花支数</view>
+          <view class="tui-title">用花支数</view>
           <input v-model="form.flowerNum" @focus="onFlowerNumFocus" @blur="onFlowerNumBlur" placeholder-class="phcolor" class="tui-input" name="flowerNum" placeholder="用于判断花束大小" maxlength="5" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">重量</view>
+          <view class="tui-title">重量</view>
           <input v-model="form.weight" @focus="onWeightFocus" @blur="onWeightBlur" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="公斤，可输入小数" maxlength="10" type="digit" />
         </tui-list-cell>
 

hdApp/src/admin/goods/goodsSort.vue

@@ -1,31 +1,6 @@
 <template>
   <view class="app-content">
-    <!-- 价格类型切换：相册 / 商城 -->
-    <view class="modern-tabs-container">
-      <view class="modern-tabs">
-        <view
-          class="modern-tab"
-          :class="{ 'active': priceType === 0 }"
-          @click="switchPriceTab(0)"
-        >
-          <view class="tab-content">
-            <text class="tab-icon">🏷️</text>
-            <text class="tab-text">相册</text>
-          </view>
-        </view>
-        <view
-          class="modern-tab"
-          :class="{ 'active': priceType === 1 }"
-          @click="switchPriceTab(1)"
-        >
-          <view class="tab-content">
-            <text class="tab-icon">💰</text>
-            <text class="tab-text">商城</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    
+   
     <view class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
         <block v-for="(item, index) in list.data" :key="item.id">
@@ -53,6 +28,7 @@
 
             <view class="list-det" style="position: absolute; bottom: 15upx; left: 122upx">
               <view v-if="item.priceType == 1" class="app-size-28 app-color-0" style="font-size: 24upx">¥{{ item.price?parseFloat(item.price):0 }}</view>
+              <view v-else>--</view>
             </view>
             <view
               v-if="index > 0"
@@ -120,7 +96,6 @@ export default {
   mixins: [list],
   data() {
     return {
-      priceType: 0, // 0 相册（无价格），1 商城（有价格）
       draggedIndex: -1,
       draggedItem: null,
       dragOffsetY: 0,
@@ -173,8 +148,7 @@ export default {
       const params = {
         cId: this.option.id,
         page: this.list.page,
-        pageSize: this.list.pageSize,
-        priceType: this.priceType
+        pageSize: this.list.pageSize
       };
 
       return getListB(params)
@@ -188,14 +162,6 @@ export default {
           this.list.loading = false;
         });
     },
-    // 切换 相册 / 商城
-    switchPriceTab(value) {
-      if (this.priceType === value) return;
-      this.priceType = value;
-      this.resetList();
-      this._list();
-    },
-
     // 响应 touchmove 事件并实时更新 transform 样式
     transformStyle(index) {
       if (index === this.draggedIndex) {

hdApp/src/admin/goods/list.vue

@@ -3,34 +3,22 @@
 
     <view class="modern-tabs-container">
       <view class="modern-tabs">
-        <view 
-          class="modern-tab" 
-          :class="{ 'active': priceType === 0 }" 
-          @click="switchPriceTab(0)"
-        >
+        <view class="modern-tab" :class="{ 'active': priceType === -1 }" @click="switchPriceTab(-1)" >
           <view class="tab-content">
-            <text class="tab-icon">🏷️</text>
-            <text class="tab-text">相册</text>
+            <text class="tab-icon">📋</text>
+            <text class="tab-text">全部</text>
           </view>
         </view>
-        <view 
-          class="modern-tab" 
-          :class="{ 'active': priceType === 1 }" 
-          @click="switchPriceTab(1)"
-        >
+        <view class="modern-tab" :class="{ 'active': priceType === 0 }" @click="switchPriceTab(0)" >
           <view class="tab-content">
-            <text class="tab-icon">💰</text>
-            <text class="tab-text">商城</text>
+            <text class="tab-icon">🏷️</text>
+            <text class="tab-text">无价</text>
           </view>
         </view>
-        <view 
-          class="modern-tab" 
-          :class="{ 'active': priceType === -1 }" 
-          @click="switchPriceTab(-1)"
-        >
+        <view class="modern-tab" :class="{ 'active': priceType === 1 }" @click="switchPriceTab(1)" >
           <view class="tab-content">
-            <text class="tab-icon">📋</text>
-            <text class="tab-text">全部</text>
+            <text class="tab-icon">💰</text>
+            <text class="tab-text">有价</text>
           </view>
         </view>
       </view>
@@ -185,7 +173,7 @@ export default {
       searchTimer: null, // 搜索防抖定时器
       riseData: {}, // 价格上涨配置
       hasStock:-1, // 0没库存 1有库存
-      priceType:0, // 0 没价格，1 有价格 
+      priceType:-1,// 0 没价，1 有价 
       // 新增筛选相关数据
       showFilterPanel: false,
       // 价格筛选已移至顶部标签页

hdApp/src/admin/home/apply.vue

@@ -36,6 +36,7 @@ export default {
                 { name: "分类", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/category",pf:1},
                 { name: "排序", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/categorySort",pf:1},
                 { name: "涨价设置", img: `${this.$constant.hostUrl}/image/ghs/home/gj2.png`, url: "/admin/goods/price-increase",pf:1},
+                { name: "新建任务", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/order/workOrder",pf:1},
             ]
         },
         {

hdApp/src/admin/home/workbench.vue

@@ -116,12 +116,6 @@
               </view>
               <view class="icon-text">商城</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/cg/album'})">
-              <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>
             <view class="icon-item" @click="goHsKd">
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/pandian2.png`" mode="aspectFit"></image>
@@ -140,11 +134,17 @@
               </view>
               <view class="icon-text">任务</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/order/workOrder'})">
+            <view class="icon-item" @click="goPage({url: '/admin/goods/category'})">
+              <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>
+            <view class="icon-item" @click="goPage({url: '/admin/goods/categorySort'})">
               <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: '/admin/goods/list'})">
               <view class="icon-wrapper">

hdApp/src/pages.json

@@ -318,7 +318,7 @@
 				{ "path": "pdGoodsConfirm", "style": { "navigationBarTitleText": "确认盘点" } },
 				{ "path": "pdGoodsDetail", "style": { "navigationBarTitleText": "详情" } },
 				{ "path": "categorySort", "style": { "navigationBarTitleText": "排序" } },
-				{ "path": "goodsSort", "style": { "navigationBarTitleText": "商品排序" } },
+				{ "path": "goodsSort", "style": { "navigationBarTitleText": "排序" } },
 				{ "path": "picTextAdd-Edit", "style": { "navigationBarTitleText": "创建简介" } }
 			]
 		},