打开注释代码，开屏广告；积分商城订单列表显示品牌；优化获取验证码

pages/index/index/index.vue

@@ -212,13 +212,13 @@
         // 生命周期
         onLoad(e) {
 			// 进入开屏广告页
-			// if(app.globalData.app_first_full){
-			// 	getApp().globalData.app_first_full = false;
-			// 	this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'launch'});
-			// }else if(app.globalData.app_first_alert){
-			// 	getApp().globalData.app_first_alert = false;
-			// 	this.getAlertAd();
-			// }
+			if(app.globalData.app_first_full){
+				getApp().globalData.app_first_full = false;
+				this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'launch'});
+			}else if(app.globalData.app_first_alert){
+				getApp().globalData.app_first_alert = false;
+				this.getAlertAd();
+			}
 		    
 			// 第三方平台配置颜色
 			var gbConfig = this.$cookieStorage.get('globalConfig') || '';

pages/order/pointconfirm/confirm.vue

@@ -229,7 +229,9 @@
 						this.address = res.data.data.address;
 						uni.hideLoading()
 					}else{
-						this.$msg('订单提交失败!', {icon: 'error'})
+						this.$msg(res.data.message || '订单提交失败!').then(() => {
+							this.$toBack();
+						});
 					}
 				}).catch(err => uni.hideLoading())
 			},

pages/point/exchangeRecord/exchangeRecord.vue

@@ -10,7 +10,7 @@
 				<view class="card" v-for="(item, index) in list" :key="index" @click="$url('/pages/order/newdetail/newdetail?type=point&order_id='+item.order_no)">
 					<view>
 						<text class="lf-iconfont icon-Group- lf-font-30"></text>
-						<text class="shop-name">{{item.from}}</text>
+						<text class="shop-name">{{item.brand.name}}</text>
 						<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
 					</view>
 					<view class="lf-flex lf-m-t-20" v-for="(item2,index2) of item.items" :key="index2">

pages/user/loginType/loginType.vue

@@ -43,7 +43,7 @@
 				code: '',
 				is_code: false,
 				timer: null,
-				num: 10
+				num: 60
 			}
 		},
 		onLoad(){
@@ -70,7 +70,7 @@
 					if(this.num <= 0){
 						clearInterval(this.timer);
 						this.timer = null;
-						this.num = 10;
+						this.num = 60;
 						this.is_code = false;
 					}
 				}, 1000);

pages/user/my/newPhone.vue

@@ -33,7 +33,7 @@
 				code: '',
 				is_code: false,
 				timer: null,
-				num: 10,
+				num: 60,
 				token: ''
 			}
 		},
@@ -64,7 +64,7 @@
 					if(this.num <= 0){
 						clearInterval(this.timer);
 						this.timer = null;
-						this.num = 10;
+						this.num = 60;
 						this.is_code = false;
 					}
 				}, 1000);
@@ -80,9 +80,16 @@
 						Authorization: this.token
 					}
 				}).then(res => {
-					console.log("-------", res);
-					if(res.data.code == 200){
+					if(res.data.success){
 						this.$msg(res.data.message, {icon: 'success'});
+					}else{
+						this.$msg(res.data.message);
+						if(this.timer){
+							clearInterval(this.timer);
+							this.timer = null;
+							this.num = 60;
+							this.is_code = false;
+						}
 					}
 				})
 			},

pages/user/my/setPassword.vue

@@ -37,7 +37,7 @@
 				code: '',
 				is_code: false,
 				timer: null,
-				num: 10,
+				num: 60,
 				show_pay: false,
 				show_again_pay: false,
 				token: '',
@@ -72,7 +72,7 @@
 					if(this.num <= 0){
 						clearInterval(this.timer);
 						this.timer = null;
-						this.num = 10;
+						this.num = 60;
 						this.is_code = false;
 					}
 				}, 1000);
@@ -88,7 +88,17 @@
 						Authorization: this.token
 					}
 				}).then(res => {
-					this.$msg(res.data.message, {icon: 'success'});
+					if(res.data.success){
+						this.$msg(res.data.message, {icon: 'success'});
+					}else{
+						this.$msg(res.data.message);
+						if(this.timer){
+							clearInterval(this.timer);
+							this.timer = null;
+							this.num = 60;
+							this.is_code = false;
+						}
+					}
 				})
 			},
 			// 下一步

pages/user/my/verificationPhone.vue

@@ -33,7 +33,7 @@
 				code: '',
 				is_code: false,
 				timer: null,
-				num: 10,
+				num: 60,
 				token: ''
 			}
 		},
@@ -64,7 +64,7 @@
 					if(this.num <= 0){
 						clearInterval(this.timer);
 						this.timer = null;
-						this.num = 10;
+						this.num = 60;
 						this.is_code = false;
 					}
 				}, 1000);
@@ -80,7 +80,17 @@
 						Authorization: this.token
 					}
 				}).then(res => {
-					this.$msg(res.data.message, {icon: 'success'});
+					if(res.data.success){
+						this.$msg(res.data.message, {icon: 'success'});
+					}else{
+						this.$msg(res.data.message);
+						if(this.timer){
+							clearInterval(this.timer);
+							this.timer = null;
+							this.num = 60;
+							this.is_code = false;
+						}
+					}
 				})
 			},
 			next(){