更新优化

package-lock.json

@@ -27,7 +27,7 @@
 				"uuid": "^10.0.0",
 				"vue": "^3.3.8",
 				"vue-router": "^4.2.5",
-				"ysk-utils": "^1.0.47"
+				"ysk-utils": "^1.0.56"
 			},
 			"devDependencies": {
 				"@vitejs/plugin-vue": "^4.5.0",
@@ -5194,6 +5194,12 @@
 				"url": "https://opencollective.com/webpack"
 			}
 		},
+		"node_modules/loadsh": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmmirror.com/loadsh/-/loadsh-0.0.4.tgz",
+			"integrity": "sha512-U+wLL8InpfRalWrr+0SuhWgGt10M4OyAk6G8xCYo2rwpiHtxZkWiFpjei0vO463ghW8LPCdhqQxXlMy2qicAEw==",
+			"deprecated": "This is a typosquat on the popular Lodash package. This is not maintained nor is the original Lodash package."
+		},
 		"node_modules/locate-path": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
@@ -7636,11 +7642,12 @@
 			}
 		},
 		"node_modules/ysk-utils": {
-			"version": "1.0.47",
+			"version": "1.0.56",
-			"resolved": "https://registry.npmmirror.com/ysk-utils/-/ysk-utils-1.0.47.tgz",
+			"resolved": "https://registry.npmmirror.com/ysk-utils/-/ysk-utils-1.0.56.tgz",
-			"integrity": "sha512-OoH+uLVysu0nkVYtj3VPZJlkk0c22uFgmvh25W5ERBCHfo/4CyHVyPVEmtiJdiXBiTFQiuwaFmTsQsv6l2YvUQ==",
+			"integrity": "sha512-TsRQGo1TEIVWZTc/j084eKVhTeI4r73dJRrzJHPUI56861hy40ekwYtozoa8v+LURXgEVIwXlMHM6zkgv8zBZw==",
 			"dependencies": {
 				"bignumber.js": "^9.3.1",
+				"loadsh": "^0.0.4",
 				"lodash": "^4.17.21"
 			}
 		},

package.json

@@ -30,7 +30,7 @@
 		"uuid": "^10.0.0",
 		"vue": "^3.3.8",
 		"vue-router": "^4.2.5",
-		"ysk-utils": "^1.0.47"
+		"ysk-utils": "^1.0.56"
 	},
 	"devDependencies": {
 		"@vitejs/plugin-vue": "^4.5.0",

src/api/market.js

@@ -12,3 +12,16 @@ export function shopRecharge(params) {
     params,
   });
 }
+
+/**
+ * 获取当前可用限时折扣
+ * @param {shopId} params 
+ * @returns 
+ */
+export function getLimitTimeDiscount(params) {
+  return request({
+    method: "get",
+    url: "/market/admin/limitTimeDiscount",
+    params,
+  });
+}

src/components/payCard/payCard.vue

@@ -15,9 +15,9 @@
                 <div class="t2">
                     <span>商品原价:￥{{ goodsStore.cartInfo.costSummary.goodsRealAmount || 0 }}</span>
                     <span>餐位费:￥{{ formatDecimal(goodsStore.cartInfo.costSummary.seatFee || 0)
-                        }}</span>
+                    }}</span>
                     <span>打包费:￥{{ formatDecimal(goodsStore.cartInfo.costSummary.packFee || 0)
-                        }}</span>
+                    }}</span>
                     <span>优惠:￥{{ formatDecimal(goodsStore.cartInfo.costSummary.totalDiscountAmount || 0) }}</span>
                     <!-- <span v-if="goodsStore.cartInfo.costSummary.goodsDiscountAmount">
                         <span>折扣:{{ goodsStore.cartInfo.costSummary.goodsDiscountAmount }}</span>
@@ -675,6 +675,8 @@ function clearCouponUser() {
     couponForm.value.discountRatio = ''
     discountRateNumber.value = 0
 
+    couponResList1.value = []
+
     updateCartCalc()
 
     // resetCouponFormHandle()
@@ -842,8 +844,12 @@ async function selectUserHandle(row) {
         if (store.shopInfo.isMemberPrice && row.isVip) {
             console.log('选择会员后重新计算会员价===', row);
             goodsStore.showVipPrice = 1
+        } else {
+            goodsStore.showVipPrice = 0
         }
 
+        couponResList1.value = []
+
         goodsStore.calcCartInfo()
 
         // emit('reset')

src/store/goods.js

@@ -4,6 +4,7 @@ import { defineStore } from "pinia";
 import { ref, computed } from "vue";
 import { productPage, categoryList } from "@/api/product_new.js";
 import { historyOrder, cancelOrder, rmPlaceOrder } from "@/api/order.js";
+import { getLimitTimeDiscount } from '@/api/market'
 import { useUser } from "@/store/user.js";
 import { useSocket } from "@/store/socket.js";
 import useStorage from "@/utils/useStorage.js";

src/views/home/components/settleAccount.vue

@@ -14,7 +14,8 @@
               <span>{{ goodsStore.orderListInfo.tableCode || store.shopInfo.shopName }}</span>
               <div class="member_info" v-if="goodsStore.vipUserInfo.id">
                 <span>用户昵称：{{ formatPhoneNumber(goodsStore.vipUserInfo.phone) }}</span>
-                <span class="vip">白银会员</span>
+                <span class="vip" v-if="goodsStore.vipUserInfo.memberLevelName">{{
+                  goodsStore.vipUserInfo.memberLevelName }}</span>
               </div>
               <div class="member_info s" v-if="goodsStore.vipUserInfo.id">当前积分：
                 {{ goodsStore.vipUserInfo.accountPoints }}