联合丽格V1.0.2

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

@@ -15,7 +15,7 @@ li{list-style:none}
     .pageTitle{height:57px;line-height:57px;padding-top:16px}
     .pageTitle h1{color:#2D3036;font-size:16px;font-weight:bold;float:left}
     .pageTitle h1 span{color:#627386;font-size:12px;font-weight:normal;margin-left:10px}
-    h2.title{height:36px;font-size:16px;padding:0 16px;line-height:36px;color:#22272e;font-weight:normal;clear:both}
+    h2.title{height:36px;font-size:16px;padding:0 ;line-height:36px;color:#22272e;font-weight:normal;clear:both}
     h2.title>a{color: #E15621;margin-left: 32px;}
     .pageTitle .step{float:right;color:#999999;font-size:14px;height:44px;line-height:44px}
     .pageTitle .step span{display:inline-block;height:20px;line-height:20px;vertical-align:middle;position:relative;padding-right:55px;}

src/main/resources/static/js/shopping/mixins/conMixins.js

@@ -72,13 +72,13 @@ var conMixins = function () {
             //修改运费
             handlePostageFlag($event,supplier){  // 选择到付 总运费为到付 供应商总价格 - 总运费  确认订单总金额 - 总运费
                 console.log('$event',$event)
-                const postage = supplier.isColdChina ? ( supplier.postage + supplier.coldChain ) : supplier.postage
+                // const postage = supplier.isColdChina ? ( supplier.postage + supplier.coldChain ) : supplier.postage
                 supplier.handlePostageFlag = $event;
                 if(supplier.handlePostageFlag === 1){
-                    supplier.totalPrice = Number((supplier.totalPrice*100 + postage*100)/100)
+                    supplier.totalPrice = Number((supplier.totalPrice*100 + supplier.postage*100)/100)
                     this.attributePallPrice()
                 }else{
-                    supplier.totalPrice = Number(this.repiceNumSub(supplier.totalPrice,postage))
+                    supplier.totalPrice = Number(this.repiceNumSub(supplier.totalPrice,supplier.postage))
                     this.attributePallPrice()
                 }
             },

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

@@ -90,7 +90,7 @@
                         <span class="coll-checked" :class="[cart.isChecked ? 'checked': '',cart.isDisable ? 'disable': '']"></span>
                     </div>
                     <div class="c1"><a :href="'/product-'+cart.productId+'.html'" target="_blank">
-                        <img class="smalltype" src="/img/base/icon-bigtype@2x.png" alt="">
+                        <img class="smalltype" src="/img/base/icon-bigtype@2x.png" alt="" v-if="cart.productType ===2">
                         <img class="image" :src="cart.image">
                     </a></div>
                     <div class="c2">

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

@@ -227,10 +227,12 @@
                         </span>
                         <div class="freight">
                             <template v-if="supplier.postageFlag === 0">
-                                运费：
-                                <span>包邮</span>
+                                运费：<span>包邮</span>
+                            </template>
+                            <template v-if="supplier.postageFlag === 1 && supplier.designatedFlag === 1">
+                                运费：<span v-if="supplier.handlePostageFlag === 1">¥{{ handleTotalPostage(supplier) | NumFormat }}</span>
                             </template>
-                            <template v-if="supplier.postageFlag === 1">
+                            <template v-if="(supplier.postageFlag === 1 && supplier.designatedFlag === 3) || (supplier.postageFlag === 1 && supplier.designatedFlag === 2)">
                                 <el-popover
                                         placement="bottom"
                                         width="240"
@@ -261,9 +263,23 @@
                                         </div>
                                     </template>
                                     <template v-if="supplier.handlePostageFlag === 2">
+                                        <div class="freight-radio" v-if="supplier.coldChain>0">
+                                            <p style="float: left;">冷链运输费</p>
+                                            <p style="float: right;">
+                                                <span>¥{{ supplier.coldChain | NumFormat }}</span>
+                                                <el-checkbox v-model="supplier.isColdChina" @change="handleChangeColdChina($event,supplier)"></el-checkbox>
+                                            </p>
+                                        </div>
+                                        <div class="freight-radio">
+                                            <p style="float: left;">其他运费</p>
+                                            <p style="float: right;"><span>到付</span></p>
+                                        </div>
                                         <div class="freight-radio">
                                             <p style="float: left;">总运费</p>
-                                            <p style="float: right;color: #F94B4B;"><span>到付</span></p>
+                                            <p style="float: right;color: #F94B4B;">
+                                                <span v-if="supplier.isColdChina">¥{{ supplier.coldChain | NumFormat }}</span>
+                                                <span v-else>到付</span>
+                                            </p>
                                         </div>
                                     </template>
                                     <span slot="reference">