兑换页面样式等

src/components/cme/basic-info.vue

@@ -15,8 +15,10 @@
       <!-- <span>{{level}} | {{projectCredit}}</span> -->
     </div>
     <div class="content">
-      <span>申请范围</span>
-      <span>{{scope}}</span>
+      <!-- <span>申请范围</span> -->
+      <!-- <span>{{scope}}</span> -->
+      <span>学习范围</span>
+      <span>后台配置</span>
     </div>
     <div class="remind" v-if="remind && cmeType != 2">
       <span>{{remind}}</span>
@@ -27,8 +29,8 @@
     </div>
     <div class="content">
       <!-- <span>{{cmeType == 2 ? '主办单位' : '发起机构'}}</span> -->
-      <span>主办单位</span>
-      <!-- <span>发起机构</span> -->
+      <!-- <span>主办单位</span> -->
+      <span>发起机构</span>
       <span>{{organName}}</span>
     </div>
   </div>

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

@@ -9,11 +9,11 @@
       </div>
       <div class="bottom">
         <img src="../../images/cme/phrase2/info.png" />
-        <span>兑换或购买后可学习课程</span>
+        <span>激活或购买后可学习课程</span>
       </div>
     </article>
     <article class="right">
-      <span class="left" @click="changeClick">去兑换</span>
+      <span class="left" @click="changeClick">去激活</span>
          <span @click="gotoBuy" class="right">去购买</span>
     </article>
   </section>

src/components/cme/change-card.vue

@@ -6,7 +6,7 @@
   >
     <section class="bind-cart-wrapper">
       <article class="title">
-        <span>兑换详情</span>
+        <span>激活详情</span>
         <img @click="cancle" src="../../images/cme/close.png" />
       </article>
       <article class="tip">
@@ -20,7 +20,6 @@
           <van-field
             maxlength="23"
             v-model="activationCode"
-            clearable
             label="激活码"
             placeholder="请输入激活码"
           />
@@ -29,7 +28,7 @@
       </section>
 
       <article class="bottom">
-        <van-button @click="confirm" size="large" round color="#449284">确认兑换</van-button>
+        <van-button @click="confirm" size="large" round color="#449284">确认激活</van-button>
       </article>
     </section>
   </van-popup>
@@ -144,8 +143,8 @@ export default {
     }
     .error {
       position: absolute;
-      top: px2rem(64px);
-      left: px2rem(70px);
+      top: px2rem(66px);
+      left: px2rem(56px);
       display: inline-block;
       color: red;
       font-size: px2rem(12px);

src/style/global.scss

@@ -127,4 +127,7 @@
 .bind-cart-wrapper .van-field__label {
     width: px2rem(56px) !important;
     padding-top: px2rem(8px);
+}
+.bind-cart-wrapper .van-cell {
+    padding: 0.54rem 0 !important;
 }
\ No newline at end of file

src/views/merge-detail.vue

@@ -132,7 +132,7 @@
       @gotoBuy="confirm"
     ></BindCardButton>
 
-    <!--去兑换-->
+    <!--去激活-->
     <ChangeCard
       :changeErrorMsg="changeCardErrorMsg"
       :isShow="showChangeCard" 
@@ -236,7 +236,7 @@ export default {
         // inScope=0时考试按钮不显示，
         // currentProgress>1时考试按钮显示并可用
       },
-      hasBindCard: false, // 是否绑定过学习卡或兑换过   没有绑定，则显示绑定按钮
+      hasBindCard: false, // 是否绑定过学习卡或激活过   没有绑定，则显示绑定按钮
       projectLeader: {},
       doctorList: [],
       from: "inner",
@@ -278,7 +278,7 @@ export default {
         id: 0
       },
       advertInfoList: [],
-      showChangeCard: false, //是否展示兑换弹框,
+      showChangeCard: false, //是否展示激活弹框,
       changeCardErrorMsg: ""
     };
   },
@@ -369,7 +369,7 @@ export default {
       this.showChangeCard = false;
     },
 
-    // 兑换  返回值：0绑定失败，1绑定成功
+    // 激活  返回值：0绑定失败，1绑定成功
     changeCardAction(cardKey) {
       console.log("cardKey", cardKey);
       console.log("in changeCard");
@@ -386,10 +386,10 @@ export default {
           this.showChangeCard = false;
           _this.getProjectParticularsV2();
         } else {
-          _this.changeCardErrorMsg = "请输入正确的兑换码";
+          _this.changeCardErrorMsg = "请输入正确的激活码";
         }
       }).catch( e => {
-        _this.changeCardErrorMsg = "请输入正确的兑换码";
+        _this.changeCardErrorMsg = "请输入正确的激活码";
       });
     },
 
@@ -755,7 +755,7 @@ export default {
       });
     },
 
-    //去兑换
+    //去激活
     changeClick(msg) {
       console.log("in changeClick");
       this.showChangeCard = true;