diff --git a/pages/components/notice-index.vue b/pages/components/notice-index.vue
index 08490d2..24f5ae9 100644
--- a/pages/components/notice-index.vue
+++ b/pages/components/notice-index.vue
@@ -6,13 +6,13 @@
通告
-
+
-
+
@@ -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;
}
diff --git a/pages/components/notice-item.vue b/pages/components/notice-item.vue
index 9a81648..3b2ea2d 100644
--- a/pages/components/notice-item.vue
+++ b/pages/components/notice-item.vue
@@ -3,7 +3,7 @@
急招
-
+
{{item.title}}
@@ -103,7 +103,7 @@
},
data() {
return {
- imageUrl: config.baseUrl
+ imageUrl: ''
}
},
methods: {
@@ -268,4 +268,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/index.vue b/pages/index.vue
index b75a86e..45795fa 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -218,4 +218,4 @@
width: 70vw;
}
}
-
+
\ No newline at end of file
diff --git a/pages/login.vue b/pages/login.vue
index 3b710a7..154918a 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -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')
})
}
}
diff --git a/pages/mine/auth/auth-form.vue b/pages/mine/auth/auth-form.vue
index d67f7f4..0b257e3 100644
--- a/pages/mine/auth/auth-form.vue
+++ b/pages/mine/auth/auth-form.vue
@@ -219,7 +219,7 @@
data() {
return {
userId:"",
- uploadUrl: config.baseUrl,
+ uploadUrl: '',
globalConfig: getApp().globalData.config,
//当前选择的认证身份
identityType: "",
diff --git a/pages/mine/card/card-detail.vue b/pages/mine/card/card-detail.vue
index 699ee2c..de987c6 100644
--- a/pages/mine/card/card-detail.vue
+++ b/pages/mine/card/card-detail.vue
@@ -46,6 +46,22 @@
+
+
+ 主页链接
+
+
+
+
+
+
+
+ 微信号
+
+
+
+
+
收货地址
@@ -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
diff --git a/pages/mine/member/member-index.vue b/pages/mine/member/member-index.vue
index f06df35..0a7d607 100644
--- a/pages/mine/member/member-index.vue
+++ b/pages/mine/member/member-index.vue
@@ -72,7 +72,7 @@
},
data() {
return {
- imageUrl: config.baseUrl,
+ imageUrl: '',
member:{},
dataList: ['', ''],
queryParams: {
diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue
index 1dd153a..f9f013d 100644
--- a/pages/mine/mine-index.vue
+++ b/pages/mine/mine-index.vue
@@ -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
+ }
})
},
/**
diff --git a/pages/mine/set/black-list.vue b/pages/mine/set/black-list.vue
index a9075bf..fb1ccce 100644
--- a/pages/mine/set/black-list.vue
+++ b/pages/mine/set/black-list.vue
@@ -46,7 +46,7 @@
},
data() {
return {
- uploadUrl: config.baseUrl,
+ uploadUrl: '',
dataList: [{
nickName: "李林",
createTime: "2024-02-10 12:22:44",
diff --git a/pages/mine/set/my-info.vue b/pages/mine/set/my-info.vue
index e296dc0..f3eec02 100644
--- a/pages/mine/set/my-info.vue
+++ b/pages/mine/set/my-info.vue
@@ -149,7 +149,7 @@
this.fileImageUrl = this.valiFormData.avatar.split(',')
this.fileImageUrl.map((item)=>{
this.fileList.push({
- url:config.baseUrl + item
+ url:item
})
})
}
diff --git a/pages/mine/set/my-suggest.vue b/pages/mine/set/my-suggest.vue
index 82bec3c..5be4655 100644
--- a/pages/mine/set/my-suggest.vue
+++ b/pages/mine/set/my-suggest.vue
@@ -38,7 +38,7 @@
},
data() {
return {
- uploadUrl: config.baseUrl,
+ uploadUrl: '',
dataList: [{
createTime: "2024-02-10 12:22:44",
content: "我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见我的意见",
diff --git a/pages/mine/set/report-form.vue b/pages/mine/set/report-form.vue
index 09508aa..f024072 100644
--- a/pages/mine/set/report-form.vue
+++ b/pages/mine/set/report-form.vue
@@ -60,7 +60,7 @@
},
data() {
return {
- uploadUrl: config.baseUrl,
+ uploadUrl: '',
dataObj: {
content: ""
},
diff --git a/pages/mine/set/suggest.vue b/pages/mine/set/suggest.vue
index 67bea16..b07289a 100644
--- a/pages/mine/set/suggest.vue
+++ b/pages/mine/set/suggest.vue
@@ -47,7 +47,7 @@
},
data() {
return {
- uploadUrl: config.baseUrl,
+ uploadUrl: '',
dataObj: {
content: ""
},
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index abf2439..79f739f 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -175,7 +175,7 @@
-
+
@@ -915,6 +915,7 @@
width: 100%;
.report-box {
+ width: calc(100% - 60rpx);
display: flex;
justify-content: center;
align-items: center;
@@ -971,4 +972,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pages/notice/public-notice.vue b/pages/notice/public-notice.vue
index 3df390a..f12f70b 100644
--- a/pages/notice/public-notice.vue
+++ b/pages/notice/public-notice.vue
@@ -286,7 +286,7 @@
//所有可选的平台
platFormRange: [],
globalConfig: getApp().globalData.config,
- uploadUrl: config.baseUrl,
+ uploadUrl: '',
sizeType: ['compressed'],
//产品图片数组
fileList: [],
diff --git a/utils/request.js b/utils/request.js
index 248de8b..30d6ec1 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -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) {