运费V1.0.4

src/main/resources/static/css/pay/caimei-paylist.css

@@ -95,7 +95,7 @@
     .pay-list-cell .list-cell-button .list-cell-vleft.btn{width: 100%;}
     .pay-list-cell .list-cell-button .list-cell-btn{width: 22.4vw;height: 9.6vw;float: right;border-radius: 2px;line-height: 9.6vw;font-size: 3.4vw;text-align: center;background-color: #FF5B00;color: #FFFFFF;margin-left: 40px;cursor: pointer;}
     .pay-list-cell .list-cell-button .list-cell-btn:hover{background-color: rgba(225,86,22,0.9);}
-    .pay-list-cell .list-cell-button .list-cell-msg{float: left;line-height: 9.6vw;font-size: 3.4vw;color: #22272E;}
+    .pay-list-cell .list-cell-button .list-cell-msg{float: left;line-height: 9.6vw;font-size: 3.4vw;color: #22272E;margin-right: 2vw;}
     .pay-list-cell .list-cell-button .list-cell-msg span{font-weight: bold;}
     .pay-list-cell .list-cell-button .list-cell-msg span.red{color: #F94B4B;}
 

src/main/resources/static/css/shopping/shopping.css

@@ -175,7 +175,7 @@ li{list-style:none}
     .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:996;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
     .summaryWrap .summary .back{color:#f55c5c}
     .summaryWrap .summary .back .icon:before{width:20px;height:20px;background-position:-340px 0;margin-right:15px}
-    .priceTotal{position:relative;text-align:right;height: 50px;line-height: 50px;display:inline-block;}
+    .priceTotal{position:relative;text-align:right;height: 50px;line-height: 50px;display:inline-block;float: right;}
     .priceTotal em{color:#f55c5c}
     .priceTotal .dl{position:absolute;right:0;top:-20px;cursor:pointer;height:24px;font-size:12px}
     .priceTotal .dl em{position:absolute;top:-12px;height:24px;white-space:nowrap;right:0;background:#ff4500;line-height:24px;color:#FFF;padding:0 12px;border-radius:2px;font-size:14px}

src/main/resources/static/css/supplier-center/order/detail.css

@@ -31,7 +31,7 @@
 
     .title-time {float: right;color: #9aa5b5;}
     .order-item {display: flex;width: 100%;}
-    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: 25%}
+    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: auto;margin-right: 40px;}
     .red {color: #f94b4b;}
     .none {color: #333333;}
     .order-info {margin-top: 20px;}

src/main/resources/static/css/supplier-center/order/order-edit.css

@@ -30,7 +30,7 @@
     .title-time {float: right;color: #9aa5b5;}
     .order-item {display: flex;width: 100%;}
     .order-item p.state{color:#FF5B00;margin-left: 20px;}
-    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: 25%}
+    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: auto;margin-right: 40px;}
     .order-item p.none{width: 100%;}
     .red {color: #f94b4b;}
     .none {color: #333333;}

src/main/resources/static/css/supplier-center/order/order-return.css

@@ -17,7 +17,7 @@
     .title-name p{float: left;}
     .title-time {float: right;color: #9aa5b5;}
     .order-item {display: flex;width: 100%;}
-    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: 25%}
+    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: auto;margin-right: 40px;}
     .order-item p.state{color:#FF5B00;margin-left: 20px;}
     .order-item p.none{width: 100%;}
     .order-product .product-img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left;position: relative;}

src/main/resources/static/css/supplier-center/order/orderlist.css

@@ -16,7 +16,7 @@
     .title-name p.state{color:#FF5B00;margin-left: 20px;}
     .title-time{float: right;color: #9aa5b5;}
     .order-item{display: flex;width: 100%;}
-    .order-item p{display: inline-block;color: #627386;width: 25%;margin-bottom: 20px}
+    .order-item p{display: inline-block;color: #627386;width: auto;margin-right: 40px; margin-bottom: 20px}
     .order-item p.none{width: 100%;}
     .order-item.pay p span{color: #FF5B00}
     .red{color: #f94b4b;}

src/main/resources/templates/pay/caimei-paylist.html

@@ -67,9 +67,7 @@
                         <div class="list-cell-msg" v-if="list.obligation >0">
                             待付：<span class="red">￥{{list.obligation | NumFormat}}</span>
                         </div>
-                        <div class="list-cell-msg" v-if="list.eachDiscount >0">
-                            优惠：<span class="none">￥{{list.eachDiscount | NumFormat}}</span>
-                        </div>
+
                     </div>
                 </div>
                 <div class="list-cell-button">
@@ -86,6 +84,14 @@
                             </span>
                     </div>
                 </div>
+                <div class="list-cell-button">
+                    <div class="list-cell-msg" v-if="list.couponAmount >0">
+                        优惠：<span class="none">￥{{list.couponAmount | NumFormat}}</span>
+                    </div>
+                    <div class="list-cell-msg" v-if="list.promotionFullReduction >0">
+                        促销满减：<span class="none">￥{{list.promotionFullReduction | NumFormat}}</span>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

src/main/resources/templates/shopping/confirm.html

@@ -237,14 +237,14 @@
                                         placement="bottom"
                                         width="240"
                                         trigger="click">
-                                    <div class="freight-radio" v-if="supplier.designatedFlag !== 1">
-                                        <el-radio-group
-                                                v-model="supplier.handlePostageFlag"
-                                                @change="handlePostageFlag($event,supplier)">
-                                            <el-radio :label="1">不包邮</el-radio>
+<!--                                    <div class="freight-radio" v-if="supplier.designatedFlag !== 1">-->
+<!--                                        <el-radio-group-->
+<!--                                                v-model="supplier.handlePostageFlag"-->
+<!--                                                @change="handlePostageFlag($event,supplier)">-->
+<!--                                            <el-radio :label="1">不包邮</el-radio>-->
 <!--                                            <el-radio :label="2">到付</el-radio>-->
-                                        </el-radio-group>
-                                    </div>
+<!--                                        </el-radio-group>-->
+<!--                                    </div>-->
                                     <template v-if="supplier.handlePostageFlag === 1">
                                         <div class="freight-radio" v-if="supplier.coldChain>0">
                                             <p style="float: left;">冷链运输费</p>

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

@@ -87,8 +87,9 @@
                           </div>
                           <div class="order-item">
                               <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>
+                              <p v-if="order.couponAmount > 0">优惠券：<span class="red">￥{{order.couponAmount | amountfilters}}</span> </p>
+                              <p v-if="order.promotionFullReduction > 0">促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                              <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum }}</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

@@ -127,14 +127,15 @@
                             </div>
                             <div class="order-item">
                                 <p>商品金额：<span class="red">￥{{order.productAmount| amountfilters}}</span> </p>
-                                <p>结算商品金额：<span class="red">￥{{order.shopProductAmount| amountfilters}}</span> </p>
+                                <p>结算商品金额：<span class="red">￥{{order. | amountfilters}}</span> </p>
 <!--                                <p>结算税费：<span class="red">￥{{order.shopTaxFee| amountfilters}}</span> </p>-->
                                 <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
                             </div>
                             <div class="order-item">
                                 <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>
+                                <p v-if="order.couponAmount > 0">优惠券：<span class="red">￥{{order.couponAmount | amountfilters}}</span> </p>
+                                <p v-if="order.promotionFullReduction > 0">促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                                <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum }}</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

@@ -103,8 +103,9 @@
                           </div>
                           <div class="order-item">
                               <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>
+                              <p v-if="order.couponAmount > 0">优惠券：<span class="red">￥{{order.couponAmount | amountfilters}}</span> </p>
+                              <p v-if="order.promotionFullReduction > 0">促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                              <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum }}</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

@@ -65,8 +65,9 @@
                             </div>
                             <div class="order-item">
                                 <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>
+                                <p v-if="order.couponAmount > 0">优惠券：<span class="red">￥{{order.couponAmount | amountfilters}}</span> </p>
+                                <p v-if="order.promotionFullReduction > 0">促销满减：<span class="red">￥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                                <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum }}</span> </p>
                             </div>
                             <div class="order-item">
                                 <p>总结算金额：<span class="red">￥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>

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

@@ -135,16 +135,16 @@
                                     </div>
                                 </div>
                                 <div class="shopinfo-bott clear">
-                                    <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">1</span> </p>
+                                    <p>商品总额：<span class="red" >￥{{orderInfo.totalAmount | NumFormat }}</span> </p>
+                                    <p>订单总额：<span class="red" >￥{{orderInfo.totalAmount | NumFormat }}</span> </p>
+                                    <p>运费：<span class="red">{{orderInfo.postageInfo }}</span> </p>
+                                    <p v-if="orderInfo.couponAmount > 0">优惠券：<span class="red">￥{{orderInfo.couponAmount | NumFormat}}</span> </p>
+                                    <p v-if="orderInfo.promotionFullReduction > 0">促销满减：<span class="red">￥{{orderInfo.promotionFullReduction | NumFormat}}</span> </p>
+                                    <p v-if="orderInfo.presentNum > 0">赠品数：<span class="red">{{ orderInfo.presentNum }}</span> </p>
                                 </div>
                                 <div class="shopinfo-bott clear">
-                                    <p>应付金额：<span class="none">￥{{orderInfo.realPay | NumFormat}}</span> </p>
-                                    <p>已付金额：<span class="none">
+                                    <p>应付金额：<span class="red">￥{{orderInfo.realPay | NumFormat}}</span> </p>
+                                    <p>已付金额：<span class="red">
                                         ￥{{orderInfo.receiptAmount | NumFormat}}
                                         <span v-if="orderInfo.accountAmount>0">(余额抵扣：￥{{orderInfo.accountAmount | NumFormat}})</span>
                                     </span>

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

@@ -95,11 +95,6 @@
                                 </div>
                             </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>
                                 <div class="order-item">
                                     <p>订单总额：<span class="red">￥{{order.totalAmount | NumFormat}}</span> </p>
                                 </div>
@@ -108,6 +103,11 @@
                                     <p>已支付：<span class="red">￥{{order.receiptAmount | NumFormat}}</span> </p>
                                     <p>待付金额：<span class="red">￥{{order.obligation | NumFormat}}</span> </p>
                                 </div>
+                                <div class="order-item">
+                                    <p v-if="order.couponAmount > 0">优惠券：<span class="red">￥{{order.couponAmount | NumFormat}}</span> </p>
+                                    <p v-if="order.promotionFullReduction > 0">促销满减：<span class="red">￥{{order.promotionFullReduction | NumFormat}}</span> </p>
+                                    <p v-if="order.presentNum > 0">赠品数：<span class="red">{{order.presentNum}}</span></p>
+                                </div>
                                 <div class="order-botton">
 <!--                                    <a class="btn primary confirm" href="javascript: void(0);" v-if="order.affirmPaymentFlag== 10 " @click="hanldConfirmFn(order.userId,order.orderId)"><p>确认</p>打款供应商</a>-->
                                     <a class="btn primary" href="javascript: void(0);" v-if="[11,12,13,21,22,23].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.shopOrderId)">支付订单</a>