diff --git a/src/api/product.js b/src/api/product.js index f1d232f..ce098f8 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -159,12 +159,22 @@ export function seckillProductLstApi(data) { export function categoryListApi(data) { return request.get(`store/category/list`, data) } +/** + * @description 导出订单 + */ +export function exportProductApi(data) { + return request.get(`store/product/export`, data) +} /** * @description 商户分类 -- 列表 */ export function merCategoryListApi() { return request.get(`system/merchant/category_lst`) } +/** 商品列表 -- 价格编辑 */ +export function freeTrialApi(id, data) { + return request.post(`store/product/free_trial/${id}`, data) +} /** * @description 商品审核 -- 详情 */ diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue index 1ddf8dc..bfc0c08 100644 --- a/src/views/merchant/list/handle/merEditForm.vue +++ b/src/views/merchant/list/handle/merEditForm.vue @@ -183,22 +183,125 @@
费用信息
- - - {{merData.is_margin == 0 ? '无' : merData.ot_margin+'元'}} - - - - - {{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }} - - - - - {{merData.margin}} + + + + 无 + 有 + + + 元, + + + 额度 + + + + + 无 + 有 + + + 元, + + + 额度 + + + + + + + + 无 + 有 + + + 元, + + + 额度 + + + + + + + + + + + + + + + {{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }} + + + + + {{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }} + + + + + {{merData.is_goods == 1 ? '待缴' : merData.is_goods == 0 ? '无' : '已缴' }} + + + + + + + {{merData.margin}} + + + + + {{merData.service_cost}} + + + + + {{merData.goods_cost}} + + + +
审核信息
@@ -263,7 +365,7 @@
-
+
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue index e8f02f5..e89f7a0 100644 --- a/src/views/merchant/list/handle/merInfo.vue +++ b/src/views/merchant/list/handle/merInfo.vue @@ -6,7 +6,7 @@
基础信息
  • -
    商户名称：
    +
    店铺名称：
    {{merData.mer_name}}
    @@ -23,13 +23,13 @@
    是否为军人:
    {{merData.is_soldier == 1 ? "是" : "否"}}
    • -
  • +
  • 推荐商户：
    {{merData.is_best == 1 ? "是" : "否"}}
    @@ -42,10 +42,10 @@
    商户状态：
    {{merData.status == 1 ? "开启" : "关闭"}}
    • -
  • +
  • 更新时间：
    {{merData.update_time}}
    @@ -58,29 +58,35 @@
    备注：
    {{merData.mark}}
    • -
  • +
银行卡信息
-
    +
    • 名称：
      - {{merData.financial_bank&&merData.financial_bank.name}} + {{merData.ext.bank&&merData.ext.bank.bankName}}
    • 开户银行：
      - {{merData.financial_bank&&merData.financial_bank.bank}} + {{merData.ext.bank&&merData.ext.bank.bankCard}}
    • 开户卡号：
      - {{merData.financial_bank&&merData.financial_bank.bank_code}} + {{merData.ext.bank&&merData.ext.bank.bankBranchName}} +
      +
      • +
    • +
      联行号：
      +
      + {{merData.ext.bank&&merData.ext.bank.CNAPS}}
    diff --git a/src/views/product/productExamine/editAttr.vue b/src/views/product/productExamine/editAttr.vue new file mode 100644 index 0000000..1904726 --- /dev/null +++ b/src/views/product/productExamine/editAttr.vue @@ -0,0 +1,659 @@ + + + + + diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index 041512a..ccbf866 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -97,6 +97,7 @@ 批量显示 批量设置标签 批量设置推荐 + 导出列表
@@ -199,6 +200,7 @@ 编辑商品 + 价格编辑 查看评价 @@ -354,6 +356,7 @@ @changeDrawer="changeDrawer" :drawer="drawer" > +
@@ -381,14 +384,17 @@ import { updatetProductLabel, batchesLabelsApi, batchesRecommendApi, - batchesOnOffApi + batchesOnOffApi, + exportProductApi } from '@/api/product' import { roterPre } from '@/settings' import infoFrom from './info' +import editAttr from './editAttr' import ueditorFrom from '@/components/ueditorFrom' import previewBox from '@/components/previewBox/index' import proDetail from './proDetails.vue'; import timeOptions from '@/utils/timeOptions'; +import createWorkBook from '@/utils/newToExcel.js'; const proOptions = [{ name: '热门榜单', value: 'is_hot' @@ -408,7 +414,8 @@ export default { infoFrom, ueditorFrom, previewBox, - proDetail + proDetail, + editAttr }, data() { return { @@ -534,6 +541,34 @@ export default { this.getLabelLst() }, methods: { + // 价格编辑 + onAuditFree(row) { + this.$refs.editAttr.getAttrDetail(row.product_id) + }, + async exports() { + let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = [] + excelData.page = 1 + let pageCount = 1 + let lebData = {}; + for (let i = 0; i < pageCount; i++) { + lebData = await this.downData(excelData) + pageCount = Math.ceil(lebData.count/excelData.limit) + if (lebData.export.length) { + data = data.concat(lebData.export) + excelData.page++ + } + } + createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); + return + }, + /**订单列表 */ + downData(excelData) { + return new Promise((resolve, reject) => { + exportProductApi(excelData).then((res) => { + return resolve(res.data) + }) + }) + }, // 具体日期 onchangeTime(e) { this.timeVal = e