取消预售

ghsApp/src/admin/item/components/item2.vue

@@ -8,6 +8,11 @@
 		<button v-if="info.reachNum && info.reachNum>0 && info.reachNumDiscount && info.reachNumDiscount>0" @click.stop="cancelFullOff(info)" class="admin-button-com mini-btn blue" 
 			style="position:absolute;bottom:0upx;font-size:24upx;left:10upx;z-index:30;">取消满减</button>
 
+		<block v-if="Number(info.discountPrice)<=0 && !(info.reachNum && info.reachNum>0 && info.reachNumDiscount && info.reachNumDiscount>0)">
+		<button v-if="info.presell == 1" @click.stop="cancelPreSellFn(info)" class="admin-button-com mini-btn blue" 
+			style="position:absolute;bottom:0upx;font-size:24upx;left:10upx;z-index:30;">取消预售</button>
+		</block>
+
         <image :src="`${constant.imgUrl}/icon/official8.png`" v-if="info.auth && info.auth == 1" mode="widthFix" class="official"></image>
 
 		<view class="img_bx" @click="pageTo({url: '/admin/item/detail?id='+info.id})">

ghsApp/src/admin/item/list2.vue

@@ -215,7 +215,7 @@ import productMins from "@/mixins/product2";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite";
 import { print,cancelDiscountPrice,cancelPreSell,delStatusUpdate,cancelFullOffFn } from '@/api/product';
-import { getHdPoster,getSkPoster,breakItem,changeFrontHide,applyAuth,changeHalf,moveToLosing } from '@/api/item'
+import { getHdPoster,getSkPoster,changeFrontHide,applyAuth,moveToLosing } from '@/api/item'
 import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 import ModalModule from "@/components/plugin/modal"
 import { partItem } from "@/api/part"