V1.0.4

src/main/java/com/caimei/www/controller/authorized/supplier/SupplierPageController.java

@@ -64,6 +64,8 @@ public class SupplierPageController extends BaseController {
 	private static final String GOODS_LIST = "supplier-center/shop/goods";
     /** 品牌管理 */
 	private static final String BRAND_LIST = "supplier-center/shop/brand";
+    /** 运费模板 */
+	private static final String FREIGHT_LIST = "supplier-center/shop/freight";
     /** 商品预览 */
 	private static final String GOODS_PREVIEW = "supplier-center/shop/preview";
 	/** 查看示例 */
@@ -249,6 +251,12 @@ public class SupplierPageController extends BaseController {
         return BRAND_LIST;
     }
 
+    /** 运费模板管理 */
+    @GetMapping("/supplier/freight.html")
+    public String freightList(){
+        return FREIGHT_LIST;
+    }
+
     /** 商品预览 */
     @GetMapping("/supplier/goods/preview.html")
     public String goodsPreview() {
@@ -306,6 +314,7 @@ public class SupplierPageController extends BaseController {
     public String encyclopediaPreview(){
         return ENCYCLOPEDIA_PREVIEW;
     }
+
     /*
     // 供应商采美百科商品列表页面
     @GetMapping("/supplier/encyclopedia/product-list.html")

src/main/resources/static/css/supplier-center/shop/freight.css

@@ -0,0 +1,43 @@
+li{list-style: none}
+ @media screen and (min-width:768px) {
+    .crumbs{color: #22272e;font-size: 16px;}
+    .head-top{overflow: hidden;background: #fff;padding:17px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+    .head-top>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
+    .state {width: 158px !important;}
+    .state.small{width: 170px;margin: 0 0;}
+    input::placeholder{color: #9aa5b5;font-size: 12px;}
+    textarea::placeholder{color: #9aa5b5;}
+    #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
+    #newBtn{float: left;margin: 0}
+    .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
+    .goods-tips{width: 100%;box-sizing: border-box;margin-top: 14px;}
+    .goods-tips .end-tips{width:100%;height: 32px;background: #FFF3F3;border-radius: 2px;line-height: 32px;color: #F94B4B;font-size: 12px;box-sizing: border-box;padding: 0 10px;}
+    .goods-tips .end-tips .tips{display:inline-block;width:32px;height:32px;line-height:32px;box-sizing:border-box;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
+    .goods-tips .end-tips .tips:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:-24px 1px;margin-right:2px;}
+    .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
+    .goods-main-empty p{font-size: 14px;color: #333;}
+    .goods-main-empty p a{color: #FF5B00;text-decoration: underline;margin: 0 3px;}
+    .empty{background: #fff;margin-top: 10px;}
+    .navLayout{min-height: auto;}
+    ::-webkit-scrollbar{ height: 6px;}
+    .pagination{width: 100%;margin-top: 10px;float: left; background: #FFFFFF;padding: 8px 20px;box-sizing: border-box;}
+    .el-button--primary.is-plain{background:#FFE6DC !important;color: #FF5B00 !important;border-color: #FF5B00 !important;}
+ }
+
+/*移动*/
+ @media screen and (max-width:768px) {
+    .head-top{padding: 3vw 0;background: #fff;}
+    .head-top .form-row{margin:1.5vw 0;color: #627386;float: left;width: 50%;}
+    .state {width: 92% !important;margin: 0 2vw;}
+    #newBtn{float: left;margin: 2vw;}
+    .goods-main{margin-top: 2.7vw; padding-bottom: 15vw;}
+    .goods-tips{width: 100%;box-sizing: border-box;margin-top: 14px;}
+    .goods-tips .end-tips{width:100%;height:auto;background: #FFF3F3;border-radius: 2px;color: #F94B4B;font-size: 3.2vw;box-sizing: border-box;padding: 2vw;line-height: 5vw;}
+    .goods-tips .end-tips .tips{display:none;}
+    .empty{box-sizing:border-box;padding:15vw 0;text-align:center;color:#4A4F58;line-height:8vw;font-size:3.4vw;background: #fff;}
+    .empty img{width:40vw;height:40vw;}
+    .empty a{color:#FF5B00;}
+    footer{display: none;}
+    .pagination{width: 100%;min-height: 2vw;position: fixed;bottom: 0;left: 0;background: #FFFFFF;z-index: 99;padding: 2vw;box-sizing: border-box;}
+    .el-button--primary.is-plain{background:#FFE6DC !important;color: #FF5B00 !important;border-color: #FF5B00 !important;}
+ }

src/main/resources/static/js/supplier-center/shop/freight.js

@@ -0,0 +1,266 @@
+var myGoods = new Vue({
+    el:"#myGoods",
+    mixins: [cmSysVitaMixins],
+    data: {
+        userId:0,
+        shopId:'',
+        listRecord: 0,
+        featuredNum:'',//主图商品标志
+        listQuery:{
+            shopId:'',
+            pageNum:1,
+            pageSize:10,
+            productCode:'',//货号
+            name:'',//商品名称
+            showFlag:'',// 新品展示状态
+            validFlag:'',//状态
+            featuredFlag:'',//是否主推
+            commodityType:'',//商品属性
+            bigTypeId:'',//一级
+            smallTypeId:'',//二级
+            tinyTypeId:'',//三级
+            groundMall:'' // 上架平台
+        },
+        classificationFirstList:[],
+        classificationTwoList:[],
+        classificationThreeList:[],
+        productsList:[],
+        total:0,
+        layout: '',
+        isForbid:false,
+        listLoading:true,
+        productRadio:[],
+        handlePros:{},
+        dialogFormVisible:false,
+        groundMallType:0,
+    },
+    filters: {
+        newvalidFlagFilters(value) {
+            //新品展示状态
+            const map = {
+                0: '待审核',
+                1: '已展示',
+                2: '展示过期',
+                3: '未展示',
+                4: '审核未通过',
+                5: '已下线'
+            }
+            return map[value]
+        }
+    },
+    computed: {
+        disabled() {
+            return !this.productRadio.length > 0
+        }
+    },
+    methods: {
+        //切换页码
+        handleCurrentChange(val){
+            this.listQuery.pageNum = val;
+            this.getList();
+        },
+        // 多选商品
+        handleSelectionChange(row) {
+            if(this.isForbid){ return }
+            this.productRadio = row
+            console.log('row', row)
+        },
+        getList(){//我的商品数据初始化
+            const _this = this;
+            SupplierApi.GetMyProductList(_this.listQuery,function(response){
+                if(response.code === 0){
+                    const data  = response.data
+                    let page = data.productPage;
+                    _this.featuredNum = data.featuredNum;
+                    _this.isForbid = data.listingFee === 1
+                    _this.productsList = _this.handleResults(page.results,_this.featuredNum)
+                    console.log('productsList',_this.productsList)
+                    _this.total = page.totalRecord;
+                    _this.listLoading = false
+                }else{
+                    CAIMEI.Alert(response.msg, '确定');
+                    _this.listLoading = false
+                }
+            })
+        },
+        //处理
+        handleResults(list,featuredNum){
+            return list.map(function(el){
+                el.isAddFeatured = false;
+                el.isDelFeatured = false;
+                if(featuredNum<4){
+                    if(el.validFlag === 2 && el.featuredFlag === 0 ){
+                        el.isAddFeatured = true;
+                    }
+                }
+                if(featuredNum>0){
+                    if (el.validFlag === 2 && el.featuredFlag === 1) {
+                        el.isDelFeatured = true;
+                    }
+                }
+                return el
+            })
+        },
+        handleCommodityType(event){//选择商品属性
+            console.log('event',event)
+            console.log('event',this.listQuery.commodityType)
+            this.GetFistClassFn(this.listQuery.commodityType);
+        },
+        handeleChangeFirst(event){//选择一级分类
+            console.log('event',event)
+            console.log('event',this.listQuery.bigTypeId)
+            this.GetTwoClassFn(this.listQuery.bigTypeId);
+        },
+        handeleChangeTwo(event){//选择二级分类
+            console.log('event',event)
+            console.log('event',this.listQuery.smallTypeId)
+            this.GetThreeClassFn(this.listQuery.smallTypeId);
+        },
+        GetFistClassFn(value){//获取一级分类菜单
+            const _this = this;
+            PublicApi.GetFirstClassFication({typeSort:value},function (response) {
+                if(response.data.length>0){
+                     _this.classificationFirstList = response.data;
+                }else {
+                      _this.classificationFirstList = [];
+                }
+            })
+        },
+        GetTwoClassFn(value){//获取二级分类菜单
+            const _this = this;
+            PublicApi.GetTwoClassFication({bigTypeId:value},function (response) {
+                if(response.code===0){
+                    if(response.data.length>0){
+                        _this.classificationTwoList = response.data;
+                     }else {
+                         _this.classificationTwoList = [];
+                     }
+                }
+            })
+        },
+        GetThreeClassFn(value){//获取三级分类菜单
+            const _this = this;
+            PublicApi.GetThreeClassFication({smallTypeId:value},function (response) {
+                if(response.code===0){
+                  if(response.data.length>0){
+                        _this.classificationThreeList = response.data;
+                  }else {
+                     _this.classificationThreeList = [];
+                  }
+                }
+            })
+        },
+        handleDownshelfAll(){//批量下架
+            const _this = this;
+            let isValidFlag = false;
+            let productIds = '';
+            _this.productRadio.forEach(function(el){
+                if(el.validFlag === 2){
+                    productIds += el.productId+','
+                }
+                if(el.validFlag !== 2){
+                    isValidFlag = true;
+                }
+            });
+            if(isValidFlag){
+                CAIMEI.Alert('部分选中的商品暂未上架，不能进行下架操作','确定');
+                return;
+            }
+            CAIMEI.Modal('批量下架会将选中的商品在全部平台进行下架，确定操作吗？','取消','确定',function () {
+                SupplierApi.SupplierSoldOut({productIds: productIds,groundMallType:0},function (response) {
+                    if (response.code === 0){
+                        CAIMEI.dialog('下架成功！');
+                        _this.getList();
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定');
+                    }
+                })
+            })
+        },
+        // 操作下架商品
+        handleDownshelf(pros){
+            if(this.isForbid){ return }
+            this.dialogFormVisible = true
+            this.handlePros = pros
+            if(this.handlePros.groundMall === '0'){
+                this.groundMallType = 1
+            }else if(this.handlePros.groundMall === '4'){
+                this.groundMallType = 2
+            }else{
+                this.groundMallType = 0
+            }
+        },
+        // 下架商品
+        handleConfirmShelf(){
+            const _this = this
+            SupplierApi.SupplierSoldOut({productIds:this.handlePros.productId,groundMallType:this.groundMallType},function (response) {
+                if (response.code === 0){
+                    _this.dialogFormVisible = false
+                    CAIMEI.dialog('下架成功~');
+                    _this.getList();
+                }else{
+                    _this.dialogFormVisible = false
+                    CAIMEI.Alert(response.msg,'确定');
+                }
+            })
+        },
+        handlePushHot(pros){//添加主页推荐
+            var _this = this;
+            var num = 4-this.featuredNum;
+            if(this.isForbid){ return }
+            CAIMEI.Modal('总共能添加4个主推商品，您还能添加'+num+'个确定将该商品添加为主推商品吗？','取消','确定',function () {
+                SupplierApi.SwitchFeatured({productId:pros.productId,featuredFlag:1,shopId:_this.shopId},function (response) {
+                    if (response.code == 0){
+                        CAIMEI.dialog('添加成功~');
+                        _this.productsList = [];
+                        _this.getList();
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定');
+                    }
+                })
+            })
+        },
+        handleDeleteHot(pros){//删除主页推荐
+            var _this = this;
+            if(this.isForbid){ return }
+            CAIMEI.Modal('是否把该商品从主推商品中删除？','取消','确定',function () {
+                SupplierApi.SwitchFeatured({productId:pros.productId,featuredFlag:0,shopId:_this.shopId},function (response) {
+                    if (response.code == 0){
+                        CAIMEI.dialog('删除成功~');
+                        _this.productsList = [];
+                        _this.getList();
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定');
+                    }
+                })
+            })
+        },
+        handlePreview(pros){//预览商品
+            if(this.isForbid){ return }
+            window.open('/product-'+pros.productId+'.html');
+        },
+        handleEdit(pros){//编辑商品
+            if(this.isForbid){ return }
+            location.href ='/supplier/release.html?productId='+pros.productId+'&type=edit';
+        },
+        toFixedFn(text){
+            return Number(text).toFixed(2);
+        }
+    },
+    mounted: function () {
+        if(globalUserData){
+            this.userId = globalUserData.userId;
+            this.listQuery.shopId = globalUserData.shopId;
+            this.shopId =globalUserData.shopId;
+        }
+        this.getList();
+        if(isPC){
+            this.layout ='total, prev, pager, next, jumper';
+        }else{
+            this.layout ='total, prev, pager, next';
+        }
+        $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
+        $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(5).addClass("on");
+    }
+});
+

src/main/resources/templates/supplier-center/components/tableft.html

@@ -17,6 +17,7 @@
             <a href="/supplier/release.html" v-if="isForbidTabs">发布商品</a>
             <a href="/supplier/goods.html">我的商品</a>
             <a href="/supplier/brand.html">品牌管理</a>
+            <a href="/supplier/freight.html">运费模板管理</a>
         </div>
     </div>
     <div class="navList">

src/main/resources/templates/supplier-center/order/detail.html

@@ -86,7 +86,9 @@
                             <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
                           </div>
                           <div class="order-item">
-                                <p class="none">结算运费：<span class="red">{{ order.postageInfo }}</span> </p>
+                              <p>结算运费：<span class="red">{{ order.postageInfo }}</span> </p>
+                              <p>优惠券：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                              <p>促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
                           </div>
                           <div class="order-item">
                                 <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>

src/main/resources/templates/supplier-center/order/list.html

@@ -132,7 +132,9 @@
                                 <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
                             </div>
                             <div class="order-item">
-                                <p class="none">结算运费：<span class="red">{{order.postageInfo }}</span> </p>
+                                <p>结算运费：<span class="red">{{order.postageInfo }}</span> </p>
+                                <p>优惠券：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                                <p>促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
                             </div>
                             <div class="order-item">
                                 <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount| amountfilters}}</span> </p>

src/main/resources/templates/supplier-center/order/order-edit.html

@@ -102,7 +102,9 @@
                               <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
                           </div>
                           <div class="order-item">
-                              <p class="none">结算运费：<span class="red">{{ order.postageInfo }}</span> </p>
+                              <p>结算运费：<span class="red">{{ order.postageInfo }}</span> </p>
+                              <p>优惠券：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                              <p>促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
                           </div>
                           <div class="order-item">
                               <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>

src/main/resources/templates/supplier-center/order/order-return.html

@@ -64,7 +64,9 @@
                                 <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
                             </div>
                             <div class="order-item">
-                                <p class="none">结算运费：<span class="red">{{ order.postageInfo }}</span> </p>
+                                <p>结算运费：<span class="red">{{ order.postageInfo }}</span> </p>
+                                <p>优惠券：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                                <p>促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
                             </div>
                             <div class="order-item">
                                 <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>

src/main/resources/templates/supplier-center/shop/freight.html

@@ -0,0 +1,315 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <title>采美365网</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/shop/freight.css(v=${version})}" rel="stylesheet" type="text/css">
+    <!--element ui 样式表-->
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 我的采美 -->
+<div id="myGoods">
+    <div class="navLayout goods-container" v-cloak>
+        <div class="crumbs" v-if="isPC">
+            <span>我的店铺</span>
+            <span>&gt;</span>
+            <span>运费模板管理</span>
+        </div>
+        <div class="wrap clear">
+            <!--左侧面包屑-->
+            <template th:replace="supplier-center/components/tableft"></template>
+            <div class="right">
+                <div class="head-top clear">
+                    <div class="form-row low">
+                        <span v-if="isPC">商品名称：</span>
+                        <el-input
+                                v-model="listQuery.name"
+                                class="state"
+                                placeholder="请输入商品名称"
+                                clearable
+                                @keyup.enter.native="getList"
+                                @clear="getList"
+                        ></el-input>
+                    </div>
+                    <div class='form-row low'>
+                        <span v-if="isPC">商品编码：</span>
+                        <el-input
+                                v-model="listQuery.productCode"
+                                class="state"
+                                placeholder="请输入商品编码"
+                                clearable
+                                @keyup.enter.native="getList"
+                                @clear="getList"
+                        ></el-input>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">商品状态：</span>
+                        <el-select v-model="listQuery.validFlag" class="state" clearable @change="getList">
+                            <el-option value="" label="所有"></el-option>
+                            <el-option label="待审核" value="1"></el-option>
+                            <el-option label="审核未通过" value="8"></el-option>
+                            <el-option label="已上架" value="2"></el-option>
+                            <el-option label="已下架" value="3"></el-option>
+                            <el-option label="已冻结" value="9"></el-option>
+                            <el-option label="已隐身" value="10"></el-option>
+                            <el-option label="已删除" value="0"></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">主推商品：</span>
+                        <el-select v-model="listQuery.featuredFlag" class="state" clearable @change="getList">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option label="是" value="1"></el-option>
+                            <el-option label="否" value="0"></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">商品属性：</span>
+                        <el-select v-model="listQuery.commodityType" class="state" clearable @change="handleCommodityType($event)">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option label="产品" value="1"></el-option>
+                            <el-option label="仪器" value="2"></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row fenlei">
+                        <span v-if="isPC">商品分类：</span>
+                        <el-select v-model="listQuery.bigTypeId" class="state" clearable @change="handeleChangeFirst($event)">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option
+                                    v-for="item in classificationFirstList"
+                                    :key="item.bigTypeId"
+                                    :label="item.name"
+                                    :value="item.bigTypeId"
+                            ></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row fenlei">
+                        <el-select v-model="listQuery.smallTypeId" class="state small" clearable @change="handeleChangeTwo($event)">
+                            <el-option label="二级分类" value="" ></el-option>
+                            <el-option
+                                    v-for="item in classificationTwoList"
+                                    :key="item.smallTypeId"
+                                    :label="item.name"
+                                    :value="item.smallTypeId"
+                            ></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row fenlei">
+                        <el-select v-model="listQuery.tinyTypeId" class="state small" clearable @change="getList">
+                            <el-option label="三级分类" value="" ></el-option>
+                            <el-option
+                                    v-for="item in classificationThreeList"
+                                    :key="item.tinyTypeId"
+                                    :label="item.name"
+                                    :value="item.tinyTypeId"
+                            ></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">新品展示：</span>
+                        <el-select v-model="listQuery.showFlag" class="state" clearable @change="getList">
+                            <el-option value="" label="所有"></el-option>
+                            <el-option label="待审核" value="0"></el-option>
+                            <el-option label="已展示" value="1"></el-option>
+                            <el-option label="展示过期" value="2"></el-option>
+                            <el-option label="未展示" value="3"></el-option>
+                            <el-option label="审核未通过" value="4"></el-option>
+                            <el-option label="已下线" value="5"></el-option>
+                        </el-select>
+                    </div>
+                    <div class="form-row">
+                        <span v-if="isPC">上架平台：</span>
+                        <el-select v-model="listQuery.groundMall" class="state" clearable @change="getList">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option label="【采美平台】" value="0"></el-option>
+                            <el-option label="【丽格集采联盟平台】" value="4"></el-option>
+                        </el-select>
+                    </div>
+                    <div id="newBtn">
+                        <el-button type="primary" @click="getList">查询</el-button>
+                        <el-button type="primary" :disabled="disabled"  @click="handleDownshelfAll">批量下架</el-button>
+                    </div>
+                </div>
+                <div class="goods-tips" v-if="isForbid">
+                    <div class="end-tips">
+                        <span class="WEB-icon tips"></span>
+                        <span>您的上架费已到期，已禁止商品的所有操作，支付账户上架费后才能继续操作。</span>
+                    </div>
+                </div>
+                <div class="goods-main" v-if="productsList.length>0">
+                    <el-table
+                            :data="productsList"
+                            v-loading="listLoading"
+                            element-loading-text="Loading"
+                            border
+                            fit
+                            height="600px"
+                            highlight-current-row
+                            :header-cell-style="{background:'#E1E1E1',color:'#606266'}"
+                            @selection-change="handleSelectionChange"
+                    >
+                        <el-table-column
+                                type="selection"
+                                align="center"
+                                width="55">
+                        </el-table-column>
+                        <el-table-column label="商品图片" align="center" prop="shopOrderNo" width="80">
+                            <template slot-scope="{row}">
+                                <img :src="row.image" :alt="row.name" style="width: 40px;height: 40px;">
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品名称" align="center" prop="orderTime" width="200">
+                            <template slot-scope="{row}">
+                                {{ row.name}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品分类" align="center" prop="name" width="120">
+                            <template slot-scope="{row}">
+                                {{ row.typeName}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="市场价/售价" align="center" prop="payTotalFee" width="160">
+                            <template slot-scope="{row}">
+                                ¥{{ row.normalPrice | NumFormat }}/ ¥{{ row.price | NumFormat }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="上架平台" align="center" prop="groundMall" width="250">
+                            <template slot-scope="{row}">
+                                <template v-if="row.groundMall === '0'">
+                                    <P>
+                                        <span style="float: left;">【采美平台】</span>
+                                        <el-tag v-if="row.validFlag===0" type="danger" size="small" style="float: right;">已删除</el-tag>
+                                        <el-tag v-if="row.validFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.validFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.validFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
+                                        <el-tag v-if="row.validFlag===8" type="danger" size="small" style="float: right;">审核未通过</el-tag>
+                                        <el-tag v-if="row.validFlag===9" type="danger" size="small" style="float: right;">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===10" type="danger" size="small" style="float: right;">已冻结</el-tag>
+                                    </P>
+                                </template>
+                                <template v-else-if="row.groundMall === '4'">
+                                    <P>
+                                        <span style="float: left;">【丽格集采联盟平台】</span>
+                                        <el-tag v-if="row.mallValidFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===8" type="danger" size="small" style="float: right;">审核未通过</el-tag>
+                                    </P>
+                                </template>
+                                <template v-else>
+                                    <P>
+                                        <span style="float: left;">【采美平台】</span>
+                                        <el-tag v-if="row.validFlag===0" type="danger" size="small" style="float: right;">已删除</el-tag>
+                                        <el-tag v-if="row.validFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.validFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.validFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
+                                        <el-tag v-if="row.validFlag===8" type="danger" size="small" style="float: right;">审核未通过</el-tag>
+                                        <el-tag v-if="row.validFlag===9" type="danger" size="small" style="float: right;">已隐身</el-tag>
+                                        <el-tag v-if="row.validFlag===10" type="danger" size="small" style="float: right;">已冻结</el-tag>
+                                    </P>
+                                    <P>
+                                        <span style="float: left;">【丽格集采联盟平台】</span>
+                                        <el-tag v-if="row.mallValidFlag===1" type="warning" size="small" style="float: right;">待审核</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===2" type="success" size="small" style="float: right;">已上架</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===3" type="danger" size="small" style="float: right;">已下架</el-tag>
+                                        <el-tag v-if="row.mallValidFlag===8" type="danger" size="small" style="float: right;">审核未通过</el-tag>
+                                    </P>
+                                </template>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="新品展示" align="center" prop="showFlag" width="120" >
+                            <template slot-scope="{row}">
+                                <template v-if="row.groundMall === '0' || row.groundMall === '0##4'">
+                                    <el-tag v-if="row.showFlag===0" type="warning" size="small">待审核</el-tag>
+                                    <el-tag v-if="row.showFlag===1" type="success" size="small">已展示</el-tag>
+                                    <el-tag v-if="row.showFlag===2" type="danger" size="small">展示过期</el-tag>
+                                    <el-tag v-if="row.showFlag===3" type="warning" size="small">未展示</el-tag>
+                                    <el-tag v-if="row.showFlag===4" type="danger" size="small">审核未通过</el-tag>
+                                    <el-tag v-if="row.showFlag===5" type="danger" size="small">已下线</el-tag>
+                                </template>
+                                <template v-else>
+                                    <span>--</span>
+                                </template>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" align="center" width="250">
+                            <template slot-scope="{row}">
+                                <el-button type="primary" style="margin: 5px;" v-if="[0,1,2,3,8,9].indexOf(row.validFlag)!=-1" :disabled="isForbid" size="mini" plain @click="handleEdit(row)">编辑</el-button>
+                                <template  v-if="[2].indexOf(row.validFlag)!=-1 || [2].indexOf(row.mallValidFlag)!=-1">
+                                    <el-button type="primary" style="margin: 5px;" :disabled="isForbid" size="mini" plain @click="handleDownshelf(row)">下架</el-button>
+                                </template>
+                                <template v-if="row.groundMall === '0' || row.groundMall === '0##4'">
+                                    <el-button type="primary" style="margin: 5px;" v-if="[2].indexOf(row.validFlag)!=-1" :disabled="isForbid" size="mini" plain @click="handlePreview(row)">查看</el-button>
+                                    <el-button type="primary" style="margin: 5px;" v-if="row.isDelFeatured" :disabled="isForbid" size="mini" plain @click="handleDeleteHot(row)">删除主页推荐</el-button>
+                                    <el-button type="primary" style="margin: 5px;" v-if="row.isAddFeatured" :disabled="isForbid" size="mini" plain @click="handlePushHot(row)">添加主页推荐</el-button>
+                                </template>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div  class="empty" v-else>
+                    <img src="/img/order/icon-goods.svg">
+                    <div class="msg"><p>您还未发布任何商品快去<a href="/supplier/release.html">发布</a>吧</p></div>
+                </div>
+                <div class="pagination">
+                    <el-pagination
+                            background
+                            :small="false"
+                            @current-change="handleCurrentChange"
+                            :current-page="listQuery.pageNum"
+                            :layout="layout"
+                            :total="total"
+                    >
+                    </el-pagination>
+                </div>
+                <!--下架弹窗-->
+                <el-dialog title="下架" :visible.sync="dialogFormVisible" width="380px" style="margin: 200px auto;">
+                    <template v-if="handlePros.groundMall === '0'">
+                        <p>确定将商品从【采美平台】下架吗？</p>
+                    </template>
+                    <template v-else-if="handlePros.groundMall === '4'">
+                        <p>确定将商品从【丽格集采联盟平台】下架吗？</p>
+                    </template>
+                    <template v-else>
+                        <el-row :gutter="24" class="box-row" style="margin-bottom: 20px;">
+                            <el-col :span="12" v-if="handlePros.mallValidFlag === 2 && handlePros.validFlag === 2">
+                                <el-radio v-model="groundMallType" :label="0">全部平台</el-radio>
+                            </el-col>
+                            <el-col :span="12" v-if="handlePros.validFlag === 2">
+                                <el-radio v-model="groundMallType" :label="1">【采美平台】</el-radio>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="24" class="box-row" style="margin-bottom: 20px;" v-if="handlePros.mallValidFlag === 2">
+                            <el-col :span="12">
+                                <el-radio v-model="groundMallType" :label="2">【丽格集采联盟平台】</el-radio>
+                            </el-col>
+                        </el-row>
+                    </template>
+
+                    <div slot="footer" class="dialog-footer">
+                        <el-button @click="dialogFormVisible = false">取消</el-button>
+                        <el-button type="primary" @click="handleConfirmShelf">确定</el-button>
+                    </div>
+                </el-dialog>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"
+        th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/shop/freight.js(v=${version})}"></script>
+</body>
+</html>

src/main/resources/templates/user-center/order/detail.html

@@ -138,7 +138,9 @@
                                     <p>商品总额：<span class="none" >￥{{orderInfo.totalAmount | NumFormat }}</span> </p>
                                     <p>订单总额：<span class="none" >￥{{orderInfo.totalAmount | NumFormat }}</span> </p>
                                     <p>运费：<span class="none">{{orderInfo.postageInfo }}</span> </p>
-                                    <p>优惠：<span class="none">￥{{orderInfo.eachDiscount | NumFormat}}</span> </p>
+                                    <p>优惠券：<span class="none">￥{{orderInfo.eachDiscount | NumFormat}}</span> </p>
+                                    <p>促销满减：<span class="none">￥{{orderInfo.eachDiscount | NumFormat}}</span> </p>
+                                    <p>赠品数：<span class="none">1</span> </p>
                                 </div>
                                 <div class="shopinfo-bott clear">
                                     <p>应付金额：<span class="none">￥{{orderInfo.realPay | NumFormat}}</span> </p>

src/main/resources/templates/user-center/order/list.html

@@ -96,6 +96,7 @@
                             </div>
                             <div class="order-content">
                                 <div class="order-item">
+                                    <p>优惠券：<span>￥{{order.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>促销满减：<span>￥{{order.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数：<span>{{order.presentNum}}</span></p>
                                 </div>