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

优化小程序和app登录的逻辑,优化部分页面样式错乱的问题,优化跳转页面后部分页面无法接受url参数的问题,优化app端的兼容问题

master
gaoxs 5 years ago
parent
4cc4c60a87
commit
3fa8054983
12 changed files with 503 additions and 464 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      components/ProductWindow.vue
  2. 23
      main.js
  3. 48
      pages/Loading/index.vue
  4. 1
      pages/activity/GoodsGroup/index.vue
  5. 27
      pages/activity/GroupDetails/index.vue
  6. 2
      pages/authorization/index.vue
  7. 2
      pages/home/index.vue
  8. 113
      pages/user/Login/index.vue
  9. 12
      pages/user/Register/index.vue
  10. 12
      pages/user/User/index.vue
  11. 11
      store/index.js
  12. 98
      utils/index.js

2
components/ProductWindow.vue
Unescape View File

@ -58,7 +58,7 @@ export default {
default: () => {}
},
cartNum: {
type: String,
type: Number,
default: () => 1
}
},

23
main.js
Unescape View File

@ -33,8 +33,6 @@ Vue.prototype.$validator = function(rule) {
return new schema(rule);
};
Vue.prototype.$dialog = dialog;
const CACHE_KEY = "clear_0.0.1";
if (!cookie.has(CACHE_KEY)) {
@ -54,6 +52,7 @@ Vue.mixin({
const {
$mp
} = this.$root
console.log($mp)
this._route = parseRoute($mp)
// this.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL;
this._data.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL;
@ -79,24 +78,28 @@ Object.defineProperty(Vue.prototype, '$yroute', {
Vue.prototype.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL
Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL
// #ifdef H5
// H5编译的代码
Vue.prototype.$deviceType = 'H5'
// #endif
// #ifdef APP-PLUS
// App平台编译的代码
Vue.prototype.$deviceType = 'App'
Vue.prototype.$platform = uni.getSystemInfoSync().platform
// #endif
// #ifndef H5
// H5编译的代码
Vue.prototype.$deviceType = 'H5'
// #endif
// #ifdef MP-WEIXIN
// 微信小程序编译的代码
Vue.prototype.$deviceType = 'Weixin'
// #endif
if(wx){
Vue.prototype.$deviceType = 'Weixin'
}
console.log(wx,121212)
console.log(Vue.prototype.$deviceType)
// if(wx){
// Vue.prototype.$deviceType = 'Weixin'
// }
app.$mount()

48
pages/Loading/index.vue
Unescape View File

@ -1,36 +1,56 @@
<template>
<view class="lottie-bg">
<view id="lottie"><image src="../../static/images/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%;" /></view>
<view id="lottie">
<image
src="../../static/images/live-logo.gif"
rel="preload"
mode="widthFix"
style="width: 100%;"
/>
</view>
</view>
</template>
<script>
import { mapState, mapMutations, mapActions } from 'vuex';
import { mapState, mapMutations, mapActions } from "vuex";
// 组件
// import request from "@//api/request";
import { wxappAuth, getUser } from '@/api/user';
import dayjs from 'dayjs';
import cookie from '@/utils/store/cookie';
import { parseQuery, login, handleQrCode } from '@/utils';
import { wxappAuth, getUser } from "@/api/user";
import dayjs from "dayjs";
import cookie from "@/utils/store/cookie";
import { parseQuery, login, handleQrCode } from "@/utils";
export default {
name: 'Loading',
name: "Loading",
data() {
return {};
},
mounted() {
onShow() {
var url = handleQrCode();
// 判断是否是分销
if (url) {
var spread = cookie.get('spread');
var spread = cookie.get("spread");
let urlSpread = parseInt(url.spread);
if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
cookie.set('spread', urlSpread || 0);
} else if (spread === 0 || typeof spread !== 'number') {
cookie.set('spread', urlSpread || 0);
cookie.set("spread", urlSpread || 0);
} else if (spread === 0 || typeof spread !== "number") {
cookie.set("spread", urlSpread || 0);
}
}
if (this.$store.getters.token) {
this.toLaunch();
return;
}
console.log(this.$store.getters.token, 9999);
cookie.get("spread");
// this.toLaunch();
if (this.$deviceType == 'App') {
// this.toLaunch();
this.$yrouter.switchTab({
path: '/pages/home/index',
});
return
}
login({
fail: () => {
this.toLaunch();
@ -38,12 +58,12 @@ export default {
});
},
methods: {
...mapActions(['changeAuthorization', 'changeUserInfo']),
...mapActions(["changeAuthorization", "setUserInfo"]),
toLaunch() {
console.log(this);
this.changeAuthorization(false);
this.$yrouter.switchTab({
path: '/pages/home/index',
path: "/pages/home/index"
});
}
}

1
pages/activity/GoodsGroup/index.vue
Unescape View File

@ -10,6 +10,7 @@
:key="combinationListIndex"
@click="link(item.id)"
>
<text>{{item.id}}</text>
<view class="pictrue">
<image :src="item.image" />
</view>

27
pages/activity/GroupDetails/index.vue
Unescape View File

@ -114,7 +114,7 @@
<view class="bnt bg-color-violet" @click="openAlone">单独购买</view>
<view class="bnt bg-color-red" @click="openTeam">立即开团</view>
</view>
<ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow>
<ProductWindow v-if="cartNum" v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow>
<StorePoster
v-on:setPosterImageStatus="setPosterImageStatus"
:posterImageStatus="posterImageStatus"
@ -122,18 +122,6 @@
></StorePoster>
</view>
</template>
<style scoped>
.noscroll {
height: 100%;
overflow: hidden;
}
.product-con .footer-group .bnt {
width: 43%;
}
.product-con .footer-group .bnt.bg-color-violet {
background-color: #fa8013;
}
</style>
<script>
// import { swiper, swiperSlide } from "vue-awesome-swiper";
@ -211,7 +199,7 @@ export default {
}
}
},
mounted: function() {
onShow: function() {
this.mountedStart();
},
methods: {
@ -220,6 +208,7 @@ export default {
},
mountedStart: function() {
var that = this;
console.log(that)
let id = that.$yroute.query.id;
getCombinationDetail(id).then(res => {
that.$set(that, "storeInfo", res.data.storeInfo);
@ -336,4 +325,14 @@ export default {
.product-con .wrapper {
padding-bottom: 0.26rem;
}
.noscroll {
height: 100%;
overflow: hidden;
}
.product-con .footer-group .bnt {
width: 43%;
}
.product-con .footer-group .bnt.bg-color-violet {
background-color: #fa8013;
}
</style>

2
pages/authorization/index.vue
Unescape View File

@ -40,7 +40,7 @@ export default {
this.changeAuthorization(false);
},
methods: {
...mapActions(["changeAuthorization", "changeUserInfo"]),
...mapActions(["changeAuthorization", "setUserInfo"]),
...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
back() {
this.$yrouter.switchTab({

2
pages/home/index.vue
Unescape View File

@ -252,7 +252,7 @@ export default {
}
};
},
mounted: function() {
onShow: function() {
let that = this;
uni.showLoading({
title:'加载中'

113
pages/user/Login/index.vue
Unescape View File

@ -7,29 +7,24 @@
</view>
<view class="whiteBg" v-if="formItem === 1">
<view class="title acea-row row-center-wrapper">
<view
class="item"
:class="current === index ? 'on' : ''"
v-for="(item, index) in navList"
@click="navTap(index)"
:key="index"
>{{ item }}</view>
<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)"
:key="index">{{ item }}</view>
</view>
<view class="list" :hidden="current !== 0">
<form @submit.prevent="submit">
<view class="item">
<view class="acea-row row-between-wrapper">
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_" />
</svg>
</svg> -->
<input type="text" placeholder="输入手机号码" v-model="account" required />
</view>
</view>
<view class="item">
<view class="acea-row row-between-wrapper">
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_" />
</svg>
</svg> -->
<input type="password" placeholder="填写登录密码" v-model="password" required />
</view>
</view>
@ -38,24 +33,19 @@
<view class="list" :hidden="current !== 1">
<view class="item">
<view class="acea-row row-between-wrapper">
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_" />
</svg>
</svg> -->
<input type="text" placeholder="输入手机号码" v-model="account" />
</view>
</view>
<view class="item">
<view class="align-left">
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_1" />
</svg>
</svg> -->
<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
<button
class="code"
:disabled="disabled"
:class="disabled === true ? 'on' : ''"
@click="code"
>{{ text }}</button>
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
</view>
</view>
</view>
@ -71,31 +61,26 @@
<view class="list">
<view class="item">
<view>
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_" />
</svg>
</svg> -->
<input type="text" placeholder="输入手机号码" v-model="account" />
</view>
</view>
<view class="item">
<view class="align-left">
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_1" />
</svg>
</svg> -->
<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
<button
class="code"
:disabled="disabled"
:class="disabled === true ? 'on' : ''"
@click="code"
>{{ text }}</button>
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
</view>
</view>
<view class="item">
<view>
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_" />
</svg>
</svg> -->
<input type="password" placeholder="填写您的登录密码" v-model="password" />
</view>
</view>
@ -111,12 +96,25 @@
</template>
<script>
import sendVerifyCode from "@/mixins/SendVerifyCode";
import { login, loginMobile, registerVerify, register } from "@/api/user";
import attrs, { required, alpha_num, chs_phone } from "@/utils/validate";
import { validatorDefaultCatch } from "@/utils/dialog";
import {
login,
loginMobile,
registerVerify,
register
} from "@/api/user";
import attrs, {
required,
alpha_num,
chs_phone
} from "@/utils/validate";
import {
validatorDefaultCatch
} from "@/utils/dialog";
import dayjs from "dayjs";
import cookie from "@/utils/store/cookie";
import {handleGetUserInfo} from '@/utils'
const BACK_URL = "login_back_url";
export default {
@ -136,7 +134,10 @@ export default {
methods: {
async loginMobile() {
var that = this;
const { account, captcha } = that;
const {
account,
captcha
} = that;
try {
await that
.$validator({
@ -164,11 +165,7 @@ export default {
.then(res => {
var data = res.data;
that.$store.commit("LOGIN", data.token, dayjs(data.expires_time));
const backUrl = cookie.get(BACK_URL) || "/";
cookie.remove(BACK_URL);
that.$yrouter.replace({
path: backUrl
});
handleGetUserInfo()
})
.catch(err => {
uni.showToast({
@ -180,7 +177,11 @@ export default {
},
async register() {
var that = this;
const { account, captcha, password } = that;
const {
account,
captcha,
password
} = that;
try {
await that
.$validator({
@ -230,7 +231,9 @@ export default {
},
async code() {
var that = this;
const { account } = that;
const {
account
} = that;
try {
await that
.$validator({
@ -271,7 +274,10 @@ export default {
},
async submit() {
console.log("spread:" + cookie.get("spread"));
const { account, password } = this;
const {
account,
password
} = this;
try {
await this.$validator({
account: [
@ -297,13 +303,18 @@ export default {
password,
spread: cookie.get("spread")
})
.then(({ data }) => {
.then(({
data
}) => {
this.$store.commit("LOGIN", data.token, dayjs(data.expires_time));
const backUrl = cookie.get(BACK_URL) || "/";
cookie.remove(BACK_URL);
this.$yrouter.replace({
path: backUrl
});
handleGetUserInfo()
// let replace=this.$yroute.query.replace
// if(replace){
// }
// this.$yrouter.replace({
// path: this.$yroute.query.replace || '/pages/home/index'
// });
})
.catch(err => {
uni.showToast({

12
pages/user/Register/index.vue
Unescape View File

@ -10,17 +10,17 @@
<view class="list">
<view class="item">
<view>
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_" />
</svg>
</svg> -->
<input type="text" placeholder="输入手机号码" />
</view>
</view>
<view class="item">
<view class="align-left">
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_1" />
</svg>
</svg> -->
<input type="text" placeholder="填写验证码" class="codeIput" />
<button
class="code"
@ -32,9 +32,9 @@
</view>
<view class="item">
<view>
<svg class="icon" aria-hidden="true">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_" />
</svg>
</svg> -->
<input type="text" placeholder="填写您的登录密码" />
</view>
</view>

12
pages/user/User/index.vue
Unescape View File

@ -57,7 +57,7 @@
<view class="title acea-row row-between-wrapper">
<text>我的订单</text>
<text @click="goMyOrder()" class="allOrder">
全部订单
<text>全部订单</text>
<text class="iconfont icon-jiantou"></text>
</text>
</view>
@ -67,8 +67,8 @@
<image :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
<text
class="order-status-num"
v-if="orderStatusNum.unpaidCount > 0"
>{{ orderStatusNum.unpaidCount }}</text>
v-if="userInfo.orderStatusNum.unpaidCount > 0"
>{{ userInfo.orderStatusNum.unpaidCount }}</text>
</view>
<view>待付款</view>
</view>
@ -142,11 +142,11 @@
</view>
<view style="text-align: center;margin-top: 1rem">By@意象</view>
<view class="footer-line-height"></view>
<SwitchWindow
<!-- <SwitchWindow
v-on:changeswitch="changeswitch"
:switchActive="switchActive"
:login_type="userInfo.login_type"
></SwitchWindow>
></SwitchWindow> -->
</view>
<Authorization v-else />
</view>
@ -310,7 +310,7 @@ export default {
},
onShow() {
console.log(this.userInfo);
if (this.userInfo.uid) {
if (this.$store.getters.token) {
this.User();
this.MenuUser();
this.isWeixin = isWeixin();

11
store/index.js
Unescape View File

@ -17,7 +17,7 @@ const vuexStore = new Vuex.Store({
// 是否授权
isAuthorization: false,
token: store.get(LOGIN_KEY) || null,
userInfo: null
userInfo: store.get('userInfo')
},
mutations: {
SHOW_FOOTER(state) {
@ -81,8 +81,13 @@ const vuexStore = new Vuex.Store({
changeLogin({ state, commit }, data, date) {
commit("LOGIN", data, date);
},
changeUserInfo({ state, commit }, user) {
commit("UPDATE_USERINFO", user.user);
setUserInfo({ state, commit }, user) {
commit("UPDATE_USERINFO", user);
if (user) {
store.set('userInfo', user)
} else {
store.set('userInfo', null)
}
},
changeAuthorizationPage({ state, commit }, index) {
commit("UPDATE_AUTHORIZATIONPAGE", index);

98
utils/index.js
Unescape View File

@ -120,7 +120,7 @@ export const replaceLogin = (msg) => {
console.log(Vue.prototype.$deviceType)
// 这里代表已经失去登录状态以及401强制推出登录了
store.commit('LOGOUT')
console.log(uni, 989)
if (Vue.prototype.$deviceType == 'Weixin') {
// 如果是微信小程序，跳转到授权页
replace({
@ -132,9 +132,9 @@ export const replaceLogin = (msg) => {
})
} else {
// 如果不是小程序跳转到登录页
replace({
push({
path: '/pages/user/Login/index',
query: query || {
query: {
redirect: `/${getCurrentPageUrl()}`,
...parseQuery()
}
@ -220,13 +220,50 @@ export const login = (option) => {
store.commit("LOGIN", data.token, dayjs(data.expires_time));
console.log('登录成功5')
getUser().then(res => {
store.dispatch('changeUserInfo', {
user: res.data
handleGetUserInfo()
}).catch(error => {
reject()
console.log('微信登录失败')
console.log(error)
handleFail(option, '微信登录失败')
});
}
},
fail() {
// 获取用户信息失败
reject()
handleFail(option, '获取用户信息失败')
}
});
}).catch(error => {
reject()
console.log(error)
handleFail(option, '拒绝授权')
})
},
fail() {
// 调用登录接口失败
reject()
handleFail(option, '登录失败')
}
});
}).catch(error => {
reject()
console.log(error)
handleFail(option, '获取环境服务商失败')
})
}).catch(error => {
console.log(error)
handleFail(option, '登录失败')
})
}
export const handleGetUserInfo = () => {
getUser().then(res => {
console.log(res.data, '登录后的样式')
store.dispatch('setUserInfo', res.data)
console.log('登录成功6')
console.log(option)
// option && option.success ? option.success() : null
var pages = getCurrentPages() //获取加载的页面
console.log('登录成功7')
@ -239,8 +276,7 @@ export const login = (option) => {
if (currentPage) {
// 获取到最后一个页面
if (
currentPage.route != 'pages/Loading/index'
&&
currentPage.route != 'pages/Loading/index' &&
currentPage.route != 'pages/user/Login/index'
) {
url = currentPage.route
@ -266,42 +302,6 @@ export const login = (option) => {
query
});
})
}).catch(error => {
reject()
console.log('微信登录失败')
console.log(error)
handleFail(option, '微信登录失败')
});
}
},
fail() {
// 获取用户信息失败
reject()
handleFail(option, '获取用户信息失败')
}
});
}).catch(error => {
reject()
console.log(error)
handleFail(option, '拒绝授权')
})
},
fail() {
// 调用登录接口失败
reject()
handleFail(option, '登录失败')
}
});
}).catch(error => {
reject()
console.log(error)
handleFail(option, '获取环境服务商失败')
})
}).catch(error => {
console.log(error)
handleFail(option, '登录失败')
})
}
@ -332,11 +332,11 @@ export function parseRoute($mp) {
return {
path: `/${path}`,
params: {},
query: _$mp.query,
query: _$mp.query || _$mp.page.options,
hash: '',
fullPath: parseUrl({
path: `/${path}`,
query: _$mp.query
query: _$mp.query || _$mp.page.options
}),
name: path && path.replace(/\/(\w)/g, ($0, $1) => $1.toUpperCase())
}
@ -376,7 +376,7 @@ export const handleLoginStatus = (location, complete, fail, success) => {
}
console.log(store.getters.userInfo, '用户信息')
if (!store.getters.userInfo.uid) {
if (!store.getters.token) {
page.map((item) => {
console.log(item.path == path)
if (item.path == path) {

Write Preview
Loading…
Cancel
Save