bug

fuintAdmin/src/views/convenienceStore/goodsFile.vue

@@ -100,6 +100,7 @@
           type="primary"
           @click="batchGrounding('jy')"
         >商品下架</el-button>
+        <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
       </div>
 
       <el-table ref="tables" v-loading="loading" :data="list"

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java

@@ -217,7 +217,8 @@ public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> impl
         for (String s : split) {
             LJGoods ljGoods = this.selectLJGoodsById(Integer.parseInt(s));
             if (ObjectUtil.isNotEmpty(ljGoods)){
-                if (status.equals("qy") && ljGoods.getStock()==0){
+                if (status.equals("qy") && ljGoods.getStock()==0 ||
+                        status.equals("qy") && ljGoods.getRetailPrice()==0 && ljGoods.getMemberPrice()==0){
                     ljGoods.setStatus("jy");
                 }else {
                     ljGoods.setStatus(status);

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -53,6 +53,7 @@
           <div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥{{ goodsAmount.toFixed(2) }}</div>
           <div class="hj-box" style="justify-content: flex-end">合计: ￥{{ (oilAmount + goodsAmount).toFixed(2) }}</div>
         </div>
+        <div style="overflow-y: scroll;height: 42vh">
           <div class="center-left-hj">
             <div>
               <el-popover
@@ -191,6 +192,7 @@
           </div>
         </div>
         </div>
+      </div>
       <div class="bottom-posi">
         <div class="center-left-wrap">
           <div class="wrap-box" value="oilCard"