Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/assets/css/common.css

@@ -281,4 +281,13 @@
   }
   .commonF .yhqUl .blue._active{
     background-color: #6776D2;
+  }
+
+  .commonF ._trip_xiangqing_tips{
+    color: red !important;
+    font-size: 14px !important;
+  }
+  .commonF ._trip_xiangqing_tips span{
+    color: #3965B0;
+    cursor: pointer;
   }
\ No newline at end of file

src/components/Hotel/HotelSure.vue

@@ -561,7 +561,9 @@
                 <div class="Yhq">
                     <p class="pfR" style="color:#000000;padding-left:20px">优惠券使用</p>
                     <ul class="yhqUl">
-                        <li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active}" :key="index+5000" class="sawtooth">
+                        <p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还为进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
+
+                        <li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" :key="index+5000" class="sawtooth">
                             <span class="kdj">
                                 <span v-if="item.overlapUse==1">可叠加</span>
                                 <span v-else>不可叠加</span>
@@ -838,6 +840,7 @@ export default {
 
         ActivateCode:'',
         price:0,
+        Verification:'',
     };
   },
   mounted() {
@@ -871,8 +874,22 @@ export default {
       
     }
     
+    let userInfo = this.getLocalStorage();
+        this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
+            if (res.data.resultCode == 1) {
+                this.Verification = res.data.data
+            } else {
+                this.$message.error(res.data.message);
+            }
+        },err => {});
   },
   methods: {
+      goShenqing: function () {
+            let dom = document.querySelector("#blankLink")
+            dom.href=`http://${window.location.host}/#/PsSystem/${1}`
+            //console.log(that.$refs.blankLink.click())
+            dom.click()
+        },
       clickCoupon: function (item) {
             
             let list = [];
@@ -1099,6 +1116,7 @@ export default {
                     AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
                     childJapanCount+=ChildJapanPrice*x.roomChildCount;
                     this.SettlementPrice=this.sureMsg.totalChargeableRateInfo;
+                    this.sureMsg.CustomerPayMoney=this.sureMsg.totalChargeableRateInfo;
 
                     this.price=this.sureMsg.totalChargeableRateInfo;
                     // AdultJapanCount+=AdultJapanPrice;

src/components/Ticket/FillItinerary.vue

@@ -224,7 +224,9 @@
                     <div class="Yhq">
                         <p class="pfR" style="color:#000000;padding-left:20px">优惠券使用</p>
                         <ul class="yhqUl">
-                            <li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active}" :key="index+5000" class="sawtooth">
+                            <p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还为进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
+
+                            <li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" :key="index+5000" class="sawtooth">
                                 <span class="kdj">
                                     <span v-if="item.overlapUse==1">可叠加</span>
                                     <span v-else>不可叠加</span>
@@ -323,8 +325,19 @@ export default {
             SettlementPrice:0,
 
             ActivateCode:'',
+            Verification:'',
         }
     },
+    created(){
+        let userInfo = this.getLocalStorage();
+        this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
+            if (res.data.resultCode == 1) {
+                this.Verification = res.data.data
+            } else {
+                this.$message.error(res.data.message);
+            }
+        },err => {});
+    },
     mounted () {
        this.GetDes();
        this.GetCountroy()
@@ -332,6 +345,12 @@ export default {
        this.getUserCanUseCouponList();
     },
     methods: {
+        goShenqing: function () {
+            let dom = document.querySelector("#blankLink")
+            dom.href=`http://${window.location.host}/#/PsSystem/${1}`
+            //console.log(that.$refs.blankLink.click())
+            dom.click()
+        },
         clickCoupon: function (item) {
             
             let list = [];
@@ -521,6 +540,7 @@ export default {
             this.personNum.seatNum=this.personNum.ManNum+this.personNum.ChirdNum+this.personNum.OldPeopleNum;
             this.personNum.PreferPrice=this.personNum.seatNum*this.getlistSigel.scatterB2BPrice;
             this.SettlementPrice=this.personNum.PreferPrice;
+            this.personNum.CustomerPayMoney=this.personNum.PreferPrice;
             this.price=this.personNum.PreferPrice;
             this.filterCoupon();
 

src/components/visa/SchedProduct.vue

@@ -253,7 +253,8 @@
                             <div class="Yhq" v-show="step==2">
                                 <p class="pfR" style="color:#000000;padding-left:20px">优惠券使用</p>
                                 <ul class="yhqUl">
-                                    <li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active}" :key="index+5000" class="sawtooth">
+                                    <p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还为进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
+                                    <li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" class="sawtooth">
                                         <span class="kdj">
                                             <span v-if="item.overlapUse==1">可叠加</span>
                                             <span v-else>不可叠加</span>
@@ -325,7 +326,7 @@
                             </li>
                             <li style="color:#FF680B;font-weight:600">
                                 <span>实付款</span>
-                                <span>￥<span style="font-size:18px;">{{SettlementPrice}}</span></span>
+                                <span>￥<span style="font-size:18px;">{{formInline.CustomerPayMoney}}</span></span>
                             </li>
                         </ul>
                     </el-col>
@@ -381,6 +382,7 @@ export default {
             SettlementPrice:0,
 
             ActivateCode:'',
+            Verification:'',
         }
     },
     mounted () {
@@ -401,8 +403,22 @@ export default {
         }
         this.getProvince();
         this.getUserCanUseCouponList();
+        let userInfo = this.getLocalStorage();
+        this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
+            if (res.data.resultCode == 1) {
+                this.Verification = res.data.data
+            } else {
+                this.$message.error(res.data.message);
+            }
+        },err => {});
     },
     methods: {
+        goShenqing: function () {
+            let dom = document.querySelector("#blankLink")
+            dom.href=`http://${window.location.host}/#/PsSystem/${1}`
+            //console.log(that.$refs.blankLink.click())
+            dom.click()
+        },
         clickCoupon: function (item) {
             
             let list = [];
@@ -585,6 +601,7 @@ export default {
                 let num=this.formInline.AdultPeopleNum+this.formInline.ChildPeopleNum;
                 this.formInline.TotalPrice= num * this.price;
                 this.SettlementPrice=this.formInline.TotalPrice;
+                this.formInline.CustomerPayMoney=this.formInline.TotalPrice;
                 this.price=this.formInline.TotalPrice;
                  
             } else {