This commit is contained in:
lzh
2023-02-23 09:02:50 +08:00
parent e3c1b76ffe
commit 6545724584
18 changed files with 475 additions and 259 deletions

View File

@@ -0,0 +1,205 @@
<template>
<section class="data_section" ref="data_section">
<a :href="github" target="_blank">
<el-row :gutter="20">
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="order" class="total-icon">
</svg-icon>
<div class="total-title">今日下单</div>
<div class="total-value">123</div>
</div>
</el-col>
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="total-today" class="total-icon">
</svg-icon>
<div class="total-title">今日销售总额</div>
<div class="total-value">456</div>
</div>
</el-col>
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="total-yesterday" class="total-icon">
</svg-icon>
<div class="total-title">昨日销售总额</div>
<div class="total-value">111</div>
</div>
</el-col>
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="total-week" class="total-icon">
</svg-icon>
<div class="total-title">近7天销售总额</div>
<div class="total-value">222</div>
</div>
</el-col>
</el-row>
</a>
<el-row :gutter="10" class="row_list order_list">
<el-col :span="7">
<log-list></log-list>
</el-col>
<el-col :span="17">
<bar-chart type="barChart"></bar-chart>
</el-col>
</el-row>
<el-row :gutter="10" class="row_list order_list">
<el-col :span="7">
<pie-chart type="ordertype"></pie-chart>
</el-col>
<el-col :span="10">
<line-chart></line-chart>
</el-col>
<el-col :span="7">
<radar-chart></radar-chart>
</el-col>
</el-row>
<el-row :gutter="10" class="row_list">
<el-col :span="11">
<sales-table></sales-table>
</el-col>
<el-col :span="7">
<comment-list></comment-list>
</el-col>
<el-col :span="6">
<card-list></card-list>
</el-col>
</el-row>
</section>
</template>
<script>
import echarts from 'echarts'
import salesTable from "./components/salesTable"; // 销售数据表格
import commentList from "./components/commentList"; // 用户评论列表
import cardList from "./components/cardList"; // card列表
import logList from "./components/logList"; // 日志列表
import barChart from '@/components/echarts/barChart' // 用户投资类型 柱状图
import pieChart from '@/components/echarts/pieChart' // 用户投资类型 饼状图
import radarChart from '@/components/echarts/radarChart' // 用户投资类型 雷达图
import lineChart from '@/components/echarts/lineChart' // 用户投资类型 折线图
import { github } from "@/utils/env";
export default {
data(){
return {
github:github
}
},
components: {
salesTable,
commentList,
cardList,
logList,
barChart,
pieChart,
radarChart,
lineChart
},
created(){
},
mounted(){
},
methods: {
}
}
</script>
<style lang="less" scoped>
.total-frame {
border: 1px solid #DCDFE6;
padding: 20px;
height: 100px;
}
.total-icon {
913656
color: #409EFF;
width: 60px;
height: 60px;
}
.total-title {
position: relative;
font-size: 16px;
color: #909399;
left: 70px;
top: -35px;
}
.total-value {
position: relative;
font-size: 18px;
color: #606266;
left: 70px;
top: -25px;
}
.data_section{
margin: 20px;
border-radius: 2px;
.row_list{
margin-bottom: 20px;
.row_base{
padding: 10px;
box-sizing: border-box;
background: #fff;
border-radius: 6px;
height: 120px;
}
}
.order_list{
.orderArea{
width: 100%;
height: 300px;
background: #fff !important;
border-radius: 6px;
box-sizing: border-box;
padding: 10px;
padding-top: 40px;
overflow: hidden;
}
.orderbarArea{
height: 370px;
}
}
.data_list{
text-align: center;
font-size: 14px;
border-radius: 6px;
padding: 10px;
color:#fff;
height: 80px;
.leftItem{
align-items: start;
justify-content: space-between;
text-align: left;
}
.rightItem{
width:62px;
align-items: center;
justify-content: center;
.svg-icon{
font-size: 30px;
}
}
.number{
font-size: 22px;
font-weight: bold;
.perTitle{
font-size: 13px;
margin-left: 5px;
}
}
}
.pay{
.leftItem{
justify-content: space-around;
}
}
}
</style>

View File

@@ -1,205 +1,143 @@
<template>
<section class="data_section" ref="data_section">
<a :href="github" target="_blank">
<el-row :gutter="20">
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="order" class="total-icon">
</svg-icon>
<div class="total-title">今日下单</div>
<div class="total-value">123</div>
</div>
</el-col>
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="total-today" class="total-icon">
</svg-icon>
<div class="total-title">日销售总额</div>
<div class="total-value">456</div>
</div>
</el-col>
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="total-yesterday" class="total-icon">
</svg-icon>
<div class="total-title">昨日销售总额</div>
<div class="total-value">111</div>
</div>
</el-col>
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="total-week" class="total-icon">
</svg-icon>
<div class="total-title">近7天销售总额</div>
<div class="total-value">222</div>
</div>
</el-col>
</el-row>
</a>
<el-row :gutter="10" class="row_list order_list">
<el-col :span="7">
<log-list></log-list>
</el-col>
<el-col :span="17">
<bar-chart type="barChart"></bar-chart>
</el-col>
</el-row>
<el-row :gutter="10" class="row_list order_list">
<el-col :span="7">
<pie-chart type="ordertype"></pie-chart>
</el-col>
<el-col :span="10">
<line-chart></line-chart>
</el-col>
<el-col :span="7">
<radar-chart></radar-chart>
</el-col>
</el-row>
<el-row :gutter="10" class="row_list">
<el-col :span="11">
<sales-table></sales-table>
</el-col>
<el-col :span="7">
<comment-list></comment-list>
</el-col>
<el-col :span="6">
<card-list></card-list>
</el-col>
</el-row>
</section>
<section class="data_section" ref="data_section">
<el-row :gutter="20">
<el-col :span="6">
<div class="total-frame">
<svg-icon icon-class="order" class="total-icon"></svg-icon>
<div class="total-title">今日下单</div>
<div class="total-value">123</div>
</div>
<div class="total-frame">
<svg-icon icon-class="total-today" class="total-icon"></svg-icon>
<div class="total-title">今日销售总额</div>
<div class="total-value">456</div>
</div>
<div class="total-frame">
<svg-icon icon-class="total-yesterday" class="total-icon"></svg-icon>
<div class="total-title">日销售总额</div>
<div class="total-value">111</div>
</div>
<div class="total-frame">
<svg-icon icon-class="total-week" class="total-icon"></svg-icon>
<div class="total-title">近7天销售总额</div>
<div class="total-value">222</div>
</div>
</el-col>
<el-col :span="18" class="row_list order_list"><bar-chart type="barChart"></bar-chart></el-col>
</el-row>
</section>
</template>
<script>
import echarts from 'echarts'
import salesTable from "./components/salesTable"; // 销售数据表格
import commentList from "./components/commentList"; // 用户评论列表
import cardList from "./components/cardList"; // card列表
import logList from "./components/logList"; // 日志列表
import barChart from '@/components/echarts/barChart' // 用户投资类型 柱状图
import pieChart from '@/components/echarts/pieChart' // 用户投资类型 饼状图
import radarChart from '@/components/echarts/radarChart' // 用户投资类型 雷达图
import lineChart from '@/components/echarts/lineChart' // 用户投资类型 折线图
import { github } from "@/utils/env";
import echarts from 'echarts'
import barChart from '@/components/echarts/barChart' // 用户投资类型 柱状图
export default {
data(){
return {
github:github
}
},
components: {
salesTable,
commentList,
cardList,
logList,
barChart,
pieChart,
radarChart,
lineChart
},
created(){
},
mounted(){
},
methods: {
}
}
export default {
data() {
return {
name: ''
}
},
components: {
barChart
},
created() {},
mounted() {},
methods: {}
}
</script>
<style lang="less" scoped>
.total-frame {
border: 1px solid #DCDFE6;
padding: 20px;
height: 100px;
}
.total-frame {
border: 1px solid #dcdfe6;
padding: 20px;
height: 100px;
margin-bottom: 5px;
}
.total-icon {
913656
color: #409EFF;
width: 60px;
height: 60px;
}
.total-icon {
913656color: #409eff;
width: 60px;
height: 60px;
}
.total-title {
position: relative;
font-size: 16px;
color: #909399;
left: 70px;
top: -35px;
}
.total-title {
position: relative;
font-size: 16px;
color: #909399;
left: 70px;
top: -35px;
}
.total-value {
position: relative;
font-size: 18px;
color: #606266;
left: 70px;
top: -25px;
}
.data_section{
margin: 20px;
border-radius: 2px;
.row_list{
margin-bottom: 20px;
.row_base{
padding: 10px;
box-sizing: border-box;
background: #fff;
border-radius: 6px;
height: 120px;
}
}
.order_list{
.orderArea{
width: 100%;
height: 300px;
background: #fff !important;
border-radius: 6px;
box-sizing: border-box;
padding: 10px;
padding-top: 40px;
overflow: hidden;
}
.orderbarArea{
height: 370px;
}
}
.data_list{
text-align: center;
font-size: 14px;
border-radius: 6px;
padding: 10px;
color:#fff;
height: 80px;
.leftItem{
align-items: start;
justify-content: space-between;
text-align: left;
}
.rightItem{
width:62px;
align-items: center;
justify-content: center;
.svg-icon{
font-size: 30px;
}
}
.number{
font-size: 22px;
font-weight: bold;
.perTitle{
font-size: 13px;
margin-left: 5px;
}
}
}
.pay{
.leftItem{
justify-content: space-around;
}
}
}
.total-value {
position: relative;
font-size: 18px;
color: #606266;
left: 70px;
top: -25px;
}
.data_section {
margin: 20px;
border-radius: 2px;
.row_list {
margin-bottom: 20px;
.row_base {
padding: 10px;
box-sizing: border-box;
background: #fff;
border-radius: 6px;
height: 120px;
}
}
.order_list {
.orderArea {
width: 100%;
height: 300px;
background: #fff !important;
border-radius: 6px;
box-sizing: border-box;
padding: 10px;
padding-top: 40px;
overflow: hidden;
}
.orderbarArea {
height: 370px;
}
}
.data_list {
text-align: center;
font-size: 14px;
border-radius: 6px;
padding: 10px;
color: #fff;
height: 80px;
.leftItem {
align-items: start;
justify-content: space-between;
text-align: left;
}
.rightItem {
width: 62px;
align-items: center;
justify-content: center;
.svg-icon {
font-size: 30px;
}
}
.number {
font-size: 22px;
font-weight: bold;
.perTitle {
font-size: 13px;
margin-left: 5px;
}
}
}
.pay {
.leftItem {
justify-content: space-around;
}
}
}
</style>

View File

@@ -2,8 +2,8 @@
<div>
<el-card class="login-form-layout">
<el-form autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
<div style="text-align: center"><svg-icon icon-class="login-mall" style="width: 56px;height: 56px;color: #409EFF"></svg-icon></div>
<h2 class="login-title color-main">云链管理</h2>
<div style="text-align: center"><img src="../../assets/img/logo.png" width="140px"/></div>
<h2 class="login-title color-main">云链管理</h2>
<el-form-item prop="username">
<el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入用户名">
<span slot="prefix"><svg-icon icon-class="user" class="color-main"></svg-icon></span>
@@ -131,7 +131,7 @@ export default {
position: absolute;
left: 0;
right: 0;
width: 360px;
width: 560px;
margin: 140px auto;
border-top: 10px solid #409eff;
}

View File

@@ -13,7 +13,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="商品规格:">
<!-- <el-form-item label="商品规格:">
<el-card shadow="never" class="cardBg">
<div v-for="(productAttr,idx) in selectProductAttr">
{{productAttr.name}}
@@ -106,7 +106,7 @@
style="margin-top: 20px"
@click="handleSyncProductSkuPrice">同步价格
</el-button>
</el-form-item>
</el-form-item> -->
<!--<el-form-item label="属性图片:" v-if="hasAttrPic">
<el-card shadow="never" class="cardBg">
<div v-for="(item,index) in selectProductAttrPics">
@@ -116,7 +116,7 @@
</div>
</el-card>
</el-form-item>-->
<el-form-item label="商品参数:">
<!-- <el-form-item label="商品参数:">
<el-card shadow="never" class="cardBg">
<div v-for="(item,index) in selectProductParam" :class="{littleMarginTop:index!==0}">
<div class="paramInputLabel">{{item.name}}:</div>
@@ -131,7 +131,7 @@
<el-input v-else class="paramInput" v-model="selectProductParam[index].value"></el-input>
</div>
</el-card>
</el-form-item>
</el-form-item> -->
<el-form-item label="商品相册:">
<multi-upload v-model="selectProductPics"></multi-upload>
</el-form-item>
@@ -146,8 +146,9 @@
</el-tabs>
</el-form-item>
<el-form-item style="text-align: center">
<el-button size="medium" @click="handlePrev">上一步填写商品促销</el-button>
<el-button type="primary" size="medium" @click="handleNext">下一步选择商品关联</el-button>
<el-button size="medium" @click="handlePrev">上一步</el-button>
<!-- <el-button type="primary" size="medium" @click="handleNext">下一步选择商品关联</el-button> -->
<el-button type="primary" size="medium" @click="handleFinishCommit">保存商品</el-button>
</el-form-item>
</el-form>
</div>
@@ -573,7 +574,10 @@
this.mergeProductAttrValue();
this.mergeProductAttrPics();
this.$emit('nextStep')
}
},
handleFinishCommit(){
this.$emit('finishCommit',this.isEdit);
}
}
}
</script>

View File

@@ -1,10 +1,9 @@
<template> 
<el-card class="form-container" shadow="never">
<el-steps :active="active" finish-status="success" align-center>
<el-step title="填写商品信息"></el-step>
<el-step title="填写商品促销"></el-step>
<el-step title="填写商品属性"></el-step>
<el-step title="选择商品关联"></el-step>
<el-step title="商品息信"></el-step>
<el-step title="商品展示"></el-step>
<el-step title="图片及详情"></el-step>
</el-steps>
<product-info-detail
v-show="showStatus[0]"
@@ -23,6 +22,7 @@
v-show="showStatus[2]"
v-model="productParam"
:is-edit="isEdit"
@finishCommit="finishCommit"
@nextStep="nextStep"
@prevStep="prevStep">
</product-attr-detail>

View File

@@ -27,7 +27,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="店内分类:" prop="storeClassId">
<!-- <el-form-item label="店内分类:" prop="storeClassId">
<el-select
v-model="value.storeClassId"
@@ -46,7 +46,7 @@
v-model="selectAreaValue"
:options="areaOptions">
</el-cascader>
</el-form-item>
</el-form-item> -->
<el-form-item label="标签" prop="tags">
<el-select
v-model="value.tagList"
@@ -102,7 +102,7 @@
<el-input v-model="value.weight" style="width: 300px"></el-input>
<span style="margin-left: 20px">千克</span>
</el-form-item>
<el-form-item label="固定运费:">
<!-- <el-form-item label="固定运费:">
<el-input v-model="value.transfee" style="width: 300px"></el-input>
<span style="margin-left: 20px">优先于运费模版</span>
</el-form-item>
@@ -116,7 +116,7 @@
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-select> -->
</el-form-item>
@@ -124,7 +124,7 @@
<el-input v-model="value.sort"></el-input>
</el-form-item>
<el-form-item style="text-align: center">
<el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步填写商品促销</el-button>
<el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步</el-button>
</el-form-item>
</el-form>
</div>

View File

@@ -1,7 +1,7 @@
<template>
<div style="margin-top: 50px">
<el-form :model="value" ref="productSaleForm" label-width="120px" style="width: 600px" size="small">
<el-form-item label="赠送积分:">
<!-- <el-form-item label="赠送积分:">
<el-input v-model="value.giftPoint"></el-input>
</el-form-item>
<el-form-item label="赠送成长值:">
@@ -16,7 +16,7 @@
:active-value="1"
:inactive-value="0">
</el-switch>
</el-form-item>
</el-form-item> -->
<el-form-item label="商品上架:">
<el-switch
v-model="value.publishStatus"
@@ -24,7 +24,7 @@
:inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="分销商品:">
<!-- <el-form-item label="分销商品:">
<el-switch
v-model="value.isFenxiao"
:active-value="1"
@@ -37,7 +37,7 @@
:active-value="1"
:inactive-value="0">
</el-switch>
</el-form-item>
</el-form-item> -->
<el-form-item label="商品推荐:">
<span style="margin-right: 10px">新品</span>
<el-switch
@@ -71,7 +71,7 @@
<el-form-item label="商品备注:">
<el-input v-model="value.note" type="textarea" :autoSize="true"></el-input>
</el-form-item>
<el-form-item label="选择优惠方式:">
<!-- <el-form-item label="选择优惠方式:">
<el-radio-group v-model="value.promotionType" size="small">
<el-radio-button :label="0">无优惠</el-radio-button>
<el-radio-button :label="1">特惠促销</el-radio-button>
@@ -79,7 +79,7 @@
<el-radio-button :label="3">阶梯价格</el-radio-button>
<el-radio-button :label="4">满减价格</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<el-form-item v-show="value.promotionType===1">
<div>
开始时间
@@ -172,8 +172,8 @@
</el-table>
</el-form-item>
<el-form-item style="text-align: center">
<el-button size="medium" @click="handlePrev">上一步填写商品信息</el-button>
<el-button type="primary" size="medium" @click="handleNext">下一步填写商品属性</el-button>
<el-button size="medium" @click="handlePrev">上一步</el-button>
<el-button type="primary" size="medium" @click="handleNext">下一步</el-button>
</el-form-item>
</el-form>
</div>

View File

@@ -435,19 +435,7 @@
value: 4,
label: '回收站'
}],
btnList: [{
type: 'primary',
size: 'small',
icon: 'add',
btnKey: 'toAdd',
btnLabel: '新增'
}, {
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
btnList: [],
queryParams: {
current: 1,
size: 10,