2 Commity 7b8bf3a6ba ... 6a7d262f7b

Autor SHA1 Wiadomość Data
  17755135699 6a7d262f7b Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx 3 miesięcy temu
  17755135699 02c611f486 删除注释代码 3 miesięcy temu

+ 0 - 9
pagesHouse/HotelMerchandise/index.vue

@@ -125,12 +125,6 @@
 
 
 					</view>
 					</view>
 					<view class="type-btn-right">
 					<view class="type-btn-right">
-						<!-- <view class="" @click="shanchu(item,index)">
-							删除
-						</view> -->
-						<!-- <view class="" @click="gaijia(item,index)" v-if='item.goodsType == 2'>
-							改价格
-						</view> -->
 						<view v-if="canyinmeishi" class="" @click="xiajia(item,index)">
 						<view v-if="canyinmeishi" class="" @click="xiajia(item,index)">
 							{{fromData.status==0?'下架':'上架'}}
 							{{fromData.status==0?'下架':'上架'}}
 						</view>
 						</view>
@@ -185,9 +179,6 @@
 					<view v-if="!canyinmeishi" class="right-btn" @click="piliangxiajia">
 					<view v-if="!canyinmeishi" class="right-btn" @click="piliangxiajia">
 						{{fromData.status==0?'批量上架':'批量下架'}}
 						{{fromData.status==0?'批量上架':'批量下架'}}
 					</view>
 					</view>
-					<!-- <view class="right-btn" @click="piliangshanchu">
-						批量删除
-					</view> -->
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>

+ 0 - 18
pagesHouse/Mine/ordersList/details/details.vue

@@ -138,24 +138,6 @@
 				</template>
 				</template>
 			</view>
 			</view>
 		</view>
 		</view>
-		<!-- 餐饮 -->
-	<!-- 	<view class="btns" v-if="merchantType==4&&infoMation.orderStatus==4">
-			<view class="detail del" @tap="hexiao2()" v-if="infoMation.orderStatus==4">
-				核销订单
-			</view>
-
-		</view> -->
-		<!-- <view class="btns" v-if="merchantType==10&&infoMation.status==1"> -->
-		<!-- 	<view class="detail del" @tap="hexiao()" v-if="infoMation.status==1">
-				核销订单
-			</view> -->
-			<!-- <template v-else>
-				<view class="detail" @tap="Detail(list)">
-					删除订单
-				</view>
-			</template> -->
-
-	<!-- 	</view> -->
 	</view>
 	</view>
 
 
 </template>
 </template>

+ 0 - 11
pagesHouse/Mine/ordersList/index.vue

@@ -32,17 +32,6 @@
 							</span>
 							</span>
 						</view>
 						</view>
 					</view>
 					</view>
-					<!-- 待使用 -->
-				<!-- 	<view class="bottom" @click="hexiao(item)" v-if="item.status==1">
-						<view class="detail s1">
-							核销订单
-						</view>
-					</view> -->
-					<!-- <view class="bottom" @click="Detail(item)" v-else>
-					<view class="detail">
-						删除订单
-					</view>
-				</view> -->
 				</template>
 				</template>
 				<template v-if="merchantType==4">
 				<template v-if="merchantType==4">
 					<view class="header">
 					<view class="header">