渠道端bug

packages/app/src/pages-sub/home/mall/confirm-order/index.vue

@@ -79,7 +79,9 @@ const handlePay = async () => {
   if(coupons.value.length>0 && selectedCoupons.value?.length===0){
 	  uni.showModal({
 	  	title:"提示",
-		content:"您有" + coupons.value.length + "张优惠券可用，是否要使用？",
+		content:"您有" + coupons.value.length + "张该商品的免费兑换券，使用后可免费兑换该商品，是否需要使用？",
+		cancelText:"不使用",
+		confirmText:"使用",
 		success: async (res) => {
 			if(res.confirm){
 				handleQ()

packages/app/src/pages-sub/mine/orders/code/index.vue

@@ -53,7 +53,7 @@ onReady(() => {})
             {{ data?.projectName }}
           </div>
           <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal">
-            {{ data?.orderQuantity }}张/共{{ data?.points }}积分
+            {{ data?.orderQuantity }}张/共{{ data?.payPoints }}积分
           </div>
           <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
             {{ dayjs(data?.createTime).format('YYYY/MM/DD') }}

packages/merchant/src/pages/agent/designer/detail.vue

@@ -239,11 +239,17 @@ onLoad(async (query) => {
                 {{ it.label }}
               </div>
               <wd-img
-                :style="{ visibility: it.value === active ? 'visible' : 'hidden' }"
+                v-if="it.value === active"
                 width="17"
                 height="5.6"
                 :src="arcBottomBlue"
               ></wd-img>
+			  <!-- <wd-img
+			    :style="{ visibility: it.value === active ? 'visible' : 'hidden' }"
+			    width="17"
+			    height="5.6"
+			    :src="arcBottomBlue"
+			  ></wd-img> -->
             </div>
           </template>
         </div>

packages/merchant/src/pages/agent/designer/index.vue

@@ -479,11 +479,11 @@ onLoad(async (params: { title?: string; filter?: string; tags?: string }) => {
             :style="{ 'grid-template-columns': `${addUnit(64)} auto` }"
           >
             <label class="text-sm font-normal leading-relaxed text-black/60 h-10 flex items-center">
-              <span
+              <!-- <span
                 class="text-[#ef4343] text-base font-normal font-['PingFang_SC'] leading-normal visible"
               >
                 *
-              </span>
+              </span> -->
               地址
             </label>
             <div
@@ -504,11 +504,11 @@ onLoad(async (params: { title?: string; filter?: string; tags?: string }) => {
           :style="{ 'grid-template-columns': `${addUnit(64)} auto` }"
         >
           <label class="text-sm font-normal leading-relaxed text-black/60 h-10 flex items-center">
-            <span
+            <!-- <span
               class="text-[#ef4343] text-base font-normal font-['PingFang_SC'] leading-normal visible"
             >
               *
-            </span>
+            </span> -->
             图片
           </label>
           <wd-upload

packages/merchant/src/pages/home/index.vue

@@ -67,6 +67,20 @@ const handleScanning = async () => {
   }
   uni.navigateTo({ url: `/pages/home/result/orderConfirm?orderNo=${options.no}` })
 }
+const limitDecimalPlaces =(event) =>{	
+	const value = event.value;
+	const regex = /^[0-9]+(.[0-9])?$/; // 正则表达式，匹配最多两位小数的数字
+	if (!regex.test(value)) {
+		console.log(event)	  
+		nextTick(()=>{
+			orderAmount.value= value.slice(0, value.lastIndexOf('.') + 2);
+		})
+		// 如果输入不符合正则表达式，则不更新formattedNumber，保持原值或截断多余的位数
+		return; // 或者可以设置一个合理的默认值或截断多余的位数，例如：this.formattedNumber = value.slice(0, value.lastIndexOf('.') + 3);
+	} else {
+		orderAmount.value= value; // 更新显示值
+	}
+}
 const handle2Settlement = () => {
   if ((orderAmount.value ?? '') === '') {
     uni.showToast({ title: '请输入金额', icon: 'none', duration: 5000 })
@@ -321,8 +335,10 @@ onShareAppMessage(() => ({}))
           </div>
           <div class="flex-1 bg-[#f5f7f9] rounded-lg flex items-center p-3.5">
             <wd-input
+			  @input="limitDecimalPlaces"
               custom-class="bg-transparent! flex-1"
-              type="number"
+              type="digit"
+			  step="0.1"
               no-border
               placeholder="请输金额"
               v-model="orderAmount"

packages/merchant/src/pages/home/result/orderConfirm.vue

@@ -12,6 +12,7 @@ const productInfo = ref({
   productName: '',
   productCoverImgUrl: '',
   productPoints: '',
+  payPoints:'',
   num: 0,
   price: '',
 });
@@ -56,7 +57,7 @@ const navigateBack = () => {
         <view class="text-lg font-bold mb-[8px]">{{ productInfo.productName }}</view>
         <view class="text-sm text-gray-500 mb-[8px]">数量: x{{ productInfo.num }}</view>
         <view class="text-sm text-gray-500">
-          {{ productInfo.productPoints }} 积分
+          {{ productInfo.payPoints }} 积分
         </view>
       </view>
     </view>