shish преди 11 месеца
родител
ревизия
66fbcc0858

+ 120 - 2
ghsApp/src/admin/item/add.vue

@@ -111,7 +111,10 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">每扎重量</div>
-          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位为公斤,参考红玫每扎1.2公斤" maxlength="50" type="digit" />
+          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="公斤" maxlength="50" type="digit" />
+          <view class="weight-reminder-icon" @click="showWeightPopup">
+            <text style="color: #999; font-size: 32upx; font-weight: bold;">?</text>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -190,6 +193,22 @@
       </view>
     </uni-popup>
 
+    <uni-popup ref="weightRef" background-color="#fff" type="center" :animation="false" class="weight-popup-style">
+      <view class="weight-popup-container">
+        <view class="weight-popup-title">花材重量参考</view>
+        <view class="weight-popup-content">
+          <view class="weight-item" v-for="(item, index) in weightReferenceData" :key="index">
+            <text class="weight-name">{{ item.name }}</text>
+            <text class="weight-value">{{ item.weight }}</text>
+          </view>
+        </view>
+        <view class="weight-popup-note">以上含纸箱平摊下来的重量,供参考</view>
+        <view class="weight-popup-footer">
+          <button class="weight-popup-btn" @click="closeWeightPopup">确定</button>
+        </view>
+      </view>
+    </uni-popup>
+
   </div>
 </template>
 
@@ -251,7 +270,15 @@ export default {
       hasRequest:0,
       productData:{id:0},
       headers:{token:''},
-      backCpInfo:{cpId:0,cpName:'',needUpdate:0}
+      backCpInfo:{cpId:0,cpName:'',needUpdate:0},
+      weightReferenceData:[
+        {name: '单头玫瑰', weight: '1.2公斤'},
+        {name: '多头玫瑰', weight: '1.2公斤'},
+        {name: '百合', weight: '2.7公斤'},
+        {name: '康乃馨', weight: '1公斤'},
+        {name: '向日葵', weight: '2.7公斤或3公斤'},
+        {name: '其他', weight: '0.5公斤或1公斤'}
+      ]
     };
   },
 	computed:{
@@ -283,6 +310,12 @@ export default {
     this.headers.token = token
   },
   methods: {
+    showWeightPopup(){
+      this.$refs.weightRef.open('center')
+    },
+    closeWeightPopup(){
+      this.$refs.weightRef.close()
+    },
     delOneCp(info,index){
       let that = this
       that.$util.confirmModal({content:'确认删除'+info.cpName+'?'},() => {
@@ -731,4 +764,89 @@ export default {
     width: 46%;
   }
 }
+
+// 权重提醒图标样式
+.weight-reminder-icon {
+  margin-left: 20upx;
+  padding: 10upx;
+  width: 60upx;
+  height: 60upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+  border-radius: 50%;
+  border: 1upx solid #ddd;
+}
+
+// 权重弹窗样式
+.weight-popup-style {
+  .weight-popup-container {
+    width: 600upx;
+    max-height: 80vh;
+    padding: 30upx;
+    border-radius: 16upx;
+    background-color: #fff;
+    
+    .weight-popup-title {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+      text-align: center;
+      margin-bottom: 30upx;
+    }
+    
+    .weight-popup-content {
+      .weight-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20upx 0;
+        border-bottom: 1upx solid #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .weight-name {
+          font-size: 28upx;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .weight-value {
+          font-size: 28upx;
+          color: #666;
+        }
+      }
+    }
+    
+    .weight-popup-note {
+      margin-top: 30upx;
+      padding: 20upx;
+      background-color: #f8f8f8;
+      border-radius: 8upx;
+      font-size: 24upx;
+      color: #999;
+      line-height: 1.5;
+    }
+    
+    .weight-popup-footer {
+      margin-top: 30upx;
+      display: flex;
+      justify-content: center;
+      
+      .weight-popup-btn {
+        width: 200upx;
+        height: 70upx;
+        background-color: #3385FF;
+        color: #fff;
+        border: none;
+        border-radius: 8upx;
+        font-size: 28upx;
+        line-height: 70upx;
+      }
+    }
+  }
+}
 </style>

+ 120 - 2
ghsApp/src/admin/item/copy.vue

@@ -111,7 +111,10 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view>
-          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="单位为公斤,参考红玫每扎1.2公斤" maxlength="50" type="digit" />
+          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="公斤" maxlength="50" type="digit" />
+          <view class="weight-reminder-icon" @click="showWeightPopup">
+            <text style="color: #999; font-size: 32upx; font-weight: bold;">?</text>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -190,6 +193,22 @@
       </view>
     </uni-popup>
 
+    <uni-popup ref="weightRef" background-color="#fff" type="center" :animation="false" class="weight-popup-style">
+      <view class="weight-popup-container">
+        <view class="weight-popup-title">花材重量参考</view>
+        <view class="weight-popup-content">
+          <view class="weight-item" v-for="(item, index) in weightReferenceData" :key="index">
+            <text class="weight-name">{{ item.name }}</text>
+            <text class="weight-value">{{ item.weight }}</text>
+          </view>
+        </view>
+        <view class="weight-popup-note">以上含纸箱平摊下来的重量,供参考</view>
+        <view class="weight-popup-footer">
+          <button class="weight-popup-btn" @click="closeWeightPopup">确定</button>
+        </view>
+      </view>
+    </uni-popup>
+
   </view>
 </template>
 
@@ -250,7 +269,15 @@ export default {
       hasRequest:0,
       productData:{id:0},
       headers:{token:''},
-      backCpInfo:{cpId:0,cpName:'',needUpdate:0}
+      backCpInfo:{cpId:0,cpName:'',needUpdate:0},
+      weightReferenceData:[
+        {name: '单头玫瑰', weight: '1.2公斤'},
+        {name: '多头玫瑰', weight: '1.2公斤'},
+        {name: '百合', weight: '2.7公斤'},
+        {name: '康乃馨', weight: '1公斤'},
+        {name: '向日葵', weight: '2.7公斤或3公斤'},
+        {name: '其他', weight: '0.5公斤或1公斤'}
+      ]
     };
   },
 	computed:{
@@ -282,6 +309,12 @@ export default {
     }
   },
   methods: {
+    showWeightPopup(){
+      this.$refs.weightRef.open('center')
+    },
+    closeWeightPopup(){
+      this.$refs.weightRef.close()
+    },
     delOneCp(info,index){
       let that = this
       that.$util.confirmModal({content:'确认删除'+info.cpName+'?'},() => {
@@ -729,4 +762,89 @@ export default {
     width: 46%;
   }
 }
+
+// 权重提醒图标样式
+.weight-reminder-icon {
+  margin-left: 20upx;
+  padding: 10upx;
+  width: 60upx;
+  height: 60upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+  border-radius: 50%;
+  border: 1upx solid #ddd;
+}
+
+// 权重弹窗样式
+.weight-popup-style {
+  .weight-popup-container {
+    width: 600upx;
+    max-height: 80vh;
+    padding: 30upx;
+    border-radius: 16upx;
+    background-color: #fff;
+    
+    .weight-popup-title {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+      text-align: center;
+      margin-bottom: 30upx;
+    }
+    
+    .weight-popup-content {
+      .weight-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20upx 0;
+        border-bottom: 1upx solid #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .weight-name {
+          font-size: 28upx;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .weight-value {
+          font-size: 28upx;
+          color: #666;
+        }
+      }
+    }
+    
+    .weight-popup-note {
+      margin-top: 30upx;
+      padding: 20upx;
+      background-color: #f8f8f8;
+      border-radius: 8upx;
+      font-size: 24upx;
+      color: #999;
+      line-height: 1.5;
+    }
+    
+    .weight-popup-footer {
+      margin-top: 30upx;
+      display: flex;
+      justify-content: center;
+      
+      .weight-popup-btn {
+        width: 200upx;
+        height: 70upx;
+        background-color: #3385FF;
+        color: #fff;
+        border: none;
+        border-radius: 8upx;
+        font-size: 28upx;
+        line-height: 70upx;
+      }
+    }
+  }
+}
 </style>

+ 121 - 4
ghsApp/src/admin/item/detail.vue

@@ -156,9 +156,11 @@
 
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
           <view class="tui-title">每扎重量</view>
-          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;"
-          class="tui-input" name="weight" placeholder="单位为公斤" maxlength="50" type="digit" />
-
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:200upx;color:#CCCCCC;"
+          class="tui-input" name="weight" placeholder="公斤" maxlength="50" type="digit" />
+          <view class="weight-reminder-icon" @click="showWeightPopup" style="margin-right: 20upx;">
+            <text style="color: #999; font-size: 32upx; font-weight: bold;">?</text>
+          </view>
           <button v-if="productData.id > 0 && productData.hasRightChange == 1" class="admin-button-com blue middle" @click.stop="changeWeight()" style="width:150upx;">修改</button>
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="notAllowChange()">修改</button>
         </tui-list-cell>
@@ -386,6 +388,22 @@
 			</view>
     </uni-popup>
 
+    <uni-popup ref="weightRef" background-color="#fff" type="center" :animation="false" class="weight-popup-style">
+      <view class="weight-popup-container">
+        <view class="weight-popup-title">花材重量参考</view>
+        <view class="weight-popup-content">
+          <view class="weight-item" v-for="(item, index) in weightReferenceData" :key="index">
+            <text class="weight-name">{{ item.name }}</text>
+            <text class="weight-value">{{ item.weight }}</text>
+          </view>
+        </view>
+        <view class="weight-popup-note">以上含纸箱平摊下来的重量,供参考</view>
+        <view class="weight-popup-footer">
+          <button class="weight-popup-btn" @click="closeWeightPopup">确定</button>
+        </view>
+      </view>
+    </uni-popup>
+
     <modal-module :show="writeRatioShow" @click="newRatioConfirm" :maskClosable="true" title="修改单位比" padding="30rpx 30rpx" >
 		<template v-slot:content>
 			<view class="app-modal-input-wrap">
@@ -503,7 +521,15 @@ export default {
       partFocus:false,
       belongCost:0,
       staffData:[],
-      modifyUnitType:'big'
+      modifyUnitType:'big',
+      weightReferenceData:[
+        {name: '单头玫瑰', weight: '1.2公斤'},
+        {name: '多头玫瑰', weight: '1.2公斤'},
+        {name: '百合', weight: '2.7公斤'},
+        {name: '康乃馨', weight: '1公斤'},
+        {name: '向日葵', weight: '2.7公斤或3公斤'},
+        {name: '其他', weight: '0.5公斤或1公斤'}
+      ]
     };
   },
 	computed:{
@@ -555,6 +581,12 @@ export default {
     }
   },
   methods: {
+    showWeightPopup(){
+      this.$refs.weightRef.open('center')
+    },
+    closeWeightPopup(){
+      this.$refs.weightRef.close()
+    },
     hasBuyList(){
       this.$util.pageTo({url: '/admin/item/hasLimitBuyCustom?id='+this.productData.id})
     },
@@ -1383,4 +1415,89 @@ export default {
     justify-content: center;
   }
 }
+
+// 权重提醒图标样式
+.weight-reminder-icon {
+  margin-left: 20upx;
+  padding: 10upx;
+  width: 60upx;
+  height: 60upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+  border-radius: 50%;
+  border: 1upx solid #ddd;
+}
+
+// 权重弹窗样式
+.weight-popup-style {
+  .weight-popup-container {
+    width: 600upx;
+    max-height: 80vh;
+    padding: 30upx;
+    border-radius: 16upx;
+    background-color: #fff;
+    
+    .weight-popup-title {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+      text-align: center;
+      margin-bottom: 30upx;
+    }
+    
+    .weight-popup-content {
+      .weight-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20upx 0;
+        border-bottom: 1upx solid #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .weight-name {
+          font-size: 28upx;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .weight-value {
+          font-size: 28upx;
+          color: #666;
+        }
+      }
+    }
+    
+    .weight-popup-note {
+      margin-top: 30upx;
+      padding: 20upx;
+      background-color: #f8f8f8;
+      border-radius: 8upx;
+      font-size: 28upx;
+      color: #999;
+      line-height: 1.5;
+    }
+    
+    .weight-popup-footer {
+      margin-top: 30upx;
+      display: flex;
+      justify-content: center;
+      
+      .weight-popup-btn {
+        width: 200upx;
+        height: 70upx;
+        background-color: #3385FF;
+        color: #fff;
+        border: none;
+        border-radius: 8upx;
+        font-size: 28upx;
+        line-height: 70upx;
+      }
+    }
+  }
+}
 </style>

+ 1 - 6
hdApp/src/admin/express/create.vue

@@ -164,7 +164,7 @@ export default {
           // 自动填充收货信息
           this.expressForm.user_name = res.data.receiveUserName || res.data.bookName || ''
           this.expressForm.user_phone = res.data.receiveMobile || res.data.bookMobile || ''
-          this.expressForm.user_address = res.data.city + res.data.dist + res.data.address + res.data.floor
+          this.expressForm.user_address = res.data.dist + res.data.address + res.data.floor
           this.expressForm.user_lng = res.data.long || 0
           this.expressForm.user_lat = res.data.lat || 0
         }
@@ -230,10 +230,6 @@ export default {
         this.$msg('收货地址不能为空')
         return
       }
-      if (!this.deliveryFee) {
-        this.$msg('请先查询运费')
-        return
-      }
       this.$util.confirmModal({content: '确认呼叫跑腿?'}, async () => {
           const data = {
             orderId: this.orderId,
@@ -242,7 +238,6 @@ export default {
             user_name: this.expressForm.user_name,
             user_phone: this.expressForm.user_phone,
             user_address: this.expressForm.user_address,
-            deliveryFee: this.deliveryFee,
             user_lng: this.expressForm.user_lng,
             user_lat: this.expressForm.user_lat,
             note: this.expressForm.note,

+ 120 - 2
hdApp/src/admin/item/add.vue

@@ -111,7 +111,10 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">每扎重量</div>
-          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位为公斤,参考红玫每扎1.2公斤" maxlength="50" type="digit" />
+          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="公斤" maxlength="50" type="digit" />
+          <view class="weight-reminder-icon" @click="showWeightPopup">
+            <text style="color: #999; font-size: 32upx; font-weight: bold;">?</text>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -190,6 +193,22 @@
       </view>
     </uni-popup>
 
+    <uni-popup ref="weightRef" background-color="#fff" type="center" :animation="false" class="weight-popup-style">
+      <view class="weight-popup-container">
+        <view class="weight-popup-title">花材重量参考</view>
+        <view class="weight-popup-content">
+          <view class="weight-item" v-for="(item, index) in weightReferenceData" :key="index">
+            <text class="weight-name">{{ item.name }}</text>
+            <text class="weight-value">{{ item.weight }}</text>
+          </view>
+        </view>
+        <view class="weight-popup-note">以上含纸箱平摊下来的重量,供参考</view>
+        <view class="weight-popup-footer">
+          <button class="weight-popup-btn" @click="closeWeightPopup">确定</button>
+        </view>
+      </view>
+    </uni-popup>
+
   </div>
 </template>
 
@@ -251,7 +270,15 @@ export default {
       hasRequest:0,
       productData:{id:0},
       headers:{token:''},
-      backCpInfo:{cpId:0,cpName:'',needUpdate:0}
+      backCpInfo:{cpId:0,cpName:'',needUpdate:0},
+      weightReferenceData:[
+        {name: '单头玫瑰', weight: '1.2公斤'},
+        {name: '多头玫瑰', weight: '1.2公斤'},
+        {name: '百合', weight: '2.7公斤'},
+        {name: '康乃馨', weight: '1公斤'},
+        {name: '向日葵', weight: '2.7公斤或3公斤'},
+        {name: '其他', weight: '0.5公斤或1公斤'}
+      ]
     };
   },
 	computed:{
@@ -283,6 +310,12 @@ export default {
     this.headers.token = token
   },
   methods: {
+    showWeightPopup(){
+      this.$refs.weightRef.open('center')
+    },
+    closeWeightPopup(){
+      this.$refs.weightRef.close()
+    },
     delOneCp(info,index){
       let that = this
       that.$util.confirmModal({content:'确认删除'+info.cpName+'?'},() => {
@@ -731,4 +764,89 @@ export default {
     width: 46%;
   }
 }
+
+// 权重提醒图标样式
+.weight-reminder-icon {
+  margin-left: 20upx;
+  padding: 10upx;
+  width: 60upx;
+  height: 60upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+  border-radius: 50%;
+  border: 1upx solid #ddd;
+}
+
+// 权重弹窗样式
+.weight-popup-style {
+  .weight-popup-container {
+    width: 600upx;
+    max-height: 80vh;
+    padding: 30upx;
+    border-radius: 16upx;
+    background-color: #fff;
+    
+    .weight-popup-title {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+      text-align: center;
+      margin-bottom: 30upx;
+    }
+    
+    .weight-popup-content {
+      .weight-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20upx 0;
+        border-bottom: 1upx solid #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .weight-name {
+          font-size: 28upx;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .weight-value {
+          font-size: 28upx;
+          color: #666;
+        }
+      }
+    }
+    
+    .weight-popup-note {
+      margin-top: 30upx;
+      padding: 20upx;
+      background-color: #f8f8f8;
+      border-radius: 8upx;
+      font-size: 24upx;
+      color: #999;
+      line-height: 1.5;
+    }
+    
+    .weight-popup-footer {
+      margin-top: 30upx;
+      display: flex;
+      justify-content: center;
+      
+      .weight-popup-btn {
+        width: 200upx;
+        height: 70upx;
+        background-color: #3385FF;
+        color: #fff;
+        border: none;
+        border-radius: 8upx;
+        font-size: 28upx;
+        line-height: 70upx;
+      }
+    }
+  }
+}
 </style>

+ 120 - 2
hdApp/src/admin/item/copy.vue

@@ -111,7 +111,10 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view>
-          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="单位为公斤,参考红玫每扎1.2公斤" maxlength="50" type="digit" />
+          <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="公斤" maxlength="50" type="digit" />
+          <view class="weight-reminder-icon" @click="showWeightPopup">
+            <text style="color: #999; font-size: 32upx; font-weight: bold;">?</text>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -190,6 +193,22 @@
       </view>
     </uni-popup>
 
+    <uni-popup ref="weightRef" background-color="#fff" type="center" :animation="false" class="weight-popup-style">
+      <view class="weight-popup-container">
+        <view class="weight-popup-title">花材重量参考</view>
+        <view class="weight-popup-content">
+          <view class="weight-item" v-for="(item, index) in weightReferenceData" :key="index">
+            <text class="weight-name">{{ item.name }}</text>
+            <text class="weight-value">{{ item.weight }}</text>
+          </view>
+        </view>
+        <view class="weight-popup-note">以上含纸箱平摊下来的重量,供参考</view>
+        <view class="weight-popup-footer">
+          <button class="weight-popup-btn" @click="closeWeightPopup">确定</button>
+        </view>
+      </view>
+    </uni-popup>
+
   </view>
 </template>
 
@@ -250,7 +269,15 @@ export default {
       hasRequest:0,
       productData:{id:0},
       headers:{token:''},
-      backCpInfo:{cpId:0,cpName:'',needUpdate:0}
+      backCpInfo:{cpId:0,cpName:'',needUpdate:0},
+      weightReferenceData:[
+        {name: '单头玫瑰', weight: '1.2公斤'},
+        {name: '多头玫瑰', weight: '1.2公斤'},
+        {name: '百合', weight: '2.7公斤'},
+        {name: '康乃馨', weight: '1公斤'},
+        {name: '向日葵', weight: '2.7公斤或3公斤'},
+        {name: '其他', weight: '0.5公斤或1公斤'}
+      ]
     };
   },
 	computed:{
@@ -301,6 +328,12 @@ export default {
       this.form.className = info.name ? info.name : ''
       this.$forceUpdate()
     },
+    showWeightPopup(){
+      this.$refs.weightRef.open('center')
+    },
+    closeWeightPopup(){
+      this.$refs.weightRef.close()
+    },
     tjLinkage(){
       if(this.form.discountPrice && Number(this.form.discountPrice)>0){
 				let skMore = this.form.skMore ? Number(this.form.skMore) : 0
@@ -729,4 +762,89 @@ export default {
     width: 46%;
   }
 }
+
+// 权重提醒图标样式
+.weight-reminder-icon {
+  margin-left: 20upx;
+  padding: 10upx;
+  width: 60upx;
+  height: 60upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+  border-radius: 50%;
+  border: 1upx solid #ddd;
+}
+
+// 权重弹窗样式
+.weight-popup-style {
+  .weight-popup-container {
+    width: 600upx;
+    max-height: 80vh;
+    padding: 30upx;
+    border-radius: 16upx;
+    background-color: #fff;
+    
+    .weight-popup-title {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+      text-align: center;
+      margin-bottom: 30upx;
+    }
+    
+    .weight-popup-content {
+      .weight-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20upx 0;
+        border-bottom: 1upx solid #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .weight-name {
+          font-size: 28upx;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .weight-value {
+          font-size: 28upx;
+          color: #666;
+        }
+      }
+    }
+    
+    .weight-popup-note {
+      margin-top: 30upx;
+      padding: 20upx;
+      background-color: #f8f8f8;
+      border-radius: 8upx;
+      font-size: 24upx;
+      color: #999;
+      line-height: 1.5;
+    }
+    
+    .weight-popup-footer {
+      margin-top: 30upx;
+      display: flex;
+      justify-content: center;
+      
+      .weight-popup-btn {
+        width: 200upx;
+        height: 70upx;
+        background-color: #3385FF;
+        color: #fff;
+        border: none;
+        border-radius: 8upx;
+        font-size: 28upx;
+        line-height: 70upx;
+      }
+    }
+  }
+}
 </style>

+ 121 - 4
hdApp/src/admin/item/detail.vue

@@ -157,9 +157,11 @@
 
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
           <view class="tui-title">每扎重量</view>
-          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;"
-          class="tui-input" name="weight" placeholder="单位为公斤" maxlength="50" type="digit" />
-
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:200upx;color:#CCCCCC;"
+          class="tui-input" name="weight" placeholder="公斤" maxlength="50" type="digit" />
+          <view class="weight-reminder-icon" @click="showWeightPopup" style="margin-right: 20upx;">
+            <text style="color: #999; font-size: 32upx; font-weight: bold;">?</text>
+          </view>
           <button v-if="productData.id > 0 && productData.hasRightChange == 1" class="admin-button-com blue middle" @click.stop="changeWeight()" style="width:150upx;">修改</button>
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="notAllowChange()">修改</button>
         </tui-list-cell>
@@ -387,6 +389,22 @@
 			</view>
     </uni-popup>
 
+    <uni-popup ref="weightRef" background-color="#fff" type="center" :animation="false" class="weight-popup-style">
+      <view class="weight-popup-container">
+        <view class="weight-popup-title">花材重量参考</view>
+        <view class="weight-popup-content">
+          <view class="weight-item" v-for="(item, index) in weightReferenceData" :key="index">
+            <text class="weight-name">{{ item.name }}</text>
+            <text class="weight-value">{{ item.weight }}</text>
+          </view>
+        </view>
+        <view class="weight-popup-note">以上含纸箱平摊下来的重量,供参考</view>
+        <view class="weight-popup-footer">
+          <button class="weight-popup-btn" @click="closeWeightPopup">确定</button>
+        </view>
+      </view>
+    </uni-popup>
+
     <modal-module :show="writeRatioShow" @click="newRatioConfirm" :maskClosable="true" title="修改单位比" padding="30rpx 30rpx" >
 		<template v-slot:content>
 			<view class="app-modal-input-wrap">
@@ -503,7 +521,15 @@ export default {
       partFocus:false,
       belongCost:0,
       staffData:[],
-      modifyUnitType:'big'
+      modifyUnitType:'big',
+      weightReferenceData:[
+        {name: '单头玫瑰', weight: '1.2公斤'},
+        {name: '多头玫瑰', weight: '1.2公斤'},
+        {name: '百合', weight: '2.7公斤'},
+        {name: '康乃馨', weight: '1公斤'},
+        {name: '向日葵', weight: '2.7公斤或3公斤'},
+        {name: '其他', weight: '0.5公斤或1公斤'}
+      ]
     };
   },
 	computed:{
@@ -555,6 +581,12 @@ export default {
     }
   },
   methods: {
+    showWeightPopup(){
+      this.$refs.weightRef.open('center')
+    },
+    closeWeightPopup(){
+      this.$refs.weightRef.close()
+    },
     clearBuyCache(){
       let that = this
       that.$util.confirmModal({content:'确认清除已购?清除后客户可再次下单'},() => {
@@ -1340,4 +1372,89 @@ export default {
     width: 46%;
   }
 }
+
+// 权重提醒图标样式
+.weight-reminder-icon {
+  margin-left: 20upx;
+  padding: 10upx;
+  width: 60upx;
+  height: 60upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+  border-radius: 50%;
+  border: 1upx solid #ddd;
+}
+
+// 权重弹窗样式
+.weight-popup-style {
+  .weight-popup-container {
+    width: 600upx;
+    max-height: 80vh;
+    padding: 30upx;
+    border-radius: 16upx;
+    background-color: #fff;
+    
+    .weight-popup-title {
+      font-size: 32upx;
+      font-weight: bold;
+      color: #333;
+      text-align: center;
+      margin-bottom: 30upx;
+    }
+    
+    .weight-popup-content {
+      .weight-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20upx 0;
+        border-bottom: 1upx solid #f0f0f0;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .weight-name {
+          font-size: 28upx;
+          color: #333;
+          font-weight: 500;
+        }
+        
+        .weight-value {
+          font-size: 28upx;
+          color: #666;
+        }
+      }
+    }
+    
+    .weight-popup-note {
+      margin-top: 30upx;
+      padding: 20upx;
+      background-color: #f8f8f8;
+      border-radius: 8upx;
+      font-size: 28upx;
+      color: #999;
+      line-height: 1.5;
+    }
+    
+    .weight-popup-footer {
+      margin-top: 30upx;
+      display: flex;
+      justify-content: center;
+      
+      .weight-popup-btn {
+        width: 200upx;
+        height: 70upx;
+        background-color: #3385FF;
+        color: #fff;
+        border: none;
+        border-radius: 8upx;
+        font-size: 28upx;
+        line-height: 70upx;
+      }
+    }
+  }
+}
 </style>