Merge branch 'dev'

pages/CardSend/CardSend.scss

@@ -319,7 +319,7 @@
 				color:#FFFFFF;
 			}
 			.bj{
-				color: #007aff;
+				color: #FFFFFF;
 				margin-right: 30upx;
 			}
 		}

pages/CardSend/CardSend.vue

@@ -58,7 +58,7 @@
 							</view>
 							<view class="itemname">本店</view>
 						</label>
-						<label class="flex ali-c" >
+						<!-- <label class="flex ali-c" >
 							<view>
 								<radio color="#FF6900" value="2" :checked="parameter.give_type==2" />
 							</view>
@@ -69,7 +69,7 @@
 								<radio color="#FF6900" value="3" :checked="parameter.give_type==3" />
 							</view>
 							<view class="itemname">全网</view>
-						</label>
+						</label> -->
 					</radio-group>
 				</view>
 			</view>
@@ -159,14 +159,18 @@
 						</view>
 						<view class="text flex ali-c jus-b">
 							<text>有效期:{{item.start_time}}至{{item.end_time}}</text>
-							<text v-if="item.get_num==0" class="bj pr-10" @tap="detailsFun(item)">编辑</text>
+							<!-- <text v-if="item.get_num==0" class="bj pr-10" @tap="detailsFun(item)">编辑</text> -->
+							
+							
 						</view>
 					</view>
 				</view>
 				<view class="cardright flexc">
 					<view>
+						<text class="bj pr-10" @tap="detailsFun(item)">编辑</text>
 						<view class="text">优惠</view>
 						<view class="prcie">{{item.money}}元</view>
+						<text class="bj pr-10" @tap="deleteFun(item)">删除</text>
 					</view>
 				</view>
 				
@@ -236,7 +240,7 @@
 <script>
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import wPicker from "@/components/w-picker/w-picker.vue";//时间弹窗
-	import { couponList, closedCoupons,couponGoods,addEditCoupons,couponsDetails} from "@/utils/api/coupon.js"
+	import { couponList, closedCoupons,couponGoods,addEditCoupons,couponsDetails,deleteCoupons} from "@/utils/api/coupon.js"
 	import empty from "@/components/empty/empty.vue"
 	export default {
 		components:{
@@ -308,6 +312,7 @@
 			
 		},
 		methods:{
+			
 			//取消编辑
 			colesedit(){
 				this.parameter={
@@ -419,6 +424,24 @@
 					this.$api.msg(res.msg);
 				}
 			},
+			
+			//删除
+			async deleteFun(item){
+				
+				let res =  await deleteCoupons({
+					id:item.id
+				});
+				this.$api.msg(res.msg);
+				if(res.code == 1){
+					//已发卡券
+					this.page = 0;
+					this.cardlist = [];
+					this.isallshow = false;
+					this.shop_couponFun();
+				}
+				
+			},
+			
 			//优惠券详情 编辑使用
 			async detailsFun(item){
 				let res =  await couponsDetails({

utils/api/coupon.js

@@ -41,3 +41,9 @@ export function couponsDetails(data)
 {
   return request.post("Coupon/couponsDetails",data,{ noAuth : true});
 }
+
+//修改的时候 获取优惠券详情
+export function deleteCoupons(data)
+{
+  return request.post("Coupon/deleteCoupons",data,{ noAuth : true});
+}
\ No newline at end of file