Pre Merge pull request !531 from 卢越/master

src/views/mall/product/spu/components/SkuList.vue

@@ -180,17 +180,17 @@
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.price }}
+        {{ fenToYuan(row.price) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.marketPrice }}
+        {{ fenToYuan(row.marketPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.costPrice }}
+        {{ fenToYuan(row.costPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">
@@ -211,12 +211,12 @@
     <template v-if="formData!.subCommissionType">
       <el-table-column align="center" label="一级返佣(元)" min-width="80">
         <template #default="{ row }">
-          {{ row.firstBrokeragePrice }}
+          {{ fenToYuan(row.firstBrokeragePrice) }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="二级返佣(元)" min-width="80">
         <template #default="{ row }">
-          {{ row.secondBrokeragePrice }}
+          {{ fenToYuan(row.secondBrokeragePrice) }}
         </template>
       </el-table-column>
     </template>
@@ -260,17 +260,17 @@
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.price }}
+        {{ fenToYuan(row.price) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.marketPrice }}
+        {{ fenToYuan(row.marketPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
-        {{ row.costPrice }}
+        {{ fenToYuan(row.costPrice) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">
@@ -284,7 +284,7 @@
 </template>
 <script lang="ts" setup>
 import { PropType, Ref } from 'vue'
-import { copyValueToTarget } from '@/utils'
+import {copyValueToTarget, fenToYuan} from '@/utils'
 import { propTypes } from '@/utils/propTypes'
 import { UploadImg } from '@/components/UploadFile'
 import type { Property, Sku, Spu } from '@/api/mall/product/spu'

src/views/mall/promotion/components/SpuAndSkuList.vue

@@ -24,7 +24,7 @@
     <el-table-column :show-overflow-tooltip="true" label="商品名称" min-width="300" prop="name" />
     <el-table-column align="center" label="商品售价" min-width="90" prop="price">
       <template #default="{ row }">
-        {{ formatToFraction(row.price) }}
+        {{ fenToYuan(row.price) }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="销量" min-width="90" prop="salesCount" />
@@ -43,7 +43,7 @@
   </el-table>
 </template>
 <script generic="T extends Spu" lang="ts" setup>
-import { formatToFraction } from '@/utils'
+import { fenToYuan } from '@/utils'
 import { createImageViewer } from '@/components/ImageViewer'
 import { Spu } from '@/api/mall/product/spu'
 import { RuleConfig, SkuList } from '@/views/mall/product/spu/components'

src/views/mall/promotion/coupon/template/CouponTemplateForm.vue

@@ -172,7 +172,7 @@
         />
         天有效
       </el-form-item>
-      <el-form-item label="优惠券描述" prop="description">
+      <el-form-item label="优惠券说明" prop="description">
         <el-input
           v-model="formData.description"
           :autosize="{ minRows: 2, maxRows: 2 }"
@@ -180,7 +180,7 @@
           :show-word-limit="true"
           class="w-100!"
           maxlength="64"
-          placeholder="请输入优惠券描述"
+          placeholder="请输入优惠券说明，例如优惠券使用须知"
           type="textarea"
         />
       </el-form-item>

src/views/mall/promotion/kefu/components/message/ProductItem.vue

@@ -117,7 +117,6 @@ const skuString = computed(() => {
 
 /** 查看商品详情 */
 const openDetail = (spuId: number) => {
-  console.log(props.spuId)
   push({ name: 'ProductSpuDetail', params: { id: spuId } })
 }
 </script>