Skip to content

M
mallapp
Commit 6c6ad5ce authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

parents 688623c7 862539d0
Show whitespace changes
Inline Side-by-side
Showing with 498 additions and 9 deletions
pages.json
View file @ 6c6ad5ce
......@@ -814,6 +814,10 @@
"path": "modifyAddress"//修改地址
},{
"path": "sendGoods" //发货
},{
"path": "commentsManage" //评论管理
},{
"path": "tixianApply" //提现申请
}]
}
],
......
pages/MallMange/commentsManage.vue 0 → 100644
View file @ 6c6ad5ce
<template>
<view class="comManage" :style="{height: contentHeight,}">
<view style="padding: 10px 0; background: #fff;">
<u-tabs :list="list" :is-scroll="false" :current="current" name="Name" @change="change"
:active-color="mainColor" bg-color="#FFF" height="80" bar-width="100"></u-tabs>
</view>
<view style="height: calc(100vh - 80px); background: #fff;" v-if="dataList.length == 0">
<u-empty text="暂无相关数据" mode="order"></u-empty>
</view>
<view v-if="dataList.length>0"
style="height: calc(100vh - 80px);width: calc(100vw);overflow: hidden;padding: 25rpx;background-color: #F7F7F7;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lowerTwo"
:style="{ height: '100%' }">
<view class="commentList" v-for="(item,index) in dataList" :key="index">
<view class="commentTop">
<view class="comment_Left">
<img style="width:100%;height:100%;" :src="item.CoverImage" alt="" />
</view>
<view class="comment_Right">
<view class="comment_Nei">{{item.Content}}</view>
<view class="comment_Replay">
来自用户 {{item.UserName}}
</view>
</view>
</view>
<view class="commentTop" style="margin-top:20rpx;justify-content: space-between;">
<view style="display:flex;align-items: center;font-size:22rpx;">
<img style="width:48rpx;height:48rpx;margin-right:10rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/good.png" />
{{item.CommentGradeName}}
</view>
<view>
<u-button size="mini" v-if="item.Is_Top==1" @click="commonSet(item,5)" class="ComStyle" shape="circle">取消置顶</u-button>
<u-button size="mini" v-if="item.Is_Top==2" @click="commonSet(item,4)" class="ComStyle" shape="circle">置顶</u-button>
<u-button size="mini" v-if="item.Is_Show==1" class="ComStyle" @click="commonSet(item,2)" shape="circle">隐藏评论</u-button>
<u-button size="mini" v-if="item.Is_Show==2" class="ComStyle" @click="commonSet(item,3)" shape="circle">显示评论</u-button>
<u-button size="mini" @click="getReplay(item)" class="ComStyle" shape="circle">回复</u-button>
</view>
</view>
</view>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20"
bg-color="#f3f4f6" />
</scroll-view>
</view>
<u-modal v-model="showReplayBox" :show-cancel-button="true" title="回复" contentSlot @confirm="SaveReply">
<textarea style="height: 120px;" class="replayRemark" v-model="hfMsg.Content" />
</u-modal>
</view>
</template>
<script>
export default {
components: {
},
data() {
return {
pageTitle: "评论管理",
current: 0,
contentHeight: 0,
mainColor: "",
page_count: 1,
dataList: [],
msg: {
pageIndex: 1,
pageSize: 15,
CommentGrade: 1,
PlatformSource: 0,
UserName: '',
GoodsName: '',
Content: '',
}, //分销商msg
list: [{
name: '好评'
}, {
name: '中评'
}, {
name: '差评'
}],
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
currentScore: 0,
showReplayBox:false,
hfMsg: {
OrderDetailIds: '',
Type: 1,
Content: '',
},
};
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad: function(option) {
//this.current = option.status || -1;
this.getList();
},
methods: {
change(index) {
this.current=index;
if(index==0){
this.msg.CommentGrade=1;
}
if(index==1){
this.msg.CommentGrade=2;
}
if(index==2){
this.msg.CommentGrade=3;
}
this.dataList = [];
this.msg.pageIndex = 1;
this.getList();
},
getList() {
uni.showLoading({
title: '加载中'
});
this.requestAdmin("/api/order/GetGoodsCommentPageList", this.msg, res => {
uni.hideLoading();
if (res.resultCode == 1) {
this.dataList = res.data.pageData;
this.page_count = res.data.pageCount;
}
})
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.getList();
} else {
this.status = "nomore";
}
},
//显示 隐藏评论
commonSet(obj,type) {
let msg={
OrderDetailIds:obj.OrderDetailId,
Type:type
}
this.requestAdmin("/api/order/SetCommentBatchByOrderDetailId", msg, res => {
if (res.resultCode == 1) {
uni.showToast({
title: res.message
});
this.getList();
} else {
uni.showToast({
title: res.message
});
}
})
},
//点击回复
getReplay(item){
this.hfMsg.OrderDetailIds = item.OrderDetailId
this.showReplayBox =true;
},
//保存回复
SaveReply(){
this.requestAdmin("/api/order/SetCommentBatchByOrderDetailId", this.hfMsg, res => {
if (res.resultCode == 1) {
uni.showToast({
title: res.message
});
this.getList();
this.showReplayBox = false;
} else {
uni.showToast({
title: res.message
});
}
})
}
}
};
</script>
<style>
.comManage {
width: 100%;
height: 100%;
}
.commentList {
width: 100%;
background-color: #E5E5E5;
padding: 20rpx;
margin-bottom: 25rpx;
border-radius: 20rpx;
}
.commentTop {
display: flex;
}
.replayRemark {
border: 1px solid #d1d1d1;
margin: 40rpx 0 40rpx 28rpx;
padding:20rpx;
width:500rpx;
}
.comment_Left {
width: 150rpx;
height: 150rpx;
flex-shrink: 0;
}
.comment_Right {
width: 560rpx;
height: 160rpx;
background-color: #DEDEDE;
border-radius: 10rpx;
padding: 10rpx 10rpx 10rpx 20rpx;
position: relative;
}
.comment_Nei {
font-size: 24rpx;
color: #000000;
}
.comment_Replay {
color: #999999;
font-size: 24rpx;
position: absolute;
bottom: 15rpx;
}
.ComStyle {
margin-right: 20rpx;
}
.ComStyle:last-child{
margin-right:0;
}
</style>
pages/MallMange/index.vue
View file @ 6c6ad5ce
......@@ -48,7 +48,7 @@
/>
<view class="iconname">审核消息</view>
</view> -->
<view class="itemBox">
<view class="itemBox" @click="goUserList('tixianApply')">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/cash.png"
mode=""
......@@ -56,7 +56,7 @@
/>
<view class="iconname">提现申请</view>
</view>
<view class="itemBox">
<view class="itemBox" @click="goUserList('commentsManage')">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/comment.png"
mode=""
......@@ -64,7 +64,7 @@
/>
<view class="iconname">评论管理</view>
</view>
<view class="itemBox" @click="goUserList()">
<view class="itemBox" @click="goUserList('userManage')">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/user.png"
mode=""
......@@ -479,11 +479,13 @@ export default {
);
},
//跳转到用户管理
goUserList() {
goUserList(item) {
let temp=item
uni.navigateTo({
url: "/pages/MallMange/userManage",
url: "/pages/MallMange/"+item,
});
},
//
//跳转页面
jumpPage(url) {
uni.navigateTo({
......@@ -639,7 +641,7 @@ export default {
margin: 0 auto;
.dayitem {
width: 150rpx;
width: 152rpx;
height: 100%;
font-size: 24rpx;
text-align: center;
......
pages/MallMange/tixianApply.vue 0 → 100644
View file @ 6c6ad5ce
<template>
<view class="userManage" :style="{height: contentHeight,}">
<view style="padding: 10px 0; background: #fff;">
<u-tabs :list="AuditStatusList" :is-scroll="false" :current="current" name="Name" @change="change"
:active-color="mainColor" bg-color="#FFF" height="80" bar-width="100"></u-tabs>
</view>
<view style="height: calc(100vh - 50px); background: #fff;" v-if="dataList.length == 0">
<u-empty text="暂无相关数据" mode="order"></u-empty>
</view>
<view v-if="dataList.length>0"
style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden;padding: 25rpx;background-color: #F7F7F7;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lowerTwo"
:style="{ height: '100%' }">
<view class="userList" v-for="(item,index) in dataList">
<view class="user_Top">
<view class="user_Header">
<img style="width:100%;height:100%;" :src="item.Photo" alt="">
</view>
<view>
<view class="userName">{{item.UserName}}</view>
<view class="tixianLevel">提现金额：{{item.AppliedMoney}}</view>
<view class="tixianLevel">手续费：{{item.Fee}}</view>
<view class="tixianLevel">打款金额：{{item.RemitMoney}}</view>
</view>
</view>
<view style="display: flex;justify-content:flex-end;margin-top: 20rpx;">
<u-button size="mini" class="ucustomStyle" shape="circle" @click="getTixianWay(item)">提现详情
</u-button>
<u-button size="mini" v-if="item.AuditStatus==1 || item.AuditStatus==2" class="ucustomStyle" shape="circle" @click="openReason(item,3)">拒绝
</u-button>
<u-button size="mini" v-if="item.AuditStatus==1" shape="circle" @click="openReason(item,1)">通过</u-button>
<u-button size="mini" v-if="item.AuditStatus==2" shape="circle" @click="openReason(item,2)">打款</u-button>
</view>
</view>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20"
:margin-bottom="20" bg-color="#f3f4f6" />
</scroll-view>
</view>
<u-modal v-model="isShowTixianWay" :show-cancel-button="false" title="提现方式" contentSlot @confirm="SaveTixian">
<view style="margin:40rpx;font-size:28rpx;">提现方式：{{tixianWay}}</view>
</u-modal>
<u-modal v-model="isShowAgree" :show-cancel-button="true" :title="commonTitle" contentSlot @confirm="SaveAgree">
<textarea style="height: 120px;" class="replayRemark" v-model="addMsg.Remark" />
</u-modal>
</view>
</template>
<script>
export default {
components: {
},
data() {
return {
pageTitle: "提现申请",
current: 0,
contentHeight: 0,
mainColor: "",
page_count: 1,
dataList: [],
u: {},
msg:{
pageIndex:1,
pageSize:15,
AuditStatus:0,
UserId:0,
},
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
AuditStatusList:[], //流程list
isShowTixianWay:false,
tixianWay:'',
addMsg:{
RemitId:0,
Type:1,
Remark:'',
ErpEmpId:0
},
isShowAgree:false,
commonTitle:'', //申请标题
};
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad: function(option) {
this.GetAuditStatus();
this.getList();
},
methods: {
change(index) {
this.current = index;
this.dataList = [];
this.msg.AuditStatus = index;
this.msg.pageIndex = 1;
this.getList();
},
getList(type) {
this.dataList = [];
uni.showLoading({
title: '加载中'
});
this.requestAdmin(
"/api/user/GetDistributorRemitPageList",
this.msg,
(res) => {
uni.hideLoading();
if (res.resultCode == 1) {
this.dataList = this.dataList.concat(res.data.pageData);
this.page_count = res.data.pageCount;
}
}
);
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.getList();
} else {
this.status = "nomore";
}
},
//获取顶部条件
GetAuditStatus(){
this.requestAdmin("/api/user/GetDistributorRemitAuditStatusEnumList",{}, res => {
if(res.resultCode==1){
this.AuditStatusList=res.data;
let obj={
Name:'全部',
Id:0
}
this.AuditStatusList.unshift(obj);
}
})
},
//弹出提现详情
getTixianWay(item){
this.isShowTixianWay=true;
this.tixianWay = item.WithdrawalWayName;
},
SaveTixian(){
this.isShowTixianWay=false;
},
openReason(item,type){
this.isShowAgree=true;
this.addMsg.Remark='';
this.addMsg.Type=type;
this.addMsg.RemitId=item.Id;
if(type==1){
this.commonTitle='通过申请'
}else if(type==3){
this.commonTitle='拒绝申请'
}else{
this.commonTitle='打款申请'
}
},
//保存同意拒绝
SaveAgree(){
this.requestAdmin("/api/user/SetDistributorRemitAudit",this.addMsg, res => {
if(res.resultCode==1){
uni.showToast({
title: '操作成功',
icon: 'none',
})
this.getList();
this.isShowAgree=false;
}else{
uni.showToast({
title: res.message,
icon: 'none',
})
}
})
}
}
};
</script>
<style>
.userManage {
width: 100%;
height: 100%;
background: #f3f4f6;
}
.userManage .userList {
width: 100%;
background-color: #fff;
padding: 20rpx;
margin-bottom: 25rpx;
}
.user_Top {
display: flex;
}
.userName {
font-size: 30rpx;
color: #000;
}
.tixianLevel {
font-size: 26rpx;
color: #999999;
margin-top:10rpx;
}
.user_Header {
width: 100rpx;
height: 100rpx;
border-radius: 10rpx;
overflow: hidden;
margin-right: 20rpx;
}
.user_Header img {
border-radius: 10rpx;
}
.ucustomStyle {
margin-right: 20rpx;
}
.replayRemark {
border: 1px solid #d1d1d1;
margin: 40rpx 0 40rpx 28rpx;
padding:20rpx;
width:500rpx;
}
</style>
pages/MallMange/userManage.vue
View file @ 6c6ad5ce
......@@ -261,7 +261,6 @@
(res) => {
uni.hideLoading();
if (res.resultCode == 1) {
console.log(res, '数据');
this.dataList = this.dataList.concat(res.data.pageData);
this.page_count = res.data.pageCount;
}
......@@ -301,7 +300,6 @@
(res) => {
uni.hideLoading();
if (res.resultCode == 1) {
console.log(res, '数据333');
this.dataList = this.dataList.concat(res.data.pageData);
this.page_count = res.data.pageCount;
}
......@@ -310,7 +308,6 @@
},
//点击修改获取信息
getItemInfo(obj) {
console.log(obj);
this.addMsg.Id = obj.Id;
this.addMsg.Remark = obj.Remark;
this.showRemarkBox = true;
......@@ -570,6 +567,8 @@
.inputRemark {
border: 1px solid #d1d1d1;
margin: 40rpx 0 40rpx 28rpx;
padding:20rpx;
width:500rpx;
}
.userManInput {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment