dxz1228 преди 2 години
родител
ревизия
bac25a6c69

+ 1 - 1
src/components/FPopup/FPopup.vue

@@ -8,7 +8,7 @@ const props = defineProps(popupProps)
8 8
 const emit = defineEmits(popupEmits)
9 9
 const { showValue, classes } = usePopup(props, emit)
10 10
 onLoad(()=>{
11
-  console.log(showValue, classes);
11
+  // console.log(showValue, classes);
12 12
   
13 13
 })
14 14
 const animationName = {

+ 1 - 1
src/pages/order/components/OrderItem.vue

@@ -324,7 +324,7 @@ function handleShowObligationOrderDetail(orderItem) {
324 324
         </div>
325 325
 
326 326
         <div class="flex justify-end gap-2" v-if="orderItem.status === '5'">
327
-          <div class="title-line">09:02:00后订单将关闭</div>
327
+          <!-- <div class="title-line">09:02:00后订单将关闭</div> -->
328 328
           <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
329 329
             <div class="text-black">取消订单</div>
330 330
           </nut-button>

+ 5 - 5
src/pages/order/components/RefundOrderItem.vue

@@ -48,14 +48,14 @@ function getStatusText(orderItem) {
48 48
   }
49 49
   if (orderItem.status == 0) {
50 50
     // return '待审核'
51
-    return '退款中'
51
+    return '审核中'
52 52
   }
53 53
   if (orderItem.status == 1) {
54 54
     // return '待退货'
55
-    return '退款中'
55
+    return '审核中'
56 56
   }
57 57
   if (orderItem.status == 2) {
58
-    return '退款中'
58
+    return '审核中'
59 59
     // return '待收货'
60 60
   }
61 61
   if (orderItem.status == 3) {
@@ -192,8 +192,8 @@ function handleShowDetail(orderItem) {
192 192
           <div class="f-text-color-2 i-tabler-chevron-right"></div>
193 193
 
194 194
       </div>
195
-      <div class=" text-xs flex w-15 justify-end"
196
-           :class="(orderItem.status == 3 || orderItem.status == -1) ? 'text-gray' : 'text-primary'"
195
+      <div class=" text-xs flex w-15 justify-end  'text-primary'"
196
+           
197 197
       >
198 198
         {{ getStatusText(orderItem) }}
199 199
       </div>

+ 2 - 1
src/pages/order_addcart/index.vue

@@ -648,7 +648,8 @@ onUnload(() => {
648 648
                 </div>
649 649
               </div>
650 650
               <div class="flex  justify-between ">
651
-                <FPrice :price="goodItem.productAttr.price" ex-class="font-bold text-dark" />
651
+                <!-- <FPrice :price="goodItem.productAttr.price" ex-class="font-bold text-dark" /> -->
652
+                <div class="font-bold text-dark" >¥{{ goodItem.productAttr.price }}</div>
652 653
                 <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)" />
653 654
               </div>
654 655
             </div>

+ 1 - 1
src/pages/refund/option.vue

@@ -91,7 +91,7 @@ function handleChooseType(refund_type) {
91 91
             <image :src="woyaotuihuotuikuanIcon" mode="widthFix" class="w-5 h-5"></image>
92 92
             <div>
93 93
               <div class="font-bold">我要退货退款</div>
94
-              <div class="text-gray-500">已收到货,需要退还已收到饿货物</div>
94
+              <div class="text-gray-500">已收到货,需要退还已收到货物</div>
95 95
             </div>
96 96
           </div>
97 97
         </div>