Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/activity/CouponAllDetail.vue

@@ -47,7 +47,7 @@
                <el-option :label="$t('pub.pleaseSel')" value="0"></el-option>
               <el-option :label="$t('active.cl_wsyong')" value="1"></el-option>
               <el-option :label="$t('active.cl_ysyong')" value="2"></el-option>
-              <el-option :label="$t('active.cl_yzfei')" value="3"></el-option>
+              <!-- <el-option :label="$t('active.cl_yzfei')" value="3"></el-option> -->
             </el-select>
           </span>
         </li>
@@ -62,7 +62,7 @@
          <li>
           <span>
             <em>使用时间</em>
-            <el-date-picker class="h34" v-model="UseDate" @change="timeAdd(1)" type="daterange"
+            <el-date-picker class="h34" v-model="UseDate" @change="timeAdd(2)" type="daterange"
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
           </span>
@@ -70,14 +70,14 @@
          <li>
           <span>
             <em>过期时间</em>
-            <el-date-picker class="h34" v-model="ExpirationDate" @change="timeAdd(1)" type="daterange"
+            <el-date-picker class="h34" v-model="ExpirationDate" @change="timeAdd(3)" type="daterange"
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
           </span>
         </li>
         
         <li>
-          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList(),getCountList()">
         </li>
       </ul>
     </div>
@@ -89,9 +89,8 @@
          CountData.allUCount
       }}</span>&nbsp;&nbsp;&nbsp;&nbsp;未使用数：<span class="colorE95252">{{
          CountData.allNCount
-      }}</span>&nbsp;&nbsp;&nbsp;&nbsp;作废数：<span class="colorE95252">{{
-         CountData.allFCount
       }}</span>
+      
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
@@ -118,9 +117,10 @@
                 {{item.couponsName}}</td>
                   <td>{{item.couponsType==1?("满"+item.useCondition+"元减"+item.denomination+"元"):("满"+item.useCondition+"打"+item.denomination+"折")}}</td>
            <td>
+            
             <span v-if="item.useState == 1" style="color: green">{{$t('active.cl_wsyong')}}</span>
-            <span v-if="item.useState == 2" style="color: gary">{{$t('active.cl_ysyong')}}</span>
-            <span v-if="item.useState == 3" style="color: red">{{$t('active.cl_yzfei')}}</span>
+            <span v-else style="color: grey">{{$t('active.cl_ysyong')}}</span>
+            <!-- <span v-if="item.useState == 3" style="color: red">{{$t('active.cl_yzfei')}}</span> -->
           </td>
          <td>{{item.acessDate }}</td>
           <td>{{item.effectDate }}至{{item.expirationDate }}</td>
@@ -209,8 +209,8 @@
             this.EUseDate = '';
             return
           }
-          this.SUseDate = this.UseDate[0];
-          this.EUseDate = this.UseDate[1];
+          this.msg.SUseDate = this.UseDate[0];
+          this.msg.EUseDate = this.UseDate[1];
         }
         if (t == 3) { //有效期
           if (!this.ExpirationDate) {
@@ -271,7 +271,8 @@
         this.apipost("coupon_post_GetDropDowmList", {
           "CouponsName": "",
           "BranchId": -1,
-          "CustomerType":this.msg.CustomerType
+          "CustomerType":this.msg.CustomerType,
+          "QGuoQi":1,
         }, res => {
           if (res.data.resultCode == 1) {
             this.CouponList = res.data.data;