Skip to content

E
ElectricitySheep
Commit 91a210fc authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 3f28fefa eaddb46e
Hide whitespace changes
Inline Side-by-side
Showing with 1237 additions and 61 deletions
src/assets/css/common.css
View file @ 91a210fc
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
.w100{ .w100{
width:100px!important; width:100px!important;
} }
.w120{
width:120px!important;
}
.w200{ .w200{
width:200px!important; width:200px!important;
} }
......
src/components/orderMan/orderDetails.vue 0 → 100644
View file @ 91a210fc
<template>
<div class="orderDetails">
<div class="head-title">
<span @click="CommonJump('orderList')" class="blue point">订单列表</span> / 订单详情
</div>
<div class="content app-order-detail">
<el-card class="app-order-status" shadow="never">
<el-steps :active="activeStep" align-center>
<el-step title="已下单" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==1?'step01Active':'step01'" slot="icon"></i>
</el-step>
<el-step title="已付款" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==2?'step02Active':'step02'" slot="icon"></i>
</el-step>
<el-step title="未发货" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==3?'step03Active':'step03'" slot="icon"></i>
</el-step>
<el-step title="已收货" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==4?'step04Active':'step04'" slot="icon"></i>
</el-step>
<el-step title="未结束" icon="el-icon-edit" description="2020-05-13 16:36:11">
<i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i>
</el-step>
</el-steps>
</el-card>
<el-row :gutter="16">
<el-col :span="8">
<div class="card-box">
<h3>订单信息</h3>
<div flex="dir:left cross:center" class="item-box">
<span class="label">订单号:</span>
<div>20200513163611394177</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">商户单号:</span>
<div>HMca0d3f54c0d1f400d78e398486ba1c</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">支付方式:</span>
<span class="el-tag el-tag--success el-tag--small el-tag--light is-hit">线上支付</span>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">配送方式:</span>
<span class="el-tag el-tag--primary el-tag--small el-tag--light is-hit">快递发送</span>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">用户:</span>
<div>🌸井澤💐</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货人:</span>
<div>李凤君</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">电话:</span>
<div>15134634264</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">收货地址:</span>
<div class="express-address">黑龙江省 哈尔滨市 道外区 哈尔滨市道外区陶瓷小区E2栋3单元1902室。15134634264李凤君
<button type="button" class="el-button el-button--text el-button--small is-circle">
<i class="el-icon-edit"></i>
</button>
</div>
</div>
<div flex="dir:top" class="item-box">
<div flex="dir:left cross:center">
<span class="label">物流信息:</span>
<span class="el-tag el-tag--info el-tag--small el-tag--light is-hit" style="margin-right: 5px;">
中通快递
</span>
<a href="https://www.baidu.com/s?wd=中通快递640213339544" target="_blank" title="点击搜索运单号">640213339544</a>
</div>
<div flex="dir:left">
<span class="label">商家留言:</span>
<span></span>
</div>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="card-box">
<h3>订单信息</h3>
<div flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;">
<span class="label">商家备注:</span>
<div>库存-1
<i class="el-icon-edit" style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i>
</div>
</div>
</div>
</el-col>
<el-col :span="8">
<div flex="dir:top" class="card-box">
<h3>分销信息</h3>
<div>
<div class="share-title">一级分销商</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">姓名:</span>
<div>印象日本地接～谢军</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<span class="label">手机号:</span>
<div></div>
</div>
<div flex="dir:left cross:center" class="item-box share-price">
<span class="label orange-label">佣金:</span>
<div>￥7.00</div>
</div>
</div>
</div>
</el-col>
</el-row>
<el-card shadow="never">
<el-table
border
:data="tableData"
style="width: 100%">
<el-table-column
prop="Id"
label="商品标题"
>
<template slot-scope="scope">
<div flex="dir:left cross:center">
<img src="https://cdnimg.iotweixin.com/uploads/mall1285/20200430/ba10bdeb05c86815ae711460c9de5d2c.jpg" alt="" style="height: 60px; width: 60px; margin-right: 5px;">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 1;">
精选！土枇杷新鲜水果5斤装 四川精品野生超大甜枇杷果 四川省内包邮
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column
prop="name"
label="规格"
width="200">
<template slot-scope="scope">
<span class="el-tag el-tag--mini el-tag--light" style="margin-right: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 95%;">
重量:5斤装
</span>
</template>
</el-table-column>
<el-table-column
prop="address"
label="单价"
width="120">
</el-table-column>
<el-table-column
prop="address"
label="数量"
width="80">
</el-table-column>
<el-table-column
prop="address"
label="原价"
width="120">
</el-table-column>
<el-table-column
prop="address"
label="折扣后"
width="120">
</el-table-column>
</el-table>
<el-form label-width="200px" class="app-order-count-price">
<el-form-item label="商品小计">
￥90.00
</el-form-item>
<el-form-item label="运费">
￥90.00
</el-form-item>
<el-form-item label="实付款">
<span style="color: rgb(255, 69, 68);">￥<b>148.00</b></span>
</el-form-item>
</el-form>
</el-card>
<div flex="dir:right" class="action-box">
<el-button style="margin-left: 10px;" size="small" type="primary">打印发货单</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">发货</el-button>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
activeStep:1,
tableData:[
{Id:1}
],
};
},
created() {
if(this.$route.query.UserId){
this.UserId=this.$route.query.UserId;
this.getData()
}
},
methods: {
getData(){
this.apipost("/api/user/GetMemberUserInfo",{UserId:this.UserId}, res => {
this.userInfo=res.data.data;
})
},
},
mounted() {
}
};
</script>
<style>
.app-order-detail .express-address {
width: 80%;
}
.app-order-detail .action-box {
padding: 10px 20px;
}
.app-order-detail .app-order-count-price .el-form-item {
margin-bottom: 5px;
}
.app-order-detail .app-order-count-price {
float: right;
margin-right: 55px;
font-size: 12px;
text-align: right;
margin-top: 15px;
}
.app-order-detail h3{
padding:15px 0;
}
.app-order-detail .share-price {
color: #EF8933;
}
.app-order-detail .share-title {
font-size: 15px;
margin: 10px 0 5px;
}
.app-order-detail .card-box .label {
color: #999999;
margin-right: 10px;
}
.app-order-detail .item-box {
margin-bottom: 10px;
}
.app-order-detail .card-box {
border: 1px solid #EBEEF5;
border-radius: 3px;
padding: 10px;
height: 300px;
overflow-y: scroll;
}
.app-order-detail .step05{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_5.png");
}
.app-order-detail .step04{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_4.png");
}
.app-order-detail .step03{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_3.png");
}
.app-order-detail .step02{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_2.png");
}
.app-order-detail .step04Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_4_active.png");
}
.app-order-detail .step03Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_3_active.png");
}
.app-order-detail .step02Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_2_active.png");
}
.app-order-detail .step01Active{
height: 30px;
width: 30px;
background-image: url("../../assets/img/userman/status_1_active.png");
}
.app-order-detail .app-order-status {
padding: 50px 120px;
margin-bottom: 30px;
}
.orderDetails .content{
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/orderMan/orderList.vue 0 → 100644
View file @ 91a210fc
<template>
<div class="orderList">
<div class="head-title">
订单列表
<el-button style="float:right;margin-top: -5px;" size="small" type="primary">批量导出</el-button>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">清空回收站</el-button>
</div>
<div class="content">
<div>
<span>下单时间：</span>
<el-date-picker
v-model="dateList"
@change="getList"
size="small"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<span style="margin-left:15px">所属平台：</span>
<el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<span style="margin-left:15px">订单类型：</span>
<el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<span style="margin-left:15px">配送方式：</span>
<el-select class="w120" @change="getList" style="margin-right: 10px;" v-model="msg.OrderSource" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<el-input style="margin-left:15px;width:350px" placeholder="请输入内容" v-model="msgVal" size="small">
<el-select @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option
v-for="item in option"
:key="item.Id"
:label="item.name"
:value="item.Id">
</el-option>
</el-select>
</el-input>
</div>
<div>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :dataId="0" label="全部" name="first"></el-tab-pane>
<el-tab-pane :dataId="1" label="上架中" name="second"></el-tab-pane>
<el-tab-pane :dataId="2" label="下架中" name="third"></el-tab-pane>
<el-tab-pane :dataId="3" label="售罄" name="fourth"></el-tab-pane>
</el-tabs>
<div class="app-order-title">
<div style="width: 55%;">订单信息</div>
<div style="width: 20%;">实付金额</div>
<div style="width: 20%;">操作</div>
</div>
<div class="app-order-list">
<el-card class="app-order-item" shadow="never">
<div slot="header" class="clearfix">
<div flex="cross:center" class="app-order-head">
<div class="app-order-time">2020-05-13 11:27:04</div>
<div class="app-order-user">
<span class="app-order-time">订单号：</span>20200513112704781609
</div>
<div flex="cross:center" class="app-order-user"><img src="../../assets/img/userman/wx.png" alt=""> <span>Lesleyyp(84021)</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">快递发送</span>
</div>
<span style="margin-left:5px" class="el-tag el-tag--warning el-tag--small el-tag--light">未付款</span>
</div>
<el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
<img @click="OrderExit(3)" style="right:60px" class="app-order-btnimg" src="../../assets/img/userman/force.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
<img class="app-order-btnimg" src="../../assets/img/userman/del1.png" alt="">
</el-tooltip>
</div>
</div>
<div class="app-order-body">
<div class="goods-item" style="width: 55%;">
<div class="goods">
<img src="https://cdnimg.iotweixin.com/uploads/mall1285/20200427/b0e6c3d4b43747302f143c2c45cafc02.jpg" class="goods-image">
<div flex="dir:left">
<div class="goods-info">
<div class="goods-name">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
<span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit" style="margin-right: 5px;">
商城
</span>
日本Horse Oil熊野油脂马油无硅油滋润洗发水护发素（2瓶洗发水600ml+1瓶护发素600ml）全国包邮
</div>
</div>
</div>
<div style="margin-bottom: 24px;">
<span style="margin-right: 10px;">
规格：
<span class="el-tag el-tag--mini el-tag--light" style="margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">
套装:2瓶洗发水+1瓶护发素
</span>
</span>
</div>
<div class="app-order-goods-price">
<span>货号：日本严选</span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 250px;">
<div flex="cross:center main:center">
<span>小计：￥128.00</span>
</div>
<div flex="cross:center main:center">数量：x 1</div>
</div>
</div>
</div>
</div>
<div flex="cross:center" class="app-order-info" style="width: 20%;">
<div flex="dir:top">
<div>
<span style="font-size: 16px;">￥128.00</span>
<el-popover
placement="top-start"
title="标题"
width="200"
trigger="hover"
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
<img slot="reference" src="../../assets/img/userman/price.png" alt="">
</el-popover>
</div>
<div class="express-price"><span>
<span style="color: rgb(144, 147, 153);">(含运费￥0.00)
<img @click="OrderExit(2)" src="../../assets/img/userman/edit1.png" alt="">
</span>
</span></div>
<div><el-tag effect="dark" type="warning" size="mini">在线支付</el-tag></div>
</div>
</div>
<div class="app-order-info" style="padding: 10px; border-right: 0px; width: 20%;">
<div flex="wrap:wrap cross:center">
<el-tooltip class="item" effect="dark" content="发货" placement="top">
<img @click="fhBtn" class="app-order-icon" src="../../assets/img/userman/send.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="打印小票" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/print.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
<img class="app-order-icon" src="../../assets/img/userman/invoice.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top">
<img @click="OrderExit(1)" class="app-order-icon" src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
<img @click="CommonJump('orderDetails')" class="app-order-icon" src="../../assets/img/userman/detail.png" alt="">
</el-tooltip>
</div>
</div>
</div>
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">收货人: 陈冰 电话：13606097366 地址：福建省 厦门市 思明区 寿彭路鸿山新村4号2102室</div>
<button @click="ExitshAdress" type="button" class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button>
</div>
</div>
</div>
</el-card>
</div>
</div>
</div>
<!-- 订单取消 -->
<el-dialog title="修改" :visible.sync="exitDig" width="600px">
<el-form :model="exitMsg" ref="exitMsg" label-width="0">
<p style="padding:10px 0" v-if="exitMsg.Type==3">填写取消理由：</p>
<p style="padding:10px 0" v-if="exitMsg.Type==1">添加备注：</p>
<template v-if="exitMsg.Type==2">
<el-form-item label="商品总价">
<el-input size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
<el-form-item label="运费">
<el-input size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</template>
<el-form-item>
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="exitDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 发货 -->
<el-dialog custom-class="app-send" title="发货" :visible.sync="fhDig" width="35%">
<div class="title-box">
<span class="text">选择发货商品</span>
<span>(默认全选)</span>
</div>
<el-table
:data="fahuoList"
@selection-change="TableSelectChange"
style="width: 100%">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="id"
label="图片"
width="60">
<template slot-scope="scope">
<img style="width:30px;height:30px" src="../../assets/img/business.png" alt="">
</template>
</el-table-column>
<el-table-column
prop="name"
label="名称"
width="314">
</el-table-column>
<el-table-column
prop="name"
label="数量"
width="80">
</el-table-column>
<el-table-column
prop="address"
label="规格">
</el-table-column>
</el-table>
<div class="title-box"><span class="text">物流信息</span></div>
<el-form :model="fhMsg" ref="exitMsg" :rules="fhrules" label-width="130px">
<el-form-item label="物流快递">
<el-radio v-model="fhMsg.Type" :label="1">快递</el-radio>
<el-radio v-model="fhMsg.Type" :label="2">其他方式</el-radio>
</el-form-item>
<template v-if="fhMsg.Type==1">
<el-form-item label="快递公司" prop="ExpressId">
<el-select class="w200" size="small" v-model="fhMsg.ExpressId" filterable placeholder="请选择">
<el-option
v-for="item in ExpressList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="收件人邮编">
<el-input type="number" min="1" size="small" v-model="exitMsg.PostCode"></el-input>
</el-form-item>
<el-form-item label="快递单号" prop="ExpressNumber">
<el-input size="small" v-model="exitMsg.ExpressNumber">
<el-button slot="append"> 获取面单</el-button>
</el-input>
</el-form-item>
<el-form-item label="商家留言">
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</template>
<template v-if="fhMsg.Type==2">
<el-form-item label="物流内容">
<el-input type="textarea" row="2" size="small" v-model="exitMsg.Remark"></el-input>
</el-form-item>
</template>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="fhDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="FhsubmitForm('exitMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 修改收货地址 -->
<el-dialog title="修改收货地址" :visible.sync="shDig" width="600px">
<el-form :model="shMsg" :rules="shMsgrule" ref="exitMsg" label-width="80px">
<el-form-item label="收件人" prop="Consignee">
<el-input size="small" v-model="shMsg.Consignee"></el-input>
</el-form-item>
<el-form-item label="电话" prop="Mobile">
<el-input type="number" size="small" v-model="shMsg.Mobile"></el-input>
</el-form-item>
<el-form-item label="所在区域" prop="Province">
<el-select size="small" @change="getCity" v-model="shMsg.Province" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in provinceList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
<el-select size="small" @change="getArea" v-model="shMsg.City" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in cityList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
<el-select size="small" v-model="shMsg.District" style="width:144px" filterable placeholder="请选择">
<el-option
v-for="item in areaList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="详细地址" prop="ShippingAddress">
<el-input size="small" v-model="shMsg.ShippingAddress"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="shDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="shsubmitForm('shMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 选择导出信息 -->
<el-dialog
title="选择导出信息"
:visible.sync="dialogVisible"
width="960px">
<el-form style="border: 1px solid #F0F2F7;" :model="addMsg" ref="addMsg" label-width="100px">
<div style="box-sizing: border-box;background-color: #F3F5F6;width: 100%;padding-left: 20px;height: 50px;line-height: 50px;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
</div>
<div style="margin: 15px 0;"></div>
<div style="padding: 10px 25px 20px;">
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom:10px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
</el-form>
<div style="text-align:right;margin-top:20px">
<el-button size="small" type="primary" @click="Export">导出</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: "orderList",
data(){
return{
checkAll: false,
checkedCities: [],
cities: [],
cityOptions: [],
isIndeterminate: true,
addMsg:{},
dialogVisible:false,
shDig:false,
shMsg:{
OrderId:0,
Consignee:'',
Mobile:'',
Province:'',
City:'',
District:'',
ShippingAddress:'',
},
shMsgrule:{
Province: [
{ required: true, message: '请选择省', trigger: 'change' }
],
ShippingAddress: [
{ required: true, message: '请输入详细地址', trigger: 'blur' }
],
Mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' }
],
Consignee: [
{ required: true, message: '请输入收件人', trigger: 'blur' }
],
},
fhrules:{
ExpressId: [
{ required: true, message: '请选择快递公司', trigger: 'change' }
],
ExpressNumber: [
{ required: true, message: '请输入快递单号', trigger: 'blur' }
],
},
fhMsg:{
Type:1,
PostCode:'',
PostCode:0,
ExpressNumber:'',
Remark:'',
OrderDetailIdList:[],
},
fahuoList:[
{id:1},
],
fhDig:false,
exitMsg:{
OrderId:0,
Type:1,
Remark:'',
Income:'',
},
exitDig:false,
activeName:'first',
msgVal:'',
dateList:[],
msg:{
pageIndex:1,
pageSize:15,
Name:'',
OrderSource:0,
OrderType:0,
DeliveryMethod:0,
OrderId:0,
StartTime:'',
EndTime:'',
OrderStatus:0,
OrderNo:'',
MerchantsNo:'',
UserName:'',
UserId:'',
GoodsName:'',
Consignee:'',
Mobile:'',
ProductCode:'',
Recycled:1,
},
platList:[],
option:[
{Id:1,name:'订单号'},
{Id:2,name:'商户单号'},
{Id:3,name:'用户名'},
{Id:4,name:'用户ID'},
{Id:5,name:'商品名称'},
{Id:6,name:'收货人'},
{Id:7,name:'收货人电话'},
{Id:8,name:'门店名称'},
{Id:9,name:'商品货号'},
],
msgId:1,
ExpressList:[],
provinceList:[],
cityList:[],
areaList:[],
}
},
created(){
this.getList();
this.getplat();
this.getExpressInfo();
this.getProvince();
this.getDown();
},
mounted(){},
methods:{
// 发货
fhBtn(){
this.fhDig=true;
},
// 修改收货地址
shsubmitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderShopingAddress',this.shMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
// 清空回收站
ClearHsz(){
let that=this;
that.$confirm('此操作将清空回收站，是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderEmptyRecycleBin',
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}).catch(() => {
});
},
Export(){
this.msg.ExcelEnumIds=this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/order/GetMemberUserListToExcel",
msg,
"订单列表.xls"
);
},
getDown(){
this.cityOptions=[];
this.apipost("/api/order/GetOrderListExportEnumList",{}, res => {
this.cities=res.data.data;
let data=res.data.data;
data.forEach(item=>{
this.cityOptions.push(item.Id)
})
})
},
handleCheckAllChange(val) {
this.checkedCities = val ? this.cityOptions : [];
this.isIndeterminate = false;
},
handleCheckedCitiesChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.cities.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
},
ExitshAdress(){
this.shDig=true;
},
FhsubmitForm(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/order/SetOrderSendGoods',this.fhMsg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
TableSelectChange(val){},
// 强制取消
OrderExit(type){
this.exitMsg.Type=type;
this.exitDig=true;
},
handleClick(val){
let dataId=val.$attrs.dataId;
if(dataId==0){
this.msg.GoodsStatus=0;
this.msg.IsSelectSellOut=0;
}
if(dataId==1){
this.msg.GoodsStatus=1;
this.msg.IsSelectSellOut=0;
}
if(dataId==2){
this.msg.GoodsStatus=2;
this.msg.IsSelectSellOut=0;
}
if(dataId==3){
this.msg.GoodsStatus=0;
this.msg.IsSelectSellOut=1;
}
this.getList();
},
ChangeId(val){
console.log("ChangeId",val)
},
getList(){
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}else{
this.msg.StartTime='';
this.msg.EndTime='';
}
this.loading=true;
this.apipost("/api/order/GetGoodsOrderPageList", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.total=res.data.data.count;
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
getplat(){
this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
this.platList=res.data.data;
})
},
getArea(val){
this.apipost("/api/Destination/GetChildList",{Id:val}, res => {
this.areaList=res.data.data;
})
},
getCity(val){
this.apipost("/api/Destination/GetChildList",{Id:val}, res => {
this.cityList=res.data.data;
if(this.cityList.length>0){
this.getArea(this.cityList[0].ID)
}
})
},
getProvince(){
this.apipost("/api/Destination/GetChildList",{Id:2}, res => {
this.provinceList=res.data.data;
if(this.provinceList.length>0){
this.getCity(this.provinceList[0].ID)
}
})
},
// 快递公司
getExpressInfo(){
this.apipost("/api/MallBase/GetExpressInfo",{} , res => {
if (res.data.resultCode == 1) {
this.ExpressList = res.data.data;
} else {
this.Info(res.data.message);
}
})
},
},
};
</script>
<style>
.app-send .el-table__header-wrapper th {
background-color: #f5f7fa;
}
.app-send .title-box .text {
background-color: #FEFAEF;
color: #E6A23C;
padding: 6px;
}
.app-send .title-box {
margin: 15px 0;
}
.app-order-list .app-order-item .el-button {
padding: 0;
}
.app-order-list .card-footer .address-box {
margin-right: 10px;
}
.app-order-list .card-footer {
background: #F3F5F6;
padding: 10px 20px;
}
.app-order-list .app-order-info > div {
width: 100%;
}
.app-order-icon {
margin-right: 5%;
margin-bottom: 10px;
cursor: pointer;
}
.app-order-body {
display: flex;
flex-wrap: nowrap;
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
justify-content: center;
}
.app-order-list .el-card__body {
padding: 0;
}
.app-order-list .express-price {
height: 30px;
line-height: 30px;
}
.app-order-list .goods-item {
border-right: 1px solid #EBEEF5;
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods .app-order-goods-price {
height: 24px;
margin-top: 10px;
position: absolute;
bottom: 20px;
left: 125px;
}
.app-order-list .goods-item .goods-info .goods-name {
margin-bottom: 5px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.app-order-list .goods-item .goods-info {
width: 50%;
margin-top: 5px;
}
.app-order-list .goods-image {
height: 90px;
width: 90px;
margin-right: 15px;
float: left;
}
.app-order-list .goods-item .goods {
position: relative;
padding: 20px;
min-height: 130px;
border-top: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods:first-of-type {
border-top: 0;
}
.orderList .app-order-list .app-order-item:hover .app-order-btnimg{
display: block;
}
.orderList .app-order-list .app-order-item:hover{
border: 1px solid #3399FF;
}
.orderList .app-order-btnimg {
position: absolute;
top: 20px;
right:25px;
color: #7C868D;
font-size: 18px;
padding: 0;
display: none;
}
.orderList .app-order-offline {
margin-left: 30px;
margin-top: -2px;
}
.orderList .app-order-user img {
height: 20px;
width: 20px;
display: block;
float: left;
border-radius: 50%;
margin-right: 10px;
}
.orderList .app-order-list .app-order-time {
color: #909399;
}
.orderList .app-order-user {
margin-left: 30px;
}
.orderList .app-order-list .app-order-time {
color: #909399;
}
.orderList .app-order-list .app-order-item .el-card__header {
padding: 0;
}
.orderList .app-order-list .app-order-item {
margin-top: 20px;
min-width: 750px;
}
.orderList .app-order-list .app-order-head {
padding: 20px;
background-color: #F3F5F6;
color: #303133;
min-width: 750px;
display: flex;
position: relative;
}
.orderList .app-order-title div {
text-align: center;
}
.orderList .app-order-title {
background-color: #F3F5F6;
height: 40px;
line-height: 40px;
display: flex;
min-width: 750px;
}
.orderList .content{
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
</style>
src/components/sallCenter/CustomPage.vue
View file @ 91a210fc
...@@ -9,29 +9,32 @@ ...@@ -9,29 +9,32 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0"> <el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table-column prop="mall_id" label="ID" width="100"> <el-table-column prop="Id" label="ID" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="title" width="436" label="标题"> <el-table-column prop="PageName" width="436" label="标题">
</el-table-column> </el-table-column>
<el-table-column label="导航与模板" prop="navs" width="750"> <el-table-column label="导航与模板" prop="DetailsList" width="750">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="templat-list"> <div class="templat-list">
<div class="templat-item"> <template v-if="scope.row.DetailsList && scope.row.DetailsList.length>0"
<div>{{scope.row.navs[0].navs}}</div> v-for="(subItem,subIndex) in scope.row.DetailsList">
<div style="color: rgb(153, 153, 153);">{{scope.row.navs[0].template}}</div> <div class="templat-item" :key="subIndex">
</div> <div>{{subItem.NavName}}</div>
<div style="color: rgb(153, 153, 153);">{{subItem.TemplateId}}</div>
</div>
</template>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="is_home_page" label="设为首页" width="80"> <el-table-column prop="IsHome" label="设为首页" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.is_home_page" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="scope.row.IsHome" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="is_disable" label="禁用/启用" width="85"> <el-table-column prop="IsUse" label="禁用/启用" width="85">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.is_disable" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
...@@ -58,40 +61,41 @@ ...@@ -58,40 +61,41 @@
<div class="conten_indder"> <div class="conten_indder">
<el-form label-width="150px"> <el-form label-width="150px">
<el-form-item label="标题"> <el-form-item label="标题">
<el-input type="text" size="small" v-model="addMsg.title"></el-input> <el-input type="text" size="small" v-model="addMsg.PageName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="启用/禁用"> <el-form-item label="启用/禁用">
<el-switch v-model="addMsg.is_disable" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="addMsg.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="显示导航条"> <el-form-item label="显示导航条">
<el-switch v-model="addMsg.show_navs" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="addMsg.IsShowNav" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="模板和导航"> <el-form-item label="模板和导航">
<div style="max-width:480px;"> <div style="max-width:480px;">
<div class="Custom_item" v-for="(item,index) in addMsg.navs" :key="index"> <div class="Custom_item" v-for="(item,index) in addMsg.DetailsList" :key="index">
<div flex="box:last"> <div flex="box:last">
<el-form label-width="80px"> <el-form label-width="80px">
<el-form-item label="导航名称" style="margin-bottom:20px;"> <el-form-item label="导航名称" style="margin-bottom:20px;">
<el-input type="text" v-model="item.navs" size="small"></el-input> <el-input type="text" v-model="item.NavName" size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="对应模板"> <el-form-item label="对应模板">
<el-input type="text" size="small" v-model="item.template"> <el-input type="text" size="small" v-model="item.TemplateId">
<el-button slot="append">选择模板</el-button> <el-button slot="append">选择模板</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="padding-left: 15px;"> <div style="padding-left: 15px;">
<el-tooltip class="item" effect="dark" content="删除导航" placement="bottom"> <el-tooltip class="item" effect="dark" content="删除导航" placement="bottom">
<img @click="delModel(index)" style="cursor:pointer;" src="../../assets/img/userman/del.png" alt=""> <img @click="delModel(index)" style="cursor:pointer;" src="../../assets/img/userman/del.png"
alt="">
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
</div> </div>
<el-button type="text" @click="addModule()"> <el-button type="text" @click="addModule()">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
<span style="color: rgb(53, 53, 53);">新增模版和导航</span> <span style="color: rgb(53, 53, 53);">新增模版和导航</span>
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
...@@ -109,33 +113,18 @@ ...@@ -109,33 +113,18 @@
return { return {
loading: false, loading: false,
CustomIsShowAdd: true, CustomIsShowAdd: true,
dataList: [{ dataList: [],
mall_id: '2028',
title: '欧洲严选',
navs: [{
navs: "欧洲严选",
navs_id: 4275,
template: "欧洲严选",
template_id: 3781
}],
show_navs: 0,
is_disable: 1,
is_home_page: 0,
is_delete: 0
}],
msg: { msg: {
pageIndex: 1,
pageSize: 10,
}, },
addMsg: { addMsg: {
title: '', Id: 0,
is_disable: 1, PageName: '',
show_navs: 0, IsHome: 0,
navs: [{ IsUse: 1,
navs: "", IsShowNav: 0,
navs_id: 0, DetailsList: []
template: "",
template_id: 0
}]
}, },
total: 0, total: 0,
}; };
...@@ -152,9 +141,10 @@ ...@@ -152,9 +141,10 @@
this.getList(); this.getList();
}, },
getList() { getList() {
this.apipost("/api/Tenant/GetMiniProgrameNaviconPage", this.msg, res => { this.apipost("/api/Template/GetMiniprogramPageTemplPageList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log("this.dataList", this.dataList);
this.total = res.data.data.count; this.total = res.data.data.count;
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
...@@ -162,33 +152,67 @@ ...@@ -162,33 +152,67 @@
}) })
}, },
submitform(addMsg) { submitform(addMsg) {
this.apipost("/api/Template/SetMiniprogramPageTempl", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.getList();
this.CustomIsShowAdd = true;
} else {
this.Info(res.data.message);
}
})
}, },
//编辑 //编辑
EditCustom() { EditCustom(item) {
this.apipost("/api/Template/GetMiniprogramPageTempl", {
Id: item.Id
}, res => {
if (res.data.resultCode == 1) {
var jsonData = res.data.data;
this.addMsg.Id=jsonData.Id;
this.addMsg.PageName=jsonData.PageName;
this.addMsg.IsUse=jsonData.IsUse;
this.addMsg.IsShowNav=jsonData.IsShowNav;
this.addMsg.IsHome=jsonData.IsHome;
this.addMsg.DetailsList=jsonData.DetailsList;
this.CustomIsShowAdd = false;
} else {
this.Info(res.data.message);
}
})
}, },
//删除 //删除
RemoveCustom() { RemoveCustom(item) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost("/api/Template/RemoveMiniprogramPageTempl", {
Id: item.Id,
Status: 1,
}, res => {
if (res.data.resultCode == 1) {
that.getList();
} else {
that.Info(res.data.message);
}
})
});
}, },
//新增模板导航 //新增模板导航
addModule(){ addModule() {
let obj={ let obj = {
navs: "", Id: 0,
navs_id: 0, PageTemplID: 0,
template: "", NavName: "",
template_id: 0 TemplateId: 0,
} }
this.addMsg.navs.push(obj); this.addMsg.DetailsList.push(obj);
}, },
//删除模板 //删除模板
delModel(index){ delModel(index) {
this.addMsg.navs.splice(index,1); this.addMsg.DetailsList.splice(index, 1);
} }
}, },
mounted() { mounted() {
//this.getList(); this.getList();
} }
}; };
......
src/router/index.js
View file @ 91a210fc
...@@ -228,6 +228,18 @@ export default new Router({ ...@@ -228,6 +228,18 @@ export default new Router({
name: 'goodsListEdit', name: 'goodsListEdit',
component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve), component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
}, },
// 商品管理 商品列表新增
{
path: '/orderList',
name: 'orderList',
component: resolve => require(['@/components/orderMan/orderList'], resolve),
},
// 商品管理 商品详情
{
path: '/orderDetails',
name: 'orderDetails',
component: resolve => require(['@/components/orderMan/orderDetails'], resolve),
},
//设置 基础设置 //设置 基础设置
{ {
path: '/basicSetUp', path: '/basicSetUp',
......
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