取消特价

ghsApp/src/admin/changePrice/components/Item.vue

@@ -20,14 +20,18 @@
 						<view class="sk-price-area">
 							<input class="change-input" @click.stop @blur="saveSkPrice" @focus="skModifyPrice = ''" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="散客价" />
 						</view>
+						<button v-if="Number(info.discountPrice)>0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn default" 
+							style="position:absolute;bottom:-66upx;font-size:24upx;left:0upx;">取消特价</button>
 					</view>
 				</view>
 			</view>
 		</view>
 	</view>
+
 	<view class="level-price">
 		<text>剩余 {{showStock}}</text>
 	</view>
+
 </view>
 </template>
 <script>
@@ -76,6 +80,9 @@ export default {
 		}
 	},
 	methods: {
+		cancelDiscountFn(item){
+			this.$emit("cancelDiscountFn",item)
+		},
 		savePrice() {
 			if(Number(this.modifyPrice)>0 && Number(this.skModifyPrice)){
 				this.$emit("savePrice",this.modifyPrice,this.skModifyPrice,this.info.id)

ghsApp/src/admin/changePrice/list.vue

@@ -31,7 +31,7 @@
 
 							<template v-for="(productItem, productIndex) in classItem.child">
 								<view style="height:230upx" :id="`class_${classIndex}`" :key="productIndex">
-									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @savePrice="savePrice" ></ItemComponent>
+									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @savePrice="savePrice" @cancelDiscountFn="cancelDiscountFn"></ItemComponent>
 								</view>
 							</template>
 
@@ -66,7 +66,7 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import ItemComponent from "./components/Item";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
-import { batchChangePrice,generatePriceTable } from '@/api/product/index'
+import { batchChangePrice,generatePriceTable,cancelDiscountPrice } from '@/api/product/index'
 export default {
 	name: "item_list",
 	components: {
@@ -90,6 +90,16 @@ export default {
 		this.initProduct()
 	},
 	methods: {
+		cancelDiscountFn(item){
+			let that = this
+			this.$util.confirmModal({content:'确认取消？'},() => {
+				cancelDiscountPrice({id:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
 		downloadTable(){
 			let level = 0
 			let levelList = ['散客价', '花店价']

ghsApp/src/admin/item/add.vue

@@ -25,7 +25,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">今日特价</div>
+          <div class="tui-title">特价</div>
           <input v-model="form.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" maxlength="50" type="digit" />
         </tui-list-cell>
 

ghsApp/src/admin/item/copy.vue

@@ -25,7 +25,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">今日特价</view>
+          <view class="tui-title">特价</view>
           <input v-model="form.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" maxlength="50" type="digit" />
         </tui-list-cell>
 

ghsApp/src/admin/item/detail.vue

@@ -25,7 +25,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">今日特价</view>
+          <view class="tui-title">特价</view>
           <input v-model="form.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" maxlength="50" type="digit" />
         </tui-list-cell>
 

ghsApp/src/api/product/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const cancelDiscountPrice = data => {
+	return https.get("/product/cancel-discount", data);
+};
+
 export const print = data => {
 	return https.get("/product/print", data);
 };

mallApp/src/components/item/module/app-goods-commodity.vue

@@ -3,13 +3,13 @@
 	<view>
 		<view class="item-cmd_bx" @click="addEvents">
 			<view class="img_bx" >
-				<app-img  :src="info.smallImgList[0]" alt="商品图" mode="aspectFit" :height="160" />
+				<app-img  :src="info.smallImgList[0]" mode="aspectFit" :height="160" />
 			</view>
 			<view class="cmd-info_bx">
 				<view class="tit" @click="addEvents">{{ info.name || "" }}</view>
-	<!--			<view class="kc" @click="addEvents">库存 {{ info.stock }}</view>-->
+
 				<view class="num-open_bx">
-					<!--<view class="price">￥{{ showPrice }}</view>-->
+
 					<view class="price">￥{{ info.price }}</view>
 					<view class="open-bx" >
 						<i class="iconfont iconjianqu" :class="delAnimationData?'animation':''" @click.stop="delEvent" v-if="bigCount > 0"></i>

mallApp/src/pages/item/components/subItem.vue

@@ -7,11 +7,11 @@
 			<view class="tit" >{{ info.itemName}}</view>
 			<view class="kc num-open_bx flex-space">
 				<view v-if="!offPrice">
-					<view class="flex-space" style="margin-top:20upx" v-if="Number(info.discountPrice)>0">
-						<view style="padding:2upx 10upx 5upx 10upx;text-align: center;color: red;border: 1upx solid red;margin-right: 20upx;line-height: 1;font-size: 20upx">
+					<view class="flex-space" style="margin-top:20upx;" v-if="Number(info.discountPrice)>0">
+						<view style="padding:2upx 10upx 5upx 10upx;text-align: center;color: red;border: 1upx solid red;line-height: 1;font-size: 20upx;">
 							{{parseFloat(((Number(info.discountPrice)/Number(info.prePrice)).toFixed(2)*10).toFixed(1))+'折'}}
 						</view>
-						<text style="text-decoration:line-through;color:#A9A9A9">¥{{parseFloat(info.prePrice)}}</text>
+						<text style="text-decoration:line-through;color:#A9A9A9;position:absolute;display:block;top:16upx;left:90upx;">¥{{parseFloat(info.prePrice)}}</text>
 					</view>
 					<view class="price" >￥{{ parseFloat(info.price) }}</view>
 				</view>
@@ -31,11 +31,9 @@
 		</view>
 	</view>
 </template>
-
 <script>
 import { COMMODITY_TYPE } from "@/utils/declare";
 import AppImg from "@/components/app-img";
-//import { autoPriceByIdApi, changePriceByIdApi } from '@/api/product/index'
 import allSelectInput from "@/components/module/allSelectInput";
 import animationMins from "@/mixins/animation";
 import allSelectInputMins from "@/mixins/allSelectInput";