7.11下班后提交

pages/user/commission/commission-log.vue

@@ -74,10 +74,10 @@
 							</view> -->
 							<view v-if="item.status==0" class="log-num"
 								style="display: flex;flex-direction: column;align-items: center;">
-								<view class="" style="color:orange;">
+								<view class="" style="color:orange; width: 100rpx;text-align: center;">
 									待入账
 								</view>
-								<view class="" style="color:orange">
+								<view class="" style="color:orange;width: 100rpx;text-align: center;">
 									{{item.amount}}
 								</view>
 							</view>
@@ -202,6 +202,9 @@
 			...mapGetters(['appInfo', 'isLogin', 'userInfo'])
 		},
 		async onLoad() {
+
+		},
+		async onShow() {
 			let ress = await taskCount()
 			if (ress.code == 0) {
 				this.commissionSum = ress.data
@@ -215,9 +218,6 @@
 				this.commissionList = res.data.data
 			}
 		},
-		onShow() {
-			// this.getCheck()
-		},
 
 		methods: {
 			queryList(pageNo, pageSize) {

pages/user/commission/commission-log2.vue

@@ -207,6 +207,9 @@
 			...mapGetters(['appInfo', 'isLogin', 'userInfo'])
 		},
 		async onLoad() {
+
+		},
+		async onShow() {
 			let ress = await recommendCount()
 			console.log('推广佣金汇总返回值', ress);
 			if (ress.code == 0) {
@@ -223,9 +226,6 @@
 				console.log('推广佣金明细返回值', res, this.commissionList);
 			}
 		},
-		onShow() {
-			// this.getCheck()
-		},
 
 		methods: {
 			queryList(pageNo, pageSize) {

pages/user/signin.vue

@@ -76,8 +76,8 @@
 
 						</view>
 					</u-popup>
-					<!-- <block v-if="platform == 'wxOfficialAccount'&&showWX"> -->
-					<block v-if="false">
+					<block v-if="platform == 'wxOfficialAccount'&&showWX">
+						<!-- <block v-if="false"> -->
 						<view class="wxBox">
 							<view class="">
 								<view class="grant wxBtn" @click="thirdLogin('wechat')"
@@ -97,8 +97,8 @@
 						</view>
 					</block>
 
-					<!-- <block v-else> -->
-					<block>
+					<block v-else>
+						<!-- <block> -->
 						<view class="" v-if="!showWX"
 							style="color: #34c758;font-weight: 600; margin-bottom: 100rpx;width: 100%;text-align: center;margin-top: 30rpx;">
 							微信绑定成功，请手机号注册后登录,如已注册请直接登录

pages/user/user.vue

@@ -249,6 +249,12 @@
 			if (res.code == 0) {
 				this.userInfo = res.data
 			}
+
+			let ress = await taskCount()
+			if (ress.code == 0) {
+				this.commissionMoney = Number(ress.data.cashing)
+				console.log('我的--任务佣金汇总返回值', ress, this.commissionMoney);
+			}
 		},
 
 		async onLoad() {
@@ -257,13 +263,6 @@
 					url: '/pages/user/signin'
 				})
 			}
-
-
-			let ress = await taskCount()
-			if (ress.code == 0) {
-				this.commissionMoney = Number(ress.data.cashing)
-				// console.log('我的--任务佣金汇总返回值', ress, this.commissionMoney);
-			}
 			let res1 = await recommendCount()
 			if (res1.code == 0) {
 				this.tuskMoney = Number(ress.data.cashing)