12.20

components/hx-invite/hx-invite.vue

@@ -8,14 +8,20 @@
 							<view class="order">
 								订单编号:{{item.order.order_no}}
 							</view>
-							<view class="deposit">
+							<view class="deposit" v-if="item.withdraw_status == 'unapplied'">
 								未提现
 							</view>
+							<view style="color: rgba(250, 143, 0, 1);background-color:rgba(250, 143, 0, .1) ;" class="deposit" v-if="item.withdraw_status == 'withdrawing'">
+								提现中
+							</view>						
+							<view style="color: rgba(53, 170, 31, 1);background-color:rgba(53, 170, 31, .1) ;" class="deposit" v-if="item.withdraw_status == 'success'">
+								已提现
+							</view>
 						</view>
 						<view class="u-flex u-row-between dan" style="margin-top: 18rpx;">
 							<view class="u-flex">
 								<u-checkbox :name="index"
-									:disabled="['unapplied','failed'].includes(item.withdraw_status)&&item.is_confirm==0?true : false">
+									:disabled="['unapplied','failed'].includes(item.withdraw_status)&&item.is_confirm==1?false : true">
 								</u-checkbox>
 								<view class="lietou">{{item.type_name}}</view>
 							</view>
@@ -167,10 +173,11 @@
 				if (n.length > 0) {
 					this.arralylist = []
 					this.list.forEach((item, index) => {
-						if (item.is_confirm == 1) {
+						if (item.is_confirm == 1 && ['unapplied', 'failed'].includes(item.withdraw_status)) {
 							this.arralylist.push(index)
 						}
 					})
+					console.log(this.arralylist);
 					// this.arralylist = this.checkboxValue1
 				}
 				if (n.length == 0) {
@@ -208,7 +215,7 @@
 			},
 			commission_list() {
 				commission_list({
-					page:1,
+					page: 1,
 					source_type: "invite",
 					job_name: "",
 					is_confirm: "",
@@ -313,7 +320,7 @@
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #0C66C2;
-		padding: 4rpx;
+		padding: 6rpx;
 	}
 
 	.order {

components/hx-order/hx-order.vue

@@ -4,14 +4,23 @@
 			<view class="yong" v-if="current==0" style="margin-top: 20rpx;" v-for="(item,index) in list" :key="index">
 				<view class="u-flex">
 					<u-checkbox :customStyle="{marginBottom: '8px'}" :name="index"
-						:disabled="['unapplied','failed'].includes(item.withdraw_status)&&item.is_confirm==0?true : false">
+						:disabled="['unapplied','failed'].includes(item.withdraw_status)&&item.is_confirm==1?false : true">
 					</u-checkbox>
 					<view class="" style="flex: 1;">
-						<view class="" style="font-size: 24rpx;
+						<view class="u-flex u-row-between" style="font-size: 24rpx;
 font-family: PingFangSC, PingFang SC;
 font-weight: 400;
 color: #555555;">
-							订单编号:{{item.order.order_no}}
+							<text>订单编号:{{item.order.order_no}}</text>
+							<view class="deposit" v-if="item.withdraw_status == 'unapplied'">
+								未提现
+							</view>				
+							<view style="color: rgba(250, 143, 0, 1);background-color:rgba(250, 143, 0, .1) ;" class="deposit" v-if="item.withdraw_status == 'withdrawing'">
+								提现中
+							</view>
+							<view style="color: rgba(53, 170, 31, 1);background-color:rgba(53, 170, 31, .1) ;" class="deposit" v-if="item.withdraw_status == 'success'">
+								已提现
+							</view>
 						</view>
 						<view class="u-flex u-row-between"
 							style="margin-top: 20rpx; border-top:2rpx solid #F6F6F6;padding-top: -18rpx;box-sizing: border-box;">
@@ -203,7 +212,7 @@ color: #555555;">
 				if (n.length > 0) {
 					this.arralylist = []
 					this.list.forEach((item, index) => {
-						if (item.is_confirm == 1) {
+						if (item.is_confirm == 1 && ['unapplied', 'failed'].includes(item.withdraw_status)) {
 							this.arralylist.push(index)
 						}
 					})

pages/luntan/luntan.vue

@@ -157,8 +157,8 @@
 			if (this.isshow) {
 				this.isshow = false
 			} else {
-				this.page = 1
-				this.list = []
+				// this.page = 1
+				// this.list = []
 				this.getlist()
 				this.getuser()
 			}

pages/mine/mine.vue

@@ -18,14 +18,14 @@
 				</view>
 				<view class="introduce" v-if="is_profile">
 					<text>{{resume_Detail.birthday_text||0}}岁</text>
-					<text style="margin: 0 11rpx;">|</text>
+					<text v-if="resume_Detail.education_name" style="margin: 0 11rpx;">|</text>
 					<text>{{resume_Detail.education_name ||""}}</text>
-					<text style="margin: 0 11rpx;">|</text>
+					<text v-if="resume_Detail.experience" style="margin: 0 11rpx;">|</text>
 					<text>{{resume_Detail.experience ||0 }}年</text>
 				</view>
 				<view class="introduce" v-else>
 					<text>{{userinfo.group_info||0}}岁</text>
-<!-- 					<text style="margin: 0 11rpx;">|</text>
+					<!-- 					<text style="margin: 0 11rpx;">|</text>
 					<text>{{resume_Detail.education_name ||""}}</text>
 					<text style="margin: 0 11rpx;">|</text>
 					<text>{{resume_Detail.experience ||0 }}年</text> -->

pagesD/bank-add.vue

@@ -132,22 +132,22 @@
 				// 	captcha: this.code
 				// }).then(res => {
 				// 	if (res.code == 1) {
-						setBank({
-							bank_type_name: this.bank_type_name,
-							bank_name: this.bank_name,
-							bank_no: this.bank_no,
-							bank_user: this.bank_user,
-							bank_mobile: this.bank_mobile,
-							code: this.code
-						}).then(res => {
-							this.$u.toast(res.msg)
-							if (res.code == 1) {
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 800)
-							}
-						})
-					// } 
+				setBank({
+					bank_type_name: this.bank_type_name,
+					bank_name: this.bank_name,
+					bank_no: this.bank_no,
+					bank_user: this.bank_user,
+					bank_mobile: this.bank_mobile,
+					code: this.code
+				}).then(res => {
+					this.$u.toast(res.msg)
+					if (res.code == 1) {
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 800)
+					}
+				})
+				// } 
 				// 	else {
 				// 		this.$u.toast(res.msg)
 				// 	}

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-line/u-line.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }