配置更新

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {

App.vue

@@ -1,9 +1,9 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch');
+			console.log('App Launch ');
 			uni.setStorageSync('adRewardedNum',0)
-			
+
 		},
 		onShow: function() {
 		},

api/task/index.js

@@ -27,7 +27,8 @@ export const getUserSignData = (data) => {
 export const receiveGoods = (data) => {
     return http.request({
         url: 'taskCenter/receiveGoods',
-        data
+        data,
+		method: 'POST',
     })
 } 
 //  任务-签到

api/video/index.js

@@ -137,4 +137,14 @@ export function playStatus(data) {
 		method: 'GET',
 		data
 	})
-}
+}
+
+// 获取支付次数提示
+export function getPayTips(data){
+	return http.request({
+		url: 'course/getRedEnvelopeTips',
+		method: 'GET',
+		data
+	})
+	
+}

commons/config.js

@@ -1,12 +1,12 @@
 
 //打包时修改env的值即可
-const env='test' //test , production,local
+const env='production' //test , production,local
 
 export const encryptKey='1234567890123456' // http数据加解密的key 
 
 export const apiUrl='/czg/'
 export const h5Config = {
-	production: 'https://dj-h5.hnsiyao.cn',
+	production: 'https://web.hnsiyao.cn',
 	test: 'https://web-api.hnsiyao.cn',
 	local: 'http://192.168.1.41:8100'
 }

components/my-video-list/list-item.vue

@@ -1,27 +1,32 @@
 <template>
-	<view class="item" @appear="appear" @disappear="disappear" @click.stop 	:style="{height:height+'px'}" :key="index">
+	<view class="item" @appear="appear" @disappear="disappear" @click.stop :style="{height:height+'px'}" :key="index">
 
-		<video class="u-flex-1 video" :show-fullscreen-btn="false" @controlstoggle="controlstoggles" v-if="showVideo"
-			play-btn-position="center"
-			:show-center-play-btn="false"
-			:show-play-btn="false"
-			:controls="true"
-			@click.stop="videoClick()"
-			@loadedmetadata="loadedmetadata"
-			@timeupdate="timeupdate" @waiting="waiting()" object-fit="cover" @pause="onpause" 
+		<!-- :controls="showControls" -->
+		<video class=" video" :show-fullscreen-btn="false" @controlstoggle="controlstoggles" v-if="showVideo"
+			play-btn-position="bottom" :show-center-play-btn="true" :show-play-btn="true" @click.stop="videoClick()"
+			@loadedmetadata="loadedmetadata" @timeupdate="timeupdate" @waiting="waiting()" object-fit="cover"
+			@loadeddata="waiting()" @pause="onpause"
 			@play="videoPlay('myVideo'+item.courseDetailsId,item.courseDetailsId)" :play-strategy="2"
-			:show-loading="true" codec="software" :muted="false"  :loop="loop"
-			:enable-progress-gesture="false" :poster="item.titleImg" :ref="'myVideo'+item.courseDetailsId"
-			:autoplay="autoplay" @ended="ended" :id="'myVideo'+item.courseDetailsId" :src="item.videoUrl"></video>
+			:show-loading="true" codec="software" :muted="false" :loop="loop" :enable-progress-gesture="false"
+			:poster="item.titleImg" :ref="'myVideo'+item.courseDetailsId" :autoplay="autoplay" @ended="ended"
+			:id="'myVideo'+item.courseDetailsId" :src="item.videoUrl"></video>
 
-		<image class="poster" v-else @click.stop="posterClick" :src="item.titleImg"
-			mode="aspectFill">
+
+		<image class="poster" v-else @click.stop="posterClick" :src="item.titleImg" mode="aspectFill">
 		</image>
-		
-		<view class="play-icon" v-if="videoIsLoadedmetadata&&showVideo&&!isPlying" @click.stop="videoClick()" :style="playStyle">
-			<image class="icon"  src="@/static/images/play.png" mode=""></image>
+		<!-- #ifdef APP -->
+		<view class="control-play-cover" v-if="showControls&&isIos" @click="playCoverClick()">
 		</view>
+		<!-- #endif -->
+
+		<!-- <view class="progress" v-if="showVideo&&!isPlying" @click.stop>
+			<progress-vue @touchstart="progressScroll" @touchend="progressScrollEnd"></progress-vue>
+		</view> -->
 		
+		<!-- <view class="play-icon" v-if="showVideo&&!isPlying" @click.stop="playIconClick()" :style="playStyle">
+			<image class="icon" src="@/static/images/play.png" mode=""></image>
+		</view> -->
+
 		<view class="info" v-if="!isCommand" :style="infoStyle">
 			<text class="color-fff" v-if="item.courseDetailsName">{{item.courseDetailsName}}</text>
 			<view v-if="item.content" v-html="item.content"></view>
@@ -64,6 +69,10 @@
 
 <script setup>
 	import * as Api from '@/api/video/index.js'
+	// #ifdef APP
+	const domModule = uni.requireNativePlugin('dom')
+	// #endif
+	import progressVue from './progress.vue'
 	import {
 		computed,
 		nextTick,
@@ -79,13 +88,17 @@
 	// #endif
 
 	const props = defineProps({
-		isAndriod:{
+		isIos:{
 			type: Boolean,
 			default: false
 		},
-		height:{
-			type:Number,
-			default:0
+		isAndriod: {
+			type: Boolean,
+			default: false
+		},
+		height: {
+			type: Number,
+			default: 0
 		},
 		item: {
 			type: Object,
@@ -111,7 +124,7 @@
 				}
 			}
 		},
-		isTabbar:{
+		isTabbar: {
 			type: Boolean,
 			default: false
 		},
@@ -153,22 +166,47 @@
 			type: Number,
 			default: 1
 		},
-		showControls: {
+		showAndriod: {
 			type: Boolean,
-			default: true
+			default: false
 		}
 	})
+
+	let isWaiting = ref(true)
+
+	function waiting() {
+		console.log('waiting');
+		isWaiting.value = true
+	}
+
+	let showControls = ref(props.showAndriod?false:true)
+
+	let playPercent = ref(0)
+
+
 	let autoplay = ref(props.item.videoUrl ? true : false)
 
 	const emits = defineEmits(['controlstoggles', 'disappear', 'appear', 'waiting', 'videoPlay', 'ended', 'dianzanClick',
-		'share', 'zhuijuClick', 'popupShow', 'itemMounted', 'toDetail', 'showInfo', 'playStatusChange'
+		'share', 'zhuijuClick', 'popupShow', 'itemMounted', 'toDetail', 'playStatusChange', 'progressScroll',
+		'progressScrollEnd'
 	])
-	function posterClick(){
-		if(!props.item.videoUrl){
-			popupShow('pay',props.item)
+
+	function progressScroll(e) {
+		emits('progressScroll')
+	}
+
+	function progressScrollEnd(e) {
+		emits('progressScrollEnd')
+	}
+
+	function posterClick() {
+		if (!props.item.videoUrl) {
+			popupShow('pay', props.item)
 		}
 	}
+
 	function controlstoggles(e) {
+		showControls.value = e.detail.show
 		emits('controlstoggles', e)
 	}
 
@@ -179,21 +217,16 @@
 		emits('toDetail')
 	}
 
-	function waiting() {
 
-	}
-	
-	let videoIsLoadedmetadata=ref(false)
-	function loadedmetadata(){
-		videoIsLoadedmetadata.value=true
+	let videoIsLoadedmetadata = ref(false)
+
+	function loadedmetadata() {
+		console.log('loadedmetadata');
+		videoIsLoadedmetadata.value = true
 	}
 
 
 	let isPlying = ref(false)
-	watch(() => isPlying.value, (newval) => {
-		console.log(newval);
-		emits('showInfo', newval)
-	})
 
 
 	//是否是第一次加载时的播放，不是暂停再播放
@@ -216,6 +249,7 @@
 	}
 
 	function timeupdate(e) {
+		playPercent.value = e.detail.currentTime * 100 / e.detail.duration
 		//隐藏loding
 		uni.hideLoading()
 		if (isPlayFinish) {
@@ -229,31 +263,45 @@
 		}
 	}
 
+
+	let videoBar = null
+
+
+	let watingTimer = null
+
 	function videoPlay() {
 		if (isFirstPlay && !isPlayFinish) {
 			sendPlayStatus('start')
 		}
+
 		isFirstPlay = false
 		isPlying.value = true
+		clearTimeout(watingTimer)
+		watingTimer = setTimeout(() => {
+			isWaiting.value = false
+		}, 1000)
+		// showControls.value = false
 		// #ifdef H5
-		emits('controlstoggles', {
-			detail: {
-				show: false
-			}
-		})
+		videoBar = videoBar ? videoBar : document.querySelector('.uni-video-bar');
+		videoBar.style.cssText = 'display:none;';
 		// #endif
 
+		// #ifdef APP
+		if (!props.showAndriod) {}
+		// #endif
+
+
 	}
 
 	function onpause() {
 		isPlying.value = false
+		// showControls.value = true
 		// #ifdef H5
-		emits('controlstoggles', {
-			detail: {
-				show: true
-			}
-		})
+		videoBar = videoBar ? videoBar : document.querySelector('.uni-video-bar');
+		videoBar.style.cssText = '';
 		// #endif
+
+
 	}
 
 
@@ -278,8 +326,36 @@
 		emits('popupShow', key)
 	}
 
+	function playCoverClick() {
+		console.log('playCoverClick');
+		if (video) {
+			if (isPlying.value) {
+				video.pause()
+			} else {
+				video.play()
+			}
+		}
+	}
+	
+	function playIconClick(){
+		if (video) {
+			if (isPlying.value) {
+				video.pause()
+			} else {
+				video.play()
+			}
+		}
+	}
+	
 	function videoClick() {
 		console.log('videoClick');
+		// #ifdef APP
+		// 兼容ios控制条和信息展示不同步
+		if (isPlying.value&&showControls.value) {
+			return
+		}
+		// #endif
+
 		if (video) {
 			if (isPlying.value) {
 				video.pause()
@@ -305,17 +381,15 @@
 	let video = null
 
 	function disappear(e) {
-		emits('disappear',e)
+		emits('disappear', e)
 		if (video) {
 			video.pause()
 		}
 	}
 	const showVideo = computed(() => {
-		if(props.isAndriod){
-			console.log('props.nowIndex === props.index ');
-			console.log(props.nowIndex,props.index );
-			return (props.nowIndex === props.index && props.item.videoUrl) ?true :false
-		}else{
+		if (props.isAndriod) {
+			return (props.nowIndex === props.index && props.item.videoUrl) ? true : false
+		} else {
 			return props.current === props.index && props.item.videoUrl
 		}
 	})
@@ -330,7 +404,6 @@
 				video = uni.createVideoContext('myVideo' + props.item.courseDetailsId)
 				video.playbackRate(props.playSpeeds)
 				video.play()
-				console.log('init play');
 			}
 		} catch (error) {
 			console.error('------')
@@ -344,7 +417,6 @@
 		}
 	})
 	watch(() => showVideo.value, (newval) => {
-		console.log('showVideo change:' + newval);
 		if (newval) {
 			isFirstPlay = true
 			isPlayFinish = false
@@ -355,7 +427,7 @@
 			video = null
 		}
 	})
-	
+
 	const customStyle = computed(() => {
 		// #ifdef H5
 		return {
@@ -366,26 +438,40 @@
 		return {}
 		// #endif
 	})
-	const playStyle=computed(()=>{
-		if(isPlying.value){
+	const playStyle = computed(() => {
+		if (isPlying.value) {
 			return {
-				bottom:'0'
+				bottom: '0'
 			}
 		}
 		return {
-			bottom: props.isTabbar ? (50+44 +'px') : '44px'
+			bottom: props.isTabbar ? (50 + 44 + 'px') : '44px'
 		}
 	})
 	const infoStyle = computed(() => {
+		// #ifdef H5
 		return {
 			transform: `translateX(${(!isPlying.value||!props.item.videoUrl)?0:'-750rpx'})`
 		}
+		// #endif
+		return {
+			transform: `translateX(${(showControls.value||!props.item.videoUrl)?0:'-750rpx'})`
+		}
+		// return {
+		// 	transform: `translateX(${(!isPlying.value||!props.item.videoUrl)?0:'-750rpx'})`
+		// }
 	})
 
 	const rightStyle = computed(() => {
+		// #ifdef H5
 		return {
 			transform: `translateX(${(!isPlying.value||!props.item.videoUrl)?'0':60}px)`
 		}
+		// #endif
+		return {
+			transform: `translateX(${(showControls.value||!props.item.videoUrl)?'0':60}px)`
+		}
+
 	})
 </script>
 
@@ -396,6 +482,12 @@
 		position: relative;
 	}
 
+	/* 假设控制条的类名为 uni-video-controls */
+	.uni-video-controls {
+		transition: none !important;
+		-webkit-transition: none !important;
+	}
+
 	.box {
 		/* #ifdef H5 */
 		flex: 1;
@@ -509,7 +601,8 @@
 		justify-content: center;
 		align-items: center;
 	}
-	.play-icon{
+
+	.play-icon {
 		position: absolute;
 		left: 0;
 		right: 0;
@@ -517,12 +610,13 @@
 		bottom: 0;
 		justify-content: center;
 		align-items: center;
-		$icon-size:80rpx;
-		.icon{
+		$icon-size: 80rpx;
+
+		.icon {
 			width: $icon-size;
 			height: $icon-size;
 		}
-		
+
 	}
 
 	.hot {
@@ -541,8 +635,28 @@
 		}
 	}
 
+	.progress {
+		padding: 20rpx;
+		position: absolute;
+		bottom: 20rpx;
+		left: 0;
+		right: 0;
+		z-index: 1;
+	}
+
 	.zhifubao {
 		width: 56rpx;
 		height: 56rpx;
 	}
+
+	.control-play-cover {
+		position: absolute;
+		left: 10px;
+		bottom: 0;
+		width: 38px;
+		height: 44px;
+		// background-color: red;
+		background-color: transparent;
+		z-index: 1;
+	}
 </style>

components/my-video-list/my-video-list.vue

@@ -1,26 +1,38 @@
 <template>
 	<list v-if="showAndriod" :bounce="false" :loadmoreoffset="wHeight*3" :show-scrollbar="false" ref="listBox"
-		:pagingEnabled="true" @loadmore="loadmore" :scrollable="true">
+		:pagingEnabled="true" @loadmore="loadmore" :scrollable="scrollable">
 		<cell v-for="(item,index) in list" :key="item.courseDetailsId" :ref="setRefList(index)">
 			<view class="swipers-items" :style="boxStyle" @longpress="popupShow('speed')">
 				<list-item-vue :total="list.length" :item="item" :current="current" :isCollect="isCollect"
-					:isAndriod="isAndriod" :isTabbar="isTabbar" @playStatusChange="playStatusChange" :height="wHeight"
+					:isAndriod="isAndriod"
+					 :showAndriod="showAndriod"
+					 :isIos="isIos"
+					 :isH5="isH5"
+					 :isTabbar="isTabbar" @playStatusChange="playStatusChange" :height="wHeight"
 					:isCommand="isCommand" :showControls="control.showControls" @toDetail="toDetail(item,index)"
 					@itemMounted="itemMounted" @controlstoggles="controlstoggles" :index="index" :instance="instance"
 					:nowIndex="nowIndex" @appear="appear($event,item,index)" :playSpeeds="playSpeeds"
 					@disappear="disappear($event, item,index)" @dianzanClick="dianzanClick(item,index)"
 					@share="share(item)" @zhuijuClick="zhuijuClick(item)"
+					@progressScroll="progressScroll"
+					@progressScrollEnd="progressScrollEnd"
 					@popupShow="popupShow($event,item,index)"></list-item-vue>
 			</view>
 		</cell>
 	</list>
 	<view v-if="isH5||isIos" class=" w-full box" style="width: 100vw;">
-		<swiper @longpress="popupShow('speed')" :style="{height:wHeight+'px'}" v-if="videoList.length"
+		<swiper
+		@longpress="popupShow('speed')"
+		:style="{height:wHeight+'px'}" v-if="videoList.length"
 			@change="swiperChange" :current="current" :circular="true" vertical class="u-flex-1"
 			@transition="transition" :indicator-dots="false" :autoplay="false" :interval="0" :duration="200">
 			<swiper-item v-for="(item,index) in videoList" :key="index">
 				<list-item-vue :total="list.length" :item="item" :isCommand="isCommand" :height="wHeight"
-					:isAndriod="isAndriod" :isTabbar="isTabbar" @playStatusChange="playStatusChange"
+				:isAndriod="isAndriod"
+				:showAndriod="showAndriod"
+				:isIos="isIos"
+				:isH5="isH5"
+					:isTabbar="isTabbar" @playStatusChange="playStatusChange"
 					:showControls="control.showControls" :current="current" :isCollect="isCollect"
 					@toDetail="toDetail(item,index)" @controlstoggles="controlstoggles" :playSpeeds="playSpeeds"
 					:index="index" :nowIndex="nowIndex" @dianzanClick="dianzanClick(item,index)" @share="share(item)"
@@ -146,7 +158,7 @@
 				<up-icon name="close" :size="16" color="#333" bold @click="popupClose('pay')"></up-icon>
 			</view>
 			<view class="u-m-t-30">
-				<text class=" color-999 u-font-24">每日前10次付款均可获取抽奖机会，抽奖保底抽中付款金额等额红包，红包可直接提现。当前为第1次付款</text>
+				<text class=" color-999 u-font-24">{{paytips}} </text>
 			</view>
 			<view class="colo-333 pay-list font-bold u-font-28 u-m-t-20">
 				<view class="pay-list-item" v-if="info&&info.price" @click="payBtnClick('money','all')">
@@ -260,6 +272,17 @@
 		getCurrentInstance,
 		onUnmounted
 	} from 'vue';
+	
+	
+	let scrollable=ref(true)
+	
+	function progressScroll(){
+		scrollable.value=false
+	}
+	function progressScrollEnd(){
+		scrollable.value=true
+	}
+	
 
 	let isH5 = false
 	// #ifdef H5
@@ -271,8 +294,9 @@
 	const showAndriod = !isH5 && isAndriod ? true : false
 	let initing = true
 	const refPoster = ref(null)
-
-
+	
+	
+	let paytips=ref('')
 	const props = defineProps({
 		list: {
 			type: Array,
@@ -309,6 +333,8 @@
 			}
 		}
 	})
+	
+	
 	const control = reactive({
 		showBack: true,
 		showControls: true
@@ -328,7 +354,6 @@
 	})
 
 	function controlstoggles(e) {
-		console.log(e);
 		control.showControls = e.detail.show
 		control.showBack = control.showControls
 	}
@@ -459,7 +484,6 @@
 		if (isFirst) {
 			$mountedComponents[index] = true
 		}
-		console.log('appear:' + index);
 		if (!initing) {
 			cacheIndex = index
 		}
@@ -594,10 +618,8 @@
 
 	function goListPosition(index) {
 		clearTimeout(positonmer)
-		console.log('goListPosition:' + index)
 		const el = refList.value[index]
 		if (initing) {
-			console.log($mountedComponents);
 			if (!$mountedComponents[index]) {
 				positonmer = setTimeout(() => {
 					goListPosition(index)
@@ -634,7 +656,7 @@
 		}
 	}
 
-	function popupShow(key = 'show', item, index) {
+	async function popupShow(key = 'show', item, index) {
 		console.log(key, item, 'debug');
 		console.log('key' + popup[key]);
 		console.log('popupShow');
@@ -648,6 +670,11 @@
 			xuanjiInit()
 			// #endif
 		}
+		if(key=='pay'){
+			const res=await Api.getPayTips()
+			console.log(res);
+			paytips.value=res
+		}
 		popup[key] = true
 		if (item) {
 			popup.data = item
@@ -827,7 +854,6 @@
 		const lastIndex = listLen - 1
 		const index = props.list.findIndex(v => v.courseDetailsId == item.courseDetailsId)
 		nowIndex.value = index
-		console.log('setVideoList nowIndex' + index);
 		let position = ''
 		if (index === 0) {
 			position = 'start'
@@ -862,7 +888,6 @@
 				videoList.value = [props.list[index + 1], props.list[index - 1], item]
 			}
 		}
-		console.log(videoList.value, 'debug');
 		if (!item.videoUrl) {
 			nextTick(() => {
 				setTimeout(() => {

components/my-video-list/progress.vue

@@ -0,0 +1,68 @@
+<template>
+	<view class="progress-box">
+		<view class="line" :style="{width:percent+'px'}">
+		</view>
+		<view class="block" @touchstart="progressTouchStart" @touchmove="progressTouchMove"
+		:style="{transform:'translateX('+percent+'px)'}"
+			@touchend="progressTouchEnd"></view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue';
+	const props=defineProps({
+	})
+	
+	
+	let percent=ref(50)
+	//进度条
+	let progressIsTouch = false
+	let start = 0
+	function progressTouchStart(e) {
+		console.log(e);
+		start = e.touches[0].clientX
+		progressIsTouch = true
+	}
+
+	function progressTouchMove(e) {
+		console.log(e);
+		const step = 1;
+		playPercent.value += step
+	}
+
+	function progressTouchEnd(e) {
+		console.log(e);
+		progressIsTouch = false
+	}
+</script>
+
+<style lang="scss" scoped>
+	.progress-box {
+		border-radius: 20px;
+		height: 5px;
+		margin:  4px 0;
+		background-color: rgba(255, 255, 255, .6);
+		box-shadow: 0 0 1px #eee;
+		flex-direction: row;
+		overflow: visible;
+		.line {
+			background-color: #fff;
+			border-radius: 20px;
+			overflow: visible;
+		}
+		$block-size: 8px;
+		.block {
+			top: -1px;
+			left: 0;
+			position: absolute;
+			z-index: 2;
+			width: $block-size;
+			height: $block-size;
+			background-color: #fff;
+			border-radius: 50%;
+			box-shadow: 0 0 1px #eee;
+		}
+	}
+</style>

http/http.js

@@ -73,8 +73,6 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 			// http响应码不正确
 			if (statusCode != 200 && statusCode != 204 && statusCode != 201) {
 				isShowErrorToast = true;
-				data.message =
-					data.message == "Bad credentials" ? "用户名或密码错误" : data.message;
 				infoBox.showToast(data.message || "服务器异常");
 				return Promise.reject(bodyData); // 跳转到catch函数
 			}
@@ -122,14 +120,12 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 			}
 
 			if (res.code == 401) {
-				infoBox.showToast(res.message || "请登录").then(() => {
-					uni.redirectTo({
-						url: "/pages/login/login",
-					});
-					reject();
+				uni.redirectTo({
+					url: "/pages/login/login",
 				});
+				reject();
 			}
-			if (res.code != 0) {
+			if (res.code != 0&&res.code != 401) {
 				infoBox.showToast(res.msg).then(() => {});
 				reject();
 			}

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "duanju-app-v3",
+    "name" : "斯耀短剧",
     "appid" : "__UNI__E0B05B1",
     "description" : "",
-    "versionName" : "2.3.4",
-    "versionCode" : 234,
+    "versionName" : "1.2.5",
+    "versionCode" : 125,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -32,7 +32,8 @@
 		{
 			"path": "pages/task/index",
 			"style": {
-				"navigationBarTitleText": "任务大厅"
+				"navigationBarTitleText": "任务大厅",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/chasingDrama/index",

pages/index/components/contentlist.vue

@@ -26,7 +26,7 @@
 
 	function seVideo(item) {
 		uni.navigateTo({
-			url:"/pages/video/detail?courseId="+item.courseId+"&courseDetailsId="+item.courseDetailsId
+			url: "/pages/video/detail?courseId=" + item.courseId + "&courseDetailsId=" + item.courseDetailsId
 		})
 	}
 </script>
@@ -35,7 +35,7 @@
 	.contentlist {
 		display: flex;
 		align-items: center;
-		justify-content: space-around;
+		justify-content: space-between;
 		flex-wrap: wrap;
 		margin-top: 10rpx;
 		padding: 0 26rpx;
@@ -44,17 +44,19 @@
 			border-radius: 21rpx 21rpx 21rpx 21rpx;
 			width: 30%;
 			margin-top: 20rpx;
+			text-align: center;
 
 			>view {
 				font-weight: 400;
 				font-size: 25rpx;
 				text-align: left;
+				margin-left: 10rpx;
 			}
 		}
 
-		.liststyle:last-child {
-			// margin-right: auto;
-			// margin-left: 6rpx;
-		}
+		// .liststyle:last-child {
+		// 	margin-right: auto;
+		// 	margin-left: 6rpx;
+		// }
 	}
 </style>

pages/index/index.vue

@@ -10,7 +10,7 @@
 			</view> -->
 		</view>
 
-		<template v-if="datas.setindexdata">
+		<template v-if="datas.isExamine">
 			<view class="gongao">
 				<view class="gongaoicon">
 					公告
@@ -42,27 +42,37 @@
 		</view>
 	</view>
 	<contentlist :list='datas.list'></contentlist>
-	<image v-if="datas.setindexdata" @click="goMsg()" src="@/static/index/red-pack-new.gif"
+	<image v-if="datas.isExamine" @click="goMsg()" src="@/static/index/red-pack-new.gif"
 		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
 	<up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText"
-		:showCancelButton="datas.version.cancelText!=''" @confirm='confirmUpdateVersion' :title="datas.version.title"
-		:title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)" @cancel="datas.version.show = false">
+		:showCancelButton="datas.version.cancelText!=''" @cancel="cancelUpdateVersion" @confirm='confirmUpdateVersion'
+		:title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)">
 		<view class="" style="padding-top: 30rpx;text-align: left;">
 			<scroll-view scroll-y="true" style="max-height: 50vh;">
-				<rich-text style="color:#666" :nodes="datas.version.content"></rich-text>
+				<!-- <rich-text style="color:#666" :nodes="datas.version.content"></rich-text> -->
+				<view style="text-align: justify;font-size: 18px;color: #666;" v-html="datas.version.content"></view>
 			</scroll-view>
 		</view>
 	</up-modal>
-	<up-modal :show="datas.ruleShow" v-if="$common.isIosExamine&&!datas.version.show" confirm-text="知道了" title="规则说明"
-		:title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm"
+	
+	<!-- h5关闭通知 -->
+	<!-- #ifdef H5 -->
+	<up-modal :show="datas.stopShow"  
+	cancel-text="知道了"
+	show-cancel-button
+	confirm-text="去下载" title="重要通知"
+	@cancel="stopCancel"
+		:title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="stopConfirm"
 		confirm-color="rgb(255, 117, 129)">
-		<view class="u-p-30 u-text-left">
-			<scroll-view scroll-y="true" style="max-height: 50vh;">
-				<rich-text style="text-align: justify;font-size: 18px;color: #666;"
-					:nodes="datas.rule_content"></rich-text>
-			</scroll-view>
+		<view class="color-red u-text-left">
+			<text>2025年2月8日将关闭网页访问，请及时下载最新APP</text>
 		</view>
 	</up-modal>
+	<!-- #endif -->
+	
+	
+	
+	
 </template>
 
 <script setup>
@@ -94,14 +104,18 @@
 	} from '@/store/common.js'
 	const $common = useCommonStore()
 	onShow(() => {
-		console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
+		// console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
 		// 判断ios是否审核
 		$common.init()
-		let sysInfo = uni.getSystemInfoSync()
-		let isIos = sysInfo.platform == 'ios'
-		if (isIos) {
-			datas.setindexdata = $common.isIosExamine
-		}
+		// #ifdef H5
+		datas.isExamine = $common.isIosExamine
+		// #endif 
+		// let sysInfo = uni.getSystemInfoSync()
+		// let isIos = sysInfo.platform == 'ios'
+		// if (isIos) {
+		// 	datas.setindexdata = $common.setversion
+		// 	console.log(datas.setindexdata,'seaeasdas')
+		// }
 	})
 	let datas = reactive({
 		noticeList: [], //公告列表
@@ -110,7 +124,7 @@
 
 		list: [], // 底部短剧内容
 		page: 1, // 首页推荐分页
-
+		stopShow:true,//h5关闭弹窗
 		ruleShow: false,
 		rule_title: '', // 首页弹窗标题
 		rule_content: '', // 首页弹窗内容
@@ -123,14 +137,14 @@
 			content: "",
 			confirmText: "",
 			cancelText: "",
+			downloadLink: ""
 		},
-		setindexdata :"false"
+		setindexdata: false
 	})
 	onLoad(() => {
 		versionUpdate()
 		getMsg()
 		getrecomVideo()
-		datas.isExamine = $common.isIosExamine || 0
 	})
 	onReady(() => {
 		if (!uni.getStorageSync('ruleShow')) {
@@ -150,32 +164,41 @@
 		++datas.page
 		getrecomVideo()
 	})
-
+	
+	function stopConfirm(){
+		datas.stopShow=false
+		uni.navigateTo({
+			url:'/pages/login/download'
+		})
+	}
+	function stopCancel(){
+		datas.stopShow=false
+	}
 	function versionUpdate() {
 		//#ifdef APP-PLUS
 		plus.screen.lockOrientation('portrait-primary'); //竖屏正方向锁定
 		//获取当前系统版本信息
 		plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
 			//请求后台接口 解析数据 对比版本
-			selectNewApp().then(res => {
+			selectNewApp().then(async res => {
 				res = res[0];
+				console.log(uni.getSystemInfoSync().platform == 'ios', 1101)
 				let version;
 				if (uni.getSystemInfoSync().platform == 'android') {
 					version = res.version
 				}
 				if (uni.getSystemInfoSync().platform == 'ios') {
 					version = res.iosVersion
-					$common.setversion(widgetInfo.version, version)
 				}
-				version = res.version
-				// && uni.getSystemInfoSync().platform == 'android'
-				if (widgetInfo.version < version) {
-					let downloadLink = '';
-					let androidLink = res.androidWgtUrl;
-					let iosLink = res.iosWgtUrl;
+				let isVersion = await $common.setversion(widgetInfo.version, version)
+				datas.isExamine = $common.isIosExamine
+				console.log(isVersion, '')
+				if (isVersion == 1) {
+					datas.version.downloadLink = res.androidWgtUrl;
 					datas.version.show = true;
 					datas.version.title = "发现新版本";
 					datas.version.content = res.des;
+					uni.hideTabBar()
 					if (res.method == "true") {
 						datas.version.confirmText = "立即更新"
 					} else {
@@ -189,6 +212,11 @@
 		//#endif
 	}
 
+	function cancelUpdateVersion() {
+		uni.showTabBar()
+		datas.version.show = false
+	}
+
 	function confirmUpdateVersion() {
 		// plus.runtime.openURL(config.baseUrl + '/pages/login/appEq')
 		linkTo('/pages/login/download')
@@ -199,7 +227,7 @@
 		});
 		if (uni.getSystemInfoSync().platform == 'android') {
 			uni.downloadFile({
-				url: androidLink,
+				url: datas.version.downloadLink,
 				success: downloadResult => {
 					console.log(downloadResult)
 					if (downloadResult.statusCode === 200) {
@@ -222,7 +250,7 @@
 			});
 		}
 		if (uni.getSystemInfoSync().platform == 'ios') {
-			plus.runtime.openURL(iosLink, function(res) {});
+			plus.runtime.openURL(datas.version.downloadLink, function(res) {});
 		}
 	}
 

pages/login/download.vue

@@ -4,9 +4,9 @@
 
 		<view class="content">
 			<image class="logo" src="/static/download/appLogo.png"></image>
-			<view style="font-size: 40rpx;margin-top: 22rpx;color: #FFFFFF;font-weight: bold;">斯耀短剧APP</view>
+			<view style="font-size: 40rpx;margin-top: 22rpx;color: #FFFFFF;font-weight: bold;">{{data.confirmBtn}}</view>
 			<view style="font-size: 28rpx;margin-top: 16rpx;color: #FFFFFF;font-weight: bold;">海量电子榨菜  免费又过瘾</view>
-			<button class="confirm-btn" @click="download">{{data.confirmBtn}}</button>
+			<button class="confirm-btn" @click="download">点击下载{{data.confirmBtn}}</button>
 			
 		</view>
 		
@@ -32,7 +32,7 @@
 		// #ifdef H5
 		let u = window.navigator.userAgent;
 		if ( uni.getSystemInfoSync().platform == 'ios') {
-			data.confirmBtn = "跳转网页版首页"
+			data.confirmBtn = "顺享短剧APP"
 		}
 		if ( u.toLowerCase().indexOf('micromessenger') !== -1) {
 			data.isWeixin = true
@@ -45,54 +45,22 @@
 		console.log(uni.getSystemInfoSync().platform == 'android')
 		if (uni.getSystemInfoSync().platform == 'android') {
 			commonType(49).then(res => {
-				console.log(res)
 				if (res && res.value) {
 					// #ifndef H5
-					plus.runtime.openURL(res.value, function(res) {
-						
-					});
+					plus.runtime.openURL(res.value, function(res) {});
 					// #endif
 					// #ifdef H5
-					uni.setClipboardData({
-						data: res.value,
-						success: r => {
-							// this.$queue.showToast('邀请码复制成功');
-							uni.showToast({
-								title: '邀请码复制成功',
-								icon: 'none',
-							});
-						}
-					});
 					window.location.href = res.value;
 					// #endif
 				}
 			});
 		} else {
-			commonType(50).then(res => {
-				if (res && res.value) {
-					// #ifndef H5
-					plus.runtime.openURL(res.value, function(res) {
-						
-					});
-					// #endif
-					// #ifdef H5
-					uni.setClipboardData({
-						data: res.value,
-						success: r => {
-							uni.showToast({
-								title: '邀请码复制成功',
-								icon: 'none',
-							});
-						}
-					});
-					
-					uni.switchTab({
-						url: '/pages/index/index'
-					})
-					// window.location.href = res.data.value;
-					// #endif
-				}
-			});
+			// #ifndef H5
+				plus.runtime.openURL('https://apps.apple.com/cn/app/%E9%A1%BA%E4%BA%AB%E7%9F%AD%E5%89%A7/id6740074541', function(res) {});
+			// #endif
+			// #ifdef H5
+				window.location.href = 'https://apps.apple.com/cn/app/%E9%A1%BA%E4%BA%AB%E7%9F%AD%E5%89%A7/id6740074541';
+			// #endif
 		}
 	}
 </script>

pages/me/index.vue

@@ -179,7 +179,7 @@ onPullDownRefresh(async () => {
 	}, 500);
 });
 
-onLoad(() => {
+onShow(() => {
 	if(uni.getStorageSync('token')){
 		selectByUserIdAjax();
 		collectVideoSummaryAjax();

pages/me/userInfo.vue

@@ -12,11 +12,11 @@
 					<input v-model="data.userInfo.userName" align="right" placeholder="请输入用户名" />
 				</template>
 			</up-cell>
-			<up-cell title="手机">
+			<!-- <up-cell title="手机">
 				<template #value>
-					<input :disabled="data.userInfo.phone?true:false" v-model="data.userInfo.phone" align="right" placeholder="请输入联系电话" />
+					<input v-model="data.userInfo.phone" align="right" placeholder="请输入联系电话" />
 				</template>
-			</up-cell>
+			</up-cell> -->
 		</up-cell-group>
 		<view class="save" @click="save">保存</view>
 	</view>
@@ -62,7 +62,8 @@
 				if (index === 0) {
 					// 用户点击了预览当前图片
 					// 可以自己实现当前头像链接的读取
-					let url = data.userInfo.avatar;
+					console.log()
+					let url = data.userInfo.avatar||'../../static/default/avatar.png';
 					let arr = []
 					arr.push(url)
 					uni.previewImage({
@@ -108,20 +109,20 @@
 			})
 			return
 		}
-		if (!data.userInfo.phone) {
-			uni.showToast({
-				title: "手机号不能空",
-				icon: "none"
-			})
-			return
-		}
-		if (checkPhone(data.userInfo.phone) == false) {
-			uni.showToast({
-				title: "手机号格式不正确",
-				icon: "none"
-			})
-			return
-		}
+		// if (!data.userInfo.phone) {
+		// 	uni.showToast({
+		// 		title: "手机号不能空",
+		// 		icon: "none"
+		// 	})
+		// 	return
+		// }
+		// if (checkPhone(data.userInfo.phone) == false) {
+		// 	uni.showToast({
+		// 		title: "手机号格式不正确",
+		// 		icon: "none"
+		// 	})
+		// 	return
+		// }
 					
 		uni.showModal({
 			title: '温馨提示',
@@ -132,7 +133,7 @@
 					let res = await updateUsers({
 							userName: data.userInfo.userName,
 							avatar: data.userInfo.avatar,
-							phone: data.userInfo.phone,
+							// phone: data.userInfo.phone,
 						})
 					uni.showToast({
 						title: '保存成功',
@@ -141,7 +142,7 @@
 					let userInfo = uni.getStorageSync('userInfo');
 					userInfo.userName = data.userInfo.userName
 					userInfo.avatar = data.userInfo.avatar
-					userInfo.phone = data.userInfo.phone
+					// userInfo.phone = data.userInfo.phone
 					uni.setStorageSync('userInfo', userInfo);
 					setTimeout(function() {
 						uni.navigateBack()

pages/me/withdraw/index.vue

@@ -76,7 +76,8 @@
 		<up-modal :show="data.ruleShow" confirm-text="知道了" title="规则说明" :title="data.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
 			<view class="u-p-30 u-text-left">
 				<scroll-view scroll-y="true" style="max-height: 50vh;" >
-					<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.rule_content"></rich-text>
+					<!-- <rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.rule_content"></rich-text> -->
+					<view style="text-align: justify;font-size: 18px;color: #666;" v-html="data.rule_content"></view>
 				</scroll-view>
 			</view>
 		</up-modal>
@@ -100,7 +101,7 @@
 	import { commonType } from '@/api/init.js';
 	import { linkTo } from '@/utils/app.js';
 	
-	let data = reactive({
+	const data = reactive({
 		ruleShow: false,
 		rule_title: "",
 		rule_content: "",
@@ -135,6 +136,7 @@
 		getCanCash()
 		announcement({type: 1}).then(res=>{
 			data.ruleList = res
+			
 			ruleInit()
 			
 		})
@@ -163,6 +165,7 @@
 		getMoneyDetail();
 	})
 	function ruleInit(){
+		data.rule_content = ""
 		data.rule_title = data.ruleList[data.ruleIndex].title
 		data.rule_content = data.ruleList[data.ruleIndex].content
 	}
@@ -175,7 +178,7 @@
 				title: "暂未配置规则",
 				icon: 'none'
 			})
-			return
+			return false;
 		}
 		ruleInit()
 		data.ruleShow = true
@@ -184,6 +187,7 @@
 	 * 规则确认
 	 */
 	function ruleConfirm() {
+		console.log(1)
 		data.ruleShow = false
 		data.ruleIndex++
 		if( data.ruleIndex >= data.ruleList.length) {
@@ -301,9 +305,39 @@
 	 * 全部提现赋值
 	 */
 	function setAllMoney() {
-		data.money = data.mayMoney.toFixed(2)
+		data.money = getMoneys(data.mayMoney)
 	}
 	
+	/**
+	 * 
+	 * 金额格式化
+	 * money:金额
+	 * 保留两位小数&不四舍五入
+	 */
+	function getMoneys (money) {
+	    if (!money || isNaN(money)) return "0.00";
+	    let num = parseFloat(money + '') + '';
+	    num = parseInt(money * 100 + '') / 100 + ''
+	
+	    let reg = /(-?\d+)(\d{4})/;
+	    while (reg.test(num)) {
+	        num = num.replace(reg, "$1,$2");
+	    }
+	
+	    let idx = num.indexOf('.')
+	    if (idx === -1) {
+	        num = num + '.00'
+	    }
+	
+	    if (idx > 0) {
+	        let num_per = num.substring(0, idx) + '.'
+	        let num_next = num.substring(idx + 1).padEnd(2, '0')
+	        num = num_per + num_next
+	    }
+	
+	    return num;
+	}
+
 	/**
 	 * 获取提现记录
 	 */
@@ -338,7 +372,7 @@
 	 */
 	function getcashMoney() {
 		selectUserMoney().then(res => {
-			data.mayMoney = res.amount || 0
+			data.mayMoney = getMoneys(res.amount) || 0
 		})
 	}
 	

pages/me/withdraw/moneyList.vue

@@ -55,7 +55,7 @@
 			moneyType : data.moneyType,
 			viewType: data.viewType,
 		}).then(res => {
-			data.totalCount = res.total;
+			data.totalCount = res.totalCount;
 			if ( res.records.length > 0) {
 				data.list = [...data.list,...res.records];
 			}

pages/me/withdraw/realName.vue

@@ -1,16 +1,20 @@
 <template>
 	<view class="containerView">
 		<up-cell-group label-width="80" :border="false">
-			<up-cell :label-style="{ width: '100rpx' }" title="姓名">
+			<up-cell>
+				<template #title> <view style="width: 90px;">姓名</view></template>
 				<template #right-icon> <up-input border="none" v-model="data.certName" placeholder="请输入姓名"></up-input> </template>
 			</up-cell>
-			<up-cell title="身份证号码">
+			<up-cell>
+				<template #title> <view style="width: 90px;">身份证号码</view></template>
 				<template #right-icon> <up-input border="none" v-model="data.certNum" placeholder="请输入身份证号码"></up-input> </template>
 			</up-cell>
-			<up-cell  title="银行卡号码">
+			<up-cell>
+				<template #title> <view style="width: 90px;">银行卡号码</view></template>
 				<template #right-icon> <up-input border="none" v-model="data.accountNo" placeholder="请输入银行卡号码"></up-input> </template>
 			</up-cell>
-			<up-cell  title="手机号">
+			<up-cell>
+				<template #title> <view style="width: 90px;">手机号</view></template>
 				<template #right-icon> <up-input border="none" v-model="data.mobile" placeholder="请输入银行预留号码"></up-input> </template>
 			</up-cell>
 		</up-cell-group>
@@ -125,7 +129,9 @@
 	page {
 		background: #FFFFFF;
 	}
-
+	.u-cell__body__content{
+		flex: 0!important;
+	}
 	.containerView {
 		padding:30rpx;
 		position: relative;

pages/task/index.vue

@@ -1,6 +1,5 @@
 <template>
-	<view style="background-color: #F3F4F8;">
-
+	<view class="container">
 		<view class="task_bg u-absolute">
 			<image class="task_bg" src="@/static/task/task_bg.png"></image>
 		</view>
@@ -50,7 +49,8 @@
 					<view v-else class="btn u-font-24 text-bold disabled">
 						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
 					</view>
-					<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip" style="text-align: center;"
+					<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip"
+						style="text-align: center;"
 						@click="goNav({id: item.id,buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title, disabled: item.disabled, discNumber: item.discNumber})">
 						{{ item.buttonUnderContent}}
 					</view>
@@ -226,7 +226,12 @@
 	})
 	onReady(() => {
 		nextTick(() => {
+			datas.urlCallback = {
+				userId: uni.getStorageSync('userInfo').userId,
+				extra: uni.getStorageSync('userInfo').userId + "" + new Date().getTime(),
+			}
 			datas.adRewardedVideoloadNum = 0
+			
 			adRewarded.value.load();
 		})
 	})
@@ -250,6 +255,10 @@
 		}
 		datas.adRewardedVideoloadNum++
 		setTimeout(() => {
+			datas.urlCallback = {
+				userId: uni.getStorageSync('userInfo').userId,
+				extra: uni.getStorageSync('userInfo').userId + "" + new Date().getTime(),
+			}
 			adRewarded.value.load();
 		}, 1000); // 10
 		console.log("广告加载失败")
@@ -274,6 +283,10 @@
 			let res = await state({
 				extraKey: datas.urlCallback.extra
 			})
+			datas.urlCallback = {
+				userId: uni.getStorageSync('userInfo').userId,
+				extra: uni.getStorageSync('userInfo').userId + "" + new Date().getTime(),
+			}
 			uni.showToast({
 				title: '获得' + $common.freeDuration + '分钟免费时长',
 				icon: 'none'
@@ -283,6 +296,7 @@
 		}
 	}
 	async function goNav(item, url) {
+		console.log(item, url, '调试111')
 		// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
 		// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
 		if (url) {
@@ -345,10 +359,8 @@
 						});
 						return
 					}
-					datas.urlCallback = {
-						userId: uni.getStorageSync('userId'),
-						extra: uni.getStorageSync('userId') + "" + new Date().getTime(),
-					}
+					
+					console.log(datas.urlCallback)
 					adRewarded.value.show();
 				} else {
 					uni.switchTab({
@@ -360,42 +372,38 @@
 				if (item.title && item.title.indexOf('每周打卡奖励') != -1) {
 					buttonUrl = item.buttonUrl + '?source=2'
 
-					uni.navigateTo({
-						url: buttonUrl
-					})
+					
 				}
 				if (item.title && item.title.indexOf('每月打卡奖励1') != -1) {
 					buttonUrl = item.buttonUrl + '?source=3'
-
-					uni.navigateTo({
-						url: buttonUrl
-					})
 				}
 				if (item.title && item.title.indexOf('每月打卡奖励2') != -1) {
 
-					let res = await taskReceive({
-						id: item.id
-					})
-					if (res.code == 0) {
-						uni.showToast({
-							title: res.id == 15 ? '签到成功' : '领取成功',
-							icon: 'none'
-						})
-						setTimeout(() => {
-							getTaskdata()
-							getsignIn()
-						}, 1000)
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
+					// let res = await taskReceive({
+					// 	id: item.id
+					// })
+					// if (res.code == 0) {
+					// 	uni.showToast({
+					// 		title: res.id == 15 ? '签到成功' : '领取成功',
+					// 		icon: 'none'
+					// 	})
+					// 	setTimeout(() => {
+					// 		getTaskdata()
+					// 		getsignIn()
+					// 	}, 1000)
+					// } else {
+					// 	uni.showToast({
+					// 		title: res.msg,
+					// 		icon: 'none'
+					// 	})
+					// }
 
-					// buttonUrl =
-					// 	`${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
+					buttonUrl =
+						`${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
 				}
-
+				uni.navigateTo({
+					url: buttonUrl
+				})
 
 			} else if (item.jumpType == 3) {
 				uni.switchTab({
@@ -436,6 +444,19 @@
 </script>
 
 <style scoped lang="scss">
+	page{
+		// min-height: 100vh;
+	}
+	.container{
+		/* #ifdef H5 */
+		min-height: calc(100vh - 96rpx);
+		/* #endif */
+		/* #ifndef H5 */
+		min-height: 100vh;
+		/* #endif */
+		background-color: #F3F4F8;
+		padding-top: 2rpx;
+	}
 	.u-absolute {
 		position: absolute;
 	}
@@ -446,9 +467,9 @@
 	}
 
 	.icon {
-		position: relative;
-		padding: 32rpx;
-
+		position: absolute;
+		padding: 122rpx 32rpx 32rpx 32rpx;
+		
 		.icon_title {
 			color: #000000;
 			margin-left: 28rpx;
@@ -475,13 +496,13 @@
 
 	.contentTop {
 		border-radius: 16rpx;
-		top: -115rpx;
+		// top: -115rpx;
 		padding: 20rpx;
 		margin-bottom: 32rpx;
 		position: relative;
 		background-color: #ffffff;
 		color: #666666;
-		margin: 32rpx;
+		margin: 282rpx 32rpx 32rpx 32rpx;
 
 		>view:first-child {
 			>image {
@@ -538,7 +559,7 @@
 
 	.content {
 		border-radius: 16rpx;
-		top: -115rpx;
+		// top: -115rpx;
 		padding: 28rpx;
 		background-color: #ffffff;
 		color: #666666;
@@ -546,9 +567,8 @@
 		margin-right: 32rpx;
 		position: relative;
 		border-radius: 16rpx;
-		top: -115rpx;
 		padding: 28rpx;
-
+		margin-bottom: 32rpx;
 		.cell {
 			padding: 32rpx 0;
 			border-bottom: 2rpx solid #EBEBEB;

pages/task/receiveMember.vue

@@ -57,10 +57,11 @@
 		getCurrentInstance
 	} from 'vue'
 	import {
-		onLoad
+		onLoad,onShow
 	} from '@dcloudio/uni-app'
 	import {
-		selectTaskCenterUserReward
+		selectTaskCenterUserReward,
+		receiveGoods
 	} from '@/api/task/index.js'
 	let datas = reactive({
 		list: [],
@@ -82,6 +83,8 @@
 		if (options.taskId) {
 			datas.taskId = options.taskId
 		}
+	})
+	onShow(()=>{
 		getList()
 	})
 	// 去兑换

pages/video/detail.nvue

@@ -98,7 +98,6 @@
 	}
 	onLoad((opt) => {
 		Object.assign(options, opt)
-		console.log(options);
 		init()
 	})
 

store/common.js

@@ -67,23 +67,39 @@ export const useCommonStore = defineStore("common", {
 			}
 		},
 		setversion(a, b) {
-			// a是當前應用的版本號 b是接口拿的
-			let appversion = (a.split('.').join('')) * 1
-			let resversion = (b.split('.').join('')) * 1
-			console.log('當前版本-' + appversion, '接口版本-' + resversion, '返回-' + this.isIosExamine,'判斷值-'+this.isExamines)
-			if (appversion > resversion) {
-				// 再審核
-				this.isExamines = 1
+			return new Promise(async (resolve, reject) => {
+				this.isExamines = await this.compare(a, b)
+				console.log('判斷值-' + this.isExamines)
+				resolve(this.isExamines)
+			})
+		},
+		// 判断版本号
+		compare(version1, version2) {
+			let arr1 = version1.split(".");
+			let arr2 = version2.split(".");
+			let length = Math.max(arr1.length, arr2.length);
+			for (let i = 0; i < length; i++) {
+				const n1 = Number(arr1[i] || 0)
+				const n2 = Number(arr2[i] || 0)
+				// version1 > version2 返回1，如果 version1 < version2 返回-1，不然返回0
+				// 当前版 n1 接口版本是 n2   
+				// 1小于2 更新弹窗、抽奖等显示
+				if (n1 < n2) return 1
+				// 1大于2 更新弹窗、抽奖不显示
+				if (n1 > n2) return -1
 			}
+			// APP等于2 更新弹窗不显示‘抽奖显示
+			return 0
 		}
 
 	},
 	getters: {
 		isIosExamine: function() {
+			console.log(this.isExamines)
 			if (!this.isIos) {
 				return true
 			}
-			if (this.isExamines == 1) {
+			if (this.isExamines == -1) {
 				return false
 			}
 			return true

vue.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+    productionSourceMap: false, // 生产打包时不输出map文件，增加打包速度
+    configureWebpack: config => {
+        if (process.env.NODE_ENV === 'production') {
+            config.optimization.minimizer[0].options.terserOptions.compress.warnings = false
+            config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
+            config.optimization.minimizer[0].options.terserOptions.compress.drop_debugger = true
+            config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log']
+        }
+    }
+}