From e39688ab9f15a9db4318525bde541e47f852fb1a Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 12 Dec 2024 16:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E8=B1=86=E4=B8=BA?=
 =?UTF-8?q?=E9=87=91=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payPopus/payPopus.vue | 10 +++++-----
 me/detail/detail.nvue            | 18 ++++++++++++++++--
 me/detail/detail.vue             |  2 +-
 me/detail/detailIOS.nvue         | 10 +++++-----
 me/payOrder/payOrder.vue         | 20 ++++++++++----------
 me/wallet/wallet.vue             |  6 +++---
 me/wallet/wallets.vue            |  6 +++---
 pages.json                       |  4 ++--
 pages/index/index copy.vue       |  4 ++--
 pages/index/index.vue            |  4 ++--
 pages/me/vip/index.vue           | 24 ++++++++++++------------
 11 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/components/payPopus/payPopus.vue b/components/payPopus/payPopus.vue
index 9c3cbab..858d356 100644
--- a/components/payPopus/payPopus.vue
+++ b/components/payPopus/payPopus.vue
@@ -6,14 +6,14 @@
 			<!-- <view class="money">
 				<view class="money-l flex align-center">
 					账号余额:
-					<text>{{moneyNum}}金豆</text>
+					<text>{{moneyNum}}金币</text>
 					<view class="money-l-go" @click="goWallet('/me/wallet/wallet')">
 						查看明细
 					</view>
 				</view>
 				<view class="money-r">
 					解锁价格:
-					<text>{{payPrice}}金豆</text>
+					<text>{{payPrice}}金币</text>
 				</view>
 			</view> -->
 			<!-- <scroll-view scroll-y="true" class="payLists">
@@ -31,10 +31,10 @@
 						</view> -->
 						<!-- #endif -->
 						<!-- <view class="payList-item-dou">
-							{{item.money}}金豆
+							{{item.money}}金币
 						</view>
 						<view class="payList-item-duo" v-if="item.giveMoney>0">
-							多送{{item.giveMoney}}金豆
+							多送{{item.giveMoney}}金币
 						</view>
 						<view class="payList-item-hui" v-if="item.remarks">
 							{{item.remarks}}
@@ -136,7 +136,7 @@
 				type: Number,
 				default: null
 			},
-			//需要支付的金豆
+			//需要支付的金币
 			payPrice: {
 				type: Number,
 				default: 0
diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index 4908431..08f28cd 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -316,6 +316,8 @@
 	export default {
 		data() {
 			return {
+				//可抽奖次数
+				freeNum:0,
 				showBack:false,
 				noBuyVideoIndex:null,
 				// 奖品列表，
@@ -1194,6 +1196,13 @@
 					// },1000)
 				})
 			},
+			async getCount(){
+				const res=await this.$Request.getT('app/discSpinning/drawCount')
+				if(res.code==0){
+					this.freeNum=res.count||0
+				}
+				return res
+			},
 			/**
 			 * @param {Number} courseId 总id
 			 * @param {Number} courseDetailsId 当前视频id
@@ -1245,6 +1254,7 @@
 										}
 									})
 								})
+								getCount
 								if(this.noBuyVideoIndex!==null){
 									this.noBuyVideoIndex=null
 									this.videoContext.stop()
@@ -1274,8 +1284,12 @@
 											this);
 											if(this.noBuyVideoIndex!=null&&this.videoList[this.noBuyVideoIndex].videoUrl){
 												this.videoContext.stop();
-												uni.navigateTo({
-													url:'/me/choujiang/choujiang'
+												this.getCount(res).then(res=>{
+													if(res.count>=1){
+														uni.navigateTo({
+															url:'/me/choujiang/choujiang'
+														})
+													}
 												})
 												this.noBuyVideoIndex=null
 											}else{
diff --git a/me/detail/detail.vue b/me/detail/detail.vue
index d97b9d7..b1b233b 100644
--- a/me/detail/detail.vue
+++ b/me/detail/detail.vue
@@ -1210,7 +1210,7 @@
 			closeMoney(data) {
 				this.showMoney = data
 			},
-			//使用金豆购买
+			//使用金币购买
 			submitPay(type) {
 				let data = {
 					courseId: this.courseId
diff --git a/me/detail/detailIOS.nvue b/me/detail/detailIOS.nvue
index fe72597..85ba8f4 100644
--- a/me/detail/detailIOS.nvue
+++ b/me/detail/detailIOS.nvue
@@ -197,7 +197,7 @@
 							账号余额:
 						</text>
 						<text class="popuppay-money-l-jd">
-							{{moneyNum}}金豆
+							{{moneyNum}}金币
 						</text>
 						<text class="popuppay-money-l-mx" @click="goWallet('/me/wallet/wallet')">
 							查看明细
@@ -208,7 +208,7 @@
 							解锁价格:
 						</text>
 						<text class="popuppay-money-jd">
-							{{payPrice}}金豆
+							{{payPrice}}金币
 						</text>
 					</view>
 				</view> -->
@@ -225,12 +225,12 @@
 							</view>
 							<view class="payList-item-dou">
 								<text class="payList-item-dous">
-									{{item.money}}金豆
+									{{item.money}}金币
 								</text>
 							</view>
 							<view class="payList-item-duo" v-if="item.giveMoney>0">
 								<text class="payList-item-duos">
-									多送{{item.giveMoney}}金豆
+									多送{{item.giveMoney}}金币
 								</text>
 							</view>
 							<view class="payList-item-hui" v-if="item.remarks">
@@ -925,7 +925,7 @@
 					})
 				}
 			},
-			//使用金豆购买
+			//使用金币购买
 			submitPay(type) {
 				let data = {
 					courseId: this.courseId
diff --git a/me/payOrder/payOrder.vue b/me/payOrder/payOrder.vue
index 5242785..09daf2a 100644
--- a/me/payOrder/payOrder.vue
+++ b/me/payOrder/payOrder.vue
@@ -128,7 +128,7 @@
 					},
 					{
 						imgurl: '/static/images/pay/lingqian.png',
-						name: '金豆支付',
+						name: '金币支付',
 						payAway: 3
 					}
 				]
@@ -138,7 +138,7 @@
 				if (checkIosPay === '是') {
 					this.payList = [{
 						imgurl: '/static/images/pay/lingqian.png',
-						name: '金豆支付',
+						name: '金币支付',
 						payAway: 3
 					}]
 					this.payAway = 3
@@ -155,7 +155,7 @@
 						},
 						{
 							imgurl: '/static/images/pay/lingqian.png',
-							name: '金豆支付',
+							name: '金币支付',
 							payAway: 3
 						}
 					]
@@ -166,7 +166,7 @@
 			// #ifdef MP-WEIXIN
 			this.payList = [{
 				imgurl: '/static/images/pay/lingqian.png',
-				name: '金豆支付',
+				name: '金币支付',
 				payAway: 3
 			}]
 			this.payAway = 3
@@ -181,7 +181,7 @@
 					},
 					{
 						imgurl: '/static/images/pay/lingqian.png',
-						name: '金豆支付',
+						name: '金币支付',
 						payAway: 3
 					}
 				]
@@ -194,7 +194,7 @@
 					},
 					{
 						imgurl: '/static/images/pay/lingqian.png',
-						name: '金豆支付',
+						name: '金币支付',
 						payAway: 3
 					}
 				]
@@ -209,7 +209,7 @@
 				},
 				{
 					imgurl: '/static/images/pay/lingqian.png',
-					name: '金豆支付',
+					name: '金币支付',
 					payAway: 3
 				}
 			]
@@ -225,7 +225,7 @@
 					},
 					{
 						imgurl: '/static/images/pay/lingqian.png',
-						name: '金豆支付',
+						name: '金币支付',
 						payAway: 3
 					}
 				]
@@ -233,7 +233,7 @@
 			} else {
 				this.payList = [{
 					imgurl: '/static/images/pay/lingqian.png',
-					name: '金豆支付',
+					name: '金币支付',
 					payAway: 3
 				}]
 				this.payAway = 3
@@ -385,7 +385,7 @@
 						}
 					})
 				} else {
-					switch (this.payAway) { //1:微信支付,2:支付宝支付 3:金豆支付
+					switch (this.payAway) { //1:微信支付,2:支付宝支付 3:金币支付
 						case 1: //微信支付
 							// #ifdef MP-WEIXIN
 							that.$Request.postT("/app/wxPay/wxPayJsApiOrder", {
diff --git a/me/wallet/wallet.vue b/me/wallet/wallet.vue
index 9bdd01d..3d3827e 100644
--- a/me/wallet/wallet.vue
+++ b/me/wallet/wallet.vue
@@ -5,14 +5,14 @@
 				<view class="money-top">
 					<image src="../../static/images/me/moneyBanner.png" mode=""></image>
 					<view class="money-top-title">
-						当前剩余金豆
+						当前剩余金币
 					</view>
 					<view class="money-top-money">
 						{{formatNumber(moneyNum)}}
 					</view>
 				</view>
 				<view @click="goNav('/me/wallet/mingxi')" class="money-bto flex align-center justify-between">
-					金豆明细
+					金币明细
 					<u-icon name="arrow-right" color="#ff7581" size="40"></u-icon>
 				</view>
 			</view>
@@ -41,7 +41,7 @@
 										</view>
 									</view>
 									<view class="moneycz-bom">
-										{{item.money}}金豆<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
+										{{item.money}}金币<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
 									</view>
 								</view>
 								<u-radio :name="index"></u-radio>
diff --git a/me/wallet/wallets.vue b/me/wallet/wallets.vue
index 6a2b9dd..ceefd2b 100644
--- a/me/wallet/wallets.vue
+++ b/me/wallet/wallets.vue
@@ -5,14 +5,14 @@
 				<view class="money-top">
 					<image src="../../static/images/me/moneyBanner.png" mode=""></image>
 					<view class="money-top-title">
-						当前剩余金豆
+						当前剩余金币
 					</view>
 					<view class="money-top-money">
 						{{formatNumber(moneyNum)}}
 					</view>
 				</view>
 				<view @click="goNav('/me/wallet/mingxi')" class="money-bto flex align-center justify-between">
-					金豆明细
+					金币明细
 					<u-icon name="arrow-right" color="#6696ff" size="40"></u-icon>
 				</view>
 			</view>
@@ -34,7 +34,7 @@
 										</view>
 									</view>
 									<view class="moneycz-bom">
-										{{item.money}}金豆<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
+										{{item.money}}金币<text v-if="item.giveMoney>0">+{{item.giveMoney}}赠豆</text>
 									</view>
 								</view>
 								<u-radio :name="index"></u-radio>
diff --git a/pages.json b/pages.json
index 5ee77ea..e6ae901 100644
--- a/pages.json
+++ b/pages.json
@@ -494,14 +494,14 @@
 				}, {
 					"path": "wallet/wallet",
 					"style": {
-						"navigationBarTitleText": "金豆充值",
+						"navigationBarTitleText": "金币充值",
 						"enablePullDownRefresh": false
 					}
 
 				}, {
 					"path": "wallet/mingxi",
 					"style": {
-						"navigationBarTitleText": "金豆明细",
+						"navigationBarTitleText": "金币明细",
 						"enablePullDownRefresh": true
 					}
 
diff --git a/pages/index/index copy.vue b/pages/index/index copy.vue
index d29d0d7..406a501 100644
--- a/pages/index/index copy.vue	
+++ b/pages/index/index copy.vue	
@@ -139,7 +139,7 @@
 					src="https://dj-api.hnsiyao.cn/file/uploadPath/2024/02/22/cee2fcdc4c4ebe31ab4ce2c3c3a3d183.png"
 					mode=""></image>
 				<view class="zl-titles">
-					{{xxJDNum}} <text>金豆</text>
+					{{xxJDNum}} <text>金币</text>
 				</view>
 			</view>
 		</u-popup>
@@ -382,7 +382,7 @@
 				this.$Request.postT('/app/user/getNewUserRed').then(res => {
 					if (res.code == 0) {
 						this.xxPopu = false;
-						this.$queue.showToast('领取成功，金豆已到账！');
+						this.$queue.showToast('领取成功，金币已到账！');
 					} else {
 						this.$queue.showToast(res.msg)
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2414957..50d7f10 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -166,7 +166,7 @@
 						src="https://dj-api.hnsiyao.cn/file/uploadPath/2024/02/22/cee2fcdc4c4ebe31ab4ce2c3c3a3d183.png"
 						mode=""></image>
 					<view class="zl-titles">
-						{{xxJDNum}} <text>金豆</text>
+						{{xxJDNum}} <text>金币</text>
 					</view>
 				</view>
 			</u-popup>
@@ -545,7 +545,7 @@
 				this.$Request.postT('/app/user/getNewUserRed').then(res => {
 					if (res.code == 0) {
 						this.xxPopu = false;
-						this.$queue.showToast('领取成功，金豆已到账！');
+						this.$queue.showToast('领取成功，金币已到账！');
 					} else {
 						this.$queue.showToast(res.msg)
 					}
diff --git a/pages/me/vip/index.vue b/pages/me/vip/index.vue
index 5baf3f6..9d5af4f 100644
--- a/pages/me/vip/index.vue
+++ b/pages/me/vip/index.vue
@@ -16,13 +16,13 @@
 			<view class="flex justify-between margin-bottom" v-for="(item, index) in VIPlist" :key="index">
 				<view>
 					<view class="u-font-40">
-						{{item.money}}<text style="font-size: 22rpx;margin-right: 16rpx;">金豆</text>
+						{{item.money}}<text style="font-size: 22rpx;margin-right: 16rpx;">金币</text>
 						<!-- #ifdef MP-TOUTIAO -->
 						/ {{item.payDiamond}}<text style="font-size: 22rpx;">钻石</text>
 						<!-- #endif -->
 					</view>
 					<view class="" style="color: #7F8299;">{{item.type}}卡 •
-						{{item.money}}金豆/
+						{{item.money}}金币/
 						<!-- #ifdef MP-TOUTIAO -->
 						{{item.payDiamond}}钻石/
 						<!-- #endif -->
@@ -53,7 +53,7 @@
 			</view>
 			<view @click="goMoney" class="flex align-center justify-end" style="margin-right: 20rpx;color: #ff7581;">
 				<view class="" style="color: #666666;">
-					金豆不足？
+					金币不足？
 				</view>
 				去充值
 			</view>
@@ -141,7 +141,7 @@
 					id: 2
 				}, {
 					image: '/static/images/pay/lingqian.png',
-					text: '金豆支付',
+					text: '金币支付',
 					id: 3
 				}]
 				this.openWay = 1;
@@ -150,7 +150,7 @@
 				if (checkIosPay === '是') {
 					this.openLists = [{
 						image: '/static/images/pay/lingqian.png',
-						text: '金豆支付',
+						text: '金币支付',
 						id: 3
 					}];
 					this.openWay = 3;
@@ -165,7 +165,7 @@
 						id: 2
 					}, {
 						image: '/static/images/pay/lingqian.png',
-						text: '金豆支付',
+						text: '金币支付',
 						id: 3
 					}];
 					this.openWay = 1;
@@ -183,7 +183,7 @@
 					// },
 					{
 						image: '/static/images/pay/lingqian.png',
-						text: '金豆支付',
+						text: '金币支付',
 						id: 3
 					}
 				],
@@ -199,7 +199,7 @@
 						id: 1
 					}, {
 						image: '/static/images/pay/lingqian.png',
-						text: '金豆支付',
+						text: '金币支付',
 						id: 3
 					}],
 					this.openWay = 1;
@@ -210,7 +210,7 @@
 						id: 2
 					}, {
 						image: '/static/images/pay/lingqian.png',
-						text: '金豆支付',
+						text: '金币支付',
 						id: 3
 					}],
 					this.openWay = 2;
@@ -224,7 +224,7 @@
 				id: 4
 			}, {
 				image: '/static/images/pay/lingqian.png',
-				text: '金豆支付',
+				text: '金币支付',
 				id: 3
 			}]
 			this.openWay = 4;
@@ -237,14 +237,14 @@
 					id: 5
 				}, {
 					image: '/static/images/pay/lingqian.png',
-					text: '金豆支付',
+					text: '金币支付',
 					id: 3
 				}]
 				this.openWay = 5
 			} else {
 				this.openLists = [{
 					image: '/static/images/pay/lingqian.png',
-					text: '金豆支付',
+					text: '金币支付',
 					id: 3
 				}]
 				this.openWay = 3