diff --git a/config/request.js b/config/request.js
index d57d2ba..aea2d7a 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,7 +5,7 @@
*/
export default {
- // baseURL: 'http://192.168.31.51:10010/',
+ // baseURL: 'http://192.168.31.217:10010/',
baseURL: 'http://124.71.79.122/',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
diff --git a/other/follow/follow.vue b/other/follow/follow.vue
index 4246f1c..3fa52f9 100644
--- a/other/follow/follow.vue
+++ b/other/follow/follow.vue
@@ -22,7 +22,7 @@
-
+
{{ item.whetherAttention ? '取消关注' : '关注' }}
我想采购
diff --git a/other/procureDetail/procureDetail.vue b/other/procureDetail/procureDetail.vue
index b513e93..c407974 100644
--- a/other/procureDetail/procureDetail.vue
+++ b/other/procureDetail/procureDetail.vue
@@ -17,7 +17,7 @@
{{ item.prodName}}
- ¥{{ item.price }}
+ {{ item.price ? '¥' + item.price : '面议' }}
{{ item.prodCount }}件
diff --git a/other/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue
index 1b21fdf..2e6ff5c 100644
--- a/other/registeredActivity/registeredActivity.vue
+++ b/other/registeredActivity/registeredActivity.vue
@@ -38,6 +38,7 @@
+
diff --git a/other/vouchers/vouchers.vue b/other/vouchers/vouchers.vue
index 3e40551..920b0af 100644
--- a/other/vouchers/vouchers.vue
+++ b/other/vouchers/vouchers.vue
@@ -2,11 +2,11 @@
- - {{ tab.name }}
+ - {{ tab.name }}
-
+
{{ item.competitionName }}
@@ -15,6 +15,7 @@
{{ item.status === 1 ? '电子入场券' : '使用' }}
+
@@ -92,6 +92,7 @@
teamName: '',
// avatar: Common.avatar,
avatar: '',
+ clickNum: 0,
}
},
onShow() {
@@ -320,13 +321,13 @@
.wrap {
position: relative;
height: 60vh;
- padding: 214rpx 74rpx 28rpx;
+ padding: 190rpx 74rpx 28rpx;
margin: 0 61rpx;
text-align: center;
background-color: #fff;
border-radius: 20rpx;
.logo {
- width: 393rpx;
+ width: 200rpx;
}
.hello {
margin: 36rpx 0;
@@ -460,13 +461,13 @@
}
.avatar-wrap {
padding: 30rpx 0;
+ text-align: center;
.avatar-btn {
padding: 0;
- line-height: 0;
+ line-height: normal;
border: 0 !important;
background-color: transparent;
outline: none;
- border-radius: 50%;
&:after {
display: none;
}
@@ -483,16 +484,20 @@
text-align: center;
color: #7d7d7d;
}
-
.btn {
width: 300rpx;
padding: 20rpx 0;
- margin: 30rpx auto 0;
+ margin: 5rpx auto 0;
font-size: 28rpx;
color: #fff;
text-align: center;
background-color: $uni-primary;
border-radius: 20px;
}
+ .next {
+ margin-top: 30rpx;
+ font-size: 26rpx;
+ color: #9e9e9e;
+ }
}
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 320b465..da181a8 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -181,7 +181,6 @@
},
enterInfo: {},
headerTop: 0,
- auditStatus: '',
isMember: true, // 成员标识
curAccount: {
account: ''
@@ -209,6 +208,7 @@
// #endif
this.platformId = uni.getStorageSync('platformId')
this.per = true
+ this.enterInfo = {}
this.enterDisabled = 0
this.getInfo()
this.getEnterInfo()
@@ -238,7 +238,7 @@
// 团队信息
const org = result.organizationInfoList.filter(e => !e.isEnable)
if (org && org.length) {
- if (this.teams) {
+ if (org.length) {
/**
* @description 如果是第一次进,则默认选中第一个团队,并把该团队的信息存入缓存
* 或者团队列表里没有该id,则说明超管已经被转让,也需要重新选中团队
@@ -304,7 +304,6 @@
async getEnterInfo() {
const { data } = await enterpriseCertificationStatus(this.openId)
if (data) {
- this.auditStatus = Common.authenticationStatus.find(e => e.id === data.authenticationStatus).name
this.enterInfo = data
}
},
diff --git a/team/auth/auth.vue b/team/auth/auth.vue
index 04f3df0..f44634d 100644
--- a/team/auth/auth.vue
+++ b/team/auth/auth.vue
@@ -195,7 +195,9 @@
uni.hideLoading()
this.publicNotice()
} catch(e) {
- uni.hideLoading()
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1500)
this.submiting = false
}
},