dever 6 vuotta sitten
vanhempi
commit
59c6fbd0d1

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
service/assets/mobile/css/global.css


+ 1 - 1
service/assets/mobile/css/global.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=ecafd6c6","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=03efaf78","sourceRoot":""}

+ 1 - 1
service/assets/mobile/css/index.css

@@ -1,2 +1,2 @@
 .content{margin-bottom:1.0267rem;box-shadow:0 .04rem 0 #f3f3f3;padding-top:1.0267rem}.content .iphone,.content img{display:block;width:6.1333rem;height:10.12rem;margin:0 auto}.title{margin:0 .6667rem .4267rem;font-size:.48rem}.title,.txt{text-align:center}.txt{margin:0 .6667rem .5333rem;color:#999;font-size:.3467rem}
-/*# sourceMappingURL=index.css.map?v=ecafd6c6*/
+/*# sourceMappingURL=index.css.map?v=03efaf78*/

+ 1 - 1
service/assets/mobile/css/index.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=ecafd6c6","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=03efaf78","sourceRoot":""}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
service/assets/mobile/css/list.css


+ 1 - 1
service/assets/mobile/css/list.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/list.css?v=ecafd6c6","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/list.css?v=03efaf78","sourceRoot":""}

+ 1 - 1
service/assets/mobile/css/pay.css

@@ -1,2 +1,2 @@
 .container{padding:0 .4rem;-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.h1{font-size:.4rem;line-height:.64rem;padding:.6533rem 0}.list .item{height:1.3333rem;border-radius:.1333rem;border:.0267rem solid #000;margin-bottom:.4rem;box-sizing:border-box;padding:0 .4rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:.4rem;color:#000}.list .item.active{background-color:#cc1619;border-color:#cc1619;color:#fff}.buytip{font-size:.32rem;color:#999;text-align:center;text-decoration:underline;padding-bottom:.8rem}.p{text-align:justify;display:block;box-sizing:border-box}.layer .title,.p{font-size:.4rem;line-height:.64rem;margin-bottom:.4rem}.layer .title{text-align:center}.layer .richtext{margin-bottom:.5333rem}.layer .richtext img{max-width:100%}.layer .button{width:4rem}
-/*# sourceMappingURL=pay.css.map?v=ecafd6c6*/
+/*# sourceMappingURL=pay.css.map?v=03efaf78*/

+ 1 - 1
service/assets/mobile/css/pay.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/pay.css?v=ecafd6c6","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/pay.css?v=03efaf78","sourceRoot":""}

+ 2 - 2
service/assets/mobile/css/success.css

@@ -1,2 +1,2 @@
-.code{background:url(../images/code.png) no-repeat top #eee;background-size:4.8rem 4.8133rem;height:3.1067rem;padding-bottom:.533333rem;padding-top:1.7067rem;margin-bottom:.5333rem}.code img{width:2.7467rem;height:2.7467rem;display:block;margin:0 auto}.success{background:url(../images/success.png) no-repeat top;background-size:2.0667rem 1.5733rem;width:2.0667rem;height:1.5733rem;margin:0 auto .506667rem}.txt{margin:0 1.6rem .533333rem;font-size:.3733rem}.txt span{color:#d1171a}.download{margin-bottom:.333333rem;font-size:.373333rem;text-align:center}.download *{border-bottom:.026667rem solid #d1171a;color:#d1171a}.tip{margin-bottom:.5333rem;text-align:center;color:#999;font-size:.32rem}.read{margin-bottom:1.066667rem;position:relative;height:.9333rem}.read p{left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);background:url(../images/].png) no-repeat 100% 0;background-size:.2667rem .9333rem;padding:0 .4rem;color:#d1171a;font-size:.3733rem;line-height:.933333rem}.read p,.read P:before{position:absolute;top:0;height:.9333rem}.read P:before{left:0;background:url(../images/[.png) no-repeat 0 0;background-size:.2667rem .9333rem;padding-right:.4rem;content:""}.btn{margin:0 .6rem}.btn .button{float:right;width:4rem}.btn .button.opposite{float:left}
-/*# sourceMappingURL=success.css.map?v=ecafd6c6*/
+.code{background:url(../images/code.png) no-repeat top #eee;background-size:4.8rem 4.8133rem;height:4.533333rem;padding-bottom:.533333rem;padding-top:.2667rem;margin-bottom:.5333rem}.code p{height:.96rem;line-height:.96rem;margin-bottom:.2667rem;text-align:center;color:#fff;font-size:.4rem}.code img{width:2.7467rem;height:2.7467rem;display:block;margin:0 auto}.success{background:url(../images/success.png) no-repeat top;background-size:.786667rem .786667rem;width:.8rem;height:.8rem;margin:0 auto .506667rem}.txt{margin:0 1.6rem .533333rem;font-size:.3733rem}.txt span{color:#d1171a}.download{margin-bottom:.333333rem;font-size:.373333rem;text-align:center}.download *{border-bottom:.026667rem solid #d1171a;color:#d1171a}.tip{display:none;margin-bottom:.5333rem;text-align:center;color:#999;font-size:.32rem}.read{margin-bottom:1.066667rem;position:relative;height:.9333rem}.read p{left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);background:url(../images/].png) no-repeat 100% 0;background-size:.2667rem .9333rem;padding:0 .4rem;color:#d1171a;font-size:.3733rem;line-height:.933333rem}.read p,.read P:before{position:absolute;top:0;height:.9333rem}.read P:before{left:0;background:url(../images/[.png) no-repeat 0 0;background-size:.2667rem .9333rem;padding-right:.4rem;content:""}.btn{margin:0 .6rem}.btn .button{float:right;width:4rem}.btn .button.opposite{float:left}.btn .button span{position:absolute;opacity:0}
+/*# sourceMappingURL=success.css.map?v=03efaf78*/

+ 1 - 1
service/assets/mobile/css/success.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/success.css?v=ecafd6c6","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/success.css?v=03efaf78","sourceRoot":""}

+ 9 - 2
service/assets/mobile/success.html

@@ -9,6 +9,7 @@
 
 <body>
     <div class="code">
+        <p>JSTYLE精美电子刊</p>
         <img class="default" src="images/code.jpg" alt="">
     </div>
     <div class="success" ></div>
@@ -22,8 +23,14 @@
     </div>
     <div class="btn clearfix">
         <a class="button opposite" href="#">查看全部</a>
-        <a class="button" href="#">继续购买<span></span></a>
+        <button class="button" href="#" node-id="copy">继续购买<span></span></button>
     </div>
 <script type="text/javascript" src="js/global.js?v=0b04b240"></script><script type="text/javascript" src="js/success.js?v=0b04b240"></script></body>
 
-</html>
+</html>
+
+<script>
+$('[node-id="refresh"]').on("touchend",function(){
+    location.reload();
+});
+</script>

+ 8 - 3
service/src/Buy.php

@@ -131,11 +131,16 @@ class Buy extends Base
             $config['button_node'] = 'copy';
             $config['button_span'] = $order['code'];
             if (!$order['code']) {
-                $order['code'] = '生成中';
+                $order['code'] = '生成中...';
                 $config['reload'] = 2;
-                $this->location('success', array('id' => $id, 'buy' => $buy_id, 'order_id' => $order_id));
+                $config['button_node'] = 'refresh';
+                $config['button_span'] = '';
+                $config['button'] = '刷新';
+                //$this->location('success', array('id' => $id, 'buy' => $buy_id, 'order_id' => $order_id));
+            } else {
+                $config['button'] = '复制兑换码';
             }
-            $config['button'] = '复制兑换码';
+            
             $config['code'] = '<p>兑换码:'.$order['code'].'</p>';
             
         }

+ 2 - 0
service/template/mobile/success.php

@@ -10,6 +10,8 @@ $view
 
 ->fetch(array('span', 0), 'service/buy.success#service_text')
 
+->fetch(array('p', 0), 'service/buy.success#service_text')
+
 ->fetch('.opposite@href', 'service/buy.success#list')
 
 ->fetch(array('.button@href', 1), 'service/buy.success#buy')

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä