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

Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

Browse Source 
# Conflicts:
#	config.js
This commit is contained in:
PQZ 2025-05-29 15:29:36 +08:00
commit d48e15ac9a
11 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
App.vue
View File

@ -38,11 +38,6 @@
},
initConfig() {
this.globalData.config = config
},
checkLogin() {
if (!getToken()) {
this.$tab.reLaunch('/pages/login')
}
}
}
}
@ -50,4 +45,4 @@
<style lang="scss">
@import '@/static/scss/index.scss';
</style>
</style>

5
config.js
View File

@ -1,9 +1,8 @@
// 应用全局配置
module.exports = {
//baseUrl: 'https://3w823u8516.vicp.fun/noticeApi',
//baseUrl: 'https://www.ddtg.site/noticeApi',
// baseUrl: 'http://192.168.1.31:8088',
baseUrl: 'http://192.168.1.4:8099',
baseUrl: 'https://www.ddtg.site/noticeApi',
//baseUrl: 'http://192.168.1.6:8088',
// 应用信息
appInfo: {
// 应用名称

4
pages/components/my-notice-item.vue
View File

@ -12,6 +12,8 @@
</view>
<!-- 操作按钮 -->
<view class="opt-button-box">
<view style="flex: 1;display: flex;align-items: self-start;">报名卡片：{{item.cardName}}</view>
<view class="opt-item" v-if="item.signStatus=='已通过'&&item.isEvaluate == 0" @click="evaluate(item)">评价
</view>
<view class="opt-item" @click="goDetail(item)">查看详情</view>
@ -181,4 +183,4 @@
}
}
}
</style>
</style>

12
pages/components/notice-index.vue
View File

@ -202,7 +202,8 @@
import constant from '@/utils/constant';
import store from '@/store'
import {
changeUserType
changeUserType,
showConfirm
} from '@/utils/common.js'
import {
treeCity
@ -569,11 +570,8 @@
goDetail(item) {
let userInfo = getJSONData(constant.userInfo)
if (!userInfo) {
store.dispatch('LogOut').then(res => {
uni.reLaunch({
url: '/pages/login'
})
})
console.log(572);
this.$tab.navigateTo(`/pages/notice/detail?id=${item.id}`)
} else {
let userType = getUserType()
@ -1007,4 +1005,4 @@
.text-color {
color: #929292 !important;
}
</style>
</style>

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

@ -13,8 +13,7 @@
<view class="left-text">
<view class="text-item">
<image class="dl-icon" src="@/static/index/money.png" mode="aspectFit"></image>
<view v-if="null==item.feeUp" class="dl-content">奖励：无稿费</view>
<view v-else class="dl-content">奖励：¥{{item.feeDown}}-{{item.feeUp}}</view>
<view class="dl-content">奖励：¥{{item.feeDown}}-{{item.feeUp==null?'无上限':item.feeUp}}</view>
</view>
<view class="text-item">
<image class="dl-icon" src="@/static/index/my.png" mode="aspectFit"></image>
@ -59,8 +58,9 @@
<view class="left-text">
<view class="text-item">
<image class="dl-icon" src="@/static/index/money.png" mode="aspectFit"></image>
<view v-if="null==dataObj.feeUp" class="dl-content">奖励：无稿费</view>
<view v-else class="dl-content">奖励：¥{{dataObj.feeDown}}-{{dataObj.feeUp}}</view>
<view class="dl-content">奖励：¥{{dataObj.feeDown}}-{{dataObj.feeUp==null?'无上限':dataObj.feeUp}}
</view>
</view>
<view class="text-item">
<image class="dl-icon" src="@/static/index/my.png" mode="aspectFit"></image>
@ -70,7 +70,7 @@
</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.bloggerTypesText||'无限制'}}</view>
</view>
<view class="text-item" style="padding-top: 10rpx;">
<view class="item-box">

6
pages/index.vue
View File

@ -117,6 +117,12 @@
} else {
console.error('Component not found');
}
if (this.$refs.myNotice) {
this.$refs.myNotice.search()
}
if (this.$refs.myNoticeTg) {
this.$refs.myNoticeTg.search()
}
});
this.refreshUserType()
setTimeout(() => {

3
pages/login.vue
View File

@ -134,6 +134,7 @@
},
//微信授权登录
async getPhone(e) {
console.log(this.ifAgree, 137);
if (!this.ifAgree) {
toast("请先阅读并同意《隐私协议》《用户服务协议》")
return
@ -314,4 +315,4 @@
}
}
}
</style>
</style>

18
pages/mine/member/member-index.vue
View File

@ -61,7 +61,8 @@
<script>
import {
toast
toast,
showConfirm
} from '@/utils/common.js'
import {
getJSONData
@ -130,10 +131,15 @@
goDetail(item) {
let userInfo = getJSONData(constant.userInfo)
if (!userInfo) {
store.dispatch('LogOut').then(res => {
uni.reLaunch({
url: '/pages/login'
})
showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
if (res.confirm) {
store.dispatch('LogOut').then(res => {
console.log('跳转');
uni.navigateTo({
url: '/pages/login'
})
})
}
})
} else {
@ -479,4 +485,4 @@
}
}
}
</style>
</style>

3
pages/notice/detail.vue
View File

@ -363,6 +363,7 @@
},
onShow() {
console.log(366);
if (null != getJSONData(constant.userInfo)) {
this.userInfo = getJSONData(constant.userInfo)
}
@ -1039,4 +1040,4 @@
}
}
}
</style>
</style>

2
permission.js
View File

@ -5,7 +5,7 @@ const loginPage = "/pages/login"
// 页面白名单
const whiteList = [
'/pages/login', '/pages/register', '/pages/common/webview/index','/pages/common/richview/index'
'/pages/login', '/pages/register', '/pages/common/webview/index','/pages/common/richview/index','/pages/notice/detail','/pages/index'
]
// 检查地址白名单

12
utils/request.js
View File

@ -44,9 +44,17 @@ const request = config => {
const code = res.data.code || 200
const msg = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {
uni.navigateTo({
url: '/pages/login?canBack=true'
showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
if (res.confirm) {
store.dispatch('LogOut').then(res => {
console.log('跳转');
uni.navigateTo({
url: '/pages/login?canBack=true'
})
})
}
})
} else if (code === 500) {
toast(msg)
reject(msg)