git-user-info

@@ -30,13 +30,13 @@ $('.nav-back').on('touchend', function() {
             {
             {
                 href: '/',
                 href: '/',
                 text: '放弃',
                 text: '放弃',
-                class: '',
+                class: ''
             },
             },
             {
             {
-                href: '/',
+                href: '',
                 text: '马上支付',
                 text: '马上支付',
-                class: 'order-tip-btnred',
-            },
+                class: 'order-tip-btnred'
+            }
         ]
         ]
     );
     );
 });
 });

@@ -35,20 +35,32 @@ function show(con, btn) {
         });
         });
     }
     }
 
 
-    if (btn && $.isArray(btn)) {
-        if (btn.length === 1) {
+    if (btn && $.isArray(btn) && btn.length === 1) {
+        if (!btn[0].href) {
+            buttons += '<a class="order-tip-btn1 ' + btn[0].class
+                + '"><span>' + btn[0].text
+                + '</span></a>';
+        } else {
             buttons += '<a href="' + btn[0].href
             buttons += '<a href="' + btn[0].href
                 + '" class="order-tip-btn1 ' + btn[0].class
                 + '" class="order-tip-btn1 ' + btn[0].class
                 + '"><span>' + btn[0].text
                 + '"><span>' + btn[0].text
                 + '</span></a>';
                 + '</span></a>';
-        } else {
+        }
+    }
+
+    if (btn && $.isArray(btn) && btn.length > 1) {
          $.each(btn, function(key, value) {
          $.each(btn, function(key, value) {
+             if (!value.href) {
+                 buttons += '<a class="' + value.class
+                     + '"><span>' + value.text
+                     + '</span></a>';
+             } else {
                  buttons += '<a href="' + value.href
                  buttons += '<a href="' + value.href
                      + '" class="' + value.class
                      + '" class="' + value.class
                      + '"><span>' + value.text
                      + '"><span>' + value.text
                      + '</span></a>';
                      + '</span></a>';
-            });
              }
              }
+        });
     }
     }
     
     
     $tipMsg.html(content);
     $tipMsg.html(content);

@@ -605,21 +605,21 @@ class IndexController extends AbstractAction
     public function orderSubAction()
     public function orderSubAction()
     {
     {
         /* TODO TAR DELETE THIS !!! */
         /* TODO TAR DELETE THIS !!! */
-       /* $this->echoJson(array(
-            'code' => 409,
-            'msg' => array('XXX 商品已被抢光，', '继续结算剩余商品。'),
-            'btns' => array(
-                // array(
-                //     'href' => '/',
-                //     'text' => '重新选择商品',
-                //     'color' => '',
-                // ), 
-                array(
-                    'href' => '#',
-                    'text' => '知道了',
-                    'class' => 'order-tip-btnred'
-                )),
-        ));exit;*/
+//       $this->echoJson(array(
+//            'code' => 409,
+//            'msg' => array('XXX 商品已被抢光，', '继续结算剩余商品。'),
+//            'btns' => array(
+//                // array(
+//                //     'href' => '/',
+//                //     'text' => '重新选择商品',
+//                //     'color' => '',
+//                // ),
+//                array(
+//                    'href' => '',
+//                    'text' => '知道了',
+//                    'class' => 'order-tip-btnred'
+//                )),
+//        ));exit;
         if ($this->isAjax()) {
         if ($this->isAjax()) {
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             $addressId = $this->post('addressId', null);
             $addressId = $this->post('addressId', null);