wangmingchuan
/
yanzong_vue_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节

Browse Source
main
fanfan 9 months ago
parent 16ebf73cc5
commit 4e6cf6a3ee
3 changed files with 199 additions and 193 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 256
      src/config/router.config.js
  2. 132
      src/views/goods/memberPrice/Index.vue
  3. 4
      src/views/order/Detail.vue

256
src/config/router.config.js
Unescape View File

@ -350,26 +350,26 @@ export const asyncRouterMap = [
permission: ['/goods/filter/index']
}
},
{
path: '/goods/memberPrice/index',
component: () => import(/* webpackChunkName: "goods" */ '@/views/goods/memberPrice/Index'),
meta: {
title: '会员价',
pageTitle: '会员价',
keepAlive: false,
permission: ['/goods/memberPrice/index']
}
},
{
path: '/goods/distributionPrice/index',
component: () => import(/* webpackChunkName: "goods" */ '@/views/goods/distributionPrice/Index'),
meta: {
title: '分销价',
pageTitle: '分销价',
keepAlive: false,
permission: ['/goods/distributionPrice/index']
}
},
// {
// path: '/goods/memberPrice/index',
// component: () => import(/* webpackChunkName: "goods" */ '@/views/goods/memberPrice/Index'),
// meta: {
// title: '会员价',
// pageTitle: '会员价',
// keepAlive: false,
// permission: ['/goods/memberPrice/index']
// }
// },
// {
// path: '/goods/distributionPrice/index',
// component: () => import(/* webpackChunkName: "goods" */ '@/views/goods/distributionPrice/Index'),
// meta: {
// title: '分销价',
// pageTitle: '分销价',
// keepAlive: false,
// permission: ['/goods/distributionPrice/index']
// }
// },
]
},
@ -837,11 +837,11 @@ export const asyncRouterMap = [
moduleKey: 'apps-dealer',
isHideChildren: true,
children: [
{
path: '/apps/dealer/apply',
component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/apply/Index'),
meta: { title: '入驻申请', keepAlive: false, permission: ['/apps/dealer/apply'] }
},
// {
// path: '/apps/dealer/apply',
// component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/apply/Index'),
// meta: { title: '入驻申请', keepAlive: false, permission: ['/apps/dealer/apply'] }
// },
{
path: '/apps/dealer/user',
component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/user/Index'),
@ -857,11 +857,11 @@ export const asyncRouterMap = [
component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/withdraw/Index'),
meta: { title: '提现申请', keepAlive: false, permission: ['/apps/dealer/withdraw'] }
},
{
path: '/apps/dealer/poster',
component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/poster/Index'),
meta: { title: '分销海报', keepAlive: false, permission: ['/apps/dealer/poster'] }
},
// {
// path: '/apps/dealer/poster',
// component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/poster/Index'),
// meta: { title: '分销海报', keepAlive: false, permission: ['/apps/dealer/poster'] }
// },
{
path: '/apps/dealer/setting',
component: () => import(/* webpackChunkName: "dealer" */ '@/views/apps/dealer/setting/Index'),
@ -869,89 +869,89 @@ export const asyncRouterMap = [
}
]
},
{
path: '/apps/bargain',
component: RouteView,
redirect: '/apps/bargain/active/index',
meta: { title: '砍价活动', keepAlive: false, permission: ['/apps/bargain'] },
moduleKey: 'apps-bargain',
isHideChildren: true,
children: [
{
path: '/apps/bargain/active/index',
component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/active/Index'),
meta: { title: '活动列表', keepAlive: false, permission: ['/apps/bargain/active/index'] },
// 访问其他页面时激活该菜单(router-link-active)
activePath: ['/apps/bargain/active/create', '/apps/bargain/active/update']
},
{
path: '/apps/bargain/active/create',
component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/active/Create'),
meta: { title: '创建活动', keepAlive: false, permission: ['/apps/bargain/active/create'] },
hidden: true
},
{
path: '/apps/bargain/active/update',
component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/active/Update'),
meta: { title: '编辑活动', keepAlive: false, permission: ['/apps/bargain/active/update'] },
hidden: true
},
{
path: '/apps/bargain/task/index',
component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/task/Index'),
meta: { title: '砍价任务', keepAlive: false, permission: ['/apps/bargain/task/index'] }
},
{
path: '/apps/bargain/setting',
component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/Setting'),
meta: { title: '砍价设置', keepAlive: false, permission: ['/apps/bargain/setting'] }
}
]
},
{
path: '/apps/groupon',
component: RouteView,
redirect: '/apps/groupon/goods/index',
meta: { title: '多人拼团', keepAlive: false, permission: ['/apps/groupon'] },
moduleKey: 'apps-groupon',
isHideChildren: true,
children: [
{
path: '/apps/groupon/goods/index',
component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/goods/Index'),
meta: { title: '拼团商品', keepAlive: false, permission: ['/apps/groupon/goods/index'] },
// 访问其他页面时激活该菜单(router-link-active)
activePath: ['/apps/groupon/goods/create', '/apps/groupon/goods/update']
},
{
path: '/apps/groupon/goods/create',
component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/goods/Create'),
meta: { title: '创建拼团商品', keepAlive: false, permission: ['/apps/groupon/goods/create'] },
hidden: true
},
{
path: '/apps/groupon/goods/update',
component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/goods/Update'),
meta: { title: '编辑拼团商品', keepAlive: false, permission: ['/apps/groupon/goods/update'] },
hidden: true
},
{
path: '/apps/groupon/task',
component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/task/Index'),
meta: { title: '拼单管理', keepAlive: false, permission: ['/apps/groupon/task'] }
},
{
path: '/apps/groupon/robot',
component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/robot/Index'),
meta: { title: '拼团机器人', keepAlive: false, permission: ['/apps/groupon/robot'] }
},
{
path: '/apps/groupon/setting',
component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/Setting'),
meta: { title: '拼团设置', keepAlive: false, permission: ['/apps/groupon/setting'] }
}
]
},
// {
// path: '/apps/bargain',
// component: RouteView,
// redirect: '/apps/bargain/active/index',
// meta: { title: '砍价活动', keepAlive: false, permission: ['/apps/bargain'] },
// moduleKey: 'apps-bargain',
// isHideChildren: true,
// children: [
// {
// path: '/apps/bargain/active/index',
// component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/active/Index'),
// meta: { title: '活动列表', keepAlive: false, permission: ['/apps/bargain/active/index'] },
// // 访问其他页面时激活该菜单(router-link-active)
// activePath: ['/apps/bargain/active/create', '/apps/bargain/active/update']
// },
// {
// path: '/apps/bargain/active/create',
// component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/active/Create'),
// meta: { title: '创建活动', keepAlive: false, permission: ['/apps/bargain/active/create'] },
// hidden: true
// },
// {
// path: '/apps/bargain/active/update',
// component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/active/Update'),
// meta: { title: '编辑活动', keepAlive: false, permission: ['/apps/bargain/active/update'] },
// hidden: true
// },
// {
// path: '/apps/bargain/task/index',
// component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/task/Index'),
// meta: { title: '砍价任务', keepAlive: false, permission: ['/apps/bargain/task/index'] }
// },
// {
// path: '/apps/bargain/setting',
// component: () => import(/* webpackChunkName: "bargain" */ '@/views/apps/bargain/Setting'),
// meta: { title: '砍价设置', keepAlive: false, permission: ['/apps/bargain/setting'] }
// }
// ]
// },
// {
// path: '/apps/groupon',
// component: RouteView,
// redirect: '/apps/groupon/goods/index',
// meta: { title: '多人拼团', keepAlive: false, permission: ['/apps/groupon'] },
// moduleKey: 'apps-groupon',
// isHideChildren: true,
// children: [
// {
// path: '/apps/groupon/goods/index',
// component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/goods/Index'),
// meta: { title: '拼团商品', keepAlive: false, permission: ['/apps/groupon/goods/index'] },
// // 访问其他页面时激活该菜单(router-link-active)
// activePath: ['/apps/groupon/goods/create', '/apps/groupon/goods/update']
// },
// {
// path: '/apps/groupon/goods/create',
// component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/goods/Create'),
// meta: { title: '创建拼团商品', keepAlive: false, permission: ['/apps/groupon/goods/create'] },
// hidden: true
// },
// {
// path: '/apps/groupon/goods/update',
// component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/goods/Update'),
// meta: { title: '编辑拼团商品', keepAlive: false, permission: ['/apps/groupon/goods/update'] },
// hidden: true
// },
// {
// path: '/apps/groupon/task',
// component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/task/Index'),
// meta: { title: '拼单管理', keepAlive: false, permission: ['/apps/groupon/task'] }
// },
// {
// path: '/apps/groupon/robot',
// component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/robot/Index'),
// meta: { title: '拼团机器人', keepAlive: false, permission: ['/apps/groupon/robot'] }
// },
// {
// path: '/apps/groupon/setting',
// component: () => import(/* webpackChunkName: "groupon" */ '@/views/apps/groupon/Setting'),
// meta: { title: '拼团设置', keepAlive: false, permission: ['/apps/groupon/setting'] }
// }
// ]
// },
{
path: '/apps/sharp',
component: RouteView,
@ -1022,21 +1022,21 @@ export const asyncRouterMap = [
}
]
},
{
path: '/apps/live',
component: RouteView,
redirect: '/apps/live/room/index',
meta: { title: '小程序直播', keepAlive: false, permission: ['/apps/live'] },
moduleKey: 'apps-live',
isHideChildren: true,
children: [
{
path: '/apps/live/room/index',
component: () => import(/* webpackChunkName: "live" */ '@/views/apps/live/room/Index'),
meta: { title: '直播间管理', keepAlive: false, permission: ['/apps/live/room/index'] }
}
]
},
// {
// path: '/apps/live',
// component: RouteView,
// redirect: '/apps/live/room/index',
// meta: { title: '小程序直播', keepAlive: false, permission: ['/apps/live'] },
// moduleKey: 'apps-live',
// isHideChildren: true,
// children: [
// {
// path: '/apps/live/room/index',
// component: () => import(/* webpackChunkName: "live" */ '@/views/apps/live/room/Index'),
// meta: { title: '直播间管理', keepAlive: false, permission: ['/apps/live/room/index'] }
// }
// ]
// },
{
path: '/apps/eorder',
component: RouteView,

132
src/views/goods/memberPrice/Index.vue
Unescape View File

@ -3,79 +3,70 @@
<div class="card-title">{{ $route.meta.title }}</div>
<a-spin :spinning="isLoading">
<a-form :form="form" @submit="handleSubmit">
<a-form-item label="数据渠道" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
v-decorator="[`open_channel`]"
allowClear
mode="multiple"
@change="getChannel"
placeholder="请选择渠道"
>
<a-select-option :value="item.id" v-for="item in checkList" :key="item.id">
{{ item.name }}
</a-select-option>
</a-select>
<div style="color: rgba(0, 0, 0, 0.45); font-size: 12.5px; line-height: 20px">
注：数据渠道未选择时则代表所有渠道
</div>
<a-form-item v-bind="formItemLayoutWithOutLabel">
<div class="msg">
<span>价格区间(元)</span>
<span>分销加价率%</span>
<span>利润空间(元)</span>
</div></a-form-item
>
<a-form-item v-bind="formItemLayoutWithOutLabel">
<a-button type="dashed" style="width: calc(43.5% + 8px); margin-right: 50px" @click="handleAddCondition">
<a-icon type="plus-circle" /> 新增分类模版 </a-button
><a-button type="dashed" style="width: calc(44.5% + 8px)" @click="handleAddCondition">
<a-icon type="minus-circle-o" /> 删除分类模版
</a-button>
</a-form-item>
<!-- {{form.getFieldValue('fliter_condition')}} -->
<a-form-item
v-for="(k, index) in form.getFieldValue('fliter_condition')"
:key="k.id"
:label="index === 0 ? '过滤数据' : ''"
:label="index === 0 ? '分销模版' : ''"
:labelCol="labelCol"
v-bind="index === 0 ? { wrapperCol } : formItemLayoutWithOutLabel"
required
>
<div class="fan">
<a-tree-select
style="width: 100%; margin-right: 8px; margin-top: 3px"
placeholder="请选择商品分类"
:dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
:treeData="formData.categoryList"
treeCheckable
allowClear
treeCheckStrictly
@select="onSelect(index, $event)"
@focus="handleSelectChange(index)"
v-decorator="[`category${index}`, { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]"
></a-tree-select>
<a-form-item>
<a-input
placeholder="利润值"
prefix=">"
suffix="元"
v-decorator="[`profit${index}`, { rules: [{ required: true, message: '请输入利润值' }] }]"
style="width: 94%; margin-right: 8px"
/>
</a-form-item>
<a-form-item>
<a-input
placeholder="利润率"
prefix=">"
suffix="%"
v-decorator="[`profit_rate${index}`, { rules: [{ required: true, message: '请输入利润率' }] }]"
style="width: 94%; margin-right: 8px"
/>
</a-form-item>
<a-form-item>
<a-icon
style="margin-top: 30rpx"
v-if="form.getFieldValue('fliter_condition').length > 0"
class="dynamic-delete-button"
type="minus-circle-o"
:disabled="form.getFieldValue('fliter_condition').length === 1"
@click="() => handleRemoveCondition(index)"
/>
</a-form-item>
<a-tree-select
style="width: 100%; margin-right: 8px; margin-top: 3px"
placeholder="请选择商品分类"
:dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
:treeData="formData.categoryList"
treeCheckable
allowClear
treeCheckStrictly
@select="onSelect(index, $event)"
@focus="handleSelectChange(index)"
v-decorator="[`category${index}`, { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]"
></a-tree-select>
<div style="width: 100%">
<div class="fan">
<a-form-item style="margin-right: 15px; width: 33%">
<a-input
placeholder="利润值"
suffix="元"
v-decorator="[`profit${index}`, { rules: [{ required: true, message: '请输入利润值' }] }]"
style="width: 100%; margin-right: 8px; text-align: center"
/>
</a-form-item>
<a-form-item style="margin-right: 15px; width: 33%">
<a-input
placeholder="利润率"
suffix="%"
v-decorator="[`profit_rate${index}`, { rules: [{ required: true, message: '请输入利润率' }] }]"
style="width: 100%; margin-right: 8px; text-align: center"
/>
</a-form-item>
<div style="width: 33%; text-align: center"><span>0</span>~<span>90</span></div>
</div>
<div style="width: 100%">
<a-button type="dashed" style="width: calc(40% + 8px); margin-right: 50px" @click="handleAddCondition">
<a-icon type="plus-circle" /> 新增价格区间 </a-button
><a-button type="dashed" style="width: calc(40% + 8px)" @click="handleAddCondition">
<a-icon type="minus-circle-o" /> 删除价格区间
</a-button>
</div>
</div>
</a-form-item>
<a-form-item v-bind="formItemLayoutWithOutLabel">
<a-button type="dashed" style="width: calc(50% + 8px)" @click="handleAddCondition">
<a-icon type="plus" /> 新增过滤数据
</a-button>
</a-form-item>
<a-form-item :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
<a-button type="primary" html-type="submit">提交</a-button>
</a-form-item>
@ -328,6 +319,21 @@ export default {
}
</script>
<style lang="less" scoped>
.msg {
width: 100%;
background: #ffe7e7;
border-radius: 0px 0px 0px 0px;
opacity: 1;
padding: 5px 25px;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 16px;
span {
width: 33%;
text-align: center;
}
}
/deep/.ant-form-item-control {
padding-left: 10px;
.ant-form-item-control {

4
src/views/order/Detail.vue
Unescape View File

@ -278,8 +278,8 @@
<div class="deliver-goods-list clearfix">
<div class="goods-item" v-for="(goods, idx) in item.goods" :key="idx">
<a-tooltip>
<template slot="title">{{ goods.goods.goods_name }}</template>
<img class="goods-img" :src="goods.goods.goods_image" alt="商品图片" />
<template slot="title">{{ goods.goods_name?goods.goods_name:'' }}</template>
<img class="goods-img" :src="goods.goods_image?goods.goods_image:''" alt="商品图片" />
<div class="title">共{{ goods.delivery_num }}件</div>
</a-tooltip>
</div>

Write Preview
Loading…
Cancel
Save