项目详情页分享

src/components/cme/cme-step.vue

@@ -6,19 +6,19 @@
       <p :class="{'actived': step1 || step2 || step3 || step4}">项目学习</p>
     </div>
     <div class="step-line step-one-line" :class="{'actived': step2 || step3 || step4}"></div>
-    <p class="step-text step2-text" v-if="step2" @click="applyFor">立即申请></p>
+    <p class="step-text step2-text" v-if="step2" @click="applyFor">立即申请<img src="../../images/cme/step-right-arrow.png"></p>
     <div class="step-item">
       <span :class="{'actived': step2 || step3 || step4}">2</span>
       <p :class="{'actived': step2 || step3 || step4}">申请学分</p>
     </div>
     <div class="step-line step-two-line" :class="{'actived': step3 || step4}"></div>
-    <p class="step-text step3-text" v-if="step3" @click="verifyResult">{{progressText}}></p>
+    <p class="step-text step3-text" v-if="step3" @click="verifyResult">{{progressText}}<img src="../../images/cme/step-right-arrow.png"></p>
     <div class="step-item">
       <span :class="{'actived': step3 || step4}">3</span>
       <p :class="{'actived': step3 || step4}">学分审核</p>
     </div>
     <div class="step-line step-three-line" :class="{'actived': step4}"></div>
-    <p class="step-text step4-text" v-if="step4" @click="getScore">获得{{credit}}></p>
+    <p class="step-text step4-text" v-if="step4" @click="getScore">获得{{credit}}<img src="../../images/cme/step-right-arrow.png"></p>
     <div class="step-item">
       <span :class="{'actived': step4}">4</span>
       <p :class="{'actived': step4}">申请成功</p>
@@ -251,6 +251,12 @@ export default {
     font-size: px2rem(12px);
     line-height: px2rem(12px);
     color: #fff;
+    img {
+        display: inline-block;
+        width: px2rem(6px);
+        height: px2rem(9px);
+        padding-left: px2rem(4px);
+    }
   }
   .step1-text {
     left: px2rem(20px);

src/components/common/common-navbar.vue

@@ -14,11 +14,11 @@
           <!-- <img class="nav-back" src="../../images//grey-throw.png"/> -->
         </span>
         <span class="nav-title-title" v-show="bgColor!=='none'">{{title}}</span>
-        <span v-show="isShowShare" class="nav-share" @click="goShare">
-          <img
+        <span v-if="isShowShare" class="nav-share" @click="goShare">
+          <img  v-show="isBlack"
             src="https://pica-pro.oss-cn-shanghai.aliyuncs.com/eagle_plan/courses/Group17_hover%403x.png"
           >
-          <!-- <img src="../../images/share-icon.png"/> -->
+          <img v-show="!isBlack" src="../../images/share-icon.png"/>
         </span>
       </div>
     </div>
@@ -71,6 +71,14 @@ export default {
     isBlack: {
       type: Boolean,
       default: true
+    },
+    shareTitle: {
+      type: String,
+      default: ""
+    },
+    shareTitleInfo: {
+      type: String,
+      default: ""
     }
   },
   computed: {
@@ -121,9 +129,9 @@ export default {
         // shareImageUrl: '_this.shareImageUrl'
         type: 6,
         shareId: 0,
-        shareUrl: 'shareUrl',
-        title1: "this.shareTitle1",
-        title2: "this.shareTitle2",
+        shareUrl: url,
+        title1: _this.shareTitle,
+        title2: _this.shareTitleInfo,
         shareImageUrl: "https://file.yunqueyi.com/logo.png?version=" + new Date().getTime()
       });
     }

src/views/merge-detail.vue

@@ -6,7 +6,10 @@
       :bgColor="bgColor"
       v-show="isShowNavbar"
       :isBlack="isBlack"
+      :isShowShare="isShowShare"
       :title="navTitle"
+      :shareTitle="project.projectName"
+      :shareTitleInfo="project.projectIntro"
       :isFixNavbar="isFixNavbar"
       :burialPoint="pointStyle"
       borderStyle="0px solid #fff"
@@ -113,6 +116,8 @@ import vueFilters from "@/utils/filter";
 export default {
   data() {
     return {
+      pageTitle: "",
+      isShowShare: true,
       premissionFlag: false,
       isSingle: false,
       dialogContent: "", // 弹框内容
@@ -208,13 +213,14 @@ export default {
       _this.getProjectParticularsV2();
     };
     _this.getUserInfo();
-    if (__isWeb && process.env.BUILD_ENV == "development") {
-      let param = {};
-      __getUserInfo64Comp(param);
+    // if (__isWeb && process.env.BUILD_ENV == "development") {
+    //   let param = {};
+    //   __getUserInfo64Comp(param);
+    // }
+    if(__isWeb) {
+      _this.getProjectParticularsV2();
     }
-    // alert('mounted  __before');
     window.__refresh = function() {
-      //  _this.getProjectParticularsV2();
       _this.getUserInfo();
     };
 
@@ -250,16 +256,9 @@ export default {
         this.isBlack = false;
         this.bgColor = "none";
       }
-      if (scrollTop > 300) {
-        this.fixedFlag = true;
-      } else {
-        this.fixedFlag = false;
-      }
-      if (scrollTop > h) {
-        this.tabFlag = false;
-      } else {
-        this.tabFlag = true;
-      }
+
+      this.fixedFlag = scrollTop > 280 ? true : false;
+      this.tabFlag = scrollTop > h ? false : true;
     },
     // token是否失效校验
     checkToken() {