Leadfyy.co
/
uniapp-shikongwang
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改图标，去掉退出登录，对接协议页面，完善路由分发页

master
邓平艺 4 years ago
parent
76fd8e4615
commit
9280b756aa
21 changed files with 116 additions and 35 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. 6
      App.vue
  2. 2
      common/api.js
  3. 17
      pages/agreement/agreement.vue
  4. 50
      pages/center/index.vue
  5. 15
      pages/goodsDetail/index.vue
  6. 2
      pages/index/index.vue
  7. 17
      pages/login/index.vue
  8. 12
      pages/order/index.vue
  9. 30
      pages/route/index.vue
  10. BIN
      static/center/home.png
  11. BIN
      static/center/share.png
  12. BIN
      static/tabbar/center-selected.png
  13. BIN
      static/tabbar/center.png
  14. BIN
      static/tabbar/home-active.png
  15. BIN
      static/tabbar/home.png
  16. BIN
      static/tabbar/index-selected.png
  17. BIN
      static/tabbar/index.png
  18. BIN
      static/tabbar/my-active.png
  19. BIN
      static/tabbar/my.png
  20. BIN
      static/tabbar/order-active.png
  21. BIN
      static/tabbar/order.png

6
App.vue
View File

@ -19,6 +19,12 @@
// 获取用户信息
getUserInfo(){
this.globalData.wxlogin = this.wxlogin;
// 检查用户是否点击的退出登录按钮
// let quit_login_state = uni.getStorageSync('quit_login_state');
// if(quit_login_state){
// return;
// }
// 去缓存判断有无用户信息
let userinfo = uni.getStorageSync('userinfo');
if(userinfo && userinfo.id){
return;

2
common/api.js
View File

@ -46,6 +46,8 @@ export const API_ARTICLE_QA = '/api/article/qa'; // 常见问题列表
export const API_WXLOGIN = '/api/wxlogin'; // 用户登录
export const API_WECHAT_SETPHONE = '/api/wechat/setPhone'; // 用户授权手机号提交
export const API_WECHAT_SETPROFILE = '/api/wechat/setProfile'; // 用户授权微信信息提交（返回用户信息）
export const API_WXLOGIN_VIEW = '/api/wxlogin/view'; // 获取登录页协议
export const API_ARTICLE_DETAIL = '/api/article/detail'; // 协议文章详情
/* 商户相关 */
export const API_CONFIRM_CODE = '/api/confirm/code'; // 扫码核销

17
pages/agreement/agreement.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="padding-lr">
协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议
协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议协议
<rich-text :nodes="detail.content" v-if="detail.content"></rich-text>
<my-nocontent v-else></my-nocontent>
</view>
</template>
@ -9,11 +9,20 @@
export default {
data() {
return {
article_id: 0,
detail: {}
}
},
onLoad(options){
this.article_id = options.id;
this.getData();
},
methods: {
getData(){
this.$http(this.API.API_ARTICLE_DETAIL, {article_id: this.article_id}).then(res => {
this.detail = res.data;
})
}
}
}
</script>

50
pages/center/index.vue
View File

@ -4,8 +4,8 @@
<image class="user-img" :src="info.avatar" @click="lookImg(info.avatar)" v-if="info.avatar"></image>
<image class="user-img" src="../../static/logo.png" v-else></image>
<view class="user-info">
<view class="lf-font-40 lf-font-bold" style="width: 500rpx;">
<text>{{ info.nickname }}</text>
<view class="lf-font-40" style="width: 500rpx;">
<text class="lf-font-bold">{{ info.nickname }}</text>
<text class="user-label" v-for="(item, index) in info.tags" :key="index">{{ item }}</text>
</view>
<view class="lf-m-t-20 lf-font-28">
@ -21,7 +21,7 @@
<text class="lf-text-vertical lf-m-l-20 lf-font-32">我的收藏</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
</view>
<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/contactService/index')">
@ -30,7 +30,7 @@
<text class="lf-text-vertical lf-m-l-16 lf-font-32">联系客服</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
</view>
<view class="lf-row-between list-item" hover-class="lf-opacity">
@ -39,7 +39,7 @@
<text class="lf-text-vertical lf-m-l-16 lf-font-32">意见反馈</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
<button class="feedback-btn" open-type="feedback"></button>
</view>
@ -49,19 +49,18 @@
<text class="lf-text-vertical lf-m-l-16 lf-font-32">常见问题</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
</view>
<!-- TODO 退出登录逻辑 -->
<view class="lf-row-between list-item" hover-class="lf-opacity">
<!-- <view class="lf-row-between list-item" hover-class="lf-opacity" @click="quitLogin">
<view class="lf-row-center">
<image class="icon-img" src="../../static/center/loginout.png"></image>
<text class="lf-text-vertical lf-m-l-16 lf-font-32">退出登录</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
</view>
</view> -->
</view>
<!-- 商家工具 -->
<view class="lf-m-b-20 shop-list" v-if="isRight(info.store)">
@ -75,7 +74,7 @@
<text class="lf-text-vertical lf-m-l-16 lf-font-32">商家订单</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
</view>
<view class="lf-row-between list-item" hover-class="lf-opacity" @click="chargeOff">
@ -84,7 +83,7 @@
<text class="lf-text-vertical lf-m-l-16 lf-font-32">卡券核销</text>
</view>
<view>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-32"></text>
</view>
</view>
</view>
@ -123,11 +122,17 @@
}
},
onLoad() {
this.verifyUserInfo();
this.getData();
},
onShow(){
this.verifyUserInfo();
},
methods: {
verifyUserInfo(){
// let quit_login_state = uni.getStorageSync('quit_login_state');
// if(quit_login_state){
// return;
// }
let userInfo = uni.getStorageSync('userinfo') || {};
if(!userInfo.id || !userInfo.nickname || !userInfo.avatar){
this.$url('/pages/login/index?type=userinfo');
@ -158,6 +163,21 @@
}
}
})
},
// 退出登录
quitLogin(){
uni.showModal({
title: '温馨提示',
content: '您确定退出当前登录状态吗？',
success: result => {
console.log(result);
if(result.confirm){
uni.setStorageSync('quit_login_state', true);
uni.removeStorageSync('userinfo');
this.$msg('退出成功', {icon: 'success'});
}
}
})
}
}
}
@ -212,8 +232,8 @@
box-sizing: border-box;
position: relative;
.icon-img{
width: 42rpx;
height: 42rpx;
width: 50rpx;
height: 50rpx;
}
.feedback-btn{
position: absolute;

15
pages/goodsDetail/index.vue
View File

@ -58,7 +58,7 @@
<view class="lf-flex lf-p-t-10 lf-p-b-10">
<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/index/index', {type: 'switch'})">
<!-- <u-icon name="home" size="50"></u-icon> -->
<image class="icon-img" src="../../static/tabbar/home.png"></image>
<image class="icon-img" src="../../static/center/home.png"></image>
<view class="lf-m-t-1">首页</view>
</view>
<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/contactService/index')">
@ -75,9 +75,10 @@
</view>
<button class="lf-flex-column lf-row-center icon-item" open-type="share">
<!-- <u-icon name="share" size="50"></u-icon> -->
<view class="icon-img lf-row-center">
<!-- <view class="icon-img lf-row-center">
<text class="lf-iconfont lf-icon-fenxiangzhuanfa lf-font-32"></text>
</view>
</view> -->
<image class="icon-img" src="../../static/center/share.png"></image>
<view class="lf-m-t-1">分享</view>
</button>
</view>
@ -154,7 +155,7 @@
let goods = this.goods_detail;
let title = goods.name;
let imageUrl = goods.share_cover || goods.cover;
let path = '/pages/route/index';
let path = '/pages/route/index?route=goods_detail&id='+ goods.id;
return {
title,
@ -277,18 +278,20 @@
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
.icon-item{
padding: 0 14rpx;
margin-right: 16rpx;
background-color: transparent;
margin: 0;
line-height: initial;
font-size: 28rpx;
font-weight: inherit;
margin-right: 10rpx;
padding: 0;
width: 88rpx;
&:first-child{
padding-left: 0;
}
.icon-img{
height: 44rpx;
height: 50rpx;
width: 50rpx;
}
}

2
pages/index/index.vue
View File

@ -158,7 +158,7 @@
onShareAppMessage(){
return {
title: '分享小程序',
path: '/pages/route/index'
path: '/pages/route/index?route=home'
}
}
}

17
pages/login/index.vue
View File

@ -23,16 +23,16 @@
</block>
</view>
<!-- 服务条款 -->
<view class="fixed-bottom" v-show="agreement.title">
<view class="fixed-bottom lf-flex" v-show="agreement.title">
<checkbox-group @change="checkboxChange" style="display: inline-block;">
<checkbox class="lf-text-vertical" :checked="checked"></checkbox>
</checkbox-group>
<view class="lf-m-l-10 lf-font-24 lf-color-gray lf-flex">
<view>请认真阅读并同意</view>
<view class="highlight" @click="enterAgree">《{{ agreement.title }}》</view>
<view>，在小程序下单购买即表示您已默认同意</view>
<view class="highlight" @click="enterAgree">《{{ agreement.title }}》</view>
<view>的所有条款。</view>
<view class="lf-m-l-10 lf-font-24 lf-color-gray" style="display: inline-block;">
<text>请认真阅读并同意</text>
<text @click="enterAgree" style="color: #5c6ed1;">《{{ agreement.title }}》</text>
<text>，在小程序下单购买即表示您已默认同意</text>
<text @click="enterAgree" style="color: #5c6ed1;">《{{ agreement.title }}》</text>
<text>的所有条款。</text>
</view>
</view>
</view>
@ -166,4 +166,7 @@
width: 100%;
height: 190rpx;
}
.display-inline-block{
display: inline-block;
}
</style>

12
pages/order/index.vue
View File

@ -106,10 +106,20 @@
}
},
onLoad(e) {
this.assetsType = e.type
this.assetsType = e.type;
this.getUserOrder()
},
onShow(){
this.verifyUserInfo();
},
methods: {
// 检查当前用户登录状态
verifyUserInfo(){
let userInfo = uni.getStorageSync('userinfo') || {};
if(!userInfo.id || !userInfo.nickname || !userInfo.avatar){
this.$url('/pages/login/index?type=userinfo');
}
},
// 切换tab
change(index) {
this.current = index;

30
pages/route/index.vue
View File

@ -6,7 +6,35 @@
/* 路由分发页面仅供跳转页面 */
export default {
onLoad(options){
this.$url('/pages/index/index', {type: 'switch'});
this.routeToPage(options);
},
methods: {
// 路由分发
routeToPage(options){
if(options.route == 'goods_detail'){
options.page_url = '/pages/goodsDetail/index';
this.joinPagePath(options);
}else if(options.route == 'home'){
options.page_url = '/pages/index/index';
this.joinPagePath(options);
}
},
// 拼接地址，并相应跳转
joinPagePath(par){
let path = par.page_url;
let flag = true; // 标志，用于判断拼接次数，？只能出现一次
for(let i in par){
if(i != 'route' && i != 'page_url'){ // 跳过route和page_url
if(flag){
path += '?'+ i +'='+ par[i];
flag = false;
}else{
path += '&'+ i +'='+ par[i];
}
}
}
this.$url(path, {type: 'redirect'});
}
}
}
</script>

BIN
static/center/home.png
View File

Side by Side

After

Width: 75  |  Height: 75  |  Size: 2.2 KiB

BIN
static/center/share.png
View File

Side by Side

After

Width: 75  |  Height: 75  |  Size: 1.4 KiB

BIN
static/tabbar/center-selected.png
View File

Side by Side

Before

Width: 150  |  Height: 150  |  Size: 3.4 KiB

BIN
static/tabbar/center.png
View File

Side by Side

Before

Width: 150  |  Height: 150  |  Size: 5.4 KiB

BIN
static/tabbar/home-active.png
View File

Side by Side Swipe Overlay

Before

Width: 200  |  Height: 200  |  Size: 5.8 KiB

After

Width: 63  |  Height: 63  |  Size: 2.3 KiB

BIN
static/tabbar/home.png
View File

Side by Side Swipe Overlay

Before

Width: 200  |  Height: 200  |  Size: 5.7 KiB

After

Width: 63  |  Height: 63  |  Size: 2.3 KiB

BIN
static/tabbar/index-selected.png
View File

Side by Side

Before

Width: 150  |  Height: 150  |  Size: 3.3 KiB

BIN
static/tabbar/index.png
View File

Side by Side

Before

Width: 150  |  Height: 150  |  Size: 2.1 KiB

BIN
static/tabbar/my-active.png
View File

Side by Side Swipe Overlay

Before

Width: 200  |  Height: 200  |  Size: 6.9 KiB

After

Width: 63  |  Height: 63  |  Size: 2.8 KiB

BIN
static/tabbar/my.png
View File

Side by Side Swipe Overlay

Before

Width: 200  |  Height: 200  |  Size: 6.8 KiB

After

Width: 63  |  Height: 63  |  Size: 2.6 KiB

BIN
static/tabbar/order-active.png
View File

Side by Side Swipe Overlay

Before

Width: 200  |  Height: 200  |  Size: 3.3 KiB

After

Width: 63  |  Height: 63  |  Size: 1.8 KiB

BIN
static/tabbar/order.png
View File

Side by Side Swipe Overlay

Before

Width: 200  |  Height: 200  |  Size: 3.4 KiB

After

Width: 63  |  Height: 63  |  Size: 1.7 KiB

Write Preview
Loading…
Cancel
Save