From e68135d56a2b0242dcfe376406a23630614bf8c6 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Sun, 16 Jun 2024 13:07:33 +0800
Subject: [PATCH] 1

---
 pages/adv/index.vue                   | 26 ++++++++++++++++++++----
 pages/user/index.vue                  |  2 +-
 pages/users/order_confirm/index.vue   | 29 +++++++++++++++++++--------
 pages/users/user_money/zhuanzhang.vue | 19 ++++++++++++++----
 4 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/pages/adv/index.vue b/pages/adv/index.vue
index c186ed5..b8b871a 100644
--- a/pages/adv/index.vue
+++ b/pages/adv/index.vue
@@ -1,6 +1,7 @@
 <template>
 <view class="adv">
-	<image :src="item" class="picItem" v-for="(item,index) in data" :key="index" mode="aspectFill"></image>
+	<!-- <image :src="item" class="picItem" v-for="(item,index) in data" :key="index" mode="aspectFill"></image> -->
+	<ad adpid="1111111111" @load="onload" @close="onclose" @error="onerror"></ad>
 </view>
 </template>
 
@@ -8,9 +9,26 @@
 export default{
 	data(){
 		return {
-			data:[
-				'/static/images/adv.png','/static/images/adv.png'
-			]
+			// data:[
+			// 	'/static/images/adv.png','/static/images/adv.png'
+			// ]
+		}
+	},
+	methods:{
+		onload(){
+			console.log("广告加载完成")
+		},
+		onclose(){
+			console.log("0000")
+		},
+		onerror(val){
+			uni.showToast({
+				title: val.detail.errMsg,
+				icon: 'none'
+			})
+			setTimeout(()=>{
+				uni.navigateBack(-1)
+			},2000)
 		}
 	}
 }
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 212f33a..44189f1 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -91,7 +91,7 @@
 							<view class="txt">余额</view>
 						</view>
 						<view class="num-item" @click="goOtherPage('/pages/users/user_spread_money/index?type=2')">
-							<text class="num">{{userInfo.brokerage_level||0}}</text>
+							<text class="num">{{userInfo.total_brokerage_price||0}}</text>
 							<view class="txt">累计收益</view>
 						</view>
 						<view class="num-item" @click="goOtherPage('/pages/users/user_integral/index')">
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index d7cf2c6..bdb659e 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -364,7 +364,7 @@
 					<view class='list'>
 						<!-- #ifdef H5 -->
 						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
-							v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+							v-for="(item,index) in cartArrNew" :key='index' v-if="item.payStatus==1">
 							<view class='name acea-row row-center-wrapper'>
 								<view class='iconfont animated'
 									:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
@@ -554,6 +554,7 @@
 				textareaStatus: true,
 				deliveryName: '快递配送',
 				//支付方式
+				cartArrNew:[],
 				cartArr: [{
 						"name": "微信支付",
 						"icon": "icon-weixin2",
@@ -561,6 +562,13 @@
 						title: '微信快捷支付',
 						payStatus: 1,
 					},
+					{
+						"name": "余额支付",
+						"icon": "icon-icon-test",
+						value: 'balance',
+						title: '可用余额:',
+						payStatus: this.$store.getters.globalData.yue_pay_status,
+					},
 					{
 						name: "支付宝支付",
 						icon: "icon-icon34",
@@ -573,13 +581,7 @@
 						title: '支付宝支付',
 						payStatus: this.$store.getters.globalData.alipay_open
 					},
-					{
-						"name": "余额支付",
-						"icon": "icon-icon-test",
-						value: 'balance',
-						title: '可用余额:',
-						payStatus: this.$store.getters.globalData.yue_pay_status,
-					},
+					
 					{
 						"name": "线下支付",
 						"icon": "icon-yinhangqia",
@@ -1184,6 +1186,17 @@
 						that.$set(that, 'order_form', (that.order_form && that.order_form.length>0) ? that.order_form : formData);	
 					}
 					that.totalPrice = res.data.order_price;
+					if(Number(that.totalPrice)==0){
+						that.cartArrNew = that.cartArr.filter((c,i)=>{
+							return c.value!='weixin'
+						})
+						that.cartArr = that.cartArrNew;
+						
+						that.payType='balance';
+					}else{
+						that.cartArrNew = that.cartArr;
+					}
+					console.log(that.cartArr)
 					that.totalPoint = 0
 					res.data.order.forEach(item => {
 						item.list.forEach(i=>{
diff --git a/pages/users/user_money/zhuanzhang.vue b/pages/users/user_money/zhuanzhang.vue
index db279c7..7d6ea71 100644
--- a/pages/users/user_money/zhuanzhang.vue
+++ b/pages/users/user_money/zhuanzhang.vue
@@ -37,7 +37,7 @@
 
 <script>
 import {
-	setCode,zhuanzhangApi
+	setCode,zhuanzhangApi,getUserInfo
 } from '@/api/user.js'
 export default{
 	data(){
@@ -51,17 +51,22 @@ export default{
 			timer:null,
 			timeNum:60,
 			canClick:true,
-			now_money:0
+			now_money:0,
+			currentUserPhone:null
 		}
 	},
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
+	onLoad() {
+		this.getUserInfo()
+	},
 	methods:{
 		getUserInfo() {
 			let that = this;
 			getUserInfo().then(res => {
 				that.now_money = res.data.now_money;
+				that.currentUserPhone = res.data.phone
 			
 			});
 		},
@@ -81,7 +86,7 @@ export default{
 				})
 				return;
 			}
-			setCode({phone:this.form.phone}).then(res => {
+			setCode({phone:this.currentUserPhone}).then(res => {
 				uni.showToast({
 					title: res.message,
 					icon: 'none'
@@ -137,10 +142,16 @@ export default{
 			}
 			zhuanzhangApi(params).then(res=>{
 				console.log(res,"00")
+				this.getUserInfo()
+				uni.showToast({
+					title:res.message,
+					icon: 'none'
+				})
+				
 			}).catch((res)=>{
 				console.log(res)
 				uni.showToast({
-					title: res,
+					title: res.message,
 					icon: 'none'
 				})
 			})