m

@@ -90,6 +90,7 @@
                         <ul class="table table-group">
                             <li class="pre-sell-box tr" {{#if pid}}data-pid="{{pid}}"{{/if}} {{#if id}}data-id="{{id}}"{{/if}} {{#if skn}}data-skn="{{skn}}"{{/if}} {{#if sku}}data-sku="{{sku}}"{{/if}} {{#if productNum}}data-productnum="{{productNum}}"{{/if}} {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}}>
                                 <div class="td pay-pro" style="width: 45%;">
+                                  <sub class="out-of-stock">您勾选的商品库存不足</sub>
                                   <input class="cart-item-check cart-item-checked" readonly="readonly" data-goodstype="{{goodsType}}"  {{#if isChecked}}checked{{/if}}/>
                                   <a class="pay-pro-icon" href="{{link}}" target="_blank">
                                     <img src="{{imgCover}}">
@@ -556,11 +557,11 @@
                     </div>
 
                     <!-- 失效 -->
-                    <div class="cart-table cart-table-disabled">
+                    <div class="cart-table">
                     <ul class="table">
-                      <li class="pre-sell-box tr" {{#if pid}}data-pid="{{pid}}"{{/if}} {{#if id}}data-id="{{id}}"{{/if}} {{#if skn}}data-skn="{{skn}}"{{/if}} {{#if sku}}data-sku="{{sku}}"{{/if}} {{#if productNum}}data-productnum="{{productNum}}"{{/if}} {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}}>
+                      <li class="pre-sell-box tr tr-disabled" {{#if pid}}data-pid="{{pid}}"{{/if}} {{#if id}}data-id="{{id}}"{{/if}} {{#if skn}}data-skn="{{skn}}"{{/if}} {{#if sku}}data-sku="{{sku}}"{{/if}} {{#if productNum}}data-productnum="{{productNum}}"{{/if}} {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}}>
                         <div class="pay-pro td" style="width: 45%;">
-                          <input class="cart-item-disabled" readonly="readonly"/>
+                          <del class="cart-item-disabled">失效</del>
                           <a class="pay-pro-icon" href="{{link}}" target="_blank">
                             <img src="{{imgCover}}">
                             <span class="incentive">预售</span>

@@ -1019,3 +1019,13 @@ $goodsSelWin.on('click', '[data-role=colors] .color', GoodsWinAction.selColor);
 $goodsSelWin.on('click', '[data-role=sizes] .size-row span', GoodsWinAction.selSize);
 $goodsSelWin.on('click', '.cut, .add', GoodsWinAction.changeNum);
 $goodsSelWin.on('click', '.addcart', GoodsWinAction.add2Cart);
+
+
+Array.prototype.method = function(){
+    console.log(this.length);
+}
+var myArray = [1,2,4,5,6,7];
+myArray.name="数组";
+for (var index in myArray) {
+    console.log(myArray[index]);
+}
\ No newline at end of file

@@ -617,11 +617,6 @@ $('.shop-cart').on('click', '[data-role="cart-gift-win"] .close', function() {
     $(this).closest('[data-role="cart-gift-win"]').hide();
 });
 
-<<<<<<< HEAD
-require('./cart-action');
 
-
-=======
 // require('./cart-action');
 require('./cart-goods-win');
->>>>>>> d625bda7832219cc33b358719ed7fcfbda90bd0f

@@ -466,12 +466,6 @@
         &:not(last-child){
             margin-top:-1px;
         }
-        &.cart-table-disabled{
-            filter: alpha(opacity = 50);
-            -moz-opacity: 0.5;
-            -khtml-opacity: 0.5;
-            opacity: .5;
-        }
     }
 
    .pre-sell {
@@ -741,21 +735,49 @@
                     text-align:center;
                 }
             }
+
+            .tr-disabled{
+                 filter: alpha(opacity = 50);
+                 -moz-opacity: 0.5;
+                 -khtml-opacity: 0.5;
+                 opacity: .5;
+            }
+
         }
 
         .cart-item-disabled {
-            position: absolute;
-            left: 15px;
-            width: 16px;
-            height: 15px;
-            float: left;
-            margin-top: 25px;
-            margin-left: 15px;
+            /*display: block;*/
+            /*font-size: 13px;*/
+            /*color: #fff;*/
+            /*padding:2px 5px;*/
+            /*border-radius: 50%;*/
+            /*-webkit-border-radius: 50%;*/
+            /*-moz-border-radius: 50%;*/
+            /*background-color: #000100;*/
+        }
+
+        .out-of-stock {
+            position:absolute;
+            top:20px;
+            left:0;
             display: inline-block;
-            border: none;
-            background: url(/cart/ico_disabled.png);
-            background-repeat: no-repeat;
-            cursor: pointer;
+            font-size: 12px;
+            color: #000;
+            background-color: #f0f0f0;
+            padding: 8px 10px;
+            line-height: 12px;
+            &:after {
+                position: absolute;
+                top: 52px;
+                left: 5px;
+                content: '';
+                display: inline-block;
+                width: 0;
+                height: 0;
+                border-top: 14px solid #f0f0f0;
+                border-left: 5px solid transparent;
+                border-right: 5px solid transparent;
+            }
         }
 
         .pay-pro-info {