other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yunuo970428
2023-03-14 10:17:14 +08:00
parent cc5fa3e7aa 59cc919edd
commit 64276d879b
240 changed files with 20071 additions and 11235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mallplusui-web-admin/src/api/ums/sysMessage.js Normal file
View File

@@ -0,0 +1,23 @@
import request from '@/utils/request'
export function sendToOne(data) {
return request({
url:'/ums/sysMessage/sendToOne',
method:'post',
data:data
})
}
export function sendToAll(data) {
return request({
url:'/ums/sysMessage/sendToAll',
method:'post',
data:data
})
}
export function sendToSelect(data) {
return request({
url:'/ums/sysMessage/sendToSelect',
method:'post',
data:data
})
}

BIN
mallplusui-web-admin/src/assets/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 54 KiB

2
mallplusui-web-admin/src/icons/svg/cross.svg Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654485972937" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33086" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M561.17013333 509.06026667L858.02666667 213.73973333c14.03733333-13.968 14.1088-36.60053333 0.1408-50.63786666-13.99893333-14.06826667-36.592-14.10773333-50.62933334-0.1408L510.6048 458.31466667 216.256 163.06986667c-13.9328-13.96693333-36.59733333-14.03733333-50.63466667-0.07146667-14.00426667 13.96586667-14.03733333 36.63146667-0.0704 50.6688l294.27733334 295.1744-296.71466667 295.14026667c-14.0384 13.968-14.1088 36.59733333-0.14293333 50.63786666a35.7216 35.7216 0 0 0 25.3856 10.56c9.13066667 0 18.26666667-3.4688 25.25013333-10.4192l296.78613333-295.2128L807.4304 857.48266667c6.9824 7.02186667 16.15253333 10.53013333 25.35253333 10.53013333a35.72906667 35.72906667 0 0 0 25.28213334-10.45973333c13.99893333-13.96586667 14.03733333-36.592 0.07146666-50.62933334L561.17013333 509.06026667z m0 0" p-id="33087" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

4370
mallplusui-web-admin/src/router/index.js
View File

File diff suppressed because it is too large Load Diff

73
mallplusui-web-admin/src/styles/index.scss
View File

@@ -55,21 +55,88 @@ a:hover {
}
.app-container {
padding: 20px;
margin: 0 0 25px 0;
background-color: #fff;
}
//搜索栏样式
.filter-container {
}
// 搜索的
.webtop {
// position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000;
background-color: #fff;
display: flex !important;
flex-direction: row;
justify-content: space-between !important;
align-items: center;
margin-bottom: 0px !important;
font-size: 20px;
}
.tab-header {
background-color: #edf1f7;
padding: 10px 20px;
}
// 设置了页面头部的内边距和背景色
.tab-header {
font-size: 20px;
font-weight: bold;
}
// 设置了搜索条件里的样式
.search {
.tab-header {
.el-form-item {
margin-right: 16px;
.el-form-item__label {
font-size: 16px;
font-weight: 500;
}
}
}
}
.search .btn {
padding: 5px 0;
border: 1px solid #e0e3eb;
text-align: center;
margin-bottom: 5px;
}
.searchcon{margin: 0px 0 10px 0;}
.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;}
// 隐藏显示按钮
.main-content {
.searchcon {
.searchbtn {
margin: 5px 0;
border: #2cab69 1px solid;
color: #2cab69;
}
}}
// 页面上的button按钮
.app-container {
.el-button--medium {
padding: 10px 14px;
font-size: 16px;
}
.el-button--small {
padding: 8px 12px;
font-size: 14px;
}
.el-button--mini {
padding: 7px 10px;
font-size: 12px;
}
}
//操作栏样式
.operate-container {
margin-top: 20px;
// margin-top: 20px;
}
.operate-container .btn-add {
float: right;
margin-left: 20px;
}
//表格栏样式

16
mallplusui-web-admin/src/views/build/community/index.vue
View File

@@ -86,26 +86,26 @@
<el-table-column label="操作" width="250" align="center">
<template slot-scope="scope">
<el-button
<!-- <el-button
size="mini"
@click="getAttrList(scope.$index, scope.row)">添加楼
</el-button>
<el-button
</el-button> -->
<!-- <el-button
size="mini"
@click="getAttrList1(scope.$index, scope.row)">添加缴费规则
</el-button>
<el-button
</el-button> -->
<!-- <el-button
size="mini"
@click="getAttrList2(scope.$index, scope.row)">添加缴费记录
</el-button>
<el-button
</el-button> -->
<!-- <el-button
size="mini"
@click="getAttrList3(scope.$index, scope.row)">添加通知
</el-button>
<el-button
size="mini"
@click="getAttrList4(scope.$index, scope.row)">添加轮播图
</el-button>
</el-button> -->
<el-button
size="mini"
@click="handleUpdate(scope.$index, scope.row)">编辑

2
mallplusui-web-admin/src/views/build/wuyeCompany/index.vue
View File

@@ -70,7 +70,7 @@
<template slot-scope="scope">
<el-button
size="mini"
@click="handleCommunity(scope.$index, scope.row)">绑定小区
@click="handleCommunity(scope.$index, scope.row)">添加取货点
</el-button>
<el-button
size="mini"

29
mallplusui-web-admin/src/views/cms/subject/components/SubjectDetail.vue
View File

@@ -2,7 +2,7 @@
<el-card class="form-container" shadow="never">
<el-form :model="subject" :rules="rules" ref="subjectFrom" label-width="150px">
<el-form-item label="分类：" prop="categoryId">
<!-- <el-form-item label="分类：" prop="categoryId">
<el-select
v-model="subject.categoryId"
@change="handlecateChange"
@@ -14,33 +14,32 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="标题：" prop="title">
<el-input v-model="subject.title"></el-input>
</el-form-item>
<el-form-item label="专题主图：" prop="pic">
<el-form-item label="主图：" prop="pic">
<single-upload v-model="subject.pic"></single-upload>
</el-form-item>
<el-form-item label="推荐：" prop="recommendStatus">
<!-- <el-form-item label="推荐：" prop="recommendStatus">
<el-radio-group v-model="subject.recommendStatus">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
-->
<el-form-item label="画册：">
<multi-upload v-model="selectProductPics"></multi-upload>
</el-form-item>
<el-form-item label="是否显示：">
<!-- <el-form-item label="是否显示：">
<el-radio-group v-model="subject.showStatus">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<el-form-item label="描述：" prop="description">
<el-input
:autoSize="true"
@@ -51,9 +50,9 @@
<el-form-item label="内容：" prop="content">
<el-tabs v-model="activeHtmlName" type="card">
<el-tab-pane label="电脑端详情" name="pc">
<!-- <el-tab-pane label="电脑端详情" name="pc">
<tinymce :width="595" :height="300" v-model="subject.content"></tinymce>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="移动端详情" name="mobile">
<tinymce :width="595" :height="300" v-model="subject.content"></tinymce>
</el-tab-pane>
@@ -73,7 +72,9 @@
import Tinymce from '@/components/Tinymce'
import MultiUpload from '@/components/Upload/multiUpload'
const defaultSubject={
name: ''
title: '',
categoryId:38,
categoryName:'农机租赁'
};
export default {
name: 'SubjectDetail',
@@ -90,7 +91,7 @@
categoryName:'',
albumPics:null,
cateOptions:null,
activeHtmlName: 'pc',
activeHtmlName: 'mobile',
rules: {
name: [
{required: true, message: '请输入品牌名称', trigger: 'blur'},
@@ -193,6 +194,8 @@
this.$router.back();
});
} else {
this.subject.categoryId=38
this.subject.categoryName='农机租赁'
createSubject(this.subject).then(response => {
this.$refs[formName].resetFields();
this.subject = Object.assign({},defaultSubject);

17
mallplusui-web-admin/src/views/cms/subject/index.vue
View File

@@ -15,7 +15,7 @@
<div style="margin-top: 15px">
<el-form :inline="true" :model="listQuery" size="small" label-width="140px">
<el-form-item label="输入搜索：">
<el-input style="width: 203px" v-model="listQuery.keyword" placeholder="品牌名称/关键字"></el-input>
<el-input style="width: 203px" v-model="listQuery.title" placeholder="标题/关键字"></el-input>
</el-form-item>
</el-form>
</div>
@@ -42,19 +42,19 @@
<el-table-column label="编号" align="center">
<template slot-scope="scope">{{scope.row.id}}</template>
</el-table-column>
<el-table-column label="分类" align="center">
<!-- <el-table-column label="分类" align="center">
<template slot-scope="scope">{{scope.row.categoryId}}</template>
</el-table-column>
<el-table-column label="专题分类名称" align="center">
<template slot-scope="scope">{{scope.row.categoryName}}</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="标题" align="center">
<template slot-scope="scope">{{scope.row.title}}</template>
</el-table-column>
<el-table-column label="专题主图" align="center">
<el-table-column label="主图" align="center">
<template slot-scope="scope"><img style="height: 80px" :src="scope.row.pic"></template>
</el-table-column>
<el-table-column label="关联产品数量" align="center">
<!-- <el-table-column label="关联产品数量" align="center">
<template slot-scope="scope">{{scope.row.productCount}}</template>
</el-table-column>
<el-table-column label="推荐" align="center">
@@ -67,7 +67,6 @@
</el-switch>
</template>
</el-table-column>
<el-table-column label="收藏量" align="center">
<template slot-scope="scope">{{scope.row.collectCount}}</template>
</el-table-column>
@@ -77,7 +76,6 @@
<el-table-column label="评论量" align="center">
<template slot-scope="scope">{{scope.row.commentCount}}</template>
</el-table-column>
<el-table-column label="显示状态" align="center">
<template slot-scope="scope">
<el-switch
@@ -88,11 +86,9 @@
</el-switch>
</template>
</el-table-column>
<el-table-column label="转发数" align="center">
<template slot-scope="scope">{{scope.row.forwardCount}}</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="创建时间" align="center">
<template slot-scope="scope">{{scope.row.createTime|formatCreateTime}}</template>
</el-table-column>
@@ -150,6 +146,7 @@
operateType: null,
listQuery: {
keyword: null,
title: null,
pageNum: 1,
pageSize: 10
},

205
mallplusui-web-admin/src/views/home/index-liu.vue Normal file
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>

331
mallplusui-web-admin/src/views/home/index.vue
View File

@@ -1,50 +1,42 @@
<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">
<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>
</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>
<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> -->
<el-col><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>
@@ -54,8 +46,8 @@
<el-col :span="7">
<radar-chart></radar-chart>
</el-col>
</el-row>
<el-row :gutter="10" class="row_list">
</el-row> -->
<!-- <el-row :gutter="10" class="row_list">
<el-col :span="11">
<sales-table></sales-table>
</el-col>
@@ -65,141 +57,134 @@
<el-col :span="6">
<card-list></card-list>
</el-col>
</el-row>
</section>
</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 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: {
}
}
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-frame {
border: 1px solid #dcdfe6;
padding: 20px;
height: 100px;
}
.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>

6
mallplusui-web-admin/src/views/login/index.vue
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;
}

13
mallplusui-web-admin/src/views/oms/order/deliverOrderList.vue
View File

@@ -6,20 +6,20 @@
</el-card>
<div class="table-container">
<el-table ref="deliverOrderTable"
style="width: 100%;"
style="margin-left: 20px;width: 95%;"
:data="list" border>
<el-table-column label="订单编号" width="180" align="center">
<el-table-column label="订单编号" width="200" align="center">
<template slot-scope="scope">{{scope.row.orderSn}}</template>
</el-table-column>
<el-table-column label="收货人" width="180" align="center">
<el-table-column label="收货人" width="120" align="center">
<template slot-scope="scope">{{scope.row.receiverName}}</template>
</el-table-column>
<el-table-column label="手机号码" width="160" align="center">
<template slot-scope="scope">{{scope.row.receiverPhone}}</template>
</el-table-column>
<el-table-column label="邮政编码" width="160" align="center">
<!-- <el-table-column label="邮政编码" width="160" align="center">
<template slot-scope="scope">{{scope.row.receiverPostCode}}</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="收货地址" align="center">
<template slot-scope="scope">{{scope.row.address}}</template>
</el-table-column>
@@ -36,7 +36,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="物流单号" width="180" align="center">
<el-table-column label="物流单号" width="200" align="center">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.deliverySn"></el-input>
</template>
@@ -62,6 +62,7 @@
},
created(){
this.list= this.$route.query.list;
console.log("list", this.list)
},
methods:{
cancel(){

1230
mallplusui-web-admin/src/views/oms/order/index1.vue
View File

File diff suppressed because it is too large Load Diff

1491
mallplusui-web-admin/src/views/oms/order/orderDetail.vue
View File

File diff suppressed because it is too large Load Diff

29
mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
View File

@@ -1,7 +1,7 @@
<template>
<div style="margin-top: 50px">
<el-form :model="value" ref="productAttrForm" label-width="150px" style="width: 720px" size="small">
<el-form-item label="属性类型：">
<el-form-item label="商品类型：">
<el-select v-model="value.productAttributeCategoryId"
placeholder="请选择属性类型"
@change="handleProductAttrChange">
@@ -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,23 +131,25 @@
<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>
<el-form-item label="规格参数：">
<el-tabs v-model="activeHtmlName" type="card">
<el-tab-pane label="电脑端详情" name="pc">
<!-- <el-tab-pane label="电脑端详情" name="pc">
<tinymce :width="595" :height="300" v-model="value.detailHtml"></tinymce>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="移动端详情" name="mobile">
<tinymce :width="595" :height="300" v-model="value.detailMobileHtml"></tinymce>
<!-- <tinymce :width="595" :height="300" v-model="value.detailMobileHtml"></tinymce> -->
<tinymce :width="595" :height="300" v-model="value.detailHtml"></tinymce>
</el-tab-pane>
</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>
@@ -185,7 +187,7 @@
//可手动添加的商品属性
addProductAttrValue: '',
//商品富文本详情激活类型
activeHtmlName: 'pc'
activeHtmlName: 'mobile'
}
},
computed: {
@@ -573,7 +575,10 @@
this.mergeProductAttrValue();
this.mergeProductAttrPics();
this.$emit('nextStep')
}
},
handleFinishCommit(){
this.$emit('finishCommit',this.isEdit);
}
}
}
</script>

19
mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue
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,23 +22,24 @@
v-show="showStatus[2]"
v-model="productParam"
:is-edit="isEdit"
@finishCommit="finishCommit"
@nextStep="nextStep"
@prevStep="prevStep">
</product-attr-detail>
<product-relation-detail
<!-- <product-relation-detail
v-show="showStatus[3]"
v-model="productParam"
:is-edit="isEdit"
@prevStep="prevStep"
@finishCommit="finishCommit">
</product-relation-detail>
</product-relation-detail> -->
</el-card>
</template>
<script>
import ProductInfoDetail from './ProductInfoDetail';
import ProductSaleDetail from './ProductSaleDetail';
import ProductAttrDetail from './ProductAttrDetail';
import ProductRelationDetail from './ProductRelationDetail';
// import ProductRelationDetail from './ProductRelationDetail';
import {createProduct,getProduct,updateProduct} from '@/api/product';
const defaultProductParam = {
@@ -113,7 +113,9 @@
};
export default {
name: 'ProductDetail',
components: {ProductInfoDetail, ProductSaleDetail, ProductAttrDetail, ProductRelationDetail},
components: {ProductInfoDetail, ProductSaleDetail, ProductAttrDetail
// , ProductRelationDetail
},
props: {
isEdit: {
type: Boolean,
@@ -131,6 +133,7 @@
if(this.isEdit){
getProduct(this.$route.query.id).then(response=>{
this.productParam=response.data;
console.log('kkkkk',this.productParam)
});
}
},

39
mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
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"
@@ -78,7 +78,7 @@
<el-form-item label="商品售价：">
<el-input v-model="value.price"></el-input>
</el-form-item>
<el-form-item label="市场价：">
<el-form-item label="惠农价：">
<el-input v-model="value.originalPrice"></el-input>
</el-form-item>
<el-form-item label="商品库存：">
@@ -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>
@@ -117,14 +117,13 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item label="排序">
<!-- <el-form-item label="排序">
<el-input v-model="value.sort"></el-input>
</el-form-item>
</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>
@@ -167,6 +166,9 @@ let userRoles = []
unitOptions:[{
id: "个",
name: "个",
},{
id: "袋",
name: "袋",
},
{
id: "箱",
@@ -237,7 +239,6 @@ let userRoles = []
this.handleEditCreated();
},
selectProductCateValue: function (newValue) {
if (newValue != null) {
this.value.productCategoryId = newValue[newValue.length-1 >0?newValue.length-1:0];
this.value.productCategoryName= this.getCateNameById(this.value.productCategoryId);
@@ -245,7 +246,6 @@ let userRoles = []
this.value.productCategoryId = null;
this.value.productCategoryName=null;
}
},
selectAreaValue: function (newValue) {
@@ -288,11 +288,17 @@ let userRoles = []
},
//处理编辑逻辑
handleEditCreated(){
console.log(this.value)
if(this.value.productCategoryId!=null){
this.selectProductCateValue.push(this.value.cateParentId);
this.selectProductCateValue.push(this.value.productCategoryId);
let seleval = []
seleval.push(this.value.cateParentId);
seleval.push(this.value.productCategoryId);
this.selectProductCateValue = seleval
// this.selectProductCateValue.push(this.value.cateParentId);
// this.selectProductCateValue.push(this.value.productCategoryId);
}
console.log(this.selectProductCateValue)
if(this.value.areaId!=null){
getArea(this.value.areaId).then(response => {
this.selectAreaValue.push(response.data.pid);
@@ -334,10 +340,9 @@ let userRoles = []
getCateNameById(id){
let name=null;
for(let i=0;i<this.productCateOptions.length;i++){
for(let j=0;i<this.productCateOptions[i].children.length;j++){
if( this.productCateOptions[i].children[j].value!=undefined && this.productCateOptions[i].children[j].value===id){
for(let j=0;j<this.productCateOptions[i].children.length;j++){
if( this.productCateOptions[i].children[j].value && this.productCateOptions[i].children[j].value!=undefined && this.productCateOptions[i].children[j].value===id){
name=this.productCateOptions[i].children[j].label;
return name;
}

16
mallplusui-web-admin/src/views/pms/product/components/ProductSaleDetail.vue
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>

280
mallplusui-web-admin/src/views/pms/product/index.vue
View File

@@ -1,6 +1,6 @@
<template> 
<div class="app-container">
<button-bar ref="btnbar" view-title="库存信息查询" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="商品列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!-- <el-card class="filter-container" shadow="never">
<div>
@@ -54,33 +54,69 @@
</div>
</el-card> -->
<div class="main-content">
<div class="main-content" style="margin-left: 20px;margin-right: 20px;">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
<el-form-item label="仓库/门店">
<el-input v-model="queryParams.params.orderId" placeholder="" clearable />
</el-form-item>
<el-form-item label="起始日期">
<el-date-picker v-model="queryParams.params.orderStartDate" type="date" clearable
value-format="yyyy-MM-dd" placeholder="选择日期" />
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="queryParams.params.orderEndDate" type="date" clearable
value-format="yyyy-MM-dd" placeholder="选择日期" />
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form :model="listQuery" :inline="true" class="tab-header">
<el-form-item label="输入搜索：">
<el-input style="width: 203px" v-model="listQuery.keyword" placeholder="商品名称"></el-input>
</el-form-item>
<el-form-item label="商品类型：">
<el-select v-model="listQuery.productAttributeCategoryId" placeholder="商品类型" clearable style="width: 160px;">
<el-option v-for="item in productAttributeCategoryOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="商品分类：">
<el-cascader clearable change-on-select v-model="selectProductCateValue"
:options="productCateOptions">
</el-cascader>
</el-form-item>
<el-form-item label="商品品牌：">
<el-select v-model="listQuery.brandId" placeholder="请选择品牌" clearable>
<el-option v-for="item in brandOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="上架状态：">
<el-select v-model="listQuery.publishStatus" placeholder="全部" clearable style="width: 120px;">
<el-option v-for="item in publishStatusOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="审核状态：">
<el-select v-model="listQuery.verifyStatus" placeholder="全部" clearable style="width: 120px;">
<el-option v-for="item in verifyStatusOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否新品：">
<el-select v-model="listQuery.newStatus" placeholder="全部" clearable style="width: 120px;">
<el-option v-for="item in newStatusOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否推荐：">
<el-select v-model="listQuery.recommandStatus" placeholder="全部" clearable style="width: 120px;">
<el-option v-for="item in recommandStatusOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleSearchList()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="handleResetSearch()">重置</el-button>
</div>
</div>
</div>
@@ -99,19 +135,34 @@
<el-tab-pane name="3">
<span slot="label"><i class="el-icon-truck"></i>仓库中</span>
</el-tab-pane>
<el-tab-pane name="4">
<!-- <el-tab-pane name="4">
<span slot="label"><i class="el-icon-truck"></i> 回收站</span>
</el-tab-pane>
<el-tab-pane name="5">
</el-tab-pane> -->
<!-- <el-tab-pane name="5">
<span slot="label"><i class="el-icon-truck"></i>
<el-button class="btn-add" @click="handleAddProduct()" size="mini">
添加商品
</el-button>
</span>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<div class="batch-operate-container">
<el-select size="small" v-model="operateType" placeholder="批量操作">
<el-option v-for="item in operates" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-button style="margin-left: 20px" class="search-button" @click="handleBatchOperate()" type="primary"
size="small">
确定
</el-button>
</div>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
layout="total, sizes,prev, pager, next,jumper" :page-size="listQuery.pageSize"
:page-sizes="[5,10,15]" :current-page.sync="listQuery.pageNum" :total="total">
</el-pagination>
</div>
<div class="table-container">
<el-table ref="productTable" :data="list" style="width: 100%" @selection-change="handleSelectionChange"
v-loading="listLoading" border>
@@ -126,6 +177,7 @@
<template slot-scope="scope">
<p>{{scope.row.name}}</p>
<p>品牌：{{scope.row.brandName}}</p>
<p>类别：{{scope.row.productCategoryName}}</p>
</template>
</el-table-column>
<el-table-column label="价格/货号" width="120" align="center">
@@ -151,7 +203,7 @@
:active-value="1" :inactive-value="0" v-model="scope.row.recommandStatus">
</el-switch>
</p>
<p>分销：
<!-- <p>分销：
<el-switch @change="handleFenxiaoStatusChange(scope.$index, scope.row)"
:active-value="1" :inactive-value="0" v-model="scope.row.isFenxiao">
</el-switch>
@@ -160,17 +212,17 @@
<el-switch @change="handleVipStatusChange(scope.$index, scope.row)" :active-value="1"
:inactive-value="0" v-model="scope.row.isVip">
</el-switch>
</p>
</p> -->
</template>
</el-table-column>
<el-table-column label="排序" width="100" align="center">
<!-- <el-table-column label="排序" width="100" align="center">
<template slot-scope="scope">{{scope.row.sort}}</template>
</el-table-column>
<el-table-column label="SKU库存" width="100" align="center">
</el-table-column> -->
<el-table-column label="库存数" width="100" align="center">
<template slot-scope="scope">
<p>{{scope.row.stock }}</p>
<el-button type="primary" icon="el-icon-edit"
@click="handleShowSkuEditDialog(scope.$index, scope.row)" circle></el-button>
<!-- <el-button type="primary" icon="el-icon-edit"
@click="handleShowSkuEditDialog(scope.$index, scope.row)" circle></el-button> -->
</template>
</el-table-column>
<el-table-column label="销量" width="100" align="center">
@@ -188,14 +240,16 @@
<el-table-column label="操作" width="160" align="center">
<template slot-scope="scope">
<p>
<el-button size="mini" @click="handleDeleteStatus(scope.$index, scope.row)">回收
</el-button>
<el-button size="mini" @click="handleUpdateProduct(scope.$index, scope.row)">编辑
</el-button>
<!-- <el-button size="mini" @click="handleDeleteStatus(scope.$index, scope.row)">回收
</el-button>
</p>
<p>
<el-button size="mini" @click="handleShowVeriyEditDialog(scope.$index, scope.row)">日志
</el-button>
</el-button> -->
<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除
</el-button>
</p>
@@ -203,22 +257,7 @@
</el-table-column>
</el-table>
</div>
<div class="batch-operate-container">
<el-select size="small" v-model="operateType" placeholder="批量操作">
<el-option v-for="item in operates" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-button style="margin-left: 20px" class="search-button" @click="handleBatchOperate()" type="primary"
size="small">
确定
</el-button>
</div>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
layout="total, sizes,prev, pager, next,jumper" :page-size="listQuery.pageSize"
:page-sizes="[5,10,15]" :current-page.sync="listQuery.pageNum" :total="total">
</el-pagination>
</div>
<el-dialog title="审核信息" :visible.sync="vertyProduct.dialogVisible" width="40%">
<el-form :model="vertyProduct" ref="brandFrom" label-width="150px">
<el-form-item label="审核状态：" prop="verifyStatus">
@@ -317,7 +356,8 @@
update as updateSkuStockList
} from '@/api/skuStock'
import {
fetchList as fetchProductAttrList
fetchList as fetchProductAttrList,
fetchAllList as fetchProductAttrAllList
} from '@/api/productAttr'
import {
fetchList as fetchBrandList
@@ -325,7 +365,8 @@
import {
fetchListWithChildren
} from '@/api/productCate'
import {fetchList as fetchProductAttrCateList} from '@/api/productAttrCate'
const defaultListQuery = {
keyword: null,
pageNum: 1,
@@ -335,6 +376,9 @@
verifyStatus: null,
productSn: null,
productCategoryId: null,
productAttributeCategoryId: null,
newStatus: null,
recommandStatus: null,
brandId: null
};
export default {
@@ -344,7 +388,7 @@
name: "productList",
data() {
return {
status: 0,
status: 0,
btndisabled: false,
isSearchShow: false,
searchxianshitit: '显示查询条件',
@@ -389,14 +433,14 @@
label: "取消新品",
value: "newOff"
},
{
label: "转移到分类",
value: "transferCategory"
},
{
label: "移入回收站",
value: "recycle"
}
// {
// label: "转移到分类",
// value: "transferCategory"
// },
// {
// label: "移入回收站",
// value: "recycle"
// }
],
tabsName: '1',
operateType: null,
@@ -408,6 +452,7 @@
multipleSelection: [],
productCateOptions: [],
brandOptions: [],
productAttributeCategoryOptions: [],
publishStatusOptions: [{
value: 1,
label: '上架'
@@ -422,6 +467,20 @@
value: 0,
label: '未审核'
}],
newStatusOptions: [{
value: 1,
label: '是'
}, {
value: 0,
label: '否'
}],
recommandStatusOptions: [{
value: 1,
label: '是'
}, {
value: 0,
label: '否'
}],
statusOptions: [{
value: 1,
label: '出售中'
@@ -431,32 +490,28 @@
}, {
value: 3,
label: '仓库中'
}, {
value: 4,
label: '回收站'
}],
btnList: [{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
}
// , {
// value: 4,
// label: '回收站'
// },
],
btnList: [],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
}
current: 1,
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
}
},
}
},
@@ -468,6 +523,7 @@
this.getList();
this.getBrandList();
this.getProductCateList();
this.getProductAttrCateList();
},
watch: {
selectProductCateValue: function(newValue) {
@@ -516,27 +572,27 @@
}
},
dosearch() {
this.queryParams.current = 1
// this.loadList()
this.queryParams.current = 1
// this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
}
}
// this.loadList()
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
}
}
// this.loadList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
@@ -600,6 +656,16 @@
}
});
},
getProductAttrCateList() {
let param = {pageNum: 1, pageSize: 100};
fetchProductAttrCateList().then(response => {
let list = response.data.records;
this.productAttributeCategoryOptions = [];
for (let i = 0; i < list.length; i++) {
this.productAttributeCategoryOptions.push({label: list[i].name, value: list[i].id});
}
});
},
handleShowVeriyEditDialog(index, row) {
this.vertyProduct.dialogVisible = true;
this.vertyProduct.productId = row.id;

8
mallplusui-web-admin/src/views/pms/productAttr/index.vue
View File

@@ -3,12 +3,12 @@
<el-card class="operate-container" shadow="never">
<i class="el-icon-tickets" style="margin-top: 5px"></i>
<span style="margin-top: 5px">数据列表</span>
<el-button
<!-- <el-button
class="btn-add"
@click="addProductAttrCate()"
size="mini">
添加
</el-button>
</el-button> -->
</el-card>
<div class="table-container">
<el-table ref="productAttrCateTable"
@@ -22,7 +22,7 @@
<el-table-column label="类型名称" align="center">
<template slot-scope="scope">{{scope.row.name}}</template>
</el-table-column>
<el-table-column label="属性数量" width="200" align="center">
<!-- <el-table-column label="属性数量" width="200" align="center">
<template slot-scope="scope">{{scope.row.attributeCount==null?0:scope.row.attributeCount}}</template>
</el-table-column>
<el-table-column label="参数数量" width="200" align="center">
@@ -52,7 +52,7 @@
@click="handleDelete(scope.$index, scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</div>
<div class="pagination-container">

27
mallplusui-web-admin/src/views/sms/coupon/components/CouponDetail.vue
View File

@@ -7,12 +7,7 @@
size="small">
<el-form-item label="优惠券类型：">
<el-select v-model="coupon.type">
<el-option
v-for="type in typeOptions"
:key="type.value"
:label="type.label"
:value="type.value">
</el-option>
<el-option v-for='type in typeOptions' :key='type.value' :label='type.label' :value='type.value'></el-option>
</el-select>
</el-form-item>
<el-form-item label="优惠券名称：" prop="name">
@@ -190,6 +185,23 @@
value: 2
}
];
var validatePrice = (rule, value, callback) => {
if (!value) {
callback(new Error("面额不能为空"));
} else if (value.split(".").length > 2) {
callback(new Error("请输入正确格式的金额")); //防止输入多个小数点
}
// else if (value > add_Com.Retail_Price) {
// callback(new Error("金额不能大于零售价"));
// }
else {
value = Math.round(value * Math.pow(10, 2)) / Math.pow(10, 2); //四舍五入
value = Number(value).toFixed(2); //不足补位
this.add_Com.Cost_Price = value;
callback();
}
};
export default {
name: 'CouponDetail',
props: {
@@ -212,7 +224,8 @@
{type: 'number',required: true, message: '只能输入正整数', trigger: 'blur'}
],
amount: [
{type: 'number',required: true,message: '面值只能是数值，0.01-10000，限2位小数',trigger: 'blur'}
// {type: 'number',required: true,message: '面值只能是数值，0.01-10000，限2位小数',trigger: 'blur'}
{ required: true, validator: validatePrice, trigger: "blur" },
],
minPoint: [
{type: 'number',required: true,message: '只能输入正整数',trigger: 'blur'}

3
mallplusui-web-admin/src/views/sms/hot/index.vue
View File

@@ -334,7 +334,8 @@
productId:this.dialogData.multipleSelection[i].id,
pic:this.dialogData.multipleSelection[i].pic,
price:this.dialogData.multipleSelection[i].price,
productName:this.dialogData.multipleSelection[i].name
productName:this.dialogData.multipleSelection[i].name,
originalPrice:this.dialogData.multipleSelection[i].originalPrice
});
}
this.$confirm('使用要进行添加操作?', '提示', {

3
mallplusui-web-admin/src/views/sms/new/index.vue
View File

@@ -334,7 +334,8 @@
productId:this.dialogData.multipleSelection[i].id,
pic:this.dialogData.multipleSelection[i].pic,
price:this.dialogData.multipleSelection[i].price,
productName:this.dialogData.multipleSelection[i].name
productName:this.dialogData.multipleSelection[i].name,
originalPrice:this.dialogData.multipleSelection[i].originalPrice
});
}
this.$confirm('使用要进行添加操作?', '提示', {

1315
mallplusui-web-admin/src/views/ums/member/index.vue
View File

File diff suppressed because it is too large Load Diff

19
mallplusui-web-admin/src/views/ums/memberLevel/index.vue
View File

@@ -1,6 +1,6 @@
<template> 
<div class="app-container">
<el-card class="filter-container" shadow="never">
<!-- <el-card class="filter-container" shadow="never">
<div>
<i class="el-icon-search"></i>
<span>筛选搜索</span>
@@ -19,16 +19,16 @@
</el-form-item>
</el-form>
</div>
</el-card>
</el-card> -->
<el-card class="operate-container" shadow="never">
<i class="el-icon-tickets"></i>
<span>数据列表</span>
<el-button
<!-- <el-button
class="btn-add"
@click="addMemberLevel()"
size="mini">
添加
</el-button>
</el-button> -->
</el-card>
<div class="table-container">
<el-table ref="memberLevelTable"
@@ -45,10 +45,10 @@
<el-table-column label="名称" align="center">
<template slot-scope="scope">{{scope.row.name}}</template>
</el-table-column>
<el-table-column label="成长值" align="center">
<!-- <el-table-column label="成长值" align="center">
<template slot-scope="scope">{{scope.row.growthPoint}}</template>
</el-table-column>
<el-table-column label="免运费标准" align="center">
<template slot-scope="scope">{{scope.row.freeFreightPoint}}</template>
</el-table-column>
@@ -81,13 +81,14 @@
</el-table-column>
<el-table-column label="成为会员的价格" align="center">
<template slot-scope="scope">{{scope.row.price}}</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="备注" align="center">
<template slot-scope="scope">{{scope.row.note}}</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center">
<!-- <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
@@ -99,7 +100,7 @@
@click="handleDelete(scope.$index, scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</div>
<div class="batch-operate-container">