diff --git a/pages.json b/pages.json
index b5e5212..0305c01 100644
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,7 @@
"navigationBarTitleText": "电子发票",
"navigationBarBackgroundColor": "#000",
"navigationBarTextStyle": "white"
+ // "navigationStyle": "custom"
// "onReachBottomDistance": 10//上拉刷新距离
}
},
diff --git a/pages/Invoicing/Invoicing.vue b/pages/Invoicing/Invoicing.vue
index 2325228..94ff037 100644
--- a/pages/Invoicing/Invoicing.vue
+++ b/pages/Invoicing/Invoicing.vue
@@ -29,7 +29,7 @@
-
+
@@ -51,11 +51,11 @@
接收方式：
-
-
+
+
-
-
+
+
@@ -95,7 +95,7 @@
抬头信息
-
+
@@ -104,14 +104,14 @@
{{list2.title}}
-
+
{{list2.tax_number}}
接收方式
-
- {{list1.email}}
+
+ {{list1.email?list1.email:'请选择电子邮箱'}}
-
+
{{list1.phone}}
@@ -134,7 +134,7 @@
+ confirmText="知道了" :content="text">
@@ -232,6 +232,7 @@
mergelist: [{text: '不合并',value: '0'},{text: '合并',value: '1'}],
form1:{},
form2:{},
+ text:''
}
},
onLoad() {
@@ -452,7 +453,8 @@
this.stepsIndex = 0;
}
API.validateFeePay(data, res => {
- this.amount = res.data.amount
+ this.amount = res.data.amount;
+ this.text = res.msg;
if(!this.amount){
this.$refs.inputDialog.open();
this.stepsIndex = 0;
@@ -667,7 +669,9 @@
/deep/.uni-radio-input{
width: 35rpx;
height: 35rpx;
- margin-left: 20rpx;
+}
+/deep/.uni-label-pointer{
+ margin-right: 20rpx;
}
/deep/.uni-select__input-placeholder{
color: #999;
@@ -676,6 +680,9 @@
/deep/.uni-easyinput__placeholder-class{
font-size: 28rpx;
}
+/deep/.uni-easyinput__content-input{
+ padding-left: 0px !important;
+}
.popup-header {
display: flex;
justify-content: space-between;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 75d3337..767a74f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,7 +12,9 @@
-
+
@@ -85,7 +87,8 @@
state:'',
scrollTop: 0,//滚动条位置
start_date:'',//开始日期
- end_date:''//结束日期
+ end_date:'',//结束日期
+ refreshing: false,
}
},
onLoad(options) {
@@ -115,6 +118,14 @@
}
},
methods: {
+ onRefresh() {
+ this.getUniversityList()
+ if (this.refreshing) return;
+ this.refreshing = true;
+ setTimeout(() => {
+ this.refreshing = false;
+ }, 1000)
+ },
// 解析URL中的参数
getUrlParams(url) {
const params = {};
@@ -398,7 +409,8 @@
.scroll-Y{
width: 100%;
/* #ifdef H5 */
- height: calc(100vh - 154px);
+ height: calc(100vh - 308rpx);
+ // height: calc(100vh - 108px); //去除导航栏就开启这个
/* #endif */
/* #ifdef MP-WEIXIN || APP-PLUS */
height: calc(100vh - 218rpx);
diff --git a/pages/wxlogin/registerphone.vue b/pages/wxlogin/registerphone.vue
index b9c4419..dea556e 100644
--- a/pages/wxlogin/registerphone.vue
+++ b/pages/wxlogin/registerphone.vue
@@ -58,6 +58,15 @@
uni.showToast({title: '请输入手机号',icon: 'none'});
return
}
+ const phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(this.mobile)) {
+ uni.showToast({
+ title: '您输入的手机号格式有误',
+ icon: 'none'
+ });
+ return
+ }
+
this.num = 60; // 设置倒计时总时间
localStorage.setItem('countdownNum', this.num);
this.intervalId = setInterval(this.countDownTimer, 1000);
@@ -68,17 +77,7 @@
},
// 限制手机号
onInput(event) {
- // 使用正则表达式过滤非数字字符
- const phonePattern = /^1[3-9]\d{9}$/;
- if (!phonePattern.test(event.detail.value) && event.detail.value) {
- uni.showToast({
- title: '您输入的手机号格式有误',
- icon: 'none'
- });
- this.mobile = ''; // 清空输入框
- }else{
- this.mobile = event.detail.value
- }
+ this.mobile = event.detail.value
},
register(){
if(!this.mobile){
@@ -93,6 +92,15 @@
uni.showToast({title: '请输入短信验证码',icon: 'none'});
return
}
+ const phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test(this.mobile)) {
+ uni.showToast({
+ title: '您输入的手机号格式有误',
+ icon: 'none'
+ });
+ return
+ }
+
const url = '/wechat/wechat/savePuCode'
let data = {
mobile:this.mobile,