sss~

pages/HotelManage/HotelManage.scss

 .ProductManage{
 	min-height: 100vh;
 	background: #F5F2F2;
+	padding-bottom: 120upx;
 }
 .projuctTab{
 	background: #FFFFFF;
@@ -40,7 +41,7 @@
 	.itempro{
 		position: relative;
 		border-bottom: 1px solid rgba(220,220,220,1);
-		padding: 20upx;
+		padding:30upx 20upx;
 		.thumbnail{
 			width: 143upx;
 			height: 143upx;
@@ -89,6 +90,9 @@
 			}
 		}
 	}
+	.itempro:nth-last-child(1){
+		border:0;
+	}
 	
 }
 

pages/edit/shop/shop.vue

@@ -51,12 +51,12 @@
 				<textarea maxlength="-1"  v-model="fromdata.details" placeholder="请输入介绍"></textarea>
 				<!-- :disabled="modalName!=null" -->
 			</view>
-			<view class="cu-form-group ">
+			<!-- <view class="cu-form-group ">
 				<view class="title">是否营业：</view>
 				<view class="title" >
 					<switch @change="SwitchAchange" :class="switchA?'checked':''"  :checked="switchA?true:false" color="#e54d42"></switch> 
 				</view>
-			</view>
+			</view> -->
 			
 		</view>
 		

pages/hotelOrder/hotelOrder.scss

@@ -106,4 +106,8 @@
 			}
 		}
 	}
+}
+
+.ml-20{
+	margin-left: 20upx;
 }
\ No newline at end of file

pages/hotelOrder/hotelOrder.vue

@@ -54,6 +54,14 @@
 					<view class="footbodyorder_r flex ali-c">
 						
 						<view class="btns iusbg isend ml-20" :data-orderid="item.order_id" @tap="orderDetails">查看订单</view>
+						
+						<view class="btns iusbg isend ml-20" v-if="item.order_status.indexOf('退')!=-1"  @tap="hotelConsentRefund(item)">同意退款</view>
+						
+						<view class="btns iusbg isend ml-20" v-if="item.order_status.indexOf('退')!=-1"   @tap="hotelRefuseRefund(item)">拒绝退款</view>
+						
+						
+						
+						
 						<!-- <view class="btns iusbg isend ml-20"  v-if='item.order_status==1' :data-orderid="item.order_id" @tap="method">确认人住</view> -->
 							
 						<!-- <navigator url="/pages/myStore/HotelRefundExamine?id=11" class="btns iusbg isend">立即处理</navigator> -->
@@ -76,7 +84,7 @@
 <script>
 	// import { shopHotel,complete} from "@/utils/api/shop.js";
 	import empty from "@/components/empty/empty.vue";
-	import {hotelStatus,hotelOrder} from "@/utils/api/hotel.js";
+	import {hotelStatus,hotelOrder,hotelConsentRefund,hotelRefuseRefund} from "@/utils/api/hotel.js";
 	
 	export default {
 		components:{
@@ -186,6 +194,7 @@
 				}
 				
 			},
+			//切换tab
 			taggletabs(ids){
 				if(ids!=this.tabactive){
 					this.tabactive = ids;
@@ -195,7 +204,42 @@
 					this.shopHotelfun();
 				}
 				
+			},
+			//酒店订单同意退房
+			async hotelConsentRefund(data){
+				let res = await hotelConsentRefund({
+					order_id:data.order_id,
+				});
+				if(res.code==0){
+					this.$api.msg(res.msg);
+					
+					this.orderList = [];
+					this.page = 0;
+					this.isallshow = false;
+					this.shopHotelfun();//刷新列表
+					
+				}else{
+					this.$api.msg(res.msg);
+				}
+			},
+			//酒店订单拒绝退房
+			async hotelRefuseRefund(data){
+				let res = await hotelRefuseRefund({
+					order_id:data.order_id,
+				});
+				if(res.code==0){
+					this.$api.msg(res.msg);
+					
+					this.orderList = [];
+					this.page = 0;
+					this.isallshow = false;
+					this.shopHotelfun();//刷新列表
+					
+				}else{
+					this.$api.msg(res.msg);
+				}
 			}
+			
 		}
 	}
 </script>

pages/hotelOrderDetaile/hotelOrderDetaile.scss

@@ -199,6 +199,7 @@ page{
 	font-size: 24upx;
 	font-weight: 500;
 	color: rgba(0,0,0,1);
+	margin-top: 10upx;
 
 }
 

pages/index/index.vue

@@ -10,7 +10,7 @@
 				<view class="jiu_01">
 					<navigator url="/pages/notice/notice">
 						<view>
-							<image class="img" src="/static/icon/xiaoxiicon.png" mode=""></image>
+							<image class="img" src="/static/icon/newsicon.png" mode=""></image>
 						</view>
 						<view>消息通知</view>
 					</navigator>
@@ -188,7 +188,7 @@
 			<view class="jiu_01 " v-if="shop_type=='goods'">
 				<navigator url="/pages/LuckDraw/homenav/homenav">
 					<view>
-						<image class="img" src="/static/news/activity.png" mode=""></image>
+						<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
 					</view>
 					<view>抽奖活动</view>
 				</navigator>

pages/specs/specs.vue

@@ -6,7 +6,7 @@
 		<view class="specslist">
 			<view class="specsItemdata flex ali-c jus-b" v-for="(item,index) in specsList" :key="index">
 				<view class="flex1">
-					<view class="specsname">{{item.name}}</view>
+					<view class="specsname">{{TypeList[item.type_id].name}}  {{item.name}}</view>
 					<view class="spectag twoline">{{item.spec_item}}</view>
 				</view>
 				<view class="issysbtns">
@@ -23,11 +23,12 @@
 </template>
 
 <script>
-	import {specitemList} from  "@/utils/api/api.js";
+	import {specitemList,specTypeList} from  "@/utils/api/api.js";
 	export default {
 		data() {
 			return {
 				specsList:[],
+				TypeList:[],//关联分类
 			};
 		},
 		onLoad() {
@@ -35,6 +36,8 @@
 		},
 		onShow() {
 			this.getspecitemList();
+			
+			this.getspecTypeList();//分类模型
 		},
 		methods:{
 			//获取规格列表
@@ -47,6 +50,24 @@
 					this.$api.msg(res.msg);
 				}
 			},
+			async getspecTypeList(){
+				let res = await specTypeList({
+					
+				});
+				if(res.code==0){
+					let TypeList = res.data;
+					let twoobj ={};
+					TypeList = TypeList.map((item,index)=>{
+						let id = "name";
+						id = item.id;
+						twoobj[id] = item;
+						return {[id]:{...item}};
+					})
+					this.TypeList = twoobj;
+				}else{
+					this.$api.msg(res.msg);
+				}
+			},
 			getedti(data){
 				uni.setStorageSync("editspecs",data);
 				uni.navigateTo({

pages/user/reseller/reseller.scss

@@ -27,7 +27,8 @@ page {
 				
 			}
 			.num1{
-				margin-top: 10%; text-align: center;width: 33%;
+				margin-top: 10%; text-align: center;
+				// width: 33%;
 			}
 			
 		}
@@ -36,7 +37,7 @@ page {
 			font-size: 30upx;
 			position: absolute;
 			left: 78%;
-			top: 20%;
+			top: 15%;
 		}
 
 		.tixian {

utils/api/hotel.js

@@ -74,3 +74,5 @@ export function hotelRefuseRefund(data)
 {
   return request.post("order/hotelRefuseRefund",data,{ noAuth : false});
 }
+
+//因为小程序和APP 都没有做酒店的退款