问题修复

pagesCreateOrder/index/components/car.vue

@@ -125,7 +125,7 @@
           class="u-p-t-32 u-p-b-32 u-p-r-28 u-p-l-28 u-m-t-40 bg-fff u-flex u-row-between"
         >
           <view class="color-333" style="font-weight: bold">历史订单</view>
-          <view class="color-666">
+          <!-- <view class="color-666">
             <uni-icons color="#666" type="trash"></uni-icons>
             <text
               class="u-m-l-10"
@@ -134,7 +134,7 @@
               "
               >清空历史订单</text
             >
-          </view>
+          </view> -->
         </view>
         <view
           v-for="(item, index) in historyOrder"
@@ -581,7 +581,7 @@ function getshopsInfo() {
 
 async function workerConfirm() {
   //debugger
-  form.workerAccount=accountStore.staffUserName
+  // form.workerAccount=accountStore.staffUserName
   if (!form.workerAccount) {
     return infoBox.showToast("请输入服务员账号");
   }
@@ -603,7 +603,7 @@ async function workerConfirm() {
       placeNum: 1, //当前订单下单次数
       waitCall: 0, //是否等叫 0 否 1 等叫
       vipPrice: false, //是否使用会员价
-      limitRate: null,
+      limitRate:  props.limitTimeDiscount,
       subStatus: subStatus.value,
       orderId: props.orderInfo.id?props.orderInfo.id:"",
     });

pagesCreateOrder/index/index.vue

@@ -523,10 +523,7 @@ function onMessage() {
       );
     }
 
-    if (
-      msg.status == 0 &&
-      msg.type != "time_discount" 
-    ) {
+    if (msg.status == 0 && msg.type != "time_discount") {
       console.log("msg", msg);
       infoBox.showToast(msg.msg || "添加失败");
       data.isGoodsAdd = true;
@@ -646,7 +643,7 @@ async function getHistoryOrderDetail() {
   if (shopInfo.registerType == "before") {
     return;
   }
-  if(!data.table.tableCode){
+  if (!data.table.tableCode) {
     return;
   }
   data.historyOrder = [];
@@ -1962,10 +1959,6 @@ onShow(() => {
       data.userInfo = shopif;
     }
   }
-  // 判断是否token过期,是否有名字
-  if (!data.userInfo.shopName) {
-    loginShowOut();
-  }
 
   getHistoryOrderDetail();
   nextTick(() => {
@@ -2018,7 +2011,7 @@ async function getLimit() {
 }
 
 async function getTableDetail() {
-  if(!data.table.tableCode){
+  if (!data.table.tableCode) {
     return;
   }
   let res = await $returnTableDetail({

pagesCreateOrder/table-order/components/goods-list.vue

@@ -180,6 +180,10 @@ function returnLimitPrice(data) {
     shopUserInfo: cartStore.shopUserInfo,
     idKey: "productId",
   });
+
+  console.log("cartStore.shopInfo", cartStore.shopInfo);
+  console.log("cartStore.limitTimeDiscount", cartStore.limitTimeDiscount);
+  console.log("cartStore.shopUserInfo", cartStore.shopUserInfo);
   return price;
 }
 

pagesCreateOrder/table-order/index.vue

@@ -515,6 +515,7 @@ async function discountconfirm(form) {
       product_id: modelData.data.product_id,
       sku_id: modelData.data.sku_id,
       discount_sale_amount: discount_sale_amount,
+      is_time_discount: discount_sale_amount>0 ? 0 : (modelData.data.is_time_discount||modelData.data.isTimeDiscount)
       // discount_sale_note: str + form.note,
     };
     updateCart(par);