lex-xin пре 5 месеци
родитељ
комит
ca25bf841c

+ 1 - 1
src/views/order-detail/add-discount/index.tsx

@@ -75,7 +75,7 @@ export default defineComponent({
           (props.actualPrice * discountDetail.value.discountRate / 100)
         ))
         const users = state.user.data
-        const startTime = users.discountEndTime || new Date()
+        const startTime = users.discountCardFlag ? users.discountEndTime || new Date() : new Date()
         let endTime = dayjs(new Date()).format('YYYY-MM-DD')
         if (discountDetail.value.period === 'MONTH') {
           endTime = dayjs(startTime).add(1, 'month').format('YYYY-MM-DD')

+ 7 - 3
src/views/order-detail/index.tsx

@@ -48,13 +48,13 @@ import AddDiscount from './add-discount'
 /** 保留两位小数向上取整 */
 export const numberToTwoUp = (num: number | string) => {
   num = Number(num)
-  return Math.ceil(num * 1000) / 1000
+  return Math.ceil(Number((num * 100).toFixed(1))) / 100
 }
 
 /** 保留两位小数向下取整 */
 export const numberToTwoDown = (num: number | string) => {
   num = Number(num)
-  return Math.floor(num * 1000) / 1000
+  return Math.floor(Number((num * 100).toFixed(1))) / 100
 }
 
 export default defineComponent({
@@ -122,7 +122,7 @@ export default defineComponent({
     },
     countDiscountPrice() {
       const orderObject = orderStatus.orderObject
-      return orderObject.couponAmount || numberToTwoUp(orderObject.couponDiscountPrice + orderObject.discountPrice + orderObject.discountCardPrice)
+      return orderObject.couponAmount || numberToTwoDown(orderObject.couponDiscountPrice + orderObject.discountPrice + orderObject.discountCardPrice)
     }
   },
   async mounted() {
@@ -681,6 +681,10 @@ export default defineComponent({
                     }
                   }
                   this.orderGoodsType = tempType
+
+                  console.log(item, this.orderAmount, '-----------------', Number(this.orderAmount) -
+                  Number(item.discountPrice) -
+                  Number(orderStatus.orderObject.couponDiscountPrice))
                   // 更新优惠券列表
                   const useCouponRef: any =  this.$refs.useCouponRef
                   if(useCouponRef) {

+ 3 - 2
src/views/order-detail/use-coupons/index.module.less

@@ -1,6 +1,7 @@
 .useCoupon {
-  padding-top: 16px;
-  padding-bottom: 16px;
+  // padding-top: 16px;
+  // padding-bottom: 16px;
+  border-radius: 10px;
 
   .couponCount {
     color: #ff3535;

+ 0 - 1
src/views/order-detail/use-coupons/index.tsx

@@ -198,7 +198,6 @@ export default defineComponent({
         <Cell
           title="优惠券"
           class={styles.useCoupon}
-          style={{ borderRadius: '8px' }}
           isLink={!this.disabled}
           clickable={false}
           v-slots={{