Merge branch 'dev-compliance-0708' of...

Merge branch 'dev-compliance-0708' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme into dev-compliance-0708

* 'dev-compliance-0708' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme:
  提交兑换ui

# Conflicts:
#	src/views/merge-detail.vue

src/components/cme/bind-card-button.vue

@@ -13,8 +13,8 @@
       </div>
     </article>
     <article class="right">
-      <span @click="gotoExchange" class="left">去兑换</span>
-      <span @click="gotoBuy" class="right">去购买</span>
+      <span class="left" @click="changeClick">去兑换</span>
+         <span @click="gotoBuy" class="right">去购买</span>
     </article>
   </section>
 </template>
@@ -30,6 +30,9 @@ export default {
     return {};
   },
   methods: {
+    changeClick(){
+      this.$emit("changeClick","去兑换")
+    },
     gotoExchange() {
       this.$emit("gotoExchange");
     },

src/components/cme/change-card.vue

+<template>
+  <van-popup v-model="show"  
+    closeable
+   close-icon-position="top-right"
+   position="bottom"
+   >
+   <section class="bind-cart-wrapper">
+    <article class="title">兑换详情</article>
+    <article class="tip">
+      <div class="left">
+        <img src="../../images/cme/phrase2/info.png" />
+        <span>激活码用于兑换课程，您可以从订单详情或已购买到实体卡查看激活码密码。激活码一旦兑换，不可退回。</span>
+      </div>
+    </article>
+<article class="code">
+  <van-field v-model="value" 
+  clearable
+  label="激活码" 
+  placeholder="请输入激活码"  
+  error-message="请输入正确的激活码"
+   />
+ </article>
+       <article class="bottom">  <van-button size="large" round color="#449284">确认兑换</van-button></article>
+  </section>
+
+</van-popup>
+  
+</template>
+<script>
+export default {
+  props: {
+    cardInfo: {
+      type: Object,
+      default: () => {}
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  data() {
+    return {
+      activationCode: '',
+    };
+  },
+  methods: {
+
+  }
+};
+</script>
+<style  lang="scss" scoped>
+@import "../../style/mixin";
+.bind-cart-wrapper {
+  width: 100%;
+  display: flex;
+  line-height: 1;
+  padding: px2rem(10px) px2rem(15px);
+   display: flex;
+  flex-direction: column;   
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px -2px 10px 0px rgba(0, 0, 0, 0.1);
+  .title{
+    display: flex;
+    flex-direction: row;
+    font-size : 18px;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    margin-top: px2rem(20px);
+  }
+  .tip{
+    display: flex;
+    margin-top: px2rem(40px);
+    .left{
+      display: flex;
+      line-height: 1.2;
+        font-size: px2rem(12px);
+      img {
+        width: px2rem(12px);
+        height: px2rem(12px);
+        margin-left: 1px;
+        margin-right: px2rem(4px);
+      }
+      color: #979899;
+    }
+  }
+  .code{
+    display: flex;
+  }
+  .bottom{
+    display: flex;
+    margin-bottom: px2rem(4px);
+  }
+
+}
+</style>
\ No newline at end of file

src/views/merge-detail.vue

@@ -134,10 +134,12 @@
     <BindCardButton 
       v-if="project.cmeType == 2 && !hasBindCard" 
       :cardInfo="cardInfo"
-      :gotoExchange="gotoExchange"
       :gotoBuy="confirm"
+      @changeClick="changeClick"
       ></BindCardButton>
-    
+
+    <!--去兑换-->
+    <ChangeCard :show="show" :cardInfo="cardInfo" ></ChangeCard>
     <!-- <CardPopup :cardInfo="cardInfo" :isShow="isShowPopup" @clickOverlay="clickOverlay" @cancle="jumpToCardList()" @confirm="confirm"></CardPopup> -->
     <Loading v-show="showLoading" />
     <div>
@@ -174,7 +176,7 @@ import vueFilters from "@/utils/filter";
 import { Toast  } from 'vant';
 // import CardPopup from "@/components/cme/card-popup";
 import BindCardButton from "@/components/cme/bind-card-button";
-
+import ChangeCard from "@/components/cme/change-card";
 let cataOffsetTop = 0;
 let intorOffsetTop = 0;
 let titleOffsetHeight = 50;
@@ -272,6 +274,7 @@ export default {
         id: 0
       },
       advertInfoList: [],
+      show: false,//是否展示兑换弹框
     };
   },
   components: {
@@ -293,7 +296,8 @@ export default {
     // CardPopup,
     CommonAdertImg,
     NoMoreContent,
-    BindCardButton
+    BindCardButton,
+    ChangeCard
   },
 
   computed: {
@@ -368,16 +372,6 @@ export default {
       });
     },
 
-    // 打开兑换码弹框
-    gotoExchange() {
-
-    },
-
-    // // 调用支付页面
-    // gotoBuy() {
-
-    // },
-
     // 查询教培项目广告位配置信息
     getAdvertInfoList() {
       let param = {
@@ -417,7 +411,7 @@ export default {
         component_tag: `883#8831`
       });
       this.isShowEJDialog = false;
-      this.jumpToCardList();          
+      this.jumpToCardList();
       // this.isBuy(2);
       this.firstIntoExamAction();
     },
@@ -448,6 +442,9 @@ export default {
         component_tag: `885#8851`
       });
 
+      // 复制卡密
+      this.copyLink();
+
       this.showLoading = false;
       // this.isShowPopup = false;
       // 判断版本号，如果小于3.4.0，则只做提示
@@ -711,7 +708,11 @@ export default {
         }
       });
     },
-
+//去兑换
+changeClick(msg){
+  console.log(msg)
+  this.show = !this.show;
+},
     // 弹框按钮事件
     handlerAction(data) {
       this.isShowDialog = false;