完成商城下单功能

src/utils/merchant.ts

@@ -1,17 +1,17 @@
 // 获取商户ID
 export const getMerchantId = () => {
-  const MerchantId = localStorage.getItem('MerchantId');
-  if (MerchantId != 'null') {
-    return MerchantId;
+  const merchantId = localStorage.getItem('MerchantId');
+  if (merchantId) {
+    return Number(merchantId);
   }
-  return null;
+  return undefined;
 };
 
 // 获取商户名称
 export const getMerchantName = () => {
   const MerchantName = localStorage.getItem('MerchantName');
-  if (MerchantName != 'null') {
+  if (MerchantName) {
     return MerchantName;
   }
-  return null;
+  return undefined;
 };