Skip to content

E
ElectricitySheep
Commit a95b7ec0 authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

新增销售统计和直播管理 修改部分小问题

parent 817440e2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 728 additions and 46 deletions
src/components/StoreDesign/AppletPublishing.vue
View file @ a95b7ec0
...@@ -26,10 +26,11 @@ ...@@ -26,10 +26,11 @@
<div style="color: rgb(112, 115, 121);">live-player-plugin</div> <div style="color: rgb(112, 115, 121);">live-player-plugin</div>
</div> </div>
<el-switch <el-switch
@change ='UpdateLivePlayBtn'
style="margin-left: 50px" style="margin-left: 50px"
:active-value="1" :active-value="1"
:inactive-value="0" :inactive-value="0"
v-model="msg.assembly"> v-model="assembly">
</el-switch> </el-switch>
</div> </div>
<el-button type="primary" size="small" @click="JumpDeploy" style="margin-top: 20px">可跳转小程序设置</el-button> <el-button type="primary" size="small" @click="JumpDeploy" style="margin-top: 20px">可跳转小程序设置</el-button>
...@@ -55,6 +56,8 @@ ...@@ -55,6 +56,8 @@
<div style="text-align: center;" > <div style="text-align: center;" >
<img :src='previewQRcode' style="width: 150px; height: 150px; border: 1px solid rgb(226, 226, 226); margin-bottom: 12px;"> <img :src='previewQRcode' style="width: 150px; height: 150px; border: 1px solid rgb(226, 226, 226); margin-bottom: 12px;">
<div style="margin-bottom: 12px;">扫描二维码可以预览小程序</div> <div style="margin-bottom: 12px;">扫描二维码可以预览小程序</div>
<!--<input type="text" autocomplete="off" placeholder="请填写小程序版本号" class="el-input__inner" v-model="Version" style="width: 20%">-->
</div> </div>
<div style="padding: 20px; text-align: center;" > <div style="padding: 20px; text-align: center;" >
<el-button type="primary" @click="uploadApplet" :loading="upload_load">上传小程序</el-button> <el-button type="primary" @click="uploadApplet" :loading="upload_load">上传小程序</el-button>
...@@ -63,11 +66,13 @@ ...@@ -63,11 +66,13 @@
<div style="padding: 20px 10px;" v-if="active==3"> <div style="padding: 20px 10px;" v-if="active==3">
<div style="text-align: center;"> <div style="text-align: center;">
<img src="" alt="" style="width: 150px; height: 150px; border: 1px solid rgb(226, 226, 226); margin-bottom: 12px;"> <img :src="previewQRcode" alt="" style="width: 150px; height: 150px; border: 1px solid rgb(226, 226, 226); margin-bottom: 12px;">
<div style="margin-bottom: 12px;">扫描二维码可以预览小程序</div> <div style="margin-bottom: 12px;">扫描二维码可以预览小程序</div>
<div> <div>
<div style="margin-bottom: 12px;"><span>上传成功！</span> <span>请登录微信小程序平台（</span> <a href="https://mp.weixin.qq.com/" target="_blank">https://mp.weixin.qq.com/</a> <span>）发布小程序</span></div> <div style="margin-bottom: 12px;"><span>上传成功！</span> <span>请登录微信小程序平台（</span> <a href="https://mp.weixin.qq.com/" target="_blank">https://mp.weixin.qq.com/</a> <span>）发布小程序</span></div>
<div style="margin-bottom: 12px;"><div>版本号：4.2.73</div> <div>描述：</div></div> <div style="margin-bottom: 12px;">
<!--<div>版本号：{{Version}}</div> <div>描述：</div>-->
</div>
<div> <div>
<img src="http://wx.weibaoge.cn/plugins/wxapp/assets/upload-tip.png" style="max-width: 100%; height: auto; border: 1px dashed rgb(53, 182, 53);"> <img src="http://wx.weibaoge.cn/plugins/wxapp/assets/upload-tip.png" style="max-width: 100%; height: auto; border: 1px dashed rgb(53, 182, 53);">
</div> </div>
...@@ -78,7 +83,7 @@ ...@@ -78,7 +83,7 @@
</div> </div>
<!--可跳转小程序设置--> <!--可跳转小程序设置-->
<el-dialog title="可跳转小程序设置" :visible.sync="dialogVisible" width="1024px"> <el-dialog title="可跳转小程序设置" :visible.sync="dialogVisible" width="1024px">
<div class="el-dialog__body" :v-loading="AppIDLoading"> <div class="el-dialog__body" v-loading="AppIDLoading">
<div style="margin-bottom: 20px;">最多可配置10个，超出无效</div> <div style="margin-bottom: 20px;">最多可配置10个，超出无效</div>
<div flex="box:last" style="margin-bottom: 20px; width: 95%;" v-for="(item,index) of datas.JumpAppIdList" :key="index"> <div flex="box:last" style="margin-bottom: 20px; width: 95%;" v-for="(item,index) of datas.JumpAppIdList" :key="index">
<div class="el-input" style="margin-right: 10px;"> <div class="el-input" style="margin-right: 10px;">
...@@ -101,7 +106,7 @@ ...@@ -101,7 +106,7 @@
<img src="" alt="" style="width: 200px;"> <img src="" alt="" style="width: 200px;">
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="rightshow=false" >保存</el-button> <el-button type="primary" @click="rightshow=false" >确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -112,9 +117,7 @@ ...@@ -112,9 +117,7 @@
name: "AppletPublishing", name: "AppletPublishing",
data(){ data(){
return{ return{
msg:{ assembly:0,
assembly:0
},
active: 0, active: 0,
dialogVisible:false, dialogVisible:false,
AppIDLoading:false, AppIDLoading:false,
...@@ -128,6 +131,7 @@ ...@@ -128,6 +131,7 @@
upload_load:false, upload_load:false,
getLoginQRcode:'', getLoginQRcode:'',
previewQRcode:'', previewQRcode:'',
Version:'',
} }
}, },
methods:{ methods:{
...@@ -206,17 +210,32 @@ ...@@ -206,17 +210,32 @@
}) })
}, },
uploadApplet(){ uploadApplet(){
this.apipost("/api/Publish/GetPreviewAppletWeChat", {}, res => {
if (res.data.resultCode == 1) {
this.previewQRcode =res.data.data
this.active=3; this.active=3;
// this.apipost("/api/Publish/GetPreviewAppletWeChat", {}, res => {
// if (res.data.resultCode == 1) {
// this.previewQRcode =res.data.data
// this.active=3;
// } else {
// this.Info(res.data.message);
// }
// })
},
getApplet(){ //获取小程序的二维码
this.rightshow=true
},
UpdateLivePlayBtn(val){
this.apipost("/api/Tenant/UpdateLivePlayerPlugin", {'LivePlayerPlugin':val}, res => {
if (res.data.resultCode == 1) {
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
if(val==1){
this.assembly =0
}else {
this.assembly =1
}
} }
}) })
},
getApplet(){ //获取小程序的二维码
this.rightshow=true
} }
} }
......
src/components/StoreDesign/liveManage.vue 0 → 100644
View file @ a95b7ec0
<template>
<div class="liveManage">
<div class="el-card__header">
<span>直播管理</span>
</div>
<div class="table-body">
<el-button type="primary" size="small" style="margin-bottom: 15px;" @click="getNew" :loading="btnload">获取最新直播间列表</el-button>
<el-table
:data="tableData"
border
v-loading="loading"
style="width: 100%">
<el-table-column
prop="ID"
label="房间ID"
width="80">
</el-table-column>
<el-table-column
label="房间名"
width="220">
<template slot-scope="scope">
<div style="word-break: break-all;-webkit-line-clamp: 1;" class="vue-line-clamp">{{scope.row.name}}</div>
</template>
</el-table-column>
<el-table-column
label="主播信息"
width="553">
<template slot-scope="scope">
<div style="display: flex;flex-direction: row;align-items: center">
<img :src="scope.row.anchor_img" alt="" style="width: 45px; height: 45px;">
<div style="margin-left: 5px">{{ scope.row.anchor_name }}</div>
</div>
</template>
</el-table-column>
<el-table-column
label="封面图片"
width="120">
<template slot-scope="scope">
<img :src="scope.row.cover_img" alt="" style="width: 45px; height: 45px;">
</template>
</el-table-column>
<el-table-column
label="计划直播时间"
width="180">
<template slot-scope="scope">
<div>{{scope.row.start_time}}</div>
<div>{{scope.row.end_time}}</div>
</template>
</el-table-column>
<el-table-column
label="状态">
<template slot-scope="scope">
<div class="el-tag" v-if="scope.row.live_status==101">直播中</div>
<div class="el-tag" v-if="scope.row.live_status==102">未开始</div>
<div class="el-tag" v-if="scope.row.live_status==103">已结束</div>
<div class="el-tag" v-if="scope.row.live_status==104">禁播</div>
<div class="el-tag" v-if="scope.row.live_status==105">暂停中</div>
<div class="el-tag" v-if="scope.row.live_status==106">异常</div>
<div class="el-tag" v-if="scope.row.live_status==107">已过期</div>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="count">
</el-pagination>
</div>
</div>
</template>
<script>
export default {
name: "liveManage",
data(){
return{
msg:{
pageIndex:1,
pageSize:20,
},
count:0,
tableData: [],
loading:false,
btnload:false,
}
},
created(){
this.getDateList()
},
methods:{
getDateList(){
this.loading=true;
this.apipost("/api/Publish/GetLiveHousePageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.tableData = res.data.data.pageData;
this.count = res.data.data.count;
}else {
this.Info(res.data.message);
}
})
},
getNew(){
this.btnload=true;
this.apipost("/api/Publish/GetLiveInfo", {}, res => {
this.btnload=false;
if(res.data.resultCode==1){
this.getDateList()
}else {
this.Info(res.data.message);
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getIntegraStatisticslList();
},
}
}
</script>
<style >
.liveManage .el-card__header{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background: #fff;
}
.liveManage .table-body {
padding: 20px;
background-color: #fff;
margin-top: 10px;
}
.liveManage .el-tag {
background-color: #ecf5ff;
border-color: #d9ecff;
display: inline-block;
height: 32px;
padding: 0 10px;
line-height: 30px;
font-size: 12px;
color: #409EFF;
border-width: 1px;
border-style: solid;
border-radius: 4px;
box-sizing: border-box;
white-space: nowrap;
}
</style>
src/components/sallCenter/addAutoreleaseCoupon.vue
View file @ a95b7ec0
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
:data="tableData" :data="tableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
:v-loading="loading" v-loading="loading"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
......
src/components/sallCenter/autorelease.vue
View file @ a95b7ec0
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
header-cell-class-name="headClass" header-cell-class-name="headClass"
style="width: 1707px;" style="width: 1707px;"
border border
:v-loading="loading" v-loading="loading"
> >
<el-table-column <el-table-column
......
src/components/sallCenter/couponManage.vue
View file @ a95b7ec0
...@@ -85,9 +85,10 @@ ...@@ -85,9 +85,10 @@
<!--PickupType--> <!--PickupType-->
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
:active-value="2" @change="dianswitch(scope.row)"
:inactive-value="1" :active-value="1"
v-model="scope.row.PickupType" :inactive-value="0"
v-model="scope.row.PickupCenter"
> >
</el-switch> </el-switch>
</template> </template>
...@@ -199,6 +200,16 @@ ...@@ -199,6 +200,16 @@
getList(){ getList(){
this.getDateList() this.getDateList()
}, },
dianswitch(row){
this.apipost("/api/Coupon/UpdatePickupType", {'Id':row.ID}, res => {
if(res.data.resultCode==1){
this.Success(res.data.message);
}else {
this.Info(res.data.message);
}
})
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getDateList(); this.getDateList();
......
src/components/sallCenter/integralSetting.vue
View file @ a95b7ec0
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
ID:0, ID:0,
IntegralNum:0, IntegralNum:0,
Explain:'', Explain:'',
} },
loading:false
} }
}, },
created(){ created(){
...@@ -55,7 +57,10 @@ ...@@ -55,7 +57,10 @@
}) })
}, },
preserve(){ preserve(){
this.loading=true
this.apipost("/api/Integral//AddOrUpdateIntegralSettings",this.msg , res => { this.apipost("/api/Integral//AddOrUpdateIntegralSettings",this.msg , res => {
this.loading=false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
......
src/components/setup/basicSetUp.vue
View file @ a95b7ec0
...@@ -860,9 +860,9 @@ ...@@ -860,9 +860,9 @@
<el-button @click="openChangeDig(11)">选择图标</el-button> <el-button @click="openChangeDig(11)">选择图标</el-button>
</el-tooltip> </el-tooltip>
<div class="img_yuan"> <div class="img_yuan">
<img v-if="msg.SellOutDefaultIco == true" src="../../assets/img/setup/plugins-out.png" alt="" style="background: black"> <img v-if="msg.SellOutDefaultIco == 1" src="../../assets/img/setup/plugins-out.png" alt="" style="background: black">
<img v-if="msg.SellOutDefaultIco == false && msg.GoodsNormalPic" :src='msg.GoodsNormalPic' alt=""> <img v-if="msg.SellOutDefaultIco == 0 && msg.GoodsNormalPic" :src='msg.GoodsNormalPic' alt="">
<img v-else src="../../assets/img/setup/default_img.png" alt=""> <img v-if="msg.SellOutDefaultIco==0 && (msg.GoodsNormalPic==null||msg.GoodsNormalPic=='')" src="../../assets/img/setup/default_img.png" alt="">
</div> </div>
</el-form-item> </el-form-item>
...@@ -871,9 +871,9 @@ ...@@ -871,9 +871,9 @@
<el-button @click="openChangeDig(12)">选择图标</el-button> <el-button @click="openChangeDig(12)">选择图标</el-button>
</el-tooltip> </el-tooltip>
<div class="img_yuan"> <div class="img_yuan">
<img v-if="msg.SellOutDefaultIco == true" src="../../assets/img/setup/plugins-out.png" alt="" style="background: black"> <img v-if="msg.SellOutDefaultIco == 1" src="../../assets/img/setup/plugins-out.png" alt="" style="background: black">
<img v-if="msg.SellOutDefaultIco == false&& msg.GoodsZoomPic" :src='msg.GoodsZoomPic' alt=""> <img v-if="msg.SellOutDefaultIco == 0 && msg.GoodsZoomPic" :src='msg.GoodsZoomPic' alt="">
<img v-else src="../../assets/img/setup/default_img.png" alt=""> <img v-if="msg.SellOutDefaultIco==0 && (msg.GoodsZoomPic==null||msg.GoodsZoomPic=='')" src="../../assets/img/setup/default_img.png" alt="">
</div> </div>
</el-form-item> </el-form-item>
......
src/components/setup/electronFaceSheet.vue
View file @ a95b7ec0
...@@ -144,16 +144,26 @@ ...@@ -144,16 +144,26 @@
}, },
moren:{ moren:{
ID:0, ID:0,
ExpressId:-1,
IsSubscribeSMS:0,
IsPrintGoods:0,
Account:'',
Password:'',
MonthlyCode:'',
WebCode:'',
WebDot:'',
Company:'', Company:'',
Name:'', Name:'',
Mobile:'', Mobile:'',
Phone:'', Phone:'',
Email:'', Email:'',
Address:'',
ProvinceId:'', ProvinceId:'',
CityId:'', CityId:'',
DistrictId:'', DistrictId:'',
position:[], Address:'',
IsDefault:1,
position:[]
}, },
list:[], list:[],
...@@ -214,15 +224,40 @@ ...@@ -214,15 +224,40 @@
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
delete this.moren.position //删除position 不传到后台 delete this.moren.position //删除position 不传到后台
// this.apipost("/api/MallBase/SetLogisticsElectronicSheet",this.moren , res => { this.apipost("/api/MallBase/AddOrUpdateElectronicSheet",this.moren , res => {
// if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// this.Success(res.data.message); this.Success(res.data.message);
// this.dialogFormVisible=false this.dialogFormVisible=false;
// this.getElectronicSheetPage()
// } else { this.moren={
// this.Info(res.data.message); ID:0,
// } ExpressId:-1,
// }) IsSubscribeSMS:0,
IsPrintGoods:0,
Account:'',
Password:'',
MonthlyCode:'',
WebCode:'',
WebDot:'',
Company:'',
Name:'',
Mobile:'',
Phone:'',
Email:'',
ProvinceId:'',
CityId:'',
DistrictId:'',
Address:'',
IsDefault:1,
position:[]
}
} else {
this.Info(res.data.message);
}
})
} else { } else {
return false; return false;
} }
......
src/components/setup/uploadSettings.vue
View file @ a95b7ec0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class='table-body'> <div class='table-body'>
<el-table <el-table
:data="tableData" :data="tableData"
:v-loading="loading" v-loading="loading"
border border
style="width: 1705px"> style="width: 1705px">
<el-table-column <el-table-column
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.dialogVisible = false; this.dialogVisible = false;
this.getDateList()
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
......
src/components/setup/view/regionChoice.vue
View file @ a95b7ec0
...@@ -581,6 +581,7 @@ ...@@ -581,6 +581,7 @@
Receive(val,val2=[],isban=false){ Receive(val,val2=[],isban=false){
this.regionList = []; this.regionList = [];
this.loading=true; this.loading=true;
this.provinceindex=0;
this.cityindex=0; this.cityindex=0;
this.areaindex=0; this.areaindex=0;
this.cityID=0; this.cityID=0;
......
src/components/statistics/grantStatistics.vue
View file @ a95b7ec0
...@@ -54,19 +54,19 @@ ...@@ -54,19 +54,19 @@
<div class="zongshow"> <div class="zongshow">
<div class="num-info"> <div class="num-info">
<div class="num-info-item"> <div class="num-info-item">
<div>{{Totaldata.Income!=null ?Totaldata.Income:0 }}</div> <div>{{Totaldata.IsSued!=null ?Totaldata.IsSued:0 }}</div>
<div class="info-item-name">发放总数</div> <div class="info-item-name">发放总数</div>
</div> </div>
<div class="num-info-item"> <div class="num-info-item">
<div>{{Totaldata.Expend!=null ?Totaldata.Expend:0 }}</div> <div>{{Totaldata.Used!=null ?Totaldata.Used:0 }}</div>
<div class="info-item-name">已使用总数</div> <div class="info-item-name">已使用总数</div>
</div> </div>
<div class="num-info-item"> <div class="num-info-item">
<div>{{Totaldata.Expend!=null ?Totaldata.Expend:0 }}</div> <div>{{Totaldata.UnUsed!=null ?Totaldata.UnUsed:0 }}</div>
<div class="info-item-name">未使用总数</div> <div class="info-item-name">未使用总数</div>
</div> </div>
<div class="num-info-item"> <div class="num-info-item">
<div>{{Totaldata.Expend!=null ?Totaldata.Expend:0 }}</div> <div>{{Totaldata.Voksi!=null ?Totaldata.Voksi:0 }}</div>
<div class="info-item-name">已失效总数</div> <div class="info-item-name">已失效总数</div>
</div> </div>
</div> </div>
...@@ -149,8 +149,10 @@ ...@@ -149,8 +149,10 @@
activeName:'', activeName:'',
loading:false, loading:false,
Totaldata:{ Totaldata:{
Expend:0, IsSued: "0",
Income:0, UnUsed: "0",
Used: "0",
Voksi: "0",
}, },
} }
}, },
...@@ -218,9 +220,9 @@ ...@@ -218,9 +220,9 @@
} }
msg = JSON.parse(JSON.stringify(msg)); msg = JSON.parse(JSON.stringify(msg));
this.JavaGetLocalFile( this.JavaGetLocalFile(
"/api/Integral/GetIntegralListToExcel", "/api/Coupon/GetCouponListToExcel",
msg, msg,
"积分收支.xls" "优惠券-发布统计.xls"
); );
}, },
empty(){ empty(){
......
src/components/statistics/integralBudget.vue
View file @ a95b7ec0
...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
this.msg.EndDate=''; this.msg.EndDate='';
this.value=''; this.value='';
this.activeName=''; this.activeName='';
this.getIntegraStatisticslList()
}, },
handleClick(tab, event) { handleClick(tab, event) {
......
src/components/statistics/salesStatistics.vue 0 → 100644
View file @ a95b7ec0
This diff is collapsed.
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