zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并ma分支解决冲突

master
lemon橪 2021-06-03 11:51:39 +08:00
parent 837f01e8a1 65cb7787a6
commit 3eee6b35e8
142 changed files with 6024 additions and 6336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer/index.html
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="./static/logo.ico" type="image/x-icon"> <link rel="icon" href="./static/logo.ico" type="image/x-icon">
<!-- <script src = 'https://webapi.amap.com/maps?v=2.0&key=b440952723253aa9fe483e698057bf7d'></script> --> <script src="https://yzf.qq.com/xv/web/static/chat_sdk/yzf_chat.min.js"></script>
<title>LILI</title> <title>LILI</title>
</head> </head>
<body> <body>

36
buyer/src/api/member.js
View File

@ -441,3 +441,39 @@ export function memberPointHistory (params) {
params params
}); });
} }
/**
* 分页获取会员站内信
* @param {Object} params 请求参数，包括pageNumber、pageSize、status
*/
export function memberMsgList (params) {
return request({
url: `/buyer/member/message`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 设置消息为已读
* @param {String} messageId 消息id
*/
export function readMemberMsg (params) {
return request({
url: `/buyer/member/message`,
method: Method.PUT,
needToken: true,
params
});
}
/**
* 删除会员消息
* @param {String} messageId 消息id
*/
export function delMemberMsg (params) {
return request({
url: `/buyer/member/message`,
method: Method.DELETE,
needToken: true,
params
});
}

10
buyer/src/components/addressManage/index.vue
View File

@ -57,7 +57,7 @@ import {
export default { export default {
name: 'addressManage', name: 'addressManage',
props: { props: {
id: { id: { // 传入的地址id
defalut: '', defalut: '',
type: String type: String
} }
@ -89,7 +89,7 @@ export default {
}; };
}, },
methods: { methods: {
save () { save () { // 保存地址
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
const params = JSON.parse(JSON.stringify(this.formData)); const params = JSON.parse(JSON.stringify(this.formData));
@ -138,15 +138,15 @@ export default {
this.formData.lat = item.position.lat; this.formData.lat = item.position.lat;
this.formData.lon = item.position.lng; this.formData.lon = item.position.lng;
}, },
show () { show () { // 地址模态框显示
this.showAddr = true; this.showAddr = true;
}, },
hide () { hide () { // 地址模态框隐藏
this.showAddr = false; this.showAddr = false;
} }
}, },
watch: { watch: {
id: { id: { // 传入的地址id
handler: function (v) { handler: function (v) {
if (v) { if (v) {
this.getAddrById(v); this.getAddrById(v);

1
buyer/src/components/card/index.vue
View File

@ -59,7 +59,6 @@ export default {
isActive: 0 // 已激活tab栏下标 isActive: 0 // 已激活tab栏下标
}; };
}, },
mounted () {},
methods: { methods: {
// 点击右侧的回调 // 点击右侧的回调
callBack () { callBack () {

8
buyer/src/components/coupon/Coupon.vue
View File

@ -44,7 +44,7 @@ export default {
}; };
}, },
methods: { methods: {
getList () { getList () { // 获取优惠券列表
this.loading = true this.loading = true
memberCouponList(this.params).then(res => { memberCouponList(this.params).then(res => {
this.loading = false this.loading = false
@ -67,18 +67,18 @@ export default {
} }
}, },
changePageNum (val) { changePageNum (val) { // 分页改变页码
this.params.pageNumber = val; this.params.pageNumber = val;
this.getList() this.getList()
}, },
changePageSize (val) { changePageSize (val) { // 分页改变页数
this.pageNumber = 1; this.pageNumber = 1;
this.params.pageSize = val; this.params.pageSize = val;
this.getList() this.getList()
}, },
useScope (type, storeName) { useScope (type, storeName) { // 根据字段返回 优惠券适用范围
let shop = '平台'; let shop = '平台';
let goods = '全部商品' let goods = '全部商品'
if (storeName !== 'platform') shop = storeName if (storeName !== 'platform') shop = storeName

29
buyer/src/components/goodsDetail/ShowGoods.vue
View File

@ -20,7 +20,6 @@
<div class="goodsConfig mt_10"> <div class="goodsConfig mt_10">
<span @click="collect" ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{isCollected?'已收藏':'收藏'}}</span> <span @click="collect" ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{isCollected?'已收藏':'收藏'}}</span>
<!-- <span>举报</span> -->
</div> </div>
</div> </div>
<!-- 右侧商品信息、活动信息、操作展示 --> <!-- 右侧商品信息、活动信息、操作展示 -->
@ -60,7 +59,7 @@
:key="index" :key="index"
@click="receiveCoupon(item.id)" @click="receiveCoupon(item.id)"
> >
<span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price | unitPrice}}</span> <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price}}</span>
<span v-if="item.couponType == 'DISCOUNT'">满{{ item.consumeThreshold }}打{{item.couponDiscount}}折</span> <span v-if="item.couponType == 'DISCOUNT'">满{{ item.consumeThreshold }}打{{item.couponDiscount}}折</span>
</span> </span>
</p> </p>
@ -126,32 +125,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="item-detail-see">
<Divider>更多推荐</Divider>
<Row>
<Col :span="24" class="see-Item">
<img class="see-Img" src="https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489099128797.jpg" alt="" />
<p>
名龙堂i7 6700升7700 GTX1060 6G台式电脑主机DIY游戏组装整机
升6GB独显 送正版WIN10 一年上门
</p>
<p class="global_color">￥2500.00</p>
</Col>
<Col :span="24" class="see-Item">
<img
class="see-Img"
src="https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489099128797.jpg"
alt=""
/>
<p>
名龙堂i7 6700升7700 GTX1060 6G台式电脑主机DIY游戏组装整机
升6GB独显 送正版WIN10 一年上门
</p>
<p class="global_color">￥2500.00</p>
</Col>
</Row>
</div> -->
</div> </div>
</div> </div>
</template> </template>

14
buyer/src/components/header/Header.vue
View File

@ -51,8 +51,9 @@
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
</li> </li>
<li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li> <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li>
<li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li> <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li>
<li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
<li v-if="$route.name !== 'Cart'" style="position:relative;"> <li v-if="$route.name !== 'Cart'" style="position:relative;">
<i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i> <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
<Dropdown placement="bottom-start"> <Dropdown placement="bottom-start">
@ -60,7 +61,6 @@
<span @mouseenter="getCartList"> <span @mouseenter="getCartList">
<Icon <Icon
size="18" size="18"
class="cart-icon"
type="ios-cart-outline" type="ios-cart-outline"
></Icon> ></Icon>
购物车 购物车
@ -260,12 +260,12 @@ export default {
float: left; float: left;
font-size: 14px; font-size: 14px;
line-height: 35px; line-height: 35px;
margin-right: 15px; margin-right: 10px;
font-weight: bold; font-weight: bold;
} }
.nav a,.nav-item { .nav a,.nav-item {
text-decoration: none; text-decoration: none;
padding-left: 15px; padding-left: 10px;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
color: #999; color: #999;
cursor: pointer; cursor: pointer;
@ -406,9 +406,7 @@ export default {
.sign-out p { .sign-out p {
font-size: 12px; font-size: 12px;
} }
.cart-icon{
padding: 0 6px;
}
.goods-title:hover { .goods-title:hover {
color: $theme_color; color: $theme_color;
} }

50
buyer/src/components/header/ShopHeader.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="shop-box"> <div class="shop-box">
<div class="shop-container"> <div class="shop-container">
<div class="shop-title">
<div class="shop-title-content"> <div class="shop-title-content">
<p><router-link :to="`/merchant?id=${skuDetail.storeId}`">{{ skuDetail.storeName }}</router-link></p> <img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
</div> <p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
<div class="ml_20" v-html="storeDetail.storeDesc"></div>
</div> </div>
</div> </div>
</div> </div>
@ -20,7 +20,7 @@ export default {
} }
}, },
computed: { computed: {
skuDetail () { storeDetail () {
return this.detail; return this.detail;
} }
} }
@ -46,57 +46,17 @@ export default {
color: #fff; color: #fff;
} }
.shop-title {
display: flex;
flex-direction: row;
}
.shop-title-icon {
font-size: 46px;
}
.shop-title-content { .shop-title-content {
padding-top: 8px;
margin-left: 15px;
display: flex; display: flex;
align-items: center;
} }
.shop-title-content p { .shop-title-content p {
line-height: 26px;
font-size: 20px; font-size: 20px;
}
.shop-title-content p:nth-child(2) {
font-size: 16px;
margin-left: 20px; margin-left: 20px;
} }
.shop-title-content a { .shop-title-content a {
color: #fff; color: #fff;
} }
.shop-another-item {
display: flex;
flex-direction: row;
}
.shop-another-item-detail {
display: flex;
flex-direction: row;
align-items: center;
margin-left: 15px;
}
.shop-another-item-img {
height: 80px;
border-radius: 40px;
overflow: hidden;
}
.shop-another-item-img img {
width: 80px;
}
.shop-anoter-item-intro {
margin-left: 15px;
}
</style> </style>

21
buyer/src/components/nav/cateNav.vue
View File

@ -13,11 +13,12 @@
</li> </li>
</ul> </ul>
</div> </div>
<!-- 侧边导航 --> <!-- 全部商品分类 -->
<div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false"> <div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">
<div class="nav-side"> <!-- 第一级分类 -->
<div class="nav-side" @mouseleave="panel = false">
<ul> <ul>
<li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" @mouseleave="panel = false"> <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" >
<span class="nav-side-item" @click="goGoodsList(item.id)">{{item.name}}</span> <span class="nav-side-item" @click="goGoodsList(item.id)">{{item.name}}</span>
<span v-for="(second, secIndex) in item.children" :key="secIndex"> <span v-for="(second, secIndex) in item.children" :key="secIndex">
<span v-if="secIndex < 2" > / </span> <span v-if="secIndex < 2" > / </span>
@ -26,13 +27,11 @@
</li> </li>
</ul> </ul>
</div> </div>
<transition name="fade"> <!-- 展开分类 -->
<div <div
class="detail-item-panel" class="detail-item-panel"
:duration="{ enter: 100, leave: 100 }"
v-show="panel" v-show="panel"
@mouseenter="panel = true" @mouseenter="panel = true"
ref="itemPanel1"
@mouseleave="panel = false" @mouseleave="panel = false"
> >
<div class="nav-detail-item"> <div class="nav-detail-item">
@ -57,7 +56,6 @@
</li> </li>
</ul> </ul>
</div> </div>
</transition>
</div> </div>
</div> </div>
</template> </template>
@ -86,12 +84,12 @@ export default {
} }
}, },
computed: { computed: {
navList () { navList () { // 导航列表
return JSON.parse(storage.getItem('navList')) || [] return JSON.parse(storage.getItem('navList')) || []
} }
}, },
methods: { methods: {
getCate () { getCate () { // 获取分类数据
getCategory(0).then(res => { getCategory(0).then(res => {
if (res.success) { if (res.success) {
this.cateList = res.result; this.cateList = res.result;
@ -99,7 +97,7 @@ export default {
} }
}); });
}, },
showDetail (index) { showDetail (index) { // 展示全部分类
this.panel = true this.panel = true
this.panelData = this.cateList[index].children this.panelData = this.cateList[index].children
}, },
@ -245,9 +243,6 @@ export default {
.nav-detail-item span:hover { .nav-detail-item span:hover {
background-color: $theme_color; background-color: $theme_color;
} }
.detail-item-panel ul {
list-style: none;
}
.detail-item-panel li { .detail-item-panel li {
line-height: 30px; line-height: 30px;
// margin-left: 40px; // margin-left: 40px;

8
buyer/src/config/index.js
View File

@ -17,10 +17,10 @@ export default {
* @description api请求基础路径 * @description api请求基础路径
*/ */
api_dev: { api_dev: {
// common: 'http://192.168.0.103:8890', // common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.103:8888', // buyer: 'http://192.168.0.109:8888',
// seller: 'http://192.168.0.103:8889', // seller: 'http://192.168.0.109:8889',
// manager: 'http://192.168.0.103:8887' // manager: 'http://192.168.0.109:8887'
common: 'https://common-api.pickmall.cn', common: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn', buyer: 'https://buyer-api.pickmall.cn',

5
buyer/src/main.js
View File

@ -37,6 +37,11 @@ Vue.prototype.linkTo = function (url) {
window.open(url, '_blank') window.open(url, '_blank')
} }
} }
// 联系客服
Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') {
const url = 'https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign
window.open(url, '_blank')
}
Vue.prototype.Cookies = storage Vue.prototype.Cookies = storage
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({

35
buyer/src/pages/GoodsDetail.vue
View File

@ -3,7 +3,7 @@
<BaseHeader></BaseHeader> <BaseHeader></BaseHeader>
<Search></Search> <Search></Search>
<drawer></drawer> <drawer></drawer>
<ShopHeader v-if="goodsMsg.data" :detail="goodsMsg.data"></ShopHeader> <ShopHeader :detail="storeMsg"></ShopHeader>
<div class="shop-item-path"> <div class="shop-item-path">
<div class="shop-nav-container"> <div class="shop-nav-container">
<Breadcrumb> <Breadcrumb>
@ -11,8 +11,9 @@
<BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem> <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem>
</Breadcrumb> </Breadcrumb>
<div class="store-collect"> <div class="store-collect">
<span class="mr_10"><router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span> <span class="mr_10" v-if="goodsMsg.data"><router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span>
<span @click="collect" ><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span> <span @click="collect" ><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
<span @click="connectCs(storeMsg.yzfSign)" class="ml_10"><Icon custom="icomoon icon-customer-service" />联系客服</span>
</div> </div>
</div> </div>
</div> </div>
@ -40,6 +41,7 @@ import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail';
import ShowLikeGoods from '@/components/like'; import ShowLikeGoods from '@/components/like';
import { goodsSkuDetail } from '@/api/goods'; import { goodsSkuDetail } from '@/api/goods';
import { cancelCollect, collectGoods, isCollection } from '@/api/member'; import { cancelCollect, collectGoods, isCollection } from '@/api/member';
import {getDetailById} from '@/api/shopentry'
export default { export default {
name: 'GoodsDetail', name: 'GoodsDetail',
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
@ -48,20 +50,15 @@ export default {
}, },
created () { created () {
this.getGoodsDetail(); this.getGoodsDetail();
if (this.Cookies.getItem('userInfo')) {
isCollection('STORE', this.goodsMsg.data.storeId).then(res => {
if (res.success && res.result) {
this.storeCollected = true;
}
})
}
}, },
data () { data () {
return { return {
goodsMsg: {}, // 商品信息 goodsMsg: {}, // 商品信息
isLoading: false, // 加载状态 isLoading: false, // 加载状态
categoryBar: [], // 分类 categoryBar: [], // 分类
storeCollected: false // 商品收藏 storeCollected: false, // 商品收藏
storeMsg: {} // 店铺信息
}; };
}, },
methods: { methods: {
@ -83,6 +80,20 @@ export default {
}); });
this.categoryBar = cateArr; this.categoryBar = cateArr;
this.goodsMsg = res.result; this.goodsMsg = res.result;
// 判断是否收藏
if (this.Cookies.getItem('userInfo')) {
isCollection('STORE', this.goodsMsg.data.storeId).then(res => {
if (res.success && res.result) {
this.storeCollected = true;
}
})
}
// 获取店铺信息
getDetailById(this.goodsMsg.data.storeId).then(res => {
if (res.success) {
this.storeMsg = res.result
}
})
} else { } else {
this.$Message.error(res.message) this.$Message.error(res.message)
this.$router.push('/') this.$router.push('/')
@ -91,7 +102,7 @@ export default {
this.$router.push('/') this.$router.push('/')
}); });
}, },
goGoodsList (currIndex) { goGoodsList (currIndex) { // 跳转商品列表
const arr = [] const arr = []
this.categoryBar.forEach((e, index) => { this.categoryBar.forEach((e, index) => {
if (index <= currIndex) { if (index <= currIndex) {
@ -132,7 +143,6 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.shop-item-path { .shop-item-path {
height: 38px; height: 38px;
@ -146,6 +156,7 @@ export default {
padding: 20px 0; padding: 20px 0;
@include white_background_color(); @include white_background_color();
} }
.shop-nav-container { .shop-nav-container {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;

5
buyer/src/pages/Merchant.vue
View File

@ -9,9 +9,10 @@
<img :src="storeMsg.storeLogo" height="50" alt=""> <img :src="storeMsg.storeLogo" height="50" alt="">
<div> <div>
<p>{{storeMsg.storeName || 'xx店铺'}}</p> <p>{{storeMsg.storeName || 'xx店铺'}}</p>
<p>{{storeMsg.storeDesc || 'xx店铺描述'}}</p> <p v-html="storeMsg.storeDesc"></p>
</div> </div>
<div class="store-collect" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</div> <div class="store-collect" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</div>
<span class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service" />联系客服</span>
</div> </div>
</div> </div>
<div class="store-category"> <div class="store-category">
@ -204,7 +205,7 @@ export default {
} }
} }
.store-collect{ .store-collect{
margin-left: 20px!important; margin-left: 750px!important;
&:hover{ &:hover{
cursor: pointer; cursor: pointer;
} }

171
buyer/src/pages/PointGoods.vue Normal file
View File

@ -0,0 +1,171 @@
<template>
<div style="background:#fff;">
<BaseHeader></BaseHeader>
<Search></Search>
<drawer></drawer>
<ShopHeader :detail="storeMsg"></ShopHeader>
<div class="shop-item-path">
<div class="shop-nav-container">
<Breadcrumb>
<BreadcrumbItem to="/">首页</BreadcrumbItem>
<BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem>
</Breadcrumb>
<div class="store-collect">
<span class="mr_10" v-if="goodsMsg.data"><router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span>
<span @click="collect" ><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
<span @click="connectCs(storeMsg.yzfSign)" class="ml_10"><Icon custom="icomoon icon-customer-service" />联系客服</span>
</div>
</div>
</div>
<!-- 商品信息展示 -->
<ShowGoods v-if="goodsMsg.data" :detail="goodsMsg"></ShowGoods>
<!-- 商品详细展示 -->
<ShowGoodsDetail v-if="goodsMsg.data" :detail="goodsMsg"></ShowGoodsDetail>
<Spin size="large" fix v-if="isLoading"></Spin>
<BaseFooter></BaseFooter>
</div>
</template>
<script>
import Search from '@/components/Search';
import ShopHeader from '@/components/header/ShopHeader';
import ShowGoods from '@/components/goodsDetail/ShowGoods';
import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail';
import ShowLikeGoods from '@/components/like';
import { goodsSkuDetail } from '@/api/goods';
import { cancelCollect, collectGoods, isCollection } from '@/api/member';
import {getDetailById} from '@/api/shopentry'
export default {
name: 'GoodsDetail',
beforeRouteEnter (to, from, next) {
window.scrollTo(0, 0);
next();
},
created () {
this.getGoodsDetail();
},
data () {
return {
goodsMsg: {}, // 商品信息
isLoading: false, // 加载状态
categoryBar: [], // 分类
storeCollected: false, // 商品收藏
storeMsg: {} // 店铺信息
};
},
methods: {
getGoodsDetail () {
this.isLoading = true;
const params = this.$route.query
goodsSkuDetail(params).then((res) => {
this.isLoading = false;
if (res.success) {
const result = res.result;
const cateName = res.result.categoryName;
const cateId = result.data.categoryPath.split(',');
const cateArr = [];
cateId.forEach((e, index) => { // 插入分类id和name
cateArr.push({
id: e,
name: cateName[index]
});
});
this.categoryBar = cateArr;
this.goodsMsg = res.result;
// 判断是否收藏
if (this.Cookies.getItem('userInfo')) {
isCollection('STORE', this.goodsMsg.data.storeId).then(res => {
if (res.success && res.result) {
this.storeCollected = true;
}
})
}
// 获取店铺信息
getDetailById(this.goodsMsg.data.storeId).then(res => {
if (res.success) {
this.storeMsg = res.result
}
})
} else {
this.$Message.error(res.message)
this.$router.push('/')
}
}).catch(() => {
this.$router.push('/')
});
},
goGoodsList (currIndex) { // 跳转商品列表
const arr = []
this.categoryBar.forEach((e, index) => {
if (index <= currIndex) {
arr.push(e.id)
}
})
return location.origin + '/goodsList?categoryId=' + arr.toString()
},
async collect () { // 收藏店铺
if (this.storeCollected) {
let cancel = await cancelCollect('STORE', this.goodsMsg.data.storeId)
if (cancel.success) {
this.$Message.success('已取消收藏')
this.storeCollected = false;
}
} else {
let collect = await collectGoods('STORE', this.goodsMsg.data.storeId);
if (collect.code === 200) {
this.storeCollected = true;
this.$Message.success('收藏店铺成功,可以前往个人中心我的收藏查看');
}
}
}
},
watch: {
'$route.query.skuId': function (val) {
location.reload();
}
},
computed: {
},
components: {
Search,
ShopHeader,
ShowGoods,
ShowGoodsDetail,
ShowLikeGoods
}
};
</script>
<style scoped lang="scss">
.shop-item-path {
height: 38px;
@include background_color($light_background_color);
line-height: 38px;
color: #2c2c2c;
}
.like {
width: 100%;
padding: 20px 0;
@include white_background_color();
}
.shop-nav-container {
width: 1200px;
margin: 0 auto;
position: relative;
.store-collect {
position: absolute;
right: 20px;
top: 0;
color: #999;
span{
&:hover{
cursor: pointer;
color: $theme_color;
}
}
}
}
</style>

40
buyer/src/pages/PointMall.vue
View File

@ -4,7 +4,7 @@
<Search></Search> <Search></Search>
<cateNav></cateNav> <cateNav></cateNav>
<ul class="category"> <ul class="category">
<li @click="selectCate(cate.id)" v-for="(cate, index) in cateList" :key="index">{{cate.name}}</li> <li @click="selectCate(cate.id)" :class="{'selected-cate': cate.id === params.pointsGoodsCategoryId}" v-for="(cate, index) in cateList" :key="index">{{cate.name}}</li>
</ul> </ul>
<h3 class="promotion-decorate">积分商品</h3> <h3 class="promotion-decorate">积分商品</h3>
<!-- 列表 --> <!-- 列表 -->
@ -39,6 +39,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="page-size">
<Page :total="total" @on-change="changePageNum"
@on-page-size-change="changePageSize"
:page-size="params.pageSize"
show-sizer>
</Page>
</div>
<BaseFooter></BaseFooter> <BaseFooter></BaseFooter>
</div> </div>
</template> </template>
@ -79,11 +86,27 @@ export default {
} }
}) })
}, },
selectCate (id) { selectCate (id) { // 选择商品分类
this.params.pointsGoodsCategoryId = id this.params.pointsGoodsCategoryId = id
this.getList() this.getList()
this.$router.push({query: {categoryId: id}}) this.$router.push({query: {categoryId: id}})
} },
goGoodsDetail (skuId, goodsId) { // 跳转商品详情
let routerUrl = this.$router.resolve({
path: '/goodsDetail',
query: {skuId, goodsId}
})
window.open(routerUrl.href, '_blank')
},
changePageNum (val) { // 修改页码
this.params.pageNumber = val;
this.getList()
},
changePageSize (val) { // 修改页数
this.pageNumber = 1;
this.params.pageSize = val;
this.getList()
},
} }
} }
</script> </script>
@ -104,8 +127,19 @@ export default {
margin: 0 10px; margin: 0 10px;
&:hover{ &:hover{
cursor: pointer; cursor: pointer;
color: $theme_color;
} }
} }
.selected-cate{
color: $theme_color;
}
}
.page-size {
width: 1200px;
margin: 10px auto;
display: flex;
justify-content: flex-end;
} }
.promotion-decorate::before,.promotion-decorate::after{ .promotion-decorate::before,.promotion-decorate::after{
background-image: url('../../static/sprite@2x.png'); background-image: url('../../static/sprite@2x.png');

27
buyer/src/pages/ShoppingCart.vue
View File

@ -34,33 +34,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="other-user-buy-box">
<div class="other-user-buy-title">
<p>可以顺便看下其他商品哦 ~</p>
</div>
<div class="other-user-buy-row" v-for="(items,index1) in recommend" :key="index1">
<div class="other-user-buy-item-box" v-for="(item,index2) in items" :key="index2">
<div class="other-user-buy-item-img">
<a href="item_detail.html"><img :src="item.img" alt=""></a>
</div>
<div class="other-buy-detail-box">
<div class="other-buy-title">
<a href="item_detail.html">
<p>{{item.intro}}</p>
</a>
</div>
<div class="other-buy-price">
<p>￥{{item.price}}</p>
</div>
<div class="other-buy-btn-box">
<router-link to="/goodsDetail">
<button class="other-buy-btn"><Icon type="ios-cart"></Icon> 加入购物车</button>
</router-link>
</div>
</div>
</div>
</div>
</div> -->
<BaseFooter></BaseFooter> <BaseFooter></BaseFooter>
</div> </div>
</template> </template>

4
buyer/src/pages/home/memberCenter/CommentList.vue
View File

@ -112,6 +112,10 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.page-size {
display: flex;
justify-content: flex-end;
}
.order-img { .order-img {
> img { > img {
width: 60px; width: 60px;

17
buyer/src/pages/home/memberCenter/memberMsg/MsgDetail.vue Normal file
View File

@ -0,0 +1,17 @@
<template>
<div class="msg-list">
会员消息详情
</div>
</template>
<script>
export default {
data() {
return {
detail: {}, // 消息详情
}
},
}
</script>
<style lang="scss" scoped>
</style>

41
buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue Normal file
View File

@ -0,0 +1,41 @@
<template>
<div class="msg-list">
<card _Title="我的消息" :_Tabs="status" :_Size="16" />
</div>
</template>
<script>
import {memberMsgList, readMemberMsg, delMemberMsg} from '@/api/member.js'
export default {
data() {
return {
list: [], // 会员列表
status: ['未读', '已读', '回收站'],
params: { // 请求参数
pageNumber: 1,
pageSize: 10,
status: ''
},
}
},
methods: {
getList () { // 获取消息列表
memberMsgList(this.params).then(res => {
if (res.success) {
this.list = res.result.records;
}
})
},
setRead (id) { // 设置消息已读
readMemberMsg(id).then(res => {
})
}
},
mounted () {
this.getList()
}
}
</script>
<style lang="scss" scoped>
</style>

5
buyer/src/pages/user/menu.js
View File

@ -41,6 +41,11 @@ const member = [{
title: '账户安全', title: '账户安全',
path: 'AccountSafe' path: 'AccountSafe'
}, },
{
icon: '',
title: '我的消息',
path: 'MsgList'
},
{ {
icon: '', icon: '',
title: '我的足迹', title: '我的足迹',

14
buyer/src/router/index.js
View File

@ -47,6 +47,8 @@ const ComplainList = resolve => require(['@/pages/home/memberCenter/ComplainList
const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve); const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve);
const Invoice = resolve => require(['@/pages/home/memberCenter/Invoice'], resolve); const Invoice = resolve => require(['@/pages/home/memberCenter/Invoice'], resolve);
const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve); const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve);
const MsgList = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgList'], resolve);
const MsgDetail = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgDetail'], resolve);
/* /*
* 会员中心 * 会员中心
@ -316,6 +318,18 @@ export default new Router({
name: 'AddAddress', name: 'AddAddress',
component: AddAddress component: AddAddress
}, },
{
path: 'MsgList',
name: 'MsgList',
component: MsgList,
meta: {title: '我的消息'}
},
{
path: 'MsgDetail',
name: 'MsgDetail',
component: MsgDetail,
meta: {title: '我的消息'}
},
{ {
path: 'MyOrder', path: 'MyOrder',
name: 'MyOrder', name: 'MyOrder',

7
manager/src/api/member.js
View File

@ -98,11 +98,16 @@ export const getMemberStatistics = params => {
}; };
// 获取会员注册统计列表 // 获取会员注册统计列表
export const getStatisticsList = params => { export const getStatisticsList = params => {
return getRequest("/statistics/view/list", params); return getRequest("/statistics/view/list", params);
}; };
// 获取会员历史流量
export const historyMemberChartList = () => {
return getRequest("/statistics/view/online/history");
}
//查询会员数量 //查询会员数量
export const getMemberNum = params => { export const getMemberNum = params => {
return getRequest("/member/num", params); return getRequest("/member/num", params);

12
manager/src/config/index.js
View File

@ -17,14 +17,10 @@ export default {
* @description api请求基础路径 * @description api请求基础路径
*/ */
api_dev: { api_dev: {
// common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn", buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn", seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn" manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.109:8890',
buyer: 'http://192.168.0.109:8888',
seller: 'http://192.168.0.109:8889',
manager: 'http://192.168.0.109:8887'
}, },
api_prod: { api_prod: {
common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",

2
manager/src/views/Main.vue
View File

@ -12,7 +12,7 @@
<shrinkable-menu></shrinkable-menu> <shrinkable-menu></shrinkable-menu>
</div> </div>
<!-- 顶部标题栏主体 --> <!-- 顶部标题栏主体 -->
<div class="main-header-con" style="padding-left:240px"> <div class="main-header-con">
<div class="main-header"> <div class="main-header">
<div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}"> <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
<!-- 通知消息 --> <!-- 通知消息 -->

178
manager/src/views/distribution/distribution.vue
View File

@ -1,10 +1,14 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="会员名称" prop="memberName"> <Form-item label="会员名称" prop="memberName">
<Input <Input
type="text" type="text"
@ -15,23 +19,52 @@
/> />
</Form-item> </Form-item>
<Form-item label="状态"> <Form-item label="状态">
<Select v-model="searchForm.distributionStatus" style="width:200px"> <Select
<Option v-for="item in distributionStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option> v-model="searchForm.distributionStatus"
style="width: 200px"
>
<Option
v-for="item in distributionStatusList"
:value="item.value"
:key="item.value"
>{{ item.label }}</Option
>
</Select> </Select>
</Form-item> </Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button
@click="handleSearch"
type="primary"
icon="ios-search"
class="search-btn"
>搜索</Button
>
</Form> </Form>
</Row> </Row>
<Row class="padding-row"> <Table
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> :loading="loading"
</Row> border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page> <Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
@ -42,17 +75,17 @@
resumeDistribution, resumeDistribution,
auditDistribution, auditDistribution,
} from "@/api/distribution"; } from "@/api/distribution";
import {distributionStatusList} from './dataJson.js'; import { distributionStatusList } from "./dataJson.js";
export default { export default {
name: "distribution", name: "distribution",
components: { components: {},
},
data() { data() {
return { return {
distributionStatusList, // 分销状态 distributionStatusList, // 分销状态
openSearch: true, // 显示搜索 openSearch: true, // 显示搜索
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { // 搜索框初始化对象 searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
}, },
@ -63,7 +96,7 @@
title: "会员名称", title: "会员名称",
key: "memberName", key: "memberName",
minWidth: 120, minWidth: 120,
tooltip: true tooltip: true,
}, },
{ {
title: "推广单数", title: "推广单数",
@ -77,8 +110,11 @@
width: 150, width: 150,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥')) return h(
} "div",
this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
);
},
}, },
{ {
title: "可用金额", title: "可用金额",
@ -86,8 +122,11 @@
width: 150, width: 150,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥')) return h(
} "div",
this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
);
},
}, },
{ {
title: "冻结金额", title: "冻结金额",
@ -95,8 +134,11 @@
width: 150, width: 150,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥')) return h(
} "div",
this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
);
},
}, },
{ {
title: "状态", title: "状态",
@ -105,16 +147,24 @@
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
if (params.row.distributionStatus == "PASS") { if (params.row.distributionStatus == "PASS") {
return h( "Badge", {props: { status: "success",text: "审核通过" } }) return h("Badge", {
props: { status: "success", text: "审核通过" },
});
} else if (params.row.distributionStatus == "APPLY") { } else if (params.row.distributionStatus == "APPLY") {
return h( "Badge", {props: { status: "processing",text: "申请中" } }) return h("Badge", {
props: { status: "processing", text: "申请中" },
});
} else if (params.row.distributionStatus == "RETREAT") { } else if (params.row.distributionStatus == "RETREAT") {
return h( "Badge", {props: { status: "warning",text: "已清退" } }) return h("Badge", {
props: { status: "warning", text: "已清退" },
});
} else if (params.row.distributionStatus == "REFUSE") { } else if (params.row.distributionStatus == "REFUSE") {
return h( "Badge", {props: { status: "error",text: "审核拒绝" } }) return h("Badge", {
} props: { status: "error", text: "审核拒绝" },
});
} }
}, },
},
{ {
title: "操作", title: "操作",
key: "action", key: "action",
@ -122,11 +172,13 @@
fixed: "right", fixed: "right",
width: 140, width: 140,
render: (h, params) => { render: (h, params) => {
return h("div",{ return h(
"div",
{
style: { style: {
display:'flex', display: "flex",
justifyContent:'center' justifyContent: "center",
} },
}, },
[ [
h( h(
@ -134,14 +186,20 @@
{ {
props: { props: {
type: "error", type: "error",
size: "small" size: "small",
},
style: {
marginRight: "5px",
display:
params.row.distributionStatus != "RETREAT"
? "block"
: "none",
}, },
style:{marginRight:'5px', display:params.row.distributionStatus!='RETREAT'?'block':'none'},
on: { on: {
click: () => { click: () => {
this.retreat(params.row); this.retreat(params.row);
} },
} },
}, },
"清退" "清退"
), ),
@ -150,23 +208,30 @@
{ {
props: { props: {
type: "success", type: "success",
size: "small" size: "small",
},
style: {
marginRight: "5px",
display:
params.row.distributionStatus == "RETREAT"
? "block"
: "none",
}, },
style:{marginRight:'5px', display:params.row.distributionStatus=='RETREAT'?'block':'none'},
on: { on: {
click: () => { click: () => {
this.resume(params.row); this.resume(params.row);
} },
} },
}, },
"恢复" "恢复"
) ),
]); ]
} );
} },
},
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0 // 表单数据总数 total: 0, // 表单数据总数
}; };
}, },
methods: { methods: {
@ -176,7 +241,7 @@
see(v) { see(v) {
this.$router.push({ this.$router.push({
name: "distributionOrder", name: "distributionOrder",
query: { id:v.memberId } query: { id: v.memberId },
}); });
}, },
changePage(v) { changePage(v) {
@ -194,7 +259,8 @@
this.getDataList(); this.getDataList();
}, },
clearSelectAll() { // 清空 clearSelectAll() {
// 清空
this.$refs.table.selectAll(false); this.$refs.table.selectAll(false);
}, },
changeSelect(e) { changeSelect(e) {
@ -206,7 +272,7 @@
this.loading = true; this.loading = true;
this.searchForm.status = "PASS"; this.searchForm.status = "PASS";
// 带多条件搜索参数获取表单数据 请自行修改接口 // 带多条件搜索参数获取表单数据 请自行修改接口
getDistributionListData(this.searchForm).then(res => { getDistributionListData(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
this.data = res.result.records; this.data = res.result.records;
@ -223,39 +289,39 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
retreatDistribution(v.id).then(res => { retreatDistribution(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
// 恢复分销商 // 恢复分销商
resume(v) { resume(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: '提示', title: "提示",
// 记得确认修改此处 // 记得确认修改此处
content: "您确认要恢复 " + v.memberName + " ?", content: "您确认要恢复 " + v.memberName + " ?",
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
resumeDistribution(v.id).then(res => { resumeDistribution(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
} },
}, },
mounted() { mounted() {
this.init(); this.init();
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">

99
manager/src/views/distribution/distributionApply.vue
View File

@ -1,10 +1,14 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="会员名称" prop="memberName"> <Form-item label="会员名称" prop="memberName">
<Input <Input
type="text" type="text"
@ -14,29 +18,46 @@
style="width: 200px" style="width: 200px"
/> />
</Form-item> </Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button
@click="handleSearch"
type="primary"
icon="ios-search"
class="search-btn"
>搜索</Button
>
</Form> </Form>
</Row> </Row>
<Row style="margin-top: 10px"> <Table
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" class="mt_10"
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> :loading="loading"
</Row> border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" <Page
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" :current="searchForm.pageNumber"
size="small" show-total show-elevator show-sizer></Page> :total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
<script> <script>
import { import { getDistributionListData, auditDistribution } from "@/api/distribution";
getDistributionListData,
auditDistribution
} from "@/api/distribution";
export default { export default {
name: "distributionApply", name: "distributionApply",
@ -44,15 +65,17 @@
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { // 搜索框初始化对象 searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
startDate: "", // 起始时间 startDate: "", // 起始时间
endDate: "" // 终止时间 endDate: "", // 终止时间
}, },
form: { // 添加或编辑表单对象初始化数据 form: {
// 添加或编辑表单对象初始化数据
memberName: "", memberName: "",
}, },
// 表单验证规则 // 表单验证规则
@ -92,13 +115,13 @@
size: "small", size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.audit(params.row, "PASS"); this.audit(params.row, "PASS");
} },
} },
}, },
"通过" "通过"
), ),
@ -112,17 +135,17 @@
on: { on: {
click: () => { click: () => {
this.audit(params.row, "REFUSE"); this.audit(params.row, "REFUSE");
} },
} },
}, },
"拒绝" "拒绝"
) ),
]); ]);
} },
} },
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0 // 表单数据总数 total: 0, // 表单数据总数
}; };
}, },
methods: { methods: {
@ -168,7 +191,7 @@
this.loading = true; this.loading = true;
this.searchForm.distributionStatus = "APPLY"; this.searchForm.distributionStatus = "APPLY";
// 带多条件搜索参数获取表单数据 请自行修改接口 // 带多条件搜索参数获取表单数据 请自行修改接口
getDistributionListData(this.searchForm).then(res => { getDistributionListData(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
this.data = res.result.records; this.data = res.result.records;
@ -183,33 +206,33 @@
}, },
//审核 //审核
audit(v, status) { audit(v, status) {
let test = "拒绝" let test = "拒绝";
if (status == "PASS") { if (status == "PASS") {
test = "通过" test = "通过";
} }
let params = { let params = {
status : status status: status,
} };
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认" + test, title: "确认" + test,
// 记得确认修改此处 // 记得确认修改此处
content: "您确认要" + test + " " + v.memberName + " ?", content: "您确认要" + test + " " + v.memberName + " ?",
loading: true, loading: true,
onOk: () => { onOk: () => {
auditDistribution(v.id, params).then(res => { auditDistribution(v.id, params).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
} },
}, },
mounted() { mounted() {
this.init(); this.init();
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">

6
manager/src/views/distribution/distributionCash.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch" > <Row @keydown.enter.native="handleSearch" >
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -21,15 +19,11 @@
</Form-item> </Form-item>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page padding-row"> <Row type="flex" justify="end" class="page padding-row">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page> <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500"> <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
<Form ref="form" :model="form" :label-width="100" :rules="formValidate" > <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >
<FormItem label="编号"> <FormItem label="编号">

6
manager/src/views/distribution/distributionGoods.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -20,7 +18,6 @@
<Row class="operation" style="margin-top: 10px"> <Row class="operation" style="margin-top: 10px">
<Button @click="delAll">批量删除</Button> <Button @click="delAll">批量删除</Button>
</Row> </Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<template slot="goodsName" slot-scope="{row}"> <template slot="goodsName" slot-scope="{row}">
<div> <div>
@ -36,13 +33,10 @@
</div> </div>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page> <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

8
manager/src/views/distribution/distributionOrder.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row v-show="openSearch" @keydown.enter.native="handleSearch"> <Row v-show="openSearch" @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -36,19 +34,13 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

6
manager/src/views/goods-unit/index.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> </Row> <Row @keydown.enter.native="handleSearch"> </Row>
<Row class="operation"> <Row class="operation">
@ -9,7 +7,6 @@
<Button @click="delAll">批量删除</Button> <Button @click="delAll">批量删除</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -20,7 +17,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -36,8 +32,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"

1
manager/src/views/goods/goods-industry-statistics/index.vue
View File

@ -70,7 +70,6 @@
<Tabs v-model="orderStatus" @on-click="handleClickType"> <Tabs v-model="orderStatus" @on-click="handleClickType">
<TabPane label="行业订单数量" name="NUM"> <TabPane label="行业订单数量" name="NUM">
<Table :columns="columns" :data="data"></Table> <Table :columns="columns" :data="data"></Table>
</TabPane> </TabPane>
<TabPane label="行业订单金额" name="PRICE"> <TabPane label="行业订单金额" name="PRICE">
<Table :columns="columns" :data="data"></Table> <Table :columns="columns" :data="data"></Table>

31
manager/src/views/goods/goods-info/goods.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form
@ -43,7 +41,6 @@
<Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button> <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -77,7 +74,6 @@
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -93,8 +89,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"
@ -105,7 +99,6 @@
ref="underForm" ref="underForm"
:model="underForm" :model="underForm"
:label-width="100" :label-width="100"
:rules="formValidate"
> >
<FormItem label="下架原因" prop="reason"> <FormItem label="下架原因" prop="reason">
<Input v-model="underForm.reason" clearable style="width: 100%" /> <Input v-model="underForm.reason" clearable style="width: 100%" />
@ -133,9 +126,6 @@ export default {
modalType: 0, // 添加或编辑标识 modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示 modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题 modalTitle: "", // 添加或编辑标题
drop: false, // 展开搜索框
dropDownContent: "展开", // 展开标签文字
dropDownIcon: "ios-arrow-down", // 展开图标
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
@ -146,17 +136,6 @@ export default {
underForm: { // 下架原因 underForm: { // 下架原因
reason: "", reason: "",
}, },
form: {
// 添加或编辑表单对象初始化数据
goodsName: "",
sn: "",
marketEnable: "",
price: "",
sellerName: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数
@ -379,16 +358,6 @@ export default {
this.selectList = e; this.selectList = e;
this.selectCount = e.length; this.selectCount = e.length;
}, },
dropDown() {
if (this.drop) {
this.dropDownContent = "展开";
this.dropDownIcon = "ios-arrow-down";
} else {
this.dropDownContent = "收起";
this.dropDownIcon = "ios-arrow-up";
}
this.drop = !this.drop;
},
getDataList() { getDataList() {
this.loading = true; this.loading = true;
// 带多条件搜索参数获取表单数据 // 带多条件搜索参数获取表单数据

16
manager/src/views/goods/goods-info/goodsApply.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form
@ -32,7 +30,6 @@
<Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button> <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -60,7 +57,6 @@
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -76,8 +72,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
@ -105,16 +99,6 @@
goodsAuditForm: { // 商品编辑表单 goodsAuditForm: { // 商品编辑表单
is_auth: 1, is_auth: 1,
}, },
form: {
// 添加或编辑表单对象初始化数据
goodsName: "",
sn: "",
marketEnable: "",
price: "",
sellerName: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数

6
manager/src/views/goods/goods-manage/brand.vue
View File

@ -3,8 +3,6 @@
</style> </style>
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form
@ -30,7 +28,6 @@
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="add" type="primary">添加</Button> <Button @click="add" type="primary">添加</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -41,7 +38,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -57,8 +53,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"

7
manager/src/views/goods/goods-manage/spec.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form
@ -28,7 +26,6 @@
<Button @click="add" type="primary" >添加</Button> <Button @click="add" type="primary" >添加</Button>
<Button @click="delAll" >批量删除</Button> <Button @click="delAll" >批量删除</Button>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -39,9 +36,7 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -57,8 +52,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"

249
manager/src/views/goods/goods-refund/index.vue
View File

@ -1,249 +0,0 @@
<template>
<Card>
<Form
label-position="left"
ref="searchForm"
:model="params"
inline
:label-width="100"
class="search-form"
>
<Form-item label="选择店铺" prop="sn">
<span class="tips" v-if="storeName"
>{{ storeName }}
<Button
@click="
() => {
storeName = '';
params.shopId = '';
}
"
type="text"
>清空</Button
>
</span>
<Button size="small" @click="handleClickShop" type="primary"
>选择店铺</Button
>
</Form-item>
<Form-item label="选择时间类型">
<Select v-model="params.timeType" style="width: 200px">
<Option
v-for="item in typeList"
:value="item.value"
:key="item.value"
>{{ item.label }}</Option
>
</Select>
</Form-item>
<Form-item label="按年查询">
<DatePicker
type="year"
placeholder="Select year"
style="width: 200px"
v-model="year"
></DatePicker>
</Form-item>
<Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
<InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
</Form-item>
</Form>
<div class="order-list">
<div class="order-col">
<div>金额</div>
<div>{{ priceData | unitPrice }}</div>
</div>
</div>
<Tabs v-model="orderStatus" @on-click="handleClickType">
<TabPane label="订单列表" name="PRICE">
<Table :columns="columns" :data="data"></Table>
<div class="page-col">
<Page @on-change="changePage" :total="total" show-total />
</div>
</TabPane>
</Tabs>
<Modal v-model="modalFlag" width="1200" :title="selectName">
<!-- 店铺 -->
<shopLayout v-if="shopFlag" @callback="callbackShop" ref="shops" />
<!-- 会员 -->
<memberLayout v-else @callback="callbackMember" ref="members" />
</Modal>
</Card>
</template>
<script>
import shopLayout from "@/views/seller/shop/shopList";
import memberLayout from "@/views/member/list/index";
import * as API_Goods from "@/api/goods";
export default {
components: {
shopLayout,
memberLayout,
},
data() {
return {
storeName: "", // 店铺名称
memberName: "", // 会员名称
shopFlag: false, // 是否展示
selectName: "选择", // modal名称
modalFlag: false, // modal显隐
priceData: "", // 价格
orderStatus: "PRICE", // tab展示
shopList: {}, // 店铺列表
memberList: {}, // 会员列表
typeList: [
{
value: "YEAR",
label: "年",
},
{
value: "MONTH",
label: "月",
},
],
total: 0, // 列表总数
year: "", // 当前年份
params: { // 请求参数
type: "PRICE",
timeType: "YEAR",
pageNumber: 1,
pageSize: 10,
year: "",
shopId: "",
memberId: "",
},
columns: [ // 表格表头
{
title: "售后号",
key: "refundSn",
},
{
title: "卖家名称",
key: "sellerName",
},
{
title: "商品名称",
key: "name",
},
{
title: "规格名称",
key: "specs",
},
{
title: "会员名称",
key: "memberName",
},
{
title: "实际退款金额",
key: "finalPrice",
align: "center",
render: (h, params) => {
return h(
"div",
this.$options.filters.unitPrice(params.row.finalPrice)
);
},
},
],
data: [] // 列表数据
};
},
watch: {
params: {
handler(val) {
this.init();
},
deep: true,
},
year(val) {
this.params.year = new Date(val).getFullYear();
},
},
methods: {
// 选择店铺
handleClickShop() {
this.modalFlag = true;
this.selectName += "店铺";
this.shopFlag = true;
this.$nextTick(() => {
this.$refs.shops.selectedShop = true;
});
},
// 选择会员
handleClickMember() {
this.modalFlag = true;
this.selectName += "会员";
this.$nextTick(() => {
this.$refs.members.selectedMember = true;
});
},
callbackMember(val) {
this.memberName = val.username;
this.params.memberId = val.id;
this.modalFlag = false;
},
callbackShop(val) {
this.storeName = val.storeName;
this.params.shopId = val.id;
this.modalFlag = false;
},
// 点击分页
changePage(index) {
this.params.pageNumber = index;
},
handleClickType(name) {
this.params.type = name;
},
init(name) {
Promise.all([
API_Goods.refundStatistics(this.params),
!this.priceData ? API_Goods.refundPriceStatistics(this.params) : "",
]).then((res) => {
if (res[0].result) {
this.data = res[0].result.records;
this.total = res[0].result.total;
}
if (res[1].result) {
this.priceData = res[1].result;
}
});
},
},
mounted() {
let data = new Date();
this.year = data;
this.year && this.params.month
? this.timeType == "MONTH"
: this.timeType == "YEAR";
},
};
</script>
<style scoped lang="scss">
.page-col {
text-align: right;
margin: 10px 0;
}
.order-col {
display: flex;
> div {
margin-right: 8px;
padding: 16px;
font-size: 15px;
}
}
.order-list {
display: flex;
}
.tips {
margin: 0 8px;
}
</style>

19
manager/src/views/goods/goods-review/index.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -10,7 +9,6 @@
<Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button> <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
@on-sort-change="changeSort" @on-selection-change="changeSelect"> @on-sort-change="changeSort" @on-selection-change="changeSelect">
<!-- 页面展示 --> <!-- 页面展示 -->
@ -24,15 +22,12 @@
</i-switch> </i-switch>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
@on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Row>
<Modal v-model="infoFlag" width="800" :title="infoTitle"> <Modal v-model="infoFlag" width="800" :title="infoTitle">
@ -68,7 +63,7 @@
<div style="margin-left: 40px"> <div style="margin-left: 40px">
<img style="width: 100px;height: 110px;margin-left: 2px" <img style="width: 100px;height: 110px;margin-left: 2px"
v-for="(img,index) in infoData.image.split(',')" v-if="infoData.image.length !=0" :src="img" v-for="(img,index) in infoData.image.split(',')" v-if="infoData.image.length !=0" :src="img"
alt="" /> alt="" :key="index"/>
</div> </div>
</div> </div>
</List> </List>
@ -81,7 +76,7 @@
</div> </div>
<div v-if="infoData.haveReplyImage == 1"> <div v-if="infoData.haveReplyImage == 1">
<div style="margin-left: 60px"> <div style="margin-left: 60px">
<img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')" <img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')" :key="index"
v-if="infoData.replyImage.length !=0" :src="img" alt=""/> v-if="infoData.replyImage.length !=0" :src="img" alt=""/>
</div> </div>
</div> </div>
@ -114,16 +109,6 @@ export default {
startDate: "", // 起始时间 startDate: "", // 起始时间
endDate: "", // 终止时间 endDate: "", // 终止时间
}, },
form: {
// 添加或编辑表单对象初始化数据
memberName: "",
storeName: "",
shopDisable: "",
id: "",
createTime: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数

71
manager/src/views/home/home.vue
View File

@ -172,14 +172,22 @@
</div> </div>
</div> </div>
</div> </div>
<!-- chart -->
<div class="card transform">
<div>
<h4>最近48小时在线人数（整点为准）</h4>
<div id="historyMemberChart"></div>
</div>
</div>
<!-- chart --> <!-- chart -->
<div class="charts flex"> <div class="charts flex">
<div class="chart-item"> <div class="chart-item">
<h4>流量统计</h4> <h4>流量走势</h4>
<div id="pvChart"></div> <div id="pvChart"></div>
</div> </div>
<div class="chart-item"> <div class="chart-item">
<h4>交易统计</h4> <h4>交易趋势</h4>
<div id="orderChart"></div> <div id="orderChart"></div>
</div> </div>
</div> </div>
@ -279,6 +287,7 @@ export default {
homeData: "", // 首页数据 homeData: "", // 首页数据
pvChart: "", // 流量统计 pvChart: "", // 流量统计
orderChart: "", // 订单统计 orderChart: "", // 订单统计
historyMemberChart: "", // 最近会员流量统计
params: { // 请求参数 params: { // 请求参数
searchType: "LAST_SEVEN", searchType: "LAST_SEVEN",
}, },
@ -308,13 +317,13 @@ export default {
}, },
// top10热卖商品 // top10热卖商品
async toHotGoods() { async toHotGoods() {
let res = await hotGoods(); let res = await hotGoods(this.params);
res.success ? (this.topHotGoodsData = res.result) : ""; res.success ? (this.topHotGoodsData = res.result) : "";
}, },
// top10热卖店铺 // top10热卖店铺
async topHotShops() { async topHotShops() {
let res = await hotShops(); let res = await hotShops(this.params);
res.success ? (this.topHotShopsData = res.result) : ""; res.success ? (this.topHotShopsData = res.result) : "";
}, },
// 今日待办 // 今日待办
@ -323,6 +332,7 @@ export default {
res.success ? (this.awaitTodoData = res.result) : ""; res.success ? (this.awaitTodoData = res.result) : "";
}, },
//首页统计数据
async getHomeData() { async getHomeData() {
let res = await homeStatistics(); let res = await homeStatistics();
if (res.success) { if (res.success) {
@ -358,6 +368,7 @@ export default {
} }
}, },
initOrderChart() { initOrderChart() {
// 默认已经加载 legend-filter 交互 // 默认已经加载 legend-filter 交互
let data = this.chartList; let data = this.chartList;
@ -393,6 +404,9 @@ export default {
this.orderChart.render(); this.orderChart.render();
}, },
// 浏览量统计图 // 浏览量统计图
initPvChart() { initPvChart() {
let uv = []; let uv = [];
@ -465,8 +479,54 @@ export default {
this.initPvChart(); this.initPvChart();
} }
}); });
}, }, // 实例化会员流量图表
async initHistoryMemberChartList() {
const res = await API_Member.historyMemberChartList();
if (res.success) {
this.chartList = res.result;
if (!this.historyMemberChart) {
this.historyMemberChart = new Chart({
container: "historyMemberChart",
autoFit: true,
height: 500,
padding: [70, 35, 70, 35],
});
}
this.initHistoryMemberChart();
}
},
initHistoryMemberChart(){
// 默认已经加载 legend-filter 交互
let data = this.chartList;
data.forEach((item) => {
item.title = "历史在线人数";
});
this.historyMemberChart.data(data);
console.error(data)
this.historyMemberChart.tooltip({
showCrosshairs: true,
shared: true,
});
this.historyMemberChart
.line()
.position("date*num")
.color("title",['#ffaa71'])
.shape("smooth")
;
this.historyMemberChart
.point()
.position("date*num")
.color("title",['#ffaa71'])
.shape("circle")
;
this.historyMemberChart.render();
},
// 初始化信息 // 初始化信息
init() { init() {
this.toHotGoods(); this.toHotGoods();
@ -475,6 +535,7 @@ export default {
this.getHomeData(); this.getHomeData();
this.getPvChart(); this.getPvChart();
this.initOrderChartList(); this.initOrderChartList();
this.initHistoryMemberChartList();
}, },
}, },
mounted() { mounted() {

1
manager/src/views/lili-dialog/goods-dialog.vue
View File

@ -114,6 +114,7 @@ export default {
res.result.records.forEach((item) => { res.result.records.forEach((item) => {
item.selected = false; item.selected = false;
item.___type = "goods"; //设置为goods让pc wap知道标识 item.___type = "goods"; //设置为goods让pc wap知道标识
this.selectedWay.forEach(e => { this.selectedWay.forEach(e => {
if (e.id === item.id) { if (e.id === item.id) {
item.selected = true item.selected = true

11
manager/src/views/lili-dialog/index.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<Modal :styles="{ top: '120px' }" width="1160" @on-cancel="clickClose" @on-ok="clickOK" v-model="flag" :mask-closable="false" scrollable> <Modal :styles="{ top: '120px' }" width="1160" @on-cancel="clickClose" @on-ok="clickOK" v-model="flag" :mask-closable="false" scrollable>
<template v-if="flag">
<goodsDialog @selected="(val) => {goodsData = val;}" <goodsDialog @selected="(val) => {goodsData = val;}"
v-if="goodsFlag" ref="goodsDialog" :selectedWay='goodsData'/> v-if="goodsFlag" ref="goodsDialog" :selectedWay='goodsData'/>
<linkDialog @selectedLink=" <linkDialog @selectedLink="
@ -7,6 +8,7 @@
linkData = val; linkData = val;
} }
" v-else class="linkDialog" /> " v-else class="linkDialog" />
</template>
</Modal> </Modal>
</template> </template>
<script> <script>
@ -25,9 +27,6 @@ export default {
flag: false, // modal显隐 flag: false, // modal显隐
}; };
}, },
props: ["types"],
watch: {},
mounted() {},
methods: { methods: {
// 关闭弹窗 // 关闭弹窗
clickClose() { clickClose() {
@ -51,13 +50,17 @@ export default {
} }
this.clickClose(); this.clickClose();
}, },
open(type) { open(type, mutiple) {
this.flag = true; this.flag = true;
if (type == "goods") { if (type == "goods") {
this.goodsFlag = true; this.goodsFlag = true;
if (mutiple) {
this.singleGoods()
}
} else { } else {
this.goodsFlag = false; this.goodsFlag = false;
} }
}, },
close() { close() {
this.flag = false; this.flag = false;

2
manager/src/views/lili-dialog/link-dialog.vue
View File

@ -40,7 +40,7 @@ export default {
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs["lili-component"][0].type = "single"; //如果商品页面设置成为单选 this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选
}); });
this.wap.forEach((item) => { this.wap.forEach((item) => {

4
manager/src/views/lili-dialog/template/marketing.vue
View File

@ -65,7 +65,7 @@ export default {
}, },
{ {
title: "店铺名称", title: "店铺名称",
key: "sellerName", key: "storeName",
tooltip: true, tooltip: true,
}, },
{ {
@ -113,7 +113,7 @@ export default {
}, },
{ {
title: "店铺名称", title: "店铺名称",
key: "sellerName", key: "storeName",
tooltip: true, tooltip: true,
}, },
{ {

6
manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
View File

@ -176,12 +176,16 @@ export default {
handleSelectGoods(item) { // 调起选择商品 handleSelectGoods(item) { // 调起选择商品
console.warn(item); console.warn(item);
if (item) this.selected = item; if (item) this.selected = item;
this.$refs.liliDialog.open('goods') this.$refs.liliDialog.open('goods', 'single')
setTimeout(() => {
this.$refs.liliDialog.goodsData = [this.selected]
}, 500);
}, },
selectedLink (val) { selectedLink (val) {
this.selected.url = this.$options.filters.formatLinkType(val); this.selected.url = this.$options.filters.formatLinkType(val);
}, },
selectedGoodsData (val) { selectedGoodsData (val) {
console.log(val);
let goods = val[0] let goods = val[0]
console.log(this.selected); console.log(this.selected);
this.selected.img = goods.thumbnail this.selected.img = goods.thumbnail

5
manager/src/views/lili-floor-renovation/modelList/notEnough.vue
View File

@ -108,7 +108,10 @@ export default {
}, },
handleSelectGoods(item) { // 调起选择链接弹窗 handleSelectGoods(item) { // 调起选择链接弹窗
if(item) this.selected = item; if(item) this.selected = item;
this.$refs.liliDialog.open('goods') this.$refs.liliDialog.open('goods', 'single')
setTimeout(() => {
this.$refs.liliDialog.goodsData = [this.selected]
}, 500);
}, },
selectedLink(val) { selectedLink(val) {
this.selected.url = this.$options.filters.formatLinkType(val); this.selected.url = this.$options.filters.formatLinkType(val);

2
manager/src/views/lili-floor-renovation/modelList/recommend.vue
View File

@ -241,7 +241,7 @@ export default {
}, },
handleSelectGoods(item) { handleSelectGoods(item) {
// 调起选择商品 // 调起选择商品
this.$refs.liliDialog.open("goods"); this.$refs.liliDialog.open('goods', 'single')
}, },
selectedLink(val) { selectedLink(val) {
this.selected.url = this.$options.filters.formatLinkType(val); this.selected.url = this.$options.filters.formatLinkType(val);

6
manager/src/views/logistics/index.vue
View File

@ -1,13 +1,10 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"></Row> <Row @keydown.enter.native="handleSearch"></Row>
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="add" type="primary">添加</Button> <Button @click="add" type="primary">添加</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -26,7 +23,6 @@
</i-switch> </i-switch>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -42,8 +38,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"

4
manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
View File

@ -3,7 +3,7 @@
<template> <template>
<div class="ivu-shrinkable-menu"> <div class="ivu-shrinkable-menu">
<!-- 一级菜单 --> <!-- 一级菜单 -->
<Menu ref="sideMenu" width="110px" theme="dark" :active-name="currNav" @on-select="selectNav"> <Menu ref="sideMenu" width="80px" theme="dark" :active-name="currNav" @on-select="selectNav">
<MenuItem v-for="(item, i) in navList" :key="i" :name="item.name"> <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
{{item.title}} {{item.title}}
</MenuItem> </MenuItem>
@ -12,7 +12,7 @@
<Menu <Menu
ref="childrenMenu" ref="childrenMenu"
:active-name="$route.name" :active-name="$route.name"
width="130px" width="100px"
@on-select="changeMenu" @on-select="changeMenu"
> >
<template v-for="item in menuList"> <template v-for="item in menuList">

2
manager/src/views/main-components/shrinkable-menu/styles/menu.scss
View File

@ -1,6 +1,6 @@
.ivu-shrinkable-menu{ .ivu-shrinkable-menu{
height: calc(100% - 60px); height: calc(100% - 60px);
width: 240px; width: 180px;
display: flex; display: flex;
} }
.ivu-menu-vertical .ivu-menu-item-group-title { .ivu-menu-vertical .ivu-menu-item-group-title {

6
manager/src/views/main.scss
View File

@ -52,7 +52,7 @@
box-sizing: border-box; box-sizing: border-box;
position: fixed; position: fixed;
display: block; display: block;
padding-left: 200px; padding-left: 180px;
width: 100%; width: 100%;
height: 100px; height: 100px;
z-index: 20; z-index: 20;
@ -256,12 +256,12 @@
.single-page-con { .single-page-con {
min-width: 740px; min-width: 740px;
position: relative; position: relative;
left: 240px; left: 180px;
top: 100px; top: 100px;
right: 0; right: 0;
bottom: 0; bottom: 0;
height: calc(100% - 110px); height: calc(100% - 110px);
width: calc(100% - 240px); width: calc(100% - 180px);
overflow: auto; overflow: auto;
background-color: #f0f0f0; background-color: #f0f0f0;
z-index: 1; z-index: 1;

6
manager/src/views/member/advance/recharge.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form
@ -43,7 +41,6 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -54,7 +51,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -70,8 +66,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

6
manager/src/views/member/advance/walletLog.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -15,16 +13,12 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

6
manager/src/views/member/advance/withdrawApply.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form
@ -50,7 +48,6 @@
</Form-item> </Form-item>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -61,7 +58,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -77,8 +73,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="roleModalVisible" v-model="roleModalVisible"

5
manager/src/views/member/list/index.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -22,17 +21,13 @@
<Button @click="addMember" type="primary">添加会员</Button> <Button @click="addMember" type="primary">添加会员</Button>
</Row> </Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Row>
<!-- 添加用户模态框 --> <!-- 添加用户模态框 -->
<Modal v-model="addFlag" title="添加用户"> <Modal v-model="addFlag" title="添加用户">

25
manager/src/views/member/list/memberDetail.vue
View File

@ -78,7 +78,6 @@
</div> </div>
</div> </div>
<div class="point-data" style="margin-top: -5px"> <div class="point-data" style="margin-top: -5px">
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -89,7 +88,6 @@
@on-sort-change="pointChangeSort" @on-sort-change="pointChangeSort"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -168,7 +166,6 @@
</Form> </Form>
</Row> </Row>
<div style="min-height: 180px"> <div style="min-height: 180px">
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -179,7 +176,6 @@
@on-sort-change="orderChangeSort" @on-sort-change="orderChangeSort"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -201,7 +197,6 @@
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="addMemberAddress" type="primary">新增</Button> <Button @click="addMemberAddress" type="primary">新增</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -212,7 +207,6 @@
@on-sort-change="addressChangeSort" @on-sort-change="addressChangeSort"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -249,7 +243,6 @@
</div> </div>
</div> </div>
</div> </div>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -260,7 +253,6 @@
@on-sort-change="walletChangeSort" @on-sort-change="walletChangeSort"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -292,7 +284,6 @@
<Button @click="getReceiptRecordData" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="getReceiptRecordData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -308,7 +299,6 @@
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -502,7 +492,20 @@
{ {
title: "来源", title: "来源",
key: "clientType", key: "clientType",
width: 80, width: 80,render: (h, params) => {
if (params.row.clientType == "H5") {
return h("div",{},"移动端");
}else if(params.row.clientType == "PC") {
return h("div",{},"PC端");
}else if(params.row.clientType == "WECHAT_MP") {
return h("div",{},"小程序端");
}else if(params.row.clientType == "APP") {
return h("div",{},"移动应用端");
}
else{
return h("div",{},params.row.clientType);
}
},
}, },
{ {
title: "订单状态", title: "订单状态",

3
manager/src/views/member/list/memberRecycle.vue
View File

@ -32,7 +32,6 @@
<Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button > <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -44,8 +43,6 @@
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

12
manager/src/views/member/message-manage/memberMessageManager.vue
View File

@ -101,7 +101,6 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -112,7 +111,6 @@
@on-selection-change="showSelect" @on-selection-change="showSelect"
ref="memberTable" ref="memberTable"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -145,7 +143,6 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -156,7 +153,6 @@
@on-selection-change="showSelect" @on-selection-change="showSelect"
ref="shopTable" ref="shopTable"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -191,7 +187,6 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -202,7 +197,6 @@
@on-selection-change="showSelect" @on-selection-change="showSelect"
ref="weChatTable" ref="weChatTable"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="weChatSearchForm.pageNumber" :current="weChatSearchForm.pageNumber"
@ -236,7 +230,6 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -247,7 +240,6 @@
@on-selection-change="showSelect" @on-selection-change="showSelect"
ref="otherTable" ref="otherTable"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -275,7 +267,7 @@
import { import {
getMessageData, getMessageData,
editSmsMessageTemplate, editSmsMessageTemplate,
editNoticeMessageTemplate, editNoticeMessage,
wechatMessageSync, wechatMessageSync,
getWechatMessagePage, getWechatMessagePage,
editWechatMessageTemplate, editWechatMessageTemplate,
@ -600,7 +592,7 @@
noticeFormDataEdit(){ noticeFormDataEdit(){
this.$refs['noticeFormData'].validate((valid) => { this.$refs['noticeFormData'].validate((valid) => {
if (valid) { if (valid) {
editNoticeMessageTemplate(this.messageTemplateId,this.noticeFormData).then(res => { editNoticeMessage(this.messageTemplateId,this.noticeFormData).then(res => {
if(res.message === 'success') { if(res.message === 'success') {
this.$Message.success('站内信修改成功'); this.$Message.success('站内信修改成功');
this.noticeModal = false; this.noticeModal = false;

2
manager/src/views/member/message-manage/messageManage.vue
View File

@ -75,7 +75,6 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -86,7 +85,6 @@
@on-selection-change="showSelect" @on-selection-change="showSelect"
ref="table" ref="table"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

2
manager/src/views/member/message-manage/messageSendDetail.vue
View File

@ -41,7 +41,6 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -52,7 +51,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="pageNumber" :current="pageNumber"

4
manager/src/views/member/message-manage/weChatMessageManager.vue
View File

@ -46,7 +46,6 @@
<Row class="operation"> <Row class="operation">
<Button @click="weChatSync" type="primary">同步微信消息</Button> <Button @click="weChatSync" type="primary">同步微信消息</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -54,7 +53,6 @@
:data="weChatData" :data="weChatData"
ref="weChatTable" ref="weChatTable"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="weChatSearchForm.pageNumber" :current="weChatSearchForm.pageNumber"
@ -77,7 +75,6 @@
<Row class="operation"> <Row class="operation">
<Button @click="weChatSync('mp')" type="primary">同步微信小程序订阅消息</Button> <Button @click="weChatSync('mp')" type="primary">同步微信小程序订阅消息</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -86,7 +83,6 @@
sortable="custom" sortable="custom"
ref="weChatMPTable" ref="weChatMPTable"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="weChatMPSearchForm.pageNumber" :current="weChatMPSearchForm.pageNumber"

142
manager/src/views/member/notice/sender.vue
View File

@ -1,29 +1,58 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="标题" prop="title"> <Form-item label="标题" prop="title">
<Input type="text" v-model="searchForm.title" placeholder="请输入标题" clearable style="width: 200px"/> <Input
type="text"
v-model="searchForm.title"
placeholder="请输入标题"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="消息内容" prop="content"> <Form-item label="消息内容" prop="content">
<Input type="text" v-model="searchForm.content" placeholder="请输入消息内容" clearable style="width: 200px"/> <Input
type="text"
v-model="searchForm.content"
placeholder="请输入消息内容"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
<span v-if="drop"> <span v-if="drop">
<Form-item label="发送类型" prop="sendType"> <Form-item label="发送类型" prop="sendType">
<Select v-model="searchForm.sendType" placeholder="请选择" clearable style="width: 200px"> <Select
v-model="searchForm.sendType"
placeholder="请选择"
clearable
style="width: 200px"
>
<Option value="ALL">全站会员</Option> <Option value="ALL">全站会员</Option>
<Option value="SELECT">指定会员</Option> <Option value="SELECT">指定会员</Option>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="创建人" prop="createBy"> <Form-item label="创建人" prop="createBy">
<Input type="text" v-model="searchForm.createBy" placeholder="请输入创建人" clearable style="width: 200px"/> <Input
type="text"
v-model="searchForm.createBy"
placeholder="请输入创建人"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
</span> </span>
<Form-item style="margin-left:-35px;" class="br"> <Form-item style="margin-left: -35px" class="br">
<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search"
>搜索</Button
>
<Button @click="handleReset">重置</Button> <Button @click="handleReset">重置</Button>
<a class="drop-down" @click="dropDown"> <a class="drop-down" @click="dropDown">
{{ dropDownContent }} {{ dropDownContent }}
@ -43,23 +72,38 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row> <Table
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> :loading="loading"
</Row> border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page> <Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "member-notice-sender", name: "member-notice-sender",
components: { components: {},
},
data() { data() {
return { return {
openSearch: true, // 显示搜索 openSearch: true, // 显示搜索
@ -71,7 +115,8 @@
drop: false, // 更多搜索项 drop: false, // 更多搜索项
dropDownContent: "展开", // drop中文提示 dropDownContent: "展开", // drop中文提示
dropDownIcon: "ios-arrow-down", // drop图标 dropDownIcon: "ios-arrow-down", // drop图标
searchForm: { // 搜索框初始化对象 searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
@ -85,12 +130,12 @@
{ {
type: "selection", type: "selection",
width: 60, width: 60,
align: "center" align: "center",
}, },
{ {
type: "index", type: "index",
width: 60, width: 60,
align: "center" align: "center",
}, },
{ {
title: "标题", title: "标题",
@ -110,22 +155,21 @@
h("Badge", { h("Badge", {
props: { props: {
status: "success", status: "success",
text: "全部会员" text: "全部会员",
} },
}) }),
]); ]);
} else { } else {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "success", status: "success",
text: "指定会员" text: "指定会员",
} },
}) }),
]); ]);
} }
} },
}, },
{ {
title: "创建人", title: "创建人",
@ -152,22 +196,22 @@
props: { props: {
type: "error", type: "error",
size: "small", size: "small",
icon: "md-trash" icon: "md-trash",
}, },
on: { on: {
click: () => { click: () => {
this.remove(params.row); this.remove(params.row);
} },
} },
}, },
"删除" "删除"
) ),
]); ]);
} },
} },
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0 // 表单数据总数 total: 0, // 表单数据总数
}; };
}, },
methods: { methods: {
@ -223,13 +267,15 @@
getDataList() { getDataList() {
this.loading = true; this.loading = true;
// 带多条件搜索参数获取表单数据 请自行修改接口 // 带多条件搜索参数获取表单数据 请自行修改接口
this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(res => { this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(
(res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
this.data = res.result.records; this.data = res.result.records;
this.total = res.result.total; this.total = res.result.total;
} }
}); }
);
// 以下为模拟数据 // 以下为模拟数据
//this.data = [ //this.data = [
//]; //];
@ -240,7 +286,7 @@
let query = { type: 0, backRoute: this.$route.name }; let query = { type: 0, backRoute: this.$route.name };
this.$router.push({ this.$router.push({
name: "add_message", name: "add_message",
query: query query: query,
}); });
}, },
edit(v) { edit(v) {
@ -266,18 +312,20 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(res => { this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(
(res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); }
);
// 模拟请求成功 // 模拟请求成功
//this.$Message.success("操作成功"); //this.$Message.success("操作成功");
//this.$Modal.remove(); //this.$Modal.remove();
//this.getDataList(); //this.getDataList();
} },
}); });
}, },
delAll() { delAll() {
@ -296,26 +344,28 @@
}); });
ids = ids.substring(0, ids.length - 1); ids = ids.substring(0, ids.length - 1);
// 批量删除 // 批量删除
this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(res => { this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(
(res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.clearSelectAll(); this.clearSelectAll();
this.getDataList(); this.getDataList();
} }
}); }
);
// 模拟请求成功 // 模拟请求成功
//this.$Message.success("操作成功"); //this.$Message.success("操作成功");
//this.$Modal.remove(); //this.$Modal.remove();
//this.clearSelectAll(); //this.clearSelectAll();
//this.getDataList(); //this.getDataList();
} },
}); });
} },
}, },
mounted() { mounted() {
this.init(); this.init();
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">

3
manager/src/views/member/point/point.vue
View File

@ -22,7 +22,6 @@
<Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button > <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -34,8 +33,6 @@
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

8
manager/src/views/order/after-order/afterSale.vue
View File

@ -10,7 +10,6 @@
<Row class="operation" style="margin-bottom: 10px"> <Row class="operation" style="margin-bottom: 10px">
<Button @click="add" type="primary" >添加</Button> <Button @click="add" type="primary" >添加</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -21,7 +20,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -45,7 +43,6 @@
<Row class="operation" style="margin-bottom: 10px"> <Row class="operation" style="margin-bottom: 10px">
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -56,7 +53,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -80,7 +76,6 @@
<Row class="operation" style="margin-bottom: 10px"> <Row class="operation" style="margin-bottom: 10px">
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -91,7 +86,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -116,7 +110,6 @@
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
<Button @click="getDataList" icon="md-refresh">刷新</Button> <Button @click="getDataList" icon="md-refresh">刷新</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -127,7 +120,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

2
manager/src/views/order/after-order/afterSaleOrder.vue
View File

@ -73,7 +73,6 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -106,7 +105,6 @@
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

7
manager/src/views/order/after-order/orderComplaint.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -36,8 +34,6 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -58,7 +54,6 @@
</Poptip> </Poptip>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -74,8 +69,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"

6
manager/src/views/order/flow/paymentLog.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -29,16 +27,12 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

14
manager/src/views/order/flow/refundLog.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -21,18 +19,14 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
@ -57,14 +51,6 @@ export default {
isRefund: "", isRefund: "",
}, },
selectDate: null, selectDate: null,
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
columns: [ columns: [
{ {
title: "售后单号", title: "售后单号",

12
manager/src/views/order/order/fictitiousOrderList.vue
View File

@ -51,7 +51,6 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -62,7 +61,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -106,16 +104,6 @@
orderStatus: "" orderStatus: ""
}, },
selectDate: null, // 下单时间 selectDate: null, // 下单时间
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数

2
manager/src/views/order/order/orderDetail.vue
View File

@ -212,7 +212,7 @@
<li> <li>
<span class="label">应付金额：</span> <span class="label">应付金额：</span>
<span class="txt flowPrice" <span class="txt flowPrice"
>¥{{ orderInfo.order.priceDetailDTO.flowPrice }}</span >¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}</span
> >
</li> </li>
</ul> </ul>

20
manager/src/views/order/order/orderList.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -35,16 +34,15 @@
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
@ -121,16 +119,6 @@ export default {
orderStatus: "", orderStatus: "",
}, },
selectDate: null, selectDate: null,
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数

33
manager/src/views/order/receipt/receipt.vue
View File

@ -58,7 +58,6 @@
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -75,7 +74,6 @@
@click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a> @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -114,20 +112,10 @@
receiptStatus: "", // 起始时间 receiptStatus: "", // 起始时间
}, },
shopsData: [], // 店铺数据 shopsData: [], // 店铺数据
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
params: { params: {
pageNumber: 1, pageNumber: 1,
pageSize: 1, pageSize: 10,
}, },
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数
@ -293,25 +281,6 @@
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
//开发票
invoicing(params){
this.$Modal.confirm({
title: "确认开票",
content: "您确认已经开具发票 ?",
loading: true,
onOk: () => {
API_Order.invoicing(params.id).then((res) => {
if (res.success) {
this.$Message.success("开票成功");
}
this.$Modal.remove();
this.getData();
});
}
});
},
}, },
mounted() { mounted() {
this.init(); this.init();

6
manager/src/views/page/article-manage/articleList.vue
View File

@ -20,7 +20,6 @@
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="add" type="primary" style="">添加</Button> <Button @click="add" type="primary" style="">添加</Button>
</Row> </Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<!-- 页面展示 --> <!-- 页面展示 -->
<template slot="openStatusSlot" slot-scope="scope"> <template slot="openStatusSlot" slot-scope="scope">
@ -33,14 +32,13 @@
</i-switch> </i-switch>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator> size="small" show-total show-elevator>
</Page> </Page>
</Row> </Row>
<template v-if="!selected">
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100"> <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
<Form ref="form" :model="form" :label-width="100"> <Form ref="form" :model="form" :label-width="100">
<FormItem label="文章标题" prop="title"> <FormItem label="文章标题" prop="title">
@ -73,6 +71,8 @@
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button> <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div> </div>
</Modal> </Modal>
</template>
</Card> </Card>
</Col> </Col>

2
manager/src/views/page/feedback/feedback.vue
View File

@ -4,7 +4,6 @@
<template> <template>
<div class="search"> <div class="search">
<Card> <Card>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -15,7 +14,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="pageNumber" :current="pageNumber"

166
manager/src/views/page/focus/mobileFocus.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row class="operation"> <Row class="operation">
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
<Button @click="disableAll" icon="md-trash">批量禁用</Button> <Button @click="disableAll" icon="md-trash">批量禁用</Button>
<Button @click="getDataList" icon="md-refresh">刷新</Button> <Button @click="getDataList" icon="md-refresh">刷新</Button>
<Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button> <Button type="dashed" @click="openTip = !openTip">{{
openTip ? "关闭提示" : "开启提示"
}}</Button>
</Row> </Row>
<Row v-show="openTip"> <Row v-show="openTip">
<Alert show-icon> <Alert show-icon>
@ -15,24 +15,54 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row> <Table
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> :loading="loading"
</Row> border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page> <Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</Col> <Modal
</Row> :title="modalTitle"
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500"> v-model="modalVisible"
<Form ref="form" :model="form" :label-width="100" :rules="formValidate" > <FormItem label="名称" prop="name" > :mask-closable="false"
:width="500"
>
<Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="名称" prop="name">
<Input v-model="form.name" clearable style="width: 100%" /> <Input v-model="form.name" clearable style="width: 100%" />
</FormItem> </FormItem>
<FormItem label="图片" prop="url"> <FormItem label="图片" prop="url">
<upload-pic-input v-model="form.url" style="width:100%"></upload-pic-input> <upload-pic-input
v-model="form.url"
style="width: 100%"
></upload-pic-input>
</FormItem> </FormItem>
<FormItem label="操作类型" prop="operationType"> <FormItem label="操作类型" prop="operationType">
<Select v-model="form.operationType" placeholder="请选择" clearable style="width: 200px"> <Select
v-model="form.operationType"
placeholder="请选择"
clearable
style="width: 200px"
>
<Option value="NONE">无操作</Option> <Option value="NONE">无操作</Option>
<Option value="URL">链接地址</Option> <Option value="URL">链接地址</Option>
<Option value="GOODS">商品序号</Option> <Option value="GOODS">商品序号</Option>
@ -50,7 +80,9 @@
</Form> </Form>
<div slot="footer"> <div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button> <Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button> <Button type="primary" :loading="submitLoading" @click="handleSubmit"
>提交</Button
>
</div> </div>
</Modal> </Modal>
</div> </div>
@ -62,14 +94,14 @@
saveFocusData, saveFocusData,
disableFocus, disableFocus,
enableFocus, enableFocus,
delFocus delFocus,
} from "@/api/pages"; } from "@/api/pages";
import uploadPicInput from "@/views/my-components/lili/upload-pic-input"; import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
export default { export default {
name: "mobileFocus", name: "mobileFocus",
components: { components: {
uploadPicInput uploadPicInput,
}, },
data() { data() {
return { return {
@ -78,14 +110,16 @@
modalType: 0, // 添加或编辑标识 modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示 modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题 modalTitle: "", // 添加或编辑标题
searchForm: { // 搜索框初始化对象 searchForm: {
// 搜索框初始化对象
clientType: "MOBILE", //客户端类型 clientType: "MOBILE", //客户端类型
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
form: { // 添加或编辑表单对象初始化数据 form: {
// 添加或编辑表单对象初始化数据
name: "", name: "",
operationType: "", operationType: "",
operationUrl: "", operationUrl: "",
@ -104,7 +138,7 @@
{ {
type: "selection", type: "selection",
width: 60, width: 60,
align: "center" align: "center",
}, },
{ {
title: "名称", title: "名称",
@ -118,26 +152,26 @@
minWidth: 100, minWidth: 100,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
if (params.row.status == 'CLOSE') { if (params.row.status == "CLOSE") {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "error", status: "error",
text: "禁用" text: "禁用",
} },
}) }),
]); ]);
} else if (params.row.status == 'OPEN') { } else if (params.row.status == "OPEN") {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "success", status: "success",
text: "启用" text: "启用",
} },
}) }),
]); ]);
} }
} },
}, },
{ {
title: "图片", title: "图片",
@ -148,17 +182,17 @@
return h("img", { return h("img", {
attrs: { attrs: {
src: params.row.url, src: params.row.url,
alt: "加载图片失败" alt: "加载图片失败",
}, },
style: { style: {
cursor: "pointer", cursor: "pointer",
width: "80px", width: "80px",
height: "60px", height: "60px",
margin: "10px 0", margin: "10px 0",
"object-fit": "contain" "object-fit": "contain",
} },
}); });
} },
}, },
{ {
title: "排序", title: "排序",
@ -179,16 +213,16 @@
{ {
props: { props: {
type: "success", type: "success",
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.enable(params.row); this.enable(params.row);
} },
} },
}, },
"启用" "启用"
); );
@ -197,16 +231,16 @@
"Button", "Button",
{ {
props: { props: {
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.disable(params.row); this.disable(params.row);
} },
} },
}, },
"禁用" "禁用"
); );
@ -217,16 +251,16 @@
{ {
props: { props: {
type: "primary", type: "primary",
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.edit(params.row); this.edit(params.row);
} },
} },
}, },
"编辑" "编辑"
), ),
@ -238,23 +272,23 @@
size: "small", size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.remove(params.row); this.remove(params.row);
} },
} },
}, },
"删除" "删除"
), ),
enableOrDisable, enableOrDisable,
]); ]);
} },
} },
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0 // 表单数据总数 total: 0, // 表单数据总数
}; };
}, },
methods: { methods: {
@ -300,7 +334,7 @@
getDataList() { getDataList() {
this.loading = true; this.loading = true;
// 带多条件搜索参数获取表单数据 请自行修改接口 // 带多条件搜索参数获取表单数据 请自行修改接口
getFocusData(this.searchForm).then(res => { getFocusData(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
this.data = res.result.records; this.data = res.result.records;
@ -321,14 +355,14 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
enableFocus(v.id).then(res => { enableFocus(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
disable(v) { disable(v) {
@ -339,26 +373,26 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
disableFocus(v.id).then(res => { disableFocus(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
this.form.ClientType = "MOBILE" this.form.ClientType = "MOBILE";
this.submitLoading = true; this.submitLoading = true;
if (this.modalType === 0) { if (this.modalType === 0) {
this.form.status = "OPEN" this.form.status = "OPEN";
// 添加 避免编辑后传入id等数据 记得删除 // 添加 避免编辑后传入id等数据 记得删除
delete this.form.id; delete this.form.id;
saveFocusData(this.form).then(res => { saveFocusData(this.form).then((res) => {
this.submitLoading = false; this.submitLoading = false;
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -368,7 +402,7 @@
}); });
} else { } else {
// 编辑 // 编辑
saveFocusData(this.form).then(res => { saveFocusData(this.form).then((res) => {
this.submitLoading = false; this.submitLoading = false;
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -410,14 +444,14 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
delFocus(v.id).then(res => { delFocus(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
disableAll() { disableAll() {
@ -436,7 +470,7 @@
}); });
ids = ids.substring(0, ids.length - 1); ids = ids.substring(0, ids.length - 1);
// 批量删除 // 批量删除
disableFocus(ids).then(res => { disableFocus(ids).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("禁用成功"); this.$Message.success("禁用成功");
@ -444,13 +478,13 @@
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
} },
}, },
mounted() { mounted() {
this.init(); this.init();
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">

166
manager/src/views/page/focus/pcFocus.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row class="operation"> <Row class="operation">
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
<Button @click="disableAll" icon="md-trash">批量禁用</Button> <Button @click="disableAll" icon="md-trash">批量禁用</Button>
<Button @click="getDataList" icon="md-refresh">刷新</Button> <Button @click="getDataList" icon="md-refresh">刷新</Button>
<Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button> <Button type="dashed" @click="openTip = !openTip">{{
openTip ? "关闭提示" : "开启提示"
}}</Button>
</Row> </Row>
<Row v-show="openTip"> <Row v-show="openTip">
<Alert show-icon> <Alert show-icon>
@ -15,24 +15,54 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row> <Table
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> :loading="loading"
</Row> border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page> <Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</Col> <Modal
</Row> :title="modalTitle"
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500"> v-model="modalVisible"
<Form ref="form" :model="form" :label-width="100" :rules="formValidate" > <FormItem label="名称" prop="name" > :mask-closable="false"
:width="500"
>
<Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="名称" prop="name">
<Input v-model="form.name" clearable style="width: 100%" /> <Input v-model="form.name" clearable style="width: 100%" />
</FormItem> </FormItem>
<FormItem label="图片" prop="url"> <FormItem label="图片" prop="url">
<upload-pic-input v-model="form.url" style="width:100%"></upload-pic-input> <upload-pic-input
v-model="form.url"
style="width: 100%"
></upload-pic-input>
</FormItem> </FormItem>
<FormItem label="操作类型" prop="operationType"> <FormItem label="操作类型" prop="operationType">
<Select v-model="form.operationType" placeholder="请选择" clearable style="width: 200px"> <Select
v-model="form.operationType"
placeholder="请选择"
clearable
style="width: 200px"
>
<Option value="NONE">无操作</Option> <Option value="NONE">无操作</Option>
<Option value="URL">链接地址</Option> <Option value="URL">链接地址</Option>
<Option value="GOODS">商品序号</Option> <Option value="GOODS">商品序号</Option>
@ -50,7 +80,9 @@
</Form> </Form>
<div slot="footer"> <div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button> <Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button> <Button type="primary" :loading="submitLoading" @click="handleSubmit"
>提交</Button
>
</div> </div>
</Modal> </Modal>
</div> </div>
@ -62,14 +94,14 @@
saveFocusData, saveFocusData,
disableFocus, disableFocus,
enableFocus, enableFocus,
delFocus delFocus,
} from "@/api/pages"; } from "@/api/pages";
import uploadPicInput from "@/views/my-components/lili/upload-pic-input"; import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
export default { export default {
name: "pcFocus", name: "pcFocus",
components: { components: {
uploadPicInput uploadPicInput,
}, },
data() { data() {
return { return {
@ -78,14 +110,16 @@
modalType: 0, // 添加或编辑标识 modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示 modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题 modalTitle: "", // 添加或编辑标题
searchForm: { // 搜索框初始化对象 searchForm: {
// 搜索框初始化对象
clientType: "PC", //客户端类型 clientType: "PC", //客户端类型
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
form: { // 添加或编辑表单对象初始化数据 form: {
// 添加或编辑表单对象初始化数据
name: "", name: "",
operationType: "", operationType: "",
operationUrl: "", operationUrl: "",
@ -104,7 +138,7 @@
{ {
type: "selection", type: "selection",
width: 60, width: 60,
align: "center" align: "center",
}, },
{ {
title: "名称", title: "名称",
@ -118,26 +152,26 @@
minWidth: 100, minWidth: 100,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
if (params.row.status == 'CLOSE') { if (params.row.status == "CLOSE") {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "error", status: "error",
text: "禁用" text: "禁用",
} },
}) }),
]); ]);
} else if (params.row.status == 'OPEN') { } else if (params.row.status == "OPEN") {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "success", status: "success",
text: "启用" text: "启用",
} },
}) }),
]); ]);
} }
} },
}, },
{ {
title: "图片", title: "图片",
@ -148,17 +182,17 @@
return h("img", { return h("img", {
attrs: { attrs: {
src: params.row.url, src: params.row.url,
alt: "加载图片失败" alt: "加载图片失败",
}, },
style: { style: {
cursor: "pointer", cursor: "pointer",
width: "80px", width: "80px",
height: "60px", height: "60px",
margin: "10px 0", margin: "10px 0",
"object-fit": "contain" "object-fit": "contain",
} },
}); });
} },
}, },
{ {
title: "排序", title: "排序",
@ -179,16 +213,16 @@
{ {
props: { props: {
type: "success", type: "success",
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.enable(params.row); this.enable(params.row);
} },
} },
}, },
"启用" "启用"
); );
@ -197,16 +231,16 @@
"Button", "Button",
{ {
props: { props: {
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.disable(params.row); this.disable(params.row);
} },
} },
}, },
"禁用" "禁用"
); );
@ -217,16 +251,16 @@
{ {
props: { props: {
type: "primary", type: "primary",
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.edit(params.row); this.edit(params.row);
} },
} },
}, },
"编辑" "编辑"
), ),
@ -238,23 +272,23 @@
size: "small", size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.remove(params.row); this.remove(params.row);
} },
} },
}, },
"删除" "删除"
), ),
enableOrDisable, enableOrDisable,
]); ]);
} },
} },
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0 // 表单数据总数 total: 0, // 表单数据总数
}; };
}, },
methods: { methods: {
@ -300,7 +334,7 @@
getDataList() { getDataList() {
this.loading = true; this.loading = true;
// 带多条件搜索参数获取表单数据 请自行修改接口 // 带多条件搜索参数获取表单数据 请自行修改接口
getFocusData(this.searchForm).then(res => { getFocusData(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
this.data = res.result.records; this.data = res.result.records;
@ -321,14 +355,14 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
enableFocus(v.id).then(res => { enableFocus(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
disable(v) { disable(v) {
@ -339,26 +373,26 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
disableFocus(v.id).then(res => { disableFocus(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
this.form.ClientType = "PC" this.form.ClientType = "PC";
this.submitLoading = true; this.submitLoading = true;
if (this.modalType === 0) { if (this.modalType === 0) {
this.form.status = "OPEN" this.form.status = "OPEN";
// 添加 避免编辑后传入id等数据 记得删除 // 添加 避免编辑后传入id等数据 记得删除
delete this.form.id; delete this.form.id;
saveFocusData(this.form).then(res => { saveFocusData(this.form).then((res) => {
this.submitLoading = false; this.submitLoading = false;
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -368,7 +402,7 @@
}); });
} else { } else {
// 编辑 // 编辑
saveFocusData(this.form).then(res => { saveFocusData(this.form).then((res) => {
this.submitLoading = false; this.submitLoading = false;
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -410,14 +444,14 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
delFocus(v.id).then(res => { delFocus(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
disableAll() { disableAll() {
@ -436,7 +470,7 @@
}); });
ids = ids.substring(0, ids.length - 1); ids = ids.substring(0, ids.length - 1);
// 批量删除 // 批量删除
disableFocus(ids).then(res => { disableFocus(ids).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("禁用成功"); this.$Message.success("禁用成功");
@ -444,13 +478,13 @@
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
} },
}, },
mounted() { mounted() {
this.init(); this.init();
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">

169
manager/src/views/page/navigation/mobileNavigation.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row class="operation"> <Row class="operation">
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
<Button @click="disableAll" icon="md-trash">批量禁用</Button> <Button @click="disableAll" icon="md-trash">批量禁用</Button>
<Button @click="getDataList" icon="md-refresh">刷新</Button> <Button @click="getDataList" icon="md-refresh">刷新</Button>
<Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button> <Button type="dashed" @click="openTip = !openTip">{{
openTip ? "关闭提示" : "开启提示"
}}</Button>
</Row> </Row>
<Row v-show="openTip"> <Row v-show="openTip">
<Alert show-icon> <Alert show-icon>
@ -15,19 +15,37 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row> <Table
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" :loading="loading"
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> border
</Row> :columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" <Page
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" :current="searchForm.pageNumber"
size="small" show-total show-elevator show-sizer></Page> :total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row> </Row>
</Card> </Card>
</Col> <Modal
</Row> :title="modalTitle"
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500"> v-model="modalVisible"
:mask-closable="false"
:width="500"
>
<Form ref="form" :model="form" :label-width="100" :rules="formValidate"> <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="导航栏名称" prop="navigationName"> <FormItem label="导航栏名称" prop="navigationName">
<Input v-model="form.navigationName" clearable style="width: 100%" /> <Input v-model="form.navigationName" clearable style="width: 100%" />
@ -36,12 +54,17 @@
<Input v-model="form.url" clearable style="width: 100%" /> <Input v-model="form.url" clearable style="width: 100%" />
</FormItem> </FormItem>
<FormItem label="品牌图标" prop="image"> <FormItem label="品牌图标" prop="image">
<upload-pic-input v-model="form.image" style="width:100%"></upload-pic-input> <upload-pic-input
v-model="form.image"
style="width: 100%"
></upload-pic-input>
</FormItem> </FormItem>
</Form> </Form>
<div slot="footer"> <div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button> <Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button> <Button type="primary" :loading="submitLoading" @click="handleSubmit"
>提交</Button
>
</div> </div>
</Modal> </Modal>
</div> </div>
@ -54,14 +77,14 @@
disableNavigation, disableNavigation,
enableNavigation, enableNavigation,
delNavigation, delNavigation,
update update,
} from "@/api/pages"; } from "@/api/pages";
import uploadPicInput from "@/views/my-components/lili/upload-pic-input"; import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
export default { export default {
name: "mobileNavigation", name: "mobileNavigation",
components: { components: {
uploadPicInput uploadPicInput,
}, },
data() { data() {
return { return {
@ -71,21 +94,27 @@
modalType: 0, // 添加或编辑标识 modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示 modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题 modalTitle: "", // 添加或编辑标题
searchForm: { // 搜索框初始化对象 searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
form: { // 添加或编辑表单对象初始化数据 form: {
// 添加或编辑表单对象初始化数据
navigationName: "", navigationName: "",
image: "", image: "",
url: "", url: "",
}, },
// 表单验证规则 // 表单验证规则
formValidate: { formValidate: {
url: [{required: true, message: "导航栏url不能为空", trigger: "blur"}], url: [
navigationName: [{required: true, message: "导航栏不能为空", trigger: "blur"}], { required: true, message: "导航栏url不能为空", trigger: "blur" },
],
navigationName: [
{ required: true, message: "导航栏不能为空", trigger: "blur" },
],
}, },
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
@ -95,7 +124,7 @@
{ {
type: "selection", type: "selection",
width: 60, width: 60,
align: "center" align: "center",
}, },
{ {
title: "导航名称", title: "导航名称",
@ -109,26 +138,26 @@
minWidth: 100, minWidth: 100,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
if (params.row.status == 'CLOSE') { if (params.row.status == "CLOSE") {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "error", status: "error",
text: "禁用" text: "禁用",
} },
}) }),
]); ]);
} else if (params.row.status == 'OPEN') { } else if (params.row.status == "OPEN") {
return h("div", [ return h("div", [
h("Badge", { h("Badge", {
props: { props: {
status: "success", status: "success",
text: "启用" text: "启用",
} },
}) }),
]); ]);
} }
} },
}, },
{ {
title: "图片", title: "图片",
@ -139,17 +168,17 @@
return h("img", { return h("img", {
attrs: { attrs: {
src: params.row.image, src: params.row.image,
alt: "加载图片失败" alt: "加载图片失败",
}, },
style: { style: {
cursor: "pointer", cursor: "pointer",
width: "80px", width: "80px",
height: "60px", height: "60px",
margin: "10px 0", margin: "10px 0",
"object-fit": "contain" "object-fit": "contain",
} },
}); });
} },
}, },
{ {
title: "排序", title: "排序",
@ -163,7 +192,7 @@
align: "center", align: "center",
width: 250, width: 250,
render: (h, params) => { render: (h, params) => {
console.warn(params.status) console.warn(params.status);
let enableOrDisable = ""; let enableOrDisable = "";
if (params.row.status == "CLOSE") { if (params.row.status == "CLOSE") {
enableOrDisable = h( enableOrDisable = h(
@ -171,16 +200,16 @@
{ {
props: { props: {
type: "success", type: "success",
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.enable(params.row); this.enable(params.row);
} },
} },
}, },
"启用" "启用"
); );
@ -189,16 +218,16 @@
"Button", "Button",
{ {
props: { props: {
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.disable(params.row); this.disable(params.row);
} },
} },
}, },
"禁用" "禁用"
); );
@ -209,16 +238,16 @@
{ {
props: { props: {
type: "primary", type: "primary",
size: "small" size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.edit(params.row); this.edit(params.row);
} },
} },
}, },
"编辑" "编辑"
), ),
@ -230,23 +259,23 @@
size: "small", size: "small",
}, },
style: { style: {
marginRight: "5px" marginRight: "5px",
}, },
on: { on: {
click: () => { click: () => {
this.del(params.row); this.del(params.row);
} },
} },
}, },
"删除" "删除"
), ),
enableOrDisable, enableOrDisable,
]); ]);
} },
} },
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0 // 表单数据总数 total: 0, // 表单数据总数
}; };
}, },
methods: { methods: {
@ -290,10 +319,10 @@
this.selectCount = e.length; this.selectCount = e.length;
}, },
getDataList() { getDataList() {
this.searchForm.clientType = this.type this.searchForm.clientType = this.type;
this.loading = true; this.loading = true;
// 带多条件搜索参数获取表单数据 请自行修改接口 // 带多条件搜索参数获取表单数据 请自行修改接口
getNavigationData(this.searchForm).then(res => { getNavigationData(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
this.data = res.result.records; this.data = res.result.records;
@ -304,14 +333,14 @@
this.loading = false; this.loading = false;
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
this.submitLoading = true; this.submitLoading = true;
this.form.clientType = this.type this.form.clientType = this.type;
if (this.modalType === 0) { if (this.modalType === 0) {
// 添加 避免编辑后传入id等数据 记得删除 // 添加 避免编辑后传入id等数据 记得删除
delete this.form.id; delete this.form.id;
save(this.form).then(res => { save(this.form).then((res) => {
this.submitLoading = false; this.submitLoading = false;
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -321,7 +350,7 @@
}); });
} else { } else {
// 编辑 // 编辑
update(this.form).then(res => { update(this.form).then((res) => {
this.submitLoading = false; this.submitLoading = false;
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -363,14 +392,14 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
enableNavigation(v.id).then(res => { enableNavigation(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
disable(v) { disable(v) {
@ -381,14 +410,14 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
disableNavigation(v.id).then(res => { disableNavigation(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
disableAll() { disableAll() {
@ -407,7 +436,7 @@
}); });
ids = ids.substring(0, ids.length - 1); ids = ids.substring(0, ids.length - 1);
// 批量禁用 // 批量禁用
disableNavigation(ids).then(res => { disableNavigation(ids).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
@ -415,7 +444,7 @@
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
}, },
del(v) { del(v) {
@ -426,21 +455,21 @@
loading: true, loading: true,
onOk: () => { onOk: () => {
// 删除 // 删除
delNavigation(v.id).then(res => { delNavigation(v.id).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
this.$Message.success("操作成功"); this.$Message.success("操作成功");
this.getDataList(); this.getDataList();
} }
}); });
} },
}); });
} },
}, },
mounted() { mounted() {
this.init(); this.init();
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">

6
manager/src/views/page/navigation/pcNavigation.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row class="operation"> <Row class="operation">
<Button @click="add" type="primary" icon="md-add">添加</Button> <Button @click="add" type="primary" icon="md-add">添加</Button>
@ -15,18 +13,14 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500"> <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
<Form ref="form" :model="form" :label-width="100" :rules="formValidate"> <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="导航栏名称" prop="navigationName"> <FormItem label="导航栏名称" prop="navigationName">

9
manager/src/views/promotion/coupon/coupon.vue
View File

@ -42,7 +42,6 @@
<Button @click="delAll">批量下架</Button> <Button @click="delAll">批量下架</Button>
<!-- <Button @click="upAll" >批量上架</Button> --> <!-- <Button @click="upAll" >批量上架</Button> -->
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -54,13 +53,6 @@
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
> >
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<!-- <Button
type="info"
size="small"
style="margin-right: 10px"
@click="receiveInfo(row)"
>查看</Button
> -->
<Button <Button
v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
type="primary" type="primary"
@ -81,7 +73,6 @@
> >
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber + 1" :current="searchForm.pageNumber + 1"

2
manager/src/views/promotion/coupon/couponInfo.vue
View File

@ -72,9 +72,7 @@
</div> </div>
<h4>适用品类范围</h4> <h4>适用品类范围</h4>
<div> <div>
<Row>
<Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>

20
manager/src/views/promotion/coupon/couponPublish.vue
View File

@ -70,7 +70,7 @@
<FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'"> <FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
<div style="display: flex; margin-bottom: 10px"> <div style="display: flex; margin-bottom: 10px">
<Button type="primary" @click="$refs.skuSelect.open('goods')">选择商品</Button> <Button type="primary" @click="openSkuList">选择商品</Button>
<Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button> <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
</div> </div>
<Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect"> <Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
@ -392,6 +392,14 @@ export default {
); );
this.$router.go(-1); this.$router.go(-1);
}, },
openSkuList() { // 显示商品选择器
this.$refs.skuSelect.open("goods");
let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
data.forEach(e => {
e.id = e.skuId
})
this.$refs.skuSelect.goodsData = data;
},
changeSelect(e) { changeSelect(e) {
// 已选商品批量选择 // 已选商品批量选择
this.selectedGoods = e; this.selectedGoods = e;
@ -424,25 +432,19 @@ export default {
}, },
selectedGoodsData(item) { selectedGoodsData(item) {
// 回显已选商品 // 回显已选商品
let ids = [];
let list = []; let list = [];
this.form.promotionGoodsList.forEach((e) => {
ids.push(e.skuId);
});
item.forEach((e) => { item.forEach((e) => {
if (!ids.includes(e.id)) {
list.push({ list.push({
goodsName: e.goodsName, goodsName: e.goodsName,
price: e.price, price: e.price,
originalPrice: e.price, originalPrice: e.price,
quantity: e.quantity, quantity: e.quantity,
storeId: e.storeId, storeId: e.storeId,
sellerName: e.sellerName, storeName: e.storeName,
skuId: e.id, skuId: e.id,
}); });
}
}); });
this.form.promotionGoodsList.push(...list); this.form.promotionGoodsList = list;
}, },
getGoodsCategory(e) { getGoodsCategory(e) {
// 获取级联选择器商品分类id // 获取级联选择器商品分类id

6
manager/src/views/promotion/coupon/memberReceiveCoupon.vue
View File

@ -1,9 +1,6 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -28,7 +25,6 @@
> >
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -44,8 +40,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

2
manager/src/views/promotion/fullCut/full-cut.vue
View File

@ -43,7 +43,6 @@
<Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button> <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -71,7 +70,6 @@
</div> </div>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page operation"> <Row type="flex" justify="end" class="page operation">
<Page <Page
:current="searchForm.pageNumber + 1" :current="searchForm.pageNumber + 1"

2
manager/src/views/promotion/pintuan/pintuan.vue
View File

@ -45,7 +45,6 @@
> >
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -72,7 +71,6 @@
</Button> </Button>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber + 1" :current="searchForm.pageNumber + 1"

3
manager/src/views/promotion/pintuan/pintuanGoods.vue
View File

@ -10,10 +10,10 @@
></Table> ></Table>
<h4>商品信息</h4> <h4>商品信息</h4>
<Row class="operation">
<Table <Table
:loading="loading" :loading="loading"
border border
class="operation"
:columns="goodsColumns" :columns="goodsColumns"
:data="goodsData" :data="goodsData"
ref="table" ref="table"
@ -34,7 +34,6 @@
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page operation"> <Row type="flex" justify="end" class="page operation">
<Page <Page
:current="searchForm.pageNumber + 1" :current="searchForm.pageNumber + 1"

16
manager/src/views/promotion/pointsGoods/editPointsGoods.vue
View File

@ -5,19 +5,19 @@
<div class="base-info-item"> <div class="base-info-item">
<h4>积分商品信息</h4> <h4>积分商品信息</h4>
<div class="form-item-view"> <div class="form-item-view">
<FormItem label="商品名称" prop="goodsName"> <FormItem label="商品名称">
<div>{{ form.goodsSku.goodsName }}</div> <div>{{ form.goodsSku.goodsName }}</div>
</FormItem> </FormItem>
<FormItem label="SKU编码" prop="skuId"> <FormItem label="SKU编码">
<div>{{ form.goodsSku.id }}</div> <div>{{ form.goodsSku.id }}</div>
</FormItem> </FormItem>
<FormItem label="店铺名称" prop="sellerName"> <FormItem label="店铺名称">
<div>{{ form.goodsSku.sellerName }}</div> <div>{{ form.goodsSku.storeName }}</div>
</FormItem> </FormItem>
<FormItem label="商品价格" prop="goodsPrice"> <FormItem label="商品价格">
<div>{{ form.goodsSku.price | unitPrice('￥') }}</div> <div>{{ form.goodsSku.price | unitPrice('￥') }}</div>
</FormItem> </FormItem>
<FormItem label="库存" prop="quantity"> <FormItem label="库存">
<div>{{ form.goodsSku.quantity }}</div> <div>{{ form.goodsSku.quantity }}</div>
</FormItem> </FormItem>
<FormItem label="结算价格" prop="settlementPrice"> <FormItem label="结算价格" prop="settlementPrice">
@ -90,9 +90,7 @@
</FormItem> </FormItem>
</div> </div>
<div class="footer"> <div class="footer">
<Button @click="closeCurrentPage" style="margin-right: 5px" <Button @click="closeCurrentPage" style="margin-right: 5px">返回</Button>
>返回</Button
>
<Button <Button
type="primary" type="primary"
:loading="submitLoading" :loading="submitLoading"

2
manager/src/views/promotion/pointsGoods/pointsGoods.vue
View File

@ -61,7 +61,6 @@
<Button @click="addPointsGoods" type="primary" >添加积分商品</Button> <Button @click="addPointsGoods" type="primary" >添加积分商品</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -124,7 +123,6 @@
> >
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

18
manager/src/views/promotion/seckill/addSeckill.vue
View File

@ -148,11 +148,11 @@ export default {
} }
}); });
}, },
addPeriod() { addPeriod() { // 添加时间段显示input
this.addPeriodTime(); this.addPeriodTime();
this.showAddPeriod = true; this.showAddPeriod = true;
}, },
addPeriodTime() { addPeriodTime() { // 添加秒杀时间段
this.showAddPeriod = false; this.showAddPeriod = false;
if ( if (
this.periodTime !== null && this.periodTime !== null &&
@ -161,20 +161,10 @@ export default {
this.form.seckillPeriod.push(this.periodTime); this.form.seckillPeriod.push(this.periodTime);
} }
}, },
removePeriodTime(event, name) { removePeriodTime(event, name) { // 移除秒杀时间段
this.form.seckillPeriod = this.form.seckillPeriod.filter((i) => i !== name); this.form.seckillPeriod = this.form.seckillPeriod.filter((i) => i !== name);
}, },
handleSelectLink(item, index) { /** 添加秒杀活动 */
// 调起选择链接弹窗
if (item) this.selectedNav = item;
this.$refs.liliDialog.open('link')
},
changeScope(val) {
if (val === "PORTION_GOODS") {
this.handleSelectLink();
}
},
/** 保存平台优惠券 */
handleSubmit() { handleSubmit() {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {

4
manager/src/views/promotion/seckill/seckill.vue
View File

@ -53,7 +53,7 @@
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button type="primary" @click="add">添加活动</Button> <Button type="primary" @click="add">添加活动</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -112,7 +112,7 @@
> >
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber + 1" :current="searchForm.pageNumber + 1"

3
manager/src/views/promotion/seckill/seckillGoods.vue
View File

@ -29,10 +29,10 @@
<a class="select-clear" @click="clearSelectAll">清空</a> <a class="select-clear" @click="clearSelectAll">清空</a>
</Alert> </Alert>
</Row> </Row>
<Row class="operation">
<Table <Table
:loading="loading" :loading="loading"
border border
class="operation"
:columns="goodsColumns" :columns="goodsColumns"
:data="goodsList" :data="goodsList"
ref="table" ref="table"
@ -106,7 +106,6 @@
> >
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber + 1" :current="searchForm.pageNumber + 1"

77
manager/src/views/seller/bill/accountStatementBill.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -16,43 +14,13 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
<Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="账单号" prop="sn">
<Input v-model="form.sn" clearable style="width: 100%" />
</FormItem>
<FormItem label="店铺名称" prop="sellerName">
<Input v-model="form.sellerName" clearable style="width: 100%" />
</FormItem>
<FormItem label="结算开始时间" prop="startTime">
<DatePicker v-model="form.startTime" valueType="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%"></DatePicker>
</FormItem>
<FormItem label="结算结束时间" prop="endTime">
<DatePicker type="date" v-model="form.endTime" clearable style="width: 100%"></DatePicker>
</FormItem>
<FormItem label="最终结算金额" prop="billPrice">
<Input v-model="form.billPrice" clearable style="width: 100%" />
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交
</Button>
</div>
</Modal>
</div> </div>
</template> </template>
@ -65,9 +33,6 @@ export default {
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
@ -78,17 +43,6 @@ export default {
endDate: "", // 终止时间 endDate: "", // 终止时间
}, },
selectDate: null, // 选择一个事件段 selectDate: null, // 选择一个事件段
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数
columns: [ columns: [
@ -227,8 +181,6 @@ export default {
getDataList() { getDataList() {
this.loading = true; this.loading = true;
// this.searchForm
this.searchForm.startTime && this.searchForm.startTime &&
(this.searchForm.startTime = this.$options.filters.unixToDate( (this.searchForm.startTime = this.$options.filters.unixToDate(
this.searchForm.startTime / 1000 this.searchForm.startTime / 1000
@ -248,35 +200,6 @@ export default {
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
handleSubmit() {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
if (this.modalType === 0) {
// 添加 避免编辑后传入id等数据 记得删除
delete this.form.id;
this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
this.submitLoading = false;
if (res.success) {
this.$Message.success("操作成功");
this.getDataList();
this.modalVisible = false;
}
});
} else {
// 编辑
this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
this.submitLoading = false;
if (res.success) {
this.$Message.success("操作成功");
this.getDataList();
this.modalVisible = false;
}
});
}
}
});
},
detail(v) { detail(v) {
let id = v.id; let id = v.id;
this.$router.push({ this.$router.push({

4
manager/src/views/seller/bill/bill-detail.vue
View File

@ -48,7 +48,6 @@
<Tabs active-key="key1" @on-click="clickTabs"> <Tabs active-key="key1" @on-click="clickTabs">
<Tab-pane label="入账流水" key="key1"> <Tab-pane label="入账流水" key="key1">
<Card> <Card>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -56,7 +55,6 @@
:data="order" :data="order"
ref="table" ref="table"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="orderParam.pageNumber" :current="orderParam.pageNumber"
@ -73,7 +71,6 @@
</Tab-pane> </Tab-pane>
<Tab-pane label="退款流水" key="key2"> <Tab-pane label="退款流水" key="key2">
<Card> <Card>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -81,7 +78,6 @@
:data="refund" :data="refund"
ref="table" ref="table"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="refundParam.pageNumber" :current="refundParam.pageNumber"

111
manager/src/views/seller/bill/bill.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -24,46 +22,15 @@
</Form> </Form>
</Row> </Row>
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="add" type="primary">添加</Button>
<Button @click="delAll">批量删除</Button> <Button @click="delAll">批量删除</Button>
</Row> </Row>
<Row> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
<Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="账单号" prop="sn">
<Input v-model="form.sn" clearable style="width: 100%" />
</FormItem>
<FormItem label="店铺名称" prop="sellerName">
<Input v-model="form.sellerName" clearable style="width: 100%" />
</FormItem>
<FormItem label="结算开始时间" prop="startTime">
<DatePicker v-model="form.startTime" valueType="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%"></DatePicker>
</FormItem>
<FormItem label="结算结束时间" prop="endTime">
<DatePicker type="date" v-model="form.endTime" clearable style="width: 100%"></DatePicker>
</FormItem>
<FormItem label="最终结算金额" prop="billPrice">
<Input v-model="form.billPrice" clearable style="width: 100%" />
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交
</Button>
</div>
</Modal>
</div> </div>
</template> </template>
@ -76,9 +43,6 @@ export default {
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
@ -90,17 +54,6 @@ export default {
billStatus:"" //状态 billStatus:"" //状态
}, },
selectDate: null, // 选择一个时间段 selectDate: null, // 选择一个时间段
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数
columns: [ columns: [
@ -201,28 +154,20 @@ export default {
init() { init() {
this.getDataList(); this.getDataList();
}, },
changePage(v) { changePage(v) { // 改变页码
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
}, },
changePageSize(v) { changePageSize(v) { // 改变页数
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
handleSearch() { handleSearch() { // 搜索
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
changeSort(e) { changeSelect(e) { // 表格选中
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
changeSelect(e) {
this.selectList = e; this.selectList = e;
this.selectCount = e.length; this.selectCount = e.length;
}, },
@ -235,8 +180,6 @@ export default {
getDataList() { getDataList() {
this.loading = true; this.loading = true;
// this.searchForm
this.searchForm.startTime && this.searchForm.startTime &&
(this.searchForm.startTime = this.$options.filters.unixToDate( (this.searchForm.startTime = this.$options.filters.unixToDate(
this.searchForm.startTime / 1000 this.searchForm.startTime / 1000
@ -256,43 +199,7 @@ export default {
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
handleSubmit() { detail(v) { // 账单详情
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
if (this.modalType === 0) {
// 添加 避免编辑后传入id等数据 记得删除
delete this.form.id;
this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
this.submitLoading = false;
if (res.success) {
this.$Message.success("操作成功");
this.getDataList();
this.modalVisible = false;
}
});
} else {
// 编辑
this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
this.submitLoading = false;
if (res.success) {
this.$Message.success("操作成功");
this.getDataList();
this.modalVisible = false;
}
});
}
}
});
},
add() {
this.modalType = 0;
this.modalTitle = "添加";
this.$refs.form.resetFields();
delete this.form.id;
this.modalVisible = true;
},
detail(v) {
let id = v.id; let id = v.id;
this.$router.push({ this.$router.push({
name: "bill-detail", name: "bill-detail",
@ -314,14 +221,10 @@ export default {
this.getDataList(); this.getDataList();
} }
}); });
// 模拟请求成功
//this.$Message.success("操作成功");
//this.$Modal.remove();
//this.getDataList();
}, },
}); });
}, },
delAll() { delAll() { // 多选删除数据
if (this.selectCount <= 0) { if (this.selectCount <= 0) {
this.$Message.warning("您还未选择要删除的数据"); this.$Message.warning("您还未选择要删除的数据");
return; return;

6
manager/src/views/seller/shop/shopAuditList.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -29,16 +27,12 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

20
manager/src/views/seller/shop/shopDetail.vue
View File

@ -246,7 +246,6 @@
</Form> </Form>
</Row> </Row>
<div style="min-height: 180px"> <div style="min-height: 180px">
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -261,7 +260,6 @@
<a @click="$router.push({name: 'order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a> <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -349,7 +347,6 @@
</Form> </Form>
</Row> </Row>
<div style="min-height: 180px"> <div style="min-height: 180px">
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -386,7 +383,6 @@
<a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a> <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -474,7 +470,6 @@
</Form> </Form>
</Row> </Row>
<div style="min-height: 180px"> <div style="min-height: 180px">
<Row class="padding-row">
<Table <Table
:loading="loading" :loading="loading"
border border
@ -511,7 +506,6 @@
<a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a> <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
</template> </template>
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page" style="margin-top: 10px"> <Row type="flex" justify="end" class="page" style="margin-top: 10px">
<Page <Page
@ -597,6 +591,20 @@
title: "来源", title: "来源",
key: "clientType", key: "clientType",
width: 80, width: 80,
render: (h, params) => {
if (params.row.clientType == "H5") {
return h("div",{},"移动端");
}else if(params.row.clientType == "PC") {
return h("div",{},"PC端");
}else if(params.row.clientType == "WECHAT_MP") {
return h("div",{},"小程序端");
}else if(params.row.clientType == "APP") {
return h("div",{},"移动应用端");
}
else{
return h("div",{},params.row.clientType);
}
},
}, },
{ {
title: "订单状态", title: "订单状态",

6
manager/src/views/seller/shop/shopList.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -41,16 +39,12 @@
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="add" type="primary">添加</Button> <Button @click="add" type="primary">添加</Button>
</Row> </Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page> size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>

8
manager/src/views/seller/shop/shopOperation.vue
View File

@ -65,9 +65,17 @@
<FormItem label="详细地址" prop="salesConsigneeDetail"> <FormItem label="详细地址" prop="salesConsigneeDetail">
<Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" /> <Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
</FormItem> </FormItem>
<!-- <Divider orientation="left">腾讯云智服</Divider>
<FormItem label="唯一标识" prop="salesConsigneeDetail">
<Input v-model="shopForm.yzfSign" clearable style="width: 350px" />
</FormItem>
<FormItem label="小程序唯一标识" prop="salesConsigneeDetail">
<Input v-model="shopForm.yzfMpSign" clearable style="width: 350px" />
</FormItem> -->
<Spin fix v-if="loading"></Spin> <Spin fix v-if="loading"></Spin>
</div> </div>
</TabPane> </TabPane>
<!-- 入驻信息 -->
<TabPane label="入驻信息" class="tab" name="sms"> <TabPane label="入驻信息" class="tab" name="sms">
<!-- 遮罩层 --> <!-- 遮罩层 -->
<div v-if="isRead" class="mask">只读不可修改</div> <div v-if="isRead" class="mask">只读不可修改</div>

6
manager/src/views/sensitiveWords/index.vue
View File

@ -1,13 +1,10 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<Row class="operation"> <Row class="operation">
<Button @click="add" type="primary">添加</Button> <Button @click="add" type="primary">添加</Button>
<Button @click="delAll">批量删除</Button> <Button @click="delAll">批量删除</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -18,7 +15,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -34,8 +30,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"

4
manager/src/views/statistics/order.vue
View File

@ -52,7 +52,7 @@
</div> </div>
<div class="card-item"> <div class="card-item">
<div class="card-item-label">付款笔数</div> <div class="card-item-label">付款笔数</div>
<div class="card-item-value">{{overViewList.paymentsNum || 0}}</div> <div class="card-item-value">{{overViewList.paymentOrderNum || 0}}</div>
</div> </div>
<div class="card-item"> <div class="card-item">
<div class="card-item-label">付款金额</div> <div class="card-item-label">付款金额</div>
@ -305,7 +305,7 @@ export default {
}, },
{ {
title: "商家名称", title: "商家名称",
key: "sellerName", key: "storeName",
}, },
{ {
title: "售后单类型", title: "售后单类型",

2
manager/src/views/statistics/order/refundOrder.vue
View File

@ -38,7 +38,7 @@
</div> </div>
<div class="label-item"> <div class="label-item">
<span>店铺名称</span> <span>店铺名称</span>
<span>{{res.sellerName}}</span> <span>{{res.storeName}}</span>
</div> </div>
<div class="label-item"> <div class="label-item">
<span>创建时间</span> <span>创建时间</span>

3
manager/src/views/sys/log-manage/logManage.vue
View File

@ -55,7 +55,6 @@
</i-switch> </i-switch>
</Alert> </Alert>
</Row> </Row>
<Row>
<Table <Table
v-if="showDev" v-if="showDev"
@ -78,8 +77,6 @@
> >
</Table> </Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"

6
manager/src/views/sys/message/noticeMessageTemplate.vue
View File

@ -35,7 +35,6 @@
<Row class="operation" style="margin-top: 20px"> <Row class="operation" style="margin-top: 20px">
<Button @click="sendMessage" type="primary">发送消息</Button> <Button @click="sendMessage" type="primary">发送消息</Button>
</Row> </Row>
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -46,7 +45,6 @@
@on-sort-change="messageChangeSort" @on-sort-change="messageChangeSort"
@on-selection-change="messageChangeSelect" @on-selection-change="messageChangeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchMessageForm.pageNumber" :current="searchMessageForm.pageNumber"
@ -64,7 +62,6 @@
</TabPane> </TabPane>
<TabPane label="通知类站内信" name="SETTING"> <TabPane label="通知类站内信" name="SETTING">
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -75,7 +72,6 @@
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
@ -206,7 +202,6 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="指定商家"> <FormItem label="指定商家">
<Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -217,7 +212,6 @@
@on-sort-change="messageChangeSort" @on-sort-change="messageChangeSort"
@on-selection-change="messageChangeSelect" @on-selection-change="messageChangeSelect"
></Table> ></Table>
</Row>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
:current="searchShopMessageForm.pageNumber" :current="searchShopMessageForm.pageNumber"

Some files were not shown because too many files have changed in this diff Show More