Merge branch 'dev' into dev_local

6515e218 · owen · 4c077711 · a06a63c1 · 6515e218 · 6515e218
Commit 6515e218 authored Oct 02, 2023 by owen
18 changed files
--- a/src/api/mall/trade/order/index.ts
+++ b/src/api/mall/trade/order/index.ts
@@ -41,15 +41,22 @@ export interface OrderVO {
  refundPrice?: number | null // 退款金额
  couponId?: number | null // 优惠劵编号
  couponPrice?: number | null // 优惠劵减免金额
+  vipPrice?: number | null // VIP 减免金额
  pointPrice?: number | null // 积分抵扣的金额
  receiverAreaName?: string //收件人地区名字
  items?: OrderItemRespVO[] // 订单项列表
-  // 用户信息
+  // 下单用户信息
  user?: {
    id?: number | null
    nickname?: string
    avatar?: string
  }
+  // 推广用户信息
+  brokerageUser?: {
+    id?: number | null
+    nickname?: string
+    avatar?: string
+  }
  // 订单操作日志
  logs?: OrderLogRespVO[]
 }
@@ -114,21 +121,21 @@ export interface DeliveryVO {
 }
 // 订单发货
-export const delivery = async (data: DeliveryVO) => {
+export const deliveryOrder = async (data: DeliveryVO) => {
  return await request.put({ url: `/trade/order/delivery`, data })
 }
 // 订单备注
-export const updateRemark = async (data: any) => {
+export const updateOrderRemark = async (data: any) => {
  return await request.put({ url: `/trade/order/update-remark`, data })
 }
 // 订单调价
-export const updatePrice = async (data: any) => {
+export const updateOrderPrice = async (data: any) => {
  return await request.put({ url: `/trade/order/update-price`, data })
 }
 // 修改订单地址
-export const updateAddress = async (data: any) => {
+export const updateOrderAddress = async (data: any) => {
  return await request.put({ url: `/trade/order/update-address`, data })
 }
--- a/src/api/system/area/index.ts
+++ b/src/api/system/area/index.ts
@@ -5,14 +5,6 @@ export const getAreaTree = async () => {
  return await request.get({ url: '/system/area/tree' })
 }
-export const getChildrenArea = async (id: number) => {
-  return await request.get({ url: '/system/area/get-children?id=' + id })
-}
-export const getAreaListByIds = async (ids) => {
-  return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
-}
 // 获得 IP 对应的地区名
 export const getAreaByIp = async (ip: string) => {
  return await request.get({ url: '/system/area/get-by-ip?ip=' + ip })

--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -405,7 +405,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
        meta: { title: '订单详情', icon: 'ep:view', activeMenu: '/mall/trade/order' }
      },
      {
-        path: 'after-sale/detail/:orderId(\\d+)',
+        path: 'after-sale/detail/:id(\\d+)',
        component: () => import('@/views/mall/trade/afterSale/detail/index.vue'),
        name: 'TradeAfterSaleDetail',
        meta: { title: '退款详情', icon: 'ep:view', activeMenu: '/mall/trade/after-sale' }

--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -375,3 +375,17 @@ export const BrokerageWithdrawTypeEnum = {
    name: '支付宝'
  }
 }
+/**
+ * 配送方式枚举
+ */
+export const DeliveryTypeEnum = {
+  EXPRESS: {
+    type: 1,
+    name: '快递发货'
+  },
+  PICK_UP: {
+    type: 2,
+    name: '到店自提'
+  }
+}
--- a/src/views/mall/trade/afterSale/detail/index.vue
+++ b/src/views/mall/trade/afterSale/detail/index.vue
@@ -6,7 +6,6 @@
      <el-descriptions-item label="配送方式: ">
        <dict-tag :type="DICT_TYPE.TRADE_DELIVERY_TYPE" :value="formData.order.deliveryType" />
      </el-descriptions-item>
-      <!-- TODO 营销活动待实现 -->
      <el-descriptions-item label="订单类型: ">
        <dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="formData.order.type" />
      </el-descriptions-item>
@@ -29,8 +28,7 @@
      <el-descriptions-item label="付款方式: ">
        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="formData.order.payChannelCode" />
      </el-descriptions-item>
-      <!-- TODO 芋艿：待实现：跳转会员 -->
+      <el-descriptions-item label="买家: ">{{ formData?.user?.nickname }}</el-descriptions-item>
-      <!-- <el-descriptions-item label="买家: ">{{ formData.user.nickname }}</el-descriptions-item> -->
    </el-descriptions>
    <!-- 售后信息 -->
@@ -46,7 +44,7 @@
        <dict-tag :type="DICT_TYPE.TRADE_AFTER_SALE_WAY" :value="formData.way" />
      </el-descriptions-item>
      <el-descriptions-item label="退款金额: ">
-        {{ floatToFixed2(formData.refundPrice) }}
+        {{ fenToYuan(formData.refundPrice) }}
      </el-descriptions-item>
      <el-descriptions-item label="退款原因: ">{{ formData.applyReason }}</el-descriptions-item>
      <el-descriptions-item label="补充描述: ">
@@ -92,7 +90,7 @@
      <el-descriptions-item labelClassName="no-colon">
        <el-row :gutter="20">
          <el-col :span="15">
-            <el-table :data="formData.items" border>
+            <el-table :data="[formData.orderItem]" border>
              <el-table-column label="商品" prop="spuName" width="auto">
                <template #default="{ row }">
                  {{ row.spuName }}
@@ -102,19 +100,11 @@
                </template>
              </el-table-column>
              <el-table-column label="商品原价" prop="price" width="150">
-                <template #default="{ row }">{{ floatToFixed2(row.price) }}元</template>
+                <template #default="{ row }">{{ fenToYuan(row.price) }} 元</template>
              </el-table-column>
              <el-table-column label="数量" prop="count" width="100" />
              <el-table-column label="合计" prop="payPrice" width="150">
-                <template #default="{ row }">{{ floatToFixed2(row.payPrice) }}元</template>
+                <template #default="{ row }">{{ fenToYuan(row.payPrice) }} 元</template>
-              </el-table-column>
-              <el-table-column label="售后状态" prop="afterSaleStatus" width="120">
-                <template #default="{ row }">
-                  <dict-tag
-                    :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS"
-                    :value="row.afterSaleStatus"
-                  />
-                </template>
              </el-table-column>
            </el-table>
          </el-col>
@@ -122,6 +112,8 @@
        </el-row>
      </el-descriptions-item>
    </el-descriptions>
+    <!-- 操作日志 -->
    <el-descriptions title="售后日志">
      <el-descriptions-item labelClassName="no-colon">
        <el-timeline>
@@ -153,7 +145,7 @@
 </template>
 <script lang="ts" setup>
 import * as AfterSaleApi from '@/api/mall/trade/afterSale/index'
-import { floatToFixed2 } from '@/utils'
+import { fenToYuan } from '@/utils'
 import { DICT_TYPE, getDictLabel, getDictObj } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import UpdateAuditReasonForm from '@/views/mall/trade/afterSale/form/AfterSaleDisagreeForm.vue'
@@ -191,7 +183,7 @@ const getUserTypeColor = (type: number) => {
 /** 获得详情 */
 const getDetail = async () => {
-  const id = params.orderId as unknown as number
+  const id = params.id as unknown as number
  if (id) {
    const res = await AfterSaleApi.getAfterSale(id)
    // 没有表单信息则关闭页面返回
@@ -204,44 +196,56 @@ const getDetail = async () => {
 }
 /** 同意售后 */
-const agree = () => {
+const agree = async () => {
-  message.confirm('是否同意售后？').then(() => {
+  try {
-    AfterSaleApi.agree(formData.value.id)
+    // 二次确认
+    await message.confirm('是否同意售后？')
+    await AfterSaleApi.agree(formData.value.id)
+    // 提示成功
    message.success(t('common.success'))
-    getDetail()
+    await getDetail()
-  })
+  } catch {}
 }
 /** 拒绝售后 */
-const disagree = () => {
+const disagree = async () => {
  updateAuditReasonFormRef.value?.open(formData.value)
 }
 /** 确认收货 */
-const receive = () => {
+const receive = async () => {
-  message.confirm('是否确认收货？').then(() => {
+  try {
-    AfterSaleApi.receive(formData.value.id)
+    // 二次确认
+    await message.confirm('是否确认收货？')
+    await AfterSaleApi.receive(formData.value.id)
+    // 提示成功
    message.success(t('common.success'))
-    getDetail()
+    await getDetail()
-  })
+  } catch {}
 }
 /** 拒绝收货 */
-const refuse = () => {
+const refuse = async () => {
-  message.confirm('是否拒绝收货？').then(() => {
+  try {
-    AfterSaleApi.refuse(formData.value.id)
+    // 二次确认
+    await message.confirm('是否拒绝收货？')
+    await AfterSaleApi.refuse(formData.value.id)
+    // 提示成功
    message.success(t('common.success'))
-    getDetail()
+    await getDetail()
-  })
+  } catch {}
 }
 /** 确认退款 */
-const refund = () => {
+const refund = async () => {
-  message.confirm('是否确认退款？').then(() => {
+  try {
-    AfterSaleApi.refund(formData.value.id)
+    // 二次确认
+    await message.confirm('是否确认退款？')
+    await AfterSaleApi.refund(formData.value.id)
+    // 提示成功
    message.success(t('common.success'))
-    getDetail()
+    await getDetail()
-  })
+  } catch {}
 }
 /** 图片预览 */

--- a/src/views/mall/trade/afterSale/index.vue
+++ b/src/views/mall/trade/afterSale/index.vue
@@ -135,17 +135,16 @@
      </el-table-column>
      <el-table-column align="center" label="订单金额" prop="refundPrice">
        <template #default="scope">
-          <span>{{ floatToFixed2(scope.row.refundPrice) }}元</span>
+          <span>{{ fenToYuan(scope.row.refundPrice) }} 元</span>
        </template>
      </el-table-column>
-      <!-- TODO 芋艿：未来要加个会员链接 -->
      <el-table-column align="center" label="买家" prop="user.nickname" />
      <el-table-column align="center" label="申请时间" prop="createTime" width="180">
        <template #default="scope">
          <span>{{ formatDate(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" label="售后状态">
+      <el-table-column align="center" label="售后状态" width="100">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.TRADE_AFTER_SALE_STATUS" :value="scope.row.status" />
        </template>
@@ -177,7 +176,7 @@ import { formatDate } from '@/utils/formatTime'
 import { createImageViewer } from '@/components/ImageViewer'
 import { TabsPaneContext } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
-import { floatToFixed2 } from '@/utils'
+import { fenToYuan } from '@/utils'
 defineOptions({ name: 'TradeAfterSale' })
@@ -240,7 +239,7 @@ const tabClick = async (tab: TabsPaneContext) => {
 /** 处理退款 */
 const openAfterSaleDetail = (id: number) => {
-  push({ name: 'TradeAfterSaleDetail', params: { orderId: id } })
+  push({ name: 'TradeAfterSaleDetail', params: { id } })
 }
 /** 查看订单详情 */

--- a/src/views/mall/trade/config/index.vue
+++ b/src/views/mall/trade/config/index.vue
@@ -64,6 +64,9 @@
              商城商品满多少金额即可包邮，单位：元
            </el-text>
          </el-form-item>
+          <el-form-item label="启用门店自提" prop="deliveryPickUpEnabled">
+            <el-switch v-model="formData.deliveryPickUpEnabled" style="user-select: none" />
+          </el-form-item>
        </el-tab-pane>
        <!-- 分销 -->
        <el-tab-pane label="分销">
@@ -206,7 +209,6 @@
 <script setup lang="ts">
 import * as ConfigApi from '@/api/mall/trade/config'
-import { BrokerageBindModeEnum, BrokerageEnabledConditionEnum } from '@/utils/constants'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 defineOptions({ name: 'TradeConfig' })
@@ -221,6 +223,7 @@ const formData = ref({
  afterSaleReturnReasons: [],
  deliveryExpressFreeEnabled: false,
  deliveryExpressFreePrice: 0,
+  deliveryPickUpEnabled: false,
  brokerageEnabled: false,
  brokerageEnabledCondition: undefined,
  brokerageBindMode: undefined,

--- a/src/views/mall/trade/delivery/express/ExpressForm.vue
+++ b/src/views/mall/trade/delivery/express/ExpressForm.vue
@@ -7,17 +7,17 @@
      label-width="120px"
      v-loading="formLoading"
    >
-      <el-form-item label="快递公司编码" prop="code">
+      <el-form-item label="公司编码" prop="code">
        <el-input v-model="formData.code" placeholder="请输入快递编码" />
      </el-form-item>
-      <el-form-item label="快递公司名称" prop="name">
+      <el-form-item label="公司名称" prop="name">
        <el-input v-model="formData.name" placeholder="请输入快递名称" />
      </el-form-item>
-      <el-form-item label="快递公司 logo" prop="logo">
+      <el-form-item label="公司 logo" prop="logo">
        <UploadImg v-model="formData.logo" :limit="1" :is-show-tip="false" />
        <div style="font-size: 10px" class="pl-10px">推荐 180x180 图片分辨率</div>
      </el-form-item>
-      <el-form-item label="分类排序" prop="sort">
+      <el-form-item label="排序" prop="sort">
        <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
      </el-form-item>
      <el-form-item label="开启状态" prop="status">

--- a/src/views/mall/trade/delivery/express/index.vue
+++ b/src/views/mall/trade/delivery/express/index.vue
@@ -53,11 +53,11 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="快递公司编号" prop="code" />
+      <el-table-column label="公司编码" prop="code" />
-      <el-table-column label="快递公司名称" prop="name" />
+      <el-table-column label="公司名称" prop="name" />
-      <el-table-column label="快递公司 logo " prop="logo">
+      <el-table-column label="公司 logo " prop="logo">
        <template #default="scope">
-          <img v-if="scope.row.logo" :src="scope.row.logo" alt="快递公司logo" class="h-100px" />
+          <img v-if="scope.row.logo" :src="scope.row.logo" alt="公司logo" class="h-40px" />
        </template>
      </el-table-column>
      <el-table-column label="排序" align="center" prop="sort" />

--- a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
+++ b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
--- a/src/views/mall/trade/delivery/expressTemplate/index.vue
+++ b/src/views/mall/trade/delivery/expressTemplate/index.vue
@@ -51,14 +51,14 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" prop="id" />
+      <el-table-column label="编号" min-width="60" prop="id" />
-      <el-table-column label="模板名称" prop="name" />
+      <el-table-column label="模板名称" min-width="100" prop="name" />
-      <el-table-column label="计费方式" prop="chargeMode" align="center">
+      <el-table-column label="计费方式" prop="chargeMode" min-width="100" align="center">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.EXPRESS_CHARGE_MODE" :value="scope.row.chargeMode" />
        </template>
      </el-table-column>
-      <el-table-column label="排序" prop="sort" />
+      <el-table-column label="排序" min-width="100" prop="sort" />
      <el-table-column
        label="创建时间"
        align="center"

--- a/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
+++ b/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
@@ -51,7 +51,7 @@
      <el-row>
        <el-col :span="12">
          <el-form-item label="门店所在地区" prop="areaId">
-            <el-cascader v-model="formData.areaId" :options="areaList" :props="areaTreeProps" />
+            <el-cascader v-model="formData.areaId" :options="areaList" :props="defaultProps" />
          </el-form-item>
        </el-col>
        <el-col :span="12">
@@ -99,7 +99,7 @@
        </el-col>
      </el-row>
      <el-form-item label="获取经纬度">
-        <el-button type="primary" @click="mapDialogVisible.value = true">获取</el-button>
+        <el-button type="primary" @click="mapDialogVisible = true">获取</el-button>
      </el-form-item>
    </el-form>
    <template #footer>
@@ -121,8 +121,9 @@
 import * as DeliveryPickUpStoreApi from '@/api/mall/trade/delivery/pickUpStore'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
+import { defaultProps } from '@/utils/tree'
 import { getAreaTree } from '@/api/system/area'
-import * as ConfigApi from '@/api/infra/config'
+import * as ConfigApi from '@/api/mall/trade/config'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -161,12 +162,6 @@ const formRules = reactive({
  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const areaTreeProps = {
-  children: 'children',
-  label: 'name',
-  value: 'id',
-  emitPath: false
-}
 const areaList = ref() // 区域树
 const tencentLbsUrl = ref('') // 腾讯位置服务 url
@@ -244,16 +239,8 @@ const selectAddress = function (loc: any): void {
  mapDialogVisible.value = false
 }
-/** 初始化数据 */
+/** 初始化腾讯地图 */
-const initData = async () => {
+const initTencentLbsMap = async () => {
-  formLoading.value = true
-  try {
-    const data = await getAreaTree()
-    areaList.value = data
-  } finally {
-    formLoading.value = false
-  }
-  // TODO @jason：要不创建一个 initTencentLbsMap
  window.selectAddress = selectAddress
  window.addEventListener(
    'message',
@@ -267,17 +254,16 @@ const initData = async () => {
    },
    false
  )
-  const data = await ConfigApi.getConfigKey('tencent.lbs.key')
+  const data = await ConfigApi.getTradeConfig()
-  let key = ''
+  const key = data.tencentLbsKey
-  if (data && data.length > 0) {
-    key = data
-  }
  tencentLbsUrl.value = `https://apis.map.qq.com/tools/locpicker?type=1&key=${key}&referer=myapp`
 }
 /** 初始化 **/
-onMounted(() => {
+onMounted(async () => {
-  initData()
+  areaList.value = await getAreaTree()
+  // 加载地图
+  await initTencentLbsMap()
 })
 </script>
 <style lang="scss">

--- a/src/views/mall/trade/delivery/pickUpStore/index.vue
+++ b/src/views/mall/trade/delivery/pickUpStore/index.vue
@@ -65,16 +65,21 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" prop="id" />
+      <el-table-column label="编号" min-width="80" prop="id" />
-      <el-table-column label="门店 logo" prop="logo">
+      <el-table-column label="门店 logo" min-width="100" prop="logo">
        <template #default="scope">
-          <img v-if="scope.row.logo" :src="scope.row.logo" alt="门店 logo" class="h-100px" />
+          <img v-if="scope.row.logo" :src="scope.row.logo" alt="门店 logo" class="h-50px" />
        </template>
      </el-table-column>
-      <el-table-column label="门店名称" prop="name" />
+      <el-table-column label="门店名称" min-width="150" prop="name" />
-      <el-table-column label="门店手机" prop="phone" />
+      <el-table-column label="门店手机" min-width="100" prop="phone" />
-      <el-table-column align="center" label="门店详细地址" prop="detailAddress" />
+      <el-table-column label="地址" min-width="100" prop="detailAddress" />
-      <el-table-column align="center" label="开启状态" prop="status">
+      <el-table-column label="营业时间" min-width="180">
+        <template #default="scope">
+          {{ scope.row.openingTime }} ~ {{ scope.row.closingTime }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="开启状态" min-width="100" prop="status">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
        </template>

--- a/src/views/mall/trade/order/detail/index.vue
+++ b/src/views/mall/trade/order/detail/index.vue
--- a/src/views/mall/trade/order/form/OrderDeliveryForm.vue
+++ b/src/views/mall/trade/order/form/OrderDeliveryForm.vue
@@ -54,7 +54,7 @@ const open = async (row: TradeOrderApi.OrderVO) => {
  resetForm()
  // 设置数据
  copyValueToTarget(formData.value, row)
-  if (row.logisticsId === null || row.logisticsId === 0) {
+  if (row.logisticsId === 0) {
    expressType.value = 'none'
  }
  dialogVisible.value = true
@@ -73,7 +73,7 @@ const submitForm = async () => {
      data.logisticsId = 0
      data.logisticsNo = ''
    }
-    await TradeOrderApi.delivery(data)
+    await TradeOrderApi.deliveryOrder(data)
    message.success(t('common.updateSuccess'))
    dialogVisible.value = false
    // 发送操作成功的事件

--- a/src/views/mall/trade/order/form/OrderUpdateAddressForm.vue
+++ b/src/views/mall/trade/order/form/OrderUpdateAddressForm.vue
@@ -69,7 +69,7 @@ const submitForm = async () => {
  formLoading.value = true
  try {
    const data = unref(formData)
-    await TradeOrderApi.updateAddress(data)
+    await TradeOrderApi.updateOrderAddress(data)
    message.success(t('common.updateSuccess'))
    dialogVisible.value = false
    // 发送操作成功的事件

--- a/src/views/mall/trade/order/form/OrderUpdatePriceForm.vue
+++ b/src/views/mall/trade/order/form/OrderUpdatePriceForm.vue
@@ -69,7 +69,7 @@ const submitForm = async () => {
    data.adjustPrice = convertToInteger(data.adjustPrice)
    delete data.payPrice
    delete data.newPayPrice
-    await TradeOrderApi.updatePrice(data)
+    await TradeOrderApi.updateOrderPrice(data)
    message.success(t('common.updateSuccess'))
    dialogVisible.value = false
    // 发送操作成功的事件

--- a/src/views/mall/trade/order/form/OrderUpdateRemarkForm.vue
+++ b/src/views/mall/trade/order/form/OrderUpdateRemarkForm.vue
@@ -49,7 +49,7 @@ const submitForm = async () => {
  formLoading.value = true
  try {
    const data = unref(formData)
-    await TradeOrderApi.updateRemark(data)
+    await TradeOrderApi.updateOrderRemark(data)
    message.success(t('common.updateSuccess'))
    dialogVisible.value = false
    // 发送操作成功的事件