zhengjinyi преди 4 години
родител
ревизия
0d22a058eb
променени са 2 файла, в които са добавени 20 реда и са изтрити 12 реда
  1. 14 6
      src/main/resources/static/css/user-center/operation/form.css
  2. 6 6
      src/main/resources/templates/user-center/order/detail.html

+ 14 - 6
src/main/resources/static/css/user-center/operation/form.css

@@ -8,9 +8,9 @@ li{list-style:none}
     /*个人中心右侧*/
     .navLayout .right{float:right;width:968px}
     .order-header{width: 100%;height: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;}
-    .order-header .header-bt {width: 100%;height: 38px;float: left;}
-    .order-header .header-bt .header-title{width: 824px;height: 38px;float: left;line-height: 38px;font-size: 24px;color: #22272e;text-align: center;}
-    .order-header .header-bt .header-button{height: 38px;float: right;}
+    .order-header .header-bt {width: 100%;height: 38px;float: left;position: relative;}
+    .order-header .header-bt .header-title{width: 100%;height: 38px;float: left;line-height: 38px;font-size: 24px;color: #22272e;text-align: center;}
+    .order-header .header-bt .header-button{height: 38px;position: absolute;top: 0;right: 0;}
     .order-header .header-bt .header-button .btn-add{width: 90px;height: 36px;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;float: left;margin: 0 5px;}
     .container{width: 100%;height:526px;box-sizing: border-box;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding:32px 90px;}
     .container .form{float: left;width:220px;}
@@ -26,10 +26,18 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    .order-header{width: 100%;height: 16vw;box-sizing: border-box;padding:4vw;background-color: #FFF;}
+    .order-header .header-bt {width: 100%;height: 8vw;float: left;position: relative;}
+    .order-header .header-bt .header-title{width: 100%;height: 8vw;float: left;line-height:8vw;font-size:4vw;color: #22272e;text-align: center;}
+    .order-header .header-bt .header-button{height: 8vw;position: absolute;top: 0;right: 0;}
+    .order-header .header-bt .header-button .btn-add{width:12vw;height:8vw;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;float: left;margin: 0 5px;}
 
-
-
-
+    .container{width: 100%;box-sizing: border-box;padding:4vw}
+    .container .text{width: 100%;height: auto;float: left;}
+    .container .text p{font-size: 3.4vw;color: #22272e;text-align: left;line-height: 6vw;}
+    .container .button{width: 100%;height: 11vw;float: left;margin-top: 16px;}
+    .container .button a{display: block;width: 100%;height: 11vw;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;margin: 0 auto;text-align: center;line-height: 11vw;font-size:3.4vw;color: #FFFFFF;}
+    .container .button a.disabled{background-color: #999999;}
 
 
 }

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

@@ -66,12 +66,12 @@
                                 </div>
                                 <div class="order-item">
                                     <p>税费: <span>¥{{orderInfo.expensesOfTaxation | NumFormat}}</span> </p>
-                                    <p v-if="orderInfo.freePostFlag == '0'">运费:<span>包邮</span> </p>
-                                    <p v-if="orderInfo.freePostFlag == '-1'">运费:<span>到付</span> </p>
-                                    <p v-if="orderInfo.freePostFlag == '1'">运费:<span>¥{{orderInfo.freight | NumFormat}}</span> </p>
-                                    <p v-if="orderInfo.discountFee!=0">经理折扣:<span>¥{{orderInfo.discountFee | NumFormat}}</span> </p>
-                                    <p>促销满减:<span>¥{{orderInfo.promotionFullReduction | NumFormat}}</span> </p>
-                                    <p>赠品数:<span>{{orderInfo.presentCount}}</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.promotionFullReduction | NumFormat}}</span> </p>
+                                    <p>赠品数:<span class="none">{{orderInfo.presentCount}}</span></p>
                                 </div>
                             </div>
                         </div>