diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index bbbd5cf19..4854ff744 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/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"
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
index 64ffc2b88..03d57c892 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
+++ b/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);
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 529fd8d6a..7a25f5244 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -53,130 +53,131 @@
           <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 class="center-left-hj">
-          <div>
-            <el-popover
-              placement="bottom-start"
-              width="400"
-              trigger="click">
-                <div>
-                  <div v-if="fullReduceDiscount.length>0">
-                    <el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
-                      <el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.gunName" :key="index">
-                        <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
-                          <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
-                          <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
-                            <div style="color: red">-￥{{ item.discount }}</div>
-                            <div style="color: grey" v-if="item.type!=1">满减优惠</div>
-                            <div style="color: grey" v-if="item.type!=2">折扣优惠</div>
+        <div style="overflow-y: scroll;height: 42vh">
+          <div class="center-left-hj">
+            <div>
+              <el-popover
+                placement="bottom-start"
+                width="400"
+                trigger="click">
+                  <div>
+                    <div v-if="fullReduceDiscount.length>0">
+                      <el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
+                        <el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.gunName" :key="index">
+                          <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
+                            <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
+                            <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
+                              <div style="color: red">-￥{{ item.discount }}</div>
+                              <div style="color: grey" v-if="item.type!=1">满减优惠</div>
+                              <div style="color: grey" v-if="item.type!=2">折扣优惠</div>
+                            </div>
                           </div>
+                      </el-checkbox>
+                    </el-checkbox-group>
+                  </div>
+                  <div v-else>
+                    暂无满减油品信息
+                  </div>
+                </div>
+                <div slot="reference">
+                  <el-checkbox :disabled="fullReduceDiscount.length==0"
+                               style="color: black;font-size: 16px"
+                               v-model="checkAll1" @change="handleCheckAllChange1">
+                  </el-checkbox><!--:indeterminate="isIndeterminate1"-->
+                  活动优惠
+                </div>
+              </el-popover>
+            </div>
+            <div>-￥{{ fullReduction.toFixed(2) }}</div>
+          </div>
+          <div class="center-left-hj" v-show="isMember">
+            <div>
+              <el-popover
+                placement="bottom-start"
+                width="400"
+                trigger="click">
+                <div>
+                  <el-checkbox-group v-model="checkedCities2" @change="handleCheckedCitiesChange2">
+                    <el-checkbox v-for="(item,index) in gradeDiscount" :label="item.gunName" :key="index">
+                      <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
+                        <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
+                        <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
+                          <div style="color: red">-￥{{ item.discount }}</div>
+  <!--                        <div v-if="item.type=='满减优惠'" style="color: grey">消费满{{ item.full }}元，立减{{ item.reduce }}元</div>-->
+  <!--                        <div v-else style="color: grey">消费满{{ item.full }}元，每升优惠{{ item.liters }}元</div>-->
                         </div>
+                      </div>
                     </el-checkbox>
                   </el-checkbox-group>
                 </div>
-                <div v-else>
-                  暂无满减油品信息
+                <div slot="reference">
+                  <el-checkbox
+                               style="color: black;font-size: 16px"
+                               v-model="checkAll2" @change="handleCheckAllChange2">
+                  </el-checkbox><!-- :indeterminate="isIndeterminate2"-->
+                  等级优惠
                 </div>
-              </div>
-              <div slot="reference">
-                <el-checkbox :disabled="fullReduceDiscount.length==0"
-                             style="color: black;font-size: 16px"
-                             v-model="checkAll1" @change="handleCheckAllChange1">
-                </el-checkbox><!--:indeterminate="isIndeterminate1"-->
-                活动优惠
-              </div>
-            </el-popover>
-          </div>
-          <div>-￥{{ fullReduction.toFixed(2) }}</div>
-        </div>
-        <div class="center-left-hj" v-show="isMember">
-          <div>
-            <el-popover
-              placement="bottom-start"
-              width="400"
-              trigger="click">
-              <div>
-                <el-checkbox-group v-model="checkedCities2" @change="handleCheckedCitiesChange2">
-                  <el-checkbox v-for="(item,index) in gradeDiscount" :label="item.gunName" :key="index">
-                    <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
-                      <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
-                      <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
-                        <div style="color: red">-￥{{ item.discount }}</div>
-<!--                        <div v-if="item.type=='满减优惠'" style="color: grey">消费满{{ item.full }}元，立减{{ item.reduce }}元</div>-->
-<!--                        <div v-else style="color: grey">消费满{{ item.full }}元，每升优惠{{ item.liters }}元</div>-->
-                      </div>
-                    </div>
-                  </el-checkbox>
-                </el-checkbox-group>
-              </div>
-              <div slot="reference">
-                <el-checkbox
-                             style="color: black;font-size: 16px"
-                             v-model="checkAll2" @change="handleCheckAllChange2">
-                </el-checkbox><!-- :indeterminate="isIndeterminate2"-->
-                等级优惠
-              </div>
-            </el-popover>
-          </div>
-          <div>-￥{{ oilDiscount.toFixed(2) }}</div>
-        </div>
-        <div class="center-left-hj" v-show="isMember && refuelMoney && refuelMoney.length>0">
-          <div>
-            <el-checkbox
-                         style="color: black;font-size: 16px"
-                         v-model="checkAll3" @change="handleCheckAllChange3">
-            </el-checkbox><!--:indeterminate="isIndeterminate3"-->
-            囤油卡
-            <div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
-              （{{ item.type }}卡
-<!--              <span style="color: #00afff">{{ item.oilType }}</span>-->
-              余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）
+              </el-popover>
             </div>
+            <div>-￥{{ oilDiscount.toFixed(2) }}</div>
           </div>
-          <div>- {{ consumeRefuelMoney.toFixed(2) }}L</div>
-        </div>
-        <div class="center-left-hj" v-show="isMember">
-          <div>
-            <el-checkbox style="color: black;font-size: 16px" :disabled="balance==0"
-                         v-model="checkAll4" @change="handleCheckAllChange4">
-            </el-checkbox>
-            储值卡
-            <span>（账户余额：{{ balance }}元）</span>
-          </div>
-          <div>-￥{{ consumeAmount.toFixed(2) }}</div>
-        </div>
-        <div class="center-left-hj" v-show="isMember && couponDiscount.length>0">
-          <div>
-            <el-popover
-              placement="bottom-start"
-              width="400"
-              trigger="click">
-<!--              <div>-->
-<!--                <el-radio-group v-model="checkedCities5" @input="handleCheckedCitiesChange5">-->
-<!--                  <el-radio v-for="(item,index) in couponDiscount"-->
-<!--                            :label="item.gunName" :key="index" style="display: flex;">-->
-<!--                    <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
-<!--                      <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>-->
-<!--                      <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
-<!--                        <div style="color: red">-￥{{ item.discount }}</div>-->
-<!--&lt;!&ndash;                        <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>&ndash;&gt;-->
-<!--                      </div>-->
-<!--                    </div>-->
-<!--                  </el-radio>-->
-<!--                </el-radio-group>-->
-<!--              </div>-->
-              <div slot="reference">
-                <el-checkbox
-                             style="color: black;font-size: 16px"
-                             v-model="checkAll5" @change="handleCheckAllChange5">
-                </el-checkbox><!-- :indeterminate="isIndeterminate5"-->
-                优惠券
+          <div class="center-left-hj" v-show="isMember && refuelMoney && refuelMoney.length>0">
+            <div>
+              <el-checkbox
+                           style="color: black;font-size: 16px"
+                           v-model="checkAll3" @change="handleCheckAllChange3">
+              </el-checkbox><!--:indeterminate="isIndeterminate3"-->
+              囤油卡
+              <div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
+                （{{ item.type }}卡
+  <!--              <span style="color: #00afff">{{ item.oilType }}</span>-->
+                余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）
               </div>
-            </el-popover>
+            </div>
+            <div>- {{ consumeRefuelMoney.toFixed(2) }}L</div>
           </div>
-          <div>-￥{{ couponAmount.toFixed(2) }}</div>
-        </div>
-        <div class="center-left-th">
+          <div class="center-left-hj" v-show="isMember">
+            <div>
+              <el-checkbox style="color: black;font-size: 16px" :disabled="balance==0"
+                           v-model="checkAll4" @change="handleCheckAllChange4">
+              </el-checkbox>
+              储值卡
+              <span>（账户余额：{{ balance }}元）</span>
+            </div>
+            <div>-￥{{ consumeAmount.toFixed(2) }}</div>
+          </div>
+          <div class="center-left-hj" v-show="isMember && couponDiscount.length>0">
+            <div>
+              <el-popover
+                placement="bottom-start"
+                width="400"
+                trigger="click">
+  <!--              <div>-->
+  <!--                <el-radio-group v-model="checkedCities5" @input="handleCheckedCitiesChange5">-->
+  <!--                  <el-radio v-for="(item,index) in couponDiscount"-->
+  <!--                            :label="item.gunName" :key="index" style="display: flex;">-->
+  <!--                    <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
+  <!--                      <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>-->
+  <!--                      <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
+  <!--                        <div style="color: red">-￥{{ item.discount }}</div>-->
+  <!--&lt;!&ndash;                        <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>&ndash;&gt;-->
+  <!--                      </div>-->
+  <!--                    </div>-->
+  <!--                  </el-radio>-->
+  <!--                </el-radio-group>-->
+  <!--              </div>-->
+                <div slot="reference">
+                  <el-checkbox
+                               style="color: black;font-size: 16px"
+                               v-model="checkAll5" @change="handleCheckAllChange5">
+                  </el-checkbox><!-- :indeterminate="isIndeterminate5"-->
+                  优惠券
+                </div>
+              </el-popover>
+            </div>
+            <div>-￥{{ couponAmount.toFixed(2) }}</div>
+          </div>
+          <div class="center-left-th">
           <div class="th-box">
             <div>扫码支付</div>
             <div class="bule">{{ ((+oilActualPay) + (+goodsActualPay)).toFixed(2) }}</div>
@@ -190,6 +191,7 @@
             <div style="cursor: pointer;color: crimson" @click="getStaffList" >{{ staff.realName }}</div>
           </div>
         </div>
+        </div>
       </div>
       <div class="bottom-posi">
         <div class="center-left-wrap">