订单，商品，代客下单，分组，分类页面调整

删除批量修改库存数量

pagesCreateOrder/choose-table/choose-table.vue

@@ -23,7 +23,7 @@
 		</view>
 
 		<view class="list ">
-			<view class="u-m-t-32 bg-fff box bg-fff">
+			<view class=" bg-fff box bg-fff">
 				<view class="u-flex item u-row-between" v-for="(item,index) in tables.list" :key="index"
 					@tap="chooseTable(index,item)">
 					<view class="u-flex">
@@ -219,16 +219,17 @@
 	}
 
 	.area {
-		padding: 2px 28rpx 24rpx 10px;
+		padding: 2px 28rpx 24rpx 28rpx;
 	}
 
 	.scale7 {
 		transform: scale(0.7);
 	}
-
+	::v-deep .uni-searchbar{
+		padding: 0!important;
+	}
 	.search {
-		padding-right: 28rpx;
-
+		padding: 20rpx 28rpx 20rpx 28rpx;
 		.icon-saoma {
 			margin-left: 20rpx;
 			width: 34rpx;
@@ -238,7 +239,6 @@
 
 	.list {
 		padding: 32rpx 24rpx;
-
 		.no-choose {
 			padding: 36rpx 30rpx 36rpx 24rpx;
 		}

pagesCreateOrder/confirm-order/components/remark.vue

@@ -1,7 +1,7 @@
 <template>
 	<my-model ref="model" :title="title" iconColor="#000" @close="resetForm">
 		<template #desc>
-			<view class="u-text-left u-p-30 ">
+			<view class="u-text-left u-p-l-30 u-p-r-30 u-p-t-30 ">
 				<view class="u-m-t-32 u-flex ">
 					<uni-easyinput type="textarea" v-model="form.remark" placeholder="自定义内容"></uni-easyinput>
 				</view>
@@ -15,9 +15,9 @@
 			</view>
 		</template>
 		<template #btn>
-			<view class="u-p-30">
-				<view class="u-m-t-10">
-					<my-button @tap="confirm" shape="circle" showShadow>确认</my-button>
+			<view class="u-p-l-30 u-p-r-30 u-m-t-28 u-p-b-30">
+				<view class="">
+					<my-button @tap="confirm" shape="circle" fontWeight="700">确认</my-button>
 					<view class="u-m-t-10">
 						<my-button type="cancel" bgColor="#fff" @tap="confirm">取消</my-button>
 					</view>

pagesCreateOrder/confirm-order/confirm-order.vue

@@ -130,7 +130,7 @@
 			</view>
 
 			<view class="goods u-m-t-32">
-				<view class="item u-p-b-32" @click="changeGoodsSel(index)" v-for="(item,index) in goods.list"
+				<view class="item u-m-b-48" @click="changeGoodsSel(index)" v-for="(item,index) in goods.list"
 					:key="index">
 					<view class="u-flex u-row-between ">
 						<view class="u-flex">
@@ -197,7 +197,6 @@
 							</view>
 						</view>
 					</scroll-view>
-					<view class="border-top u-m-t-48 " v-if="index==goods.sel"></view>
 				</view>
 			</view>
 			<view class="border-bottom">
@@ -245,7 +244,7 @@
 			<view class="btn ">
 				<my-button shape="circle" @click="createOrder">
 					<view class="font-bold u-font-32">
-						{{$shop.registerType=='munchies'?'结算': '下单'}}
+						{{($shop.registerType=='munchies'||eatTypes.active=='takeout')?'结算': '下单'}}
 					</view>
 				</my-button>
 			</view>
@@ -366,6 +365,7 @@
 			isPack,isGift
 		} = item
 		const par = {
+			cartId:id,
 			isPack,
 			isGift,
 			masterId: option.masterId,
@@ -375,7 +375,7 @@
 			skuId
 		}
 		par[key] = !item[key]
-		const res = await Api.addCart(par)
+		const res = await Api.$updateCart(par)
 		goods.list[index][key] = returnBoolean(res[key])
 		if(key=='isPack'){
 			getCart()
@@ -469,8 +469,7 @@
 		sel: 0
 	})
 	const goodsNumber = computed(() => {
-		let result = 0
-		result = goods.list.reduce((prve, cur) => {
+		const result = goods.list.reduce((prve, cur) => {
 			return prve + cur.number
 		}, 0)
 		return result
@@ -567,7 +566,7 @@
 		uni.$emit('update:createOrderIndex')
 		console.log($shop.value);
 		console.log(res);
-		if ($shop.value.registerType == 'munchies') {
+		if ($shop.value.registerType == 'munchies'||eatTypes.active=='takeout') {
 			//先付
 			return go.to('PAGES_ORDER_PAY', {
 				orderId: res.id,
@@ -716,9 +715,8 @@
 	}
 
 	.goods {
-		padding-bottom: 30rpx;
+		// padding-bottom: 30rpx;
 		border-bottom: 1px dashed #E5E5E5;
-
 		.item {
 			.img {
 				width: 84rpx;