Skip to content

S
shop-new
提交 c452c3c5 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

1、入驻，获取品牌信息接口更换；2、运费模块bug修改

上级 fe59aa82
隐藏空白字符变更
内嵌 并排
正在显示 包含 248 行增加 和 229 行删除
src/api/module/entry.js
浏览文件 @ c452c3c5
...@@ -20,7 +20,7 @@ export function addMain(data) { ...@@ -20,7 +20,7 @@ export function addMain(data) {
// 获取品牌信息 // 获取品牌信息
export function getBrandsInf(query) { export function getBrandsInf(query) {
return request({ return request({
url: '/local/brands', url: '/local/shopbrand',
method: 'get', method: 'get',
params: query params: query
}); });
......
src/views/entry/fillBrandInf.vue
浏览文件 @ c452c3c5
...@@ -486,9 +486,9 @@ ...@@ -486,9 +486,9 @@
// 初始化 // 初始化
//this.resetForm(); //this.resetForm();
getBrandsInf().then(res => { getBrandsInf().then(res => {
console.log("获取品牌：",res); console.log("获取品牌：",res.data);
if(res.code === 1 && res.data.data) { if(res.code === 1 && res.data) {
this.brandForm = res.data.data[0]; this.brandForm = res.data[0];
// 商标logo图片处理 // 商标logo图片处理
let brandList = {}; let brandList = {};
let brandArr = []; let brandArr = [];
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ c452c3c5
...@@ -207,13 +207,7 @@ export default { ...@@ -207,13 +207,7 @@ export default {
IsDefault: 0, IsDefault: 0,
ChargeType: 0, ChargeType: 0,
Dispatching: [ Dispatching: [
{ { a: "全国", f: 500, fp: 10, n: 100, np: 5 }
a: "全国",
f: 500,
fp: 10,
n: 100,
np: 5,
}
], ],
Disdispatching: "", Disdispatching: "",
Publish: 0, Publish: 0,
...@@ -226,13 +220,17 @@ export default { ...@@ -226,13 +220,17 @@ export default {
}, },
methods: { methods: {
btndisabled(){ btndisabled(){
console.log(this.checkList , this.btnindex) let checkListString = '';
if(this.btnindex == 99){ if(this.btnindex == 99){
this.goodsDate.Disdispatching = this.checkList.join() checkListString = this.checkList.join();
}else{ if(checkListString.substr(0,1) === ',') {
this.goodsDate.Dispatching[this.btnindex].a = this.checkList.join() checkListString = checkListString.slice(1);
} }
this.dialogVisible = false this.goodsDate.Disdispatching = checkListString;
}else{
this.goodsDate.Dispatching[this.btnindex].a = this.checkList.join()
}
this.dialogVisible = false
}, },
unique (obj, ary){ unique (obj, ary){
return obj.filter(function(item){ return obj.filter(function(item){
...@@ -241,6 +239,7 @@ export default { ...@@ -241,6 +239,7 @@ export default {
}, },
opendias(type, i, index) { opendias(type, i, index) {
this.goodsDate.Dispatching.forEach((element) => { this.goodsDate.Dispatching.forEach((element) => {
let arrd = element.a.split(',') let arrd = element.a.split(',')
for(let i=0;i<arrd.length;i++){ for(let i=0;i<arrd.length;i++){
...@@ -268,9 +267,13 @@ export default { ...@@ -268,9 +267,13 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
}, },
handleinfomationclick() {//提交 handleinfomationclick() {//提交
this.goodsDate.Disdispatching.forEach(item=>{ //debugger;
this.goodsDate.Dispatching.forEach(item=>{
item.np = Number(item.np*100).toFixed() item.np = Number(item.np*100).toFixed()
}) })
//console.log("提交前的数据：",this.goodsDate);
addFreight(this.goodsDate).then(response => { addFreight(this.goodsDate).then(response => {
console.log(296,response); console.log(296,response);
if(response.data.code === 1) { if(response.data.code === 1) {
......
src/views/system/goods/add/index.vue
浏览文件 @ c452c3c5
<template> <template>
<div class="app-container goods" v-loading="loading"> <div class="app-container goods" v-loading="loading">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{title}}</span> <span>{{title}}</span>
<el-button style="float: right; " icon="el-icon-check" size="mini" type="primary" @click="submitForm">提 交</el-button> <el-button style="float: right; " icon="el-icon-check" size="mini" type="primary" @click="submitForm">提 交
</div> </el-button>
<el-tabs type="border-card"> </div>
<el-tab-pane label="商品信息"> <el-tabs type="border-card">
<Goodsinfomation :infomationdatas='infomationdata' @infomationclick='infomationclick' /> <el-tab-pane label="商品信息">
</el-tab-pane> <Goodsinfomation :infomationdatas='infomationdata' @infomationclick='infomationclick'/>
<el-tab-pane label="商品图片"> </el-tab-pane>
<Goodsimg :imgdata='imgdate' @imgclicks='imgclick' /> <el-tab-pane label="商品图片">
</el-tab-pane> <Goodsimg :imgdata='imgdate' @imgclicks='imgclick'/>
<el-tab-pane label="商品规格"> </el-tab-pane>
<Guide :guidedata='guidedate' @guideclicks='guideclick' /> <el-tab-pane label="商品规格">
</el-tab-pane> <Guide :guidedata='guidedate' @guideclicks='guideclick'/>
<el-tab-pane label="商品参数"> </el-tab-pane>
<Goodsparameter :parameterdata='parameterdata' @parameterclicks='parameterclick' /> <el-tab-pane label="商品参数">
</el-tab-pane> <Goodsparameter :parameterdata='parameterdata' @parameterclicks='parameterclick'/>
</el-tabs> </el-tab-pane>
</el-card> </el-tabs>
</el-card>
</div> </div>
</template> </template>
<script> <script>
import { getGoods } from '@/api/module/goods' import {getGoods} from '@/api/module/goods'
import descartes from "@/utils/dikaerjs.js"; import descartes from "@/utils/dikaerjs.js";
import Guide from './components/guide' import Guide from './components/guide'
import Goodsinfomation from './components/goodsinfomation' import Goodsinfomation from './components/goodsinfomation'
import Goodsimg from './components/goodsimg' import Goodsimg from './components/goodsimg'
import Goodsparameter from './components/goodsparameter' import Goodsparameter from './components/goodsparameter'
import { addGoods } from '@/api/module/goods' import {addGoods} from '@/api/module/goods'
export default { export default {
name: 'goods', name: 'goods',
data() { data() {
return { return {
goodsOnsale:0, goodsOnsale: 0,
loading: false, loading: false,
title:"添加新商品", title: "添加新商品",
imgdate:[], imgdate: [],
guidedate:{}, guidedate: {},
parameterdate:{}, parameterdate: {},
params:{} params: {}
}
},
components:{
Guide,
Goodsinfomation,
Goodsimg,
Goodsparameter
},
created() {
this.getParams()
},
methods: {
getParams(){
var goodsId = this.$route.query.goodsId
if(goodsId>0){
this.title = "编辑商品信息"
this.genGoodsInfo(goodsId)
} }
// if (goodsId > 0 ) {
// this.genGoodsInfo(goodsId)
// }
},
// 获取商品详情
genGoodsInfo(goodsId) {
const goods_id = goodsId
getGoods(goods_id).then(response => {
console.log("商品详情",response.data.data)
this.goodsOnsale=response.data.data.isOnsale,
this.infomationdata = {
goodsId:response.data.data.goodsId,
goodsName:response.data.data.goodsName,
categoryId:response.data.data.categoryId ,
scPrice:response.data.data.scPrice/100,
price:response.data.data.price/100,
jsPrice:response.data.data.jsPrice/100,
goodsNowStock:response.data.data.goodsNowStock,
producingArea:response.data.data.producingArea,
weight:response.data.data.weight,
unit:response.data.data.unit,
goodsBrand:response.data.data.goodsBrand,
wlPrice:response.data.data.wlPrice,
Delayompensate:response.data.data.Delayompensate,
aftersaleTime:response.data.data.aftersaleTime,
mark:response.data.data.mark,
servicetagsTags:response.data.data.ServiceagsTags.split(','),
goodsNowStock:response.data.data.goodsNowStock,
description:response.data.data.description,
freightId:response.data.data.freightId,
outGoodsId:response.data.data.outGoodsId,
};
this.guidedate = response.data.data.goodsSpecs
this.guidedate["goodsSpec"] = response.data.data.goodsSpec
this.parameterdata = response.data.data.Params
this.imgdate = {
"ruleFormdialogImageUrl":response.data.data.image,
"ruleFormdialogImageUrlplus":response.data.data.defaultImage
}
});
}, },
info(){ components: {
addgoods(this.listQuery).then(response => { Guide,
this.list = response.data.items Goodsinfomation,
this.total = response.data.total Goodsimg,
this.listLoading = false Goodsparameter
})
}, },
//商品信息 created() {
infomationclick(type){ this.getParams()
// this.Goodsinfomation = type
Object.assign(this.params, type);
console.log(111111)
// console.log(this.params,9999)
},
//商品图片
imgclick(type){
type.ruleFormdialogImageUrlplus //主图
type.ruleFormdialogImageUrl //多图
let img = []
type.ruleFormdialogImageUrl.forEach((res,index)=>{
img.push(res.url)
})
this.params["imgs"] = img
this.params["defaultImg"] = type.ruleFormdialogImageUrlplus[0].url
},
//规格
guideclick(type,specsGroup){
this.params["specs"] = type
this.params["specsGroup"] = specsGroup
console.log(333333)
console.log("type",type)
console.log("specsGroup",specsGroup)
},
//参数
parameterclick(type){
this.params["goodsPram"] = type
console.log(44444)
console.log(type)
}, },
methods: {
getParams() {
var goodsId = this.$route.query.goodsId
if (goodsId > 0) {
this.title = "编辑商品信息"
this.genGoodsInfo(goodsId)
}
// if (goodsId > 0 ) {
// this.genGoodsInfo(goodsId)
// }
},
// 获取商品详情
genGoodsInfo(goodsId) {
const goods_id = goodsId
getGoods(goods_id).then(response => {
console.log("商品详情", response.data.data)
this.goodsOnsale = response.data.data.isOnsale;
this.infomationdata = {
goodsId: response.data.data.goodsId,
goodsName: response.data.data.goodsName,
categoryId: response.data.data.categoryId,
scPrice: response.data.data.scPrice / 100,
price: response.data.data.price / 100,
jsPrice: response.data.data.jsPrice / 100,
goodsNowStock: response.data.data.goodsNowStock,
producingArea: response.data.data.producingArea,
weight: response.data.data.weight,
unit: response.data.data.unit,
goodsBrand: response.data.data.goodsBrand,
wlPrice: response.data.data.wlPrice,
Delayompensate: response.data.data.Delayompensate,
aftersaleTime: response.data.data.aftersaleTime,
mark: response.data.data.mark,
servicetagsTags: response.data.data.ServiceagsTags.split(','),
description: response.data.data.description,
freightId: response.data.data.freightId,
outGoodsId: response.data.data.outGoodsId,
};
this.guidedate = response.data.data.goodsSpecs
this.guidedate["goodsSpec"] = response.data.data.goodsSpec
this.parameterdata = response.data.data.Params
this.imgdate = {
"ruleFormdialogImageUrl": response.data.data.image,
"ruleFormdialogImageUrlplus": response.data.data.defaultImage
}
/** 确定按钮 */ });
submitForm() { },
this.loading=true info() {
addGoods(this.params).then(response => { addgoods(this.listQuery).then(response => {
this.loading=false this.list = response.data.items
if(response.data.code == 1){ this.total = response.data.total
this.$message({ this.listLoading = false
message: response.data.msg, })
type: 'success' },
}); //商品信息
if(this.goodsOnsale){ infomationclick(type) {
var redUrl = '/system/goods/onsale' Object.assign(this.params, type);
}else{ },
var redUrl = '/system/goods/offsale' //商品图片
} imgclick(type) {
this.$router.push({ type.ruleFormdialogImageUrlplus //主图
path: redUrl type.ruleFormdialogImageUrl //多图
let img = []
}); type.ruleFormdialogImageUrl.forEach((res, index) => {
}else{ img.push(res.url)
this.$message.error(response.data.msg); })
this.params["imgs"] = img
} this.params["defaultImg"] = type.ruleFormdialogImageUrlplus[0].url
},
}); //规格
guideclick(type, specsGroup) {
this.params["specs"] = type
this.params["specsGroup"] = specsGroup
},
//参数
parameterclick(type) {
this.params["goodsPram"] = type
},
}, /** 确定按钮 */
submitForm() {
this.loading = true;
//-------------------------
if (this.goodsOnsale) {
var redUrl = '/system/goods/onsale'
} else {
var redUrl = '/system/goods/offsale'
}
this.$router.push({
path: redUrl
});
this.loading = false;
return;
//------------------------
addGoods(this.params).then(response => {
if (response.data.code == 1) {
this.$message({
message: response.data.msg,
type: 'success'
});
if (this.goodsOnsale) {
var redUrl = '/system/goods/onsale'
} else {
var redUrl = '/system/goods/offsale'
}
this.$router.push({
path: redUrl
});
} else {
this.$message.error(response.data.msg);
}
this.loading = false;
});
},
}
} }
}
</script> </script>
<style scoped> <style scoped>
.el-tabs { .el-tabs {
height:calc(100% - 60px); height: calc(100% - 60px);
} }
ul,li{
list-style: none; ul, li {
margin: 0; list-style: none;
padding:0; margin: 0;
} padding: 0;
.ullist{ }
.ullist {
border: 1px solid #e7eaec; border: 1px solid #e7eaec;
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.el-input-group{
width:calc(100% - 60px); .el-input-group {
} width: calc(100% - 60px);
.addbtn{ }
background-color: #5bc0de !important;
color: #fff !important; .addbtn {
border-radius:0 4px 4px 0; background-color: #5bc0de !important;
color: #fff !important;
} border-radius: 0 4px 4px 0;
.app-container{
height:100%; }
}
.box-card{ .app-container {
height:100% ; height: 100%;
} }
.box-card /deep/ .el-card__body{
height:100%; .box-card {
overflow-x: hidden; height: 100%;
overflow-y: scroll; }
}
.el-tabs{ .box-card /deep/ .el-card__body {
height:calc(100% - 35px); height: 100%;
} overflow-x: hidden;
.el-tabs /deep/ .el-tabs__content{ overflow-y: scroll;
height:calc(100% - 39px); }
overflow-y: scroll;
} .el-tabs {
.eldelbtn{ height: calc(100% - 35px);
height:30px; }
padding:5px 20px !important;
margin-left: -3px; .el-tabs /deep/ .el-tabs__content {
} height: calc(100% - 39px);
.childlist{ overflow-y: scroll;
margin-top: 10px; }
}
.el-button--medium { .eldelbtn {
height: 30px;
padding: 5px 20px !important;
margin-left: -3px;
}
.childlist {
margin-top: 10px;
}
.el-button--medium {
padding: 10px 12px; padding: 10px 12px;
} }
.dfbtn{
.dfbtn {
position: relative; position: relative;
} }
.goods .el-tabs__content{
height:100%; .goods .el-tabs__content {
height: 100%;
overflow-y: scroll; overflow-y: scroll;
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论