分销问题修复，订单问题修复

stores/carts.js

@@ -47,6 +47,7 @@ export const useCartsStore = defineStore("cart", () => {
       product_id: item.product_id || item.productId,
       sku_id: item.skuId || item.sku_id,
     });
+    const discountSaleAmount=item.discount_sale_amount?(item.discount_sale_amount*1) : (item.discountSaleAmount?item.discountSaleAmount*1:0)
     return {
       ...item,
       id: item.id,
@@ -57,10 +58,10 @@ export const useCartsStore = defineStore("cart", () => {
       product_type: item.productType,
       is_temporary: !!(item.is_temporary || item.isTemporary),
       is_gift: !!(item.is_gift || item.isGift),
+      is_time_discount: item.is_time_discount || item.isTimeDiscount ,
       returnNum: item.returnNum || 0,
       memberPrice: item.memberPrice || 0,
-      discountSaleAmount:
-        item.discount_sale_amount || item.discountSaleAmount || 0,
+      discountSaleAmount:discountSaleAmount,
       packFee: item.packFee || (goods ? goods.packFee : 0) || 0,
       packNumber: item.pack_number || item.packNumber || 0,
       activityInfo: item.activityInfo
@@ -86,6 +87,11 @@ export const useCartsStore = defineStore("cart", () => {
     const oldOrderGoods = Object.values(oldOrder.value.detailMap || {})
       .flat()
       .map(convertToBaseCartItem);
+
+      console.log('oldOrder.value',oldOrder.value)
+      if(!oldOrder.value.id){
+
+      }
     return [...currentGoods, ...giftGoods, ...oldOrderGoods];
   }
 
@@ -217,8 +223,8 @@ export const useCartsStore = defineStore("cart", () => {
   //商品数据Map
   const goodsMap = reactive({});
 
-  function returnGoods(product_id){
-    return goodsMap[product_id*1]
+  function returnGoods(product_id) {
+    return goodsMap[product_id * 1];
   }
 
   //获取商品数据
@@ -244,7 +250,6 @@ export const useCartsStore = defineStore("cart", () => {
     goodsMap[product_id] = data;
   }
 
-
   const isLoading = ref(true);
 
   function getProductDetails(v) {
@@ -308,7 +313,9 @@ export const useCartsStore = defineStore("cart", () => {
       const msgData = Message.data;
       // 初始化
       if (Message.operate_type == "init") {
+        console.log("carts init Message", Message);
         console.log("carts init", msgData);
+        limitTimeDiscount.value = Message.time_dis_info;
         cartsGoodsInfoInit(msgData);
         uni.hideLoading();
         isLoading.value = false;
@@ -357,10 +364,14 @@ export const useCartsStore = defineStore("cart", () => {
         });
       }
       //获取限时折扣
-      // if(Message.operate_type == "time_discount_get"){
-      //   console.log("time_discount_get", Message.data);
-      //   limitTimeDiscount.value = Message.data;
-      // }
+      if(Message.operate_type == "time_discount_get"){
+        console.log("time_discount_get", Message.data);
+        limitTimeDiscount.value = Message.data;
+      }
+      if(Message.operate_type == "time_discount_save"){
+        console.log("time_discount_save", Message.data);
+        limitTimeDiscount.value = Message.data;
+      }
 
       if (Message.type == "no_suit_num") {
         uni.showModal({
@@ -407,11 +418,13 @@ export const useCartsStore = defineStore("cart", () => {
 
   //是否使用会员价
   const useVipPrice = computed(() => {
-    if (!orderVIP.value) {
+    if (!shopUserInfo.value) {
       return false;
     }
     const isUse =
-      orderVIP.value.isVip && shopInfo.value.isMemberPrice ? true : false;
+      shopUserInfo.value.isVip && shopUserInfo.value.isMemberPrice
+        ? true
+        : false;
     return isUse;
   });
 
@@ -636,7 +649,7 @@ export const useCartsStore = defineStore("cart", () => {
     carts,
     isEmpty,
     setGoodsMap,
-    goodsMap:goodsMap,
+    goodsMap: goodsMap,
     goodsIsloading,
     goodsInit,
     onMessage,
@@ -676,5 +689,6 @@ export const useCartsStore = defineStore("cart", () => {
     freeDineConfig,
     //限时折扣
     limitTimeDiscount,
+    shopUserInfo,
   };
 });