Skip to content

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

Merge branch 'yuantest'

上级 39d712fa dbf2fb0d
隐藏空白字符变更
内嵌 并排
正在显示 包含 599 行增加 和 548 行删除
src/views/index.vue
浏览文件 @ a3ef37c6
...@@ -49,51 +49,77 @@ ...@@ -49,51 +49,77 @@
</div> </div>
<!-- 中间部分 --> <!-- 中间部分 -->
<div class="main"> <div class="main">
<div class="main-left"> <el-row :gutter="10">
<el-col :xs="24" :md="24" :lg="17" >
<div class="main-left">
<div class="main-left-top"> <div class="main-left-top">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="5"> <el-col :span="5">
<div class="tp-col" @click="goovertime()"> <div class="tp-col" @click="godeliver()">
<div class="tp-le"> <el-row :gutter="10">
<span>超时订单</span> <el-col :span="12">
<p>{{waitFor.deliveredTimeNum}}</p> <div class="tp-le">
</div> <span>超时订单</span>
<div class="tp-img"> <p>{{waitFor.deliveredTimeNum}}</p>
<img src="@/assets/image/stay.png" alt=""> </div>
</div> </el-col>
<el-col :span="12">
<div class="tp-img">
<img src="@/assets/image/stay.png" alt="">
</div>
</el-col>
</el-row>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="tp-col" @click="godeliver()"> <div class="tp-col" @click="godeliver()">
<div class="tp-le"> <el-row :gutter="10">
<span>24小时需发货</span> <el-col :span="12">
<p>{{waitFor.deliverTime24Num}}</p> <div class="tp-le">
</div> <span>24小时需发货</span>
<div class="tp-img"> <p>{{waitFor.deliverTime24Num}}</p>
<img src="@/assets/image/stay.png" alt=""> </div>
</div> </el-col>
<el-col :span="12">
<div class="tp-img">
<img src="@/assets/image/stay.png" alt="">
</div>
</el-col>
</el-row>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="tp-col" @click="godeliver()"> <div class="tp-col" @click="godeliver()">
<div class="tp-le"> <el-row :gutter="10">
<span>48小时需发货</span> <el-col :span="12">
<p>{{waitFor.deliverTime48Num}}</p> <div class="tp-le">
</div> <span>48小时需发货</span>
<div class="tp-img"> <p>{{waitFor.deliverTime48Num}}</p>
<img src="@/assets/image/stay.png" alt=""> </div>
</div> </el-col>
<el-col :span="12">
<div class="tp-img">
<img src="@/assets/image/stay.png" alt="">
</div>
</el-col>
</el-row>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="tp-col" @click="afterSale()"> <div class="tp-col" @click="afterSale()">
<div class="tp-le"> <el-row :gutter="10">
<span>待处理售后</span> <el-col :span="12">
<p>{{waitFor.afterSaleNum}}</p> <div class="tp-le">
</div> <span>待处理售后</span>
<div class="tp-img"> <p>{{waitFor.afterSaleNum}}</p>
<img src="@/assets/image/stay.png" alt=""> </div>
</div> </el-col>
<el-col :span="12">
<div class="tp-img">
<img src="@/assets/image/stay.png" alt="">
</div>
</el-col>
</el-row>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -157,7 +183,9 @@ ...@@ -157,7 +183,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="main-right"> </el-col>
<el-col :xs="24" :md="24" :lg="7" >
<div class="main-right">
<div class="main-right-top"> <div class="main-right-top">
<div class="sa">常用功能</div> <div class="sa">常用功能</div>
<div style="margin-top:24px;"> <div style="margin-top:24px;">
...@@ -240,6 +268,10 @@ ...@@ -240,6 +268,10 @@
</ul> </ul>
</div> </div>
</div> </div>
</el-col>
</el-row>
</div> </div>
<!-- 底部 --> <!-- 底部 -->
<div class="footer"> <div class="footer">
...@@ -359,529 +391,548 @@ ...@@ -359,529 +391,548 @@
</div> </div>
</template> </template>
<script> <script>
import {getStatisticalHome,getOperationalData,getGoodsSale,getStoreData} from '@/api/system/home/home.js' import {
import LineChart from './dashboard/LineChart' getStatisticalHome,
export default { getOperationalData,
name: 'Index', getGoodsSale,
components: { getStoreData,
LineChart, } from "@/api/system/home/home.js";
import LineChart from "./dashboard/LineChart";
export default {
name: "Index",
components: {
LineChart,
},
data() {
return {
delivery: "", //发货率
beSettled: "", //待结算金额
beGmv: "", //gmv
dialogVisible: false, //控制弹框
numberValue: "1", //控制运营数据时间筛选
operate: {}, //运营数据
waitFor: {}, //待办事项数据
numberChartData: {}, //柱状图数据
numberChartDataCopy: {}, //柱状图默认数据
storeOrder: {}, //店铺数据-订单数据
storeGoods: [], //店铺销量数据
storeGoodsCopy: [], //销量排行默认数据
cateGory: [], //热销类目数据
numSelect: "11", //统计图数据切换
isShowData: true, //控制柱状图的切换
value1: [], //店铺数据时间查询
value2: [], //热销类目时间查询
//时间筛选验证
pickerOptions: {
disabledDate(time) {
let curDate = new Date().getTime();
let three = 30 * 24 * 3600 * 1000;
let threeMonths = curDate - three;
return time.getTime() > Date.now() || time.getTime() < threeMonths;
},
},
//下拉框数据
options: [
{
value: "一",
label: "一级类目",
},
{
value: "二",
label: "二级类目",
},
{
value: "三",
label: "三级类目",
},
],
Category: "一级类目",
};
},
created() {
this.GetDefaultData();
},
watch: {
value1: {
handler: function () {
if (this.value1 == null) {
this.value1 = [];
}
},
}, },
data() { },
return { methods: {
delivery:'',//发货率 openDia() {
beSettled:'',//待结算金额 this.dialogVisible = true;
beGmv:'',//gmv
dialogVisible: false,//控制弹框
numberValue:'1',//控制运营数据时间筛选
operate:{},//运营数据
waitFor:{},//待办事项数据
numberChartData:{},//柱状图数据
numberChartDataCopy:{},//柱状图默认数据
storeOrder:{},//店铺数据-订单数据
storeGoods:[],//店铺销量数据
storeGoodsCopy:[],//销量排行默认数据
cateGory:[],//热销类目数据
numSelect:'11',//统计图数据切换
isShowData:true,//控制柱状图的切换
value1:[],//店铺数据时间查询
value2:[],//热销类目时间查询
//时间筛选验证
pickerOptions: {
disabledDate(time) {
let curDate = (new Date()).getTime();
let three = 30 * 24 * 3600 * 1000;
let threeMonths = curDate - three;
return time.getTime() >Date.now() || time.getTime() < threeMonths;;
}
},
//下拉框数据
options: [{
value: '一',
label: '一级类目'
}, {
value: '二',
label: '二级类目'
}, {
value: '三',
label: '三级类目'
}],
Category: '一级类目'
}
}, },
created() { handleClose(done) {
this.GetDefaultData() done();
}, },
watch:{ //跳转到我的资产
value1:{ goMyAssets() {
handler:function(){ this.$router.push("/system/asset/myAsset");
if(this.value1==null){ },
this.value1=[] //跳转到商品发布页面
} goCommodity() {
} this.$router.push("/system/goods/add");
},
//跳转到售后
afterSale() {
this.$router.push("/system/repeat/retreat");
},
//跳转到订单列表
godeliver() {
this.$router.push("/system/order/index");
},
//跳转到订单列表
// goovertime() {
// this.$router.push({
// path: "/system/order/index",
// // query: { timeout: 24 },
// });
// },
//获取默认数据
async GetDefaultData() {
const result = await getStatisticalHome();
this.operate = result.data.operational_data; //运营数据
this.waitFor = result.data.seller_todo_data; //代办事项
this.storeOrder = result.data.store_order_data; //店铺数据-订单数据
let arr = result.data.store_goods_sale_data; //对营业额进行分处理
for (let i = 0; i < arr.length; i++) {
const item = arr[i];
item.total_price = item.total_price / 100;
} }
this.storeGoods = arr; //销量排行数据
this.cateGory = result.data.category_sale_data; //热销类目排行数据
// this.numberChartData=this.storeOrder//柱状图数据
this.delivery = result.data.operational_data.delivery_rate / 100; //发货率
this.beSettled = result.data.operational_data.unsettled_amount / 100; //待结算数据
this.beGmv = result.data.operational_data.order_total_price / 100; //GMV数据
let storeObject = {}; //柱状图数据
storeObject.date = this.storeOrder.date;
let catePrice = this.storeOrder.customer_price.map((item) => {
return item / 100;
});
let orderPrice = this.storeOrder.order_total.map((item) => {
return item / 100;
});
storeObject.customerprice = catePrice;
storeObject.ordercount = this.storeOrder.order_count;
storeObject.ordertotal = orderPrice;
this.numberChartData = storeObject; //给柱状图传的数据
this.numberChartDataCopy = storeObject; //默认订单数据
this.storeGoodsCopy = arr; //默认销量排行数据
}, },
methods: { //统计店铺数据时间和排行数据
openDia(){ async dateTimechange() {
this.dialogVisible=true if (this.value1 == null) {
}, this.value1 = [];
handleClose(done) { let objNum = this.numberChartDataCopy;
done(); let objStore = this.storeGoodsCopy;
}, this.numberChartData = objNum;
//跳转到我的资产 this.storeGoods = objStore;
goMyAssets(){ } else if (this.numSelect == "11") {
this.$router.push('/system/asset/myAsset') let query = {};
}, query.start_time = this.value1[0] / 1000;
//跳转到商品发布页面 query.end_time = this.value1[1] / 1000;
goCommodity(){ query.seller_id = this.$store.state.user.sellerid;
this.$router.push('/system/goods/add') const result = await getStoreData(query);
}, let storeObject = {};
//跳转到售后 storeObject.date = result.data.date;
afterSale(){ let catePrice = result.data.customer_price.map((item) => {
this.$router.push('/system/repeat/retreat') return item / 100;
}, });
//跳转到订单列表 storeObject.customerprice = catePrice;
godeliver(){ storeObject.ordercount = result.data.order_count;
this.$router.push('/system/order/index') let orderPrice = result.data.order_total.map((item) => {
}, return item / 100;
//跳转到订单列表 });
goovertime(){ storeObject.ordertotal = orderPrice;
this.$router.push({path:'/system/order/index',query:{timeout:24}}) this.numberChartData = storeObject;
}, } else if (this.numSelect == "13") {
//获取默认数据 let query = {};
async GetDefaultData(){ query.start_time = this.value1[0] / 1000;
const result = await getStatisticalHome() query.end_time = this.value1[1] / 1000;
this.operate=result.data.operational_data//运营数据 const result = await getGoodsSale(query);
this.waitFor=result.data.seller_todo_data//代办事项 //对金额进行除以100修改
this.storeOrder=result.data.store_order_data//店铺数据-订单数据 let arr = result.data;
let arr=result.data.store_goods_sale_data for (let i = 0; i < arr.length; i++) {
for(let i = 0;i<arr.length;i++){ const item = arr[i];
const item=arr[i] item.total_price = item.total_price / 100;
item.total_price=item.total_price/100
}
this.storeGoods=arr
this.cateGory=result.data.category_sale_data
this.numberChartData=this.storeOrder
this.delivery=result.data.operational_data.delivery_rate/100
this.beSettled=result.data.operational_data.unsettled_amount/100
this.beGmv=result.data.operational_data.order_total_price/100
let storeObject={}
storeObject.date=this.storeOrder.date
let catePrice = this.storeOrder.customer_price.map(item=>{
return item / 100
})
let orderPrice= this.storeOrder.order_total.map(item=>{
return item / 100
})
storeObject.customerprice=catePrice
storeObject.ordercount=this.storeOrder.order_count
storeObject.ordertotal=orderPrice
this.numberChartData=storeObject//给柱状图传的数据
this.numberChartDataCopy=storeObject//默认订单数据
this.storeGoodsCopy=arr//默认销量排行数据
},
//统计店铺数据时间和排行数据
async dateTimechange(){
if(this.value1==null){
this.value1=[]
let objNum=this.numberChartDataCopy
let objStore=this.storeGoodsCopy
this.numberChartData=objNum
this.storeGoods=objStore
}else if(this.numSelect=='11'){
let query={}
query.start_time=this.value1[0] / 1000
query.end_time=this.value1[1] / 1000
query.seller_id=this.$store.state.user.sellerid
const result=await getStoreData(query)
let storeObject={}
storeObject.date=result.data.date
let catePrice = result.data.customer_price.map(item=>{
return item / 100
})
storeObject.customerprice=catePrice
storeObject.ordercount=result.data.order_count
let orderPrice= result.data.order_total.map(item=>{
return item / 100
})
storeObject.ordertotal=orderPrice
this.numberChartData=storeObject
}else if(this.numSelect=='13'){
let query={}
query.start_time=this.value1[0] / 1000
query.end_time=this.value1[1] / 1000
const result=await getGoodsSale(query)
//对金额进行除以100修改
let arr=result.data
for(let i = 0;i<arr.length;i++){
const item=arr[i]
item.total_price=item.total_price/100
}
this.storeGoods=arr
}else{
return
}
},
//热销类目排行数据时间
RankTimechange(){
// let query={}
// query.start_time=this.value1[0]
// query.end_time=this.value1[1]
// const result=await getGoodsSale(query)
// console.log(result)
// console.log(query)
// console.log(this.value2,'热销类目选择时间')
},
//修改表格样式
changeCellStyle(row,column,rowIndex,columnIndex){
if(row.column.label==='品类'){
return 'color: #000000;font: 500 14px AlibabaPuHuiTi-Regular;margin-left:50px;'
}else{
return ''
} }
}, this.storeGoods = arr;
//时间筛选按钮 } else {
async getnumbersTime(e){ return;
let query={} }
query.seller_id=this.$store.state.user.sellerid },
if(e==1){ //热销类目排行数据时间
const result=await getOperationalData(query) RankTimechange() {
this.delivery=result.data.delivery_rate/100 // let query={}
this.beSettled=result.data.unsettled_amount/100 // query.start_time=this.value1[0]
this.beGmv=result.data.order_total_price/100 // query.end_time=this.value1[1]
this.operate=result.data // const result=await getGoodsSale(query)
}else if(e==7){ // console.log(result)
query.day=e // console.log(query)
const result=await getOperationalData(query) // console.log(this.value2,'热销类目选择时间')
this.delivery=result.data.delivery_rate/100 },
this.beSettled=result.data.unsettled_amount/100 //修改表格样式
this.beGmv=result.data.order_total_price/100 changeCellStyle(row, column, rowIndex, columnIndex) {
this.operate=result.data if (row.column.label === "品类") {
}else if(e==15){ return "color: #000000;font: 500 14px AlibabaPuHuiTi-Regular;margin-left:50px;";
query.day=e } else {
const result=await getOperationalData(query) return "";
this.delivery=result.data.delivery_rate/100 }
this.beSettled=result.data.unsettled_amount/100 },
this.beGmv=result.data.order_total_price/100 //时间筛选按钮
this.operate=result.data async getnumbersTime(e) {
} let query = {};
}, query.seller_id = this.$store.state.user.sellerid;
//数据统计按钮 if (e == 1) {
getnumData(e){ const result = await getOperationalData(query);
if(e==11){ this.delivery = result.data.delivery_rate / 100;
this.isShowData=true this.beSettled = result.data.unsettled_amount / 100;
if(this.value1.length!==0){ this.beGmv = result.data.order_total_price / 100;
this.dateTimechange() this.operate = result.data;
} else if (e == 7) {
query.day = e;
const result = await getOperationalData(query);
this.delivery = result.data.delivery_rate / 100;
this.beSettled = result.data.unsettled_amount / 100;
this.beGmv = result.data.order_total_price / 100;
this.operate = result.data;
} else if (e == 15) {
query.day = e;
const result = await getOperationalData(query);
this.delivery = result.data.delivery_rate / 100;
this.beSettled = result.data.unsettled_amount / 100;
this.beGmv = result.data.order_total_price / 100;
this.operate = result.data;
}
},
//数据统计按钮
getnumData(e) {
if (e == 11) {
this.isShowData = true;
if (this.value1.length !== 0) {
this.dateTimechange();
} }
}else if(e==13){ } else if (e == 13) {
this.isShowData=false this.isShowData = false;
if(this.value1.length!==0){ if (this.value1.length !== 0) {
this.dateTimechange() this.dateTimechange();
} }
}else{ } else {
return return;
} }
}, },
} },
} };
</script> </script>
<style lang="scss" scoped type="text/stylus"> <style lang="scss" scoped type="text/stylus">
.dashboard-promote .el-row {
.dashboard-promote .el-row { margin-bottom: 20px;
margin-bottom: 20px; font-size: 14px;
font-size: 14px; }
} .dashboard-promote {
.dashboard-promote{ margin-left: 21px;
margin-left: 21px; }
} //头部
//头部 .header {
.header{ width: 100%;
width: 100%; overflow: hidden;
overflow: hidden; margin-top: 20px;
margin-top: 20px; background: #ffffff;
background: #FFFFFF; border-radius: 8px;
border-radius: 8px; }
} .header .header-top {
.header .header-top{ margin-top: 29px;
margin-top: 29px; }
} .header .sp {
.header .sp{ width: 63px;
width: 63px; height: 16px;
height: 16px; margin-left: 24px;
margin-left: 24px; font: 400 16px/5px Alibaba PuHuiTi;
font: 400 16px/5px Alibaba PuHuiTi; color: #000000;
color: #000000; }
} .header-foot {
.header-foot{ width: 100%;
width: 100%; height: 100px;
height: 100px; margin-top: 39px;
margin-top: 39px; overflow: hidden;
overflow: hidden; }
} .foot-le {
.foot-le{ width: 66%;
width: 66%; text-align: center;
text-align: center; display: inline-block;
display: inline-block; }
} .header-img {
.header-img{ vertical-align: middle;
vertical-align: middle; }
} .header-span {
.header-span{ font: 600 14px/11px Lantinghei SC;
font: 600 14px/11px Lantinghei SC; color: #333333;
color: #333333; }
} .header-p {
.header-p{ font: 600 24px/17px Lantinghei SC;
font: 600 24px/17px Lantinghei SC; color: #344750;
color: #344750; }
} .foot-ri {
.foot-ri{ width: 33%;
width: 33%; height: 80px;
height: 80px; display: inline-block;
display: inline-block; text-align: center;
text-align: center; border-left: 2px solid #e6edfe;
border-left: 2px solid #E6EDFE; }
} @media screen and (max-width: 1000px) {
//中间部分
.main{ .tp-img img{
width: 100%;
height: 612px; width: 50px;
margin-top:20px ; }
} .main-right{
.main .main-left{ margin-top: 30px;
float: left; }
width: 74%; }
height: 592px; //中间部分
} .main {
.main-left-top .tp-le,.tp-img{ width: 100%;
display: inline-block; height: 612px;
text-align: center; margin-top: 20px;
margin-top: 27px; }
} .main .main-left {
.main-left-top .tp-col{ // float: left;
// width: 281px; height: 592px;
cursor: pointer; }
height: 106px; .main-left-top .tp-le,.tp-img {
background: linear-gradient(180deg, #FFFFFF 0%, #F5F8FF 100%); display: inline-block;
border-radius: 4px; text-align: center;
} margin-top: 27px;
.main-left-top .tp-le{ }
width: 163px; .main-left-top .tp-col {
} // width: 281px;
.main-left-top .tp-col span{ cursor: pointer;
font: 400 14px/11px Alibaba PuHuiTi; height: 106px;
color: #333333; background: linear-gradient(180deg, #ffffff 0%, #f5f8ff 100%);
} border-radius: 4px;
.main-left-top .tp-col p{ }
font: bold 24px/17px Alibaba PuHuiTi; .main-left-top .tp-le {
color: #19191A; width: 163px;
} }
.main-left-foot{ .main-left-top .tp-col span {
height: 466px; font: 400 14px/11px Alibaba PuHuiTi;
margin-top: 20px; color: #333333;
background: #FFFFFF; }
border-radius: 4px; .main-left-top .tp-col p {
overflow: hidden; font: bold 24px/17px Alibaba PuHuiTi;
} color: #19191a;
.main-left-foot .ft-sp{ }
font: 400 16px/5px Alibaba PuHuiTi; .main-left-foot {
color: #000000; height: 466px;
} margin-top: 20px;
.main-left-foot-top{ background: #ffffff;
float: right; border-radius: 4px;
margin-right:49px ; overflow: hidden;
} }
//右侧内容 .main-left-foot .ft-sp {
.main-right{ font: 400 16px/5px Alibaba PuHuiTi;
width: 25%; color: #000000;
height: 592px; }
float: left; .main-left-foot-top {
margin-left: 15px; float: right;
} margin-right: 49px;
.main-right-top{ }
height: 198px; //右侧内容
overflow: hidden; .main-right {
background: #FFFFFF; height: 592px;
border-radius: 4px; margin-left: 15px;
} }
.main-right-top .sa{ .main-right-top {
margin: 30px 0 0 26px; height: 198px;
font: 400 16px/5px Alibaba PuHuiTi; overflow: hidden;
color: #000000; background: #ffffff;
} border-radius: 4px;
.main-right-top .right-top-item{ }
width: 70px; .main-right-top .sa {
height: 70px; margin: 30px 0 0 26px;
margin: auto; font: 400 16px/5px Alibaba PuHuiTi;
display: flex; color: #000000;
justify-content: center; }
align-items: center; .main-right-top .right-top-item {
background: #F0F6FF; width: 70px;
border-radius: 10px; height: 70px;
} margin: auto;
.main-right-foot{ display: flex;
height: 374px; justify-content: center;
margin-top: 20px; align-items: center;
background: #FFFFFF; background: #f0f6ff;
border-radius: 4px; border-radius: 10px;
} }
.main-right-foot ul{ .main-right-foot {
margin: 24px 0 0 25px; height: 374px;
} margin-top: 20px;
.main-right-foot ul li{ background: #ffffff;
margin-bottom: 16px; border-radius: 4px;
cursor: pointer; }
} .main-right-foot ul {
.main-right-foot-sn{ margin: 24px 0 0 25px;
display: inline-block; }
margin:30px 0 0 25px; .main-right-foot ul li {
cursor: pointer; margin-bottom: 16px;
font: 400 16px Alibaba PuHuiTi; cursor: pointer;
color: black; }
} .main-right-foot-sn {
.main-right-foot .main-right-foot-sa{ display: inline-block;
float: right; margin: 30px 0 0 25px;
margin:30px 25px 0 0; cursor: pointer;
cursor: pointer; font: 400 16px Alibaba PuHuiTi;
font: 400 14px Alibaba PuHuiTi; color: black;
color: #999999; }
} .main-right-foot .main-right-foot-sa {
.main-right-foot .main-right-foot-le{ float: right;
display: none; margin: 30px 25px 0 0;
width: 37px; cursor: pointer;
height: 22px; font: 400 14px Alibaba PuHuiTi;
display: inline-block; color: #999999;
background: #FFF5F6; }
border-radius: 4px; .main-right-foot .main-right-foot-le {
} display: none;
.main-right-foot .main-right-foot-ri{ width: 37px;
display: none; height: 22px;
width: 23px; display: inline-block;
height: 22px; background: #fff5f6;
display: inline-block; border-radius: 4px;
border-radius: 4px; }
} .main-right-foot .main-right-foot-ri {
.foot-color{ display: none;
background: #FFF6ED; width: 23px;
} height: 22px;
.main-right-foot-le,.main-right-foot-ri div{ display: inline-block;
text-align: center; border-radius: 4px;
line-height: 22px; }
font: 400 14px Alibaba PuHuiTi; .foot-color {
font-style: italic; background: #fff6ed;
} }
.main-right-foot .foot-le-text{ .main-right-foot-le,
margin-left: 46px; .main-right-foot-ri div {
font: 400 14px Alibaba PuHuiTi; text-align: center;
color: #000000; line-height: 22px;
} font: 400 14px Alibaba PuHuiTi;
//底部样式 font-style: italic;
.footer-left{ }
width: 74%; .main-right-foot .foot-le-text {
height: 428px; margin-left: 46px;
float: left; font: 400 14px Alibaba PuHuiTi;
background: #FFFFFF; color: #000000;
border-radius: 4px; }
} //底部样式
.footer-right-top{ .footer-left {
width: 25%; width: 74%;
height: 276px; height: 428px;
background: #FFFFFF; float: left;
border-radius: 4px; background: #ffffff;
display: inline-block; border-radius: 4px;
margin-left: 15px; }
} .footer-right-top {
.footer-right-top-text{ width: 25%;
font: 400 16px Alibaba PuHuiTi; height: 276px;
color: #000000; background: #ffffff;
line-height: 5px; border-radius: 4px;
display:inline-block; display: inline-block;
margin:30px 0 0 24px; margin-left: 15px;
} }
.footer-right-top-item{ .footer-right-top-text {
width: 88%; font: 400 16px Alibaba PuHuiTi;
display: flex; color: #000000;
justify-content: space-between; line-height: 5px;
align-items: center; display: inline-block;
flex-wrap: wrap; margin: 30px 0 0 24px;
margin: 24px auto; }
} .footer-right-top-item {
.footer-right-top-img{ width: 88%;
cursor: pointer; display: flex;
width: 177px; justify-content: space-between;
height: 81px; align-items: center;
border: 1px dotted black; flex-wrap: wrap;
} margin: 24px auto;
.footer-top-one{ }
background-image: url(../assets/image/background-item1.png); .footer-right-top-img {
} cursor: pointer;
.footer-top-two{ width: 177px;
background-image: url(../assets/image/background-item2.png); height: 81px;
} border: 1px dotted black;
.footer-top-thr{ }
background-image: url(../assets/image/background-item3.png); .footer-top-one {
} background-image: url(../assets/image/background-item1.png);
.footer-right-top-img span{ }
display: inline-block; .footer-top-two {
font: 400 14px/2px Microsoft YaHei; background-image: url(../assets/image/background-item2.png);
color: #000000; }
margin: 20px 0 0 23px; .footer-top-thr {
} background-image: url(../assets/image/background-item3.png);
.footer-right-top-img p{ }
font: 400 14px/2px FZZhengHeiS-B-GB; .footer-right-top-img span {
color: #C7CAD7; display: inline-block;
margin: 14px 0 0px 23px; font: 400 14px/2px Microsoft YaHei;
} color: #000000;
.footer-right-bot{ margin: 20px 0 0 23px;
width: 25%; }
margin-top: 20px; .footer-right-top-img p {
display: inline-block; font: 400 14px/2px FZZhengHeiS-B-GB;
margin-left: 15px; color: #c7cad7;
} margin: 14px 0 0px 23px;
.foot-table-img{ }
position: absolute; .footer-right-bot {
vertical-align: middle; width: 25%;
left: 36%; margin-top: 20px;
top: 14%; display: inline-block;
} margin-left: 15px;
.foot-table-imgone{ }
position: absolute; .foot-table-img {
vertical-align: middle; position: absolute;
left: 41%; vertical-align: middle;
top: 14%; left: 36%;
} top: 14%;
.foot-table{ }
position: relative; .foot-table-imgone {
} position: absolute;
.dia-text{ vertical-align: middle;
text-align: center; left: 41%;
font: 600 24px FZZhengHeiS-B-GB; top: 14%;
color: #000000; }
} .foot-table {
.foot-index{ position: relative;
margin: auto; }
width: 48px; .dia-text {
height: 19px; text-align: center;
background: #FEEEE5; font: 600 24px FZZhengHeiS-B-GB;
border-radius: 10px; color: #000000;
} }
.foot-indexone{ .foot-index {
margin: auto; margin: auto;
width: 48px; width: 48px;
height: 19px; height: 19px;
background: #F5F7FA; background: #feeee5;
border-radius: 10px; border-radius: 10px;
} }
ul, li { .foot-indexone {
padding: 0; margin: auto;
margin: 0; width: 48px;
list-style: none height: 19px;
} background: #f5f7fa;
.dashboard-editor-container { border-radius: 10px;
background-color: #F1F4FA; }
position: relative; ul,
height: calc(100%); li {
overflow-y:scroll ; padding: 0;
overflow-x:hidden ; margin: 0;
} list-style: none;
}
.dashboard-editor-container {
background-color: #f1f4fa;
position: relative;
height: calc(100%);
overflow-y: scroll;
overflow-x: hidden;
}
</style> </style>
src/views/system/order/index.vue
浏览文件 @ a3ef37c6
...@@ -605,9 +605,9 @@ ...@@ -605,9 +605,9 @@
seller_id: this.sellerId, seller_id: this.sellerId,
status: this.goodsStatus, status: this.goodsStatus,
} }
if(this.$route.query.timeout==24){ // if(this.$route.query.timeout==24){
params.is_time_out=true // params.is_time_out=true
} // }
if(this.form.order_sn != '') { if(this.form.order_sn != '') {
params['order_sn'] = this.form.order_sn params['order_sn'] = this.form.order_sn
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论