弹框组件样式

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

@@ -33,9 +33,6 @@ export default {
     changeClick(){
       this.$emit("changeClick","去兑换")
     },
-    gotoExchange() {
-      this.$emit("gotoExchange");
-    },
     gotoBuy() {
       this.$emit("gotoBuy");
     }

src/components/cme/change-card.vue

 <template>
-  <section class="change-card-wrapper">
   <van-popup
-    v-show="isShow"
-    @click-overlay="cancle"
-    close-icon-position="top-right"
+    v-model="isShow"
+    @click-overlay="cancle"  
     position="bottom"
   >
     <section class="bind-cart-wrapper">
-      <article class="title">兑换详情</article>
+      <article class="title">
+        <span>兑换详情</span>
+        <img @click="cancle" src="../../images/cme/close.png" />
+      </article>
       <article class="tip">
         <div class="left">
           <img src="../../images/cme/phrase2/info.png" />
@@ -17,10 +18,10 @@
       <article class="code">
         <van-field
           v-model="activationCode"
+          border
           clearable
           label="激活码"
           placeholder="请输入激活码"
-          error-message="请输入正确的激活码"
         />
       </article>
       <article class="bottom">
@@ -28,14 +29,13 @@
       </article>
     </section>
   </van-popup>
-  </section>
 </template>
 <script>
 export default {
   props: {
     isShow: {
       type: Boolean,
-      default: false
+      default: true
     }
   },
   // computed: {
@@ -76,10 +76,17 @@ export default {
     display: flex;
     flex-direction: row;
     font-size: 18px;
+    font-weight: 700;
     align-items: center;
     justify-content: center;
     width: 100%;
     margin-top: px2rem(20px);
+    img {
+      position: relative;
+      top: 0;
+      right: px2rem(-120px);
+      width: 12px;
+    }
   }
   .tip {
     display: flex;
@@ -99,6 +106,8 @@ export default {
   }
   .code {
     display: flex;
+    padding: px2rem(20px) 0;
+    padding-top: 0;
   }
   .bottom {
     display: flex;

src/style/global.scss

@@ -109,4 +109,23 @@
 // }
 .van-cell__title span {
     font-weight: 700 !important;
+}
+
+.bind-cart-wrapper .van-field__control {
+
+    border-radius: px2rem(4px);
+    border: 1px solid #C7C8C9;
+    padding: px2rem(7px);
+    text-align: left !important;
+}
+
+.bind-cart-wrapper .van-cell__title .van-field__label {
+    span {
+        font-size: px2rem(15px) !important;
+        color: #373839 !important;
+    }
+}
+.bind-cart-wrapper .van-field__label {
+    width: px2rem(56px) !important;
+    padding-top: px2rem(8px);
 }
\ No newline at end of file

src/views/merge-detail.vue

@@ -134,9 +134,9 @@
     <BindCardButton 
       v-if="project.cmeType == 2 && !hasBindCard" 
       :cardInfo="cardInfo"
-      :gotoBuy="confirm"
       @changeClick="changeClick"
-      ></BindCardButton>
+      @gotoBuy="confirm"
+    ></BindCardButton>
 
     <!--去兑换-->
     <ChangeCard :isShow="showChangeCard" @cancle="cancleChangeCard" @confirm="changeCardAction"></ChangeCard>
@@ -327,9 +327,10 @@ export default {
     //   let param = {};
     //   __getUserInfo64Comp(param);
     // }
-    // if (__isWeb) {
-    //   _this.getProjectParticularsV2();
-    // }
+
+    if (__isWeb) {
+      _this.getProjectParticularsV2();
+    }
     window.__refresh = function() {
       _this.getUserInfo();
     };
@@ -555,7 +556,7 @@ export default {
 
     // 跳转到原生的购买页面
     confirm() {
-      let appVersion = this.userInfo.appVersion;
+      let appVersion = this.userInfo.appVersion || '';
       let appVersionNum = appVersion.split('.').join('');
       if(appVersionNum < 341) {
         Toast('请您下载新版本App');
@@ -734,6 +735,7 @@ export default {
 
     //去兑换
     changeClick(msg){
+      console.log('in changeClick');
       this.showChangeCard = true;
     },