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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
13405411873 2025-04-25 16:08:22 +08:00
commit 8cbc068624
16 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,13 @@
<text class="dl-text">通告</text>
</view>
<view class="left-search">
<view class="left-search-box" style="width: 90%;">
<view class="left-search-box" style="width: 90%;" @click="goSeach">
<uni-search-bar radius="20" style="width: 100%;" placeholder="VIP极速搜索" clearButton="auto"
cancelButton="none" @confirm="search" @clear="clear">
</uni-search-bar>
<image class="dl-vip" src="@/static/index/vip.png" mode="aspectFit"></image>
<!-- 遮罩层 -->
<view v-if="!canSearch" class="dl-zhezhao" @click="goSeach"></view>
<!-- <view v-if="!canSearch" class="dl-zhezhao" @click="goSeach"></view> -->
</view>
</view>
<view class="right-text">
@ -252,7 +252,7 @@
this.getByCodeInfo()
this.selectDataList()
//鉴权
this.checkRights()
// this.checkRights()
},
onLoad: function() {
@ -799,7 +799,7 @@
}
.dl-item-box {
height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 555rpx);
height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 585rpx);
isplay: flex;
flex-direction: column;
}

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

@ -3,7 +3,7 @@
<view v-for="(item,index) in dataList" class="dl-notice-box" @click="goDetail(item)">
<view class="dl-is-urgent" v-if="'1'==item.isUrgent">急招</view>
<view class="dl-notice-title">
<image class="dl-image" :src="'/static/platform/fang/'+item.platformCode+'.png'" mode="aspectFit">
<image class="dl-image" :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit">
</image>
<view class="dl-text">{{item.title}}</view>
</view>
@ -103,7 +103,7 @@
},
data() {
return {
imageUrl: config.baseUrl
imageUrl: ''
}
},
methods: {
@ -268,4 +268,4 @@
}
}
}
</style>
</style>

4
pages/index.vue
View File

@ -3,7 +3,7 @@
<!-- 主体区域 -->
<view class="content-body">
<!-- 通告列表页 -->
<notice-index v-if="'home'==menuCode" @openVip="openVip"></notice-index>
<notice-index style="height: 100%;" v-if="'home'==menuCode" @openVip="openVip"></notice-index>
<mine-index :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
@refreshUserType="refreshUserType()"></mine-index>
<subscribe v-if="'dingyue'==menuCode"></subscribe>
@ -218,4 +218,4 @@
width: 70vw;
}
}
</style>
</style>

14
pages/login.vue
View File

@ -76,6 +76,12 @@
}],
//是否同意
ifAgree: false,
canBack: "false",
}
},
onLoad(params) {
if (params.canBack) {
this.canBack = params.canBack
}
},
created() {
@ -192,8 +198,14 @@
loginSuccess(result) {
// 设置用户信息
this.$store.dispatch('GetInfo').then(res => {
if ("true" == this.canBack) {
uni.navigateBack({
delta: 1
})
} else {
this.$tab.reLaunch('/pages/index')
}
this.$tab.reLaunch('/pages/index')
})
}
}

2
pages/mine/auth/auth-form.vue
View File

@ -219,7 +219,7 @@
data() {
return {
userId:"",
uploadUrl: config.baseUrl,
uploadUrl: '',
globalConfig: getApp().globalData.config,
//当前选择的认证身份
identityType: "",

36
pages/mine/card/card-detail.vue
View File

@ -46,6 +46,22 @@
<input class="uni-input" v-model="dataObj.tel" type="tel" placeholder="请输入" />
</view>
</view>
<view class="item-field">
<view class="item-lable is-required">
<image src="@/static/mine/required.png" mode="aspectFit"></image>主页链接
</view>
<view class="item-value">
<input class="uni-input" v-model="dataObj.indexUrl" type="tel" placeholder="请输入" />
</view>
</view>
<view class="item-field">
<view class="item-lable is-required">
<image src="@/static/mine/required.png" mode="aspectFit"></image>微信号
</view>
<view class="item-value">
<input class="uni-input" v-model="dataObj.wxNum" type="tel" placeholder="请输入" />
</view>
</view>
<view class="item-field">
<view class="item-lable is-required">
<image src="@/static/mine/required.png" mode="aspectFit"></image>收货地址
@ -113,7 +129,7 @@
},
data() {
return {
uploadUrl: config.baseUrl + '/common/upload',
uploadUrl: '' + '/common/upload',
headers: {},
//所有可选的平台
range: [],
@ -133,6 +149,8 @@
addrId: null,
price: null,
content: null,
wxNum: null,
indexUrl: null,
}
}
},
@ -251,10 +269,18 @@
toast("粉丝数不能为空")
return
}
if (this.dataObj.tel == null || this.dataObj.tel == "") {
toast("电话不能为空")
return
}
if (this.dataObj.indexUrl == null || this.dataObj.indexUrl == "") {
toast("主页链接不能为空")
return
}
if (this.dataObj.wxNum == null || this.dataObj.wxNum == "") {
toast("微信号不能为空")
return
}
if (this.dataObj.tel == null || this.dataObj.tel == "") {
toast("电话不能为空")
return
}
if (this.dataObj.addrId == null || this.dataObj.addrId == "") {
toast("收货地址不能为空")
return

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

@ -72,7 +72,7 @@
},
data() {
return {
imageUrl: config.baseUrl,
imageUrl: '',
member:{},
dataList: ['', ''],
queryParams: {

10
pages/mine/mine-index.vue
View File

@ -211,11 +211,11 @@
localUserType: this.nowUserType,
globalConfig: getApp().globalData.config,
//是否已开通会员
ifHasCard: true,
ifHasCard: false,
userInfo: {
coupon: 0
},
imageUrl: config.baseUrl,
imageUrl: '',
//公众号二维码
wechat_img: constant.wechat_img,
//客服二维码
@ -264,6 +264,12 @@
this.userInfo.coupon = res.data.coupon.toString()
this.userInfo.addNotice = res.data.addNotice.toString()
this.userInfo.avatar = this.imageUrl + res.data.avatar
if (res.data.memberEndDate && null != res.data.memberEndDate) {
this.ifHasCard = true
this.memberEndDate = res.data.memberEndDate
} else {
this.ifHasCard = false
}
})
},
/**

2
pages/mine/set/black-list.vue
View File

@ -46,7 +46,7 @@
},
data() {
return {
uploadUrl: config.baseUrl,
uploadUrl: '',
dataList: [{
nickName: "李林",
createTime: "2024-02-10 12:22:44",

2
pages/mine/set/my-info.vue
View File

@ -149,7 +149,7 @@
this.fileImageUrl = this.valiFormData.avatar.split(',')
this.fileImageUrl.map((item)=>{
this.fileList.push({
url:config.baseUrl + item
url:item
})
})
}

2
pages/mine/set/my-suggest.vue
View File

@ -38,7 +38,7 @@
},
data() {
return {
uploadUrl: config.baseUrl,
uploadUrl: '',
dataList: [{
createTime: "2024-02-10 12:22:44",
content: "我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见",

2
pages/mine/set/report-form.vue
View File

@ -60,7 +60,7 @@
},
data() {
return {
uploadUrl: config.baseUrl,
uploadUrl: '',
dataObj: {
content: ""
},

2
pages/mine/set/suggest.vue
View File

@ -47,7 +47,7 @@
},
data() {
return {
uploadUrl: config.baseUrl,
uploadUrl: '',
dataObj: {
content: ""
},

5
pages/notice/detail.vue
View File

@ -175,7 +175,7 @@
<!-- 去报名，始终浮动下方 -->
<view class="dl-bottom-box" v-show="showBottom&&type=='common'">
<!-- 报名 -->
<view class="report-box">
<view class="report-box" v-if="'2'!=noticeDetail.approvalStatus">
<view @click="goHome()">
<image src="@/static/detail/home.png" mode="aspectFit"></image>
</view>
@ -915,6 +915,7 @@
width: 100%;
.report-box {
width: calc(100% - 60rpx);
display: flex;
justify-content: center;
align-items: center;
@ -971,4 +972,4 @@
}
}
}
</style>
</style>

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

@ -286,7 +286,7 @@
//所有可选的平台
platFormRange: [],
globalConfig: getApp().globalData.config,
uploadUrl: config.baseUrl,
uploadUrl: '',
sizeType: ['compressed'],
//产品图片数组
fileList: [],

4
utils/request.js
View File

@ -45,8 +45,8 @@ const request = config => {
const msg = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {
store.dispatch('LogOut').then(res => {
uni.reLaunch({
url: '/pages/login'
uni.navigateTo({
url: '/pages/login?canBack=true'
})
})
} else if (code === 500) {