yangc 8 лет назад
Родитель
Сommit
79938259bc

+ 39 - 3
src/main/webapp/resources/css/pinganPay/pinganPay.css

@@ -12,18 +12,18 @@
 .pingan-pay {
     background-color: #f5f8fe;
 }
-.pingan-pay .pay-recharge-header {
+.pingan-pay .pingan-pay-header {
     background-color: #fff;
     border: 1px solid #4290f7;
     margin-bottom: 18px;
 }
-.pingan-pay .pay-recharge-header p{
+.pingan-pay .pingan-pay-header p{
     height: 36px;
     line-height: 36px;
     margin: 0 0 0 87px;
     font-size: 14px;
 }
-.pingan-pay .pay-recharge-header p .green-text {
+.pingan-pay .pingan-pay-header p .green-text {
     color: #21bf01;
     font-weight: bold;
 }
@@ -60,4 +60,40 @@
     color: #ff8522;
     font-size: 18px;
     margin-right: 10px;
+}
+
+.pingan-pay .pingan-pay-content {
+    background-color: #fff;
+    border: 1px solid #4290f7;
+    padding: 49px 75px 0;
+}
+.pingan-pay .pingan-pay-content .pingan-pay-items {
+    font-size: 14px;
+}
+.pingan-pay .pingan-pay-content .pingan-pay-items >span {
+    margin-left: 14px;
+    font-size: 16px;
+}
+.pingan-pay .pingan-pay-content .pingan-pay-items >a{
+    display: inline-block;
+    width: 139px;
+    height: 42px;
+    line-height: 42px;
+    border: 1px solid #e5e5e5;
+    margin-right: 38px;
+    border-radius: 3px;
+}
+.pingan-pay .pingan-pay-content .pingan-pay-items >a.active {
+    border: 1px solid #ff8522;
+    background: #fdf9f6;
+}
+.pingan-pay .pingan-pay-content .pingan-pay-items >a img {
+    margin-left: 9px;
+    max-height: 29px;
+    max-width: 42px;
+}
+.pingan-pay .pingan-pay-content .pingan-pay-items >a span {
+    color: #333;
+    float: right;
+    margin-right: 12px;
 }

BIN
src/main/webapp/resources/img/pingan/card-lg.png


+ 5 - 0
src/main/webapp/resources/js/pinganPay/app.js

@@ -33,6 +33,11 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 			templateUrl: 'static/view/pinganPay/forstore/bindCard.html',
 			controllerUrl: 'app/controllers/forstore/bind_card_ctrl',
 			controller: 'bindCardCtrl'
+		})).state('withdraw', angularAMD.route({
+			url: '/withdraw',
+			templateUrl: 'static/view/pinganPay/forstore/withdraw.html',
+			controllerUrl: 'app/controllers/forstore/withdraw_ctrl',
+			controller: 'withdrawCtrl'
 		}));
 	}]);
 

+ 6 - 0
src/main/webapp/resources/js/pinganPay/controllers/forstore/withdraw_ctrl.js

@@ -0,0 +1,6 @@
+define([ 'app/app' ], function(app) {
+    'use strict';
+    app.register.controller('withdrawCtrl', ['$scope', '$rootScope', 'toaster', function ($scope, $rootScope, toaster ) {
+    }]);
+
+});

+ 3 - 37
src/main/webapp/resources/view/pinganPay/forstore/recharge.html

@@ -1,38 +1,4 @@
 <style>
-    .pay-recharge .pay-recharge-content {
-        background-color: #fff;
-        border: 1px solid #4290f7;
-        padding: 49px 75px 0;
-    }
-    .pay-recharge .pay-recharge-content .pay-recharge-items {
-        font-size: 14px;
-    }
-    .pay-recharge .pay-recharge-content .pay-recharge-items >span {
-        margin-left: 14px;
-    }
-    .pay-recharge .pay-recharge-content .pay-recharge-items >a{
-        display: inline-block;
-        width: 139px;
-        height: 42px;
-        line-height: 42px;
-        border: 1px solid #e5e5e5;
-        margin-right: 38px;
-        border-radius: 3px;
-    }
-    .pay-recharge .pay-recharge-content .pay-recharge-items >a.active {
-        border: 1px solid #ff8522;
-        background: #fdf9f6;
-    }
-    .pay-recharge .pay-recharge-content .pay-recharge-items >a img {
-        margin-left: 9px;
-        max-height: 29px;
-        max-width: 42px;
-    }
-    .pay-recharge .pay-recharge-content .pay-recharge-items >a span {
-        color: #333;
-        float: right;
-        margin-right: 12px;
-    }
     .pay-recharge .pay-recharge-content .pay-recharge-input,
     .pay-recharge .pay-recharge-content .pay-recharge-card{
         margin-top: 20px;
@@ -348,12 +314,12 @@
     /* 第二步 end */
 </style>
 <div class="pay-recharge pingan-pay">
-    <div class="pay-recharge-header">
+    <div class="pingan-pay-header">
         <p>账户:<span>深圳市优软科技有限公司</span>&nbsp;&nbsp;哈哈哈</p>
         <p>账户余额:<span class="green-text">56.63</span>&nbsp;元</p>
     </div>
-    <div class="pay-recharge-content" ng-if="step == 1">
-        <div class="pay-recharge-items">
+    <div class="pay-recharge-content pingan-pay-content" ng-if="step == 1">
+        <div class="pingan-pay-items">
             <span>充值方式:</span>
             <a href="javascript:void(0)" ng-class="{'active': rechargeType == 'wechat'}" ng-click="setRechargeType('wechat')">
                 <img src="static/img/pingan/wechat.png" alt="">

+ 47 - 0
src/main/webapp/resources/view/pinganPay/forstore/withdraw.html

@@ -0,0 +1,47 @@
+<style>
+    .pay-withdraw .pay-withdraw-content {
+        background: #fff;
+        padding: 39px 75px;
+        border: 1px solid #4290f7;
+    }
+   /* .pay-withdraw .pay-withdraw-content > p {
+        padding-left: 14px;
+    }
+    .pay-withdraw .pay-withdraw-content > p > span {
+        font-size: 16px;
+        margin-right: 28px;
+    }
+    .pay-withdraw .pay-withdraw-content > p > a {
+        display: inline-block;
+        width: 139px;
+        height: 42px;
+        line-height: 42px;
+        border: 1px solid #ff8522;
+        border-radius: 3px;
+    }
+    .pay-withdraw .pay-withdraw-content > p > a img {
+        margin-left: 12px;
+    }
+    .pay-withdraw .pay-withdraw-content > p > a span {
+        font-size: 14px;
+        color: #333;
+        display: inline-block;
+        width: 90px;
+        text-align: center;
+    }*/
+</style>
+<div class="pay-withdraw pingan-pay">
+    <div class="pingan-pay-header">
+        <p>账户:<span>深圳市优软科技有限公司</span>&nbsp;&nbsp;哈哈哈</p>
+        <p>账户余额:<span class="green-text">56.63</span>&nbsp;元</p>
+    </div>
+    <div class="pay-withdraw-content pingan-pay-content">
+        <div class="pingan-pay-items">
+            <span>提现到银行卡:</span>
+            <a href="javascript:void(0)" ng-class="{'active': rechargeType == 'netbank'}" ng-click="setRechargeType('netbank')">
+                <img src="static/img/pingan/netbank.png" alt="">
+                <span>银行卡</span>
+            </a>
+        </div>
+    </div>
+</div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -839,7 +839,7 @@
 						</div>
 						<div class="wallet-options">
 							<a href="pingan_pay#/recharge" target="_blank">充值</a>
-							<a>提现</a>
+							<a href="pingan_pay#/withdraw" target="_blank">提现</a>
 							<span>查看</span>
 						</div>
 					</div>
@@ -859,7 +859,7 @@
 								**&nbsp;&nbsp;<span>5623</span>
 							</div>
 							<div>
-								<a>+&nbsp;新增</a>
+								<a href="pingan_pay#/bind_card" target="_blank">+&nbsp;新增</a>
 							</div>
 						</div>
 						<a>管理</a>