dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
4 changed files with 2907 additions and 1 deletions
Showing only changes of commit 25e049eb91 - Show all commits

View File

@ -103,7 +103,7 @@ export function convertRouter(asyncRoutes) {
const obj = {
path: '/report',
component: '@/views/settings/config/report.vue',
name: 'Vab86001',
name: 'Vab86002',
redirect: null,
meta: {
title: '举报中心',
@ -116,6 +116,24 @@ export function convertRouter(asyncRoutes) {
route.children.push(obj)
}
if (route.meta.title == '设置') {
// 新增plateLocalDelivery 路由(和平台运费路由同级)
const localDeliveryObj = {
path: '/plateLocalDelivery', // 跳转路径
component: '@/views/settings/config/plateformDeliverFee/plateLocalDelivery.vue', // 对应文件路径
name: 'Vab8601', // 必须全局唯一不能和其他路由name重复
redirect: null,
meta: {
title: '同城配送(平台)', // 路由标题(可自定义)
icon: '',
noClosable: 0,
hidden: true, // 是否在菜单中隐藏根据需求设置比如设为true则不在菜单显示
},
menuHidden: false,
}
route.children.push(localDeliveryObj)
}
if (route.meta.title == '基础') {
const cloudPrintRoute = {
path: '/cloudPrint',

View File

@ -0,0 +1,221 @@
export const distributionOpction =[
{
value:0,
label:'飞速达'
},
{
value:1,
label:'快速达'
},
{
value:2,
label:'快速达-臻选型'
},
{
value:3,
label:'快速达-臻选型-45'
},
{
value:4,
label:'快速达-时效性'
},
{
value:5,
label:'快速达-普惠型'
},
{
value:6,
label:'及时达'
},
{
value:7,
label:'集中送'
},
{
value:8,
label:'跑腿-帮送'
},
{
value:9,
label:'及时达-新'
},
{
value:10,
label:'光速达-40'
},
{
value:11,
label:'光速达-45'
},
{
value:12,
label:'光速达-50'
},
{
value:13,
label:'光速达-55'
},
{
value:14,
label:'快速达-7590'
},
{
value:15,
label:'快速达-6090'
},
]
export const checkList = [
{
label:1,
name:'商家配送'
},
{
label:2,
name:'第三方配送'
}
]
export const distributionList =[
{
label:1,
imgUrl:require('@/assets/distribution_images/dada.png')
},
{
label:2,
imgUrl:require('@/assets/distribution_images/meituan.png')
},
{
label:3,
imgUrl:require('@/assets/distribution_images/sf.png')
},
{
label:4,
imgUrl:require('@/assets/distribution_images/ss.png')
},
{
label:5,
imgUrl:require('@/assets/distribution_images/uu.png')
}
]
export const goodsTypeData = {
"1": "快餐",
"2": "药品",
"3": "百货",
"4": "脏衣服收",
"5": "干净衣服派",
"6": "生鲜",
"8": "高端饮品",
"9": "现场勘验",
"10": "快递",
"12": "文件",
"13": "蛋糕",
"14": "鲜花",
"15": "数码",
"16": "服装",
"17": "汽配",
"18": "珠宝",
"20": "披萨",
"21": "中餐",
"22": "水产",
"27": "专人直送",
"32": "中端饮品",
"33": "便利店",
"34": "面包糕点",
"35": "火锅",
"36": "证照",
"40": "烧烤小龙虾",
"41": "外部落地配",
"47": "烟酒行",
"48": "成人用品",
"55": "宠物用品",
"56": "母婴用品",
"57": "美妆用品",
"58": "家居建材",
"59": "眼镜行",
"60": "图文广告",
"99": "其他"
}
export const mapMinPriceTypeOpciotn = [
{
value:0,
label:'商品原价'
},
{
value:1,
label:'商品折后价'
},
{
value:2,
label:'订单实付价'
}
]
export const freightReliefTypeOpction = [
{
value:0,
label:'商品原价'
},
{
value:1,
label:'商品折后价'
},
]
export const weekListConfig =[
{
label:7,
name:'周日',
isDisabled:false
},
{
label:1,
name:'周一',
isDisabled:false
},
{
label:2,
name:'周二',
isDisabled:false
},
{
label:3,
name:'周三',
isDisabled:false
},
{
label:4,
name:'周四',
isDisabled:false
},
{
label:5,
name:'周五',
isDisabled:false
},
{
label:6,
name:'周六',
isDisabled:false
}
]
export const periodOpction = [
{
value:0,
label:'天'
},
{
value:1,
label:'小时'
},
{
value:60,
label:'分钟'
},
]

File diff suppressed because it is too large Load Diff

View File

@ -165,6 +165,9 @@
<el-button type="text" @click="handleLocationEdit(row)">
{{ __('位置') }}
</el-button>
<el-button type="text" @click="handleDeliveryEdit(row)">
{{ __('运费') }}
</el-button>
</template>
</el-table-column>
<el-table-column
@ -575,6 +578,12 @@
this.$refs['locationEdit'].showEdit()
}
},
handleDeliveryEdit(row) {
this.$router.push({
path: '/plateLocalDelivery',
query: { store_id: row.store_id }
})
},
handleSizeChange(val) {
this.queryForm.pageSize = val
this.fetchData()