Skip to content

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

1

parent 6ab785fc
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 43 deletions
src/components/StoreDesign/AppletPublishing.vue
View file @ 7dbdf5a4
......@@ -35,7 +35,7 @@
</div>
<el-button type="primary" size="small" @click="JumpDeploy" style="margin-top: 20px">可跳转小程序设置</el-button>
<div style="text-align: center;">
<el-button type="primary" @click="active=1" >下一步</el-button>
<el-button type="primary" @click="updateSet" >下一步</el-button>
</div>
</div>
......@@ -101,9 +101,10 @@
</div>
</el-dialog>
<!--可跳转小程序设置-->
<!--TODO 不确定参数是否是这样-->
<el-dialog title="小程序码" :visible.sync="rightshow" width="418px">
<div style="text-align: center;">
<img src="" alt="" style="width: 200px;">
<img :src="getWeiXin" alt="" style="width: 200px;">
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="rightshow=false" >确定</el-button>
......@@ -130,6 +131,7 @@
getQRcode_load:false,
upload_load:false,
getLoginQRcode:'',
getWeiXin:'',
previewQRcode:'',
Version:'',
}
......@@ -173,6 +175,15 @@
}
})
},
updateSet(){
this.apipost("/api/Publish/UpdateSetting", {}, res => {
if (res.data.resultCode == 1) {
this.active=1;
} else {
this.Info(res.data.message);
}
})
},
getSignQRcode(){
this.getQRcode_load = true
this.apipost("/api/Publish/GetLoginAppletWeChat", {}, res => {
......@@ -221,7 +232,14 @@
// })
},
getApplet(){ //获取小程序的二维码
this.rightshow=true
this.rightshow=true;
this.apipost("/api/Publish/GetWeiXinShare", {}, res => {
if (res.data.resultCode == 1) {
this.getWeiXin = res.data.data;
} else {
this.Info(res.data.message);
}
})
},
UpdateLivePlayBtn(val){
this.apipost("/api/Tenant/UpdateLivePlayerPlugin", {'LivePlayerPlugin':val}, res => {
......
src/components/StoreDesign/wexinappmsg.vue
View file @ 7dbdf5a4
......@@ -120,7 +120,7 @@
</div>
</div>
<el-button size="small" type="primary" @click="UpdateMallDistributionMsg()">保 存</el-button>
<el-button size="small" type="primary">生成测试二维码</el-button>
<!--<el-button size="small" type="primary">生成测试二维码</el-button>-->
</template>
</div>
</template>
......
src/components/orderMan/afterSalesOrder.vue
View file @ 7dbdf5a4
......@@ -60,25 +60,25 @@
<span class="app-order-time">订单号：</span>{{item.ReOrderNo}}
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderModel.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<img v-if="item.OrderModel.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<span>{{item.UserName}}({{item.UserId}})</span>
</div>
<!-- <div flex="dir:left wrap:wrap" class="app-order-offline">
<div class="express-send-box">
<span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
<span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
</div>
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag v-else style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.DeliveryTime=='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">未发货</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">待发货</el-tag>
<el-tag v-if="item.ReceivingTime!=''" style="margin-left:5px" size="small" type="success">已收货</el-tag>
<el-tag v-if="item.ReceivingTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div> -->
</div>
</div>
......@@ -131,17 +131,17 @@
<div>实付金额:￥{{item.Income}}</div>
<div v-if="item.ReOrderStatus==3">申请退款:￥{{item.Refund}}</div>
</div>
</div>
<div flex="cross:center" class="app-order-info" style="width: 8%;">
<el-tooltip class="item" effect="dark" :content="item.Remark" placement="top">
<div>{{item.Remark}}</div>
</el-tooltip>
</div>
<div flex="main:center cross:center" class="app-order-info" style="width: 18%;">
<el-tooltip class="item" effect="dark" content="同意" placement="top">
<img @click="setOrder(item,1)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/pass.png" alt="">
<img @click="agree(item,1)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top">
<img @click="setOrder(item,2)" v-if="item.ReOrderStatus==1" style="margin-right:5px" src="../../assets/img/userman/nopass.png" alt="">
......@@ -167,7 +167,7 @@
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">收货人: {{item.OrderModel.Consignee}}
<div class="address-box">收货人: {{item.OrderModel.Consignee}}
电话：{{item.OrderModel.Mobile}} 地址：
{{item.OrderModel.DistrictAddress}}
{{item.OrderModel.ShoppingAddress}}</div>
......@@ -207,8 +207,8 @@
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
</el-form>
</el-form>
<div style="text-align:right;margin-top:20px">
<el-button size="small" type="primary" @click="Export">导出</el-button>
</div>
......@@ -298,7 +298,7 @@
<el-table-column prop="Specification" label="规格">
<template slot-scope="scope">
<span v-for="(item,index) in scope.row.SpecificationList" :key="index" style="margin-left:5px">
{{item}}
{{item}}
</span>
</template>
</el-table-column>
......@@ -340,6 +340,49 @@
<el-button size="small" type="primary" @click="FhsubmitForm('fhMsg')">确 定</el-button>
</span>
</el-dialog>
<!--选择的商品列表-->
<el-dialog title="收货地区选择" :visible.sync="regionshow" width="1024px">
<template>
<el-table
:data="regionlist"
border
style="width: 100%">
<el-table-column label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="SetOrderMsg.DeliveryId" :label="scope.row.ID"><i></i></el-radio>
</template>
</el-table-column>
<el-table-column
property="Name"
label="收件人姓名"
width="200">
</el-table-column>
<el-table-column
property="Mobile"
label="联系方式"
width="200">
</el-table-column>
<el-table-column
property="Address"
label="详细地址"
width="200"
>
</el-table-column>
<el-table-column
property="Remarks"
label="备注">
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChangere"
v-if="regionlist&&regionlist.length>0" :current-page.sync="regionMsg.pageIndex"
layout="total,prev, pager, next" :page-size="regionMsg.pageSize" :total="regiontotal">
</el-pagination>
</template>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="regionshow = false">取 消</el-button>
<el-button size="small" type="primary" @click="regionsubmitForm()">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -357,7 +400,7 @@ export default {
isIndeterminate: true,
addMsg:{},
dialogVisible:false,
activeName:'first',
msgVal:'',
dateList:[],
......@@ -455,6 +498,19 @@ export default {
fahuoList: [],
fhDig: false,
ExpressList:[],
SetOrderMsg:{
ReOrderId:0,
Type:0,
DeliveryId:'',
},
regionMsg:{
pageIndex:1,
pageSize:20,
Name:'',
},
regionshow:false,
regionlist:[],
regiontotal:0,
}
},
created(){
......@@ -489,7 +545,7 @@ export default {
null
);
}).catch(() => {
});
},
// 修改收货地址
......@@ -547,28 +603,75 @@ export default {
this.fahuoList=[];
item.OrderDetailModel.ReNumber=item.ReNumber;
this.fahuoList.push(item.OrderDetailModel);
this.fhDig=true;
this.fhDig=true;
},
// 售后订单审核
setOrder(item,num){
let msg={
ReOrderId:item.ReOrderId,
Type:num
}
let str="";
let that=this;
if(num==1){
str="同意,是否继续";
//审核同意 收货地址选择
agree(item){
let that=this;
this.SetOrderMsg.ReOrderId=item.ReOrderId;
this.SetOrderMsg.Type=1;
that.$confirm('同意,是否继续', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.regionshow=true;
this.getLogisticsDeliveryPage()
}).catch(() => {
});
},
//收货地址的列表
getLogisticsDeliveryPage(){
this.apipost("/api/MallBase/GetLogisticsDeliveryPage", this.regionMsg, res => {
if (res.data.resultCode == 1) {
this.regionlist = res.data.data.pageData;
this.regiontotal = res.data.data.count;
} else {
this.Info(res.data.message);
}
if(num==2){
str="拒绝,是否继续";
})
},
handleCurrentChangere(val){
this.regionMsg.pageIndex = val;
this.getLogisticsDeliveryPage();
},
regionsubmitForm(){
this.apipost('/api/order/SetOrderAfterSaleAudit',this.SetOrderMsg,
res => {
if (res.data.resultCode === 1) {
this.regionshow=false
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
that.$confirm(str, '提示', {
},
null
);
},
// 售后订单审核
setOrder(item){
this.SetOrderMsg.ReOrderId=item.ReOrderId;
this.SetOrderMsg.Type=2;
this.SetOrderMsg.DeliveryId='';
let that=this;
// if(num==1){
// str="同意,是否继续";
// }
that.$confirm('拒绝,是否继续', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderAfterSaleAudit',msg,
this.apipost('/api/order/SetOrderAfterSaleAudit',this.SetOrderMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -580,7 +683,7 @@ export default {
null
);
}).catch(() => {
});
},
......@@ -688,7 +791,7 @@ export default {
}
this.getList();
},
Export(){
this.msg.ExcelEnumIds=this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
......@@ -706,7 +809,7 @@ export default {
data.forEach(item=>{
this.cityOptions.push(item.Id)
})
})
},
handleCheckAllChange(val) {
......@@ -723,7 +826,7 @@ export default {
this.msg.SelectStatus=dataId;
this.getList();
},
getList(){
if(!this.msgVal || this.msgVal==''){
this.msg.ReOrderNo='';
......@@ -749,10 +852,10 @@ export default {
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -772,7 +875,7 @@ export default {
this.orderTypeList=res.data.data;
})
},
getplat(){
this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
this.platList=res.data.data;
......@@ -809,7 +912,7 @@ export default {
}
})
},
},
};
</script>
......@@ -885,7 +988,7 @@ export default {
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods .app-order-goods-price {
height: 24px;
......
src/components/sallCenter/couponManage.vue
View file @ 7dbdf5a4
......@@ -78,8 +78,8 @@
label="数量"
width="150">
<template slot-scope="scope">
<div>总数量：{{scope.row.TotalNum ==-1? '无限制领取':scope.row.TotalNum}}</div>
<div v-if="scope.row.TotalNum !=-1">剩余发放数：{{scope.row.ResidueNum}}</div>
<div>总数量：{{scope.row.TotalNum ==-1? '无限制领取':scope.row.TotalNum+scope.row.ResidueNum}}</div>
<div v-if="scope.row.TotalNum !=-1">剩余发放数：{{scope.row.TotalNum}}</div>
</template>
</el-table-column>
......
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