diff --git a/pages/packageA/user/apply_in.vue b/pages/packageA/user/apply_in.vue
index bddde59..217591f 100644
--- a/pages/packageA/user/apply_in.vue
+++ b/pages/packageA/user/apply_in.vue
@@ -7,7 +7,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
@@ -15,94 +15,106 @@
-
-
+
+
-
+
- 同意入会协议
+ 同意入会协议
- 下一步
+ 下一步
-
-
-
- 推荐人
+
+
+
+ 推荐人
+
+
+
+
-
-
-
-
-
-
- 手机号
+
+
+
+ 手机号
-
-
-
-
-
-
- 真实姓名
+
+
+
-
-
-
-
-
-
- 性别
+
+
+
+
+ 真实姓名
+
+
+
-
-
-
-
-
-
- 企业名称
+
+
+
+
+ 性别
-
-
+
+
+
+
+
+
+
+
+
+
+ 企业名称
+
+
+
+ placeholder-style="color:#9B9B9B">
-
-
- 所属行业
+
+
+
+
+ 所属行业
-
-
+
+
-
- {{formData.industrynew_id_name}}
+
+ {{new_info.industrynew_id_name}}
+
-
-
- 申请理由
+
+
+
+
+ 申请理由
-
-
+
-
-
上一步
-
提交申请
+
+ 上一步
+ 提交申请
@@ -154,22 +166,23 @@
phone: '',
nikename: '',
enterprise_name: '',
- gender_name: '请选择',
+ gender_name: '',
gender: 0,
industry_id: 0,
reason: '',
industrynew_id: 0,
+ industrynew_id_name: '请选择所属行业',
},
formData: {
position_name: '请选择',
position_id: 0,
industry_id: '',
industry_id_name: '请选择',
- industrynew_id_name: '请选择',
+ industrynew_id_name: '请选择所属行业',
phone: '',
password: '',
nikename: '',
- gender_name: '请选择',
+ gender_name: '',
gender: 0,
birth_time_name: '请选择',
birth_time: '',
@@ -363,7 +376,7 @@
getindustryId(d) {
console.log(d);
var info = d[0];
- this.formData.industrynew_id_name = info.label;
+ this.new_info.industrynew_id_name = info.label;
this.new_info.industrynew_id = info.value;
},
birth_time_chick(d) {
@@ -795,4 +808,32 @@
}
/* 标签内容 end*/
+
+
+
+ .bfre{
+ position: relative;
+ .bf{
+ margin-left: 12rpx;
+ &::before{
+ border-radius: 936rpx;
+ content: ' ';
+ width: 4rpx;
+ height: 24rpx;
+ background: #2368F2;
+ position: absolute;
+ top: 8rpx;
+ left: 0;
+ }
+
+ }
+ }
+
+ .line {
+ width: 690rpx;
+ height: 1rpx;
+ background: #E5E5E5;
+ margin: 0 auto;
+ }
+
\ No newline at end of file
diff --git a/pages/packageA/user/events_my.vue b/pages/packageA/user/events_my.vue
index fb2f3d1..4bd7409 100644
--- a/pages/packageA/user/events_my.vue
+++ b/pages/packageA/user/events_my.vue
@@ -6,7 +6,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageA/user/my_apply.vue b/pages/packageA/user/my_apply.vue
index f2cbc46..7983e6c 100644
--- a/pages/packageA/user/my_apply.vue
+++ b/pages/packageA/user/my_apply.vue
@@ -6,7 +6,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageA/user/my_card.vue b/pages/packageA/user/my_card.vue
index 602f01b..62ae3fb 100644
--- a/pages/packageA/user/my_card.vue
+++ b/pages/packageA/user/my_card.vue
@@ -22,19 +22,19 @@
-
-
{{userThisInfo.nikename}}
- 协会职务：{{userThisInfo.position_name==null||userThisInfo.position_name==''?'无':userThisInfo.position_name}}
+ 协会职务：{{userThisInfo.position_name == null || userThisInfo.position_name == '' ? '无' : userThisInfo.position_name }}
性别：{{userThisInfo.gender==0?'女':'男'}}
-
+
联系方式：{{userThisInfo.phone}}
联系方式：***********
@@ -47,7 +47,7 @@
个人经历
-
+
{{userThisInfo.introduction==''||userThisInfo.introduction==null?'无':userThisInfo.introduction}}
@@ -56,17 +56,17 @@
-
-
- {{userThisInfo.enterprise_name==null||userThisInfo.enterprise_name==''?'未填写':userThisInfo.enterprise_name}}
+ {{userThisInfo.enterprise_name == null || userThisInfo.enterprise_name == '' ? '未填写' : userThisInfo.enterprise_name}}
- 所属行业：{{userThisInfo.industry_id==-1?'其他行业':userThisInfo.industry_name}}
+ 所属行业：{{ userThisInfo.industry_id == -1 ? '其他行业' : userThisInfo.industry_name }}
企业地址：{{userThisInfo.enterprise_location==null||userThisInfo.enterprise_location==''?'无':userThisInfo.enterprise_location}}
@@ -118,7 +118,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageA/user/my_card_holder.vue b/pages/packageA/user/my_card_holder.vue
index b801a98..45508da 100644
--- a/pages/packageA/user/my_card_holder.vue
+++ b/pages/packageA/user/my_card_holder.vue
@@ -7,7 +7,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageA/user/my_desc.vue b/pages/packageA/user/my_desc.vue
index 0d3e37a..e906a79 100644
--- a/pages/packageA/user/my_desc.vue
+++ b/pages/packageA/user/my_desc.vue
@@ -6,7 +6,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageA/user/my_edit.vue b/pages/packageA/user/my_edit.vue
index 9a69edd..4b9498f 100644
--- a/pages/packageA/user/my_edit.vue
+++ b/pages/packageA/user/my_edit.vue
@@ -1,5 +1,5 @@
-
+
@@ -14,24 +14,24 @@
-
-
+
-
+
+ style="width: 164rpx;height: 164rpx;border-radius: 50%;">
-
+
-
+
个人资料
@@ -129,7 +129,7 @@
公司Logo
- 暂无
+ 暂无
@@ -166,8 +166,8 @@
-
+
提交审核
@@ -210,8 +210,8 @@
-
+
@@ -228,12 +228,12 @@
-
- 取消
+ 取消 -->
- 确定
+ style="width: 616rpx;height: 90rpx;background: #2368F2;text-align: center;line-height: 90rpx;border-radius: 50rpx;">
+ 保存
@@ -541,7 +541,7 @@
nikename: res.data.nikename,
phone: res.data.phone,
wx_number: res.data.wx_number,
- introduction: res.data.introduction == null || res.data.introduction == '' ? '无' : res
+ introduction: res.data.introduction == null || res.data.introduction == '' ? '请输入个人经历' : res
.data.introduction,
enterprise_name: res.data.enterprise_name == null || res.data.enterprise_name == '' ?
'无' : res.data.enterprise_name,
@@ -597,6 +597,13 @@
\ No newline at end of file
diff --git a/pages/packageA/user/my_idea.vue b/pages/packageA/user/my_idea.vue
index 1d5e251..6dfdb8d 100644
--- a/pages/packageA/user/my_idea.vue
+++ b/pages/packageA/user/my_idea.vue
@@ -1,58 +1,60 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
- 反馈人
+
+ 反馈人
+
+
+
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+
+
+
+
+ 反馈内容
-
-
-
-
-
- 联系方式
-
-
-
-
-
-
-
- 反馈内容
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 提交信息
+
+
+
@@ -128,6 +130,12 @@ import store from "@/store";
diff --git a/pages/packageA/user/my_msg.vue b/pages/packageA/user/my_msg.vue
index 74cc3a1..9068496 100644
--- a/pages/packageA/user/my_msg.vue
+++ b/pages/packageA/user/my_msg.vue
@@ -7,7 +7,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageA/user/user_activity.vue b/pages/packageA/user/user_activity.vue
index a28b78d..2eca239 100644
--- a/pages/packageA/user/user_activity.vue
+++ b/pages/packageA/user/user_activity.vue
@@ -22,7 +22,7 @@
- 请上传活动主图
+ 请上传活动主图
diff --git a/pages/packageB/news/new_info.vue b/pages/packageB/news/new_info.vue
index 252a01a..9f9fce5 100644
--- a/pages/packageB/news/new_info.vue
+++ b/pages/packageB/news/new_info.vue
@@ -6,7 +6,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/pages/packageB/news/notice_info.vue b/pages/packageB/news/notice_info.vue
index c7b9307..9673d40 100644
--- a/pages/packageB/news/notice_info.vue
+++ b/pages/packageB/news/notice_info.vue
@@ -6,7 +6,7 @@
+ style="text-shadow: 1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
diff --git a/static/choose.png b/static/choose.png
new file mode 100644
index 0000000..5164dae
Binary files /dev/null and b/static/choose.png differ
diff --git a/tuniao-ui/components/tn-steps/tn-steps.vue b/tuniao-ui/components/tn-steps/tn-steps.vue
index e43ba61..565ab1c 100644
--- a/tuniao-ui/components/tn-steps/tn-steps.vue
+++ b/tuniao-ui/components/tn-steps/tn-steps.vue
@@ -305,8 +305,8 @@
flex-direction: column;
.tn-steps__item__line {
- border-bottom-width: 1px;
- border-bottom-style: solid;
+ border-bottom-width: 2px;
+ border-bottom-style: dashed;
width: 50%;
left: 75%;
@@ -327,8 +327,8 @@
min-height: 120rpx;
.tn-steps__item__line {
- border-left-width: 1px;
- border-left-style: solid;
+ border-left-width: 2px;
+ border-left-style: dashed;
height: 50%;
top: 75%;