订单列表 订单详情 ,订单支付

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

@@ -20,6 +20,7 @@ table,td,th{border: 1px solid #EBECEF;}
 .favicon.ico{background: url(/img/web.ico)}
 .fl{float: left;}
 .fr{float: right;}
+.shadow{box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
 /* checkbox */
 input[type=checkbox]{width:16px;height:16px;text-align:center;outline:none;cursor:copy;}
 input[type=checkbox]:focus{outline:none}

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

@@ -1,491 +1,108 @@
-.pay-container {
-  width: 100%;
-  min-height: 550px;
-  position: relative;
-  margin-bottom: 20px;
-  opacity: 0;
+/**
+ * PC端
+ */
+@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;}
+    .head-wrap .inner{width:1184px;height: 81px;margin: 0 auto;}
+    .head-wrap .logo{width:68px;height: 81px;float: left;}
+    .head-wrap .logo a{width:68px;height: 81px;display: block;}
+    .head-wrap .logo a img{width:68px;height: 81px;display: block;}
+    .head-wrap .text{height: 81px;float: left;margin-left: 10px;line-height: 81px;font-size: 30px;color: #333333;}
+    .pay-container {width: 100%;min-height: 550px;position: relative;margin-bottom:0;opacity: 0;}
+    .pay-container.active{opacity: 1;}
+    .pay-content{width: 1184px;margin: 0 auto;height: auto;margin-top: 20px;}
+    .pay-title{width: 100%;height: 64px;padding: 12px 20px;float: left;background: #ffffff;margin-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);box-sizing: border-box;}
+    .pay-title .title-left{float: left;}
+    .pay-title .title-left p{font-size: 24px;line-height: 40px;color: #333333;}
+    .pay-title .title-left #userName{font-size: 24px;color: #333333;}
+    .pay-title .title-left span{font-size: 16px;line-height: 40px;color: #666666;}
+    .pay-title .title-left span.color{color: #e15616;}
+    .pay-title .title-right{float: right;height: 40px;}
+    .pay-title .title-right .time{width: 172px;height: 40px;padding-left: 62px;background: url("/img/pay/icon-time.png")no-repeat;background-size: cover;box-sizing: border-box;}
+    .pay-title .title-right .time span{width: 24px;height: 24px;display: block;margin: 8px 5px;float: left;font-size: 16px;line-height: 24px;text-align: center;color: #FFFFFF;}
+    .pay-goods .good-top{width: 100%;float: left;box-sizing: border-box;}
+    .pay-goods .good-top .good-top-inner{width: 100%;height: 55px;padding: 0 20px;float: left;border-bottom: 1px solid #F7F7F7;box-sizing: border-box;}
+    .pay-goods .good-top .bot-left{float: right;height: 24px;line-height: 24px;font-size: 12px;padding: 16px 0 15px 0;color: #999999;cursor: pointer;}
+    .pay-goods .good-top .bot-left .icon-down{width: 24px;height: 24px;display: block;background: url("/img/pay/icon-bot.gif");float: left;}
+    .pay-goods .good-top .bot-left .icon-down.roter{transform: rotate(180deg);}
+    .pay-goods .good-top .bot-left p{float: left;margin-left: 5px;}
+    .pay-goods .good-top .bot-right{float: left;height: 55px;}
+    .pay-goods .good-top .bot-right .bot-num{float: left;line-height: 55px;margin-right: 30px;}
+    .pay-goods .good-top .bot-right .bot-num span{font-size: 14px;color: #333333;}
+    .pay-goods .good-top .bot-right .bot-num span.p{color: #333333;}
+    .pay-goods .good-top .bot-right .bot-num span.red{color: #FF2A2A;}
+    .pay-goods{width: 100%;height: auto;float: left;background: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .pay-goods .good-main{width: 100%;height: auto;float: left;}
+    .pay-goods .good-main .list-title{width: 100%;height: 40px;padding: 0 20px;float: left;box-sizing: border-box;}
+    .pay-goods .good-main .list-title .t-li{font-size: 14px;color: #333333;line-height: 44px;float: left;text-align: center;display: flex;align-items: center;flex-direction: column;}
+    .pay-goods .good-main .list-title .t-li:nth-child(1){width: 8%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(2){width: 15%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(3){width: 27%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(4){width: 15%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(5){width: 15%;}
+    .pay-goods .good-main .list-title .t-li:nth-child(6){width: 20%;}
+    .pay-goods .good-main .list-container{width: 100%;height: auto;background: #ffffff;padding: 10px 20px;float: left;border-bottom: 1px solid #F7F7F7;opacity: 1;box-sizing: border-box;}
+    .pay-goods .good-main .list-container.active{height: 0;opacity: 0;}
+    .pay-goods .good-main .list-container .list-main{width: 100%;height: 48px;float: left;}
+    .pay-goods .good-main .list-container .list-main.active{background-color: #F7F7F7;}
+    .pay-goods .good-main .list-container .list-main .t-li{font-size: 14px;color: #333333;line-height: 48px;float: left;text-align: center;display: flex;align-items: center;flex-direction: column;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(1){width: 8%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(2){width: 15%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(3){width: 27%;text-align: justify;text-overflow:ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(4){width: 15%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(5){width: 15%;}
+    .pay-goods .good-main .list-container .list-main .t-li:nth-child(6){width: 20%;}
+    .pay-goods .good-main .list-container .list-main .t-li img{width: 30px;height: 30px;border-radius: 5px;background-color: #f7f7f7;margin-top: 9px;}
+    .pay-ment{width: 100%;height: auto;float: left;margin-top: 20px;}
+    .pay-ment .pay-message{width: 100%;height: 48px;box-sizing: border-box;line-height: 48px;float: left;background: #FFFFFF;padding: 0 20px;margin-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .pay-ment .pay-message .message-num{float: left;margin-right: 80px;font-size: 14px;color: #333333;}
+    .pay-ment .pay-message .message-num .red{color: #FF2A2A;}
+    .pay-ment .pay-record{width: 100%;height: auto;float: left;padding: 0 20px 20px 20px;background: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);box-sizing: border-box;}
+    .pay-ment .pay-record .record-title{width: 100%;line-height: 44px;font-size: 18px;color: #333333;text-align: left;}
+    .pay-ment .pay-record .record-content{width: 100%;height: auto;padding: 8px 20px;background: #F7F7F7;border: 5px;box-sizing: border-box;}
+    .pay-ment .pay-record .record-content .record-li{width: 100%;height: 30px;float: left;}
+    .pay-ment .pay-record .record-content .record-li.none{font-size: 14px;color: #999999;text-align: left;line-height: 30px;}
+    .pay-ment .pay-record .record-content .record-li .record-tb{width: 20%;height: 30px;float: left;font-size: 14px;color: #333333;text-align: left;line-height: 30px;}
+    .pay-ment .pay-record .record-content .record-li .record-tb:last-child{text-align: right;color: #999999;}
+    .pay-bank{width: 100%;height: auto;padding: 0 0 8px 0;background: #FFFFFF;margin-top: 20px;float: left;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .pay-bank .bank-title{width: 100%;line-height: 54px;font-size: 18px;color: #333333;float: left;padding-left: 20px;box-sizing: border-box;}
+    .pay-bank .bank-list{width: 100%;height: auto;padding-left: 8px;}
+    .pay-bank .bank-list a{width: 124px;height: 44px;;display: block;float: left;margin: 12px;border: 1px solid #FFFFFF;position: relative;border-radius: 2px;}
+    .pay-bank .bank-list a img{width: 100%;height: 100%;display: block;}
+    .pay-bank .bank-list a.active{border-color: #FF2A2A;}
+    .pay-bank .bank-list a.active:before{content: '';width: 20px;height: 20px;position: absolute;bottom: 0;right: -2px;background: url("/img/base/icon.png")-210px -252px no-repeat;}
+    .pay-error{width: 1184px;margin: 0 auto;height: 594px;margin-top: 20px;background: #FFFFFF;}
+    .pay-error .icon-error{width: 248px;height: 200px;margin: 0 auto;margin-top: 134px;}
+    .pay-error .icon-error.again{background: url("/img/pay/icon-error--1.png") no-repeat;background-size:contain ;}
+    .pay-error .icon-error.offline{background: url("/img/pay/icon-error--2.png") no-repeat;background-size:contain ;}
+    .pay-error .icon-error.fail{background: url("/img/pay/icon-error--3.png") no-repeat;background-size:contain ;}
+    .pay-error .icon-error.paid{background: url("/img/pay/icon-error-5.png") no-repeat;background-size:contain ;}
+    .pay-error .error-msg{font-size: 16px;color: #333333;text-align: center;line-height: 22px;margin-top: 10px;}
+    .pay-error .error-msgnone{font-size: 16px;color: #999999;text-align: center;line-height: 22px;margin-top: 10px;}
+    .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.3);z-index: 9999;}
+    .pay-alert-content .pay-alert{width: 340px;height: 208px;background: #FFFFFF;border-radius: 2px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;z-index: 9998;}
+    .pay-alert-content .pay-alert .title{width: 100%;height: 48px;box-sizing: border-box;font-size: 14px;line-height: 48px;text-align: left;color: #333333;float: left;position: relative;border-bottom: 1px solid #EFEFEF;background-color: #F8F8F8;padding: 0 14px;}
+    .pay-alert-content .pay-alert .title .icon-close{width: 16px;height: 16px;display: block;position: absolute;right:12px;top: 12px;background: url("/img/base/icon.png")-319px 0 no-repeat;cursor: pointer;}
+    .pay-alert-content .pay-alert .content{margin: 30px 0;width: 100%;height: auto;line-height: 24px;float: left;padding: 0 14px;}
+    .pay-alert-content .pay-alert .content h1{text-align: left;font-size: 16px;color: #333333;font-weight: normal;}
+    .pay-alert-content .pay-alert .content p{text-align: left;font-size: 14px;color: #666666;font-weight: normal;}
+    .pay-alert-content .pay-alert .button{width: 100%;height: 32px;float: left;padding: 0 14px;box-sizing: border-box;}
+    .pay-alert-content .pay-alert .button a{width: 90px;height: 32px;display: block;background: #E15616;border-radius: 2px;font-size: 14px;text-align: center;line-height: 32px;color: #FFFFFF;float: right;}
+    .pay-button-main{width: 100%;height: 72px;box-sizing: border-box;padding: 11px 0;background-color: #FFFFFF;float: left;border-bottom: 1px solid #EBEBEB;}
+    .pay-button-main .pay-button{width: 100%;height: 50px;float: left;}
+    .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;}
 }
-.pay-container.active{
-    opacity: 1;
-}
-.pay-content{
-    width: 1200px;
-    margin: 0 auto;
-    height: auto;
-    margin-top: 20px;
 
-}
-.pay-title{
-    width: 100%;
-    height: 64px;
-    padding: 12px 20px;
-    float: left;
-    background: #ffffff;
-    margin-bottom: 20px;
-}
-.pay-title .title-left{
-    float: left;
-}
-.pay-title .title-left p{
-    font-size: 24px;
-    line-height: 40px;
-    color: #333333;
-}
-.pay-title .title-left #userName{
-    font-size: 24px;
-    color: #333333;
-}
-.pay-title .title-left span{
-    font-size: 16px;
-    line-height: 40px;
-    color: #666666;
-}
-.pay-title .title-left span.color{
-    color: #e15616;
-}
-.pay-title .title-right{
-    float: right;
-    height: 40px;
-}
-.pay-title .title-right .time{
-    width: 172px;
-    height: 40px;
-    padding-left: 62px;
-    background: url("/web/order/img/icon-time.png")no-repeat;
-    background-size: cover;
-}
-.pay-title .title-right .time span{
-    width: 24px;
-    height: 24px;
-    display: block;
-    margin: 8px 5px;
-    float: left;
-    font-size: 16px;
-    line-height: 24px;
-    text-align: center;
-    color: #FFFFFF;
-}
-.pay-goods .good-top{
-    width: 100%;
-    padding: 0 20px;
-    float: left;
-}
-.pay-goods .good-top .good-top-inner{
-    width: 1160px;
-    float: left;
-    border-bottom: 1px solid #F7F7F7;
-}
-.pay-goods .good-top .bot-left{
-    float: right;
-    height: 24px;
-    line-height: 24px;
-    font-size: 12px;
-    padding: 16px 0 15px 0;
-    color: #999999;
-    cursor: pointer;
-}
-.pay-goods .good-top .bot-left .icon-down{
-    width: 24px;
-    height: 24px;
-    display: block;
-    background: url("/web/order/img/icon-bot.gif");
-    float: left;
-}
-.pay-goods .good-top .bot-left .icon-down.roter{
-    transform: rotate(180deg);
-}
-.pay-goods .good-top .bot-left p{
-    float: left;
-    margin-left: 5px;
-}
-.pay-goods .good-top .bot-right{
-    float: left;
-    height: 55px;
-}
-.pay-goods .good-top .bot-right .bot-num{
-    float: left;
-    line-height: 55px;
-    margin-right: 30px;
-}
-.pay-goods .good-top .bot-right .bot-num span{
-    font-size: 14px;
-    color: #333333;
-}
-.pay-goods .good-top .bot-right .bot-num span.p{
-    color: #333333;
-}
-.pay-goods .good-top .bot-right .bot-num span.red{
-    color: #FF2A2A;
-}
-.pay-goods{
-    width: 100%;
-    height: auto;
-    float: left;
-    background: #ffffff;
-}
-.pay-goods .good-main{
-    width: 100%;
-    height: auto;
-    float: left;
-}
-.pay-goods .good-main .list-title{
-    width: 100%;
-    height: 40px;
-    padding: 0 20px;
-    float: left;
-}
-.pay-goods .good-main .list-title .t-li{
-    font-size: 14px;
-    color: #333333;
-    line-height: 44px;
-    float: left;
-    text-align: center;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-}
-.pay-goods .good-main .list-title .t-li:nth-child(1){
-    width: 8%;
-}
-.pay-goods .good-main .list-title .t-li:nth-child(2){
-    width: 15%;
-}
-.pay-goods .good-main .list-title .t-li:nth-child(3){
-    width: 27%;
-}
-.pay-goods .good-main .list-title .t-li:nth-child(4){
-    width: 15%;
-}
-.pay-goods .good-main .list-title .t-li:nth-child(5){
-    width: 15%;
-}
-.pay-goods .good-main .list-title .t-li:nth-child(6){
-    width: 20%;
-}
-.pay-goods .good-main .list-container{
-    width: 100%;
-    height: auto;
-    background: #ffffff;
-    padding: 10px 20px;
-    float: left;
-    border-bottom: 1px solid #F7F7F7;
-    opacity: 1;
-}
-.pay-goods .good-main .list-container.active{
-    height: 0;
-    opacity: 0;
-}
-.pay-goods .good-main .list-container .list-main{
-    width: 100%;
-    height: 48px;
-    float: left;
-}
-.pay-goods .good-main .list-container .list-main.active{
-    background-color: #F7F7F7;
-}
-.pay-goods .good-main .list-container .list-main .t-li{
-    font-size: 14px;
-    color: #333333;
-    line-height: 48px;
-    float: left;
-    text-align: center;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-}
-.pay-goods .good-main .list-container .list-main .t-li:nth-child(1){
-    width: 8%;
-}
-.pay-goods .good-main .list-container .list-main .t-li:nth-child(2){
-    width: 15%;
-}
-.pay-goods .good-main .list-container .list-main .t-li:nth-child(3){
-    width: 27%;
-    text-align: justify;
-    text-overflow:ellipsis;
-    display: -webkit-box;
-    word-break: break-all;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-}
-.pay-goods .good-main .list-container .list-main .t-li:nth-child(4){
-    width: 15%;
-}
-.pay-goods .good-main .list-container .list-main .t-li:nth-child(5){
-    width: 15%;
-}
-.pay-goods .good-main .list-container .list-main .t-li:nth-child(6){
-    width: 20%;
-}
-.pay-goods .good-main .list-container .list-main .t-li img{
-    width: 30px;
-    height: 30px;
-    border-radius: 5px;
-    background-color: #f7f7f7;
-    margin-top: 9px;
-}
-.pay-ment{
-    width: 100%;
-    height: auto;
-    float: left;
-    margin-top: 20px;
-}
-.pay-ment .pay-message{
-    width: 100%;
-    height: 48px;
-    line-height: 48px;
-    float: left;
-    background: #FFFFFF;
-    padding: 0 20px;
-    margin-bottom: 20px;
-}
-.pay-ment .pay-message .message-num{
-    float: left;
-    margin-right: 80px;
-    font-size: 14px;
-    color: #333333;
-}
-.pay-ment .pay-message .message-num .red{
-    color: #FF2A2A;
-}
-.pay-ment .pay-record{
-    width: 100%;
-    height: auto;
-    float: left;
-    padding: 0 20px 20px 20px;
-    background: #FFFFFF;
-}
-.pay-ment .pay-record .record-title{
-    width: 100%;
-    line-height: 44px;
-    font-size: 18px;
-    color: #333333;
-    text-align: left;
-}
-.pay-ment .pay-record .record-content{
-    width: 100%;
-    height: auto;
-    padding: 8px 20px;
-    background: #F7F7F7;
-    border: 5px;
-}
-.pay-ment .pay-record .record-content .record-li{
-    width: 100%;
-    height: 30px;
-    float: left;
-}
-.pay-ment .pay-record .record-content .record-li.none{
-    font-size: 14px;
-    color: #999999;
-    text-align: left;
-    line-height: 30px;
-}
-.pay-ment .pay-record .record-content .record-li .record-tb{
-    width: 20%;
-    height: 30px;
-    float: left;
-    font-size: 14px;
-    color: #333333;
-    text-align: left;
-    line-height: 30px;
-}
-.pay-ment .pay-record .record-content .record-li .record-tb:last-child{
-    text-align: right;
-    color: #999999;
-}
-.pay-bank{
-    width: 100%;
-    height: auto;
-    padding: 0 0 8px 0;
-    background: #FFFFFF;
-    margin-top: 20px;
-    float: left;
-}
-.pay-bank .bank-title{
-    width: 100%;
-    line-height: 54px;
-    font-size: 18px;
-    color: #333333;
-    float: left;
-    padding-left: 20px;
-}
-.pay-bank .bank-list{
-    width: 100%;
-    height: auto;
-    padding-left: 8px;
-}
-.pay-bank .bank-list a{
-    width: 144px;
-    height: 48px;
-    display: block;
-    float: left;
-    margin: 12px;
-    border: 2px solid #FFFFFF;
-    position: relative;
-}
-.pay-bank .bank-list a img{
-    width: 100%;
-    height: 100%;
-    display: block;
-}
-.pay-bank .bank-list a.active{
-    border-color: #FF2A2A;
-}
-.pay-bank .bank-list a.active:before{
-    content: '';
-    width: 34px;
-    height: 28px;
-    position: absolute;
-    bottom: -2px;
-    right: -2px;
-    background: url("/web/order/img/iconbank-active@2x.png") no-repeat;
-    background-size: cover;
-}
-.pay-button{
-    width: 100%;
-    height: 44px;
-    padding: 0 20px;
-    margin: 20px 0;
-    float: left;
-}
-.pay-button a{
-    width: 208px;
-    height: 44px;
-    display: block;
-    background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-    border-radius: 5px;
-    font-size: 14px;
-    line-height: 44px;
-    text-align: center;
-    color: #FFF6D9;
-    float: right;
-}
-.pay-error{
-    width: 1200px;
-    margin: 0 auto;
-    height: 594px;
-    margin-top: 20px;
-    background: #FFFFFF;
-}
-.pay-error .icon-error{
-    width: 248px;
-    height: 200px;
-    margin: 0 auto;
-    margin-top: 134px;
-}
-.pay-error .icon-error.again{
-    background: url("/web/order/img/icon-error--1.png") no-repeat;
-    background-size:contain ;
-}
-.pay-error .icon-error.offline{
-    background: url("/web/order/img/icon-error--2.png") no-repeat;
-    background-size:contain ;
-}
-.pay-error .icon-error.fail{
-    background: url("/web/order/img/icon-error--3.png") no-repeat;
-    background-size:contain ;
-}
-.pay-error .icon-error.paid{
-    background: url("/web/order/img/icon-error-5.png") no-repeat;
-    background-size:contain ;
-}
-.pay-error .error-msg{
-    font-size: 16px;
-    color: #333333;
-    text-align: center;
-    line-height: 22px;
-    margin-top: 10px;
-}
-.pay-error .error-msgnone{
-    font-size: 16px;
-    color: #999999;
-    text-align: center;
-    line-height: 22px;
-    margin-top: 10px;
-}
-.pay-alert-content{
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    background: rgba(0,0,0,0.3);
-    z-index: 9999;
-}
-.pay-alert-content .pay-alert{
-    width: 340px;
-    height: 208px;
-    background: #FFFFFF;
-    border-radius: 5px;
-    position: absolute;
-    top: 0;
-    right: 0;
-    left: 0;
-    bottom: 0;
-    margin: auto;
-    z-index: 9998;
-}
-.pay-alert-content .pay-alert .title{
-    width: 100%;
-    height: 48px;
-    font-size: 14px;
-    line-height: 48px;
-    text-align: left;
-    color: #333333;
-    float: left;
-    position: relative;
-    border-bottom: 1px solid #EFEFEF;
-    background-color: #F8F8F8;
-    padding: 0 14px;
-}
-.pay-alert-content .pay-alert .title .icon-close{
-    width: 24px;
-    height: 24px;
-    display: block;
-    position: absolute;
-    right:12px;
-    top: 12px;
-    background: url("/web/login/img/icon-close.png")no-repeat;
-    background-size: cover;
-    cursor: pointer;
-}
-.pay-alert-content .pay-alert .content{
-    margin: 30px 0;
-    width: 100%;
-    height: auto;
-    line-height: 24px;
-    float: left;
-    padding: 0 14px;
-}
-.pay-alert-content .pay-alert .content h1{
-    text-align: left;
-    font-size: 16px;
-    color: #333333;
-    font-weight: normal;
-}
-.pay-alert-content .pay-alert .content p{
-    text-align: left;
-    font-size: 14px;
-    color: #666666;
-    font-weight: normal;
-}
-.pay-alert-content .pay-alert .button{
-    width: 100%;
-    height: 32px;
-    float: left;
-    padding: 0 14px;
-}
-.pay-alert-content .pay-alert .button a{
-    width: 90px;
-    height: 32px;
-    display: block;
-    background: #E15616;
-    border-radius: 2px;
-    font-size: 14px;
-    text-align: center;
-    line-height: 32px;
-    color: #FFFFFF;
-    float: right;
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+
+
+
 }
 

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

@@ -68,7 +68,7 @@ input::-webkit-outer-spin-button {
     .pay-link p{float: left;font-size: 14px;line-height: 32px;color: #666;text-align: left;}
     .pay-link a{width: 112px;height: 30px;border: 1px solid #e15616;background-color: #ffe6dc; display: block;text-align: center;float: left;font-size: 12px;line-height: 30px;border-radius: 20px;color: #e15616;margin-left: 16px;}
     .pay-link .inviteCode{width: 112px;height: 30px;border: 1px solid #999;text-align: center;float: left;font-size: 12px;line-height: 30px;border-radius: 2px;color: #333;margin: 0 5px;}
-    .pay-error{width: 1200px;margin: 0 auto;height: 594px;margin-top: 20px;display: none;background: #FFFFFF;}
+    .pay-error{width: 1184px;margin: 0 auto;height: 594px;margin-top: 20px;display: none;background: #FFFFFF;}
     .pay-error .icon-error{width: 248px;height: 200px;margin: 0 auto;margin-top: 134px;}
     .pay-error .icon-error.again{background: url("/img/pay/icon-error--1.png") no-repeat;background-size:contain ;}
     .pay-error .icon-error.offline{background: url("/img/pay/icon-error--2.png") no-repeat;background-size:contain ;}
@@ -98,6 +98,7 @@ input::-webkit-outer-spin-button {
     .pay-button-main{width: 100%;height: 72px;box-sizing: border-box;padding: 11px 0;background-color: #FFFFFF;float: left;border-bottom: 1px solid #EBEBEB;}
     .pay-button-main .pay-button{width: 100%;height: 50px;float: left;}
     .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;}
 }
 

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

@@ -4,8 +4,10 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-
-
+    .navLayout{min-height: 500px;}
+    .content .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
+    .content .empty img{width:180px;height:180px;}
+    .content .empty a{color:#E15616;}
     .content{width: 100%;min-height: 370px;background-color: #FFFFFF;box-sizing: border-box;padding:0 20px 20px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin:0 0 10px 0;}
     .content .title{width: 100%;height: 56px;border-bottom: solid 1px #e2e7ef;line-height: 56px;color: #22272e;font-size: 16px;}
     .content .section .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 9px 0;border-bottom: solid 1px #e2e7ef;}

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

@@ -18,53 +18,129 @@ li{list-style:none}
     .navLayout .navList.on .tab:before{top:18px;transform:rotate(270deg);color:#e15616}
     .navLayout .navList.on .tab{color:#e15616}
     .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
-    /*个人中心右侧*/
+    /*订单详情顶部信息*/
     .navLayout .right{float:right;width:968px}
     .order-container{width: 100%;min-height:410px;}
-    .order-container .empty{box-sizing:border-box;padding:100px 0;text-align:center;color:#4A4F58;line-height:30px;font-size:16px;background-color:#FFF;}
-    .order-container .empty img{width:180px;height:180px;}
-    .order-container .empty a{color:#E15616;}
     .order-container .title{width: 100%;height: 44px;line-height: 44px;font-size: 16px;text-align: left;color: #22272e;}
     .order-container .title a{display: block;float: right;position: relative;padding-right: 36px;position: relative;}
     .order-container .title a .icon{display: block;width: 18px;height: 18px;position: absolute;top: 5px;right: 10px;}
     .order-container .title a .icon:before{width: 18px;height: 18px;background-position: -304px -32px;}
     .order-container .section{width: 100%;height: auto;}
-    .order-container .section .user-main{width: 100%;height:auto;background-color: #FFFFFF;box-sizing: border-box;padding: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-bottom: 10px;}
-    .order-container .section .user-main.tabs{height: 78px;padding: 15px 20px;}
-    .order-container .section .user-main .tabs-left{height: 100%;float: left;}
-    .order-container .section .user-main .tabs-left .item{width: 50px;height: 100%;float: left;margin:0 40px;}
-    .order-container .section .user-main .tabs-left .item a{width: 100%;height: 100%;display: block;}
-    .order-container .section .user-main .tabs-left .item a .icon{width: 24px;height: 24px;display: block;margin: 0 auto;position: relative;}
-    .order-container .section .user-main .tabs-left .item a .icon span{display: block;width: 18px;height: 18px;background-image: linear-gradient(90deg,#ff5353 0%,#ff2424 100%);position: absolute;top: -9px;left: -9px;font-style: normal;font-size: 13px;color: #f94b4b;line-height: 18px;text-align: center;border-radius: 50%;color: #fff;}
-    .order-container .section .user-main .tabs-left .item a .icon:before{width: 24px;height: 24px;background-position: -273px -370px;}
-    .order-container .section .user-main .tabs-left .item a p{font-size: 14px;color: #22272e;text-align: center;line-height: 20px;margin-top: 3px;}
-    .order-container .section .user-main .tabs-right{float: right;line-height: 48px;font-size: 14px;color: #22272e;}
-    .order-container .section .user-main .tabs-right a{display: block;float: right;padding-right: 16px;}
-    .order-container .section .user-main.order{height: 224px;padding-left: 68px;padding-top: 10px;}
-    .order-container .section .user-main .order-title{width: 100%;height: 40px;position: relative;float: left;margin-bottom: 0;}
-    .order-container .section .user-main .order-title .bag{display: block;position: absolute;left: -45px;top: 12px; width: 36px;height: 16px;background-image: linear-gradient(335deg,#e15616 0%,#ffb496 100%);border-radius: 2px;font-size: 10px;color: #FFFFFF;line-height: 16px;text-align: center;}
-    .order-container .section .user-main .order-title .title-name{float: left;line-height:  40px;font-size: 14px;color: #22272e;}
-    .order-container .section .user-main .order-title .title-name p{float: left;margin-right: 10px;}
-    .order-container .section .user-main .order-title .title-name p.state{color: #E15616;margin-left: 10px;font-weight: normal;}
-    .order-container .section .user-main .order-title .title-type{float: left;width: 40px;height: 40px;background: url("/img/order/second.png")center center no-repeat;background-size: cover;}
-    .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 .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;}
-    .order-container .section .user-main .order-content .order-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
-    .order-container .section .user-main .order-content .order-botton .btn.primary{border-color: #E15616;background-color: #E15616;color: #FFFFFF;}
-    .order-container .section .user-main.product{height: 260px;padding: 20px 20px 10px 20px;}
-    .order-container .section .user-main .product-item{width: 173px;height: auto;float: left;margin-right: 15px;cursor: pointer;}
-    .order-container .section .user-main .product-item:last-child{margin-right: 0;}
-    .order-container .section .user-main .product-item .product-img{width: 173px;height: 173px;float: left;}
-    .order-container .section .user-main .product-item .product-img img{width: 173px;height: 173px;display: block;}
-    .order-container .section .user-main .product-item .product-name{width: 100%;height: 40px;float: left;margin-top: 10px;}
-    .order-container .section .user-main .product-item .product-name p{font-size: 14px;color: #93979f;text-align: justify;line-height: 20px;text-overflow: -o-ellipsis-lastline;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;line-clamp: 2;-webkit-box-orient: vertical;}
-    .order-container .section .user-main .product-item .product-name p:hover{color: #E15616;text-decoration: underline;}
+    .order-container .section .section-info {margin-bottom: 10px;box-sizing: border-box;height: 217px;padding-left: 68px;padding-top: 10px;padding-right: 20px;background-color: #FFFFFF;}
+    .order-container .section .section-info .order-title{width: 100%;height: 40px;position: relative;float: left;margin-bottom: 0;}
+    .order-container .section .section-info .order-title .bag{display: block;position: absolute;left: -45px;top: 12px; width: 36px;height: 16px;background-image: linear-gradient(335deg,#e15616 0%,#ffb496 100%);border-radius: 2px;font-size: 10px;color: #FFFFFF;line-height: 16px;text-align: center;}
+    .order-container .section .section-info .order-title .title-name{float: left;line-height:  40px;font-size: 14px;color: #22272e;}
+    .order-container .section .section-info .order-title .title-name p{float: left;margin-right: 10px;}
+    .order-container .section .section-info .order-title .title-name p.state{color: #E15616;margin-left: 10px;font-weight: normal;}
+    .order-container .section .section-info .order-title .title-type{float: left;width: 40px;height: 40px;background: url("/img/order/second.png")center center no-repeat;background-size: cover;}
+    .order-container .section .section-info .order-title .title-time{float: right;line-height:  40px;font-size: 12px;color: #9aa5b5;}
+    .order-container .section .section-info .order-content{width: 100%;height: auto;float: left;}
+    .order-container .section .section-info .order-content .order-item{width: 100%;height: 36px;float: left;}
+    .order-container .section .section-info .order-content .order-item p{float: left;margin-right: 50px;line-height: 36px;color: #22272e;font-size: 14px;}
+    .order-container .section .section-info .order-content .order-item p.org{margin-right: 20px;}
+    .order-container .section .section-info .order-content .order-item p.copy{float: left;display: block;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-list{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;}
+    .order-container .section-shopinfo{width: 100%;height: auto;box-sizing: border-box;float: left;padding: 0 20px 20px 20px;background-color: #FFFFFF;}
+    .order-container .section-shopinfo .title{width: 100%;height: 56px;box-sizing: border-box;padding: 8px 0;border-bottom: 1px solid #e2e7ef;}
+    .order-container .section-shopinfo .title .logo{width: 39px;height: 39px;box-sizing: border-box;border: 1px solid #e2e7ef;float: left;display: block;margin-right: 5px;}
+    .order-container .section-shopinfo .title .name{line-height: 40px;float: left;font-size: 14px;color: #22272E;text-align: left;margin-right: 20px;}
+    .order-container .section-shopinfo .title .activity{float: left;margin-top: 8px;position: relative;cursor:pointer;line-height: 24px;height:24px;float: left;width: 86px;border-radius: 2px;border: 1px solid rgba(225, 86, 22, 0.3);}
+    .order-container .section-shopinfo .title .activity:before{content: '';width: 100%;height: 3px;background-color: #FFFFFF;display:none;position: absolute;left: 0;bottom: -2px;z-index: 999;}
+    .order-container .section-shopinfo .title .activity .tit{width: 100%;height: 100%;}
+    .order-container .section-shopinfo .title .activity .tit p{line-height: 24px;font-size: 12px;color: #22272E;text-align: left;box-sizing: border-box;color: #e15616;text-align: center;padding-right: 16px;}
+    .order-container .section-shopinfo .title .activity .tit .icon{width: 16px;height: 16px;display: block;position: absolute;top: 4px;right: 4px;}
+    .order-container .section-shopinfo .title .activity .tit .icon:before{width: 16px;height: 16px;background-position: -93px -3px;}
+    .order-container .section-shopinfo .title .activity .action{display:none; min-width: 198px;min-height: 94px;box-sizing: border-box;padding: 10px;border: 1px solid rgba(225, 86, 22, 0.3);background-color: #FFF;position: relative;bottom: 0;left: -1px;border-radius: 2px;}
+    .order-container .section-shopinfo .title .activity .action p{color: #22272E;text-align: left;font-size: 12px;line-height: 20px;}
+    .order-container .section-shopinfo .title .activity .action p .btn{height: 24px;position: absolute;bottom: 0;left: 0;}
+    .order-container .section-shopinfo .title .activity .action p span{cursor: pointer;display: block;float: right;width: 56px;height: 24px;background-color: #e15616;border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;}
+    .order-container .section-shopinfo .title .activity .action p.org{color: #e15616;}
+    .order-container .section-shopinfo .title .activity:hover .action{display: block;}
+    .order-container .section-shopinfo .title .activity:hover:before{display: block;}
+    .order-container .section-shopinfo .title .activity.active .action{display:block;}
+    .order-container .section-shopinfo .product{width: 100%;height: auto;float: left;}
+    .order-container .section-shopinfo .section-prosinfo{width: 100%;height: 126px;padding: 16px 0;}
+    .order-container .section-shopinfo .product-t{width: 100%;height: 100px;float: left;}
+    .order-container .section-shopinfo .product-t .image{width: 98px;height: 98px;float: left;border: 1px solid #e2e7ef;margin-right: 10px;}
+    .order-container .section-shopinfo .product-t .image img{width: 98px;height: 98px;display: block;}
+    .order-container .section-shopinfo .product-t .text{width: 818px;float: left;}
+    .order-container .section-shopinfo .product-t .tit{float: left;width: 100%;margin-bottom: 6px;line-height: 22px;font-size: 16px;text-align: left;color: #22272E;}
+    .order-container .section-shopinfo .product-t .info{width: 100%;height: auto;float: left;}
+    .order-container .section-shopinfo .product-t .info-l{width: 170px;height: auto;float: left;}
+    .order-container .section-shopinfo .product-t .info p{line-height: 24px;font-size: 14px;color: #627386;text-align: left;}
+    .order-container .section-shopinfo .product-t .info-r{width: auto;height: auto;float: left;}
+    .order-container .section-shopinfo .product-b{width: 100%;height: 26px;float: left;box-sizing: border-box;padding-left:110px;}
+    .order-container .section-shopinfo .product-b p{line-height: 24px;font-size: 14px;color: #627386;text-align: left;}
+    .order-container .section-shopinfo .product-b p .red{color: #FF2A2A;}
+    .order-container .section-shopinfo .info-r .activity{float: left;margin-top: 48px;margin-left: 10px;position: relative;cursor:pointer;line-height: 24px;height:24px;float: left;box-sizing:border-box;padding:0 10px;border-radius: 2px;border: 1px solid rgba(225, 86, 22, 0.3);}
+    .order-container .section-shopinfo .info-r .activity:before{content: '';width: 100%;height: 3px;background-color: #FFFFFF;display: none;position: absolute;left: 0;bottom: -2px;z-index: 999;}
+    .order-container .section-shopinfo .info-r .activity .tit{width: 100%;height: 100%;}
+    .order-container .section-shopinfo .info-r .activity .tit p{line-height: 24px;font-size: 12px;color: #22272E;text-align: left;box-sizing: border-box;color: #e15616;text-align: center;padding-right: 16px;}
+    .order-container .section-shopinfo .info-r .activity .tit .icon{width: 16px;height: 16px;display: block;position: absolute;top: 4px;right: 4px;}
+    .order-container .section-shopinfo .info-r .activity .tit .icon:before{width: 16px;height: 16px;background-position: -93px -3px;}
+    .order-container .section-shopinfo .info-r .activity .action{display:none; min-width: 198px;min-height: 74px;box-sizing: border-box;padding: 10px;border: 1px solid rgba(225, 86, 22, 0.3);background-color: #FFF;position: absolute;bottom: -74px;left: -1px;border-radius: 2px;}
+    .order-container .section-shopinfo .info-r .activity .action p{color: #22272E;text-align: left;font-size: 12px;line-height: 20px;}
+    .order-container .section-shopinfo .info-r .activity .action p .btn{height: 24px;position: absolute;bottom: 0;left: 0;}
+    .order-container .section-shopinfo .info-r .activity .action p span{cursor: pointer;display: block;float: right;width: 56px;height: 24px;background-color: #e15616;border-radius: 2px;line-height: 24px;text-align: center;font-size: 12px;color: #FFF;}
+    .order-container .section-shopinfo .info-r .activity .action p.org{color: #e15616;}
+    .order-container .section-shopinfo .info-r .activity:hover .action{display: block;}
+    .order-container .section-shopinfo .info-r .activity:hover:before{display: block;}
+    .order-container .section-shopinfo .info-r .activity.active .action{display:block;}
+    .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;float: left;box-sizing: border-box;padding-left:110px;line-height: 38px;color: #22272E;}
+    .order-container .section-shopinfo .shopinfo-bott p .red{color: #FF2A2A;}
+    .order-container .section-shopinfo .shopinfo-bott .bott-top{width: 100%;float: left;}
+    .order-container .section-shopinfo .shopinfo-bott .bott-bot{width: 100%;float: left;}
+    .order-container .section-shopinfo .shopinfo-bott .count{float: left;font-size: 14px;}
+    .order-container .section-shopinfo .shopinfo-bott .total{float: right;font-size: 16px;}
+    .order-container .section-shopinfo .bott-bot p{color: #627386;}
+    .order-container .section-shopinfo .bott-bot span{margin-left: 10px;color: #22272E;}
+    /*发票信息*/
+    .order-container .section-invoice{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;padding:16px 20px;background-color: #FFFFFF;}
+    .order-container .section-invoice .tit{width: 100%;line-height: 24px;font-size: 14px;color: #22272E;height: 24px;float: left;}
+    .order-container .section-invoice .tit p{float: left;}
+    .order-container .section-invoice .tit .icon{width: 24px;height: 24px;display: block;float: right;}
+    .order-container .section-invoice .tit .icon:before{width: 24px;height: 24px;background-position: -90px -0px;}
+    .order-container .section-invoice .invoice-none{width: 100%;line-height: 24px;font-size: 14px;color: #999999;height: 24px;float: left;box-sizing: border-box;}
+    .order-container .section-invoice .invice-item{width: 100%;height: 36px;float: left;}
+    .order-container .section-invoice .invice-item p{float: left;margin-right: 50px;line-height: 36px;color: #627386;font-size: 14px;}
+    .order-container .section-invoice .invice-item p span{color: #22272E;}
+    /*转账信息*/
+    .section-payment{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;padding:16px 20px;background-color: #FFFFFF;}
+    .payment-transfer{width: 100%;height: auto;}
+    .payment-transfer .payment-transfer-main{width: 100%;height: auto;}
+    .payment-transfer .payment-transfer-main .label{width: 100%;height: 38px;line-height: 38px;font-size: 13px;color: #333;}
+    .payment-transfer .payment-transfer-main .label .label-title{color: #999999;}
+    .payment-transfer .payment-transfer-main .label .label-t{color: #666;}
+    .payment-transfer .payment-transfer-main .label .text{color: #333;float: left;width: 25%;}
+    .payment-transfer .payment-transfer-main .label .text-p{color: #333;float: left;}
+    .payment-transfer .payment-transfer-main .label .text-p input{border: none;background-color: #FFF;width: 60px;font-size: 14px;color: #333;}
+    .payment-transfer .payment-transfer-main .label .text-p .copy{display: block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;opacity:1;float: left;font-size: 12px;margin-top: 5px;margin-left: 5px;color: #FFF;text-align: center;}
+    .payment-transfer .payment-transfer-main .label .label-c{color: #E15616;}
+    /*退款记录*/
+    .section-paymentlist{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;}
+    .section-paymentlist .record-title{width: 100%;height: 48px;line-height: 48px;float: left;font-size: 16px;color: #22272E;}
+    .section-paymentlist .record-title .record-title-l{float: left;}
+    .section-paymentlist .record-title .record-title-r{float: right;}
+    .section-paymentlist .record-title .record-title-r .red{color: #FF2A2A;}
+    .section-paymentlist .record-list{width: 100%;height: auto;}
+    .section-paymentlist .record-list .record-item{width: 100%;height: 40px;}
+    .section-paymentlist .record-list .item-time{width: 33.33%;height: 40px;font-size: 14px;color: #627386;text-align: center;line-height: 40px;float: left;}
+    .section-paymentlist .record-list .item-time.mm{text-align: left;}
+    .section-paymentlist .record-list .item-time.tt{text-align: right;}
+    .section-paymentlist .record-list .item-rec{width: 50%;height: 40px;font-size: 14px;color: #627386;text-align: center;line-height: 40px;float: left;}
+    .section-paymentlist .record-list .item-rec.mm{text-align: left;}
+    .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 .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;}

src/main/resources/static/js/common/serviceapi/order.service.js

@@ -67,6 +67,13 @@ var OrderApi = {
                 callback(res);
             });
         },
+        /* 查询订单详情 */
+        QueryOrderDetailsInfo: function (params, callback) {
+            Http.AjaxService({ url:'/order/detail', type:'GET', data:params, json:false})
+            .then(function(res){
+                callback(res);
+            });
+        },
         /* 查询订单列表选项卡标签数量*/
         GetQueryOrderNum: function (params, callback) {
             Http.AjaxService({ url:'/pcCenter/getOrderNum', type:'GET', data:params, json:false})

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -52,6 +52,12 @@ var UserApi = {
                 callback(res);
             });
         },
+        GetMymessageList : function(params,callback) {//个人中心消息列表
+            Http.AjaxService({ url:'/user/messageList', type:'get', data:params, json:true})
+            .then(function(res){
+                callback(res);
+            });
+        },
         UserPuploadAvatar : function(params,callback) {//机构个人中心头像更新
             Http.AjaxService({ url:'/user/uploadAvatar ', type:'post', data:params, json:false})
             .then(function(res){

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

@@ -4,6 +4,7 @@
 var payContainer = new Vue({
     el:"#payContainer",
     data: {
+        isSubMitStatus:false,
         payInfo:{
             PAY_BANK_NUM:'ICBC_B2B',//银行网管信息
             PAY_CODE:'',//链接状态
@@ -12,25 +13,25 @@ var payContainer = new Vue({
             PAY_TIME:''//链接失效时间
         },
         bankData:[
-            {imgUrl:'/web/order/img/iconbank-01@2x.png',bankName:'中国工商银行',bankNum:'ICBC_B2B'},
-            {imgUrl:'/web/order/img/iconbank-02@2x.png',bankName:'招商银行',bankNum:'CMBCHINA_B2B'},
-            {imgUrl:'/web/order/img/iconbank-03@2x.png',bankName:'中国建设银行',bankNum:'CCB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-04@2x.png',bankName:'交通银行',bankNum:'BOCO_B2B'},
-            {imgUrl:'/web/order/img/iconbank-05@2x.png',bankName:'兴业银行',bankNum:'CIB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-06@2x.png',bankName:'中国民生银行',bankNum:'CMBC_B2B'},
-            {imgUrl:'/web/order/img/iconbank-07@2x.png',bankName:'中国广发银行',bankNum:'CEB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-08@2x.png',bankName:'中国银行',bankNum:'BOC_B2B'},
-            {imgUrl:'/web/order/img/iconbank-09@2x.png',bankName:'平安银行',bankNum:'SZPA_B2B'},
-            {imgUrl:'/web/order/img/iconbank-10@2x.png',bankName:'中信银行',bankNum:'ECITIC_B2B'},
-            {imgUrl:'/web/order/img/iconbank-11@2x.png',bankName:'浦发银行',bankNum:'SPDB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-12@2x.png',bankName:'华夏银行',bankNum:'HXB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-13@2x.png',bankName:'北京银行',bankNum:'BCCB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-14@2x.png',bankName:'中国农业银行',bankNum:'ABC_B2B'},
-            {imgUrl:'/web/order/img/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',bankNum:'PSBC_B2B'},
-            {imgUrl:'/web/order/img/iconbank-16@2x.png',bankName:'徽商银行',bankNum:'HSB_B2B'},
-            {imgUrl:'/web/order/img/iconbank-17@2x.png',bankName:'青岛银行',bankNum:'QDYH_B2B'},
-            {imgUrl:'/web/order/img/iconbank-18@2x.png',bankName:'浙商银行',bankNum:'CZ_B2B'},
-            {imgUrl:'/web/order/img/iconbank-19@2x.png',bankName:'齐鲁银行',bankNum:'QLYH_B2B'},
+            {imgUrl:'/img/pay/iconbank-01@2x.png',bankName:'中国工商银行',bankNum:'ICBC_B2B'},
+            {imgUrl:'/img/pay/iconbank-02@2x.png',bankName:'招商银行',bankNum:'CMBCHINA_B2B'},
+            {imgUrl:'/img/pay/iconbank-03@2x.png',bankName:'中国建设银行',bankNum:'CCB_B2B'},
+            {imgUrl:'/img/pay/iconbank-04@2x.png',bankName:'交通银行',bankNum:'BOCO_B2B'},
+            {imgUrl:'/img/pay/iconbank-05@2x.png',bankName:'兴业银行',bankNum:'CIB_B2B'},
+            {imgUrl:'/img/pay/iconbank-06@2x.png',bankName:'中国民生银行',bankNum:'CMBC_B2B'},
+            {imgUrl:'/img/pay/iconbank-07@2x.png',bankName:'中国广发银行',bankNum:'CEB_B2B'},
+            {imgUrl:'/img/pay/iconbank-08@2x.png',bankName:'中国银行',bankNum:'BOC_B2B'},
+            {imgUrl:'/img/pay/iconbank-09@2x.png',bankName:'平安银行',bankNum:'SZPA_B2B'},
+            {imgUrl:'/img/pay/iconbank-10@2x.png',bankName:'中信银行',bankNum:'ECITIC_B2B'},
+            {imgUrl:'/img/pay/iconbank-11@2x.png',bankName:'浦发银行',bankNum:'SPDB_B2B'},
+            {imgUrl:'/img/pay/iconbank-12@2x.png',bankName:'华夏银行',bankNum:'HXB_B2B'},
+            {imgUrl:'/img/pay/iconbank-13@2x.png',bankName:'北京银行',bankNum:'BCCB_B2B'},
+            {imgUrl:'/img/pay/iconbank-14@2x.png',bankName:'中国农业银行',bankNum:'ABC_B2B'},
+            {imgUrl:'/img/pay/iconbank-15@2x.png',bankName:'中国邮政储蓄银行',bankNum:'PSBC_B2B'},
+            {imgUrl:'/img/pay/iconbank-16@2x.png',bankName:'徽商银行',bankNum:'HSB_B2B'},
+            {imgUrl:'/img/pay/iconbank-17@2x.png',bankName:'青岛银行',bankNum:'QDYH_B2B'},
+            {imgUrl:'/img/pay/iconbank-18@2x.png',bankName:'浙商银行',bankNum:'CZ_B2B'},
+            {imgUrl:'/img/pay/iconbank-19@2x.png',bankName:'齐鲁银行',bankNum:'QLYH_B2B'},
         ],
         userName :'',
         goodList:'',
@@ -60,7 +61,7 @@ var payContainer = new Vue({
 
     },
     filters: {
-        NumFormat(value) {
+        NumFormat :function(value) {
             if(!value) return '0.00';
             var intPart = Number(value) - Number(value)%1; //获取整数部分（这里是windy93的方法）
             var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
@@ -80,68 +81,71 @@ var payContainer = new Vue({
     },
     methods: {
         infoPayOrderCheckoutCounter:function(){
-            var _this = this;
-            PayApi.PayOrderCheckoutCounter({orderId:_this.payInfo.PAY_ORDERID},function(response){
+            var _self = this;
+            PayApi.PayOrderCheckoutCounter({orderId:_self.payInfo.PAY_ORDERID},function(response){
                 if(response.code == 0){
                     var data = response.data;
-                    _this.discernReceiptList = data.discernReceipt;
-                    _this.orderProductList = data.orderProductList;
-                    _this.userName =  data.userName;
-                    _this.freight =  _this.freightText(data.order.freight);
-                    _this.discountFee =  data.order.discountFee;
-                    _this.balancePayFee =  data.order.balancePayFee;
-                    _this.payTotalFee =  data.order.payTotalFee;
-                    _this.receiptAmount=  data.order.receiptAmount;
-                    _this.payableAmount =  _this.payInfo.PAY_UNPAIDAMOUNT;
+                    _self.discernReceiptList = data.discernReceipt;
+                    _self.orderProductList = data.orderProductList;
+                    _self.userName =  data.userName;
+                    _self.freight =  _self.freightText(data.order.freight);
+                    _self.discountFee =  data.order.discountFee;
+                    _self.balancePayFee =  data.order.balancePayFee;
+                    _self.payTotalFee =  data.order.payTotalFee;
+                    _self.receiptAmount=  data.order.receiptAmount;
+                    _self.payableAmount =  _self.payInfo.PAY_UNPAIDAMOUNT;
                     if(data.order.status == '7'){
-                        _this.payment = _this.toFixedFn(_this.payTotalFee - _this.payableAmount);
+                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.payableAmount);
                     }else{
-                        _this.payment = _this.toFixedFn(_this.payTotalFee - _this.receiptAmount - _this.payableAmount);
+                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.receiptAmount - _self.payableAmount);
                     }
-                    _this.paySuccessCounter = data.order.paySuccessCounter;
-                    _this.isRequest = true;
+                    _self.paySuccessCounter = data.order.paySuccessCounter;
+                    _self.isRequest = true;
                 }else{
-                    layer.msg(response.msg, {icon: 7});
+                    CAIMEI.Alert(response.msg,'确定',false);
                 }
             })
         },
-        PaySubmitFn:function(){
-            var _this = this;
-            if(_this.payInfo.PAY_BANK_NUM == ''){
+        PaySubmitFn:function(){//立即支付
+            var _self = this;
+            if(_self.payInfo.PAY_BANK_NUM == ''){
                 layer.msg('请选择银行！');
                 return;
             }
             var params = {
                     payWay:'UNIONPAY',
-                    payAmount: _this.payInfo.PAY_UNPAIDAMOUNT*100,
-                    bankCode:_this.payInfo.PAY_BANK_NUM,
+                    payAmount: _self.payInfo.PAY_UNPAIDAMOUNT*100,
+                    bankCode:_self.payInfo.PAY_BANK_NUM,
                     returnUrl:'https://www.caimei365.com/',
-                    orderId:_this.payInfo.PAY_ORDERID
+                    orderId:_self.payInfo.PAY_ORDERID
                 };
-            _this.PayOrderPcMallPay(params);
+            _self.PayOrderPcMallPay(params);
         },
         PayOrderPcMallPay:function(params){//网银支付请求
-            var _this = this;
+            var _self = this;
+            _self.isSubMitStatus=true;
             PayApi.PayOrderPcMallPay(params,function(response){
                 if(response.code == 0){
-                    _this.isPayAlert = true;
-                    _this.mbOrderId = response.data.data.mbOrderId;
+                    _self.isPayAlert = true;
+                    _self.mbOrderId = response.data.data.mbOrderId;
                     window.open(response.data.data.payUrl);
+                    _self.isSubMitStatus=false;
                 }else{
-                    layer.msg(response.msg, {icon: 7});
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isSubMitStatus=false;
                 }
             })
         },
         RefreshBody:function(){
-            var _this = this;
-            _this.isPayAlert = false;
-            PayApi.PayOrderFindOrderStatus({mbOrderId:_this.mbOrderId},function(response){
-                _this.isPayAlert = false;
+            var _self = this;
+            _self.isPayAlert = false;
+            PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId},function(response){
+                _self.isPayAlert = false;
                 var data = response.data.data;
                 if(data.status === '1'){
-                    window.location.href = '/web/order/view/pay/caimei-success.jsp?pageType=wechat&type=success&payAmount='+ _this.payInfo.PAY_UNPAIDAMOUNT;
+                    window.location.href = '/pay/success.html?pageType=wechat&type=success&payAmount='+ _self.payInfo.PAY_UNPAIDAMOUNT;
                 }else{
-                    window.location.href = '/web/order/view/pay/caimei-success.jsp?pageType=wechat&type=error&payAmount='+ _this.payInfo.PAY_UNPAIDAMOUNT;
+                    window.location.href = '/pay/success.html?pageType=wechat&type=error&payAmount='+ _self.payInfo.PAY_UNPAIDAMOUNT;
                 }
             });
         },
@@ -154,7 +158,7 @@ var payContainer = new Vue({
             console.log(this.isSiled);
         },
         countTime:function(value){//支付链接倒计时
-            var _this = this;
+            var _self = this;
             //获取当前时间
             var date = new Date();
             var now = date.getTime();
@@ -169,17 +173,17 @@ var payContainer = new Vue({
                 h = Math.floor(differTime / 1000 / 60 / 60);
                 m = Math.floor(differTime / 1000 / 60 % 60);
                 s = Math.floor(differTime / 1000 % 60);
-                _this.downHour = h < 10 ? ("0" + h) : h;
-                _this.downMinute = m < 10 ? ("0" + m) : m;
-                _this.downSecond = s < 10 ? ("0" + s) : s;
+                _self.downHour = h < 10 ? ("0" + h) : h;
+                _self.downMinute = m < 10 ? ("0" + m) : m;
+                _self.downSecond = s < 10 ? ("0" + s) : s;
                 //递归调用函数所以是延时器不是定时器
                 setTimeout(function () {
-                    _this.countTime(value)
+                    _self.countTime(value)
                 }, 1000);
             } else {
-                _this.downHour = '00';
-                _this.downMinute = '00';
-                _this.downSecond = '00';
+                _self.downHour = '00';
+                _self.downMinute = '00';
+                _self.downSecond = '00';
             }
         },
         freightText:function (type) {//处理邮费显示
@@ -214,39 +218,39 @@ var payContainer = new Vue({
         },
     },
     mounted: function () {
-        var _this = this;
-        _this.payInfo.PAY_CODE = _util.getUrlParam('code');
-        _this.payInfo.PAY_ORDERID = _util.getUrlParam('orderId');
-        _this.payInfo.PAY_UNPAIDAMOUNT = Number(_util.getUrlParam('unpaidAmount'));
-        _this.payInfo.PAY_TIME = decodeURI(_util.getUrlParam('time'));
-        if(_this.payInfo.PAY_CODE==0){
+        var _self = this;
+        _self.payInfo.PAY_CODE = CAIMEI.getUrlParam('code');
+        _self.payInfo.PAY_ORDERID = CAIMEI.getUrlParam('orderId');
+        _self.payInfo.PAY_UNPAIDAMOUNT = Number(CAIMEI.getUrlParam('unpaidAmount'));
+        _self.payInfo.PAY_TIME = decodeURI(CAIMEI.getUrlParam('time'));
+        if(_self.payInfo.PAY_CODE==0){
             setTimeout(function () {  //支付倒计时
-                _this.countTime(_this.payInfo.PAY_TIME)
+                _self.countTime(_self.payInfo.PAY_TIME)
             }, 1000);
-            _this.infoPayOrderCheckoutCounter();
+            _self.infoPayOrderCheckoutCounter();
         }else{
-            _this.isErrorShow = true;
-            _this.isRequest = true;
-            switch (_this.payInfo.PAY_CODE) {
+            _self.isErrorShow = true;
+            _self.isRequest = true;
+            switch (_self.payInfo.PAY_CODE) {
                 case '-1':
-                    _this.iconErrorClass = 'again';
-                    _this.iconErrorText = '链接已更新，请联系业务人员获取最新链接再进行支付';
-                    _this.iconErrorMsgnone = '';
+                    _self.iconErrorClass = 'again';
+                    _self.iconErrorText = '链接已更新，请联系业务人员获取最新链接再进行支付';
+                    _self.iconErrorMsgnone = '';
                     break;
                 case '-2':
-                    _this.iconErrorClass = 'offline';
-                    _this.iconErrorText = '订单已通过线下转账方式付款';
-                    _this.iconErrorMsgnone = '不能再使用企业网银支付';
+                    _self.iconErrorClass = 'offline';
+                    _self.iconErrorText = '订单已通过线下转账方式付款';
+                    _self.iconErrorMsgnone = '不能再使用企业网银支付';
                     break;
                 case '-3':
-                    _this.iconErrorClass = 'fail';
-                    _this.iconErrorText = '链接超过24小时未完成支付，已失效';
-                    _this.iconErrorMsgnone = '请重新生成支付链接，继续支付';
+                    _self.iconErrorClass = 'fail';
+                    _self.iconErrorText = '链接超过24小时未完成支付，已失效';
+                    _self.iconErrorMsgnone = '请重新生成支付链接，继续支付';
                     break;
                 case '5':
-                    _this.iconErrorClass = 'paid';
-                    _this.iconErrorText = '款项已支付完成，无需重复支付';
-                    _this.iconErrorMsgnone = '';
+                    _self.iconErrorClass = 'paid';
+                    _self.iconErrorText = '款项已支付完成，无需重复支付';
+                    _self.iconErrorMsgnone = '';
                     break;
             }
         }

src/main/resources/static/js/pay/caimei-paycash.js

@@ -4,6 +4,7 @@
 var payContainer = new Vue({
     el:"#payContainer",
     data: {
+        isSubMitStatus:false,
         payInfo:{
             PAY_BANK_NUM: 'ALIPAY', //支付类型
             PAY_ORDERID: '',  //订单ID
@@ -107,12 +108,12 @@ var payContainer = new Vue({
                         _self.isReceiptStatus = false;
                     }else{
                         _self.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。';
-                _self.isReceiptStatus = true;
-            }
-            _self.isRequest = true;
-        }else{
-            layer.msg(response.msg, {icon: 7});
-}
+                        _self.isReceiptStatus = true;
+                    }
+                    _self.isRequest = true;
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
             })
         },
         PayMobileSubmitFn:function(){//点击移动支付方式
@@ -226,9 +227,11 @@ var payContainer = new Vue({
         },
         PayOrderPcMallPay:function(params,type){//网银&&支付宝生成支付地址
             var _self = this;
+            _self.isSubMitStatus=true;
             PayApi.PayOrderPcMallPay(params,function(response){
                 if(response.code == 0){
                     _self.isPayAlert = true;
+                    _self.isSubMitStatus=false;
                     _self.mbOrderId = response.data.data.mbOrderId;
                     if(type == 'ALIPAY'){
                         _self.payInfo.PAY_MOBILE_URL = response.data.data.payUrl;
@@ -245,15 +248,18 @@ var payContainer = new Vue({
                         window.open(response.data.data.payUrl);
                     }
                 }else{
-                    layer.msg(response.msg, {icon: 7});
+                    _self.isSubMitStatus=false;
+                    CAIMEI.Alert(response.msg,'确定',false);
                 }
             })
         },
         PayOrdersecondHandPay:function(params,type){//二手支付请求
             var _self = this;
+            _self.isSubMitStatus=true;
             PayApi.PayOrdersecondHandPay(params,function(response){
                 if(response.code == 0){
                     _self.isPayAlert = true;
+                    _self.isSubMitStatus=false;
                     _self.mbOrderId = response.data.data.mbOrderId;
                     if(type == 'ALIPAY'){
                         _self.payInfo.PAY_MOBILE_URL = response.data.data.payUrl;
@@ -282,7 +288,8 @@ var payContainer = new Vue({
                         window.open(response.data.data.payUrl);
                     }
                 }else{
-                    layer.msg(response.msg, {icon: 7});
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isSubMitStatus=false;
                 }
             })
         },

src/main/resources/static/js/pay/caimei-success.js

@@ -57,10 +57,10 @@ var payContainer = new Vue({
                 case 'second':
                     if(_self.isSuccess){
                         _self.linkText = '二手商品页面';
-                        _self.openLink = '/html/secondHand/secondList.jsp';
+                        _self.openLink = '/flea-market/list.html';
                     }else{
-                        _self.linkText = '发布商品页面';
-                        _self.openLink = '/html/maintenance/view/secondtransactions.jsp';
+                        _self.linkText = '发布二手商品页面';
+                        _self.openLink = '/flea-market/form.html';
                     }
                     break;
                 default:
@@ -71,7 +71,7 @@ var payContainer = new Vue({
             var timeClock = setInterval(function(){
                 _self.maxtime--;
                 if (_self.maxtime == 0) {
-                    // window.location.href = _self.openLink;
+                    window.location.href = _self.openLink;
                     clearInterval(timeClock);
                     _self.maxtime = 10;
                     _self.isRefresh = true;

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

@@ -3,48 +3,19 @@ var helpSuggestion = new Vue({
     el: "#dashboard",
     data: {
         btnLoading: false,
-        isRequset:false,
+        isRequset:true,
         userId: 0,
         degree:'',
         isCheckedAll:false,
-        messagesList:[
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false},
-            {title:'您有一笔订单等待支付，快去订单列表进行支付吧^_^。',addTime:' 2020-09-01 16:42:29',isCheck:false}
-        ],//新闻动态
+        messagesList:[],//消息列表
     },
     methods: {
-        GetMyPcCenterInfo:function(){
+        GetMyPcMymessageInfo:function(){
             var _self = this;
-            UserApi.GetMyPcCenterInfo({userId:_self.userId},function (response) {
+            UserApi.GetMymessageList({userId:_self.userId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
-                    _self.userInfo = data.user;
-                    _self.degree = data.degree;
-                    _self.unReadMessageCount = _self.showBadge(data.unReadMessageCount);
-                    _self.confirmedCount = _self.showBadge(data.confirmedCount);
-                    _self.paymentCount = _self.showBadge(data.paymentCount);
-                    _self.waitShipmentsCount = _self.showBadge(data.waitShipmentsCount);
-                    _self.shipmentsCount = _self.showBadge(data.shipmentsCount);
-                    _self.salesReturnCount = _self.showBadge(data.salesReturnCount);
-                    _self.productList = data.homePageAdvertiseList;
-                    _self.newsList = data.homePageInfoList;
-                    _self.isRequset = true;
+                    _self.isRequset = false;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
@@ -94,7 +65,7 @@ var helpSuggestion = new Vue({
     mounted: function () {
         if(globalUserData){
             this.userId = globalUserData.userId;
-            this.GetMyPcCenterInfo();
+            this.GetMyPcMymessageInfo();
         }
     }
 });

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

@@ -3,33 +3,15 @@ var orderPage = new Vue({
     el: "#orderPage",
     data: {
         isRequset:true,
-        userId: 0,
-        orderTabBarIndex:0,
-        orderTabBar: [
-            {state: 0,text: '全部订单',bages:0},
-            {state: 1,text: '待确认',bages:0},
-            {state: 2,text: '待付款',bages:0},
-            {state: 3,text: '待发货',bages:0},
-            {state: 4,text: '已发货',bages:0},
-            {state: 5,text: '退货/款',bages:0}
-        ],
-        listQuery:{
-            searchNo:'',
-            orderState:0,
-            userId:0,
-            beginTime:'',
-            endTime:'',
-            pageNum:1,
-            pageSize:10
-        },
-        listRecord: 0,
-        pageInput: '1',
-        orderList:[],
-        confirmedCount:'',//待確認數量
-        paymentCount:'',//待付款
-        waitShipmentsCount:'',//待发货
-        shipmentsCount:'',//已发货
-        salesReturnCount:'',//退货款
+        orderId:0,              //订单ID
+        userId: 0,              //用户ID
+        orderInfo:{},           //订单信息
+        shopOrderList:[],       //订单商品信息
+        userInfo:{},            //订单用户信息
+        orderInvoice:{},        //发票信息
+        discernReceiptList:[],  //订单付款信息
+        returnedPurchaseList:[],//订单退款信息
+        orderIdentificationId:'',//订单标识
         modelType:0
     },
     filters: {
@@ -73,29 +55,28 @@ var orderPage = new Vue({
 
     },
     methods: {
-        GetQueryOrderListData:function(){//查询订单列表
+        GetQueryOrderDetailsInfo:function(){//查询订单详情
             var _self = this;
-            OrderApi.GetQueryOrderListData(_self.listQuery,function (response) {
+            OrderApi.QueryOrderDetailsInfo({orderID:_self.orderId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
-                    if(data.results && data.results.length>0) {
-                        _self.orderList = [];
-                        _self.orderList = data.results;
-                        _self.listRecord = data.totalRecord;
-                    }else{
-                        _self.orderList = [];
-                        _self.orderList = data.results;
-                    }
+                    _self.orderInfo = data.order;
+                    _self.userInfo = data.userInfo;
+                    _self.orderInvoice = data.orderInvoice;
+                    _self.shopOrderList = data.shopOrderList;
+                    _self.discernReceiptList = data.discernReceiptList;
+                    _self.returnedPurchaseList = data.returnedPurchaseList;
+                    _self.orderIdentificationId = '#'+ _self.orderInfo.orderID+'#';
                     _self.isRequset = false;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
             })
         },
-        hanldConfirmOrderFn:function(orderId){//确认订单
+        hanldConfirmOrderFn:function(){//确认订单
             var _self = this;
             CAIMEI.Modal('是否确认订单？','取消','确定',function () {
-                OrderApi.AffirmOrderOrder({orderID:orderId},function(response){
+                OrderApi.AffirmOrderOrder({orderID:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('确认成功',true,function () {
                             _self.GetQueryOrderListData();
@@ -106,13 +87,13 @@ var orderPage = new Vue({
                 })
             })
         },
-        hanldCancelOrderFn:function(orderId){//取消订单
+        hanldCancelOrderFn:function(){//取消订单
             var _self = this;
             CAIMEI.Modal('确认取消该订单吗？','取消','确定',function () {
-                OrderApi.GetCancelOrder({orderID:orderId},function(response){
+                OrderApi.GetCancelOrder({orderID:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('取消成功',true,function () {
-                            _self.GetQueryOrderListData();
+                            _self.GetQueryOrderDetailsInfo();
                         });
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
@@ -120,13 +101,13 @@ var orderPage = new Vue({
                 })
             })
         },
-        hanldDeleteOrderFn:function(orderId){//删除订单
+        hanldDeleteOrderFn:function(){//删除订单
             var _self = this;
             CAIMEI.Modal('确认删除该订单吗？','取消','确定',function () {
-                OrderApi.GetDeleteOrder({orderID:orderId},function(response){
+                OrderApi.GetDeleteOrder({orderID:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('删除成功',true,function () {
-                            _self.GetQueryOrderListData();
+                            window.location.href='/user/order/list.html?state=0';
                         });
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
@@ -134,13 +115,13 @@ var orderPage = new Vue({
                 })
             })
         },
-        hanldReceivingOrderFn:function(orderId){//确认收货
+        hanldReceivingOrderFn:function(){//确认收货
             var _self = this;
             CAIMEI.Modal('是否确认收货？','取消','确定',function () {
-                OrderApi.GetAffirmOrder({orderID:orderId},function(response){
+                OrderApi.GetAffirmOrder({orderID:_self.orderId},function(response){
                     if(response.code == 0){
                         CAIMEI.dialog('操作成功',true,function () {
-                            _self.GetQueryOrderListData();
+                            _self.GetQueryOrderDetailsInfo();
                         });
                     }else{
                         CAIMEI.Alert(response.msg, '确定', false);
@@ -148,11 +129,73 @@ var orderPage = new Vue({
                 })
             })
         },
-        hanldDetilsOrderFn:function(orderId){//订单详情
-            window.location.href='/user/order/detail.html?order='+orderId;
+        hanldPayOrderFn:function(){//支付订单
+            var _self = this;
+            OrderApi.OrderPaymentValidation({orderId:_self.orderId},function(response){
+                if(response.code == 0){
+                    var dataCode = response.data.code;
+                    _self.payModelData = response.data;
+                    switch(dataCode){
+                        case 1:
+                            _self.modelType = 1;
+                            break;
+                        case 2:
+                            _self.modelType = 2;
+                            break;
+                        case -1:
+                            CAIMEI.Alert('订单已申请全部退款，无需再付款！', '确定', false);
+                            break;
+                        default:
+                            if(response.data.onlinePayFlag == '1'){
+                                _self.modelType = 3;
+                            }else{
+                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.orderId;
+                            }
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            })
         },
-        hanldPayOrderFn:function(orderId){//支付订单
-
+        hanldPaymentConfirm:function() {//余额抵扣跳转
+            var _self = this;
+            OrderApi.OrderBalanceDeduction({orderId: _self.orderId}, function (response) {
+                if (response.code == 0) {
+                    if (_self.modelType === 2) {
+                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payModelData.pendingPayments;
+                    } else {
+                        if (_self.orderInfo.onlinePayFlag === '1') {
+                            _self.modelType = 3;
+                        } else {
+                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.orderId;
+                        }
+                    }
+                } else {
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            });
+        },
+        hanldCancelConfirm:function(){//不使用余额抵扣直接跳转收银台
+            var _self = this;
+            if(_self.orderInfo.onlinePayFlag == '1'){
+                _self.modelType = 3;
+            }else{
+                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.orderId;
+            }
+        },
+        hidePaymentConfirm:function(){
+            var _self = this;
+            _self.modelType = 0;
+        },
+        copyOrderBtnSubmitFn:function(){//复制订单标识
+            var _self = this;
+            var oInput = document.createElement("textarea");
+            oInput.value = _self.orderIdentificationId;
+            document.body.appendChild(oInput);
+            oInput.select(); // 选择对象
+            document.execCommand("Copy"); // 执行浏览器复制命令
+            document.body.removeChild(oInput);
+            CAIMEI.dialog('复制成功');
         },
         showBadge:function(n){//处理标签
             var num ='';
@@ -166,11 +209,9 @@ var orderPage = new Vue({
     mounted: function () {
         if(globalUserData){
             this.userId = globalUserData.userId;
-            this.listQuery.orderState = CAIMEI.getUrlParam('state');
-            this.listQuery.userId = this.userId;
-            this.GetQueryOrderListData();
+            this.orderId = CAIMEI.getUrlParam('orderId');
+            this.GetQueryOrderDetailsInfo();
         }
-        console.log(this.listQuery.orderState)
         $('.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

@@ -31,7 +31,10 @@ var orderPage = new Vue({
         waitShipmentsCount:'',//待发货
         shipmentsCount:'',//已发货
         salesReturnCount:'',//退货款
-        modelType:0
+        modelType:0,
+        orderIdentificationId:0,
+        payModelData:{},
+        hanldOrderData:{}//监听点击的单个订单项的按钮
     },
     filters: {
         NumFormat:function(text) {//处理金额
@@ -105,7 +108,6 @@ var orderPage = new Vue({
             }
         },
         changeOrderFn:function(index,status){//点击Tab切换查询订单
-            console.log(status);
             var  _self = this;
             _self.orderTabBarIndex = index;
             _self.listQuery.orderState = status;
@@ -116,6 +118,9 @@ var orderPage = new Vue({
             _self.isRequset = true;
             _self.GetQueryOrderListData()
         },
+        searchOrderListFn:function(){//搜索
+            _self.GetQueryOrderListData();
+        },
         GetQueryOrderNumInfo:function(){//查询tabs数量
             var _self = this;
             OrderApi.GetQueryOrderNum({userId:_self.userId},function (response) {
@@ -203,21 +208,89 @@ var orderPage = new Vue({
             })
         },
         hanldDetilsOrderFn:function(orderId){//订单详情
-            window.location.href='/user/order/detail.html?order='+orderId;
+            window.location.href='/user/order/detail.html?orderId='+orderId;
+        },
+        hanldPayOrderFn:function(order,orderId){//支付订单
+            var _self = this;
+            _self.hanldOrderData = order;
+            console.log(_self.hanldOrderData);
+            _self.orderIdentificationId = '#'+orderId+'#';
+            OrderApi.OrderPaymentValidation({orderId:orderId},function(response){
+                if(response.code == 0){
+                    var dataCode = response.data.code;
+                    _self.payModelData = response.data;
+                    switch(dataCode){
+                        case 1:
+                            _self.modelType = 1;
+                            break;
+                        case 2:
+                            _self.modelType = 2;
+                            break;
+                        case -1:
+                            CAIMEI.Alert('订单已申请全部退款，无需再付款！', '确定', false);
+                            break;
+                        default:
+                            if(response.data.onlinePayFlag == '1'){
+                                _self.modelType = 3;
+                            }else{
+                                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+orderId;
+                            }
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            })
+        },
+        hanldPaymentConfirm:function(type) {//余额抵扣跳转
+            var _self = this;
+            OrderApi.OrderBalanceDeduction({orderId: _self.payModelData.orderId}, function (response) {
+                if (response.code == 0) {
+                    if (type === 2) {
+                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payModelData.pendingPayments;
+                    } else {
+                        if (data.order.onlinePayFlag === '1') {
+                            _self.modelType = 3;
+                        } else {
+                            window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.hanldOrderData.orderID;
+                        }
+                    }
+                } else {
+                    CAIMEI.Alert(response.msg, '确定', false);
+                }
+            });
+        },
+        hanldCancelConfirm:function(){//不使用余额抵扣直接跳转收银台
+            var _self = this;
+            if(_self.hanldOrderData.onlinePayFlag == '1'){
+                _self.modelType = 3;
+            }else{
+                window.location.href = '/pay/caimei-paycash.html?type=payfirm&orderID='+_self.hanldOrderData.orderID;
+            }
+        },
+        hidePaymentConfirm:function(){//隐藏弹窗
+            var _self = this;
+            _self.modelType = 0;
+        },
+        copyOrderBtnSubmitFn:function(){//复制订单标识
+            var _self = this;
+            var oInput = document.createElement("textarea");
+            oInput.value = _self.orderIdentificationId;
+            document.body.appendChild(oInput);
+            oInput.select(); // 选择对象
+            document.execCommand("Copy"); // 执行浏览器复制命令
+            document.body.removeChild(oInput);
+            CAIMEI.dialog('复制成功');
         },
-        hanldPayOrderFn:function(orderId){//支付订单
-
-        }
     },
     mounted: function () {
         if(globalUserData){
             this.userId = globalUserData.userId;
             this.listQuery.orderState = CAIMEI.getUrlParam('state');
             this.listQuery.userId = this.userId;
+            this.orderTabBarIndex = this.listQuery.orderState;
             this.GetQueryOrderListData();
             this.GetQueryOrderNumInfo();
         }
-        console.log(this.listQuery.orderState)
         $('.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/setting/phone.js

@@ -76,6 +76,10 @@ var phonePage = new Vue({
         },
         getNewMobileCodeFn:function(){//获取新手机号短信验证码
             var _self = this;
+            var pass = verifyCheack('.massageBtn');
+            if (!pass) {
+                return false;
+            }
             _self.isNewMobileDisabled = true;
             PublicApi.getClubMobileCode({ mobile : _self.form.contractMobile },function(response){
                     if(response.code == 0){

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

@@ -1,126 +1,108 @@
-<%@ page import="com.caimei.utils.SysConfig" %><%--
-  Created by IntelliJ IDEA.
-  User: 828
-  Date: 2018/5/10
-  Time: 10:01
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%
-    request.setAttribute("oldApi", SysConfig.getStringConfig("caimei.api.old"));
-    request.setAttribute("newApi", SysConfig.getStringConfig("caimei.api.new"));
-%>
 <!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>
-    <meta charset="UTF-8">
-    <meta http-equiv="pragma" content="no-cache">
-    <meta http-equiv="cache-control" content="no-cache">
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta http-equiv="keywords" content="采美平台业务包括采美采购商城，采美正品联盟，美业供应链合作，美业平台综合运营，三方项目服务合作，美业信息咨询服务，美业二手市场，医美直播，品牌招商等。其中采购商城包括热门小气泡仪器、皮肤检测，水光仪器，中胚层治疗仪器，激光仪器，射频仪器，超声仪器，微针射频仪器，脱毛仪器、红蓝光，身体塑形溶脂仪器等。产品包括：医美术后修复产品，高端SPA产品，高端院线产品，医美家居护理产品，玻尿酸，动能素，精纯液，填充针剂，线材，消耗品等。">
-    <meta http-equiv="description" content="采美365网，生美医美正品采购服务平台，国内第一家美容行业的B2B平台，具有一，二，三类医疗器械销售资质和进出口资质。聚集全球100多个优质供应商资源，包括医疗、非医疗美容产品和仪器设备，能够一站式满足医疗美容机构、生活美容机构、新兴皮肤管理中心等多样化采购需求。同时提供供应链合作，整合上下游资源，为美容产业的持续前进和发展提出新的解决方案。">
-    <link rel="shortcut icon" href="/web/common/img/favicon.ico" type="image/x-icon">
-    <link rel="stylesheet" href="/web/common/css/reset.css">
-    <link rel="stylesheet" href="/web/login/css/register.css?version=<%=Math.random()%>">
-    <link rel="stylesheet" href="/web/order/css/caimei-pay.css?version=<%=Math.random()%>">
-    <script src="/web/common/js/tools.js"></script>
-    <script src="/public/3.0/js/lib/layer/layer.min.js"></script>
-    <script src="/web/common/js/common.js?version=<%=Math.random()%>"></script>
-    <script src="/public/3.0/js/lib/vue2.6.11.js"></script>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/pay/caimei-pay.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="head-wrap">
-    <div class="head clearfix">
-        <div class="fl logo-to-index"><img src="/web/login/img/index_logo.png" alt=""></div>
-        <div class="fl main-thing">生美/医美采购服务平台</div>
-        <input id="oldApi" value='${oldApi}' type="hidden">
-        <input id="newApi" value='${newApi}' type="hidden">
+    <div class="inner clear">
+        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="text">生美/医美采购服务平台</div>
+        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>
-<div class="pay-container clearfix" id="payContainer" :class="isRequest ? 'active' : ''">
-    <div class="pay-content clearfix" v-if="!isErrorShow">
-        <div class="pay-title">
-            <div class="title-left"><p><span id="userName">{{userName}}</span><span class="color">(请在倒计时时间内使用企业网银完成本次支付)</span></p></div>
-            <div class="title-right">
-                <div class="time">
-                    <span id="downHour">{{downHour}}</span>
-                    <span id="downMinute">{{downMinute}}</span>
-                    <span id="downSecond">{{downSecond}}</span>
+<div class="pay-container clear" id="payContainer" :class="isRequest ? 'active' : ''">
+    <div class="container">
+        <div class="pay-content clear" v-if="!isErrorShow">
+            <div class="pay-title">
+                <div class="title-left"><p><span id="userName">{{userName}}</span><span class="color">(请在倒计时时间内使用企业网银完成本次支付)</span></p></div>
+                <div class="title-right">
+                    <div class="time">
+                        <span id="downHour">{{downHour}}</span>
+                        <span id="downMinute">{{downMinute}}</span>
+                        <span id="downSecond">{{downSecond}}</span>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="pay-goods">
-            <div class="good-top">
-                <div class="good-top-inner">
-                    <div class="bot-right">
-                        <div class="bot-num"><span>运费：</span><span class="p" id="freight">{{freight}}</span></div>
-                        <div class="bot-num"><span>经理折扣：</span><span class="p" id="discountFee">￥{{discountFee | NumFormat}}</span></div>
-                        <div class="bot-num"><span>余额抵扣：</span><span class="p" id="balancePayFee">￥{{balancePayFee | NumFormat}}</span></div>
-                        <div class="bot-num"><span>合计：</span><span class="red" id="payTotalFee">￥{{payTotalFee | NumFormat}}</span></div>
+            <div class="pay-goods">
+                <div class="good-top">
+                    <div class="good-top-inner">
+                        <div class="bot-right">
+                            <div class="bot-num"><span>运费：</span><span class="p" id="freight">{{freight}}</span></div>
+                            <div class="bot-num"><span>经理折扣：</span><span class="p" id="discountFee">￥{{discountFee | NumFormat}}</span></div>
+                            <div class="bot-num"><span>余额抵扣：</span><span class="p" id="balancePayFee">￥{{balancePayFee | NumFormat}}</span></div>
+                            <div class="bot-num"><span>合计：</span><span class="red" id="payTotalFee">￥{{payTotalFee | NumFormat}}</span></div>
+                        </div>
+                        <div class="bot-left" id="goodSlideToggle"@click="slideToggleContent">
+                            <i class="icon-down" :class="isSiled ? 'roter' : '' "></i>
+                            <p id="iconText">{{isSiled ? '点击箭头收起订单商品' :'点击箭头展开订单商品'}}</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="good-main" v-if="isSiled">
+                    <div class="list-title">
+                        <div class="t-li"><p>序号</p></div>
+                        <div class="t-li"><p>商品图片</p></div>
+                        <div class="t-li"><p>商品名称</p></div>
+                        <div class="t-li"><p>单价</p></div>
+                        <div class="t-li"><p>数量</p></div>
+                        <div class="t-li"><p>总价</p></div>
                     </div>
-                    <div class="bot-left clearfix" id="goodSlideToggle"@click="slideToggleContent">
-                        <i class="icon-down" :class="isSiled ? 'roter' : '' "></i>
-                        <p id="iconText">{{isSiled ? '点击箭头收起订单商品' :'点击箭头展开订单商品'}}</p>
+                    <div class="list-container" id="goodsContainer">
+                        <div class="list-main" v-for="(item, index) in orderProductList" :key="index" :class="{'active':index%2 != 1}">
+                            <div class="t-li"><p>{{index+1}}</p></div>
+                            <div class="t-li"><img :src="item.productImage" :alt="item.name"></div>
+                            <div class="t-li"><p>{{item.name}}</p></div>
+                            <div class="t-li"><p>￥{{item.price | NumFormat}}</p></div>
+                            <div class="t-li"><p>{{item.num}}</p></div>
+                            <div class="t-li"><p>￥{{item.totalFee | NumFormat}}</p></div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="good-main" v-if="isSiled">
-                <div class="list-title">
-                    <div class="t-li"><p>序号</p></div>
-                    <div class="t-li"><p>商品图片</p></div>
-                    <div class="t-li"><p>商品名称</p></div>
-                    <div class="t-li"><p>单价</p></div>
-                    <div class="t-li"><p>数量</p></div>
-                    <div class="t-li"><p>总价</p></div>
+            <div class="pay-ment">
+                <div class="pay-message">
+                    <div class="message-num"><span>本次支付金额：</span><span class="red" id="payableAmount">￥{{payableAmount | NumFormat}}</span></div>
+                    <div class="message-num"><span>剩余支付金额：</span><span class="red" id="payment">￥{{payment | NumFormat}}</span></div>
+                    <div class="message-num"><span>已支付：</span><span class="red" id="receiptAmount">￥{{receiptAmount | NumFormat}}</span></div>
                 </div>
-                <div class="list-container" id="goodsContainer">
-                    <div class="list-main" v-for="(item, index) in orderProductList" :key="index" :class="{'active':index%2 != 1}">
-                        <div class="t-li"><p>{{index+1}}</p></div>
-                        <div class="t-li"><img :src="item.productImage" :alt="item.name"></div>
-                        <div class="t-li"><p>{{item.name}}</p></div>
-                        <div class="t-li"><p>￥{{item.price | NumFormat}}</p></div>
-                        <div class="t-li"><p>{{item.num}}</p></div>
-                        <div class="t-li"><p>￥{{item.totalFee | NumFormat}}</p></div>
+                <div class="pay-record">
+                    <div class="record-title">支付记录</div>
+                    <div class="record-content clear" id="discernReceipt">
+                        <div class="record-li none" v-if="discernReceiptList.length== 0">暂无支付记录</div>
+                        <div class="record-li" v-for="(item, index) in discernReceiptList" :key="index" v-else>
+                            <div class="record-tb">￥{{item.receiptAmount | NumFormat}}</div>
+                            <div class="record-tb">{{payTypeText(item.payType)}}</div>
+                            <div class="record-tb">{{item.receiptDate}}</div>
+                            <div class="record-tb"></div>
+                            <div class="record-tb"></div>
+                            <div class="record-tb"></div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="pay-ment">
-            <div class="pay-message">
-                <div class="message-num"><span>本次支付金额：</span><span class="red" id="payableAmount">￥{{payableAmount | NumFormat}}</span></div>
-                <div class="message-num"><span>剩余支付金额：</span><span class="red" id="payment">￥{{payment | NumFormat}}</span></div>
-                <div class="message-num"><span>已支付：</span><span class="red" id="receiptAmount">￥{{receiptAmount | NumFormat}}</span></div>
-            </div>
-            <div class="pay-record">
-                <div class="record-title">支付记录</div>
-                <div class="record-content clearfix" id="discernReceipt">
-                    <div class="record-li none" v-if="discernReceiptList.length== 0">暂无支付记录</div>
-                    <div class="record-li" v-for="(item, index) in discernReceiptList" :key="index" v-else>
-                        <div class="record-tb">￥{{item.receiptAmount | NumFormat}}</div>
-                        <div class="record-tb">{{payTypeText(item.payType)}}</div>
-                        <div class="record-tb">{{item.receiptDate}}</div>
-                        <div class="record-tb"></div>
-                        <div class="record-tb"></div>
-                        <div class="record-tb"></div>
-                    </div>
+            <div class="pay-bank">
+                <div class="bank-title">请选择以下一家银行进行付款</div>
+                <div class="bank-list" id="bankContent">
+                    <a href="javascript:void(0);" v-for="(item, index) in bankData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
+                        <img :src="item.imgUrl" :alt="item.bankName">
+                    </a>
                 </div>
             </div>
         </div>
-        <div class="pay-bank">
-            <div class="bank-title">请选择以下一家银行进行付款</div>
-            <div class="bank-list" id="bankContent">
-                <a href="javascript:void(0);" v-for="(item, index) in bankData" :key="index" :class="{ active: tabIndex === index }"  @click="changeTab(index,item)">
-                    <img :src="item.imgUrl" :alt="item.bankName">
-                </a>
+    </div>
+    <div class="pay-button-main">
+        <div class="inner">
+            <div class="pay-button">
+                <a href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
             </div>
         </div>
-        <div class="pay-button"><a href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn">立即支付</a></div>
     </div>
-    <div class="pay-error clearfix" v-else>
+    <div class="pay-error clear" v-else>
         <div class="icon-error" id="iconError" :class="iconErrorClass"></div>
         <div class="error-msg" id="errorMsg">{{iconErrorText}}</div>
         <div class="error-msgnone">{{iconErrorMsgnone}}</div>
@@ -136,12 +118,12 @@
         </div>
     </div>
 </div>
-<%@ include file="/web/login/view/out_footer.jsp" %>
-<script src="/web/common/js/ajax.service.js?version=<%=Math.random()%>"></script>
-<script src="/web/common/js/api/user.service.js?version=<%=Math.random()%>"></script>
-<script src="/web/common/js/api/utils.service.js?version=<%=Math.random()%>"></script>
-<script src="/web/common/js/api/pay.service.js?version=<%=Math.random()%>"></script>
-<script src="/web/order/js/caimei-pay.js?version=<%=Math.random()%>"></script>
-
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/qrcode.min.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-pay.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -119,10 +119,10 @@
     <div class="pay-button-main">
         <div class="inner">
             <div class="pay-button" v-if="mobileTabIndex === 2">
-                <a href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn">立即支付</a>
+                <a href="javascript:void(0);" id="paySubmit" @click="PaySubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
             </div>
             <div class="pay-button" v-else>
-                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn">立即支付</a>
+                <a href="javascript:void(0);" id="payMobileSubmit" @click="PayMobileSubmitFn" :class="isSubMitStatus ? 'disabled' : ''">立即支付</a>
             </div>
         </div>
     </div>

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

@@ -4,21 +4,17 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/pay/caimei-success.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/pay/caimei-wechatpay.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <div class="head-wrap">
-    <div class="inner clear">
-        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
-        <div class="text">收银台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
-        <input type="hidden" th:value="${agent}" id="userAgent">
-    </div>
+    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${agent}" id="userAgent">
 </div>
 <div class="pay-container  clearfix" id="payContainer" :class="isRequest? 'active' : ''">
     <div class="pay-amount">
-        <div class="icon"><img src="/web/order/img/icon-paybg@2x.png" alt=""></div>
+        <div class="icon"><img src="/img/pay/icon-paybg@2x.png" alt=""></div>
         <div class="pay-money">
             <div class="label">付款金额</div>
             <div class="mount"><span>￥</span>{{payAmount}}</div>
@@ -34,7 +30,8 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/js/viewport-sitting.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/pay.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-success.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/pay/caimei-wechatpay.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -3,7 +3,7 @@
     <div class="navList">
         <span class="tab">我的交易</span>
         <div class="con" style="display:none">
-            <a href="/user/order/list.html">我的订单</a>
+            <a href="/user/order/list.html?state=0">我的订单</a>
             <a href="/user/repair/list.html">我的维修</a>
             <a href="/user/address/list.html">收货地址管理</a>
         </div>

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

@@ -23,6 +23,9 @@
             <!--左侧导航-->
             <template th:replace="user-center/components/tableft"></template>
             <div class="right">
+                <div v-if="isRequset" class="loading">
+                    <img src="/img/base/loading.gif">
+                </div>
                 <div class="content clear">
                     <div class="title">所有消息</div>
                     <div class="section">
@@ -36,7 +39,7 @@
                                 <a href="javascript:void(0);" class="btn" @class="signMessageFn">标为已读</a>
                             </div>
                         </div>
-                        <div class="section-content">
+                        <div class="section-content" v-if="messagesList.length > 0">
                             <div class="new-list" v-for="(item, index) in messagesList" :key="index">
                                 <div class="text">
                                     <i class="icon mIcon" :class="item.isCheck ? 'icon-gouxuan' : 'icon-weigouxuan'" @click="checkedItemFn(item)"></i>
@@ -45,6 +48,10 @@
                                 <div class="time">{{item.addTime}}</div>
                             </div>
                         </div>
+                        <div v-else class="empty">
+                            <img src="/img/common/empty.png">
+                            <div class="msg"><p>暂无数据</p></div>
+                        </div>
                     </div>
                 </div>
             </div>

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

@@ -10,7 +10,6 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-
 <div id="orderPage" v-cloak>
     <div class="navLayout" th:object="${pageInfo}">
         <div class="crumbs">
@@ -30,53 +29,192 @@
                 </div>
                 <div class="order-container clear" v-else>
                     <!--数据为空-->
-                    <div class="section" v-if="orderList.length > 0">
-                        <div class="user-main order" v-for="(order, index) in orderList" :key="index">
+                    <div class="section">
+                        <div class="section-info shadow">
                             <div class="order-title">
-                                <span class="bag" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">自主</span>
-                                <span class="bag" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">协销</span>
+                                <span class="bag" v-if="orderInfo.orderSubmitType == 3 || orderInfo.orderSubmitType == 4">协销</span>
+                                <span class="bag" v-if="orderInfo.orderSubmitType == 0 || orderInfo.orderSubmitType == 1 || orderInfo.orderSubmitType == 2">自主</span>
                                 <div class="title-name">
-                                    <p>订单编号(标识)：<span>{{order.orderNo}}({{order.orderID}})</span></p>
-                                    <p class="state">{{order.status | stateExp}}</p>
+                                    <p>订单编号：<span>{{orderInfo.orderNo}}</span></p>
+                                    <p class="state">{{orderInfo.status | stateExp}}</p>
                                 </div>
-                                <div class="title-type" v-if="order.secondHandOrderFlag == 1"></div>
+                                <div class="title-type" v-if="orderInfo.secondHandOrderFlag == 1"></div>
                                 <div class="title-time">
-                                    <p>{{order.orderTime}}</p>
+                                    <p>{{orderInfo.orderTime}}</p>
                                 </div>
                             </div>
                             <div class="order-content">
                                 <div class="order-item">
-                                    <p>税费: <span>￥{{order.expensesOfTaxation | NumFormat}}</span> </p>
-                                    <p v-if="order.freePostFlag == '0'">运费:<span>包邮</span> </p>
-                                    <p v-if="order.freePostFlag == '-1'">运费:<span>到付</span> </p>
-                                    <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 class="org">订单标识：<span class="org">{{orderIdentificationId}}</span></p>
+                                    <p class="copy" @click="copyOrderBtnSubmitFn">复制</p>
+                                </div>
+                                <div class="order-item">
+                                    <p>收货人:<span class="none">{{userInfo.shouHuoRen}}</span> </p>
+                                    <p>电话:<span class="none">{{userInfo.mobile}}</span> </p>
+                                    <p>地址:<span class="none">{{userInfo.province}}{{userInfo.city}}{{userInfo.town}}{{userInfo.address}}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>订单总额:<span class="red">￥{{order.payTotalFee | NumFormat}}</span> </p>
+                                    <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>
+                                    </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="red">￥{{order.payableAmount | NumFormat}}</span> </p>
-                                    <p>已支付:<span class="red">￥{{order.receiptAmount | NumFormat}}</span> </p>
-                                    <p>待付金额:<span class="red">￥{{order.pendingPayments | NumFormat}}</span> </p>
-                                </div>
-                                <div class="order-botton">
-                                    <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderID)">取消订单</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderID)">确认订单</a>
-                                    <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderID)">删除订单</a>
-                                    <!--    <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(order.status)!=-1" @click="hanldQueryExpressFn()">查看物流</a>-->
-                                    <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(order.status)!=-1" @click="hanldReceivingOrderFn(order.orderID)">确认收货</a>
-                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order.orderID)">支付订单</a>
+                                    <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>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="section-list shadow">
+                            <div class="section-shopinfo" v-for="(shop, index) in shopOrderList" :key="index">
+                                <div class="title">
+                                    <img :src="shop.shopLogo" alt="" class="logo">
+                                    <p class="name">{{shop.shopName}}</p>
+                                    <div class="activity">
+                                        <div class="tit"><p>店铺满减</p><i class="icon mIcon"></i></div>
+                                        <div class="action">
+                                            <p class="org">全店铺:满1000.00,减500.00</p>
+                                            <p>促销时间:不限时</p>
+                                            <p class="btn"><span>了解</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="product">
+                                    <div class="section-prosinfo" v-for="(pros, pIndex) in shop.orderProductList" :key="pIndex">
+                                        <div class="product-t">
+                                            <div class="image"><img :src="pros.productImage" alt=""></div>
+                                            <div class="text">
+                                                <p class="tit">{{pros.name}}</p>
+                                                <div class="info">
+                                                    <div class="info-l">
+                                                        <p v-if="pros.productCategory != 2">规格:<span class="none">{{pros.productUnit ? pros.productUnit : ''}}</span> </p>
+                                                        <p>数量:<span class="none">{{pros.num}}</span> </p>
+                                                        <p>单价:<span class="none">￥{{pros.price | NumFormat}}</span> </p>
+                                                    </div>
+                                                    <div class="info-r">
+                                                        <p>税率:<span class="none">{{pros.taxRate}}%</span></p>
+                                                        <p>折扣:<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
+                                                        <p>折后单价:<span class="none">￥{{pros.discountPrice | NumFormat}}</span></p>
+                                                    </div>
+                                                    <div class="info-r">
+                                                        <div class="activity">
+                                                            <div class="tit">
+                                                                <p>优惠价:￥<span>1200.00</span></p><i class="icon mIcon"></i></div>
+                                                            <div class="action">
+                                                                <p>促销时间:2020.6.28~2020.9.30</p>
+                                                                <p class="btn"><span>了解</span></p>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="product-b">
+                                            <p>合计: <span class="red">￥{{pros.totalFee | NumFormat}}</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="shopinfo-bott">
+                                    <div class="bott-top">
+                                        <p class="count">共计  <span class="red">{{shop.itemCount}}</span>商品</p>
+                                        <p class="total">合计: <span class="red">￥{{shop.totalAmount | NumFormat}}</span></p>
+                                    </div>
+                                    <div class="bott-bot" v-if="shop.note!=''">
+                                         <p>备注: <span>{{shop.note ? shop.note : ''}}</span></p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
+                        <div class="section-invoice shadow">
+                            <div class="tit"><p>发票信息</p><i class="icon mIcon" v-if="orderInvoice != null"></i></div>
+                            <div class="invoice-none" v-if="orderInvoice != null">
+                                <p>不开发票</p>
+                            </div>
+                            <div class="invoice-content" v-else>
+                                <div class="invice-item">
+                                    <p>公司抬头: <span>采美信息技术有限公司</span></p>
+                                    <p>纳锐人识别号: <span>430527199206186615</span></p>
+                                </div>
+                                <div class="invice-item">
+                                    <p>注册地址: <span>广东省深圳市福田区上步</span></p>
+                                    <p>注册电话: <span>0755-2190777</span></p>
+                                </div>
+                                <div class="invice-item">
+                                    <p>开户银行: <span>农业银行</span></p>
+                                    <p>银行账号: <span>6228481456743154778</span></p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="section-payment shadow">
+                            <div class="payment-transfer">
+                                <div class="payment-transfer-main" id="paymentTransferMain">
+                                    <div class="label"><P class="label-title">除了线上支付，您还可以通过直接转账的方式付款</P></div>
+                                    <div class="label"><P class="label-t">转账信息</P></div>
+                                    <div class="label">
+                                        <P class="text">开户行：中信银行（深圳泰然支行）</P>
+                                        <P class="text">银行卡号：6217 6803 0362 0897</P>
+                                        <P class="text">户名：周仁声</P>
+                                    </div>
+                                    <div class="label">
+                                        <P class="text-p">订单标识：{{orderIdentificationId}}</P>
+                                        <P class="text-p"><a href="javascript: void(0);" class="copy" @click="copyOrderBtnSubmitFn">复制</a></P>
+                                    </div>
+                                    <div class="label"><P class="label-t">特别注意</P></div>
+                                    <div class="label"><P class="label-c">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</P></div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="section-paymentlist shadow" v-if ='orderInfo.receiptAmount >0 '>
+                            <div class="record-title">
+                                <div class="record-title-l">支付记录</div>
+                                <div class="record-title-r">
+                                    已支付：<span class="red">￥{{ orderInfo.receiptAmount != null ? orderInfo.receiptAmount.toFixed(2) : '0.00'}}</span>
+                                </div>
+                            </div>
+                            <div class="record-list" v-if="discernReceiptList.length > 0">
+                                <div class="record-item" v-for="(item,index) in discernReceiptList" :key="index">
+                                    <div class="item-time mm">￥{{item.associateAmount | NumFormat}}</div>
+                                    <div class="item-time pp">{{item.payType}}</div>
+                                    <div class="item-time tt">{{item.receiptDate}}</div>
+                                </div>
+                            </div>
+                            <div class="record-empty" v-else>
+                                <p>暂无支付记录</p>
+                            </div>
+                        </div>
+                        <div class="section-paymentlist shadow" v-if ='orderInfo.returnedPurchaseFee != null'>
+                            <div class="record-title">
+                                <div class="record-title-l">退款记录</div>
+                                <div class="record-title-r">
+                                    已退款：<span class="red">￥{{ orderInfo.returnedPurchaseFee != null ? orderInfo.returnedPurchaseFee.toFixed(2) : '0.00'}}</span>
+                                </div>
+                            </div>
+                            <div class="record-list" v-if="returnedPurchaseList.length > 0">
+                                <div class="record-item" v-for="(item,index) in returnedPurchaseList" :key="index">
+                                    <div class="item-rec mm">{{item.returnedWay =='4' ? '无支付无退款' : '￥'+item.refundFee.toFixed(2)}}</div>
+                                    <div class="item-rec tt">{{item.confirmReturnTime}}</div>
+                                </div>
+                            </div>
+                            <div class="record-empty" v-else>
+                                <p>暂无退款记录</p>
+                            </div>
+                        </div>
                     </div>
-                    <div v-else class="empty">
-                        <img src="/img/common/empty.png">
-                        <div class="msg"><p>暂无数据</p></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(order.status)!=-1" @click="hanldQueryExpressFn()">查看物流</a>-->
+                        <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(orderInfo.status)!=-1" @click="hanldReceivingOrderFn()">确认收货</a>
                     </div>
                 </div>
             </div>
@@ -90,8 +228,8 @@
                 <p>您有采美余额<span id="partMonery">￥200.00</span>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<span id="partAmont">￥200.00</span></p>
             </div>
             <div class="popup-button">
-                <div class="btn btn-cancel" @click="">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="">抵扣,继续付款</div>
+                <div class="btn btn-cancel" @click="hanldCancelConfirm">不抵扣,继续付款</div>
+                <div class="btn btn-confim" @click="hanldPaymentConfirm(1)">抵扣,继续付款</div>
             </div>
         </div>
     </div>
@@ -103,8 +241,8 @@
                 <p>您有采美余额<span>￥200.00</span>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</p>
             </div>
             <div class="popup-button">
-                <div class="btn btn-cancel" @click="">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="">抵扣</div>
+                <div class="btn btn-cancel" @click="hanldCancelConfirm">不抵扣,继续付款</div>
+                <div class="btn btn-confim" @click="hanldPaymentConfirm(2)">抵扣</div>
             </div>
         </div>
     </div>
@@ -120,12 +258,12 @@
                     <p>开户行：中信银行（深圳泰然支行）</p>
                     <p>银行卡号：6217 6803 0362 0897</p>
                     <p>户名：周仁声</p>
-                    <p>订单标识：<input id="paymentTransOrderID"  readonly="readonly"><span class="copy" id="copyOrderBtn">复制</span></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">确定</div>
+                <div class="btn btn-onlinePayConfim" @click="hidePaymentConfirm">确定</div>
             </div>
         </div>
     </div>
@@ -135,6 +273,6 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/order.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/list.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/detail.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -54,7 +54,7 @@
                             </div>
                         </div>
                         <div class="header-button">
-                            <a class="btn-server" href="javascript: void(0);" target="_blank">搜索</a>
+                            <a class="btn-server" href="javascript: void(0);" target="_blank" @click="searchOrderListFn">搜索</a>
                         </div>
                     </div>
                 </div>
@@ -67,8 +67,8 @@
                     <div class="section" v-if="orderList.length > 0">
                         <div class="user-main order" v-for="(order, index) in orderList" :key="index">
                             <div class="order-title">
-                                <span class="bag" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">自主</span>
-                                <span class="bag" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">协销</span>
+                                <span class="bag" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</span>
+                                <span class="bag" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</span>
                                 <div class="title-name">
                                     <p>订单编号(标识)：<span>{{order.orderNo}}({{order.orderID}})</span></p>
                                     <p class="state">{{order.status | stateExp}}</p>
@@ -97,13 +97,13 @@
                                     <p>待付金额:<span class="red">￥{{order.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                                 <div class="order-botton">
+                                    <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order,order.orderID)">支付订单</a>
+                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="['0','111'].indexOf(order.status)!=-1" @click="hanldCancelOrderFn(order.orderID)">取消订单</a>
                                     <a class="btn primary" href="javascript: void(0);" v-if="['0'].indexOf(order.status)!=-1"  @click="hanldConfirmOrderFn(order.orderID)">确认订单</a>
                                     <a class="btn cancel" href="javascript: void(0);" v-if="['6'].indexOf(order.status)!=-1" @click="hanldDeleteOrderFn(order.orderID)">删除订单</a>
                             <!--    <a class="btn cancel" href="javascript: void(0);"  v-if="['4','5','12','13','33','22','23','32','77'].indexOf(order.status)!=-1" @click="hanldQueryExpressFn()">查看物流</a>-->
                                     <a class="btn primary" href="javascript: void(0);"  v-if="['33'].indexOf(order.status)!=-1" @click="hanldReceivingOrderFn(order.orderID)">确认收货</a>
-                                    <a class="btn cancel" href="javascript: void(0);" @click="hanldDetilsOrderFn(order.orderID)">订单详情</a>
-                                    <a class="btn primary" href="javascript: void(0);" v-if="['11','12','13','21','22','23','111'].indexOf(order.status)!=-1" @click="hanldPayOrderFn(order.orderID)">支付订单</a>
                                 </div>
                             </div>
                         </div>
@@ -134,47 +134,47 @@
     <!--余额可抵扣部分-->
     <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-title"> <p>提示</p> <i class="popup-close layui-layer-ico" @click="hidePaymentConfirm"></i></div>
             <div class="popup-content">
-                <p>您有采美余额<span id="partMonery">￥200.00</span>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<span id="partAmont">￥200.00</span></p>
+                <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="">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="">抵扣,继续付款</div>
+                <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-title"> <p>提示</p> <i class="popup-close layui-layer-ico" @click="hidePaymentConfirm"></i></div>
             <div class="popup-content">
-                <p>您有采美余额<span>￥200.00</span>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</p>
+                <p>您有采美余额<span>￥{{payModelData.ableUserMoney}}</span>暂未使用，是否需要抵扣订单？ 抵扣后订单支付完成</p>
             </div>
             <div class="popup-button">
-                <div class="btn btn-cancel" @click="">不抵扣,继续付款</div>
-                <div class="btn btn-confim" @click="">抵扣</div>
+                <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-title"> <p>提示</p> <i class="popup-close layui-layer-ico" @click="hidePaymentConfirm"></i></div>
             <div class="popup-content">
                 <p>您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解</p>
-                <p>待付金额: <span id="onlineMoney"></span></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>订单标识：<input id="paymentTransOrderID"  readonly="readonly"><span class="copy" id="copyOrderBtn">复制</span></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">确定</div>
+                <div class="btn btn-onlinePayConfim" @click="hidePaymentConfirm">确定</div>
             </div>
         </div>
     </div>