purui 2 days ago
parent
commit
764b73d077

+ 3 - 3
packages/app/src/pages-sub/common/components/coupon-record.vue

@@ -47,15 +47,15 @@ const props = withDefaults(
         <div class="flex-1 flex flex-col justify-around">
           <div class="flex items-center gap-1">
             <div
-              class="px-[3px] rounded border border-solid border-[#ff3636] justify-center items-center gap-2.5 inline-flex"
+              class="px-[3px] rounded border border-solid border-[#ff3636] justify-center items-center gap-2.5 inline-flex shrink-0"
             >
               <div
-                class="text-[#ff3e3e] text-[10px] font-normal font-['PingFang_SC'] leading-normal"
+                class="text-[#ff3e3e] text-[10px] font-normal font-['PingFang_SC'] leading-normal "
               >
                 {{ option.materialsName }}
               </div>
             </div>
-            <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal">
+            <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal overflow-hidden whitespace-nowrap text-ellipsis">
               <!-- GELATO咖啡兑换券 -->
               {{ option.couponName }}
             </div>

+ 3 - 3
packages/merchant/src/components/coupon-record.vue

@@ -45,15 +45,15 @@ const props = withDefaults(
         <div class="flex-1 flex flex-col justify-around">
           <div class="flex items-center gap-1">
             <div
-              class="px-[3px] rounded border border-solid border-[#ff3636] justify-center items-center gap-2.5 inline-flex"
+              class="px-[3px] rounded border border-solid border-[#ff3636] justify-center items-center gap-2.5 inline-flex shrink-0"
             >
               <div
-                class="text-[#ff3e3e] text-[10px] font-normal font-['PingFang_SC'] leading-normal"
+                class="text-[#ff3e3e] text-[10px] font-normal font-['PingFang_SC'] leading-normal "
               >
                 {{ option.materialsName }}
               </div>
             </div>
-            <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal">
+            <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal overflow-hidden whitespace-nowrap text-ellipsis">
               <!-- GELATO咖啡兑换券 -->
               {{ option.couponName }}
             </div>

+ 2 - 2
packages/merchant/src/pages/mine/agent/business-card/index.vue

@@ -96,7 +96,7 @@ onLoad(async () => {
 		<div class="absolute w-full h-full top-0 left-0 z-0">
 			<wd-img :src="data.cardStyleUrl" custom-class="w-full h-full"></wd-img>
 		</div> 
-        <wd-img
+        <!-- <wd-img
           :src="businessLogo"
           width="78px"
           height="27px"
@@ -117,7 +117,7 @@ onLoad(async () => {
             height="17px"
             custom-class="absolute top-[5px] left-[7px]"
           />
-        </div>
+        </div> -->
         <div class="h-65px flex justify-between items-center mb-10px relative">
           <div class="font-size-22px fw-400">
             {{ data.name }}