解决冲突

src/components/common/common-navbar.vue

 <template>
   <section :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight">
-    <!-- <section v-if="isWeb" :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'"> -->
     <div
       class="nav-part"
       :style="'background:' + bgColor + ';'
@@ -10,8 +9,6 @@
         <span class="nav-back" @click="goBack">
           <img v-show="isBlack" src="../../images/left-array-black.png" alt="">
           <img v-show="!isBlack" src="../../images/left-array-whiter.png" alt="">
-          <!-- <img src="https://pica-pro.oss-cn-shanghai.aliyuncs.com/gpranking/left-icon.png"> -->
-          <!-- <img class="nav-back" src="../../images//grey-throw.png"/> -->
         </span>
         <span class="nav-title-title" v-show="bgColor!=='none'">{{title}}</span>
         <span v-if="isShowShare" class="nav-share" @click="goShare">
@@ -79,15 +76,13 @@ export default {
     shareTitleInfo: {
       type: String,
       default: ""
+    },
+    shareUrl: {
+      type: String,
+      default: ""
     }
   },
   computed: {
-    // bgColor2() {
-    //   return this.bgColor
-    // },
-    // borderStyle() {
-    //   return this.bgColor === 'no{ne' ? '0px solid #e7e7e7' : '1px solid #e7e7e7'
-    // },
     navHeight() {
       if (this.isFixNavbar) {
         return 0;
@@ -108,28 +103,16 @@ export default {
   methods: {
     //返回
     goBack() {
-      // if (this.burialPoint == "activity") {
-      //   this.pageBurialPoin(this.objPoint);
-      // }
-      // if (this.backMethod === "inner" || window.__isWeb) {
-      //   this.$router.back(-1);
-      // } else {
-      //   rocNative.goBack();
-      // }
       rocNative.goBack();
     },
     //分享
     goShare() {
-      let url = location.href,
-        _this = this;
+      // let url = location.href,
+      let _this = this;
       rocNative.shareWechat({
-        // url: url,
-        // title: '_this.title',
-        // content: '_this.content',
-        // shareImageUrl: '_this.shareImageUrl'
         type: 6,
         shareId: 0,
-        shareUrl: url,
+        shareUrl: _this.shareUrl,
         title1: _this.shareTitle,
         title2: _this.shareTitleInfo,
         shareImageUrl: "https://file.yunqueyi.com/logo.png?version=" + new Date().getTime()
@@ -167,9 +150,6 @@ export default {
     width: 55px;
     padding-left: 15px;
     padding-right: 15px;
-    // -ms-transform: translate(180deg);
-    // -webkit-transform: (180deg);
-    // transform: rotate(180deg);
   }
   img {
     display: block;

src/router/router.js

@@ -2,6 +2,7 @@ import App from '../App'
 
 const index = r => require.ensure([], () => r(require('../views/index')), 'index')
 const merge = r => require.ensure([], () => r(require('../views/merge-detail')), 'merge')
+const shareMerge = r => require.ensure([], () => r(require('../views/share-merge-detail')), 'share-merge')
 const test = r => require.ensure([], () => r(require('../views/test-components')), 'test-components')
 const courseDetail = r => require.ensure([], () => r(require('../views/course-detail')), 'course-detail')
 
@@ -10,24 +11,28 @@ export default [{
   component: App,
   children: [
     {
-        path: '',
-        redirect: '/index'
+      path: '',
+      redirect: '/index'
     },
     {
-        path: '/index',
-        component: index
+      path: '/index',
+      component: index
     },
     {
-        path: '/home',
-        component: index
+      path: '/home',
+      component: index
     },
     {
-        path: '/coop',
-        component: merge
+      path: '/coop',
+      component: merge
     },
     {
-        path: '/test',
-        component: test
+      path: '/sharecoop',
+      component: shareMerge
+    },
+    {
+      path: '/test',
+      component: test
     },
     {
       path: '/course-detail',

src/utils/env-config.js

@@ -25,6 +25,7 @@ export const envConfig = {
     hactiveUrl: 'https://uat-hactive.yunqueyi.com',
     phomeDemain: 'https://dev-phome.yunqueyi.com',
     fileUrl: 'https://dev-www.yunqueyi.com',
+    appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
 
     // baseUrl: 'https://sc.yunqueyi.com/',
     // apiUrl: 'https://api.yunqueyi.com/',
@@ -39,6 +40,7 @@ export const envConfig = {
     hactiveUrl: 'https://dev-hactive.yunqueyi.com',
     phomeDemain: 'https://dev-phome.yunqueyi.com',
     fileUrl: 'https://dev-www.yunqueyi.com',
+    appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -47,6 +49,7 @@ export const envConfig = {
     hactiveUrl: 'https://test1-hactive.yunqueyi.com',
     phomeDemain: 'https://test1-phome.yunqueyi.com',
     fileUrl: 'https://test1-www.yunqueyi.com',
+    appId: 'wxcaad75b7fff5659c', // 用于微信授权登录
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/',
@@ -55,6 +58,7 @@ export const envConfig = {
     hactiveUrl: 'https://uat-hactive.yunqueyi.com',
     phomeDemain: 'https://uat-phome.yunqueyi.com',
     fileUrl: 'https://uat-www.yunqueyi.com',
+    appId: 'wx342ef0e5afee54a7', // 用于微信授权登录
   },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/',
@@ -63,5 +67,6 @@ export const envConfig = {
     hactiveUrl: 'https://hactive.yunqueyi.com',
     phomeDemain: 'httpss://phome.yunqueyi.com',
     fileUrl: 'https://www.yunqueyi.com',
+    appId: 'wx2c577552a2d28550', // 用于微信授权登录
   }
 }

src/utils/index.js

@@ -29,6 +29,11 @@ export function getPdfFileUrl(path) {
   return `${base}/proxyPdf${path}`;
 }
 
+// 获取微信APPID
+export function getAPPID() {
+  return getConfigByEnvType('appId')
+}
+
 // 根据不同环境，生成URL
 function getConfigByEnvType(urlType) {
   return envConfig[process.env.BUILD_ENV][urlType]

src/utils/wxShare.js

+/* eslint-disable */
+import Vue from 'vue'
+import request from '@/service/api';
+import wx from 'weixin-js-sdk'
+import { getBaseUrl } from "@/utils/index";
+/** 注入配置信息 */
+export const wxConfig = (link) => {
+  // const params = { resetURI: true, url: encodeURIComponent(location.href) };
+  //  上线前是需要把域名改为线上的sc
+  let baseUrl = getBaseUrl();
+  // request({ url: `https://sc.yunqueyi.com/wechats/signs?url=${encodeURIComponent(link)}` }).then(res => {
+  request({ url: `${baseUrl}/wechats/signs?url=${encodeURIComponent(link)}` }).then(res => {
+    let configs = res.data.signMap;
+    wx.config({
+      debug: false,
+      appId: configs.appId,
+      nonceStr: configs.nonceStr,
+      timestamp: configs.timestamp,
+      signature: configs.signature,
+      jsApiList: [
+        'hideMenuItems',
+        'previewImage',
+        'checkJsApi',
+        'chooseWXPay',
+        'onMenuShareTimeline',
+        'onMenuShareAppMessage',
+        'onMenuShareQQ',
+        'onMenuShareWeibo',
+        'onMenuShareQZone',
+        'getLocation',
+        'openLocation',
+        'translateVoice'
+      ]
+    });
+  });;
+
+};
+
+/**
+ * wxShare 分享
+ * @param option
+ */
+export const wxShare = (option = {}, successCB = () => {}) => {
+  wx.ready(() => {
+    // 分享给朋友
+    wx.onMenuShareAppMessage({
+      title: option.title,
+      desc: option.desc,
+      link: option.link,
+      imgUrl: option.imgUrl,
+      success: function(res) {
+        // 用户确认分享后执行的回调函数
+        successCB(res);
+      },
+      cancel: function() {
+        // 用户取消分享后执行的回调函数
+      }
+    });
+
+    // 分享到朋友圈
+    wx.onMenuShareTimeline({
+      title: option.friendtitle || option.title, // 标题
+      desc: option.desc,
+      link: option.link, // 链接
+      imgUrl: option.imgUrl, // 分享图标
+      success: function(res) {
+        successCB(res);
+      },
+      cancel: function() {
+        // 用户取消分享后执行的回调函数
+      }
+    });
+  });
+};
+
+export const wxDisabledShare = () => {
+  wx.ready(() => {
+    wx.hideMenuItems({
+      menuList: [
+        'menuItem:share:appMessage',
+        'menuItem:share:timeline',
+        'menuItem:share:qq',
+        'menuItem:share:weiboApp',
+        'menuItem:share:QZone'
+      ]
+    });
+  });
+};
+
+/**
+ *
+ * @param source
+ * @param option
+ */
+export const wechatShare = async (option = {}, successCB = () => {}) => {
+  const shareOption = {
+    link: location.href,
+    title: `云鹊医！`,
+    friendtitle: `讨论进行中，速来围观！`,
+    desc: '参与讨论，一起畅谈医学那些事！快来看看吧~',
+    imgUrl: 'https://file.yunqueyi.com/logo.png',
+
+    ...option
+  };
+  wxConfig(shareOption.link);
+  wxShare(shareOption, successCB);
+};
+
+Vue.prototype.wechatShare = wechatShare
+
+

src/views/merge-detail.vue

@@ -184,7 +184,7 @@ export default {
       textContent: "",
       leaderText: "",
       pageTitle: "",
-      isShowShare: false,
+      isShowShare: true,
       tabFlag: true, // 显示目录还是简介
       fixedFlag: false, // 目录和简介是否固定
       project: {

src/views/test-components.vue

@@ -55,15 +55,15 @@ export default {
       this.isShowDialog = false;
     },
     testDialog() {
-        this.$dialog.confirm({
-          className: 'course-detail',
+      this.$dialog
+        .confirm({
+          className: "course-detail",
           showCancelButton: false,
           // message: '激活/购买后可学习完整课程',
-          message: '恭喜您，已完成全部课程学习',
-          confirmButtonText: '我知道了',
-        }).then(res => {
-
+          message: "恭喜您，已完成全部课程学习",
+          confirmButtonText: "我知道了"
         })
+        .then(res => {});
     }
   }
 };