Skip to content

J
jiedao-app-customer-new-master
Commit b509fd1a authored by honghy's avatar honghy Committed by wux
Browse files
Options

修改提示弹框

parent d5650167
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 93 deletions
src/pages/changeTel/changeTel.vue
View file @ b509fd1a
......@@ -115,7 +115,7 @@
if(this.mobile == ''){
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error',
icon: 'none',
})
}
if (this.leftTime < 60) {
......@@ -146,7 +146,7 @@
}else{
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon: 'none',
})
}
})
......@@ -176,25 +176,25 @@
if(this.oldMobile == ''){
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error',
icon: 'none',
})
}
if(this.code == ''){
return uni.showToast({
title: this.$lang.lang.notices.code,
icon: 'error',
icon: 'none',
})
}
if(this.password == ''){
return uni.showToast({
title: this.$lang.lang.notices.password,
icon: 'error',
icon: 'none',
})
}
if(this.mobile == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPhone,
icon: 'error',
icon: 'none',
})
}
if(!this.agree){
......
src/pages/create_order/create_order.vue
View file @ b509fd1a
......@@ -465,7 +465,8 @@
<view class="corder-v5-v corder-picker" >
<view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.date}}</view>
<picker mode="date" class="date-picker" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
<view class="uni-input">{{params.deliveryDate ? params.deliveryDate.split(" ")[0] : '请选择'}}</view>
<view class="uni-input">{{params.deliveryDate ? params.deliveryDate.split(" ")[0] : $lang.lang.create.choose}}</view>
</picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
</view>
......@@ -1354,7 +1355,7 @@ export default {
that.isClick = false
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon:"none",
})
}
})
......@@ -1370,7 +1371,7 @@ export default {
if(res.code!=0){
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon:"none",
})
}
})
......@@ -1749,7 +1750,7 @@ export default {
if(this.hasConsignee && !this.params.consigneeName){
return uni.showToast({
title: this.$lang.lang.notices.consignee,
icon: 'error',
icon:"none",
})
}
if(this.hasConsignee && !this.params.countryCode){
......@@ -1759,12 +1760,12 @@ export default {
if(this.hasConsignee && !this.params.consigneePhone){
return uni.showToast({
title: this.$lang.lang.notices.consigneePhone,
icon: 'error',
icon:"none",
})
}/*else if(!this.params.isCargoControl && this.params.countryCode==this.config.countrySn.value[0]){
return uni.showToast({
title: this.$lang.lang.notices.foreignConsignee,
icon: 'error',
icon:"none",
})
}*/
......@@ -1774,7 +1775,7 @@ export default {
if (!email_reg.test(this.params.consigneeEmail)) {
return uni.showToast({
title: this.$lang.lang.notices.noEmail,
icon: 'error',
icon:"none",
})
}
}
......@@ -1790,7 +1791,7 @@ export default {
if(isNotAcceptGoods){
return uni.showToast({
title: this.$lang.lang.notices.isClude,
icon: 'error',
icon:"none",
})
}
......@@ -1798,60 +1799,60 @@ export default {
if(!this.params.transportId) {
return uni.showToast({
title: this.$lang.lang.notices.transport,
icon: 'error',
icon:"none",
})
}
// if(this.params.transportId>2&&!this.params.channelId){
// return uni.showToast({
// title: this.$lang.lang.notices.channel,
// icon: 'error',
// icon:"none",
// })
// }
if(this.params.lineId==''||this.params.lineId==null){
return uni.showToast({
title: this.$lang.lang.notices.lined,
icon: 'error',
icon:"none",
})
}
if(this.params.departureId==''||this.params.departureId==null){
return uni.showToast({
title: this.$lang.lang.notices.startCity,
icon: 'error',
icon:"none",
})
}
if(this.params.objectiveId==''||this.params.objectiveId==null){
return uni.showToast({
title: this.$lang.lang.notices.endCity,
icon: 'error',
icon:"none",
})
}
// if(this.params.number==''||this.params.number==null){
// return uni.showToast({
// title: '请输入快递单号',
// icon: 'error',
// icon:"none",
// })
// }
if(this.params.marks==''||this.params.marks==null){
return uni.showToast({
title: this.$lang.lang.notices.marksIn,
icon: 'error',
icon:"none",
})
}/*else if(parseFloat(this.params.marks.slice(0,1)).toString() != "NaN"){
return uni.showToast({
title: this.$lang.lang.notices.marksNum,
icon: 'error',
icon:"none",
})
}*/
if(this.params.customsType==''||this.params.customsType==null){
return uni.showToast({
title: this.$lang.lang.notices.customsType,
icon: 'error',
icon:"none",
})
}
if(this.params.deliveryDate==''||this.params.deliveryDate==null){
return uni.showToast({
title: this.$lang.lang.notices.date,
icon: 'error',
icon:"none",
})
}
if(this.params.isCargoControl){
......@@ -1883,13 +1884,13 @@ export default {
if(!this.params.collectionProxy){
return uni.showToast({
title: this.$lang.lang.create.needCollectionAmount,
icon: 'error',
icon:"none",
})
}
if(!this.params.collectionProxyCurrency){
return uni.showToast({
title: this.$lang.lang.create.needCollectionCurrency,
icon: 'error',
icon:"none",
})
}
}
......@@ -2277,7 +2278,7 @@ export default {
if(this.goodsModel.prodTitle==''){
return uni.showToast({
title: this.$lang.lang.notices.shopname,
icon: 'error',
icon:"none",
})
}
if(this.goodsModel.brandType ==''||this.goodsModel.brandType==null){
......@@ -2295,7 +2296,7 @@ export default {
if(this.goodsModel.num ==''||this.goodsModel.num==null){
return uni.showToast({
title: this.$lang.lang.notices.num,
icon: 'error',
icon:"none",
})
}else if(this.goodsModel.num<=0||Math.floor(this.goodsModel.num)!=this.goodsModel.num){
console.log(Math.floor(this.goodsModel.num)!=this.goodsModel.num)
......@@ -2306,7 +2307,7 @@ export default {
if(this.goodsModel.unit ==''||this.goodsModel.unit==null){
return uni.showToast({
title: this.$lang.lang.notices.unit,
icon: 'error',
icon:"none",
})
}
......@@ -2328,7 +2329,7 @@ export default {
if(this.goodsModel.worth ==''||this.goodsModel.worth==null){
return uni.showToast({
title: this.$lang.lang.notices.works,
icon: 'error',
icon:"none",
})
}else if(this.goodsModel.worth<=0){
return uni.showToast({
......@@ -2456,31 +2457,31 @@ export default {
if(!this.params.transportId) {
return uni.showToast({
title: this.$lang.lang.notices.transport,
icon: 'error',
icon:"none",
})
}
// if(this.params.transportId>2&&!this.params.channelId){
// return uni.showToast({
// title: this.$lang.lang.notices.channel,
// icon: 'error',
// icon:"none",
// })
// }
if(this.params.departureId==''||this.params.departureId==null){
return uni.showToast({
title: this.$lang.lang.notices.startCity,
icon: 'error',
icon:"none",
})
}
if(this.params.objectiveId==''||this.params.objectiveId==null){
return uni.showToast({
title: this.$lang.lang.notices.endCity,
icon: 'error',
icon:"none",
})
}
if(this.params.lineId==''||this.params.lineId==null){
return uni.showToast({
title: this.$lang.lang.notices.lined,
icon: 'error',
icon:"none",
})
}
this.goodsEditIndex = index
......@@ -2557,7 +2558,7 @@ export default {
}else{
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon:"none",
})
}
})
......@@ -2569,19 +2570,19 @@ export default {
if(this.conForm.name ==''||this.conForm.name==null){
return uni.showToast({
title: this.$lang.lang.notices.name,
icon: 'error',
icon:"none",
})
}
if(this.conForm.phone ==''||this.conForm.phone==null){
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error',
icon:"none",
})
}
if(this.conForm.email ==''||this.conForm.email==null){
// return uni.showToast({
// title: this.$lang.lang.notices.email,
// icon: 'error',
// icon:"none",
// })
}else{
let email_reg = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
......@@ -2589,7 +2590,7 @@ export default {
if (!email_reg.test(this.conForm.email)) {
return uni.showToast({
title: this.$lang.lang.notices.noEmail,
icon: 'error',
icon:"none",
})
}
}
......
src/pages/deletion/login.vue
View file @ b509fd1a
......@@ -240,21 +240,21 @@ export default {
if (this.mobile == '') {
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error'
icon: 'none'
})
}
if (this.password == '' && this.loginType == 1) {
return uni.showToast({
title: this.$lang.lang.notices.password,
icon: 'error'
icon: 'none'
})
}
if (this.code == '' && this.loginType == 2) {
return uni.showToast({
title: this.$lang.lang.notices.code,
icon: 'error'
icon: 'none'
})
}
......@@ -288,7 +288,7 @@ export default {
if (this.mobile == '') {
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error'
icon: 'none'
})
}
if (this.leftTime < 60) {
......
src/pages/editPsd/editPsd.vue
View file @ b509fd1a
......@@ -75,27 +75,27 @@
if(this.oldPassword == ''){
return uni.showToast({
title: this.$lang.lang.notices.oldPsd,
icon: 'error',
icon: 'none',
})
}
if(this.password == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPsd,
icon: 'error',
icon: 'none',
})
}else{
var reg1 = new RegExp('^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,32})$')
if (!reg1.test(this.password)) {
return uni.showToast({
title: this.$lang.lang.notices.numPsd,
icon: 'error',
icon: 'none',
})
}
}
if(this.password2 == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPsd,
icon: 'error',
icon: 'none',
})
}
if(this.password!=this.password2){
......
src/pages/edit_control/edit_control.vue
View file @ b509fd1a
......@@ -52,7 +52,7 @@
if(this.password == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPsd,
icon: 'error',
icon: 'none',
})
}else{
console.log(this.password)
......@@ -61,7 +61,7 @@
if (!reg1.test(this.password)) {
return uni.showToast({
title: this.$lang.lang.notices.numPsd,
icon: 'error',
icon: 'none',
})
}
}
......@@ -69,7 +69,7 @@
if(this.password2 == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPsd,
icon: 'error',
icon: 'none',
})
}
if(this.password!=this.password2){
......
src/pages/edit_mail/edit_mail.vue
View file @ b509fd1a
......@@ -52,7 +52,7 @@
if(this.mail == ''){
return uni.showToast({
title: this.$lang.lang.notices.email,
icon: 'error',
icon: 'none',
})
}
if (this.leftTime < 60) {
......@@ -86,20 +86,20 @@
if(this.code == ''){
return uni.showToast({
title: this.$lang.lang.notices.code,
icon: 'error',
icon: 'none',
})
}
if(this.mail == ''){
return uni.showToast({
title:this.$lang.lang.notices.email,
icon: 'error',
icon: 'none',
})
}else{
let email_reg = /[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/
if (!email_reg.test(this.mail)) {
return uni.showToast({
title: this.$lang.lang.notices.noEmail,
icon: 'error',
icon: 'none',
})
}
}
......
src/pages/login/login.vue
View file @ b509fd1a
......@@ -271,7 +271,7 @@ export default {
if (this.code == '' && this.loginType == 2) {
return uni.showToast({
title: this.$lang.lang.notices.code,
icon: 'error'
icon: 'none'
})
}
......
src/pages/order/order.vue
View file @ b509fd1a
......@@ -638,45 +638,45 @@
if(!this.lendingFrom.consigneeName){
return uni.showToast({
title: this.$lang.lang.notices.consignee,
icon: 'error',
icon: 'none',
})
}
if(!this.lendingFrom.consigneePhone){
return uni.showToast({
title: this.$lang.lang.notices.consigneePhone,
icon: 'error',
icon: 'none',
})
}
if(!this.lendingFrom.pickNum){
return uni.showToast({
title: this.$lang.lang.notices.sum,
icon: 'error',
icon: 'none',
})
}
if(!this.lendingFrom.pickWeight){
return uni.showToast({
title: this.$lang.lang.notices.weight,
icon: 'error',
icon: 'none',
})
}
if(!this.lendingFrom.pickVolume){
return uni.showToast({
title: this.$lang.lang.notices.volume,
icon: 'error',
icon: 'none',
})
}
if(!this.lendingFrom.code&&!this.lendingFrom.controlPassword){
return uni.showToast({
title: this.$lang.lang.order.controlNotice,
icon: 'error',
icon: 'none',
})
}
if(this.lendingFrom.pickNum>(this.selectOrder.sumNum-this.releaseData.releaseNum))
{
return uni.showToast({
title: this.$lang.lang.notices.conNotice,
icon: 'error',
icon: 'none',
})
}
this.$refs.lendingNotice.open()
......@@ -697,7 +697,7 @@
}else{
uni.showToast({
title: res.msg,
icon: 'error',
icon: 'none',
})
}
})
......@@ -726,7 +726,7 @@
if(!this.transferFrom.phone){
return uni.showToast({
title: this.$lang.lang.notices.newControlTel,
icon: 'error',
icon: 'none',
})
}
this.transferFrom.dialCode=this.transferFrom.dialCode||'86',
......@@ -736,7 +736,7 @@
}else{
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon: 'none',
})
}
})
......@@ -745,13 +745,13 @@
if(!this.transferFrom.name){
return uni.showToast({
title: this.$lang.lang.notices.newControl,
icon: 'error',
icon: 'none',
})
}
if(!this.transferFrom.controlPassword&&!this.transferFrom.code){
return uni.showToast({
title: this.$lang.lang.order.controlNotice,
icon: 'error',
icon: 'none',
})
}
......@@ -807,7 +807,7 @@
}else{
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon: 'none',
})
}
})
......
src/pages/price_inquiry/price_inquiry.vue
View file @ b509fd1a
......@@ -375,56 +375,56 @@
if(this.params.departureId==''||this.params.departureId==null){
return uni.showToast({
title: this.$lang.lang.notices.startCity,
icon: 'error',
icon: 'none',
})
}
if(this.params.objectiveId==''||this.params.objectiveId==null){
return uni.showToast({
title: this.$lang.lang.notices.endCity,
icon: 'error',
icon: 'none',
})
}
if(!this.params.prodId){
return uni.showToast({
title: this.$lang.lang.notices.shopname,
icon: 'error',
icon: 'none',
})
}
if(!this.params.weight&&this.params.weight<=0){
return uni.showToast({
title: this.$lang.lang.notices.weight,
icon: 'error',
icon: 'none',
})
}
if(!this.params.num&&this.params.num<=0){
return uni.showToast({
title: this.$lang.lang.notices.num,
icon: 'error',
icon: 'none',
})
}
if(!this.params.quantity&&this.params.quantity<=0){
return uni.showToast({
title: this.$lang.lang.notices.goodsSum,
icon: 'error',
icon: 'none',
})
}
if(!this.params.long&&this.params.long<=0){
return uni.showToast({
title: this.$lang.lang.notices.long,
icon: 'error',
icon: 'none',
})
}
if(!this.params.wide&&this.params.wide<=0){
return uni.showToast({
title: this.$lang.lang.notices.wide,
icon: 'error',
icon: 'none',
})
}
if(!this.params.high&&this.params.high<=0){
return uni.showToast({
title: this.$lang.lang.notices.height,
icon: 'error',
icon: 'none',
})
}
if(this.params.long&&this.params.wide&&this.params.high){
......
src/pages/register/shareRegister.vue
View file @ b509fd1a
......@@ -207,7 +207,7 @@ export default {
} else {
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error'
icon: 'none'
})
}
})
......@@ -216,7 +216,7 @@ export default {
if (this.mobile == '') {
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error'
icon: 'none'
})
}
if (this.leftTime < 60) {
......@@ -245,32 +245,32 @@ export default {
if (this.mobile == '') {
return uni.showToast({
title: this.$lang.lang.notices.phone,
icon: 'error'
icon: 'none'
})
}
if (this.code == '') {
return uni.showToast({
title: this.$lang.lang.notices.code,
icon: 'error'
icon: 'none'
})
}
if (this.password == '') {
return uni.showToast({
title: this.$lang.lang.notices.password,
icon: 'error'
icon: 'none'
})
}
if (this.passworded == '') {
return uni.showToast({
title: this.$lang.lang.notices.nextPsd,
icon: 'error'
icon: 'none'
})
} else {
var reg1 = new RegExp('^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,32})$')
if (!reg1.test(this.passworded)) {
return uni.showToast({
title: this.$lang.lang.notices.numPsd,
icon: 'error'
icon: 'none'
})
}
}
......
src/pages/site/site.vue
View file @ b509fd1a
......@@ -537,21 +537,21 @@ export default {
if (this.password == '') {
return uni.showToast({
title: this.$lang.lang.notices.password,
icon: 'error'
icon: 'none'
})
} else {
var reg1 = new RegExp('^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,32})$')
if (!reg1.test(this.password)) {
return uni.showToast({
title: this.$lang.lang.notices.numPsd,
icon: 'error'
icon: 'none'
})
}
}
if (this.password2 == '') {
return uni.showToast({
title: this.$lang.lang.notices.nextPsd,
icon: 'error'
icon: 'none'
})
}
if (this.password != this.password2) {
......
src/pages/telcode/telcode.vue
View file @ b509fd1a
......@@ -115,7 +115,7 @@
}else{
uni.showToast({
title: this.$lang.lang.notices.nophone,
icon: 'error',
icon: 'none',
})
}
})
......@@ -146,27 +146,27 @@
if(this.code == ''){
return uni.showToast({
title: this.$lang.lang.notices.code,
icon: 'error',
icon: 'none',
})
}
if(this.password == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPsd,
icon: 'error',
icon: 'none',
})
}else{
var reg1 = new RegExp('^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,32})$')
if (!reg1.test(this.password)) {
return uni.showToast({
title: this.$lang.lang.notices.numPsd,
icon: 'error',
icon: 'none',
})
}
}
if(this.password2 == ''){
return uni.showToast({
title: this.$lang.lang.notices.newPsd,
icon: 'error',
icon: 'none',
})
}
if(this.password!=this.password2){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment