Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into ymf

api/me/withdraw.js

@@ -58,6 +58,7 @@ export const realNameAuth = (data) => {
 export const canCash = (data) => {
 	return http.request({
 		url: '/cash/canCash',
+		showLoading: false,
 	})
 }
 

api/task/index.js

@@ -4,7 +4,8 @@ import http from '@/http/http.js'
 export const selectTaskCenter = (data) => {
     return http.request({
         url: '/taskCenter/selectTaskCenter',
-        data
+        data,
+		showLoading:false
     })
 } 
 // 兑换列表
@@ -19,7 +20,8 @@ export const selectTaskCenterUserReward = (data) => {
 export const getUserSignData = (data) => {
     return http.request({
         url: 'userSignRecord/getUserSignData',
-        data
+        data,
+		showLoading:false
     })
 } 
 export const receiveGoods = (data) => {

pages/me/withdraw/index.vue

@@ -93,7 +93,7 @@
 
 <script setup>
 	import { reactive, nextTick, ref } from 'vue';
-	import { onReady,onLoad,onShow,onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+	import { onReady,onLoad,onShow,onLaunch,onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 	import { selectUserMoney, selectPayDetails, canCash, state, withdraw } from '@/api/me/withdraw.js';
 	import { selectUserById } from '@/api/user/user.js';
 	import { announcement } from '@/api/index/index.js';
@@ -133,23 +133,24 @@
 		getExtractFei();
 		getMoneyDetail();
 		getCanCash()
-		
+		announcement({type: 1}).then(res=>{
+			data.ruleList = res
+			ruleInit()
+			
+		})
 	})
 	onShow(() => {
 		getcashMoney()
 		getUserInfo();
-		announcement({type: 1}).then(res=>{
-			data.ruleList = res
-			ruleInit()
-			data.ruleShow = true
-		})
 	})
 	onReady(() => {
 		nextTick(()=>{
 			data.adRewardedVideoloadNum = 0
 			adRewardedw.value.load();
+			data.ruleShow = true
 		})
 	})
+	
 	onReachBottom(() => {
 		if (data.page * data.limit < data.totalCount) {
 			data.page = data.page + 1;

pages/share/index.vue

@@ -98,7 +98,6 @@
 	import config from '@/commons/config.js';
 	let data = reactive({
 		loading:false,
-		qrcode: false,
 		earning: {
 			inviteMoney: 0,
 			inviteGoldMoney: 0,
@@ -122,8 +121,6 @@
 		bgImg: '',
 		tuiguang: '',
 		invitationCode: uni.getStorageSync('userInfo').invitationCode,
-		h5SaveImg: '',
-		haibaoImgH5: '',
 		inviteSignCount:0,
 		canvasW: 350,
 		canvasH: 667,

pages/task/index.vue

@@ -110,7 +110,7 @@
 	})
 	const adRewarded = ref(null);
 	onShow(() => {
-		$common.init()
+		// $common.init()
 		// if ( uni.getSystemInfoSync().platform == 'android' ) {
 		// datas.adpid = 1531580352
 		// }
@@ -276,6 +276,10 @@
 			let res = await state({
 				extraKey: datas.urlCallback.extra
 			})
+			uni.showToast({
+				title: '获得' + $common.freeDuration + '分钟免费时长',
+				icon: 'none'
+			})
 		} else {
 			// 播放中途退出
 		}

store/common.js

@@ -38,7 +38,8 @@ const $map = {
 	922: 'withdrawNum',
 	500: 'payTips',
 	914: 'goldBili', // 金币比例
-	919: 'isExamine' //是否ios审核中
+	919: 'isExamine', //是否ios审核中
+	921: 'freeDuration' //看广告免费分钟时长
 }
 
 export const useCommonStore = defineStore("common", {