Merge branch 'test6.9.12' into gray

@@ -427,7 +427,7 @@
                             <input type="checkbox" value="2" name="showScope" class="showScope-2"  [[if couponType==-1]]disabled[[/if]]> 详情页展示
                         </label>
                         <label class="checkbox-inline">
-                            <input type="checkbox" value="3" name="showScope" class="showScope-3"  [[if couponType==1||couponType==3||couponType==4||couponType==5||couponType==7||couponType==8]]disabled[[/if]] > 店铺展示
+                            <input type="checkbox" value="3" name="showScope" class="showScope-3"  [[if couponType==3||couponType==4||couponType==5||couponType==7||couponType==8]]disabled[[/if]] > 店铺展示
                         </label>
                     </div>
                     <input type="hidden" value="[[showScope]]" id="showScope" for="checkbox"  placeholder="展示范围">

@@ -345,10 +345,8 @@ $(document).on("change", "#filter-couponType", function () {
         couponBean.feeSharingType = 2;
     }
 
-    if (couponTypeVal == 1){
-        couponBean.showScope = "1,2";
-    } else if (couponTypeVal == 6) {
-        couponBean.showScope = "1,2,3";
+    if (couponTypeVal == 1 || couponTypeVal == 8){
+        couponBean.showScope = "";
     } else {
         couponBean.showScope = "2";
     }