Browse Source

钱包和邀请调整

vaecebyZ 11 months ago
parent
commit
adaf10437e

+ 1 - 1
invite/wallet/hangingAmount.vue

@@ -49,7 +49,7 @@ export default {
       if (content) {
         this.list = content;
         for (const element of this.list) {
-          if(element.receiptsType === 'WAIT'){
+          if(element.status == 'WAIT'){
             this.total += element.total
           }
         }

+ 3 - 1
invite/wallet/withdraw.vue

@@ -70,9 +70,11 @@ export default {
                 icon: 'success',
                 duration: 2000
               });
+              setTimeout(() => {
+                uni.navigateBack();
+              }, 2000);
             }
             uni.hideLoading();
-            uni.navigateBack();
           }
         )
       } else {

+ 6 - 2
pages/index/index.vue

@@ -551,9 +551,13 @@
 		},
 		onHide() {
 		},
-		onLoad(query){			
+		onLoad(query){		
+			const token = uni.getStorageSync('token')
+			console.log(!!token)
 			if(query.scene){
-				if(uni.getStorageSync('token')){
+				// const token = uni.getStorageSync('token')
+
+				if(token){
 					uni.showToast({
 						title: '已经是平台用户',
 						icon: 'none'

+ 6 - 0
study/index.vue

@@ -190,6 +190,12 @@
 				getMenu({currentPage:1,pageSize:5,userId,belongType:2}).then(res=>{
 					if(res.state == 'Success'){
 						this.typeList = res.content.records
+						const redRoad = this.typeList.find(item=>item.columnName == '红色革命');
+						// 把红色革命放到列表的第一个
+						if(redRoad){
+							this.typeList = this.typeList.filter(item=>item.columnName != '红色革命')
+							this.typeList.unshift(redRoad)
+						}
 						console.log(res.content.records);
 					}
 				})

+ 1 - 1
study/studyGoodsDetail.vue

@@ -284,7 +284,7 @@ export default {
 					}).then(res => {
 						if (res.state == 'Success') {
 							uni.showToast({
-								title: '预约成功,请留言工作人员联系',
+								title: '预约成功,请您耐心等待客服电话',
 								icon: 'none'
 							});
 						}