e 8 years ago
parent
commit
7029ef4ebc

+ 1 - 0
www/webapp/o2o/css/main.css

@@ -23,3 +23,4 @@
 @import url("./orderDetail.css");
 @import url("./beautician.css");
 @import url("./balanceLog.css");
+@import url("./recharge.css");

File diff suppressed because it is too large
+ 0 - 31
www/webapp/o2o/css/ratchetOverloading.css


+ 18 - 0
www/webapp/o2o/css/recharge.css

@@ -0,0 +1,18 @@
+.spa-page-recharge .btn-add-recharge{
+
+}
+
+.spa-page-recharge .rechange-input{
+
+}
+.spa-page-recharge .media{
+  width: 33.33%;
+  text-align: center;
+  padding: 15px;
+  font-size: 13px;
+  border:1px solid;
+}
+
+.spa-page-recharge .btn-add-recharge{
+  clear: both;
+}

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/css/main.css


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/main.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/page/balanceLog.js


File diff suppressed because it is too large
+ 3 - 3
www/webapp/o2o/js/build/template.js


+ 5 - 27
www/webapp/o2o/tpl/recharge/cell.html

@@ -1,29 +1,7 @@
-<!--
 {{ each recharges as recharge i }}
-<li class="table-view-cell media btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"
-    data-index="{{ i }}" style="margin: 10px">
-    <a class="address-item">
-        <div class="media-body">
-			<span class="denomination" style="font-size: 18px; color: rgb(233,233,216)">充值{{ recharge.denomination }}元</span>
-            <p class="detail" style="rgb(233,233,216)">
-                {{ if recharge.cash_back }}
-                返还{{ recharge.cash_back }}现金
-                {{ else if recharge.coupons }}
-                赠送价值{{ recharge.coupons }}元的优惠券
-                {{ /if }}
-            </p>
-        </div>
-    </a>
-    <button class="btn btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}" data-index="{{ i }}" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0px;">立即充值</button>
-</li>
-{{ /each }}-->
-
-
-
-{{ each recharges as recharge i }}
-<li class="media btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"
-    data-index="{{ i }}">
-    <div></div>
-    <span>立即充值>>></span>
-</li>
+    <li class="media" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"  data-index="{{ i }}">
+        <div>{{ recharge.desc }}</div>
+        <div>{{ rechange.denomination }}</div>
+    </li>
 {{ /each }}
+<!-- <input type="text" class="rechange-input" name="" value=""> -->

+ 12 - 3
www/webapp/o2o/tpl/recharge/index.html

@@ -12,9 +12,18 @@
             <div class="scroller">
                 <img class="ad-hide" src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1.jpg"
                      style="width: 100%;">
-                <ul class="ad-hide list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
-                    {{include './cell'}}
+                <ul class="ad-hide list-content list-recharge box" style="padding-top: 5px;padding-bottom: 5px">
+                  {{ each recharges as recharge i }}
+                      <li class="media" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"  data-index="{{ i }}">
+                          {{ if recharge.denomination === 1 }}
+                            <input type="text" name="" value="" class="rechange-input">
+                          {{ else }}
+                            <div>充值{{ recharge.denomination }}元</div>
+                          {{ /if }}
+                      </li>
+                  {{ /each }}
                 </ul>
+                <div class="btn-add-recharge">立即去充值</div>
                 <div class="ad-hide" style="text-align: center;"><span
                         style="font-size: 0.6rem">点击立即充值,即表示您已经同意壹管家</span><span
                         style="font-size: 0.6rem;font-weight: 600;display: block;"></span>
@@ -27,4 +36,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

Some files were not shown because too many files changed in this diff