dianliang/dl_uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
13405411873 2025-06-16 15:12:54 +08:00
parent 9fc851abfc
commit 2128c68570
6 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/navigation/navigationBar.vue
View File

@ -68,13 +68,15 @@
.navigationBar {
position: absolute;
top: var(--status-bar-height);
height: 90rpx;
height: 110rpx;
width: 100%;
display: flex;
align-items: center;
font-size: 30rpx;
justify-content: center;
z-index: 9;
box-sizing: border-box;
padding-top: 20rpx;
.navigationBarBack {
padding-left: 20rpx;

19
pages/components/notice-item.vue
View File

@ -22,21 +22,22 @@
</view>
<view class="text-item" style="border-bottom: 1rpx solid #F4F4F4;padding-bottom: 10rpx;">
<image class="dl-icon" src="@/static/index/xing.png" mode="aspectFit"></image>
<view class="dl-content">类型：{{item.bloggerTypesText||'无限制'}}</view>
<view class="dl-content">类型：{{item.bloggerTypes||'无限制'}}</view>
</view>
<view class="text-item" style="padding-top: 16rpx;">
<view class="item-box" style="flex: 1;">
<image class="dl-icon2" :src="imageUrl+item.avatar" mode="scaleToFill"></image>
<view class="dl-item-right">{{item.userNickName}}</view>
<view class="dl-item-right" style="color: #929292;font-size: 20rpx;">{{item.userNickName}}
</view>
</view>
<!-- <view class="item-box" style="width: 28%;">
<image class="dl-icon3" src="@/static/index/person.png" mode="aspectFit"></image>
<view class="dl-item-right dl-number">{{item.reportNum}}</view>
</view> -->
<view class="item-box" style="width: 35%;">
<!-- <view class="item-box" style="width: 35%;">
<image class="dl-icon3" src="@/static/index/eye.png" mode="aspectFit"></image>
<view class="dl-item-right dl-number">{{item.viewNum}}</view>
</view>
</view> -->
<!-- <view class="item-box" style="width: 25%;">
<view>
@ -70,21 +71,23 @@
</view>
<view class="text-item" style="border-bottom: 1rpx solid #F4F4F4;padding-bottom: 10rpx;">
<image class="dl-icon" src="@/static/index/xing.png" mode="aspectFit"></image>
<view class="dl-content">类型：{{dataObj.bloggerTypesText||'无限制'}}</view>
<view class="dl-content">类型：{{dataObj.bloggerTypes||'无限制'}}</view>
</view>
<view class="text-item" style="padding-top: 10rpx;">
<view class="item-box">
<image class="dl-icon2" :src="imageUrl+dataObj.avatar" mode="aspectFit"></image>
<view class="dl-item-right">{{dataObj.userNickName}}</view>
<view class="dl-item-right" style="color: #929292;font-size: 16rpx;">
{{dataObj.userNickName}}
</view>
</view>
<!-- <view class="item-box" style="width: 25%;">
<image class="dl-icon3" src="@/static/index/person.png" mode="aspectFit"></image>
<view class="dl-item-right dl-number">{{dataObj.reportNum}}</view>
</view> -->
<view class="item-box" style="width: 25%;">
<!-- <view class="item-box" style="width: 25%;">
<image class="dl-icon3" src="@/static/index/eye.png" mode="aspectFit"></image>
<view class="dl-item-right dl-number">{{dataObj.viewNum}}</view>
</view>
</view> -->
</view>

21
pages/login.vue
View File

@ -1,5 +1,8 @@
<template>
<view class="normal-login-container">
<view class="navigationBarBack" @click="back">
<uni-icons size="24" type="left" :color="titleColor"></uni-icons>
</view>
<view class="logo-content align-center justify-center flex">
<image style="width: 260rpx;height: 260rpx;" src="@/static/logo.png" mode="widthFix">
</image>
@ -87,6 +90,10 @@
},
methods: {
back() {
uni.navigateBack()
},
/**
* 同意
* @param {Object} e
@ -139,6 +146,10 @@
toast("请先阅读并同意《隐私协议》《用户服务协议》")
return
}
if (uni.getStorageSync("inviteId")) {
this.wxLoginForm.inviteId = uni.getStorageSync("inviteId")
}
console.log(this.wxLoginForm, 145);
let ok = await this.wxLogin()
console.log("微信小程序发起授权登录")
this.$modal.loading("登录中...")
@ -159,9 +170,7 @@
},
//向后端发起登录请求
sendWxLoginFormToLocalService() {
if (uni.getStorageSync("inviteId")) {
this.wxLoginForm.inviteId = uni.getStorageSync("inviteId")
}
this.$store.dispatch('WxLogin', this.wxLoginForm).then(() => {
this.$modal.closeLoading()
this.loginSuccess()
@ -220,6 +229,12 @@
background-color: #ffffff;
}
.navigationBarBack {
position: fixed;
left: 30rpx;
top: 98rpx;
}
.checklist-box {
margin-right: 0rpx !important;
}

7
pages/notice/detail.vue
View File

@ -4,7 +4,7 @@
title-color="#000000"></navigation-bar-vue>
<view class="notice-detail-last-box">
<!-- 报名列表 -->
<view class="info-box notice-detail" v-if="viewMy">
<view class="info-box notice-detail" v-if="viewMy&&!ifBz">
<view class="detail-title">已报名：{{allImgNum||0}}人</view>
<view class="image-box" v-if="imageArray.length>0"
:style="{height:(imageArray.length*((imageWidth-15)*2))+'rpx'}">
@ -129,7 +129,7 @@
</view>
<view class="bottom-box">
<text class="update-text">{{calculateTimeDifference(noticeDetail.updateTime)||''}}更新</text>
<text class="view-text">{{noticeDetail.viewNum||''}} 阅读</text>
<!-- <text class="view-text">{{noticeDetail.viewNum||''}} 阅读</text> -->
</view>
</view>
<!-- 通告详情 -->
@ -390,8 +390,9 @@
onShow() {
if (null != getJSONData(constant.userInfo)) {
this.userInfo = getJSONData(constant.userInfo)
this.getRole()
}
this.getRole()
this.getDetail()
this.viewNotice()
},

7
pages/notice/public-notice.vue
View File

@ -48,8 +48,8 @@
截止时间
</view>
<view class="item-value">
<uni-datetime-picker type="date" :clear-icon="false" v-model="dataObj.endDate"
@maskClick="maskClick" />
<uni-datetime-picker :start="nowDate" type="date" :clear-icon="false"
v-model="dataObj.endDate" @maskClick="maskClick" />
</view>
</view>
<view class="item-field">
@ -292,6 +292,7 @@
},
data() {
return {
nowDate: new Date(),
//城市树结构
dataTree: [],
//一行显示几个
@ -1138,4 +1139,4 @@
.checklist-box {
margin-right: 0 !important;
}
</style>
</style>

5
store/modules/user.js
View File

@ -62,8 +62,9 @@ const user = {
const code = wxUserInfo.code
const encryptedIv = wxUserInfo.encryptedIv
const encryptedData = wxUserInfo.encryptedData
const inviteId = wxUserInfo.inviteId
return new Promise((resolve, reject) => {
wxLogin(code, encryptedIv, encryptedData).then(res => {
wxLogin(code, encryptedIv, encryptedData, inviteId).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
resolve()
@ -161,4 +162,4 @@ const user = {
}
}
export default user
export default user