Skip to content

S
shop-new
提交 4a626dac authored 作者: yuanyufei's avatar yuanyufei
浏览文件
操作

Merge branch 'yuantest' into test

上级 257e881b 0984e522
隐藏空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 65 行删除
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 4a626dac
......@@ -36,7 +36,7 @@
<p class="col_pr">运费(元)</p>
<p class="col_pr">续费/重(个/克)</p>
<p class="col_pr">续费(元)</p>
<p class="col_pr">管理</p>
<!-- <p class="col_pr">管理</p> -->
</div>
<div
v-for="(item, index) in goodsDate.dispatching"
......@@ -67,6 +67,8 @@
<el-input
v-model="item.fp"
placeholder=""
@keyup.native="
item.fp = oninput(item.fp)"
style="width: 70%"
></el-input>
</p>
......@@ -81,6 +83,8 @@
<el-input
v-model="item.np"
placeholder=""
@keyup.native="
item.np = oninput(item.np)"
style="width: 70%"
></el-input>
</p>
......@@ -340,8 +344,8 @@ export default {
this.$message({ message: '新增成功', type: 'success'});
}else {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
item.fp= Number(item.fp/100)
item.np = Number(item.np/100)
})
this.$message({type:'error',message: res.message ? res.message : '新增失败'});
}
......@@ -353,8 +357,8 @@ export default {
this.$message({ message: '修改成功', type: 'success'});
}else {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
item.fp= Number(item.fp/100)
item.np = Number(item.np/100)
})
this.$message({type:'error',message: res.message ? res.message : '修改失败'});
}
......@@ -382,10 +386,41 @@ export default {
info() {
this.goodsDate = this.option
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
item.fp= Number(item.fp/100)
item.np = Number(item.np/100)
})
},
oninput(value) {
let str = value;
let len1 = str.substr(0, 1);
let len2 = str.substr(1, 1);
//如果第一位是0，第二位不是点，就用数字把点替换掉
if (str.length > 1 && len1 == 0 && len2 != ".") {
str = str.substr(1, 1);
}
//第一位不能是.
if (len1 == ".") {
str = "";
}
if (len1 == "+") {
str = "";
}
if (len1 == "-") {
str = "";
}
//限制只能输入一个小数点
if (str.indexOf(".") != -1) {
let str_ = str.substr(str.indexOf(".") + 1);
if (str_.indexOf(".") != -1) {
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
}
}
//正则替换
str = str.replace(/[^\d^\.]+/g, ""); // 保留数字和小数点
str = str.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/, "$1"); // 小数点后只能输 2 位
return str;
},
},
};
</script>
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 4a626dac
......@@ -171,7 +171,6 @@
// 如果包含了，英文逗号，说明有多个，就校验个数
if (value.indexOf(',') > -1) {
let arrLength = value.split(',').length;
console.log(value.split(','));
if (arrLength > 5) {
callback(new Error("商品关键词，不能超过5个"));
} else {
......@@ -288,7 +287,6 @@
},
methods: {
handchange() {//图片拖动结束
console.log(this.goodsImgFileList)
this.goodsInfoForm.imgs = []
this.goodsImgFileList.forEach(item => {
this.goodsInfoForm.imgs.push(item.url)
......@@ -342,16 +340,13 @@
}
}).catch((err) => {
console.log(err)
});
},
vedioerror(err, file, fileList) {
console.log(err, file, fileList)
},
onEnd() {
// debugger
console.log(this.goodsImgFileList)
this.drag = false
},
//显示删除图片的图标
......@@ -423,7 +418,7 @@
},
getSSQArea() {
let limboNode = { id: 0 };
let limboNode = { id: 0 }
NewGetCategoryData(limboNode).then(res => {
this.fuckoptions = res.data;
});
......@@ -452,12 +447,10 @@
},
// 类目修改
handGoodsChang(val){
console.log(val,'newval')
this.SSQGoodsList = val
},
SSQGoodsChange(value) {
this.valdata=[]
console.log(value,'ccc')
let limboNode = {
parent_id:value[value.length - 1]
}
......@@ -469,7 +462,6 @@
}
this.valdata.push(val)
})
console.log(this.valdata)
if(value.length==1){
this.fuckoptions.forEach((item,index)=>{
......@@ -492,7 +484,6 @@
})
}
});
console.log(this.SSQGoodsList,'aaaaa')
},
// 确认 修改 商品分类
saveType() {
......@@ -564,7 +555,6 @@
},
// 上传 商品图片
uploadGoodsImg(param) {
//console.log(327,param);
this.getBase64(param.file).then(res => {
let result = res.split(",");
this.Base64img = result[1];
......@@ -636,7 +626,6 @@
if (Array.isArray(cateList) && cateList.length > 0) {
data.category_id = cateList[0];
}
// console.log(8888,data);
getByCategoryData(data).then(res => {
if (res.code == 1) {
this.cateFee = res.data.service_fee_ratio ? res.data.service_fee_ratio : ''
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 4a626dac
......@@ -78,7 +78,6 @@
:label="item.spec_name"
>
<!-- <template slot-scope="scope">
</template> -->
</el-table-column>
<el-table-column align="center" prop="js_price" label="协议价">
......@@ -162,17 +161,12 @@
/>
<span class="span-img-del el-icon-delete del-span-block" @click="delSingleSpecImg(scope.$index,scope.row)"></span>
</span>
</template>
</el-table-column>
</el-table>
<input type="file" style="display: none;" ref="guideupimg" accept="image/*"
@change="changeIMG()">
</div>
</div>
</template>
......@@ -226,26 +220,20 @@ export default {
},
watch:{
'parameterdata': function(val) {
console.log('更新')
this.orgGoodsPam = val;
if(val.pamNameList){
this.spacArr = val.pamNameList
console.log(val)
}
},
},
created() {
this.cateFee = this.$store.state.user.cateFee;
debugger
},
mounted() {
this.isradioguide = this.parameterdata.isradioguide ? this.parameterdata.isradioguide:1
console.log(this.parameterdata)
this.getSpanArr(this.parameterdata);
debugger
this.keyvalue++
if(this.parameterdata.singleSpecTable && this.parameterdata.singleSpecTable.length === 1 ) {
this.singleSpecTable = this.parameterdata.singleSpecTable
}
......@@ -260,7 +248,6 @@ export default {
this.orgGoodsPam = {};
//this.singleSpecTable =
},
// ------ 无规格，上传图片相关 ------
limit5() {
this.$message({type: 'warning',message: '只能上传5张图片'});
......
src/views/system/goods/add/index.vue
浏览文件 @ 4a626dac
......@@ -470,13 +470,12 @@
let spggData = spggRef.speData;
spggRef.upDateDom();
// return;
// 商品售价，通过获取的数据，分别进行判断
let isGoodsPrice = true;
let goodsPriceMsg = '';
let spsjData1 = JSON.parse(JSON.stringify(this.$refs.goodsparameter.singleSpecTable));
let spsjData2 = JSON.parse(JSON.stringify(this.$refs.goodsparameter.parameterdata));
// debugger
// 如果有，则说明有规格组合数据
if ( this.radioguide==2&&spsjData2.specs_group && spsjData2.specs_group.length > 0 ) {
// debugger
......@@ -566,7 +565,7 @@
return
}
debugger
// 所有校验通过，整理数据
// 获取 商品信息数据
let spxxData = this.$refs.goodsInfo.goodsInfoForm;
......@@ -606,7 +605,6 @@ debugger
this.goodsAllData['specs_group'] = []
this.goodsAllData['specs'] = []
}
debugger
// 商品详情 数据
// let spxqData = this.$refs.goodsdetailsimg.goodsDeForm;
......@@ -630,7 +628,6 @@ debugger
break;
}
}
debugger
console.log(569,ssffData);
if (ssffData.delay_compensate == 72) {
......
src/views/system/goodsimport/index.vue
浏览文件 @ 4a626dac
......@@ -55,6 +55,7 @@
import { MessageBox } from 'element-ui';
import {getShopInf} from "@/api/module/entry"
import { goodsjdAddress,goodsimport} from "@/api/module/goodsgement";
import { NewGetCategoryData } from '@/api/module/goods';
import { dateFormat } from "@/utils";
export default {
......@@ -69,17 +70,18 @@ export default {
el_value: [], //地址
options: [],
props: {
checkStrictly: false,
expandTrigger: "click",
emitPath: true,
value: "id",
label: "label",
expandTrigger: 'click',
lazy: true,
lazyLoad: this.lazyLoad,
value: "id",
label: 'title',
leaf: 'leaf'
},
};
},
components: {},
created() {
this.getData();
this.info()
},
watch: {},
......@@ -188,13 +190,46 @@ export default {
elvalueclick() {
// this.goodsonly()
},
getData() {
goodsjdAddress().then((res) => {
if (res.code == 1) {
this.options = res.data;
lazyLoad(node, resolve) {
this.SSQList = [];
this.SSQStr = '';
this.getArea(node, resolve);
if(this.SSQList && this.SSQList.length > 0) {
this.isNextStep = false
}else {
this.isNextStep = true
}
});
},
},
getArea(node, resolve) {
debugger
const level = node.level;
let limboNode = {};
if(level === 0) {
limboNode = {parent_id: 0}
}
if(level > 0) {
limboNode = { parent_id: node.value };
}
NewGetCategoryData(limboNode).then(res => {
let result = {};
result = res.data
result.forEach(item => {
item.value = item.id;
item.label = item.label;
item.children = [];
item.leaf = level>=2;
// 可以控制 是否有下级 值为true都不行，必须等于0
})
resolve(result)
});
},
}, //methods结束
};
</script>
......
src/views/system/order/index.vue
浏览文件 @ 4a626dac
<template>
<div class="app-container">
<el-card class="box-card box-cardone">
<el-card class="box-cardone">
<div style="position: relative;" class="clearfixall">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane name="first">
......@@ -31,6 +31,7 @@
</el-tooltip>
</div>
</div>
<div class="overMain">
<div class="form-box">
<el-form class="form-params" ref="form" :model="form" label-width="120px" :inline="true" size="small">
<el-form-item label="总订单号：">
......@@ -130,7 +131,7 @@
</el-table>
</div>
<div class="table-all-con box-card">
<div class="table-all-con">
<el-card v-for="(item, index) in tableDataList" :key="index" class="order-card">
<div slot="header" class="el-card-header-spe">
<div style="float:left;">
......@@ -218,6 +219,7 @@
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<!-- 订单详情 对话框 -->
<el-dialog title="订单详情" width="85%" :close-on-click-modal="false" :destroy-on-close="true"
......@@ -970,19 +972,29 @@
</script>
<style scoped>
.box-cardone{
height: 100%;
}
/deep/ .el-range-editor.el-input__inner {
width: 100%;
}
/deep/ .el-card__body {
height: calc(100% - 50px);
/* overflow: auto; */
}
.overMain{
height: 729px;
overflow: auto;
padding-top: 15px;
}
.scollbox {
height: calc(100% - 50px);
overflow-y: hidden;
/* height: calc(100% - 50px); */
/* overflow-y: hidden; */
}
/deep/ .el-tabs__header{
margin: 0;
}
.form-box {
/*margin-bottom: 20px;*/
/*padding-top: 10px;*/
......@@ -1003,7 +1015,13 @@
.footer_pagination {
text-align: center;
/* width: 100%; */
margin-top: 15px;
/* position: fixed;
bottom: 50px;
left: 35%;
z-index: 1000;
background-color: white; */
}
.delivery-data-con {
......@@ -1070,12 +1088,13 @@
}
.table-all-con {
height: calc(100% - 190px);
overflow: auto;
/* height: calc(100% - 190px); */
/* margin-bottom: 40px; */
/* overflow: auto; */
}
.el-card-header-spe {
overflow: hidden;
/* overflow: hidden; */
}
.ml10 {
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 4a626dac
......@@ -514,7 +514,9 @@
/* height: 100%;*/
/* overflow: hidden;*/
/*}*/
/deep/ .el-tabs__header{
margin: 0;
}
/deep/ .after-sale-tabs .el-tabs__item {
line-height: 30px;
}
......@@ -526,6 +528,7 @@
.table-all-con {
height: calc(100% - 40px);
overflow: auto;
padding-top: 15px;
}
.table-all-body-con {
......
src/views/system/shop/brand.vue
浏览文件 @ 4a626dac
......@@ -551,7 +551,6 @@
this.certImgFileList= [];
this.factoryImgFileList= [];
this.shopImgFileList= [];
// debugger
this.indexBrandId = row.id;
let data = {
id : this.indexBrandId
......@@ -570,7 +569,6 @@
let brandArr = [];
let brandUrl = {};
brandArr = this.brandForm.brand_logo.split(",");
// debugger
if (brandArr.length > 0) {
brandArr.forEach(item=> {
brandUrl = {};
......@@ -812,7 +810,6 @@
this.certImgFileList= [];
this.factoryImgFileList= [];
this.shopImgFileList= [];
// debugger
this.validityLongTermVal = false;
this.validityConcreteTime = ''
Object.assign(this.brandForm, this.$options.data().brandForm)
......@@ -824,8 +821,6 @@
this.$refs[formName].resetFields();
})
}
// console.log("brandForm:",this.brandForm);
},
/** 上传图片 数量限制 */
limit1() {
......@@ -850,7 +845,6 @@
if (statusVal == 3) {
res = '已过期'
}
return res;
},
/** 图片转换为base64位 */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论