feat uni 修改了bug

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

@@ -63,10 +63,29 @@
             {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
           </text>
         </view>
+		<view class="notice-item" v-if="state.orderInfo.useTime">
+		  <text class="title">用餐时间：</text>
+		  <text class="detail">
+		    {{ sheep.$helper.timeFormat(state.orderInfo.useTime, 'yyyy-mm-dd hh:MM:ss') }}
+		  </text>
+		</view>
+		
         <view class="notice-item">
           <text class="title">类型：</text>
-          <text class="detail">{{ state.orderInfo.type==1?'外卖':'堂食' || '-' }}</text>
+          <text class="detail">{{ state.orderInfo.type==2?'外卖':'堂食' || '-' }}</text>
         </view>
+		<view class="notice-item">
+		  <text class="title">状态：</text>
+		  <text v-show="state.orderInfo.state==1">待支付</text>
+		  <text v-show="state.orderInfo.state==2">支付失败</text>
+		  <text v-show="state.orderInfo.state==3">支付超时 </text>
+		  <text v-show="state.orderInfo.state==4">待取餐 </text>
+		  <text v-show="state.orderInfo.state==5">已完成</text>
+		  <text v-show="state.orderInfo.state==6">已退款</text>
+		  <!-- <text class="detail">{{ state.orderInfo.state==2?'外卖':'堂食' || '-' }}</text> -->
+		  
+		</view>
+		
       </view>
     </view>
     <view v-for="(i,j) in state.orderInfo.goodsInfoList" :key="j" class="minmi" style="width: 100vw;background-color: #fff;"  >

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

@@ -10,8 +10,8 @@
             :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.id }}
-						<span v-show="order.type == 1">{{ '外卖' }}</span>
-						<span v-show="order.type == 2">{{ '堂食' }}</span>
+						<span v-show="order.type == 2">{{ '外卖' }}</span>
+						<span v-show="order.type == 1">{{ '堂食' }}</span>
 					</view>
 					<view class="order-state ss-font-26" >
             <!-- {{ order.updateTime}} -->

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

@@ -71,7 +71,7 @@
 <script setup>
 import sheep from '@/sheep';
 import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
-import { computed, reactive, ref } from 'vue';
+import { computed, reactive, ref ,onMounted} from 'vue';
 import goodsApi from '@/sheep/api/restaurant/goods'
 
 const cart = sheep.$store('cart');
@@ -83,6 +83,10 @@ const addressList = computed(() => {
 		console.log('restaurant', addressList)
 			return addressList
 	})
+	const updateTime = () => {
+		datetimesingle.value= new Date().getTime()
+		console.log('updateTime',datetimesingle.value)
+	}
 const handleOk= async () =>{
 	if(datetimesingle.value ==''){
 		sheep.$helper.toast('请选择用餐时间')
@@ -153,6 +157,9 @@ const tabSelect= (e) =>{
 	console.log(e.currentTarget.dataset.id)
     TabCur.value = e.currentTarget.dataset.id;
 }
+onMounted(() => {
+	updateTime()
+})
 </script>
 
 <style scoped lang="scss">

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

@@ -4,7 +4,7 @@
             <!-- <swiper class="screen-swiper round-dot" :indicator-dots="true" :circular="true" :autoplay="true" interval="5000"
 		 duration="500"> -->
 			<!-- <swiper-item v-for="(item,index) in 4" :key="index"> -->
-				<image src="https://www.rshunfandian.cn/prod-api/admin-api/infra/file/24/get/829355650921a542a491d6b901fce0a11b261e749778fb68688fed23d1b31fc5.png" mode="aspectFit" style="height: 15vh; width: 100%;"></image>
+				<image src="https://www.rshunfandian.cn/prod-api/admin-api/infra/file/24/get/3538c31c3fd5e425f94c28721fb4911cfd2e36d492f7b9880daa1398c59532e4.jpg" mode="aspectFit" style="height: 15vh; width: 100%;"></image>
 			<!-- </swiper-item> -->
 		<!-- </swiper> -->
         <!-- </view> -->
@@ -55,7 +55,7 @@
 					</view>
                     <view style="margin-left: 20px;">
                         <view class="">合计: ￥{{nowCartPrice}}</view>
-                        <view class="">菜品: {{nowCartList.length}}道</view>
+                        <view class="">菜品: {{nowCartNum}}道</view>
                     </view>
                   
                 </view>
@@ -108,7 +108,8 @@
 	import {
 		ref,
 		onMounted,
-		getCurrentInstance
+		getCurrentInstance,
+		computed
 	} from 'vue'
 	const cart = sheep.$store('cart');
 	const popup = ref(null);
@@ -125,6 +126,14 @@
 	}
 	const asideList = ref([])
     const getAideList = ref([])
+	const nowCartNum = computed(() => {
+		let num = 0
+		console.log('nowCartNum' )
+		nowCartList.value.forEach(element => {
+			num= num + element.num
+		});
+		return num
+	});
 	const toggle = () =>{
 		popup.value.open()
 }

yudao-ui-admin-uniapp/sheep/platform/provider/wechat/miniProgram.js

@@ -164,10 +164,10 @@ const checkUpdate = async (silence = true) => {
 
 // 获取订阅消息模板
 async function getSubscribeTemplate() {
-  const { error, data } = await third.wechat.subscribeTemplate();
-  if (error === 0) {
-    subscribeEventList = data;
-  }
+  // const { error, data } = await third.wechat.subscribeTemplate();
+  // if (error === 0) {
+    // subscribeEventList = data;
+  // }
 }
 
 // 订阅消息