yudao-ui-admin-uniapp/pages/order/detail.vue

@@ -12,54 +12,24 @@
       ]"
     >
       <view class="ss-flex ss-m-t-32 ss-m-b-20">
-        <image
-          v-if="
-            state.orderInfo.status_code == 'unpaid' ||
-            state.orderInfo.status === 10 || // 待发货
-            state.orderInfo.status_code == 'nocomment'
-          "
-          class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
-        >
-        </image>
-        <image
-          v-if="
-            state.orderInfo.status_code == 'completed' ||
-            state.orderInfo.status_code == 'refund_agree'
-          "
-          class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
-        >
-        </image>
-        <image
-          v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
-          class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
-        >
-        </image>
-        <image
-          v-if="state.orderInfo.status_code == 'noget'"
-          class="state-img"
-          :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
-        >
-        </image>
-        <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
+ 
+        <view class="ss-font-40">{{ state.orderInfo.phone.slice(-4) }}</view>
       </view>
       <view class="ss-font-26 ss-m-x-20 ss-m-b-70">{{
-        formatOrderStatusDescription(state.orderInfo)
+       '取餐码'
       }}</view>
     </view>
 
     <!-- 收货地址 -->
-    <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
+    <view class="order-address-box" >
       <view class="ss-flex ss-col-center">
         <text class="address-username">
           {{ state.orderInfo.receiverName }}
         </text>
-        <text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
+        <text class="address-phone">{{ state.orderInfo.phone }}</text>
       </view>
       <view class="address-detail">
-        {{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+        {{ state.orderInfo.name }} {{ state.orderInfo.address }}
       </view>
     </view>
 
@@ -68,62 +38,7 @@
       :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
     >
       <!-- 订单信 -->
-      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
-        <view class="order-card">
-          <s-goods-item
-            @tap="onGoodsDetail(item.spuId)"
-            :img="item.picUrl"
-            :title="item.spuName"
-            :skuText="item.properties.map((property) => property.valueName).join(' ')"
-            :price="item.price"
-            :num="item.count"
-          >
-            <template #tool>
-              <view class="ss-flex">
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="[10, 20, 30].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
-                  @tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/apply', {
-                      orderId: state.orderInfo.id,
-                      itemId: item.id,
-                    })
-                  "
-                >
-                  申请售后
-                </button>
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="item.afterSaleStatus === 10"
-                  @tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/detail', {
-                      id: item.afterSaleId,
-                    })
-                  "
-                >
-                  退款中
-                </button>
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="item.afterSaleStatus === 20"
-                  @tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/detail', {
-                      id: item.afterSaleId,
-                    })
-                  "
-                >
-                  退款成功
-                </button>
-              </view>
-            </template>
-            <template #priceSuffix>
-              <button class="ss-reset-button tag-btn" v-if="item.status_text">
-                {{ item.status_text }}
-              </button>
-            </template>
-          </s-goods-item>
-        </view>
-      </view>
+
     </view>
 
     <!-- 订单信息 -->
@@ -132,7 +47,7 @@
         <view class="notice-item--center">
           <view class="ss-flex ss-flex-1">
             <text class="title">订单编号：</text>
-            <text class="detail">{{ state.orderInfo.no }}</text>
+            <text class="detail">{{ state.orderInfo.id }}</text>
           </view>
           <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
         </view>
@@ -149,102 +64,51 @@
           </text>
         </view>
         <view class="notice-item">
-          <text class="title">支付方式：</text>
-          <text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
+          <text class="title">类型：</text>
+          <text class="detail">{{ state.orderInfo.type==1?'外卖':'堂食' || '-' }}</text>
         </view>
       </view>
     </view>
-
+    <view v-for="(i,j) in state.orderInfo.goodsInfoList" :key="j" class="minmi" style="width: 100vw;background-color: #fff;"  >
+							<image class="imgPic" :src="i.goodsIcon" mode=""></image>
+							<view class="rightContainer">
+								<view class="foodName">
+									{{i.goodsName}}
+								</view>
+								<view class="foodPrice">
+									<view class="priceflex">
+										<text class="zero">￥</text>
+										{{i.goodsPrice}}
+									</view>
+									<view class="shopCar iconfont-themeColor-write" v-show="i.num == 0" @tap="addcart(i)">
+										<text class="lg text-white cuIcon-add"  ></text>
+									</view>
+									<view class=""  v-if="i.num > 0" >
+										<!-- <text class="lg text-white cuIcon-minus" @tap="addcart(i)" ></text> -->
+										<!-- <uni-number-box :min="0" :max="100" :step="1" v-model="i.num" @tap="chengeCart(i)"  /> -->
+										<text>{{ i.num }}</text>
+										
+									</view>
+								</view>
+							</view>
+			</view>
     <!-- 价格信息 -->
     <view class="order-price-box">
       <view class="notice-item ss-flex ss-row-between">
         <text class="title">商品总额</text>
         <view class="ss-flex">
-          <text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
+          <text class="detail">￥{{ state.orderInfo.price }}</text>
         </view>
       </view>
-      <view class="notice-item ss-flex ss-row-between">
-        <text class="title">运费</text>
-        <text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
-      </view>
-      <!-- TODO 芋艿：优惠劵抵扣、积分抵扣 -->
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
-        <text class="title">优惠劵金额</text>
-        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
-      </view>
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
-        <text class="title">活动优惠</text>
-        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
-      </view>
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
-        <text class="title">会员优惠</text>
-        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
-      </view>
-      <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
+      <!-- <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
         <text class="title">{{ state.orderInfo.payStatus ? '已付款' : '需付款' }}</text>
-        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
-      </view>
-      <view
-        class="notice-item all-rpice-item ss-flex ss-m-t-20"
-        v-if="state.orderInfo.refundPrice > 0"
-      >
-        <text class="title">已退款</text>
-        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
-      </view>
+        <text class="detail all-price">￥{{ state.orderInfo.price }}</text>
+      </view> -->
     </view>
 
     <!-- 底部按钮 -->
     <!-- TODO: 查看物流、等待成团、评价完后返回页面没刷新页面 -->
-    <su-fixed bottom placeholder bg="bg-white" v-if="state.orderInfo.buttons?.length">
-      <view class="footer-box ss-flex ss-col-center ss-row-right">
-        <button
-          class="ss-reset-button cancel-btn"
-          v-if="state.orderInfo.buttons?.includes('cancel')"
-          @tap="onCancel(state.orderInfo.id)"
-        >
-          取消订单
-        </button>
-        <button
-          class="ss-reset-button pay-btn ui-BG-Main-Gradient"
-          v-if="state.orderInfo.buttons?.includes('pay')"
-          @tap="onPay(state.orderInfo.payOrderId)"
-        >
-          继续支付
-        </button>
-        <button
-          class="ss-reset-button cancel-btn"
-          v-if="state.orderInfo.buttons?.includes('combination')"
-          @tap="
-            sheep.$router.go('/pages/activity/groupon/detail', {
-              id: state.orderInfo.combinationRecordId,
-            })
-          "
-        >
-          拼团详情
-        </button>
-        <button
-          class="ss-reset-button cancel-btn"
-          v-if="state.orderInfo.buttons?.includes('express')"
-          @tap="onExpress(state.orderInfo.id)"
-        >
-          查看物流
-        </button>
-        <button
-          class="ss-reset-button cancel-btn"
-          v-if="state.orderInfo.buttons?.includes('confirm')"
-          @tap="onConfirm(state.orderInfo.id)"
-        >
-          确认收货
-        </button>
-        <button
-          class="ss-reset-button cancel-btn"
-          v-if="state.orderInfo.buttons?.includes('comment')"
-          @tap="onComment(state.orderInfo.id)"
-        >
-          评价
-        </button>
-      </view>
-    </su-fixed>
+ 
   </s-layout>
 </template>
 
@@ -630,4 +494,62 @@
       color: #fff;
     }
   }
+  .minmi {
+		display: flex;
+		width: 592upx;
+		margin-left: 25upx;
+		padding-top: 51upx;
+
+		.imgPic {
+			width: 208upx;
+			height: 167upx;
+			border-radius: 10upx;
+			margin-left: 20upx;
+		}
+
+		.rightContainer {
+			display: flex;
+			flex-direction: column;
+			height: 167upx;
+			box-sizing: border-box;
+			justify-content: space-between;
+			align-items: flex-start;
+			padding-left: 18upx;
+			padding-right: 18upx;
+			padding-top: 18upx;
+			// padding-bottom: 18upx;
+			flex: 1;
+
+			.foodName {
+				font-weight: 700;
+				font-size: 25upx;
+			}
+
+			.foodPrice {
+				display: flex;
+				justify-content: space-between;
+				width: 375upx;
+				color: #F9BE3E;
+
+				.priceflex {
+					display: flex;
+					align-items: center;
+
+					.zero {
+						font-size: 15upx;
+					}
+				}
+
+				.shopCar {
+					background-color: #F9BE3E;
+					border-radius: 45upx;
+					width: 112upx;
+					height: 45upx;
+					font-size: 25upx;
+					text-align: center;
+					line-height: 46upx;
+				}
+			}
+		}
+	}
 </style>

yudao-ui-admin-uniapp/pages/order/list.vue

@@ -1,17 +1,24 @@
 <!-- 订单列表 -->
 <template>
 	<s-layout title="我的订单">
-		<su-sticky bgColor="#fff">
+		<!-- <su-sticky bgColor="#fff">
 			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
-		</su-sticky>
+		</su-sticky> -->
 		<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
 		<view v-if="state.pagination.total > 0">
 			<view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.list"
             :key="order.id" @tap="onOrderDetail(order.id)">
 				<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
-					<view class="order-no">订单号：{{ order.no }}</view>
-					<view class="order-state ss-font-26" :class="formatOrderColor(order)">
-            {{ formatOrderStatus(order) }}
+					<view class="order-no">订单号：{{ order.id }}
+						<span v-show="order.type == 1">{{ '外卖' }}</span>
+						<span v-show="order.type == 2">{{ '堂食' }}</span>
+					</view>
+					<view class="order-state ss-font-26" >
+            <!-- {{ order.updateTime}} -->
+			<!-- <uni-dateformat :date="order.updateTime" ></uni-dateformat> -->
+			<view class="discounts-money pay-color">
+							总金额:￥{{order.price }}
+            </view>
           </view>
 				</view>
 				<view class="border-bottom" v-for="item in order.items" :key="item.id">
@@ -23,51 +30,19 @@
             :num="item.count"
           />
 				</view>
-				<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
+				<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20" style="padding-bottom: 20rpx;">
 					<view class="ss-flex ss-col-center">
-						<view class="discounts-title pay-color">共 {{ order.productCount }} 件商品,总金额:</view>
-						<view class="discounts-money pay-color">
-							￥{{ fen2yuan(order.payPrice) }}
-            </view>
+						<!-- <view class="discounts-title pay-color">共 {{ order.productCount }} 件商品,</view> -->
+						<uni-dateformat :date="Number(order.updateTime)" :threshold="[0,0]"></uni-dateformat>
+						 
+
 					</view>
 				</view>
-				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+				<!-- <view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
               :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'">
 					<view class="ss-flex ss-col-center">
-						<button v-if="order.buttons.includes('combination')" class="tool-btn ss-reset-button"
-							@tap.stop="onOrderGroupon(order)">
-              拼团详情
-						</button>
-						<button v-if="order.buttons.length === 0" class="tool-btn ss-reset-button"
-                    @tap.stop="onOrderDetail(order.id)">
-              查看详情
-						</button>
-						<button v-if="order.buttons.includes('confirm')" class="tool-btn ss-reset-button"
-                    @tap.stop="onConfirm(order)">
-              确认收货
-						</button>
-						<button v-if="order.buttons.includes('express')" class="tool-btn ss-reset-button"
-                    @tap.stop="onExpress(order.id)">
-							查看物流
-						</button>
-						<button v-if="order.buttons.includes('cancel')" class="tool-btn ss-reset-button"
-                    @tap.stop="onCancel(order.id)">
-							取消订单
-						</button>
-						<button v-if="order.buttons.includes('comment')" class="tool-btn ss-reset-button"
-                    @tap.stop="onComment(order.id)">
-							评价
-						</button>
-						<button v-if="order.buttons.includes('delete')" class="delete-btn ss-reset-button"
-                    @tap.stop="onDelete(order.id)">
-							删除订单
-						</button>
-						<button v-if="order.buttons.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
-                    @tap.stop="onPay(order.payOrderId)">
-							继续支付
-						</button>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 

yudao-ui-admin-uniapp/pages/restaurant/confirmOrder.vue

@@ -85,14 +85,21 @@ const addressList = computed(() => {
 			return addressList
 	})
 const handleOk= async () =>{
-	await goodsApi.createOrder({
-        name: addressList.name,
-        phone: addressList.phone,
-        address: addressList.address,
+	let pamser = {
+		name: addressList.value.name,
+        phone: addressList.value.phone,
+        address: addressList.value.address,
 		useTime:datetimesingle.value,
 		type: TabCur.value,
-		goodsList:nowCartList
-    }).then(res => {
+		goodsList:nowCartList.value,
+		openid :uni.getStorageSync('openid')
+		
+	}
+	const formData = {
+      ...pamser
+    }
+	console.log('pamser',formData)
+	await goodsApi.createOrder(formData).then(res => {
 		console.log(res)
     })
     

yudao-ui-admin-uniapp/pages/restaurant/order.vue

@@ -151,7 +151,7 @@
                 {   url:item.goodsIcon,
                     name: item.goodsName,
                     price: item.goodsPrice,
-                    // id: item.goodsId
+                    goodsId: item.id,
                     num : 0
                 });
         });
@@ -179,7 +179,7 @@
       
 	})
     const addcart = (item)=>{
-        console.log('item',item)
+        console.log('item',item.id)
         item.num=1
 		nowCartList.value.push(item)
 		// nowCartPrice.value = nowCartPrice.value+item.price

yudao-ui-admin-uniapp/sheep/api/restaurant/goods.js

@@ -9,12 +9,17 @@ const goodsApi = {
       method: 'POST',
     });
   },
-  createOrder: (params) => {
+  createOrder: (data) => {
     return request({
       url: '/restaurant/order/create',
       method: 'POST',
-      params
+      data:data,
+      custom: {
+        showSuccess: true,
+        successMsg: '更新成功'
+      },  
     });
+    
   },
   
 };

yudao-ui-admin-uniapp/sheep/api/trade/order.js

@@ -54,8 +54,8 @@ const OrderApi = {
   // 获得订单
   getOrder: (id) => {
     return request({
-      url: `/trade/order/get-detail`,
-      method: 'GET',
+      url: `/restaurant/order/getAppOrderDetails`,
+      method: 'POST',
       params: {
         id,
       },
@@ -67,8 +67,8 @@ const OrderApi = {
   // 订单列表
   getOrderPage: (params) => {
     return request({
-      url: '/trade/order/page',
-      method: 'GET',
+      url: '/restaurant/order/page',
+      method: 'POST',
       params,
       custom: {
         showLoading: false,