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

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

@@ -802,8 +802,9 @@
 	}
 
 	function share(item) {
+		const {qdCode}= uni.getStorageSync('userInfo')||{}
 		const urls = returnShareUrl() + '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
-			.courseDetailsId + '&invitation=' + uni.getStorageSync('invitationCode') + '&qdCode=' + this.qdCode;
+			.courseDetailsId + '&invitation=' + uni.getStorageSync('invitationCode') + '&qdCode=' +qdCode;
 		console.log(urls);
 		// #ifdef H5
 		refPoster.value.make({

manifest.json

@@ -7,6 +7,15 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        "app" : {
+            "name" : "斯耀短剧1",
+            "pkgName" : "com.hnsiyao.duanju" // 安卓包名
+        },
+        "ios" : {
+            "name" : "顺享短剧2",
+            "app-category" : "public.app-category.utilities",
+            "bundleID" : "com.hnsiyao.duanju" // iOS bundle ID
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,

pages.json

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

pages/index/index.vue

@@ -49,20 +49,30 @@
 		: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="datas.isExamine&&!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">
+		<view class="color-red u-text-left">
-			<scroll-view scroll-y="true" style="max-height: 50vh;">
+			<text>2025年2月8日将关闭网页访问，请及时下载最新APP</text>
-				<rich-text style="text-align: justify;font-size: 18px;color: #666;"
-					:nodes="datas.rule_content"></rich-text>
-			</scroll-view>
 		</view>
 	</up-modal>
+	<!-- #endif -->
+	
+	
+	
+	
 </template>
 
 <script setup>
@@ -114,7 +124,7 @@
 
 		list: [], // 底部短剧内容
 		page: 1, // 首页推荐分页
-
+		stopShow:true,//h5关闭弹窗
 		ruleShow: false,
 		rule_title: '', // 首页弹窗标题
 		rule_content: '', // 首页弹窗内容
@@ -154,7 +164,16 @@
 		++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'); //竖屏正方向锁定

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 => {
+			// #ifndef H5
-				if (res && res.value) {
+				plus.runtime.openURL('https://apps.apple.com/cn/app/%E9%A1%BA%E4%BA%AB%E7%9F%AD%E5%89%A7/id6740074541', function(res) {});
-					// #ifndef H5
+			// #endif
-					plus.runtime.openURL(res.value, function(res) {
+			// #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
-					// #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
-				}
-			});
 		}
 	}
 </script>

pages/me/withdraw/index.vue

@@ -94,40 +94,15 @@
 </template>
 
 <script setup>
-	import {
+	import { reactive, nextTick, ref } from 'vue';
-		reactive,
+	import { onReady,onLoad,onShow,onLaunch,onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-		nextTick,
+	import { selectUserMoney, selectPayDetails, canCash, state, withdraw } from '@/api/me/withdraw.js';
-		ref
+	import { selectUserById } from '@/api/user/user.js';
-	} from 'vue';
+	import { announcement } from '@/api/index/index.js';
-	import {
+	import { commonType } from '@/api/init.js';
-		onReady,
+	import { linkTo } from '@/utils/app.js';
-		onLoad,
+	
-		onShow,
+	const data = reactive({
-		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';
-	import {
-		commonType
-	} from '@/api/init.js';
-	import {
-		linkTo
-	} from '@/utils/app.js';
-
-	let data = reactive({
 		ruleShow: false,
 		rule_title: "",
 		rule_content: "",
@@ -164,6 +139,7 @@
 			type: 1
 		}).then(res => {
 			data.ruleList = res
+			
 			ruleInit()
 
 		})
@@ -191,8 +167,8 @@
 		data.list = []
 		getMoneyDetail();
 	})
-
+	function ruleInit(){
-	function ruleInit() {
+		data.rule_content = ""
 		data.rule_title = data.ruleList[data.ruleIndex].title
 		data.rule_content = data.ruleList[data.ruleIndex].content
 	}
@@ -205,7 +181,7 @@
 				title: "暂未配置规则",
 				icon: 'none'
 			})
-			return
+			return false;
 		}
 		ruleInit()
 		data.ruleShow = true
@@ -214,6 +190,7 @@
 	 * 规则确认
 	 */
 	function ruleConfirm() {
+		console.log(1)
 		data.ruleShow = false
 		data.ruleIndex++
 		if (data.ruleIndex >= data.ruleList.length) {

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>
@@ -232,6 +231,7 @@
 				extra: uni.getStorageSync('userInfo').userId + "" + new Date().getTime(),
 			}
 			datas.adRewardedVideoloadNum = 0
+			
 			adRewarded.value.load();
 		})
 	})
@@ -444,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;
 	}
@@ -454,9 +467,9 @@
 	}
 
 	.icon {
-		position: relative;
+		position: absolute;
-		padding: 32rpx;
+		padding: 122rpx 32rpx 32rpx 32rpx;
-
+		
 		.icon_title {
 			color: #000000;
 			margin-left: 28rpx;
@@ -483,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 {
@@ -546,7 +559,7 @@
 
 	.content {
 		border-radius: 16rpx;
-		top: -115rpx;
+		// top: -115rpx;
 		padding: 28rpx;
 		background-color: #ffffff;
 		color: #666666;
@@ -554,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;

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']
+        }
+    }
+}