Commit 92c81f3f by 潘琦

内容流详情分享功能放开;

parent f9130961
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
const merge = require('webpack-merge') const merge = require('webpack-merge')
const prodEnv = require('./prod.env') const prodEnv = require('./prod.env')
const baseUrl = '"http://voucher.check.icaremgt.com"' //打包前请求前缀(开发) // const baseUrl = '"http://voucher.check.icaremgt.com"' //打包前请求前缀(开发)
// const baseUrl = '"http://voucher.icaremgt.com"' //打包前请求前缀(正式) // const baseUrl = '"http://voucher.icaremgt.com"' //打包前请求前缀(正式)
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"'
API_ROOT: baseUrl
}) })
...@@ -105,5 +105,8 @@ export default { ...@@ -105,5 +105,8 @@ export default {
font-weight:bold; font-weight:bold;
/* margin-bottom:0.5em; */ /* margin-bottom:0.5em; */
margin-bottom: 0; margin-bottom: 0;
white-space: nowrap;
max-width: 13.2em;
overflow: hidden;
} }
</style> </style>
...@@ -2,6 +2,7 @@ import axios from 'axios' ...@@ -2,6 +2,7 @@ import axios from 'axios'
import store from '../store' import store from '../store'
import { Toast } from 'mint-ui' import { Toast } from 'mint-ui'
// import router from '@/router/index' // import router from '@/router/index'
// import baseUrl from '@/util/baseUrl'
import { removeUrlParam } from '@/util/index' import { removeUrlParam } from '@/util/index'
axios.defaults.timeout = 30000 axios.defaults.timeout = 30000
......
import axios from 'axios' import axiosSJKG from 'axios'
import store from '../store' import store from '../store'
import { Toast } from 'mint-ui' import { Toast } from 'mint-ui'
import baseUrl from '@/util/baseUrl' import baseUrl from '@/util/baseUrl'
// import router from '@/router/index' // import router from '@/router/index'
import { removeUrlParam } from '@/util/index' import { removeUrlParam } from '@/util/index'
axios.defaults.timeout = 30000 // 创建axios实例
console.log('NODE_ENV' + process.env.NODE_ENV) const service = axiosSJKG.create({
if (process.env.NODE_ENV === 'production') { baseURL: baseUrl.sjkgUrl,
axios.defaults.baseURL = baseUrl.sjkgUrl timeout: 30000 // 请求超时时间
} })
// 返回其他状态吗 // 返回其他状态吗
axios.defaults.validateStatus = function (status) { service.defaults.validateStatus = function (status) {
return status // 默认的 return status // 默认的
} }
// 跨域请求,允许保存cookie // 跨域请求,允许保存cookie
axios.defaults.withCredentials = true // axiosSJKG.defaults.withCredentials = true
// request拦截器 // request拦截器
axios.interceptors.request.use(config => { service.interceptors.request.use(config => {
let token = store.getters.access_token let token = store.getters.access_token
if (token) { if (token) {
// config.headers['Authorization'] = 'Bearer ' + token // config.headers['Authorization'] = 'Bearer ' + token
...@@ -30,7 +31,7 @@ axios.interceptors.request.use(config => { ...@@ -30,7 +31,7 @@ axios.interceptors.request.use(config => {
}) })
// respone拦截器 // respone拦截器
axios.interceptors.response.use(response => { service.interceptors.response.use(response => {
const res = response.data && (response.data.code === 0 || response.data.code === 200) ? response.data : response const res = response.data && (response.data.code === 0 || response.data.code === 200) ? response.data : response
const status = Number(response.status) || 200 const status = Number(response.status) || 200
console.log('response status:' + status) console.log('response status:' + status)
...@@ -77,4 +78,4 @@ axios.interceptors.response.use(response => { ...@@ -77,4 +78,4 @@ axios.interceptors.response.use(response => {
return Promise.reject(new Error(error)) return Promise.reject(new Error(error))
}) })
export default axios export default service
...@@ -48,7 +48,6 @@ export default { ...@@ -48,7 +48,6 @@ export default {
this.getContentInfoFn(this.imprId) this.getContentInfoFn(this.imprId)
}, },
mounted: function () { mounted: function () {
wxpermission(1, () => {})
}, },
computed: { computed: {
}, },
...@@ -71,15 +70,17 @@ export default { ...@@ -71,15 +70,17 @@ export default {
} }
console.log('getContentInfo') console.log('getContentInfo')
let that = this let that = this
let newShareLink = removeUrlParam('code') wxpermission(1, () => {
newShareLink = newShareLink.split('#')[0] + '#/content?imprId=' + this.imprId let newShareLink = removeUrlParam('code')
const shareData = { newShareLink = newShareLink.split('#')[0] + '#/content?imprId=' + this.imprId
title: that.data.mainTitle, const shareData = {
imgUrl: that.data.cover, title: that.data.mainTitle,
desc: that.data.subheading !== '' ? that.data.subheading : '凯歌健康券', imgUrl: that.data.cover,
link: newShareLink desc: that.data.subheading !== '' ? that.data.subheading : '凯歌健康券',
} link: newShareLink
initWXShare(shareData) }
initWXShare(shareData)
})
} }
}).catch((error) => { }).catch((error) => {
this.$toast({ this.$toast({
......
...@@ -34,7 +34,11 @@ export const wxpermission = (state, fn) => { ...@@ -34,7 +34,11 @@ export const wxpermission = (state, fn) => {
fn() fn()
if (state === 0) { if (state === 0) {
wx.hideMenuItems({ wx.hideMenuItems({
menuList: ['menuItem:share:appMessage', 'menuItem:share:timeline', 'menuItem:copyUrl', 'menuItem:share:qq', 'menuItem:share:weiboApp', 'menuItem:favorite', 'menuItem:share:facebook', 'menuItem:share:QZone', 'menuItem:originPage', 'menuItem:openWithQQBrowser', 'menuItem:openWithSafari', 'menuItem:share:email', 'menuItem:share:brand', 'menuItem:editTag'] // 要隐藏的菜单项,只能隐藏“传播类”和“保护类”按钮,所有menu项见附录3 menuList: ['menuItem:share:appMessage', 'menuItem:share:timeline', 'menuItem:share:qq', 'menuItem:share:weiboApp', 'menuItem:favorite', 'menuItem:share:facebook', 'menuItem:share:QZone', 'menuItem:originPage', 'menuItem:openWithQQBrowser', 'menuItem:openWithSafari', 'menuItem:share:email', 'menuItem:share:brand', 'menuItem:editTag'] // 要隐藏的菜单项,只能隐藏“传播类”和“保护类”按钮,所有menu项见附录3
})
} else if (state === 1) {
wx.showMenuItems({
menuList: ['menuItem:share:appMessage', 'menuItem:share:timeline', 'menuItem:share:qq']
}) })
} }
// const shareData = { // const shareData = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment