diff --git a/README.md b/README.md
index 6a8163c..5b5d0d3 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ utils 自定义工具js 独立命名，一般不用新建文件夹
│ │ └──SvgIcon # svg图标
│ │ └──Tinymce # 富文本编辑器
│ │ └──ThemePicker # 右侧设置按钮，设置组题颜色
-│ │ └──templatesFrom # 运费模板
+│ │ └──templatesFrom # 配送模板
│ │ └──uploadPicture # 上传图片组件
│ │ └──Upload # 上传文件组件
│ │ └──UploadExcel # 下载Excel
@@ -211,7 +211,7 @@ utils 自定义工具js 独立命名，一般不用新建文件夹
│ │ └──cityList # 城市数据
│ │ └──companyList # 物流公司
│ │ └──config # 物流配置
-│ │ └──shippingTemplates # 运费模板
+│ │ └──shippingTemplates # 配送模板
│ │ └──setting # 系统设置
│ │ └──systemStore # 提货点设置
│ │ └──appSetting # 应用 小程序 公众号设置
diff --git a/src/api/logistics.js b/src/api/logistics.js
index c1b4e10..a0890b3 100644
--- a/src/api/logistics.js
+++ b/src/api/logistics.js
@@ -99,7 +99,7 @@ export function expressDelete(data) {
})
}
-// 物流运费模板列表
+// 物流配送模板列表
export function shippingTemplatesList(data) {
return request({
url: '/admin/express/shipping/templates/list',
@@ -108,7 +108,7 @@ export function shippingTemplatesList(data) {
})
}
-// 物流运费模板详情
+// 物流配送模板详情
export function templateDetailApi(data) {
return request({
url: '/admin/express/shipping/templates/info',
@@ -117,7 +117,7 @@ export function templateDetailApi(data) {
})
}
-// 物流运费模板包邮
+// 物流配送模板包邮
export function shippingFree(data) {
return request({
url: '/admin/express/shipping/free/list',
@@ -126,7 +126,7 @@ export function shippingFree(data) {
})
}
-// 物流运费模板不包邮
+// 物流配送模板不包邮
export function shippingRegion(data) {
return request({
url: 'admin/express/shipping/region/list',
@@ -135,7 +135,7 @@ export function shippingRegion(data) {
})
}
-// 物流运费模板新增
+// 物流配送模板新增
export function shippingSave(data) {
return request({
url: 'admin/express/shipping/templates/save',
@@ -144,7 +144,7 @@ export function shippingSave(data) {
})
}
-// 物流运费模板更新
+// 物流配送模板更新
export function shippingUpdate(data, id) {
return request({
url: 'admin/express/shipping/templates/update',
@@ -154,7 +154,7 @@ export function shippingUpdate(data, id) {
})
}
-// 物流运费模板删除
+// 物流配送模板删除
export function shippingDetete(data) {
return request({
url: 'admin/express/shipping/templates/delete',
diff --git a/src/api/product.js b/src/api/product.js
index 2c2663b..feca4ab 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -326,7 +326,7 @@ export function productGetRuleApi() {
}
/**
- * @description 商品 -- 获取运费模板
+ * @description 商品 -- 获取配送模板
*/
export function productGetTemplateApi() {
return request({
diff --git a/src/router/modules/operation.js b/src/router/modules/operation.js
index 6811327..0c124e7 100644
--- a/src/router/modules/operation.js
+++ b/src/router/modules/operation.js
@@ -146,7 +146,7 @@ const operationRouter = {
path: 'freightSet',
component: () => import('@/views/systemSetting/deliverGoods/freightSet'),
name: 'freightSet',
- meta: { title: '运费模板', noCache: true }
+ meta: { title: '配送模板', noCache: true }
},
]
},
diff --git a/src/views/maintain/logistics/shippingTemplates/creatTemplates.vue b/src/views/maintain/logistics/shippingTemplates/creatTemplates.vue
index 2dd2d34..f5c5e75 100644
--- a/src/views/maintain/logistics/shippingTemplates/creatTemplates.vue
+++ b/src/views/maintain/logistics/shippingTemplates/creatTemplates.vue
@@ -1,7 +1,7 @@
按件数
按重量
按体积
+ 按距离
-
+
@@ -42,7 +43,7 @@
-
+
@@ -186,6 +187,7 @@ const defaultRole = {
}
const kg = '重量（kg）'
const m = '体积（m³）'
+const km = '公里（km）'
const statusMap = [
{
title: '首件',
@@ -201,6 +203,11 @@ const statusMap = [
title: `首件${m}`,
title2: `续件${m}`,
title3: `包邮${m}`
+ },
+ {
+ title: `首${km}`,
+ title2: `续${km}`,
+ title3: `免费${km}`
}
]
export default {
@@ -239,7 +246,7 @@ export default {
{ required: true, message: '请输入', trigger: 'blur' }
],
firstPrice: [
- { required: true, message: '请输入运费', trigger: 'blur' }
+ { required: true, message: '请输入费用', trigger: 'blur' }
],
renewalPrice: [
{ required: true, message: '请输入续费', trigger: 'blur' }
@@ -422,7 +429,7 @@ export default {
name: this.ruleForm.name,
sort: this.ruleForm.sort,
type: this.ruleForm.type,
- // 配送区域及运费
+ // 配送区域及费用
// shippingTemplatesRegionRequestList: [],
// // 指定包邮设置
// shippingTemplatesFreeRequestList: []
@@ -505,4 +512,4 @@ export default {
width: 100px !important;
}
}
-
\ No newline at end of file
+
diff --git a/src/views/maintain/logistics/shippingTemplates/index.vue b/src/views/maintain/logistics/shippingTemplates/index.vue
index bf9552c..d50b50d 100644
--- a/src/views/maintain/logistics/shippingTemplates/index.vue
+++ b/src/views/maintain/logistics/shippingTemplates/index.vue
@@ -11,7 +11,7 @@
- 添加运费模板
+ 添加配送模板
-
+
-
+
@@ -216,7 +216,7 @@
-
+
@@ -362,7 +362,7 @@
loading: false,
fullscreenLoading: false,
merCateList: [], // 商户分类筛选
- shippingList: [], // 运费模板
+ shippingList: [], // 配送模板
seckillTime: [],
ruleValidate: {
productId: [
@@ -384,7 +384,7 @@
{ required: true, message: '请输入砍价商品简介', trigger: 'blur' }
],
tempId: [
- { required: true, message: '请选择运费模板', trigger: 'change' }
+ { required: true, message: '请选择配送模板', trigger: 'change' }
],
timeId: [
{ required: true, message: '请选择活动时间', trigger: 'change' }
@@ -523,13 +523,13 @@
return item
})
},
- // 运费模板；
+ // 配送模板；
getShippingList() {
shippingTemplatesList(this.tempData).then(res => {
this.shippingList = res.list
})
},
- // 运费模板
+ // 配送模板
addTem() {
this.$refs.addTemplates.dialogVisible = true
this.$refs.addTemplates.getCityList()
diff --git a/src/views/marketing/groupBuy/groupGoods/creatGroup.vue b/src/views/marketing/groupBuy/groupGoods/creatGroup.vue
index ca87a06..71d50e7 100644
--- a/src/views/marketing/groupBuy/groupGoods/creatGroup.vue
+++ b/src/views/marketing/groupBuy/groupGoods/creatGroup.vue
@@ -133,7 +133,7 @@
-
+
-
+
@@ -369,7 +369,7 @@
loading: false,
fullscreenLoading: false,
merCateList: [], // 商户分类筛选
- shippingList: [], // 运费模板
+ shippingList: [], // 配送模板
seckillTime: [],
ruleValidate: {
productId: [
@@ -391,7 +391,7 @@
{ required: true, message: '请输入拼团商品简介', trigger: 'blur' }
],
tempId: [
- { required: true, message: '请选择运费模板', trigger: 'change' }
+ { required: true, message: '请选择配送模板', trigger: 'change' }
],
image: [
{ required: true, message: '请上传商品图', trigger: 'change' }
@@ -532,13 +532,13 @@
return item
})
},
- // 运费模板；
+ // 配送模板；
getShippingList() {
shippingTemplatesList(this.tempData).then(res => {
this.shippingList = res.list
})
},
- // 运费模板
+ // 配送模板
addTem() {
this.$refs.addTemplates.dialogVisible = true
this.$refs.addTemplates.getCityList()
diff --git a/src/views/marketing/seckill/seckillList/creatSeckill.vue b/src/views/marketing/seckill/seckillList/creatSeckill.vue
index c4375ab..25777f4 100644
--- a/src/views/marketing/seckill/seckillList/creatSeckill.vue
+++ b/src/views/marketing/seckill/seckillList/creatSeckill.vue
@@ -86,7 +86,7 @@
-
+
-
+
@@ -345,7 +345,7 @@
loading: false,
fullscreenLoading: false,
merCateList: [], // 商户分类筛选
- shippingList: [], // 运费模板
+ shippingList: [], // 配送模板
seckillTime: [],
ruleValidate: {
productId: [
@@ -367,7 +367,7 @@
{ required: true, message: '请输入秒杀商品简介', trigger: 'blur' }
],
tempId: [
- { required: true, message: '请选择运费模板', trigger: 'change' }
+ { required: true, message: '请选择配送模板', trigger: 'change' }
],
timeId: [
{ required: true, message: '请选择活动时间', trigger: 'change' }
@@ -496,13 +496,13 @@
return item
})
},
- // 运费模板；
+ // 配送模板；
getShippingList() {
shippingTemplatesList(this.tempData).then(res => {
this.shippingList = res.list
})
},
- // 运费模板
+ // 配送模板
addTem() {
this.$refs.addTemplates.dialogVisible = true
this.$refs.addTemplates.getCityList()
diff --git a/src/views/store/creatStore/index.vue b/src/views/store/creatStore/index.vue
index 8bca77a..e48f5d8 100644
--- a/src/views/store/creatStore/index.vue
+++ b/src/views/store/creatStore/index.vue
@@ -72,8 +72,8 @@
-
-
+
+
- 运费模板
+ 配送模板
@@ -93,9 +93,9 @@
多规格
-
+
- 单独设置
+
默认设置
@@ -422,8 +422,8 @@
otPrice: 0,
stock: 0,
barCode: '',
- weight: 0,
- volume: 0
+ // weight: 0,
+ // volume: 0
}],
attr: [],
selectRule: '',
@@ -433,7 +433,7 @@
id: 0,
couponIds: [],
coupons: [],
- activity: ['默认','秒杀','砍价','拼团']
+ activity: ['默认','秒杀']
}
const objTitle = {
price: {
@@ -451,12 +451,12 @@
barCode: {
title: '商品编号'
},
- weight: {
- title: '重量（KG）'
- },
- volume: {
- title: '体积(m³)'
- }
+ // weight: {
+ // title: '重量（KG）'
+ // },
+ // volume: {
+ // title: '体积(m³)'
+ // }
}
export default {
name: 'ProductProductAdd',
@@ -464,7 +464,7 @@
data() {
return {
isDisabled: this.$route.params.isDisabled==='1'?true:false,
- activity: { '默认': 'red', '秒杀': 'blue', '砍价': 'green', '拼团': 'yellow' },
+ activity: { '默认': 'red', '秒杀': 'blue' },
props2: {
children: 'child',
label: 'name',
@@ -482,7 +482,7 @@
ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
ruleList: [],
merCateList: [], // 商户分类筛选
- shippingList: [], // 运费模板
+ shippingList: [], // 配送模板
formThead: Object.assign({}, objTitle),
formValidate: Object.assign({}, defaultObj),
formDynamics: {
@@ -535,7 +535,7 @@
{ required: true, message: '请输入商品简介', trigger: 'blur' }
],
tempId: [
- { required: true, message: '请选择运费模板', trigger: 'change' }
+ { required: true, message: '请选择配送模板', trigger: 'change' }
],
image: [
{ required: true, message: '请上传商品图', trigger: 'change' }
@@ -706,8 +706,8 @@
otPrice: 0,
stock: 0,
barCode: '',
- weight: 0,
- volume: 0,
+ // weight: 0,
+ // volume: 0,
brokerage: 0,
brokerage_two: 0
}
@@ -737,8 +737,8 @@
otPrice: 0,
stock: 0,
barCode: '',
- weight: 0,
- volume: 0,
+ // weight: 0,
+ // volume: 0,
brokerage: 0,
brokerage_two: 0,
attrValue: { [v['attrName']]: vv }
@@ -756,7 +756,7 @@
return res
}
},
- // 运费模板
+ // 配送模板
addTem() {
this.$refs.addTemplates.dialogVisible = true
this.$refs.addTemplates.getCityList()
@@ -823,7 +823,7 @@
this.ruleList = list
})
},
- // 运费模板；
+ // 配送模板；
getShippingList() {
shippingTemplatesList(this.tempData).then(res => {
this.shippingList = res.list
@@ -870,8 +870,8 @@
this.$set(val, 'otPrice', this.oneFormBatch[0].otPrice)
this.$set(val, 'stock', this.oneFormBatch[0].stock)
this.$set(val, 'barCode', this.oneFormBatch[0].barCode)
- this.$set(val, 'weight', this.oneFormBatch[0].weight)
- this.$set(val, 'volume', this.oneFormBatch[0].volume)
+ // this.$set(val, 'weight', this.oneFormBatch[0].weight)
+ // this.$set(val, 'volume', this.oneFormBatch[0].volume)
this.$set(val, 'brokerage', this.oneFormBatch[0].brokerage)
this.$set(val, 'brokerageTwo', this.oneFormBatch[0].brokerageTwo)
}
@@ -984,7 +984,7 @@
ficti: info.ficti,
coupons: info.coupons,
couponIds: info.couponIds,
- activity: info.activityStr ? info.activityStr.split(',') : ['默认','秒杀','砍价','拼团']
+ activity: info.activityStr ? info.activityStr.split(',') : ['默认','秒杀']
}
marketingSendApi({type:3}).then(res=>{
if(this.formValidate.couponIds !== null){
diff --git a/src/views/store/taoBao.vue b/src/views/store/taoBao.vue
index ee626b0..62bb78f 100644
--- a/src/views/store/taoBao.vue
+++ b/src/views/store/taoBao.vue
@@ -62,7 +62,7 @@
-
+
{
this.shippingList = res.list
@@ -697,10 +697,10 @@
let arr = [];
let arr1 = [];
const listArr = [{ name: '是否热卖', value: 'isHot' }];
- let typeLists = [
- { name: '', value: 'isGood',type:'2' }, //精品推荐1 热门榜单2 首发新品3 促销单品4
- { name: '', value: 'isBenefit' ,type:'4'},
- { name: '', value: 'isBest',type:'1' },
+ let typeLists = [
+ { name: '', value: 'isGood',type:'2' }, //精品推荐1 热门榜单2 首发新品3 促销单品4
+ { name: '', value: 'isBenefit' ,type:'4'},
+ { name: '', value: 'isBest',type:'1' },
{ name: '', value: 'isNew',type:'3' }];
list.forEach((item)=>{
let obj = {};
diff --git a/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue b/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue
index 8e11b69..f75364a 100644
--- a/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue
+++ b/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue
@@ -1,7 +1,7 @@
按件数
按重量
按体积
+ 按距离
-
+
@@ -42,7 +43,7 @@
-
+
@@ -107,7 +108,7 @@
-
+
@@ -187,6 +188,7 @@ const defaultRole = {
}
const kg = '重量（kg）'
const m = '体积（m³）'
+const km = '公里（km）'
const statusMap = [
{
title: '首件',
@@ -202,6 +204,11 @@ const statusMap = [
title: `首件${m}`,
title2: `续件${m}`,
title3: `包邮${m}`
+ },
+ {
+ title: `首${km}`,
+ title2: `续${km}`,
+ title3: `免费${km}`
}
]
export default {
@@ -240,7 +247,7 @@ export default {
{ required: true, message: '请输入', trigger: 'blur' }
],
firstPrice: [
- { required: true, message: '请输入运费', trigger: 'blur' }
+ { required: true, message: '请输入费用', trigger: 'blur' }
],
renewalPrice: [
{ required: true, message: '请输入续费', trigger: 'blur' }
@@ -262,6 +269,7 @@ export default {
title2: '续件',
title3: '包邮件数'
},
+ isShowPrice: true,
tempId: 0,
type: 0 // 0添加 1编辑
}
@@ -310,6 +318,11 @@ export default {
},
changeRadio(num) {
this.columns = Object.assign({}, statusMap[num - 1])
+ if (num === 4) {
+ this.isShowPrice = false;
+ } else {
+ this.isShowPrice = true;
+ }
},
// 添加配送区域
addRegion(region) {
@@ -423,7 +436,7 @@ export default {
name: this.ruleForm.name,
sort: this.ruleForm.sort,
type: this.ruleForm.type,
- // 配送区域及运费
+ // 配送区域及费用
// shippingTemplatesRegionRequestList: [],
// // 指定包邮设置
// shippingTemplatesFreeRequestList: []
@@ -506,4 +519,4 @@ export default {
width: 100px !important;
}
}
-
\ No newline at end of file
+
diff --git a/src/views/systemSetting/deliverGoods/freightSet/index.vue b/src/views/systemSetting/deliverGoods/freightSet/index.vue
index 9cd0e1f..c76333e 100644
--- a/src/views/systemSetting/deliverGoods/freightSet/index.vue
+++ b/src/views/systemSetting/deliverGoods/freightSet/index.vue
@@ -11,7 +11,7 @@
- 添加运费模板
+ 添加配送模板
按件数
按重量
按体积
+ 按距离
-
+
@@ -186,6 +187,7 @@ const defaultRole = {
}
const kg = '重量（kg）'
const m = '体积（m³）'
+const km = '公里（km）'
const statusMap = [
{
title: '首件',
@@ -201,6 +203,11 @@ const statusMap = [
title: `首件${m}`,
title2: `续件${m}`,
title3: `包邮${m}`
+ },
+ {
+ title: `首${km}`,
+ title2: `续${km}`,
+ title3: `免费${km}`
}
]
export default {
@@ -505,4 +512,4 @@ export default {
width: 100px !important;
}
}
-
\ No newline at end of file
+
diff --git a/src/views/systemSetting/logistics/shippingTemplates/index.vue b/src/views/systemSetting/logistics/shippingTemplates/index.vue
index 67d7b4f..151df02 100644
--- a/src/views/systemSetting/logistics/shippingTemplates/index.vue
+++ b/src/views/systemSetting/logistics/shippingTemplates/index.vue
@@ -11,7 +11,7 @@
- 添加运费模板
+ 添加配送模板