From dc1af138e2baef43ee3a2f8f4a0fc29fbc6d25f7 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Fri, 18 Apr 2025 14:42:22 +0800
Subject: [PATCH] 250418

---
 src/views/shop/dealerWithdraw/index.vue       |  2 +-
 src/views/shop/goods/components/goodsEdit.vue | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/shop/dealerWithdraw/index.vue b/src/views/shop/dealerWithdraw/index.vue
index 22f6428..2cfd951 100644
--- a/src/views/shop/dealerWithdraw/index.vue
+++ b/src/views/shop/dealerWithdraw/index.vue
@@ -183,7 +183,7 @@ const columns = ref<ColumnItem[]>([
     align: 'center',
     customRender: ({text}) => {
       if (text === 0) return ''
-      else return dayjs(text).format('YYYY-MM-DD HH:mm:ss')
+      else return dayjs(text * 1000).format('YYYY-MM-DD HH:mm:ss')
     }
   },
   {
diff --git a/src/views/shop/goods/components/goodsEdit.vue b/src/views/shop/goods/components/goodsEdit.vue
index a884cde..564d846 100644
--- a/src/views/shop/goods/components/goodsEdit.vue
+++ b/src/views/shop/goods/components/goodsEdit.vue
@@ -121,9 +121,9 @@
               v-model:value="form.unitName"
             />
           </a-form-item>
-          <a-form-item label="原价" name="originPrice">
+          <a-form-item label="原价(划线价)" name="originPrice">
             <a-input-number
-              :placeholder="`原价`"
+              :placeholder="`原价(划线价)`"
               style="width: 240px"
               :min="0.01"
               v-model:value="form.originPrice"
@@ -138,16 +138,16 @@
             />
             <div class="ele-text-placeholder">普通用户购物价格</div>
           </a-form-item>
-          <a-form-item label="会员价" name="price">
+          <a-form-item label="牛八哥会员价" name="price">
             <a-space>
               <a-input-number
-                :placeholder="`会员价`"
+                :placeholder="`牛八哥会员价`"
                 style="width: 240px"
                 :min="0.01"
                 v-model:value="form.price"
               />
             </a-space>
-            <div class="ele-text-placeholder">会员购物价格</div>
+            <div class="ele-text-placeholder">牛八哥会员购物价格</div>
           </a-form-item>
           <a-form-item label="是否有赠品">
             <a-checkbox v-model:checked="form.priceGift">有赠品</a-checkbox>
@@ -178,7 +178,7 @@
           <!--            </a-space>-->
           <!--            <div class="ele-text-placeholder">经销商价格</div>-->
           <!--          </a-form-item>-->
-          <a-form-item label="会员店/总仓批发价" name="buyingPrice" v-if="!merchantId">
+          <a-form-item label="会员店/总仓批发价" name="buyingPrice">
             <a-space>
               <a-input-number
                 :placeholder="`会员店/总仓批发价`"