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

src/components/SalesModule/CouponsList.vue

@@ -6,7 +6,6 @@
     height: 40px;
     line-height: 40px;
     border-bottom: 1px solid #F2DADA;
-    margin-top: 10px;
     }
     .MyCoupon .menu_list ul li{
     float: left;
@@ -270,7 +269,8 @@ export default {
         couponsType: "",
         couponStatus: 1,
         couponEffectStatus: 1,
-        couponsUseScope: 0
+        couponsUseScope: 0,
+        userId:'',
       },
       dataList: [],
       dataLoading: false,
@@ -281,7 +281,10 @@ export default {
   computed: {},
   created() {},
   mounted() {
-    this.getList()
+    this.getList();
+    if(this.$route.query.customerId){
+        this.msg.userId=this.$route.query.customerId;
+    }
   },
   methods: {
     // 获取数据

src/components/SalesModule/CustomerAnalysis.vue

@@ -65,7 +65,7 @@
               
           </div>
           </div>
-          <div @click="goCoupons" class="list">
+          <div @click="goCoupons(datainfo.CustomerAccountId)" class="list">
               <div class="Item moneyItem">
               <p>优惠券</p>
               <div class="des">
@@ -196,11 +196,12 @@ export default {
       
   },
   methods: {
-      goCoupons(){
+      goCoupons(id){
           this.$router.push({
             name: 'CouponsList',
             query: { 
                 blank: "y", 
+                "customerId": id,
                 tab:'优惠券列表' 
             }
          });

src/components/SalesModule/CustomerCertification.vue

@@ -23,7 +23,7 @@
                     class="_status_str _status_str_y"
                   >{{$t('fnc.a_shezhong')}}</span>
                   <span v-if="item.ApplyState == 1||item.ApplyState == 3" class="_status_str _status_str_g">{{$t('fnc.ytongguo')}}</span>
-                  <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">{{$t('fnc.HasRefused')}}</span>
+                  <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">{{$t('salesModule.HasRefused')}}</span>
                 </p>
                 <p class="mt5">
                   <i class="iconfont icon-img_dianhua fz12" style="color: #09d49d;"></i>

src/components/SalesModule/MyCustomer.vue

@@ -48,10 +48,12 @@
     height: 450px;
   }
 
-  .page_MyCustomer ._mc_list {
+  .MyCustomerDiv ._mc_list {
     background: #fff;
     padding-top: 20px;
     box-sizing: border-box;
+    overflow: hidden;
+    
   }
 
   .page_MyCustomer ._mc_list>ul>li {
@@ -325,7 +327,7 @@
 
 </style>
 <template>
-  <div class="page_MyCustomer">
+  <div class="page_MyCustomer MyCustomerDiv">
     <div class="page_MyCustomerSearch">
       <li>
         <span>
@@ -396,7 +398,7 @@
         <td>{{item.tradeTotal}}</td>
         <td>{{item.inquireCount}}</td>
         <td>{{item.allianceName}}</td>
-        <td><span style="cursor: pointer;" @click.stop="goUrC('CouponsList')">{{item.couponNum}}</span></td>
+        <td><span style="cursor: pointer;" @click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></td>
         <td>
             <el-tooltip class="item" effect="dark" content="账户管理" placement="top-start">
               <el-button style="padding:4px" @click.stop="goUrlT('empBankAccount',item.customerId)" type="danger" icon="iconfont icon-guanliyuan" circle></el-button>
@@ -954,7 +956,6 @@
         })
       },
       goUrC(path, customerId) {
-        if(customerId){
              this.$router.push({
             name: path,
             query: {
@@ -962,14 +963,6 @@
                 blank: 'y'
             }
             })
-        }else{
-            this.$router.push({
-            name: path,
-            query: {
-                blank: 'y'
-            }
-        })
-        }
         
       },
       goUrlT(path, id) {