|
|
@@ -86,13 +86,19 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="box">
|
|
|
- <view class="box-item">
|
|
|
- <view class="box-left">
|
|
|
- 所属街道
|
|
|
+ <view class="tipss">
|
|
|
+ <view class="box-item tips">
|
|
|
+ <view class="box-left">
|
|
|
+ 所属街道
|
|
|
+ </view>
|
|
|
+ <view class="box-right">
|
|
|
+ <input type="text" class="f24" placeholder="请输入所属街道" v-model="address" />
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <view class="box-right">
|
|
|
- <input type="text" class="f24" placeholder="请输入所属街道" v-model="address" />
|
|
|
+ <view class="tip">
|
|
|
+ 如您居住于长宁区，请填写您所属的街道与居委名称；如非长宁区居民，请统一填写‘长宁区红十字会
|
|
|
</view>
|
|
|
+
|
|
|
</view>
|
|
|
<!-- <view class="box-item" v-if="intention.indexOf('千万人帮万家') != -1">
|
|
|
<view class="box-left">
|
|
|
@@ -341,8 +347,9 @@
|
|
|
}).then(({
|
|
|
data
|
|
|
}) => {
|
|
|
- this.chooseDire = data.map(item => item.name)
|
|
|
- this.chooseList = data
|
|
|
+ let arr = data.filter(item => item.status == 'normal')
|
|
|
+ this.chooseDire = arr.map(item => item.name)
|
|
|
+ this.chooseList = arr
|
|
|
}).catch()
|
|
|
},
|
|
|
// 选择捐赠意向
|
|
|
@@ -446,19 +453,22 @@
|
|
|
// if (obj.public) {
|
|
|
if (this.is_show) {
|
|
|
if (!obj.donate_er) {
|
|
|
- this.$api.msg('请填写您的姓名');
|
|
|
+ this.$api.msg('请填写您的企业');
|
|
|
return;
|
|
|
}
|
|
|
} else {
|
|
|
if (!obj.donate_er) {
|
|
|
- this.$api.msg('请填写您的企业');
|
|
|
+ this.$api.msg('请填写您的姓名');
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ if (!obj.mobile) {
|
|
|
+ obj.$api.msg('请填写联系方式');
|
|
|
+ return;
|
|
|
+ }
|
|
|
const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
|
|
|
if (!reg.test(obj.mobile)) {
|
|
|
- obj.$api.msg('请填写正确的手机号码');
|
|
|
+ obj.$api.msg('请填写正确的联系方式');
|
|
|
return;
|
|
|
}
|
|
|
// }
|
|
|
@@ -860,6 +870,7 @@
|
|
|
color: #999999;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.tipp {
|
|
|
padding: 20rpx;
|
|
|
font-size: 24rpx;
|
