Skip to content

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

列表滚轮的优化

上级 bc9ebaf0
隐藏空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 42 行删除
.env.development
浏览文件 @ b559ed1b
......@@ -5,8 +5,8 @@ ENV = 'development'
#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
# 测试环境
VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
#VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
#VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
# 文档模块 直接调用 sys开放接口
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ b559ed1b
......@@ -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
浏览文件 @ b559ed1b
......@@ -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
浏览文件 @ b559ed1b
......@@ -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/order/index.vue
浏览文件 @ b559ed1b
<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"
......@@ -968,19 +970,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;*/
......@@ -1001,7 +1013,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 {
......@@ -1068,12 +1086,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
浏览文件 @ b559ed1b
......@@ -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 {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论