Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet

pages/index/index.vue

@@ -728,20 +728,15 @@
 			})
 		},
 
-
-
 		onReachBottom() {
-
 			if (this.productList.length > 0) {
 				setTimeout(() => {
 					this.getGoods(false);
 					this.getindex();
 				}, 10)
 			}
-
 		},
 
-
 		onShow() {
 			if (this.loadEndFlag) {
 				this.getUserInfo();
@@ -894,10 +889,7 @@
 							title: res
 						});
 					})
-
-
 				}
-
 			},
 			changePopup(e) {
 				if (e.show) uni.hideTabBar();
@@ -907,7 +899,6 @@
 			refundModify(item) {
 				this.refundInfo = item;
 
-
 				this.refundMark = true;
 			},
 			//同意
@@ -951,7 +942,6 @@
 					this.countDown();
 				}, 1000);
 
-
 			},
 			//验证
 			validateBtn: function() {
@@ -1032,33 +1022,20 @@
 
 					});
 				}
-
 			},
 			//删除图片
 			DelPic(data) {
 				let that = this;
 				if (data.type == 1) {
-
 					that.merchantData.cardno_front = ''
-
-
 				} else if (data.type == 2) {
-
 					that.merchantData.cardno_back = ''
-
-
 				} else if (data.type == 3) {
 
 					that.merchantData.bank_front = ''
-
-
 				} else {
-
 					that.merchantData.bank_back = ''
-
-
 				}
-
 			},
 
 			//商家设置
@@ -1174,18 +1151,15 @@
 						.is_company = 0
 					this.userid = res.data.uid
 					this.userInfoData = res.data;
-					this.list[0].value = res.data.now_money;
 					this.$store.commit('SET_USERINFO', res.data);
 					this.merchantData.phone = res.data.phone;
 					if (res.data.mer_info.is_company == 0) !this.merchantData.company_name ? this.merchantData
 						.company_name = "" : null;
 					else this.merchantData.company_name = res.data.mer_info.company_name;
 					if (res.data.service == null) {
-						// console.log('123');
 						this.isgShow = false
 					} else {
 						this.isgShow = true
-
 					}
 					if (res.data.mer_info.length == 0) {
 						uni.showModal({
@@ -1230,7 +1204,6 @@
 
 			// 备注
 			save() {
-
 				let that = this;
 				if (!that.refundInfo.remark) {
 					return this.$util.Tips({
@@ -1256,7 +1229,6 @@
 						});
 					}
 				);
-
 			},
 			// 授权关闭
 			authColse: function(e) {
@@ -1264,10 +1236,7 @@
 			},
 			//路由跳转
 			navation(item) {
-
-
 				if (this.userid) {
-
 					if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
 						// console.log(this.$store.state.app.userInfo.mer_info.type_code);
 						if (this.$store.state.app.userInfo.mer_info.type_code == "TypeSupplyChain" && this.$store.state.app
@@ -1296,7 +1265,6 @@
 						}
 
 					} else {
-
 						switch (item.type) {
 							case 1:
 								uni.navigateTo({
@@ -1405,16 +1373,8 @@
 									url: '/pages/moreProject/moreProject'
 								})
 								break;
-
 						}
-
 					}
-
-
-
-
-
-
 				} else {
 					this.isAuto = true;
 					this.isShowAuth = true
@@ -1453,7 +1413,6 @@
 					that.loadTitle = '加载更多';
 				});
 			},
-
 		}
 	}
 </script>