提交订单

src/main/resources/static/css/base/base.pc.css

@@ -252,7 +252,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 /* 咨询，回到顶部 */
 #scrollTop{display:none;position:fixed;right:50%;margin-right:-700px;width:88px;z-index:9999;bottom:120px;}
 #scrollTop .item{width:100%;background-color:#fff;box-sizing:border-box;text-align:center;box-shadow:0 2px 4px rgb(254,246,243);border-radius:2px;margin-bottom:10px;font-size:12px;position:relative}
-#scrollTop .item>span{display:block;width:100%;box-sizing:border-box;position:relative;cursor:pointer;white-space:pre-wrap;word-break:break-all;}
+#scrollTop .item>span{display:block;width:94px;box-sizing:border-box;position:relative;cursor:pointer;white-space:pre-wrap;word-break:break-all;}
 #scrollTop .item>span:hover{color:#E15616;}
 #scrollTop .item .phone{padding:4px 16px 4px 48px;line-height:16px;}
 #scrollTop .item .phone:before{width:32px;height:32px;background-position:0 -254px;position:absolute;top:4px;left:16px}

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

@@ -1,7 +1,7 @@
 /**
  * PC端
  */
-@media screen and (min-width:768px){
+/*@media screen and (min-width:768px){*/
     .inner{width: 1184px;margin: 0 auto;}
     .container{width: 100%;height: auto;float: left;margin-bottom: 30px;}
     .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
@@ -95,43 +95,32 @@
     .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}
     .pay-button-main .pay-button a.disabled{background: #EFEFEF;color:#999999;}
     .footTop{margin-top: 0;}
-}
+/*}*/
 
 /**
 * 移动端
 */
-@media screen and (max-width:768px){
-.head-wrap{box-sizing:border-box;padding:0 3.2vw;height:15vw;line-height:15vw;background:#FFF;font-size:4.6vw}
-.head-wrap .logo{height:15vw;float:left;margin-right:3vw}
-.head-wrap .logo img{height:15vw}
-.pay-title,.pay-goods{margin-top:2.6vw;background:#FFF;position:relative;padding:2.6vw 3.2vw;line-height:7vw}
-.pay-title .title-left p span{display:block;color:#e15616;font-size:3.4vw}
-.pay-title .title-left p span:first-child{color:#333;font-size:4.2vw}
-.pay-title .title-right{text-align:right}
-.pay-title .title-right .time{box-sizing:border-box;padding-right:2vw;display:inline-block;width:40vw;height:10vw;line-height:9vw;background:url(/img/pay/icon-time.png)no-repeat;background-size:100% 100%}
-.pay-title .title-right .time span{display:inline-block;width:7vw;text-align:center;color:#FFF;vertical-align:middle}
-.pay-goods .bot-num{display:inline-block;width: 49%;}
-.pay-goods .bot-num span.red{    color: #FF2A2A;}
-.pay-goods .bot-left{
-    text-align: right;
-    color: #999999;
-    line-height: 10vw;
-}
-.pay-goods .bot-left p{display:inline-block;}
-.pay-goods .bot-left .icon-down {
-    display:inline-block;
-    width: 4vw;
-    height: 4vw;
-    background: url(/img/pay/icon-bot.gif);
-    background-size: 100% 100%;
-    vertical-align: text-bottom;
-}
+/*@media screen and (max-width:768px){*/
+/*    .head-wrap{box-sizing:border-box;padding:0 3.2vw;height:15vw;line-height:15vw;background:#FFF;font-size:4.6vw}*/
+/*    .head-wrap .logo{height:15vw;float:left;margin-right:3vw}*/
+/*    .head-wrap .logo img{height:15vw}*/
+/*    .pay-title,.pay-goods{margin-top:2.6vw;background:#FFF;position:relative;padding:2.6vw 3.2vw;line-height:7vw}*/
+/*    .pay-title .title-left p span{display:block;color:#e15616;font-size:3.4vw}*/
+/*    .pay-title .title-left p span:first-child{color:#333;font-size:4.2vw}*/
+/*    .pay-title .title-right{text-align:right}*/
+/*    .pay-title .title-right .time{box-sizing:border-box;padding-right:2vw;display:inline-block;width:40vw;height:10vw;line-height:9vw;background:url(/img/pay/icon-time.png)no-repeat;background-size:100% 100%}*/
+/*    .pay-title .title-right .time span{display:inline-block;width:7vw;text-align:center;color:#FFF;vertical-align:middle}*/
+/*    .pay-goods .bot-num{display:inline-block;width: 49%;}*/
+/*    .pay-goods .bot-num span.red{color: #FF2A2A;}*/
+/*    .pay-goods .bot-left{text-align: right;color: #999999;line-height: 10vw;}*/
+/*    .pay-goods .bot-left p{display:inline-block;}*/
+/*    .pay-goods .bot-left .icon-down {display:inline-block;width: 4vw;height: 4vw;background: url(/img/pay/icon-bot.gif);background-size: 100% 100%;vertical-align: text-bottom;}*/
+/*    .pay-goods .list-title{display: none;}*/
 
 
 
 
 
 
-
-}
+/*}*/
 

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

@@ -1,7 +1,7 @@
 /**
  * PC端
  */
-@media screen and (min-width:768px){
+/*@media screen and (min-width:768px){*/
     .head-wrap{width: 100%;height: 81px;float: left;background-color: #FFFFFF;margin-bottom: 26px;}
     .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;}
     .head-wrap .logo{width:68px;height: 81px;float: left;}
@@ -53,7 +53,7 @@
     .impowerBox .status_icon {display: none;}
     .impowerBox .status {text-align: center;display: none;}
     .impowerBox .qrcode{margin-top: 0;}
-}
+/*}*/
 
 /**
 * 移动端

src/main/resources/static/css/user-center/dashboard.css

@@ -80,7 +80,7 @@ li{list-style:none}
     .user-content .section .user-main .new-list{width: 100%;height: 36px;float: left;cursor: pointer;}
     .user-content .section .user-main .new-list .text{width: 600px;line-height: 36px;font-size: 14px;color: #4a4f58;float: left;padding-left: 15px;position: relative; white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;}
     .user-content .section .user-main .new-list .text:hover{color: #E15616;text-decoration: underline;}
-    .user-content .section .user-main .new-list .text:before{content: '';width: 8px;height: 8px;border-radius: 50%;background-color: #e15616;position: absolute;left: 0;top:10px;}
+    .user-content .section .user-main .new-list .text:before{content: '';width: 6px;height: 6px;border-radius: 50%;background-color: #e15616;position: absolute;left: 0;top:15px;}
     .user-content .section .user-main .new-list .time{line-height: 36px;font-size: 12px;color: #9aa5b5;float: right;}
 }
 

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

@@ -22,13 +22,13 @@ li{list-style:none}
     .order-container .section .section-info .order-title .title-time{position:absolute;right:0;top:0;line-height:40px;font-size: 12px;color: #9aa5b5;}
     .order-container .section .section-info .order-content{width:100%;height:auto;}
     .order-container .section .section-info .order-content .order-item{width:100%;}
-    .order-container .section .section-info .order-content .order-item p{display:inline-block;margin-left:45px;line-height: 36px;color: #22272e;font-size: 14px;}
+    .order-container .section .section-info .order-content .order-item p{display:inline-block;margin-left:45px;line-height: 36px;color: #627386;font-size: 14px;}
     .order-container .section .section-info .order-content .order-item p.org{}
     .order-container .section .section-info .order-content .order-item p.copy{margin-left:20px;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;margin-top: 6px;cursor: pointer;}
     .order-container .section .section-info .order-content .order-item p span{margin-left: 5px;}
     .order-container .section .section-info .order-content .order-item p .red{color: #f94b4b;}
     .order-container .section .section-info .order-content .order-item p .org{color: #e15616;}
-    .order-container .section .section-info .order-content .order-item p .none{color:#627386;}
+    .order-container .section .section-info .order-content .order-item p .none{color:#22272e;}
     /*商品信息*/
     .order-container .section-list{margin-bottom: 10px;width: 100%;height: auto;box-sizing:border-box;}
     .order-container .section-shopinfo{width: 100%;height: auto;margin-bottom: 5px;box-sizing: border-box;padding: 0 20px 20px 20px;background-color: #FFFFFF;}
@@ -92,28 +92,15 @@ li{list-style:none}
     .section-paymentlist .record-list .item-rec.tt{text-align: right;}
     .section-paymentlist .record-empty{width: 100%;height: 40px;font-size: 14px;color: #999999;text-align: left;float: left;line-height: 40px;}
     /*底部按钮*/
-    .section-botton{width: 100%;height: 58px;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;}
+    .section-botton{width: 100%;height: 76px;box-sizing: border-box;float: left;padding:20px;background-color: #FFFFFF;}
+    /*.section-botton .inner{width: 1184px;margin: 0 auto;}*/
     .section-botton .btn{width: 88px;height: 34px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
     .section-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
     .section-botton .btn.primary{border-color: #E15616;background-color: #E15616;color: #FFFFFF;}
-    /*弹窗*/
-    .popup{width: 100%;height: 100%;background: rgba(0,0,0,0.3);position: fixed;top: 0;left: 0;z-index: 999;}
-    .popup-layer{-webkit-overflow-scrolling: touch;width: 390px;position: absolute;left: 50%;top: 50%;transform: translate(-50%,-50%);background-color: #fff;-webkit-background-clip: content;border-radius: 2px;box-shadow: 1px 1px 50px rgba(0,0,0,.3);z-index: 1000;}
-    .popup-layer.bran{height: auto;}
-    .popup-layer .popup-title{padding: 0 80px 0 20px;height: 42px;line-height: 42px;border-bottom: 1px solid #eee;font-size: 14px;color: #333;overflow: hidden;background-color: #F8F8F8;border-radius: 2px 2px 0 0;position: relative;}
-    .popup-title .popup-close{width: 16px;height: 16px;display: block;position: absolute;right: 10px;top: 13px;background: url("/img/base/icon.png") -317px -2px no-repeat;cursor: pointer;}
-    .popup-layer .popup-content{min-height: 80px;box-sizing: border-box;padding:10px 16px;}
-    .popup-layer .popup-content .popup-message{box-sizing: border-box;padding: 8px 0;border-top: 1px solid #ebebeb;display: none;}
-    .popup-layer .popup-content p{font-size: 14px;color: #333;text-align: justify;line-height: 24px;}
-    .popup-layer .popup-content p input {border: none;background-color: #FFF;width: 60px;font-size: 14px;color: #333;}
-    .popup-layer .popup-content p.red{padding-left: 24px;color: #FF2A2A;margin-top: 10px;background: url("/web/order/img/icon-tips.png")no-repeat;}
-    .popup-layer .popup-content p span{color: #e15616;}
-    .popup-layer .popup-content p span.down{color: #333;display: inline-block;padding-right: 20px;background: url("/web/order/img/Retract.png") right center no-repeat;}
-    .popup-layer .popup-content p span.copy{width:42px;height:18px;background:linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);opacity:1;border-radius:3px;font-size: 12px;display: inline-block;line-height: 18px;color: #FFF;text-align: center;cursor: pointer;}
-    .popup-layer .popup-button{box-sizing: border-box;text-align: right;padding: 0 15px 12px;pointer-events: auto;user-select: none;-webkit-user-select: none;}
-    .popup-layer .popup-button .btn{height: 30px;line-height: 28px;margin: 5px 5px 0;padding: 0 15px;border: 1px solid #dedede;background-color: #fff;color: #333;border-radius: 2px;font-weight: 400;cursor: pointer;text-decoration: none;display: inline-block;}
-    .popup-layer .popup-button .btn.btn-confim{border-color: #E15616;background-color: #E15616;color: #fff;}
-    .popup-layer .popup-button .btn.btn-onlinePayConfim{border-color: #E15616;background-color: #E15616;color: #fff;}
+    .section-botton .shopinfo{float: right;height: 100%;margin-right: 10px;}
+    .section-botton .price-total{text-align: right;color: #22272e;font-size: 16px;float: right;padding-top: 0;line-height: 36px;}
+    .section-botton.fiexd{position: fixed;bottom: 0;right: 0;}
+    .section-botton.fiexd .inner{width: 1184px;margin: 0 auto;z-index: 9999;}
 }
 
 /**

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

@@ -58,8 +58,8 @@ li{list-style:none}
     .order-container .section .user-main .order-title .title-time{float: right;line-height:  40px;font-size: 12px;color: #9aa5b5;}
     .order-container .section .user-main .order-content{width: 100%;height: auto;float: left;}
     .order-container .section .user-main .order-content .order-item{width: 100%;height: 36px;float: left;}
-    .order-container .section .user-main .order-content .order-item p{float: left;margin-right: 50px;line-height: 36px;color: #22272e;font-size: 14px;}
-    .order-container .section .user-main .order-content .order-item p span{margin-left: 5px;}
+    .order-container .section .user-main .order-content .order-item p{float: left;margin-right: 50px;line-height: 36px;color: #627386;font-size: 14px;}
+    .order-container .section .user-main .order-content .order-item p span{margin-left: 5px;color: #22272e;}
     .order-container .section .user-main .order-content .order-item p .red{color: #f94b4b;}
     .order-container .section .user-main .order-content .order-botton{width: 100%;height: 36px;float: left;margin-top: 8px;}
     .order-container .section .user-main .order-content .order-botton .btn{width: 88px;height: 34px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
@@ -117,6 +117,7 @@ li{list-style:none}
 .user-main.order .order-title .bag{position:absolute;left:0;top:2.6vw;width:9.6vw;height:4.2vw;line-height:4.2vw;text-align:center;color:#FFF;background-image:linear-gradient(90deg,#ffb427 0%,#f58e4d 100%);border-radius:2px}
 .user-main.order .order-title .state{position:absolute;right:0;bottom:0;color:#e15616}
 .user-main.order .order-title .title-time span,.user-main.order .order-content span{color:#22272e}
+.user-main.order .order-content span.red{color: #f94b4b;}
 .user-main.order .order-item p{display:inline-block;width:49%}
 .user-main.order .order-botton{text-align:right;margin-top:2vw}
 .user-main.order .order-botton .btn{display:inline-block;width:22.4vw;height:9.5vw;line-height:9.5vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;color:#e15616;font-size:3.4vw;margin-left:2.6vw}

src/main/resources/static/css/user-center/repair/list.css

@@ -30,7 +30,7 @@ li{list-style:none}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}
     .container .section .content{width: 100%;height: auto;}
     .container .section .list{width: 100%;height: 44px;}
-    .container .section .td{height: 54px;font-size: 14px;color:#627386;float: left;line-height:54px;text-align: left;}
+    .container .section .td{height: 54px;font-size: 14px;color:#627386;float: left;line-height:54px;text-align: center;}
     .container .section .td.td-1{width:11%;}
     .container .section .td.td-2{width:14%;text-align: center;}
     .container .section .td.td-3{width:19%;text-align: center;}

src/main/resources/static/js/common/ajax.service.js

@@ -56,7 +56,7 @@ var Http = {
         },
         uploadImage : function(option,callback) {//上传图片
             var NODE_ENV_BASE_URL = $("#spiServer").val();
-            var NODE_ENV_BASE_URL = 'https://spi-b.caimei365.com';
+            // var NODE_ENV_BASE_URL = 'https://spi-b.caimei365.com';
             $.ajax({
                 url: NODE_ENV_BASE_URL + option.url,
                 type: 'POST',

src/main/resources/static/js/user-center/message.js

@@ -58,6 +58,7 @@ var helpSuggestion = new Vue({
             var _self = this;
             UserApi.GetMymessageList(_self.listQuery,function (response) {
                 if(response.code == 0){
+                    _self.isRequset = false;
                      if (response.data.results.length>0){
                       var data = response.data;
                          _self.messagesList = data.results;
@@ -67,8 +68,6 @@ var helpSuggestion = new Vue({
                      _self.requestFlag = false;
                       _self.listRecord =  data.totalRecord;
                      }
-
-                     _self.isRequset = false;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                      _self.requestFlag = false;

src/main/resources/static/js/user-center/order/detail.js

@@ -12,7 +12,8 @@ var orderPage = new Vue({
         discernReceiptList:[],  //订单付款信息
         returnedPurchaseList:[],//订单退款信息
         orderIdentificationId:'',//订单标识
-        modelType:0
+        modelType:0,
+        isFiexd:false
     },
     filters: {
         NumFormat:function(text) {//处理金额
@@ -233,7 +234,7 @@ var orderPage = new Vue({
             _self.modelType = 0;
         },
         hanldQueryExpressFn:function(){//跳转查看物流
-
+            window.location.href='/user/order/logistics.html?orderId='+_self.orderId;
         },
         copyOrderBtnSubmitFn:function(){//复制订单标识
             var _self = this;
@@ -270,11 +271,23 @@ var orderPage = new Vue({
         },
     },
     mounted: function () {
+        var _self = this;
         if(globalUserData){
             this.userId = globalUserData.userId;
             this.orderId = CAIMEI.getUrlParam('orderId');
             this.GetQueryOrderDetailsInfo();
         }
+        $(window).scroll(function (event) {
+            var supportPageOffset = window.pageXOffset !== undefined; // 判断是否支持pageXOffset
+            var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat"); // 判断渲染模式是不是标准模式
+            var scrollHeight = supportPageOffset ? window.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
+            console.log(scrollHeight)
+            if(scrollHeight>340){
+                _self.isFiexd = true
+            }else{
+                _self.isFiexd = false
+            }
+        });
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(0).addClass("on").find('.con').show().find('a').eq(0).addClass("on");
 

src/main/resources/static/js/user-center/order/list.js

@@ -211,7 +211,7 @@ var orderPage = new Vue({
         hanldDetilsOrderFn:function(orderId){//订单详情
             window.location.href='/user/order/detail.html?orderId='+orderId;
         },
-        hanldQueryExpressFn:function(orderId){
+        hanldQueryExpressFn:function(orderId){//查看物流
            window.location.href='/user/order/logistics.html?orderId='+orderId;
         },
         showModelTypePop: function(){
@@ -362,14 +362,5 @@ var orderPage = new Vue({
                 _self.listQuery.endTime = s2;
             }
         });
-
-
-
-
-
-
-
-
-
     }
 });

src/main/resources/static/js/utils.js

@@ -175,7 +175,7 @@ CAIMEI.Popup = function(params,confirmCallback, cancelCallback){
 CAIMEI.Alert = function(content,confitmText,flg,callback){
     $.confirm({
         boxWidth: (isPC?'300px':'70%'),
-        title:'',
+        title:'提示',
         content: content,
         closeIcon: true,
         animation: 'opacity',

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

@@ -26,7 +26,7 @@
                 <div v-if="isRequset" class="loading">
                     <img src="/img/base/loading.gif">
                 </div>
-                <div class="content clear">
+                <div class="content clear" v-else>
                     <div class="title">所有消息</div>
                     <div class="section">
                         <div class="section-top" v-if="isPC">

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

@@ -78,7 +78,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="section" v-if="operationList.length > 0&& !isPC">
+                    <div class="section" v-else-if="operationList.length > 0 && !isPC">
                             <div class="list"  v-for="(item, index) in operationList" :key="index">
                                   <div class="list-one">
                                       <span>姓名：<p>{{item.linkName}}</p></span>

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

@@ -59,19 +59,19 @@
                                     <p>订单总额：<span class="red">￥{{orderInfo.payTotalFee | NumFormat}}</span> </p>
                                     <p>应付总额：
                                         <span class="red">￥{{orderInfo.payableAmount | NumFormat}}</span>
-                                        <span class="none" v-if="orderInfo.balancePayFee>0">(账户余额抵扣：￥{{orderInfo.balancePayFee | NumFormat}})</span>
+                                        <span v-if="orderInfo.balancePayFee>0">(账户余额抵扣：￥{{orderInfo.balancePayFee | NumFormat}})</span>
                                     </p>
                                     <p>已支付：<span class="red">￥{{orderInfo.receiptAmount | NumFormat}}</span> </p>
                                     <p>待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>税费： <span class="none">￥{{orderInfo.expensesOfTaxation | NumFormat}}</span> </p>
-                                    <p v-if="orderInfo.freePostFlag == '0'">运费：<span class="none">包邮</span> </p>
-                                    <p v-if="orderInfo.freePostFlag == '-1'">运费：<span class="none">到付</span> </p>
-                                    <p v-if="orderInfo.freePostFlag == '1'">运费：<span class="none">￥{{orderInfo.freight | NumFormat}}</span> </p>
-                                    <p v-if="orderInfo.discountFee!=0">经理折扣：<span class="none">￥{{orderInfo.discountFee | NumFormat}}</span> </p>
-                                    <p>促销满减：<span class="none">￥{{orderInfo.payTotalFee | NumFormat}}</span> </p>
-                                    <p>赠品数：<span class="none">{{orderInfo.presentCount}}</span></p>
+                                    <p>税费： <span>￥{{orderInfo.expensesOfTaxation | NumFormat}}</span> </p>
+                                    <p v-if="orderInfo.freePostFlag == '0'">运费：<span>包邮</span> </p>
+                                    <p v-if="orderInfo.freePostFlag == '-1'">运费：<span>到付</span> </p>
+                                    <p v-if="orderInfo.freePostFlag == '1'">运费：<span>￥{{orderInfo.freight | NumFormat}}</span> </p>
+                                    <p v-if="orderInfo.discountFee!=0">经理折扣：<span>￥{{orderInfo.discountFee | NumFormat}}</span> </p>
+                                    <p>促销满减：<span>￥{{orderInfo.payTotalFee | NumFormat}}</span> </p>
+                                    <p>赠品数：<span>{{orderInfo.presentCount}}</span></p>
                                 </div>
                             </div>
                         </div>
@@ -165,9 +165,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="section-shopinfo">
-                                <p class="price-total">待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
-                            </div>
                         </div>
                         <div class="section-invoice shadow">
                             <div class="tit"><p>发票信息</p><!--<i class="icon mIcon"></i>--></div>
@@ -240,66 +237,24 @@
                                 <p>暂无退款记录</p>
                             </div>
                         </div>
-                    </div>
-                    <div class="section-botton shadow">
-                        <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
-                        <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
-                        <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
-                        <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>
-                        <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(orderInfo.status)!=-1" @click="hanldQueryExpressFn()">查看物流</a>
-                        <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">确认收货</a>
+                        <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
+                            <div class="inner">
+                                <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1" @click="hanldPayOrderFn()">支付订单</a>
+                                <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(orderInfo.status)!=-1" @click="hanldCancelOrderFn()">取消订单</a>
+                                <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(orderInfo.status)!=-1"  @click="hanldConfirmOrderFn()">确认订单</a>
+                                <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(orderInfo.status)!=-1" @click="hanldDeleteOrderFn()">删除订单</a>
+                                <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(orderInfo.status)!=-1" @click="hanldQueryExpressFn()">查看物流</a>
+                                <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">确认收货</a>
+                                <div class="shopinfo" v-if="['11','12','13','21','22','23','111'].indexOf(orderInfo.status)!=-1">
+                                    <p class="price-total">待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    <!--余额可抵扣部分-->
-    <!--<div class="popup" v-if="modelType==1">
-        <div class="popup-layer bran">
-            <div class="popup-title"> <p>提示</p> <i class="popup-close layui-layer-ico"></i></div>
-            <div class="popup-content">
-                <p>您有采美余额<span id="partMonery">￥{{ableUserMoney | NumFormat}}</span>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<span id="partAmont">￥{{pendingPayments | NumFormat}}</span></p>
-            </div>
-            <div class="popup-button">
-                <div class="btn btn-cancel" @click="hanldCancelConfirm">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="hanldPaymentConfirm(1)">抵扣,继续付款</div>
-            </div>
-        </div>
-    </div>-->
-    <!--余额可抵扣全部-->
-    <!--<div class="popup" v-if="modelType==2">
-        <div class="popup-layer bran">
-            <div class="popup-title"> <p>提示</p> <i class="popup-close layui-layer-ico"></i></div>
-            <div class="popup-content">
-                <p>您有采美余额<span>￥{{ableUserMoney | NumFormat}}</span>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</p>
-            </div>
-            <div class="popup-button">
-                <div class="btn btn-cancel" @click="hanldCancelConfirm">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="hanldPaymentConfirm(2)">抵扣</div>
-            </div>
-        </div>
-    </div>-->
-    <!--线下转账提示-->
-    <!--<div class="popup" v-if="modelType==3">
-        <div class="popup-layer bran">
-            <div class="popup-title"> <p>提示</p> <i class="popup-close layui-layer-ico"></i></div>
-            <div class="popup-content">
-                <p>您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解</p>
-                <p>待付金额: <span id="onlineMoney"></span></p>
-                <p><span class="down" id="showPpopupMsg">查看转账信息</span></p>
-                <div class="popup-message">
-                    <p>开户行：中信银行（深圳泰然支行）</p>
-                    <p>银行卡号：6217 6803 0362 0897</p>
-                    <p>户名：周仁声</p>
-                    <p>订单标识：<span class="red">{{orderIdentificationId}}}</span><span class="copy" id="copyOrderBtn" @click="copyOrderBtnSubmitFn">复制</span></p>
-                    <p class="red">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</p>
-                </div>
-            </div>
-            <div class="popup-button">
-                <div class="btn btn-onlinePayConfim" @click="hidePaymentConfirm">确定</div>
-            </div>
-        </div>
-    </div>-->
 </div>
 
 <!-- 引入底部 -->

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

@@ -88,7 +88,7 @@
                                     <p v-if="order.freePostFlag == '1'">运费：<span>￥{{order.freight | NumFormat}}</span> </p>
                                     <p v-if="order.discountFee!=0">经理折扣：<span>￥{{order.discountFee | NumFormat}}</span> </p>
                                     <p>促销满减：<span>￥{{order.payTotalFee | NumFormat}}</span> </p>
-                                    <p>赠品数：10</p>
+                                    <p>赠品数：<span>{{order.presentCount + order.promotionalGiftsCount}}</span></p>
                                 </div>
                                 <div class="order-item">
                                     <p>订单总额：<span class="red">￥{{order.payTotalFee | NumFormat}}</span> </p>
@@ -133,53 +133,6 @@
             </div>
         </div>
     </div>
-    <!--余额可抵扣部分-->
-    <!--<div class="popup" v-if="modelType==1">
-        <div class="popup-layer bran">
-            <div class="popup-title"> <p>提示</p> <i class="popup-close layui-layer-ico" @click="hidePaymentConfirm"></i></div>
-            <div class="popup-content">
-                <p>您有采美余额<span id="partMonery">￥{{payModelData.ableUserMoney}}</span>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<span id="partAmont">￥{{payModelData.pendingPayments}}</span></p>
-            </div>
-            <div class="popup-button">
-                <div class="btn btn-cancel" @click="hanldCancelConfirm">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="hanldPaymentConfirm(1)">抵扣,继续付款</div>
-            </div>
-        </div>
-    </div>-->
-    <!--余额可抵扣全部-->
-    <!--<div class="popup" v-if="modelType==2">
-        <div class="popup-layer bran">
-            <div class="popup-title"> <p>提示</p> <i class="popup-close layui-layer-ico" @click="hidePaymentConfirm"></i></div>
-            <div class="popup-content">
-                <p>您有采美余额<span>￥{{payModelData.ableUserMoney}}</span>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</p>
-            </div>
-            <div class="popup-button">
-                <div class="btn btn-cancel" @click="hanldCancelConfirm">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="hanldPaymentConfirm(2)">抵扣</div>
-            </div>
-        </div>
-    </div>-->
-    <!--线下转账提示-->
-    <!--<div class="popup" v-if="modelType==3">
-        <div class="popup-layer bran">
-            <div class="popup-title"> <p>提示</p> <i class="popup-close layui-layer-ico" @click="hidePaymentConfirm"></i></div>
-            <div class="popup-content">
-                <p>您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解</p>
-                <p>待付金额: <span id="onlineMoney">￥{{payModelData.pendingPayments}}</span></p>
-                <p><span class="down" id="showPpopupMsg">查看转账信息</span></p>
-                <div class="popup-message">
-                    <p>开户行：中信银行（深圳泰然支行）</p>
-                    <p>银行卡号：6217 6803 0362 0897</p>
-                    <p>户名：周仁声</p>
-                    <p>订单标识：{{orderIdentificationId}}}<span class="copy" id="copyOrderBtn" @click="copyOrderBtnSubmitFn">复制</span></p>
-                    <p class="red">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</p>
-                </div>
-            </div>
-            <div class="popup-button">
-                <div class="btn btn-onlinePayConfim" @click="hidePaymentConfirm">确定</div>
-            </div>
-        </div>
-    </div>-->
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>