Loki
/
fish-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化h5微信授权逻辑;修改CountDown组件报错的问题

master
Gaoxs 5 years ago
parent
0605a2b4c9
commit
59055982ab
4 changed files with 154 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 177
      components/CountDown.vue
  2. 7
      libs/wechat.js
  3. 99
      main.js
  4. 21
      utils/index.js

177
components/CountDown.vue
Unescape View File

@ -1,99 +1,104 @@
<template> <template>
<view class="time"> <view class="time">
<text v-if="rtipText">{{ rtipText }}</text> {{ tipText }}
<text class="styleAll" v-if="risDay === true">{{ rday }}</text> <text class="styleAll" v-if="isDay === true">{{ day }}</text>
<text class="timeTxt" v-if="rdayText">{{ rdayText }}</text> <text class="timeTxt">{{ dayText }}</text>
<text class="styleAll">{{ hour }}</text> <text class="styleAll">{{ hour }}</text>
<text class="timeTxt" v-if="rhourText">{{ rhourText }}</text> <text class="timeTxt">{{ hourText }}</text>
<text class="styleAll">{{ minute }}</text> <text class="styleAll">{{ minute }}</text>
<text class="timeTxt" v-if="rminuteText">{{ rminuteText }}</text> <text class="timeTxt">{{ minuteText }}</text>
<text class="styleAll">{{ second }}</text> <text class="styleAll">{{ second }}</text>
<text class="timeTxt" v-if="rsecondText">{{ rsecondText }}</text> <text class="timeTxt">{{ secondText }}</text>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
name: "CountDown", name: "CountDown",
props: [ props: {
//距离开始提示文字 //距离开始提示文字
'tipText', tipText: {
'dayText', type: String,
'hourText', default: "倒计时"
'minuteText', },
'secondText', dayText: {
'datatime', type: String,
'isDay' default: "天"
], },
data: function() { hourText: {
return { type: String,
day: "00", default: "时"
hour: "00", },
minute: "00", minuteText: {
second: "00", type: String,
rtipText: "倒计时", default: "分"
rdayText: "天", },
rhourText: "时", secondText: {
rminuteText: "分", type: String,
rsecondText: "秒", default: "秒"
rdatatime: 0, },
risDay: true datatime: {
}; type: Number,
}, default: 0
created: function() { },
// this.show_time(); isDay: {
}, type: Boolean,
mounted: function() { default: true
this.rtipText = this.$props.tipText; }
this.rdayText = this.$props.dayText; },
this.rhourText = this.$props.hourText; data: function () {
this.rminuteText = this.$props.minuteText; return {
this.rsecondText = this.$props.secondText; day: "00",
this.rdatatime = this.$props.datatime; hour: "00",
this.risDay = this.$props.isDay; minute: "00",
this.show_time(); second: "00"
}, };
methods: { },
show_time: function() { created: function () {
let that = this; this.show_time();
this.runTime();
setInterval(this.runTime, 1000);
}, },
runTime() { mounted: function () {},
let that = this; methods: {
//时间函数 show_time: function () {
let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差； let that = this;
let day = 0,
hour = 0, function runTime() {
minute = 0, //时间函数
second = 0; let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
if (intDiff > 0) { let day = 0,
//转换时间 hour = 0,
if (that.isDay === true) { minute = 0,
day = Math.floor(intDiff / (60 * 60 * 24)); second = 0;
} else { if (intDiff > 0) {
day = 0; //转换时间
if (that.isDay === true) {
day = Math.floor(intDiff / (60 * 60 * 24));
} else {
day = 0;
}
hour = Math.floor(intDiff / (60 * 60)) - day * 24;
minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
second =
Math.floor(intDiff) -
day * 24 * 60 * 60 -
hour * 60 * 60 -
minute * 60;
if (hour <= 9) hour = "0" + hour;
if (minute <= 9) minute = "0" + minute;
if (second <= 9) second = "0" + second;
that.day = day;
that.hour = hour;
that.minute = minute;
that.second = second;
} else {
that.day = "00";
that.hour = "00";
that.minute = "00";
that.second = "00";
}
} }
hour = Math.floor(intDiff / (60 * 60)) - day * 24; runTime();
minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60; setInterval(runTime, 1000);
second =
Math.floor(intDiff) -
day * 24 * 60 * 60 -
hour * 60 * 60 -
minute * 60;
if (hour <= 9) hour = "0" + hour;
if (minute <= 9) minute = "0" + minute;
if (second <= 9) second = "0" + second;
that.day = day;
that.hour = hour;
that.minute = minute;
that.second = second;
} else {
that.day = "00";
that.hour = "00";
that.minute = "00";
that.second = "00";
} }
} }
} };
};
</script> </script>

7
libs/wechat.js
Unescape View File

@ -88,7 +88,7 @@ let wechatObj;
let appId let appId
let wechatLoading = false let wechatLoading = false
export async function wechat() { export function wechat() {
console.log('初始化微信配置') console.log('初始化微信配置')
wechatLoading = false wechatLoading = false
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -148,7 +148,7 @@ export async function oAuth() {
}) })
} }
export function auth(code) { export async function auth(code) {
console.log('获取微信授权') console.log('获取微信授权')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let loginType = cookie.get(LOGINTYPE); let loginType = cookie.get(LOGINTYPE);
@ -170,7 +170,7 @@ export function auth(code) {
}) })
} }
export function toAuth() { export async function toAuth() {
if (wechatLoading) { if (wechatLoading) {
return return
} }
@ -187,7 +187,6 @@ function getAuthUrl(appId) {
// #ifdef H5 // #ifdef H5
// #endif // #endif
debugger
cookie.set('redirect', window.location.href) cookie.set('redirect', window.location.href)
const redirect_uri = encodeURIComponent(`${location.origin}/pages/Loading/index`); const redirect_uri = encodeURIComponent(`${location.origin}/pages/Loading/index`);
// const redirect_uri = encodeURIComponent(`${location.origin}/pages/Loading/index?path=${encodeURIComponent(window.location.href)}`); // const redirect_uri = encodeURIComponent(`${location.origin}/pages/Loading/index?path=${encodeURIComponent(window.location.href)}`);

99
main.js
Unescape View File

@ -82,6 +82,29 @@ Object.defineProperty(Vue.prototype, '$yroute', {
Vue.prototype.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL Vue.prototype.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL
Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL
Vue.component('cu-custom', cuCustom); Vue.component('cu-custom', cuCustom);
// #ifdef APP-PLUS
// App平台编译的代码
Vue.prototype.$deviceType = 'app'
store.commit('updateDevicetype', 'app')
Vue.prototype.$platform = uni.getSystemInfoSync().platform
// #endif
// #ifdef MP-WEIXIN
// 微信小程序编译的代码
Vue.prototype.$deviceType = 'routine'
store.commit('updateDevicetype', 'routine')
// #endif
// !!! ps 不建议在 template 中使用 $deviceType 去判断当前环境，很有可能出现 $deviceType 为 undefined 导致判断出错的问题，可以在 script 模块中正常使用
// 建议通过 store 去获取 $deviceType 可以保证 template 中取到的值有效
// import { mapState, mapMutations, mapActions } from 'vuex';
// computed: {
// ...mapState(['$deviceType'])
// },
// #ifdef H5 // #ifdef H5
// H5编译的代码 // H5编译的代码
@ -102,8 +125,6 @@ import {
} from '@/libs/wechat' } from '@/libs/wechat'
import { isWeixin } from '@/utils' import { isWeixin } from '@/utils'
const CACHE_KEY = "clear_0.0.1"; const CACHE_KEY = "clear_0.0.1";
if (!cookie.has(CACHE_KEY)) { if (!cookie.has(CACHE_KEY)) {
@ -122,56 +143,36 @@ if (urlSpread !== undefined) {
cookie.set("spread", urlSpread || 0); cookie.set("spread", urlSpread || 0);
} }
} }
// #endif
Vue.prototype.wechat = wechat
Vue.prototype.clearAuthStatus = clearAuthStatus
Vue.prototype.oAuth = oAuth
Vue.prototype.auth = auth
Vue.prototype.toAuth = toAuth
Vue.prototype.pay = pay
Vue.prototype.openAddress = openAddress
Vue.prototype.openShareAll = openShareAll
Vue.prototype.openShareAppMessage = openShareAppMessage
Vue.prototype.openShareTimeline = openShareTimeline
Vue.prototype.wechatEvevt = wechatEvevt
Vue.prototype.ready = ready
Vue.prototype.wxShowLocation = wxShowLocation
// 判断是否是微信浏览器
if (isWeixin()) {
Vue.prototype.$deviceType = 'weixin'
store.commit('updateDevicetype', 'weixin')
let wechat = await wechat()
if (wechat) {
await oAuth()
}
} else {
Vue.prototype.$deviceType = 'weixinh5'
store.commit('updateDevicetype', 'weixinh5')
}
async function init() {
// #ifdef H5
// H5编译的代码
// 判断是否是微信浏览器
if (isWeixin()) {
Vue.prototype.$deviceType = 'weixin'
store.commit('updateDevicetype', 'weixin')
let wechatInit = await wechat()
console.log(wechatInit)
if (wechatInit) {
await oAuth()
app.$mount()
}
} else {
Vue.prototype.$deviceType = 'weixinh5'
store.commit('updateDevicetype', 'weixinh5')
app.$mount()
}
// #endif
// #endif // #ifndef H5
app.$mount()
// #endif
// #ifdef APP-PLUS }
// App平台编译的代码
Vue.prototype.$deviceType = 'app'
store.commit('updateDevicetype', 'app')
Vue.prototype.$platform = uni.getSystemInfoSync().platform
// #endif
// #ifdef MP-WEIXIN
// 微信小程序编译的代码
Vue.prototype.$deviceType = 'routine'
store.commit('updateDevicetype', 'routine')
// #endif
// !!! ps 不建议在 template 中使用 $deviceType 去判断当前环境，很有可能出现 $deviceType 为 undefined 导致判断出错的问题，可以在 script 模块中正常使用
// 建议通过 store 去获取 $deviceType 可以保证 template 中取到的值有效
// import { mapState, mapMutations, mapActions } from 'vuex';
// computed: {
// ...mapState(['$deviceType'])
// },
app.$mount() init()

21
utils/index.js
Unescape View File

@ -204,25 +204,25 @@ export const authorize = (authorizeStr) => {
} }
export const login = () => { export const login = () => {
debugger;
console.log(Vue.prototype)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (Vue.prototype.$deviceType == 'weixin') { if (Vue.prototype.$deviceType == 'weixin') {
// 微信授权登录 // 微信授权登录
const { code } = parseQuery() const { code } = parseQuery()
debugger;
if (code) { if (code) {
auth(code) auth(code)
.then(() => { .then(() => {
// location.replace(
// decodeURIComponent(decodeURIComponent(this.$route.params.url))
// );
let redirect = cookie.get('redirect') let redirect = cookie.get('redirect')
console.log(redirect) console.log(redirect)
debugger; if (redirect) {
location.href = decodeURIComponent( redirect = redirect.split('/pages')[1]
decodeURIComponent(this.$route.params.url) reLaunch({
); path: '/pages' + redirect,
});
} else {
reLaunch({
path: '/pages/home/index',
});
}
}) })
.catch(() => { .catch(() => {
reject('当前运行环境为微信浏览器') reject('当前运行环境为微信浏览器')
@ -866,7 +866,6 @@ export const handleLoginFailure = () => {
store.commit("updateAuthorization", false); store.commit("updateAuthorization", false);
let currentPageUrl = getCurrentPageUrl() let currentPageUrl = getCurrentPageUrl()
debugger
if (store.state.$deviceType == 'weixin') { if (store.state.$deviceType == 'weixin') {
// 如果不是授权页面， // 如果不是授权页面，
if (!store.getters.isAuthorizationPage) { if (!store.getters.isAuthorizationPage) {

Write Preview
Loading…
Cancel
Save