联合丽格V1.0.2

src/main/resources/static/js/supplier-center/order/settlement.js

@@ -39,7 +39,15 @@ var settlement = new Vue({
             this.listQuery.pageNum = val;
             this.getList();
         },
+        //导出
         downloadExportExcel(){
+            const _this = this;
+            CAIMEI.Modal('确定导出当前数据？','取消','确定',function () {
+                _this.exportExcel()
+            })
+        },
+        // 下载
+        exportExcel(){
             const _this = this;
             const NODE_ENV_BASE_URL = $("#coreServer").val();
             const xhr = new XMLHttpRequest();

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

@@ -42,7 +42,7 @@
                 <div class="product-info">
                     <div class="price">
                         <p class="protitle">商品金额：<span class="red">￥{{order.productAmount | amountfilters}}</span></p>
-                        <p class="price-right">结算商品金额：<span class="red">￥{{order.productAmount | amountfilters}}</span></p>
+                        <p class="price-right">结算商品金额：<span class="red">￥{{order.shopProductAmount | amountfilters}}</span></p>
                     </div>
                     <div class="product" >
                         <ul class="product-title">
@@ -55,7 +55,7 @@
                         <ul class="pro-information">
                             <li v-for="pro in orderProductList ">
                                 <div class="product-img">
-<!--                                    <span class="tips" v-if="pro.productType==2||pro.productType==1">赠品</span>-->
+                                    <span class="tips" v-if="pro.giftType==2||pro.giftType==1">赠品</span>
                                     <img :src="pro.image"/>
                                     <h3>{{pro.name}}</h3>
                                 </div>

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

@@ -141,7 +141,7 @@
                             <div class="order-product" v-for="proitem in order.orderProductList">
                                 <div class="product-img">
                                     <img :src="proitem.image"/>
-<!--                                    <span class="tips" v-if="proitem.productType==2||proitem.productType==1">赠品</span>-->
+                                    <span class="tips" v-if="proitem.giftType==2||proitem.giftType==1">赠品</span>
                                 </div>
                                 <div class="product-info">
                                     <h3>{{proitem.name}}</h3>

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

@@ -53,7 +53,7 @@
                             <li v-for="order in listData.logisticsRecordList">
                                 <div class="product-img">
                                     <img :src="order.image"/>
-<!--                                    <span class="tips" v-if="order.productType==2||order.productType==1">赠品</span>-->
+                                    <span class="tips" v-if="order.giftType==2||order.giftType==1">赠品</span>
                                     <h3>{{order.productName}}</h3>
                                 </div>
                                 <div>{{order.unit}}</div>

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

@@ -60,6 +60,7 @@
                         <ul class="pro-information">
                             <li v-for="pro in orderProductList ">
                                 <div class="product-img">
+                                    <span class="tips" v-if="pro.giftType==2||pro.giftType==1">赠品</span>
                                     <img :src="pro.image"/>
                                     <h3>{{pro.name}}</h3>
                                 </div>

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

@@ -73,6 +73,7 @@
                             <div class="order-product" v-for="proitem in order.orderProductList">
                                 <div class="product-img">
                                     <img :src="proitem.image"/>
+                                    <span class="tips" v-if="proitem.giftType==2||proitem.giftType==1">赠品</span>
                                 </div>
                                 <div class="product-main">
                                     <h3>{{proitem.name}}</h3>