app和wx按钮样式统一

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/pay_order.css

@@ -8,7 +8,7 @@
 }
 
 #pay_order {
-  padding-bottom: 2.7rem;
+  padding-bottom: 3.5rem;
   font-size: .24rem !important;
 	background: rgba(245,244,249,1);
 	margin-top: 20px;
@@ -305,7 +305,7 @@ letter-spacing: 0.02rem;
           transform: scale(0.8);
 }
 #pay_order   .radio-form .read {
-  font-size: .26rem;
+  font-size: .24rem;
 }
 #pay_order   .radio-form .read a {
   color: #2cb7ca;
@@ -322,18 +322,47 @@ letter-spacing: 0.02rem;
           align-items: center;
   -webkit-box-pack: end;
       -ms-flex-pack: end;
-          justify-content: flex-end;
-  padding: .12rem .12rem;
+          justify-content: space-between;
+  height: .96rem;
+  padding: 0 .32rem;
 }
-#pay_order   .price span {
-  text-decoration: line-through;
+#pay_order .price .totalnum{
+  display: flex;
+  align-items: flex-start;
+  padding-top: 0.1rem;
+  height: 100%;
   font-size: .26rem;
-  color: #888;
+  color: #9B9CA3;
+  font-weight: 500;
+}
+#pay_order .price .pricenum{
+  display: flex;
+  flex-direction: column-reverse;
+}
+#pay_order   .price .pricenum .pay_bef {
+  color: #9B9CA3;
+  font-weight: 500;
+  font-size: .24rem;
+  margin-right: .18rem;
+}
+#pay_order   .price .pricenum .pay_bef .pay_before {
+  text-decoration: line-through;
+}
+#pay_order   .price .pricenum .pay_dis {
+  text-align: end;
+  color: #FB483D;
   margin-right: .18rem;
 }
-#pay_order  .price strong {
+#pay_order   .price .pricenum .pay_dis .bef_text{
+  font-size: .32rem;
+}
+#pay_order  .price .pay_discount {
   font-size: .4rem;
-  color: #1d1d1d;
+  color: #FB483D;
+  font-weight: 500;
+}
+.weui-cells:before{
+  border-top: 0;
 }
 #pay_order  .form-btn {
   display: -webkit-box;
@@ -342,7 +371,7 @@ letter-spacing: 0.02rem;
   -webkit-box-align: center;
       -ms-flex-align: center;
           align-items: center;
-	border-top:1px solid #e0e0e0;
+	/* border-top:1px solid #e0e0e0; */
 }
 #pay_order  .form-btn .btn {
   -webkit-box-flex: 1;

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -154,6 +154,21 @@
             </div>
         </main>
         <div class="fixed-bottom-box" id="bottombox">
+            <div class="price">
+                <div class="totalnum">
+                    合计：
+                </div>
+                <div class="pricenum">
+                    <div class="pay_bef">
+                        <span>原价：￥</span>
+                        <span class="pay_before"></span>
+                    </div>
+                    <div class="pay_dis">
+                        <span class="bef_text">￥</span>
+                        <strong class="pay_discount"></strong>
+                    </div>
+                </div>
+            </div>
             <div class="weui-cells weui-cells_checkbox radio-form">
                 <label class="weui-cell weui-check__label" for="s11">
                     <div class="weui-cell__hd">
@@ -165,10 +180,6 @@
                     </div>
                 </label>
             </div>
-            <div class="price">
-                <span class="pay_before"></span>
-                <strong class="pay_discount"></strong>
-            </div>
             <div class="form-btn j-button-group">
                 <button class="btn prew dataPreview j-button-cancel1" style="line-height: normal;">预览数据</button>
                 <button class="btn enter toPay j-button-confirm1" style="line-height: normal;" disabled="disabled">确认支付</button>
@@ -298,8 +309,8 @@
         }
         shouldPay = shouldPay > orderMinPrice ? shouldPay : orderMinPrice;
         beforePay = beforePay > orderMinPrice ? beforePay : orderMinPrice;
-        $(".pay_discount").text("￥" + shouldPay);
-        $(".pay_before").text("￥" + beforePay)
+        $(".pay_discount").text(shouldPay);
+        $(".pay_before").text(beforePay)
     }
 
     //

src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -269,7 +269,7 @@
   display: flex;
   align-items: center;
   padding: 0.18rem 0.3rem;
-  border-bottom: 1px solid #cecece;
+  /* border-bottom: 1px solid #cecece; */
 }
 
 .vip-footer .footer-preview-container .clause-box a {
@@ -280,11 +280,20 @@
   display: flex;
   align-items: center;
   padding: 0 0.3rem;
-  height: 0.94rem;
+  height: 0.76rem;
   font-size: 0.26rem;
   color: #686868;
 }
 
+.vip-footer .footer-preview-container .preview-content .billing-list-btn {
+  color: #9B9CA3;
+}
+
+.vip-footer .footer-preview-container .preview-content .billing-mon {
+  font-size: 0.32rem;
+  color: #FB483D;
+}
+
 .vip-footer .footer-preview-container .preview-content {
   flex: 1;
   display: flex;
@@ -298,7 +307,7 @@
 
 .vip-footer .footer-preview-container .preview-content .billing-price {
   font-size: 0.4rem;
-  color: #1d1d1d;
+  color: #FB483D;
 }
 
 .vip-footer .footer-button-group {

src/web/staticres/vipsubscribe/css/vip_renew.css

@@ -124,7 +124,7 @@
     display: flex;
     align-items: center;
     padding: 0.18rem 0.3rem;
-    border-bottom: 1px solid #cecece;
+    /* border-bottom: 1px solid #cecece; */
 }
 
 .vip-footer .footer-preview-container .clause-box a {
@@ -135,7 +135,7 @@
     display: flex;
     align-items: center;
     padding: 0 0.3rem;
-    height: 0.94rem;
+    height: 0.76rem;
     font-size: 0.26rem;
     color: #686868;
 }
@@ -148,12 +148,17 @@
 }
 
 .vip-footer .footer-preview-container .preview-content .billing-list-btn {
-    color: #2cb7ca;
+    color: #9B9CA3;
+}
+
+.vip-footer .footer-preview-container .preview-content .billing-mon {
+    font-size: 0.32rem;
+    color: #FB483D;
 }
 
 .vip-footer .footer-preview-container .preview-content .billing-price {
     font-size: 0.4rem;
-    color: #1d1d1d;
+    color: #FB483D;
 }
 
 .vip-footer .footer-button-group {

src/web/staticres/wx_dataExport/css/pay_order.css

@@ -8,7 +8,7 @@
 }
 
 #pay_order {
-  	padding-bottom: 2.7rem;
+  	padding-bottom: 3.5rem;
     font-size: .24rem !important;
 		background: rgba(245,244,249,1);
 }
@@ -293,7 +293,7 @@ letter-spacing: 0.02rem;
 }
 #pay_order  .radio-form {
   background: transparent;
-  padding: .12rem .12rem;
+  padding: .12rem .32rem;
   border: 0;
   margin: 0;
 }
@@ -305,7 +305,7 @@ letter-spacing: 0.02rem;
           transform: scale(0.8);
 }
 #pay_order .radio-form .read {
-  font-size: .26rem;
+  font-size: .24rem;
 }
 #pay_order.radio-form .read a {
   color: #2cb7ca;
@@ -322,18 +322,47 @@ letter-spacing: 0.02rem;
           align-items: center;
   -webkit-box-pack: end;
       -ms-flex-pack: end;
-          justify-content: flex-end;
-  padding: .12rem .12rem;
+          justify-content: space-between;
+  height: .96rem;
+  padding: 0 .32rem;
 }
-#pay_order  .price span {
-  text-decoration: line-through;
+#pay_order .price .totalnum{
+  display: flex;
+  align-items: flex-start;
+  padding-top: 0.1rem;
+  height: 100%;
   font-size: .26rem;
-  color: #888;
+  color: #9B9CA3;
+  font-weight: 500;
+}
+#pay_order .price .pricenum{
+  display: flex;
+  flex-direction: column-reverse;
+}
+#pay_order   .price .pricenum .pay_bef {
+  color: #9B9CA3;
+  font-weight: 500;
+  font-size: .24rem;
+  margin-right: .18rem;
+}
+#pay_order   .price .pricenum .pay_bef .pay_before {
+  text-decoration: line-through;
+}
+#pay_order   .price .pricenum .pay_dis {
+  text-align: end;
+  color: #FB483D;
   margin-right: .18rem;
 }
-#pay_order  .price strong {
+#pay_order   .price .pricenum .pay_dis .bef_text{
+  font-size: .32rem;
+}
+#pay_order  .price .pay_discount {
   font-size: .4rem;
-  color: #1d1d1d;
+  color: #FB483D;
+  font-weight: 500;
+}
+.weui-cells:before{
+  border-top: 0;
 }
 #pay_order  .form-btn {
   display: -webkit-box;
@@ -342,7 +371,7 @@ letter-spacing: 0.02rem;
   -webkit-box-align: center;
       -ms-flex-align: center;
           align-items: center;
-	border-top:1px solid #e0e0e0;
+	/* border-top:1px solid #e0e0e0; */
 }
 #pay_order  .form-btn .btn {
   -webkit-box-flex: 1;

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -172,6 +172,21 @@
         </div>
     </main>
     <div class="fixed-bottom-box" id="bottombox">
+        <div class="price">
+            <div class="totalnum">
+                合计：
+            </div>
+            <div class="pricenum">
+                <div class="pay_bef">
+                    <span>原价：￥</span>
+                    <span class="pay_before"></span>
+                </div>
+                <div class="pay_dis">
+                    <span class="bef_text">￥</span>
+                    <strong class="pay_discount"></strong>
+                </div>
+            </div>
+        </div>
         <div class="weui-cells weui-cells_checkbox radio-form">
             <label class="weui-cell weui-check__label" for="s11">
                 <div class="weui-cell__hd">
@@ -183,10 +198,6 @@
                 </div>
             </label>
         </div>
-        <div class="price">
-            <span class="pay_before"></span>
-            <strong class="pay_discount"></strong>
-        </div>
         <div class="form-btn j-button-group">
             <button class="btn prew dataPreview j-button-cancel" style="flex:none;line-height: normal;">预览数据</button>
             <button class="btn enter toPay j-button-confirm" style="flex:none;line-height: normal;" disabled="disabled">确认支付</button>
@@ -859,8 +870,8 @@
         }
         shouldPay = shouldPay > orderMinPrice ? shouldPay : orderMinPrice;
         beforePay = beforePay > orderMinPrice ? beforePay : orderMinPrice;
-        $(".pay_discount").text("￥" + shouldPay);
-        $(".pay_before").text("￥" + beforePay)
+        $(".pay_discount").text(shouldPay);
+        $(".pay_before").text(beforePay)
     }
 
     //

src/web/templates/weixin/vipsubscribe/change_area.html

@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/change_area.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
     <style>
         #choose_area .select-area-box .tab .province .checkbox[disabled] {
             background-color: #E0E0E0;
@@ -371,9 +372,9 @@
         </div>
     </div>
     <div class="tips_btn">
-        <div class="btns">
-            <button class="reset-btn" id="cancel">重置</button>
-            <button class="save-btn" id="enter">确认</button>
+        <div class="btns j-button-group">
+            <button class="reset-btn j-button-cancel1" id="cancel">重置</button>
+            <button class="save-btn j-button-confirm1" id="enter">确认</button>
         </div>
     </div>
     <div class="slide">

src/web/templates/weixin/vipsubscribe/change_industry.html

@@ -12,6 +12,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/change_industry.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
     <style>
         html, body, main {
             height: 100%;
@@ -253,9 +254,9 @@
         <a href="javascript:;">Z</a>
     </div>
     <div class="tips_btn">
-        <div class="btns">
-            <button class="reset-btn">重置</button>
-            <button class="save-btn">确认</button>
+        <div class="btns j-button-group">
+            <button class="reset-btn j-button-cancel1">重置</button>
+            <button class="save-btn j-button-confirm1">确认</button>
         </div>
     </div>
 </main>

src/web/templates/weixin/vipsubscribe/change_time.html

@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/change_time.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
 </head>
 
 <body>
@@ -75,9 +76,9 @@
         </ul>
     </div>
     <div class="tips_btn">
-        <div class="btns">
-            <button class="reset-btn" id="cancel">取消</button>
-            <button class="save-btn" id="enter">确认</button>
+        <div class="btns j-button-group">
+            <button class="reset-btn j-button-cancel1" id="cancel">取消</button>
+            <button class="save-btn j-button-confirm1" id="enter">确认</button>
         </div>
     </div>
 </div>

src/web/templates/weixin/vipsubscribe/choose_area.html

@@ -13,6 +13,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
 </head>
 
 <body style="height: 100%">
@@ -357,9 +358,9 @@
             <div class="tips_d_money" style="display: none">&yen;38</div>
             <!--<div class="tips_d_text">已选择4个市，建议购买“全省”更划算哦~</div>-->
         </div>
-        <div class="btns">
-            <button class="reset-btn" disabled>重置</button>
-            <button class="save-btn" disabled>确认</button>
+        <div class="btns j-button-group">
+            <button class="reset-btn j-button-cancel1" disabled>重置</button>
+            <button class="save-btn j-button-confirm1" disabled>确认</button>
         </div>
     </div>
     <div class="slide">

src/web/templates/weixin/vipsubscribe/choose_industry.html

@@ -12,6 +12,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
 </head>
 <body>
 <main class="choose_industry main">
@@ -241,9 +242,9 @@
             <div class="tips_d_money" style="display: none">&yen;38</div>
             <!--<div class="tips_d_text">已选择4个行业，建议购买“全部行业”更划算哦~</div>-->
         </div>
-        <div class="btns">
-            <button class="reset-btn" disabled>重置</button>
-            <button class="save-btn" disabled>确认</button>
+        <div class="btns j-button-group">
+            <button class="reset-btn j-button-cancel1" disabled>重置</button>
+            <button class="save-btn j-button-confirm1" disabled>确认</button>
         </div>
     </div>
 </main>

src/web/templates/weixin/vipsubscribe/messageType.html

@@ -10,6 +10,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/messageType.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <style type="text/css">
@@ -92,9 +93,9 @@
         </ul>
     </div>
 
-    <div class="resetOne">
-        <button class="reset">重置</button>
-        <button class="sure">确认</button>
+    <div class="resetOne j-button-group">
+        <button class="reset j-button-cancel1">重置</button>
+        <button class="sure j-button-confirm1">确认</button>
     </div>
 
 </div>

src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
     <style>
         .jy-switch:before {
             background-color: #fbfbfb;
@@ -215,28 +216,31 @@
     <!-- 升级 -->
     <div class="vip-footer upgrade">
         <div class="footer-preview-container">
-            <div class="clause-box">
-                <span class="checkbox"></span>
-                <span class="clause-read" style="flex: 1">我已阅读，理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
-            </div>
             <div class="price-preview">
                 <span class="preview-label">价格：</span>
                 <span class="preview-content">
                         <span class="billing-list-btn"></span>
-                        <span class="billing-price">￥366.50</span>
+                        <div class="billing-list-price">
+                            <span class="billing-mon">￥</span>
+                            <span class="billing-price">366.50</span>
+                        </div>
                     </span>
             </div>
+            <div class="clause-box">
+                <span class="checkbox"></span>
+                <span class="clause-read" style="flex: 1">我已阅读，理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
+            </div>
         </div>
-        <div class="footer-button-group">
-            <button class="button-l reset">取消</button>
-            <button class="button-r confirm" disabled>立即升级</button>
+        <div class="footer-button-group j-button-group">
+            <button class="button-l reset j-button-cancel1">取消</button>
+            <button class="button-r confirm j-button-confirm1" disabled>立即升级</button>
         </div>
     </div>
     <!-- 修改 -->
     <div class="vip-footer modify">
-        <div class="footer-button-group">
-            <button class="button-l reset">取消</button>
-            <button class="button-r confirm">保存修改</button>
+        <div class="footer-button-group j-button-group">
+            <button class="button-l reset j-button-cancel1">取消</button>
+            <button class="button-r confirm j-button-confirm1">保存修改</button>
         </div>
     </div>
 </div>

src/web/templates/weixin/vipsubscribe/vip_renew.html

@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base2.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/vip_renew.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}5">
     <style>
         .vip-header {
             display: none;
@@ -105,21 +106,24 @@
     </ul>
     <div class="vip-footer renew">
         <div class="footer-preview-container">
-            <div class="clause-box">
-                <span class="checkbox"></span>
-                <span class="clause-read">我已阅读，理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
-            </div>
             <div class="price-preview">
                 <span class="preview-label"></span>
                 <span class="preview-content">
-                        <span class="billing-list-btn"></span>
-                        <span class="billing-price"></span>
+                        <span class="billing-list-btn">合计：</span>
+                        <div class="billing-list-price">
+                            <span class="billing-mon">￥</span>
+                            <span class="billing-price"></span>
+                        </div>
                     </span>
             </div>
+            <div class="clause-box">
+                <span class="checkbox"></span>
+                <span class="clause-read">我已阅读，理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
+            </div>
         </div>
-        <div class="footer-button-group">
+        <div class="footer-button-group j-footer">
             <!--<button class="button-l reset">取消</button>-->
-            <button class="button-r confirm" disabled>确认支付</button>
+            <button class="button-r confirm j-button" disabled>确认支付</button>
         </div>
     </div>
 </div>
@@ -489,12 +493,12 @@
             var price = getsubVipOrderPriceBybuyset(this.nowBuyset, time);
             var showPrice = formatMoney(price);
             if (flag === 1) {
-                $('.billing-price').text('￥' + showPrice);
+                $('.billing-price').text(showPrice);
             } else if (flag === 2) {
-                $('.computed_price').html('￥' + showPrice);
+                $('.computed_price').html(showPrice);
             } else {
-                $('.billing-price').text('￥' + showPrice);
-                $('.computed_price').html('￥' + showPrice);
+                $('.billing-price').text(showPrice);
+                $('.computed_price').html(showPrice);
             }
             this.flushSelectTime(time, flag === undefined ? 1 : flag);
         },