首页公告优化

.hbuilderx/launch.json

@@ -18,7 +18,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

App.vue

@@ -1,6 +1,9 @@
 <script>
 	import config from '@/common/config.js'
 	import store from './store/index.js'
+	import {
+		init
+	} from './common/init.js'
 	export default {
 		onLaunch: function() {
 			let that = this
@@ -461,168 +464,168 @@
 							} else {
 								//不是热更新是在线更新 校验是否强制升级
 
-								if (res.method == "true") {
-									uni.showModal({
-										showCancel: false,
-										title: '发现新版本',
-										confirmText: '立即更新',
-										content: res.des,
-										success: res => {
-											if (res.confirm) {
-												plus.runtime.openURL(config.APIHOST2 +
-													'/pages/login/appEq')
-												return
-												uni.showLoading({
-													title: '下载中...',
-													mask: true
-												});
-												if (uni.getSystemInfoSync().platform ==
-													'android') {
-													uni.downloadFile({
-														url: androidLink,
-														success: downloadResult => {
-															console.log(
-																downloadResult
-																)
-															if (downloadResult
-																.statusCode ===
-																200) {
-																plus.runtime
-																	.install(
-																		downloadResult
-																		.tempFilePath, {
-																			force: false
-																		},
-																		d => {
-																			console
-																				.log(
-																					'install success...'
-																				);
-																			plus.runtime
-																				.restart();
-																		},
-																		e => {
-																			console
-																				.log(
-																					e
-																					)
-																			console
-																				.error(
-																					'install fail...'
-																				);
-																		}
-																	);
-																// plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, entry => {
-																// 	entry.getParent(_oldFile=>{
-																// 		entry.moveTo(_oldFile,'.apk',newFilePath=>{
-																// 			console.log('newFilePath',newFilePath.fullPath)
+								// if (res.method == "true") {
+								// 	uni.showModal({
+								// 		showCancel: false,
+								// 		title: '发现新版本',
+								// 		confirmText: '立即更新',
+								// 		content: res.des,
+								// 		success: res => {
+								// 			if (res.confirm) {
+								// 				plus.runtime.openURL(config.APIHOST2 +
+								// 					'/pages/login/appEq')
+								// 				return
+								// 				uni.showLoading({
+								// 					title: '下载中...',
+								// 					mask: true
+								// 				});
+								// 				if (uni.getSystemInfoSync().platform ==
+								// 					'android') {
+								// 					uni.downloadFile({
+								// 						url: androidLink,
+								// 						success: downloadResult => {
+								// 							console.log(
+								// 								downloadResult
+								// 								)
+								// 							if (downloadResult
+								// 								.statusCode ===
+								// 								200) {
+								// 								plus.runtime
+								// 									.install(
+								// 										downloadResult
+								// 										.tempFilePath, {
+								// 											force: false
+								// 										},
+								// 										d => {
+								// 											console
+								// 												.log(
+								// 													'install success...'
+								// 												);
+								// 											plus.runtime
+								// 												.restart();
+								// 										},
+								// 										e => {
+								// 											console
+								// 												.log(
+								// 													e
+								// 													)
+								// 											console
+								// 												.error(
+								// 													'install fail...'
+								// 												);
+								// 										}
+								// 									);
+								// 								// plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, entry => {
+								// 								// 	entry.getParent(_oldFile=>{
+								// 								// 		entry.moveTo(_oldFile,'.apk',newFilePath=>{
+								// 								// 			console.log('newFilePath',newFilePath.fullPath)
 
-																// 		})
-																// 	}) 
-																// })
+								// 								// 		})
+								// 								// 	}) 
+								// 								// })
 
-															}
-														}
-													});
-												}
-												if (uni.getSystemInfoSync().platform ==
-													'ios') {
-													plus.runtime.openURL(iosLink, function(
-														res) {});
-												}
-											} else if (res.cancel) {
-												console.log('取消');
-											}
-										}
-									});
-								} else {
-									uni.showModal({
-										title: '发现新版本',
-										confirmText: '立即更新',
-										cancelText: '下次更新',
-										content: res.des,
-										success: res => {
-											if (res.confirm) {
-												plus.runtime.openURL(config.APIHOST2 +
-													'/pages/login/appEq')
-												return
-												uni.showLoading({
-													title: '下载中...',
-													mask: true
-												});
-												if (uni.getSystemInfoSync().platform ==
-													'android') {
-													uni.downloadFile({
-														url: androidLink,
-														success: downloadResult => {
-															if (downloadResult
-																.statusCode ===
-																200) {
-																plus.runtime
-																	.install(
-																		downloadResult
-																		.tempFilePath, {
-																			force: false
-																		},
-																		d => {
-																			console
-																				.log(
-																					'install success...'
-																				);
-																			plus.runtime
-																				.restart();
-																		},
-																		e => {
-																			console
-																				.log(
-																					e
-																					)
-																			console
-																				.error(
-																					'install fail...'
-																				);
-																		}
-																	);
-																// plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, entry => {
-																// 	entry.getParent(_oldFile=>{
-																// 		entry.moveTo(_oldFile,'.apk',newFilePath=>{
-																// 			console.log('newFilePath',newFilePath.fullPath)
-																// 			plus.runtime
-																// 				.install(newFilePath.fullPath, { force: false },
-																// 					d => {
-																// 						console
-																// 							.log(
-																// 								'install success...'
-																// 							);
-																// 						plus.runtime
-																// 							.restart();
-																// 					},
-																// 					e => {
-																// 						console.log(e)
-																// 						console
-																// 							.error(
-																// 								'install fail...'
-																// 							);
-																// 					}
-																// 				);
-																// 		})
-																// 	}) 
-																// })
-															}
-														}
-													});
-												}
-												if (uni.getSystemInfoSync().platform ==
-													'ios') {
-													plus.runtime.openURL(iosLink, function(
-														res) {});
-												}
-											} else if (res.cancel) {
-												console.log('取消');
-											}
-										}
-									});
-								}
+								// 							}
+								// 						}
+								// 					});
+								// 				}
+								// 				if (uni.getSystemInfoSync().platform ==
+								// 					'ios') {
+								// 					plus.runtime.openURL(iosLink, function(
+								// 						res) {});
+								// 				}
+								// 			} else if (res.cancel) {
+								// 				console.log('取消');
+								// 			}
+								// 		}
+								// 	});
+								// } else {
+								// 	uni.showModal({
+								// 		title: '发现新版本',
+								// 		confirmText: '立即更新',
+								// 		cancelText: '下次更新',
+								// 		content: res.des,
+								// 		success: res => {
+								// 			if (res.confirm) {
+								// 				plus.runtime.openURL(config.APIHOST2 +
+								// 					'/pages/login/appEq')
+								// 				return
+								// 				uni.showLoading({
+								// 					title: '下载中...',
+								// 					mask: true
+								// 				});
+								// 				if (uni.getSystemInfoSync().platform ==
+								// 					'android') {
+								// 					uni.downloadFile({
+								// 						url: androidLink,
+								// 						success: downloadResult => {
+								// 							if (downloadResult
+								// 								.statusCode ===
+								// 								200) {
+								// 								plus.runtime
+								// 									.install(
+								// 										downloadResult
+								// 										.tempFilePath, {
+								// 											force: false
+								// 										},
+								// 										d => {
+								// 											console
+								// 												.log(
+								// 													'install success...'
+								// 												);
+								// 											plus.runtime
+								// 												.restart();
+								// 										},
+								// 										e => {
+								// 											console
+								// 												.log(
+								// 													e
+								// 													)
+								// 											console
+								// 												.error(
+								// 													'install fail...'
+								// 												);
+								// 										}
+								// 									);
+								// 								// plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, entry => {
+								// 								// 	entry.getParent(_oldFile=>{
+								// 								// 		entry.moveTo(_oldFile,'.apk',newFilePath=>{
+								// 								// 			console.log('newFilePath',newFilePath.fullPath)
+								// 								// 			plus.runtime
+								// 								// 				.install(newFilePath.fullPath, { force: false },
+								// 								// 					d => {
+								// 								// 						console
+								// 								// 							.log(
+								// 								// 								'install success...'
+								// 								// 							);
+								// 								// 						plus.runtime
+								// 								// 							.restart();
+								// 								// 					},
+								// 								// 					e => {
+								// 								// 						console.log(e)
+								// 								// 						console
+								// 								// 							.error(
+								// 								// 								'install fail...'
+								// 								// 							);
+								// 								// 					}
+								// 								// 				);
+								// 								// 		})
+								// 								// 	}) 
+								// 								// })
+								// 							}
+								// 						}
+								// 					});
+								// 				}
+								// 				if (uni.getSystemInfoSync().platform ==
+								// 					'ios') {
+								// 					plus.runtime.openURL(iosLink, function(
+								// 						res) {});
+								// 				}
+								// 			} else if (res.cancel) {
+								// 				console.log('取消');
+								// 			}
+								// 		}
+								// 	});
+								// }
 							}
 						}
 					});
@@ -649,7 +652,7 @@
 				});
 			}
 			// #endif
-
+			init()
 
 			// this.$u.get('/app/common/type/109').then(res => { // 是否开启公众号自动注册 109
 			// 	if (res.code == 0 && res.data) {
@@ -657,181 +660,6 @@
 			// 	}
 			// });
 			//微信小程序IOS系统支付功能开关	882
-			this.$u.get('/app/common/type/882').then(res => {
-				if (res.code == 0 && res.data) {
-					let value = res.data.value
-					const sysInfo = uni.getSystemInfoSync()
-					// #ifdef MP-WEIXIN
-					if (sysInfo.osName == 'ios') { //是ios系统
-						if (value == '是') { //开启
-							uni.setStorageSync('isWxIosPay', true)
-						} else { //关闭
-							uni.setStorageSync('isWxIosPay', false)
-						}
-					} else { //不是ios下，直接打开
-						uni.setStorageSync('isWxIosPay', true)
-					}
-					// #endif
-					//不在微信小程序也直接打开
-					// #ifndef MP-WEIXIN
-					uni.setStorageSync('isWxIosPay', true)
-					// #endif
-				}
-			});
-			//是否开启苹果登录	833
-			this.$u.get('/app/common/type/833').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('checkIosLogin', res.data.value)
-				}
-			});
-			//是否开启苹果支付	834
-			this.$u.get('/app/common/type/834').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('checkIosPay', res.data.value)
-				}
-			});
-			//是否开启微信登录	835
-			this.$u.get('/app/common/type/835').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('checkWxLogin', res.data.value)
-				}
-			});
-			//是否开启手机号一键登录	836
-			this.$u.get('/app/common/type/836').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('checkPhoneLogin', res.data.value)
-				}
-			});
-			this.$u.get('/app/common/type/817').then(res => { //是否开启购买整部视频	817
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('zhengbu', res.data.value)
-				}
-			});
-
-			this.$u.get('/app/common/type/818').then(res => { //是否开启购买单集视频	818
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('danbu', res.data.value)
-				}
-			});
-			// 微信激励广告id	252
-			this.$u.get('/app/common/type/252').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('adUnitId', res.data.value)
-				}
-			});
-			// 播放类型 1:抖音云 2:三方云
-			this.$u.get('/app/common/type/821').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('playType', res.data.value)
-				}
-			});
-			// 是否开启看广告（微信）	251
-			this.$u.get('/app/common/type/251').then(res => {
-				if (res.code == 0) {
-					if (res.data && res.data.value) {
-						uni.setStorageSync('isGuanggao', res.data.value)
-					}
-				}
-			});
-			// 是否开启看广告（抖音）	254
-			this.$u.get('/app/common/type/254').then(res => {
-				if (res.code == 0) {
-					if (res.data && res.data.value) {
-						uni.setStorageSync('isGuanggaody', res.data.value)
-					}
-				}
-			});
-			this.$u.get('/app/common/type/202').then(res => { //客服配置  1  二维码客服 2 微信公众号客服  3电话客服 
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('kefu', res.data.value)
-				}
-			});
-			this.$u.get('/app/common/type/206').then(res => { //客服电话 
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('kefuPhone', res.data.value)
-				}
-			});
-			this.$u.get('/app/common/type/204').then(res => { //微信客服链接 
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('kefuUrl', res.data.value)
-				}
-			});
-			this.$u.get('/app/common/type/203').then(res => { //微信客服appid   
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('kefuAppId', res.data.value)
-				}
-			});
-			//会员开关
-			this.$u.get('/app/common/type/248').then(res => { //会员开关
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('isVips', res.data.value)
-				}
-			});
-			//热搜词 249
-			this.$u.get('/app/common/type/249').then(res => { //热搜词
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('moreSearch', res.data.value)
-				}
-			});
-			//安卓下载地址 49
-			this.$u.get('/app/common/type/49').then(res => { //热搜词
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('AppUrl', res.data.value)
-				}
-			});
-			//微信虚拟支付OfferID 823
-			this.$u.get('/app/common/type/823').then(res => { //热搜词
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('OfferID', res.data.value)
-				}
-			});
-			//微信虚拟支付环境（0 米大师正式环境, 1 米大师沙箱环境） 824
-			this.$u.get('/app/common/type/824').then(res => { //热搜词
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('payEnv', res.data.value)
-				}
-			});
-			//充值提示 825
-			this.$u.get('/app/common/type/825').then(res => { //热搜词
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('moneyTips', res.data.value)
-				}
-			});
-			//是否开启卡密充值	855
-			this.$u.get('/app/common/type/855').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('kmPaySel', res.data.value)
-				}
-			});
-			//是否开启分类	849
-			this.$u.get('/app/common/type/849').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('homeTypeSel', res.data.value)
-				}
-			});
-			//是否开启收益充值余额	856
-			this.$u.get('/app/common/type/856').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('syPaySel', res.data.value)
-				}
-			});
-			//抖音im客服	857
-			this.$u.get('/app/common/type/857').then(res => {
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('imId', res.data.value)
-				}
-			});
-			this.$u.get('/app/common/type/858').then(res => { //是否开启公众号充值
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('isAccountPay', res.data.value)
-				}
-			});
-			//抖音广告id
-			this.$u.get('/app/common/type/860').then(res => { //抖音广告
-				if (res.code == 0 && res.data) {
-					uni.setStorageSync('dyadUnitId', res.data.value)
-				}
-			});
 
 			// #ifdef H5
 			if (!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {

common/config.js

@@ -1,6 +1,6 @@
-// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg/"; //
-// const ROOTPATH = "https://dj-api.hnsiyao.cn/czg/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
+const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg"; //
+const ROOTPATH = "https://dj-api.hnsiyao.cn/czg"; //后台服务域名
+const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 
 // const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
 // const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
@@ -11,10 +11,11 @@
 // const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名 
 
 // const ROOTPATH1 = "http://192.168.1.41:8100/czg"; //
-const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg"; //
-const ROOTPATH = "https://web-api.hnsiyao.cn/czg"; //后台服务域名
 // const ROOTPATH = "http://192.168.1.41:8100/czg"; //后台服务域名
-const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
+// 测试
+// const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg"; //
+// const ROOTPATH = "https://web-api.hnsiyao.cn/czg"; //后台服务域名
+// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
 
 
 module.exports = {

common/http.api.js

@@ -57,13 +57,25 @@ const install = (Vue, vm) => {
 	let type = (params = {}) => vm.$u.get('app/common/type', params); //钱包明细
 
 	let myPurseDet = (params = {}) => vm.$u.get('app/moneyDetails/queryUserMoneyDetails', params); //我的钱包
-	let myPurse = (params = {}) => vm.$u.get('app/moneyDetails/selectUserMoney', params); //钱包明细
+	let myPurse = (params = {}) => vm.$u.get('/app/moneyDetails/selectUserMoney', params); //钱包明细
 
 	let help = (params = {}) => vm.$u.get('app/helpWord/selectHelpList', params); //帮助中心 
 	let helpDet = (params = {}) => vm.$u.get('app/helpWord/selectHelpWordDetails', params); //帮助中心 详情
-	
+
 	//获取视频
-	let selectCourseDetailsById = (params = {}) => vm.$u.get('app/course/selectCourseDetailsById', params);
+	let selectCourseDetailsById = (params = {}) => {
+		let obj = {}
+		if (params.token) {
+			obj = params
+		} else {
+			obj = {
+				courseId:params.courseId,
+				token:'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMDc0MDk2MjQwODQ2ODQ1NTU3IiwiaWF0IjoxNzM2NTA0OTcyLCJleHAiOjE3MzcxMDk3NzJ9.b-xJwmlGiZ1MTojGdLPXPqk-7Lw0pSYRU-QFQW0HBRn1EUHpqz1To3HWPiC-j6F0W_YnbQrQKqztRs8kLoR0vA'
+
+			}	
+		}
+		return vm.$u.get('app/course/courseSets', obj)
+	};
 
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
@@ -124,4 +136,4 @@ const install = (Vue, vm) => {
 
 export default {
 	install
-}
+}

common/init.js

@@ -0,0 +1,410 @@
+import httpsRequest from '@/common/httpRequest.js'
+ 
+
+function getIsPauseServe() {
+	return new Promise((reslove, reject) => {
+		uni.request({
+			url: '',
+			method: 'get',
+			data: {},
+			success() {
+				reslove()
+			}
+		})
+	})
+}
+const $map = {
+	882: 'isWxIosPay',
+	833: 'checkIosLogin',
+	834: 'checkIosPay',
+	835: 'checkWxLogin',
+	836: 'checkPhoneLogin',
+	108: 'isOpenWxWebAutoLogin',
+	817: 'zhengbu',
+	818: 'danbu',
+	252: 'adUnitId',
+	821: 'playType',
+	251: 'isGuanggao',
+	254: 'isGuanggaody',
+	202: 'kefu',
+	206: 'kefuPhone',
+	204: 'kefuUrl',
+	203: 'kefuAppId',
+	248: 'isVips',
+	249: 'moreSearch',
+	49: 'AppUrl',
+	823: 'OfferID',
+	824: 'payEnv',
+	825: 'moneyTips',
+	855: 'kmPaySel',
+	849: 'homeTypeSel',
+	856: 'syPaySel',
+	857: 'imId',
+	858: 'isAccountPay',
+	860: 'dyadUnitId',
+	881: '',
+	109: ''
+}
+
+function callback() {
+	
+	if (key == 'isOpenWxWebAutoLogin' && res.data[i] == '是') {
+		// 是否开启公众号自动登陆 108
+		let ua = navigator.userAgent.toLowerCase();
+		if (ua.indexOf('micromessenger') !== -1) {
+			let openid = uni.getStorageSync('openId');
+			let userId = uni.getStorageSync('userId');
+			if (!userId) {
+				if (openid) {
+					httpsRequest.get('/app/Login/openid/login?openId=' + openid).then(
+						res => {
+							if (res.code == 0) {
+								uni.setStorageSync('token', res.token)
+								uni.setStorageSync('userId', res.user.userId)
+								uni.setStorageSync('userName', res.user.userName)
+								uni.setStorageSync('phone', res.user.phone)
+								uni.setStorageSync('invitationCode', res.user
+									.invitationCode)
+							}
+						});
+				}
+			}
+		}
+
+	}
+
+}
+export async function init() {
+		httpsRequest.getT('/app/common/getAppUseKv').then(res => {
+			console.log(res);
+			if (res.code == 0) {
+				for (let i in $map) {
+					const key = $map[i]
+					if (key) {
+						uni.setStorageSync(key, res.data[i])
+						// $cache_config.set(key, res.data[i])
+						// callback()
+					}
+				}
+			}
+		})
+	
+
+	return
+	// const res=await getIsPauseServe()
+
+	// #ifdef APP
+	//微信小程序IOS系统支付功能开关	882
+	httpsRequest.getT('/app/common/type/882').then(res => {
+		if (res.code == 0 && res.data) {
+			let value = res.data.value
+			const sysInfo = uni.getSystemInfoSync()
+			// #ifdef MP-WEIXIN
+			if (sysInfo.osName == 'ios') { //是ios系统
+				if (value == '是') { //开启
+					uni.setStorageSync('isWxIosPay', true)
+				} else { //关闭
+					uni.setStorageSync('isWxIosPay', false)
+				}
+			} else { //不是ios下，直接打开
+				uni.setStorageSync('isWxIosPay', true)
+			}
+			// #endif
+			//不在微信小程序也直接打开
+			// #ifndef MP-WEIXIN
+			uni.setStorageSync('isWxIosPay', true)
+			// #endif
+		}
+	});
+	//是否开启苹果登录	833
+	httpsRequest.getT('/app/common/type/833').then(res => {
+		if (res.code == 0 && res.data) {
+			uni.setStorageSync('checkIosLogin', res.data.value)
+		}
+	});
+	//是否开启苹果支付	834
+	httpsRequest.getT('/app/common/type/834').then(res => {
+		if (res.code == 0 && res.data) {
+			uni.setStorageSync('checkIosPay', res.data.value)
+		}
+	});
+	//是否开启微信登录	835
+	httpsRequest.getT('/app/common/type/835').then(res => {
+		if (res.code == 0 && res.data) {
+			uni.setStorageSync('checkWxLogin', res.data.value)
+		}
+	});
+	//是否开启手机号一键登录	836
+	httpsRequest.getT('/app/common/type/836').then(res => {
+		if (res.code == 0 && res.data) {
+			uni.setStorageSync('checkPhoneLogin', res.data.value)
+		}
+	});
+
+	// #endif
+
+	// #ifdef H5
+	// httpsRequest.getT('/app/common/type/108').then(res => { //// 是否开启公众号自动登陆 108
+	// 	if (res.code == 0 && res.data) {
+	// 		if (res.data.value == '是') {
+	// 			let ua = navigator.userAgent.toLowerCase();
+	// 			if (ua.indexOf('micromessenger') !== -1) {
+	// 				let openid = uni.getStorageSync('openId');
+	// 				let userId = uni.getStorageSync('userId');
+	// 				if (!userId) {
+	// 					if (openid) {
+	// 						that.$u.get('/app/Login/openid/login?openId=' + openid).then(
+	// 							res => {
+	// 								if (res.code == 0) {
+	// 									uni.setStorageSync('token', res.token)
+	// 									uni.setStorageSync('userId', res.user.userId)
+	// 									uni.setStorageSync('userName', res.user.userName)
+	// 									uni.setStorageSync('phone', res.user.phone)
+	// 									uni.setStorageSync('invitationCode', res.user
+	// 										.invitationCode)
+	// 								}
+	// 							});
+	// 					}
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// });
+
+	// #endif
+
+
+	// configInit()
+
+
+}
+
+export function configInit() {
+	const {
+		zhengbu,
+		danbu,
+		adUnitId,
+		playType,
+		isGuanggao,
+		isGuanggaody,
+		kefu,
+		kefuPhone
+	} = $cache_config
+	if (zhengbu === null || zhengbu === undefined) {
+		httpsRequest.getT('/app/common/type/817').then(res => { //是否开启购买整部视频	817
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('zhengbu', res.data.value)
+				$cache_config.set('zhengbu', res.data.value)
+			}
+		});
+	}
+
+	if (danbu === null || danbu === undefined) {
+		httpsRequest.getT('/app/common/type/818').then(res => { //是否开启购买单集视频	818
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('danbu', res.data.value)
+				$cache_config.set('danbu', res.data.value)
+			}
+		});
+	}
+
+
+	// 微信激励广告id	252
+	if (adUnitId === null || adUnitId === undefined) {
+		httpsRequest.getT('/app/common/type/252').then(res => {
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('adUnitId', res.data.value)
+				$cache_config.set('adUnitId', res.data.value)
+			}
+		});
+	}
+
+	// 播放类型 1:抖音云 2:三方云
+	if (playType === null || playType === undefined) {
+		httpsRequest.getT('/app/common/type/821').then(res => {
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('playType', res.data.value)
+				$cache_config.set('playType', res.data.value)
+			}
+		});
+	}
+
+	// 是否开启看广告（微信）	251
+	if (isGuanggao === null || isGuanggao === undefined) {
+		httpsRequest.getT('/app/common/type/251').then(res => {
+			if (res.code == 0) {
+				if (res.data && res.data.value) {
+					uni.setStorageSync('isGuanggao', res.data.value)
+					$cache_config.set('isGuanggao', res.data.value)
+				}
+			}
+		});
+	}
+
+	// 是否开启看广告（抖音）	254
+	if (isGuanggaody === null || isGuanggaody === undefined) {
+		httpsRequest.getT('/app/common/type/254').then(res => {
+			if (res.code == 0) {
+				if (res.data && res.data.value) {
+					uni.setStorageSync('isGuanggaody', res.data.value)
+					$cache_config.set('isGuanggaody', res.data.value)
+				}
+			}
+		});
+	}
+
+	if (kefu === null || kefu === undefined) {
+		httpsRequest.getT('/app/common/type/202').then(res => { //客服配置  1  二维码客服 2 微信公众号客服  3电话客服
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('kefu', res.data.value)
+				$cache_config.set('kefu', res.data.value)
+			}
+		});
+	}
+
+	if (kefuPhone === null || kefuPhone === undefined) {
+		httpsRequest.getT('/app/common/type/206').then(res => { //客服电话
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('kefuPhone', res.data.value)
+				$cache_config.set('kefuPhone', res.data.value)
+			}
+		});
+	}
+
+	if ($cache_config.kefuUrl === null || $cache_config.kefuUrl === undefined) {
+		httpsRequest.getT('/app/common/type/204').then(res => { //微信客服链接
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('kefuUrl', res.data.value)
+				$cache_config.set('kefuUrl', res.data.value)
+			}
+		});
+	}
+
+	if ($cache_config.kefuAppId === null || $cache_config.kefuAppId === undefined) {
+		httpsRequest.getT('/app/common/type/203').then(res => { //微信客服appid
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('kefuAppId', res.data.value)
+				$cache_config.set('kefuAppId', res.data.value)
+			}
+		});
+	}
+
+	//会员开关
+	if ($cache_config.isVips === null || $cache_config.isVips === undefined) {
+		httpsRequest.getT('/app/common/type/248').then(res => { //会员开关
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('isVips', res.data.value)
+				$cache_config.set('isVips', res.data.value)
+			}
+		});
+	}
+
+	//热搜词 249
+	if ($cache_config.moreSearch === null || $cache_config.moreSearch === undefined) {
+		httpsRequest.getT('/app/common/type/249').then(res => { //热搜词
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('moreSearch', res.data.value)
+				$cache_config.set('moreSearch', res.data.value)
+			}
+		});
+	}
+
+	//安卓下载地址 49
+	if ($cache_config.AppUrl === null || $cache_config.AppUrl === undefined) {
+		httpsRequest.getT('/app/common/type/49').then(res => { //热搜词
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('AppUrl', res.data.value)
+				$cache_config.set('AppUrl', res.data.value)
+			}
+		});
+	}
+
+	//微信虚拟支付OfferID 823
+	if ($cache_config.OfferID === null || $cache_config.OfferID === undefined) {
+		httpsRequest.getT('/app/common/type/823').then(res => { //热搜词
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('OfferID', res.data.value)
+				$cache_config.set('OfferID', res.data.value)
+			}
+		});
+	}
+
+	//微信虚拟支付环境（0 米大师正式环境, 1 米大师沙箱环境） 824
+	if ($cache_config.payEnv === null || $cache_config.payEnv === undefined) {
+		httpsRequest.getT('/app/common/type/824').then(res => { //热搜词
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('payEnv', res.data.value)
+				$cache_config.set('payEnv', res.data.value)
+			}
+		});
+	}
+
+	//充值提示 825
+	if ($cache_config.moneyTips === null || $cache_config.moneyTips === undefined) {
+		httpsRequest.getT('/app/common/type/825').then(res => { //热搜词
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('moneyTips', res.data.value)
+				$cache_config.set('moneyTips', res.data.value)
+			}
+		});
+	}
+
+	//是否开启卡密充值	855
+	if ($cache_config.kmPaySel === null || $cache_config.kmPaySel === undefined) {
+		httpsRequest.getT('/app/common/type/855').then(res => {
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('kmPaySel', res.data.value)
+				$cache_config.set('kmPaySel', res.data.value)
+			}
+		});
+	}
+
+	//是否开启分类	849
+	if ($cache_config.homeTypeSel === null || $cache_config.homeTypeSel === undefined) {
+		httpsRequest.getT('/app/common/type/849').then(res => {
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('homeTypeSel', res.data.value)
+				$cache_config.set('homeTypeSel', res.data.value)
+			}
+		});
+	}
+
+	//是否开启收益充值余额	856
+	if ($cache_config.syPaySel === null || $cache_config.syPaySel === undefined) {
+		httpsRequest.getT('/app/common/type/856').then(res => {
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('syPaySel', res.data.value)
+				$cache_config.set('syPaySel', res.data.value)
+			}
+		});
+	}
+
+	//抖音im客服	857
+	if ($cache_config.imId === null || $cache_config.imId === undefined) {
+		httpsRequest.getT('/app/common/type/857').then(res => {
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('imId', res.data.value)
+				$cache_config.set('imId', res.data.value)
+			}
+		});
+	}
+	if ($cache_config.isAccountPay === null || $cache_config.isAccountPay === undefined) {
+		httpsRequest.getT('/app/common/type/858').then(res => { //是否开启公众号充值
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('isAccountPay', res.data.value)
+				$cache_config.set('isAccountPay', res.data.value)
+			}
+		});
+	}
+
+	//抖音广告id
+	if ($cache_config.dyadUnitId === null || $cache_config.dyadUnitId === undefined) {
+		httpsRequest.getT('/app/common/type/860').then(res => { //抖音广告
+			if (res.code == 0 && res.data) {
+				uni.setStorageSync('dyadUnitId', res.data.value)
+				$cache_config.set('dyadUnitId', res.data.value)
+			}
+		});
+	}
+
+}

components/empty.vue

@@ -27,7 +27,7 @@
 		methods: {
 			goNav() {
 				uni.switchTab({
-					url: '/pages/index/index'
+					url: '/pages/index/index2'
 				})
 			}
 		}

components/pop-choujiang.vue

@@ -424,7 +424,7 @@
 			async remoteGetPrizeIndex() {
 				this.result = ''
 				console.warn('###当前处于模拟的请求接口，并返回了中奖信息###')
-				const res = await this.$Request.getT('app/discSpinning/draw', {
+				const res = await this.$Request.getT('/app/discSpinning/draw', {
 					orderId: this.option.orderId || 2145
 				})
 				console.log(res);
@@ -476,22 +476,22 @@
 							orderId,
 							id
 						} = _this.result
-						_this.$Request.postJson('app/discSpinning/receive', _this.result).then(res => {
-							_this.result = ''
-							console.log(res)
-							if (res.code == 0) {
-								uni.showToast({
-									title: '领取成功',
-									icon: 'none'
-								})
-								_this.getRedPack()
-							} else {
-								uni.showToast({
-									title: '领取失败',
-									icon: 'none'
-								})
-							}
-						})
+						// _this.$Request.postJson('/app/discSpinning/receive', _this.result).then(res => {
+						// 	_this.result = ''
+						// 	console.log(res)
+						// 	if (res.code == 0) {
+						// 		uni.showToast({
+						// 			title: '领取成功',
+						// 			icon: 'none'
+						// 		})
+						// 		_this.getRedPack()
+						// 	} else {
+						// 		uni.showToast({
+						// 			title: '领取失败',
+						// 			icon: 'none'
+						// 		})
+						// 	}
+						// })
 					},
 					complete: () => {
 						this.prizeing = false
@@ -521,7 +521,7 @@
 				}, 50)
 			},
 			async getRedPack() {
-				const res = await this.$Request.getT('app/moneyDetails/selectUserMoney')
+				const res = await this.$Request.getT('/app/moneyDetails/selectUserMoney')
 				if (res.code == 0) {
 					this.totalMoney = res.data.amount
 				}

components/pop-ling-qu - 副本.vue

@@ -53,23 +53,23 @@
 					orderId,
 					id
 				} = this.result
-				this.$Request.postJson('app/discSpinning/receive', this.result).then(res => {
-					this.result = ''
-					console.log(res)
-					if (res.code == 0) {
-						uni.showToast({
-							title: '领取成功',
-							icon: 'none'
-						})
-						this.$emit('success')
-						this.close()
-					} else {
-						uni.showToast({
-							title: '领取失败',
-							icon: 'none'
-						})
-					}
-				})
+				// this.$Request.postJson('/app/discSpinning/receive', this.result).then(res => {
+				// 	this.result = ''
+				// 	console.log(res)
+				// 	if (res.code == 0) {
+				// 		uni.showToast({
+				// 			title: '领取成功',
+				// 			icon: 'none'
+				// 		})
+				// 		this.$emit('success')
+				// 		this.close()
+				// 	} else {
+				// 		uni.showToast({
+				// 			title: '领取失败',
+				// 			icon: 'none'
+				// 		})
+				// 	}
+				// })
 			},
 			close() {
 				this.show = false
@@ -80,15 +80,15 @@
 					orderId,
 					id
 				} = this.result
-				this.$Request.postJson('app/discSpinning/receive', this.result).then(res => {
-					this.result = ''
-					console.log(res)
-					if (res.code == 0) {
-						this.$emit('success')
-						this.close()
-					} else {
-					}
-				})
+				// this.$Request.postJson('/app/discSpinning/receive', this.result).then(res => {
+				// 	this.result = ''
+				// 	console.log(res)
+				// 	if (res.code == 0) {
+				// 		this.$emit('success')
+				// 		this.close()
+				// 	} else {
+				// 	}
+				// })
 			}
 		}
 	}

components/pop-ling-qu.vue

@@ -57,21 +57,21 @@
 					orderId,
 					id
 				} = this.result
-				this.$Request.postJson('app/discSpinning/receive', this.result).then(res => {
-					this.result = ''
-					console.log(res)
-					if (res.code == 0) {
-						console.log('抽奖领取成功');
-						const key=res.data==0?'isBindAliPay':undefined
-						this.$emit('close',key)
-						if(key&&key=='isBindAliPay'){
-							uni.navigateTo({
-								url:'/me/yaoqing/zhifubao-tixain'
-							})
-						}
-					} else {
-					}
-				})
+				// this.$Request.postJson('/app/discSpinning/receive', this.result).then(res => {
+				// 	this.result = ''
+				// 	console.log(res)
+				// 	if (res.code == 0) {
+				// 		console.log('抽奖领取成功');
+				// 		const key=res.data==0?'isBindAliPay':undefined
+				// 		this.$emit('close',key)
+				// 		if(key&&key=='isBindAliPay'){
+				// 			uni.navigateTo({
+				// 				url:'/me/yaoqing/zhifubao-tixain'
+				// 			})
+				// 		}
+				// 	} else {
+				// 	}
+				// })
 			}
 		}
 	}

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "诗谣短剧",
+    "name" : "顺享短剧",
     "appid" : "__UNI__E0B05B1",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "2.3.2",
+    "versionCode" : 232,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

me/HEWZtgyqRH/HEWZtgyqRH.vue

@@ -85,7 +85,7 @@ export default {
 		 * 获取当前钱包信息
 		 */
 		getAmount() {
-			this.$Request.getT('app/moneyDetails/selectUserMoney').then((res) => {
+			this.$Request.getT('/app/moneyDetails/selectUserMoney').then((res) => {
 				uni.stopPullDownRefresh();
 				if (res.code === 0) {
 					this.amount = res.data.amount || 0;
@@ -119,7 +119,7 @@ export default {
 				page: this.page,
 				limit: this.limit
 			};
-			this.$Request.getT('app/moneyDetails/queryUserMoneyDetails', data).then((res) => {
+			this.$Request.getT('/app/moneyDetails/queryUserMoneyDetails', data).then((res) => {
 				setTimeout(() => {
 					this.refresherTriggered = false;
 				}, 1500);

me/VjgyqAzklr/VjgyqAzklr.vue

@@ -186,14 +186,14 @@ export default {
 		},
 		toRed() {
 			uni.navigateTo({
-				url: '/me/invite/cashDetail'
+				url: '/me/yaoqing/ymg-yaoqing-tixian'
 			});
 		},
 		toGift() {
 			console.log('1');
 
 			uni.navigateTo({
-				url: '/me/gift/gift?source=' + this.source
+				url: '/me/giftczgw/giftczgw?source=' + this.source
 			});
 		},
 		// 重新生成
@@ -452,7 +452,7 @@ export default {
 		async remoteGetPrizeIndex() {
 			this.result = '';
 			console.warn('###当前处于模拟的请求接口，并返回了中奖信息###');
-			const res = await this.$Request.getT('app/discSpinning/draw', { source: this.source });
+			const res = await this.$Request.getT('/app/discSpinning/draw', { source: this.source });
 			this.freeNum--;
 			// this.getCount()
 			console.log(res);
@@ -551,13 +551,13 @@ export default {
 			}, 50);
 		},
 		async getRedPack() {
-			const res = await this.$Request.getT('app/moneyDetails/selectUserMoney');
+			const res = await this.$Request.getT('/app/moneyDetails/selectUserMoney');
 			if (res.code == 0) {
 				this.totalMoney = res.data.amount;
 			}
 		},
 		async getCount() {
-			const res = await this.$Request.getT('app/discSpinning/drawCount', { source: this.source });
+			const res = await this.$Request.getT('/app/discSpinning/drawCount', { source: this.source });
 			if (res.code == 0) {
 				this.freeNum = res.count || 0;
 				this.freeNumDay = res.sum || 0;

me/choujiang/choujiang.vue

@@ -439,7 +439,7 @@
 			async remoteGetPrizeIndex() {
 				this.result=''
 				console.warn('###当前处于模拟的请求接口，并返回了中奖信息###')
-				const res = await this.$Request.getT('app/discSpinning/draw',{source:this.source})
+				const res = await this.$Request.getT('/app/discSpinning/draw',{source:this.source})
 				this.freeNum--
 				// this.getCount()
 				console.log(res);
@@ -538,13 +538,13 @@
 				}, 50)
 			},
 			async getRedPack(){
-				const res=await this.$Request.getT('app/moneyDetails/selectUserMoney')
+				const res=await this.$Request.getT('/app/moneyDetails/selectUserMoney')
 				if(res.code==0){
 					this.totalMoney=res.data.amount
 				}
 			},
 			async getCount(){
-				const res=await this.$Request.getT('app/discSpinning/drawCount',{source:this.source})
+				const res=await this.$Request.getT('/app/discSpinning/drawCount',{source:this.source})
 				if(res.code==0){
 					this.freeNum=res.count||0
 					this.freeNumDay=res.sum||0

me/detail/detail.nvue

@@ -1,7 +1,7 @@
 <template>
 	<view class="subNvueweight">
 		<list :bounce="false" :loadmoreoffset="wHeight*3" :show-scrollbar="false" ref="listBox" :pagingEnabled="true"
-			:scrollable="true"> 
+			:scrollable="true">
 			<image src="components/czgdetail1 (5).JPG" mode=""></image>
 			<cell v-for="(item,i) in videoList" :key="i" :ref="'list'+item.courseDetailsId">
 				<view class="subNvueswipers-items" @longpress="openBs()" @disappear="disappear(item.courseDetailsId,i)"
@@ -14,8 +14,8 @@
 						@ended="ended" :enable-progress-gesture="false" :poster="item.titleImg"
 						:ref="'myVideo'+item.courseDetailsId" :id="'myVideo'+item.courseDetailsId" :src="item.videoUrl"
 						:autoplay="item.autoPlay" class="detailswipers-items-video"></video>
-					<image v-else @click="!item.videoUrl?openPay():''" :src="item.titleImg" class="detailswipers-items-imgsbg"
-						mode="aspectFill">
+					<image v-else @click="!item.videoUrl?openPay():''" :src="item.titleImg"
+						class="detailswipers-items-imgsbg" mode="aspectFill">
 					</image>
 					<!-- 返回图标 -->
 					<image v-if="showBack" src="../static/nvueIcon/backs.png" @click="goBack()"
@@ -38,8 +38,8 @@
 						</view>
 						<view class="detailswipers-items-right-item" @click="share()">
 							<view class="detailswipers-items-right-item-img">
-								<image class="detailswipers-items-right-item-imgs" src="../../static/images/me/share.png"
-									mode=""></image>
+								<image class="detailswipers-items-right-item-imgs"
+									src="../../static/images/me/share.png" mode=""></image>
 							</view>
 							<view class="detaswipers-items-right-item-txt">
 								<text class="detaswipers-items-right-item-txts">
@@ -50,8 +50,8 @@
 
 						<view class="detailswipers-items-right-item" v-if="isCollect">
 							<view class="detailswipers-items-right-item-img" @click.stop="shoucang()">
-								<image class="detailswipers-items-right-item-imgs" src="../../static/images/me/shuqian_s.png"
-									mode=""></image>
+								<image class="detailswipers-items-right-item-imgs"
+									src="../../static/images/me/shuqian_s.png" mode=""></image>
 							</view>
 							<view class="detaswipers-items-right-item-txt">
 								<text class="detaswipers-items-right-item-txts">
@@ -61,8 +61,8 @@
 						</view>
 						<view class="detailswipers-items-right-item" v-else>
 							<view class="detailswipers-items-right-item-img" @click.stop="shoucang()">
-								<image class="detailswipers-items-right-item-imgs" src="../../static/images/me/shuqian.png"
-									mode=""></image>
+								<image class="detailswipers-items-right-item-imgs"
+									src="../../static/images/me/shuqian.png" mode=""></image>
 							</view>
 							<view class="detaswipers-items-right-item-txt">
 								<text class="detaswipers-items-right-item-txts">
@@ -497,11 +497,14 @@
 
 				this.getDataList(this.courseId, this.courseDetailsId);
 			}
-			httpsRequest.getT('app/course/getRedEnvelopeTips').then(res => {
-				if (res.code == 0) {
-					this.getRedEnvelopeTips = res.data
-				}
-			})
+			if (uni.getStorageSync('token')) {
+				httpsRequest.getT('/app/course/getRedEnvelopeTips').then(res => {
+					if (res.code == 0) {
+						this.getRedEnvelopeTips = res.data
+					}
+				})
+			}
+
 			this.getScale()
 		},
 		onLoad(e) {
@@ -535,7 +538,7 @@
 				this.getMoneyList()
 				this.getMyMoney()
 			} else {
-				console.log("allId====="+e.allId)  
+				console.log("allId=====" + e.allId)
 				if (e.allId) {
 					const arr = e.allId.split('-')
 					this.courseId = arr[0];
@@ -559,7 +562,7 @@
 			 * 获取金币比例
 			 */
 			getScale() {
-				httpsRequest.getT("app/common/type/914", {}).then(res => {
+				httpsRequest.getT("/app/common/type/914", {}).then(res => {
 					if (res.code == 0) {
 						this.scale = Number(res.data.value)
 					}
@@ -571,7 +574,7 @@
 				// this.courseDetailsId = courseDetailsId
 				if (!this.playFlag) {
 					this.playFlag = true
-					httpsRequest.getT('app/course/viewCourse', {
+					httpsRequest.getT('/app/course/viewCourse', {
 						courseId: this.courseId,
 						courseDetailsId: courseDetailsId,
 						type: 'start'
@@ -587,7 +590,7 @@
 				if (e.detail.currentTime > e.detail.duration * 0.9) {
 					if (this.playFlag) {
 						this.playFlag = false
-						httpsRequest.getT('app/course/viewCourse', {
+						httpsRequest.getT('/app/course/viewCourse', {
 							courseId: this.courseId,
 							courseDetailsId: this.courseDetailsId,
 							type: 'end'
@@ -602,7 +605,7 @@
 				this.courseDetailsId = e;
 				// 清除已经设置的定时器
 				clearTimeout(this.appearTimeout);
-		 
+
 				// 设置一个新的延迟执行的定时器
 				this.appearTimeout = setTimeout(() => {
 					// 实际要执行的操作
@@ -616,15 +619,15 @@
 					this.scrollIntoView = 'video' + index
 					console.log(this.scrollIntoViews, '当前位置')
 					//播放并更新video的上下文 
-					this.startPlay(index) 
+					this.startPlay(index)
 					//插入历史记录
 					this.setHistor(this.videoList[index].courseId, this.videoList[index].courseDetailsId);
 					this.$forceUpdate()
 				}, 500); // 延迟500毫秒执行 
-				
+
 			},
 			disappear(e, index) {
- 
+
 				// if (this.videoContext) { //判断之前是否有视频的上下文
 				// 	this.videoContext.stop();
 				// 	this.videoContext = null;
@@ -958,7 +961,7 @@
 					id: this.courseId,
 					token: uni.getStorageSync('token')
 				}
-				httpsRequest.getT('/app/course/selectCourseDetailsById', data).then(res => {
+				httpsRequest.getT('/app/course/courseSets', data).then(res => {
 					if (res.code == 0) {
 						if (res.data && res.data.isCollect && res.data.isCollect > 0) {
 							this.isCollect = true
@@ -1115,8 +1118,8 @@
 				this.$refs.popupPya.close()
 			},
 			//选择播放
-			selectPlay(item,type) {
-				if ( this.videoList[this.current].videoUrl == '' && this.videoList[this.current].price <= 0 && !type ) {
+			selectPlay(item, type) {
+				if (this.videoList[this.current].videoUrl == '' && this.videoList[this.current].price <= 0 && !type) {
 					this.getDataList(this.courseId, this.courseDetailsId, true, 'select')
 					return;
 				}
@@ -1245,13 +1248,13 @@
 						animated: false
 					})
 					_this.$forceUpdate()
-						console.log('移动结束', el)
+					console.log('移动结束', el)
 					// },1000) 
 				})
 			},
 			async getCount() {
 				console.log('getCount')
-				const res = await this.$Request.getT('app/discSpinning/drawCount')
+				const res = await this.$Request.getT('/app/discSpinning/drawCount')
 				if (res.code == 0) {
 					this.freeNum = res.count || 0
 				}
@@ -1268,7 +1271,7 @@
 					id: courseId,
 					token: uni.getStorageSync('token') ? uni.getStorageSync('token') : ''
 				};
-				httpsRequest.getT('/app/course/selectCourseDetailsById', data).then(res => {
+				httpsRequest.getT('/app/course/courseSets', data).then(res => {
 					if (res.code == 0) {
 						if (res.data.listsDetail) {
 							this.info = res.data;
@@ -1315,7 +1318,7 @@
 									this.noBuyVideoIndex = null
 									uni.removeStorageSync('noBuyVideoIndex')
 									this.videoContext.stop()
-									httpsRequest.getT('app/discSpinning/drawCount').then(res => {
+									httpsRequest.getT('/app/discSpinning/drawCount').then(res => {
 										console.log('转盘抽奖次数')
 										console.log(res)
 										if (res.count >= 1) {
@@ -1350,7 +1353,7 @@
 										if (this.noBuyVideoIndex != null && this.videoList[this
 												.noBuyVideoIndex].videoUrl) {
 											this.videoContext.stop();
-											httpsRequest.getT('app/discSpinning/drawCount').then(res => {
+											httpsRequest.getT('/app/discSpinning/drawCount').then(res => {
 												console.log('转盘抽奖次数')
 												if (res.count >= 1) {
 													uni.navigateTo({
@@ -1371,8 +1374,8 @@
 									this.$forceUpdate();
 								})
 							}
-							if ( t == 'select') {
-								this.selectPlay(this.videoList[this.current],true)
+							if (t == 'select') {
+								this.selectPlay(this.videoList[this.current], true)
 							}
 							this.$forceUpdate();
 						}

me/feedback/index.vue

@@ -118,7 +118,7 @@ export default {
 				title: '加载中...'
 			});
 			this.$u
-				.post('/app/message/insertMessage', {
+				.post('/app/message/sendMessage', {
 					title: this.sendDate.contact,
 					content: JSON.stringify(this.sendDate),
 					state: 2

me/feedbackIndexczgw/feedbackIndexczgw.vue

@@ -21,11 +21,12 @@
 					v-if="item.parentId == 0"
 				>
 					<view class="text-item">{{ problemItem.helpWordTitle }}</view>
+					<view class="text-item">通过手机号注册，注册完成即可登录。</view>
 					<view class="line" v-if="problemIndex != item.helpWordList.length - 1"></view>
 				</view>
 			</view>
 		</view>
-		<view class="bg-box">
+	<!-- 	<view class="bg-box">
 			<view class="bg-white-box">
 				<image src="../static/icon-letter.png" class="image"></image>
 				<view class="text-feedbackczg" hover-class="hover" @click="toFeedbackList">联系客服</view>
@@ -35,7 +36,7 @@
 				<image src="../static/icon-edit.png" class="image"></image>
 				<view class="text-feedbackczg" hover-class="hover" @click="toFeedback">我要反馈</view>
 			</view>
-		</view>
+		</view> -->
 		<button style="visibility: hidden" @click="SyoDEQPwCtTgyqUUymUI"></button>
 		<button style="visibility: hidden" @click="jcGEREqMgyqxlaDFFLsH"></button>
 		<button style="visibility: hidden" @click="isESEgyqcxldifCTWeyC"></button>

me/giftczgw/giftczgw.vue

@@ -2,13 +2,13 @@
 	<view class="min-pageczg bg-gray u-font-28">
 		<u-navbar :background="background" back-icon-color="#fff" immersive :border-bottom="false"></u-navbar>
 		<view class="gift-bg"></view>
-		<image src="components/czgdetail1 (3).JPG" mode=""></image>
+		<!-- <image src="components/czgdetail1 (3).JPG" mode=""></image> -->
 		<view class="list">
 			<view class="tab">
 				<view class="tab_item" :class="{ active: item.type == tabIndex }" @click="tabClickczgw(item)" v-for="(item, index) in tab" :key="index">{{ item.label }}</view>
 			</view>
 			<view class="item" v-for="(item, index) in list" :key="index">
-				<image src="components/czgdetail1 (4).JPG" mode=""></image>
+				<!-- <image src="components/czgdetail1 (4).JPG" mode=""></image> -->
 				<view class="color-666 u-font-24">中奖时间 2024-09-11 10:20:11</view>
 				<view class="u-m-t-24 u-flex u-row-between">
 					<view class="u-flex-1 u-flex u-col-top">
@@ -83,7 +83,7 @@ export default {
 		getListczg() {
 			let url = '';
 			if (this.tabIndex == 1) {
-				url = 'app/discSpinningRecord/selectDiscSpinningRecord';
+				url = '/app/discSpinningRecord/selectDiscSpinningRecord';
 			} else {
 				url = '/app/userPrizeExchange/page';
 			}

me/jilu/duanju-love.vue

@@ -84,7 +84,7 @@
 			// 跳转资源详情
 			ymfgoCourse(e,courseDetailsId) {
 				uni.navigateTo({
-					url: '/me/detail/detail?id=' + e+'&courseDetailsId='+courseDetailsId
+					url: '/me/detail/detailIOS?id=' + e+'&courseDetailsId='+courseDetailsId
 				})
 			},
 			//获取观看记录

me/juqing/new/first-select.vue

@@ -89,7 +89,7 @@
 				this.userInfo = res1.data
 				uni.setStorageSync('userInfo', res1.data)
 				uni.switchTab({
-					url:'/pages/index/index'
+					url:'/pages/index/index2'
 				})
 			}
 		}

me/message/new/first.vue

@@ -174,7 +174,7 @@
 				return this.init()
 			}
 			uni.switchTab({
-				url: '/pages/index/index'
+				url: '/pages/index/index2'
 			})
 		},
 		methods: {
@@ -186,7 +186,7 @@
 				return
 				uni.setStorageSync('first', false)
 				uni.switchTab({
-					url: '/pages/index/index'
+					url: '/pages/index/index2'
 				})
 			},
 			popshow(){
@@ -216,7 +216,7 @@
 			iKnow() {
 				uni.setStorageSync('first', false)
 				uni.switchTab({
-					url: '/pages/index/index'
+					url: '/pages/index/index2'
 				})
 			}
 		}

me/message/new/getInfo.vue

@@ -154,7 +154,7 @@
 					if(res.code==200){
 						this.timer=setTimeout(()=>{
 							uni.switchTab({
-								url:'/pages/index/index'
+								url:'/pages/index/index2'
 							})
 						},1000)
 					}

me/rHTgyqGoIV/rHTgyqGoIV.vue

@@ -240,7 +240,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImgs
@@ -248,7 +248,7 @@
 		},
 		onShareTimeline(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImgs
@@ -298,7 +298,7 @@
 				uni.downloadFile({
 					url: config.APIHOST +
 						'/app/invite/dyCreateQr?invitationCode=' + that
-						.invitationCode + ',' + that.qdCode + '&page=/pages/index/index',
+						.invitationCode + ',' + that.qdCode + '&page=/pages/index/index2',
 					success: (res) => {
 						console.log(res)
 						if (res.statusCode === 200) {

me/setting/logOff.vue

@@ -63,7 +63,7 @@
 								content: '我要注销账号',
 								userId: uni.getStorageSync('userId')
 							}
-							that.$Request.postJson('/app/message/insertMessage', data).then(res => {
+							that.$Request.postJson('/app/message/sendMessage', data).then(res => {
 								if (res.code == 0) {
 									uni.showModal({
 										title: '提示',

me/yaoqing/index - 副本.vue

@@ -155,7 +155,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg
@@ -163,7 +163,7 @@
 		},
 		onShareTimeline(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg
@@ -222,7 +222,7 @@
 				uni.downloadFile({
 					url: config.APIHOST +
 						'/app/invite/dyCreateQr?invitationCode=' + that
-						.invitationCode + ',' + that.qdCode + '&page=/pages/index/index',
+						.invitationCode + ',' + that.qdCode + '&page=/pages/index/index2',
 					success: (res) => {
 						console.log(res)
 						if (res.statusCode === 200) {

me/yaoqing/realName.vue

@@ -0,0 +1,177 @@
+<template>
+	<view class="containerView">
+		<list-cell title="姓名" type="text" placeholder="请输入姓名" v-model="certName"></list-cell>
+
+		
+		<list-cell title="身份证号码" type="text" placeholder="请输入身份证号码" v-model="certNum"></list-cell>
+		
+		<list-cell title="银行卡号码" type="text" placeholder="请输入银行卡号码" v-model="accountNo"></list-cell>
+		
+		<list-cell title="手机号" type="text" placeholder="请输入银行预留号码" v-model="mobile"></list-cell>
+
+		<button v-if="!user.accountNo" class="confirm-btn" @click="toLogin"
+			:disabled="logining">认证</button>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;margin-top: 32rpx;margin-bottom: 10rpx;">请正确填写收款人的银行卡号和真实的收款人姓名</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">手机号需是银行卡预留手机号</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">银行卡号需与收款人姓名一致</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx;;margin-bottom: 10rpx;">身份证信息仅可使用一次</view>
+		<view style="font-size: 24upx;color: #999999;padding: 0 64rpx">否则将无法正常收款，请须知</view>
+
+	</view>
+</template>
+
+<script>
+	import listCell from '@/me/components/com-input';
+	export default {
+		components: {
+			listCell
+		},
+		data() {
+			return {
+				certName: '',
+				mobile: '',
+				certNum: '',
+				accountNo: '',
+				user: {},
+				logining: false
+			}
+		},
+		onLoad() {
+			let userId = uni.getStorageSync('userId');
+
+			if (userId) {
+				this.$u.api.userinfo().then(res => {
+					if (res.code === 0) {
+						this.user = res.data
+						if (res.data.certName) {
+							this.certName = res.data.certName;
+						}
+						if (res.data.mobile) {
+							this.mobile = res.data.mobile;
+						}
+						if (res.data.accountNo) {
+							this.certNum = res.data.certNo;
+							this.accountNo = res.data.accountNo;
+						}
+						
+					}
+				})
+			}
+
+		},
+		methods: {
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			toLogin() {
+			    
+				if (!this.certName) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+				} else if (!this.mobile) {
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					})
+				} else if (!this.certNum) {
+					uni.showToast({
+						title: '请输入身份证账号',
+						icon: 'none'
+					})
+				} else if (!this.accountNo) {
+					uni.showToast({
+						title: '请请输入银行卡号',
+						icon: 'none'
+					})
+				} else {
+					this.logining = true
+					this.$u.post('app/user/realNameAuth?certName=' + this.certName + '&mobile=' + this.mobile + '&certNum=' + this.certNum + '&accountNo=' + this.accountNo.replace(/\s+/g, '')).then(
+						res => {
+							this.logining = false
+							console.log(res);
+							if(res.code===0){
+								uni.setStorageSync('certName', this.certName)
+								uni.setStorageSync('mobile', this.mobile)
+								uni.setStorageSync('certNum', this.certNum)
+								uni.setStorageSync('accountNo', this.accountNo)
+								uni.showToast({
+									title: '修改成功',
+									icon: 'none',
+									complete() {
+										setTimeout(function() {
+											uni.navigateBack();
+										}, 1000)
+									}
+								})
+							}else{
+								uni.showToast({
+									title:res.msg||'修改失败',
+									icon:'none'
+								})
+							}
+							
+
+						});
+
+				}
+				
+			},
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	page {
+		background: #FFFFFF;
+	}
+
+	.containerView {
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #ffffff;
+	}
+
+	.confirm-btn1 {
+		width: 300px;
+		height: 42px;
+		line-height: 42px;
+		border-radius: 30px;
+		margin-top: 70upx;
+		/* background: whitesmoke; */
+		background: #ff7581;
+		color: #FFFFFF;
+		font-size: 32rpx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+
+
+
+	.confirm-btn {
+		width: 300px;
+		height: 42px;
+		line-height: 42px;
+		border-radius: 30px;
+		margin-top: 70upx;
+		background: #ff7581;
+		color: #ffffff;
+		font-size: 32rpx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+</style>

me/yaoqing/redPack-mingxi.vue

@@ -41,11 +41,11 @@
 			}
 		},
 		onLoad: function(e) {
-			console.log(e)
+			console.log(e,'debug')
 			if (e.moneyType) {
 				this.moneyType = e.moneyType
 				uni.setNavigationBarTitle({
-					title: e.moneyType === 1 ? '红包明细' : '金币明细'
+					title: e.moneyType == 1 ? '红包明细' : '金币明细'
 				});
 			}
 			if (e.viewType) {
@@ -67,7 +67,7 @@
 						viewType: this.viewType,
 					}
 					
-					this.$Request.getT('app/moneyDetails/queryUserMoneyDetails', data).then(res => {
+					this.$Request.getT('/app/moneyDetails/queryUserMoneyDetails', data).then(res => {
 						this.totalCount = res.data.total;
 						if ( res.data.records.length > 0) {
 							this.list = [...this.list,...res.data.records];

me/yaoqing/ymf-yaoqing-home.vue

@@ -220,7 +220,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg
@@ -228,7 +228,7 @@
 		},
 		onShareTimeline(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg
@@ -297,7 +297,7 @@
 				uni.downloadFile({
 					url: config.APIHOST +
 						'/app/invite/dyCreateQr?invitationCode=' + that
-						.invitationCode + ',' + that.qdCode + '&page=/pages/index/index',
+						.invitationCode + ',' + that.qdCode + '&page=/pages/index/index2',
 					success: (res) => {
 						console.log(res)
 						if (res.statusCode === 200) {

me/yaoqing/ymf-yaoqing-tixian-jilu.vue

@@ -60,7 +60,7 @@ export default {
           page: this.page,
           limit: this.limit
         }
-        this.$Request.getT('app/cash/selectPayDetails', data).then(res => {
+        this.$Request.getT('/app/cash/selectPayDetails', data).then(res => {
           this.total = res.data.total;
           if (res.data.list.length > 0) {
             this.list = [...this.list, ...res.data.list];

me/yaoqing/zhifubao-tixain.vue

@@ -4,8 +4,9 @@
 
 		<list-cell title="支付宝账号" type="text" placeholder="请输入要绑定的支付宝手机号" v-model="zhiFuBao"></list-cell>
 
+		<list-cell title="身份证号码" type="text" placeholder="请输入要绑定身份证号码" v-model="certNum"></list-cell>
 
-		<button :class="zhiFuBao&&zhiFuBaoName?'confirm-btn':'ymf-confirm-btn1'" @click="ymftoLogin"
+		<button :class="zhiFuBao && zhiFuBaoName ? 'confirm-btn' : 'ymf-confirm-btn1'" @click="ymftoLogin"
 			:disabled="logining">绑定账户</button>
 		<view style="padding: 32upx 64upx;font-size: 24upx;color: #999999;">提示：请正确填写收款人的支付宝账户和真实的收款人姓名，否则将无法正常收款</view>
 
@@ -13,166 +14,177 @@
 </template>
 
 <script>
-	import listCell from '@/me/components/com-input';
-	export default {
-		components: {
-			listCell
-		},
-		data() {
-			return {
-				zhiFuBao: '',
-				zhiFuBaoName: '',
-				logining: false
-			}
-		},
-		onLoad() {
-			let userId = uni.getStorageSync('userId');
+import listCell from '@/me/components/com-input';
+export default {
+	components: {
+		listCell
+	},
+	data() {
+		return {
+			zhiFuBao: '',
+			zhiFuBaoName: '',
+			logining: false,
+			certNum: '',
 
-			if (userId) {
-				this.$u.api.userinfo().then(res => {
-					if (res.code === 0) {
-						if (res.data.zhiFuBao) {
-							this.zhiFuBao = res.data.zhiFuBao;
-						}
-						if (res.data.zhiFuBaoName) {
-							this.zhiFuBaoName = res.data.zhiFuBaoName;
-						}
-						// console.log(this.zhiFuBao )
-						// console.log(this.zhiFuBaoName )
+		}
+	},
+	onLoad() {
+		let userId = uni.getStorageSync('userId');
+		this.certNum = uni.getStorageSync('certNum')
+
+		if (userId) {
+			this.$u.api.userinfo().then(res => {
+				if (res.code === 0) {
+					if (res.data.zhiFuBao) {
+						this.zhiFuBao = res.data.zhiFuBao;
+					}
+					if (res.data.zhiFuBaoName) {
+						this.zhiFuBaoName = res.data.zhiFuBaoName;
+					}
+					if (res.data.certNo) {
+						this.certNum = res.data.certNo;
 					}
-				})
-			}
-
-		},
-		methods: {
-			inputChange(e) {
-				const key = e.currentTarget.dataset.key;
-				this[key] = e.detail.value;
-			},
-			ymfnavBack() {
-				uni.navigateBack();
-			},
-
-			ymftoLogin() {
-				// console.log(this.zhiFuBao )
-				// console.log(this.zhiFuBaoName )
-				// const {
-				// 	zhiFuBao,
-				// 	zhiFuBaoName
-				// } = this;
-				let zhiFuBao = this.zhiFuBao
-				let zhiFuBaoName = this.zhiFuBaoName
-				console.log(zhiFuBao)
-				console.log(zhiFuBaoName)
-				if (!zhiFuBao) {
-					uni.showToast({
-						title: '请设置收款人姓名',
-						icon: 'none'
-					})
-				} else if (!zhiFuBaoName) {
-					uni.showToast({
-						title: '请设置收款人支付宝账号',
-						icon: 'none'
-					})
-				} else {
-					this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&zhiFuBaoName=' + zhiFuBaoName).then(
-						res => {
-							console.log(res);
-							if(res.code===0){
-								uni.setStorageSync('zhiFuBao', zhiFuBao)
-								uni.setStorageSync('zhiFuBaoName', zhiFuBaoName)
-								uni.showToast({
-									title: '修改成功',
-									icon: 'none',
-									complete() {
-										setTimeout(function() {
-											uni.navigateBack();
-										}, 1000)
-									}
-								})
-							}else{
-								uni.showToast({
-									title:res.msg||'修改失败',
-									icon:'none'
-								})
-							}
-							
-
-						});
-
 				}
-				// if (!zhifubao) {
-				// 	this.$queue.showToast("请设置收款人支付宝账号");
-				// } else if (!zhifubaoName) {
-				// 	this.$queue.showToast("请设置收款人姓名");
-				// } else {
-				// this.$queue.showLoading("修改中...");
-				// this.$Request.postT("/cash/userinfo?userId=" + userId + "&zhifubao=" + zhifubao + "&zhifubaoName=" + zhifubaoName).then(
-				// 	res => {
-				// 		if (res.status === 0) {
-				// 			if (res.data.zhifubao) {
-				// 				this.zhifubao = res.data.zhifubao;
-				// 			}
-				// 			if (res.data.zhifubaoName) {
-				// 				this.zhifubaoName = res.data.zhifubaoName;
-				// 			}
-				// 			this.ymfnavBack();
-				// 		} else {
-				// 			// this.$queue.showToast(res.msg)
-				// 		}
-				// 		uni.hideLoading();
-				// 	});
-				// }
-			},
+			})
+		}
+
+	},
+	methods: {
+		inputChange(e) {
+			const key = e.currentTarget.dataset.key;
+			this[key] = e.detail.value;
+		},
+		ymfnavBack() {
+			uni.navigateBack();
 		},
 
-	}
+		ymftoLogin() {
+			// console.log(this.zhiFuBao )
+			// console.log(this.zhiFuBaoName )
+			// const {
+			// 	zhiFuBao,
+			// 	zhiFuBaoName
+			// } = this;
+			let zhiFuBao = this.zhiFuBao
+			let zhiFuBaoName = this.zhiFuBaoName
+			let certNum = this.certNum
+
+			if (!zhiFuBao) {
+				uni.showToast({
+					title: '请设置收款人姓名',
+					icon: 'none'
+				})
+			} else if (!certNum) {
+				uni.showToast({
+					title: '请设置收款人身份证账号',
+					icon: 'none'
+				})
+			} else if (!zhiFuBaoName) {
+				uni.showToast({
+					title: '请设置收款人支付宝账号',
+					icon: 'none'
+				})
+			} else {
+				this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&certName=' + zhiFuBaoName + '&certNum=' + certNum).then(
+					res => {
+						console.log(res);
+						if (res.code === 0) {
+							uni.setStorageSync('zhiFuBao', zhiFuBao)
+							uni.setStorageSync('zhiFuBaoName', zhiFuBaoName)
+							uni.setStorageSync('certNum', certNum)
+
+							uni.showToast({
+								title: '修改成功',
+								icon: 'none',
+								complete() {
+									setTimeout(function () {
+										uni.navigateBack();
+									}, 1000)
+								}
+							})
+						} else {
+							uni.showToast({
+								title: res.msg || '修改失败',
+								icon: 'none'
+							})
+						}
+
+
+					});
+
+			}
+			// if (!zhifubao) {
+			// 	this.$queue.showToast("请设置收款人支付宝账号");
+			// } else if (!zhifubaoName) {
+			// 	this.$queue.showToast("请设置收款人姓名");
+			// } else {
+			// this.$queue.showLoading("修改中...");
+			// this.$Request.postT("/cash/userinfo?userId=" + userId + "&zhifubao=" + zhifubao + "&zhifubaoName=" + zhifubaoName).then(
+			// 	res => {
+			// 		if (res.status === 0) {
+			// 			if (res.data.zhifubao) {
+			// 				this.zhifubao = res.data.zhifubao;
+			// 			}
+			// 			if (res.data.zhifubaoName) {
+			// 				this.zhifubaoName = res.data.zhifubaoName;
+			// 			}
+			// 			this.ymfnavBack();
+			// 		} else {
+			// 			// this.$queue.showToast(res.msg)
+			// 		}
+			// 		uni.hideLoading();
+			// 	});
+			// }
+		},
+	},
+
+}
 </script>
 
 <style lang='scss'>
-	page {
-		background: #FFFFFF;
+page {
+	background: #FFFFFF;
+}
+
+.page {
+	padding-top: 32upx;
+	position: relative;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	background: #ffffff;
+}
+
+.ymf-confirm-btn1 {
+	width: 300px;
+	height: 42px;
+	line-height: 42px;
+	border-radius: 30px;
+	margin-top: 70upx;
+	/* background: whitesmoke; */
+	background: #ff7581;
+	color: #FFFFFF;
+	font-size: 32rpx;
+
+	&:after {
+		border-radius: 60px;
 	}
+}
 
-	.page {
-		padding-top: 32upx;
-		position: relative;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		background: #ffffff;
-	}
-
-	.ymf-confirm-btn1 {
-		width: 300px;
-		height: 42px;
-		line-height: 42px;
-		border-radius: 30px;
-		margin-top: 70upx;
-		/* background: whitesmoke; */
-		background: #ff7581;
-		color: #FFFFFF;
-		font-size: 32rpx;
-
-		&:after {
-			border-radius: 60px;
-		}
-	}
-
-
-
-	.confirm-btn {
-		width: 300px;
-		height: 42px;
-		line-height: 42px;
-		border-radius: 30px;
-		margin-top: 70upx;
-		background: #ff7581;
-		color: #ffffff;
-		font-size: 32rpx;
-
-		&:after {
-			border-radius: 60px;
-		}
+
+
+.confirm-btn {
+	width: 300px;
+	height: 42px;
+	line-height: 42px;
+	border-radius: 30px;
+	margin-top: 70upx;
+	background: #ff7581;
+	color: #ffffff;
+	font-size: 32rpx;
+
+	&:after {
+		border-radius: 60px;
 	}
+}
 </style>

package-lock.json

@@ -1,11 +1,5 @@
 {
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "qrcode-svg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/qrcode-svg/-/qrcode-svg-1.1.0.tgz",
-      "integrity": "sha512-XyQCIXux1zEIA3NPb0AeR8UMYvXZzWEhgdBgBjH9gO7M48H9uoHzviNz8pXw3UzrAcxRRRn9gxHewAVK7bn9qw=="
-    }
-  }
+  "name": "悬浮球_自动吸边_延迟隐藏",
+  "version": "1.0.0",
+  "lockfileVersion": 1
 }

package.json

@@ -6,4 +6,4 @@
     "keywords": [
         "悬浮球,拖拽,浮标,拖动,renderjs"
     ]
-}
+}

pages.json

@@ -5,12 +5,18 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/index/index2",
+			"style": {
+				"navigationBarTitleText": "斯耀短剧",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/task/index",
 			"style": {
 				"navigationBarTitleText": "任务",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
-
 			}
 		},
 		{
@@ -24,9 +30,8 @@
 		{
 			"path": "pages/task/prizeList",
 			"style": {
-				"navigationBarTitleText": "任务",
-				"navigationStyle": "custom"
-
+				"navigationBarTitleText": "任务"
+				// "navigationStyle": "custom"
 			}
 		},
 		{
@@ -34,7 +39,6 @@
 			"style": {
 				"navigationBarTitleText": "任务",
 				"navigationStyle": "custom"
-
 			}
 		},
 		{
@@ -65,7 +69,8 @@
 				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		}, {
+		},
+		{
 			"path": "pages/index/course/orderDet",
 			"style": {
 				"navigationBarTitleText": "确认订单",
@@ -79,8 +84,6 @@
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		},
-
-
 		{
 			"path": "pages/learn/index",
 			"style": {
@@ -100,6 +103,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/me/webview",
+			"style": {
+				"navigationBarTitleText": "客服"
+			}
+		},
 		{
 			"path": "pages/me/userinfo",
 			"style": {
@@ -111,8 +120,6 @@
 				}
 			}
 		},
-
-
 		{
 			"path": "pages/me/vip/index",
 			"style": {
@@ -124,8 +131,6 @@
 				}
 			}
 		},
-
-
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -163,7 +168,8 @@
 					}
 				}
 			}
-		}, {
+		},
+		{
 			"path": "pages/login/bind",
 			"style": {
 				"navigationBarTitleText": "绑定手机号",
@@ -176,7 +182,6 @@
 		},
 		{
 			"path": "pages/login/register",
-
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#f1a48a",
@@ -201,7 +206,8 @@
 					}
 				}
 			}
-		}, {
+		},
+		{
 			"path": "pages/yodwbsHlmJ/yodwbsHlmJ",
 			"style": {
 				"navigationBarTitleText": "追剧",
@@ -211,8 +217,8 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-
-		}, {
+		},
+		{
 			"path": "pages/yodwbsHlmJ/aaacasadwqvb",
 			"style": {
 				"navigationBarTitleText": "追剧as",
@@ -222,8 +228,8 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-
-		}, {
+		},
+		{
 			"path": "pages/video/video",
 			"style": {
 				"navigationBarTitleText": "推荐",
@@ -239,9 +245,7 @@
 					"video-player": "ext://industry/video-player"
 				}
 				// #endif
-
 			}
-
 		},
 		{
 			"path": "pages/login/appEq",
@@ -253,7 +257,8 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-		}, {
+		},
+		{
 			"path": "pages/login/iosmobile",
 			"style": {
 				"navigationBarTitleText": "手机号绑定"
@@ -290,14 +295,6 @@
 				"navigationBarTitleText": "图片s",
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "pages/index/index2",
-			"style": {
-				"navigationBarTitleText": "斯耀短剧",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-			}
 		}
 	],
 	"subPackages": [{
@@ -308,38 +305,48 @@
 						"navigationBarTitleText": "意见反馈",
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
-				}, {
+				},
+				{
 					"path": "HEWZtgyqRH/HEWZtgyqRH",
 					"style": {
 						"navigationBarTitleText": "我的余额"
 					}
-				}, {
+				},
+				{
 					"path": "HEWZtgyqRH/YGivHgyqkI"
-				}, {
+				},
+				{
 					"path": "HEWZtgyqRH/EsBgyqacOi"
-				}, {
+				},
+				{
 					"path": "feedbackIndexczgw/issuer"
-				}, {
+				},
+				{
 					"path": "feedbackIndexczgw/Invoicedgoods"
-				}, {
+				},
+				{
 					"path": "feedback/toexamine"
-				}, {
+				},
+				{
 					"path": "feedback/orderinquiry"
-				}, {
+				},
+				{
 					"path": "feedbackIndexczgw/feedbackIndexczgw",
 					"style": {
 						"navigationBarTitleText": "帮助中心",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
-				}, {
+				},
+				{
 					"path": "helpDetail/helpDetail",
 					"style": {
 						"navigationBarTitleText": "帮助详情",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#FFFFFF"
 					}
-				}, {
+				},
+				{
 					"path": "message/duanju-message-home",
 					"style": {
 						"navigationBarTitleText": "消息中心"
@@ -373,7 +380,7 @@
 					"path": "yaoqing/ymf-yaoqing-home",
 					"style": {
 						"navigationBarTitleText": "分享好友",
-						"navigationStyle": "custom",
+						// "navigationStyle": "custom",
 						"h5": {
 							"titleNView": {
 								"backgroundColor": "#FFFFFF"
@@ -396,9 +403,13 @@
 					"path": "yaoqing/ymg-yaoqing-tixian",
 					"style": {
 						"navigationBarTitleText": "申请提现",
-						"h5": {
+						// "navigationStyle": "custom",
+						"app-plus": {
 							"titleNView": {
-								"backgroundColor": "#FFFFFF"
+								"buttons": [{
+									"text": "规则",
+									"fontSize": "30rpx"
+								}]
 							}
 						}
 					}
@@ -475,7 +486,8 @@
 							}
 						}
 					}
-				}, {
+				},
+				{
 					"path": "setting/kefu",
 					"style": {
 						"navigationBarTitleText": "客服",
@@ -525,8 +537,8 @@
 							}
 						}
 					}
-				}, {
-
+				},
+				{
 					"path": "detail/detail",
 					"style": {
 						"navigationBarTitleText": "",
@@ -565,12 +577,9 @@
 							"video-player": "ext://industry/video-player"
 						}
 						// #endif
-
-
 					}
-
-				}, {
-
+				},
+				{
 					"path": "detail/detailIOS",
 					"style": {
 						"navigationBarTitleText": "",
@@ -609,45 +618,42 @@
 							"video-player": "ext://industry/video-player"
 						}
 						// #endif
-
-
 					}
-
-				}, {
+				},
+				{
 					"path": "FrdwbsihPr/FrdwbsihPr",
 					"style": {
 						"navigationBarTitleText": "金币充值",
 						"enablePullDownRefresh": false
 					}
-
-				}, {
+				},
+				{
 					"path": "FrdwbsihPr/RSKjJIdwbH",
 					"style": {
 						"navigationBarTitleText": "金币明细",
 						"enablePullDownRefresh": true
 					}
-
-				}, {
+				},
+				{
 					"path": "jilu/duanju-zuijin-guankan",
 					"style": {
 						"navigationBarTitleText": "最近观看",
 						"enablePullDownRefresh": true
 					}
-
-				}, {
+				},
+				{
 					"path": "jilu/duanju-zhjuiju-jilu",
 					"style": {
 						"navigationBarTitleText": "追剧记录",
 						"enablePullDownRefresh": true
 					}
-
-				}, {
+				},
+				{
 					"path": "jifen/duanju-jifen",
 					"style": {
 						"navigationBarTitleText": "我的积分",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "jifen/duanju-jifen-duihuan",
@@ -655,14 +661,13 @@
 						"navigationBarTitleText": "积分兑换",
 						"enablePullDownRefresh": false
 					}
-
-				}, {
+				},
+				{
 					"path": "jilu/duanju-love",
 					"style": {
 						"navigationBarTitleText": "我的喜欢",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "jilu/new/fensehn-first",
@@ -670,7 +675,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "jilu/new/free-create-fenshen",
@@ -678,7 +682,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "jifen/new/create-zhuanye-fenshen",
@@ -686,7 +689,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "jifen/new/fenshen-detail",
@@ -694,7 +696,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "payOrder/duanju-xiadan",
@@ -702,7 +703,6 @@
 						"navigationBarTitleText": "下单",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "payOrder/new/index",
@@ -710,7 +710,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "payOrder/new/newindex",
@@ -718,7 +717,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				},
 				{
 					"path": "setting/logOff",
@@ -726,15 +724,15 @@
 						"navigationBarTitleText": "注销账号",
 						"enablePullDownRefresh": false
 					}
-
-				}, {
+				},
+				{
 					"path": "setting/offXieyi",
 					"style": {
 						"navigationBarTitleText": "用户注销协议",
 						"enablePullDownRefresh": false
 					}
-
-				}, {
+				},
+				{
 					"path": "juqing/duanju-juqing-home",
 					"style": {
 						"navigationBarTitleText": "剧情介绍",
@@ -747,7 +745,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "juqing/new/waiting-result",
@@ -755,14 +752,13 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
-
-				}, {
+				},
+				{
 					"path": "mFYpdwbMdk/mFYpdwbMdk",
 					"style": {
 						"navigationBarTitleText": "壁纸",
 						"enablePullDownRefresh": true
 					}
-
 				},
 				{
 					"path": "rHTgyqGoIV/rHTgyqGoIV",
@@ -835,19 +831,23 @@
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},
+				{
+					"path": "yaoqing/realName",
+					"style": {
+						"navigationBarTitleText": ""
+					}
 				}
 			]
 		},
 		{
 			"root": "pay",
 			"pages": [{
-					"path": "success",
-					"style": {
-						"navigationBarTitleText": "支付成功"
-					}
+				"path": "success",
+				"style": {
+					"navigationBarTitleText": "支付成功"
 				}
-
-			]
+			}]
 		},
 		{
 			"root": "other",
@@ -887,7 +887,6 @@
 					"style": {
 						"navigationBarTitleText": "抽奖",
 						"navigationStyle": "custom"
-
 					}
 				},
 				{
@@ -924,24 +923,20 @@
 						"navigationStyle": "custom"
 					}
 				}
-
 			]
 		}
 	],
-
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "短剧",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
-
 	},
 	"tabBar": {
 		"color": "#333333",
 		"selectedColor": "#FF7581",
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "black",
-
 		"list": [{
 				"pagePath": "pages/index/index2",
 				"iconPath": "static/tabbar/index@2x.png",
@@ -961,14 +956,12 @@
 			// 	"text": "刷剧"
 			// }
 			// ,
-
 			// {
 			// 	"pagePath": "pages/video/video",
 			// 	"iconPath": "static/tabbar/learn@2x.png",
 			// 	"selectedIconPath": "static/tabbar/learn_@2x.png",
 			// 	"text": "推荐"
 			// },
-
 			// {
 			// 	"pagePath": "pages/chasingDrama/chasingDrama",
 			// 	"iconPath": "static/tabbar/zhuiju.png",

pages/BdwbOqUuVz/BdwbOqUuVz.vue

@@ -132,7 +132,7 @@
 					//返回值：arg1乘以arg2的精确结果
 			enter(){
 				uni.reLaunch({
-					url:'/pages/index/index'
+					url:'/pages/index/index2'
 				})
 			},
 			init(){

pages/index/components/contentlist.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="df" style=" justify-content: space-around;flex-wrap: wrap; margin-top: 10rpx;">
 			<view style="border-radius:21rpx 21rpx 21rpx 21rpx;width: 33%;text-align: center;margin-top: 20rpx;padding:0 26rpx;"
-				class="liststyle" v-for="item in $props.list" :key="item">
+				class="liststyle" v-for="item in $props.list" :key="item.course_id" @tap="seVideo(item)">
 				<image :src="item.titleImg" style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx"
 					mode=""></image>
 				<view style="font-weight: 400;font-size: 25rpx;color: #333333;text-align: left;">
@@ -17,6 +17,9 @@
 </template>
 
 <script>
+	import {
+		returnIsSafari
+	} from '@/utils/app.js'
 	export default {
 		props: {
 			list: {
@@ -30,7 +33,55 @@
 			}
 		},
 		methods: {
+			pageScrollTo(time = 100) {
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop - 50,
+					duration: time,
+					complete() {
+			
+					}
+				})
+			},
+	//查看视频
+			seVideo(item) {
+				console.log(uni.getStorageSync('token'))
+				// if(uni.getStorageSync('token')){
+				const time = 100;
+				// #ifdef H5
+				if (returnIsSafari()) {
+					this.pageScrollTo(time)
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
+								.courseDetailsId +
+								'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+								.dyEpisodeId
+						})
+					}, time)
+				} else {
+					uni.navigateTo({
+						url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+							'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+							.dyEpisodeId
+					})
+				}
 
+				// #endif
+				// #ifndef H5
+				uni.navigateTo({
+					url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+						'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+						.dyEpisodeId
+				})
+				// #endif
+
+				// }else{
+				// 	uni.navigateTo({
+				// 		url:'/pages/login/login'
+				// 	})
+				// }
+			},
+		
 		}
 	}
 </script>

pages/index/course/courseList.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="">
-		<u-sticky :enable="enableIos">
+	<!-- 	<u-sticky :enable="enableIos">
 			<view class="search-box-ios">
 				<u-search bg-color="#f2f2f2" style="width: 100%;" placeholder="搜索更多资源" v-model="keywordIos"
 					:show-action="false" :animation="true" @search="getCourseListIos()"></u-search>
 			</view>
-		</u-sticky>
+		</u-sticky> -->
 		<view class="swiper flex align-center justify-center">
 			<view class="swiper-box">
 				<swiper :indicator-dots="true" class="swiper " :autoplay="true" interval="5000" duration="500"
 					:circular="true" style="width: 100%;height: 350rpx;">
 					<swiper-item v-for="(item,index) in swiperListIos" :key='index' @tap="goPageIos(item.url)">
-						<image :src="item.imageUrl" mode="scaleToFill"
+						<image :src="item.imageUrl" mode="aspectFill"
 							style="width: 100%;height: 100%;border-radius: 24rpx;"></image>
 					</swiper-item>
 				</swiper>

pages/index/index copy.vue

@@ -195,7 +195,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg
@@ -203,7 +203,7 @@
 		},
 		onShareTimeline(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg

pages/index/index.vue

@@ -261,14 +261,14 @@
 				isWeixin: false,
 				isIos: true,
 				scrollTop: 0,
-				isShowMoneyPay: true,
+				isShowMoneyPay: false,
 				isIos: true,
 				isIosApp: false,
 			};
 		},
 		onShareAppMessage(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg
@@ -276,7 +276,7 @@
 		},
 		onShareTimeline(res) {
 			return {
-				path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this
+				path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this
 					.qdCode, //这是为了传参   onload(data){let id=data.id;} 
 				title: this.tuiguang,
 				imageUrl: this.bgImg

pages/index/index2.vue

@@ -8,50 +8,74 @@
 				<view style="z-index: 50;width: 236rpx;line-height: 43rpx;background: rgba(255,255,255,0.29);border-radius: 7rpx 7rpx 7rpx 7rpx;
 				font-weight: 400;font-size: 21rpx;color: rgba(255,255,255,0.85);display: flex;align-items: center;"
 					@tap="moreVideo">
-					<uni-icons type="search" size="16" style="color: rgba(255,255,255,0.85);"></uni-icons>
+					<!-- <uni-icons type="search" size="16" style="color: rgba(255,255,255,0.85);"></uni-icons> -->
+					<image src="../../static/dwbimgs/sosuo.png" style="height: 34rpx;width: 34rpx;" mode=""></image>
 					点击搜索更多好剧
 				</view>
 			</view>
 
-			<template v-if="noticeList.length>0">
+			<template v-if="noticeList.length > 0 && isShowMoneyPay">
 				<view class="gongao">
 					<view class="gongaoicon">
 						公告
 					</view>
 					<swiper :autoplay="true" :vertical="true" :interval="4000" :circular="true" :indicator-dots="false"
 						class="swiperstyle">
-						<swiper-item @tap='goMsg(item.url)' v-for="(item, index) in noticeList">
-							<view style="height: 80rpx;line-height: 80rpx;">{{item.title}}</view>
+						<swiper-item @tap='goMsg(item.url)' v-for="(item, index) in noticeList" :key="index">
+							<view style="height: 80rpx;line-height: 80rpx;">{{ item.title }}</view>
 						</swiper-item>
 					</swiper>
 				</view>
 			</template>
 		</view>
 		<view style="display: flex;align-items: center;justify-content: space-between;padding:0 20rpx;">
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('')">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 1 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('', 1)">
 				最新
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('1')">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 2 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 2)">
 				排行
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('2')">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 3 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 3)">
 				最热
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('1')">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 4 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 4)">
 				剧情
 			</view>
-			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx" @tap="getrecomVideo('2')">
+			<view style="background-color: #f0f0f0;margin-left:20rpx;padding:6rpx 20rpx"
+				:style="active == 5 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 5)">
 				飙升
 			</view>
 		</view>
 		<view class="">
 			<contentlist :list='list'></contentlist>
 		</view>
+		<u-image v-if="isShowMoneyPay" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')"
+			:src="`../../static/red-pack-new.gif`"
+			style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;"></u-image>
+
+		<u-modal v-if="isShowMoneyPay" v-model="ruleShow" @confirm="ruleConfirm" confirm-text="知道了" :title="rule_title"
+			:title-style="{ fontWeight: '700' }" 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 class="color-666" :nodes="rule_content"></rich-text>
+				</scroll-view>
+			</view>
+
+		</u-modal>
 	</view>
 </template>
 
 <script>
 	import contentlist from './components/contentlist.vue'
+	import httpsRequest from '@/common/httpRequest.js'
+	import {
+		$cache_config,
+		$cache_rule
+	} from '@/store/cashe.js'
 	export default {
 		components: {
 			contentlist
@@ -60,18 +84,90 @@
 			return {
 				noticeList: [], //公告列表
 				list: [],
-				page: 1
+				page: 1,
+				active: 1,
+				isShowMoneyPay: false,
+				ruleShow: false,
+				rule_title: '',
+				rule_content: '',
+				ruleList: "",
+				ruleIndex: 0,
+				ruleList: $cache_rule.ruleIndex || []
 			}
 		},
 		onShow() {
 			this.getMsg()
 			this.getrecomVideo()
+
+			httpsRequest.getT("/app/common/type/919", {}).then(res => {
+				if (res.code == 0) {
+					const sysInfo = uni.getSystemInfoSync();
+					let isIos = sysInfo.platform == 'ios'
+					this.isIosApp = isIos
+					this.isShowMoneyPay = !(res.data.value == '1' && isIos)
+				}
+			});
+
+			if(!uni.getStorageSync('ruleShow')){
+				httpsRequest.getT("/app/announcement", {
+					type: 0
+				}).then(res => {
+					if (res.code == 0 && res.data.length > 0) {
+						this.ruleShow = true
+						this.ruleList = res.data
+						$cache_rule.set('ruleIndex', this.ruleList)
+						this.ruleInit()
+					}
+				
+				});
+			}
+			
+		},
+		onPullDownRefresh(){
+			this.getrecomVideo()
+			setTimeout(()=>{
+				    uni.stopPullDownRefresh()
+			},1000)
 		},
 		onReachBottom() {
 			++this.page
 			this.getrecomVideo()
 		},
 		methods: {
+			ruleInit() {
+				this.rule_title = this.ruleList[this.ruleIndex].title
+				this.rule_content = this.ruleList[this.ruleIndex].content
+			},
+			ruleConfirm() {
+				this.ruleIndex++
+				if (this.ruleIndex >= this.ruleList.length) {
+					this.ruleIndex = 0
+					uni.setStorageSync('ruleShow', true)
+					return
+				}
+				this.ruleShow = false
+				setTimeout(res => {
+					this.ruleInit()
+					this.ruleShow = true
+				}, 300)
+			},
+			// 跳转公告链接
+			goMsg(url) {
+				if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {
+					uni.navigateTo({
+						url
+					});
+				} else {
+					//#ifndef H5
+					uni.navigateTo({
+						url: '/pages/index/webView?url=' + url
+					});
+					//#endif
+					//#ifdef H5
+					window.location.href = url;
+					//#endif	
+				}
+			},
 			moreVideo() {
 				uni.navigateTo({
 					url: '/pages/index/course/courseList?title=最新热播'
@@ -79,7 +175,8 @@
 			},
 			// 列表
 			//获取推荐视频
-			getrecomVideo(sort) {
+			getrecomVideo(sort, active = 1) {
+				this.active = active
 				if (sort) {
 					this.page = 1
 				}

pages/login/appEq.vue

@@ -132,7 +132,7 @@
 									});
 									
 									uni.switchTab({
-										url: '/pages/index/index'
+										url: '/pages/index/index2'
 									})
 									// window.location.href = res.data.value;
 									// #endif

pages/login/iosmobile.vue

@@ -215,7 +215,7 @@
 						this.$queue.setData("token", res.token);
 						this.$queue.setData("userId", res.user.userId);
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						})
 					} else {
 						_this.isRotate = false;
@@ -245,7 +245,7 @@
 							}
 						});
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						});
 					} else {
 						uni.showModal({

pages/login/login - 副本.vue

@@ -186,7 +186,7 @@
 									that.$queue.setData('token', res.token);
 									that.$queue.setData('userId', res.user.userId);
 									uni.switchTab({
-										url: '/pages/index/index'
+										url: '/pages/index/index2'
 									})
 								} else {
 									uni.hideLoading();
@@ -307,7 +307,7 @@
 							console.log(ress.user.userId)
 							console.log(ress.token)
 							uni.switchTab({
-								url: '/pages/index/index'
+								url: '/pages/index/index2'
 							})
 						} else {
 							uni.hideLoading();
@@ -354,7 +354,7 @@
 												that.$queue.setData('userId', res.user
 													.userId);
 												uni.switchTab({
-													url: '/pages/index/index'
+													url: '/pages/index/index2'
 												})
 											} else {
 												uni.hideLoading();
@@ -446,7 +446,7 @@
 										this.$queue.setData("invitationCode", res.user.invitationCode);
 										this.$queue.setData("inviterCode", res.user.inviterCode);
 										uni.switchTab({
-											url: '/pages/index/index'
+											url: '/pages/index/index2'
 										})
 									} else {
 										uni.navigateTo({
@@ -498,7 +498,7 @@
 												this.$queue.setData("inviterCode", res.user
 													.inviterCode);
 												uni.switchTab({
-													url: '/pages/index/index'
+													url: '/pages/index/index2'
 												})
 											} else {
 												uni.navigateTo({
@@ -526,7 +526,7 @@
 									this.$queue.setData("invitationCode", res.user.invitationCode);
 									this.$queue.setData("inviterCode", res.user.inviterCode);
 									uni.switchTab({
-										url: '/pages/index/index'
+										url: '/pages/index/index2'
 									})
 								} else {
 									uni.navigateTo({
@@ -977,7 +977,7 @@
 							})
 							setTimeout(function() {
 								uni.switchTab({
-									url: '/pages/index/index'
+									url: '/pages/index/index2'
 								});
 							}, 1000)
 

pages/login/login.vue

@@ -286,6 +286,7 @@ export default {
 				})
 				this.$u.post('/app/Login/registerCode?password=' + code + '&phone=' + mobile).then(res => {
 					if (res.code === 0) {
+						console.log(res,'userid1')
 						uni.setStorageSync('token', res.token)
 						uni.setStorageSync('userId', res.user.userId)
 						uni.setStorageSync('userName', res.user.userName)

pages/login/phonebind.vue

@@ -188,7 +188,7 @@
 						this.$queue.setData("token", res.token);
 						this.$queue.setData("userId", res.user.userId);
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						})
 					} else {
 						_this.isRotate = false;
@@ -218,7 +218,7 @@
 							}
 						});
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						});
 					} else {
 						uni.showModal({

pages/login/register.vue

@@ -257,17 +257,22 @@
 						})
 						setTimeout(function() {
 							uni.switchTab({
-								url: '/pages/index/index'
+								url: '/pages/index/index2'
 							});
 						}, 1000)
 						// this.getUserInfo(res.userId, res.token);
 					} else {
 						uni.hideLoading();
-						uni.showModal({
-							showCancel: false,
-							title: '注册失败',
-							content: res.msg
-						});
+						setTimeout(function() {
+							uni.navigateTo({
+								url: '/pages/login/login'
+							});
+						}, 1000)
+						// uni.showModal({
+						// 	showCancel: false,
+						// 	title: '注册失败',
+						// 	content: res.msg
+						// });
 					}
 				});
 			},
@@ -303,7 +308,7 @@
 						// this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone);
 						// this.$queue.setData('gender', parseInt(res.data.gender));
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						});
 					} else {
 						uni.showModal({

pages/login/registerApp.vue

@@ -269,11 +269,16 @@
 						}, 1000)
 					} else {
 						uni.hideLoading();
-						uni.showModal({
-							showCancel: false,
-							title: '注册失败',
-							content: res.msg
-						});
+						setTimeout(function() {
+							uni.navigateTo({
+								url: '/pages/login/login'
+							});
+						}, 1000)
+						// uni.showModal({
+						// 	showCancel: false,
+						// 	title: '注册失败',
+						// 	content: res.msg
+						// });
 					}
 				});
 			},
@@ -309,7 +314,7 @@
 						// this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone);
 						// this.$queue.setData('gender', parseInt(res.data.gender));
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						});
 					} else {
 						uni.showModal({

pages/login/wxmobile.vue

@@ -224,7 +224,7 @@
 						this.$queue.setData("token", res.token);
 						this.$queue.setData("userId", res.user.userId);
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						})
 					} else {
 						_this.isRotate = false;
@@ -254,7 +254,7 @@
 							}
 						});
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/index/index2'
 						});
 					} else {
 						uni.showModal({

pages/me/index.vue

@@ -3,12 +3,12 @@
 		<!-- <u-navbar  :background="background" :is-back="isBack" :title="title" :border-bottom="false">
 		</u-navbar> -->
 		<!-- 登录信息 -->
-		<view class="info  " style="padding: 20rpx;">
+		<view class="info  " style="padding: 20rpx;padding-top: 120rpx;">
 			<view
 				style="background-color: #f5f1f1;padding: 20rpx; display: flex;align-items: center;justify-content: space-between;"
 				class="">
 				<image src="../../static/logo.png" style="width: 170rpx;height: 51rpx;z-index: 999;" mode=""></image>
-			<!-- 	<view class="">
+				<!-- 	<view class="">
 					<image src="../../static/dwbimgs/one.png" style="width: 46rpx;height: 46rpx;z-index: 999;" mode="">
 					</image>
 					<image src="../../static/dwbimgs/two.png" style="width: 46rpx;height: 46rpx;z-index: 999;" mode="">
@@ -47,7 +47,7 @@
 						我的喜欢
 					</view>
 					<view class="statistics-box-item-top">
-						{{myLoveNum}}
+						{{myLoveNum?myLoveNum:0}}
 					</view>
 				</view>
 				<view class="statistics-box-item" @click="goNav('/me/jilu/duanju-zhjuiju-jilu')">
@@ -55,7 +55,7 @@
 						我的追剧
 					</view>
 					<view class="statistics-box-item-top">
-						{{myZhui}}
+						{{myZhui?myZhui:0}}
 					</view>
 				</view>
 				<!-- <view class="statistics-box-item" @click="goNav('/me/jifen/duanju-jifen')">
@@ -66,8 +66,7 @@
 						我的积分
 					</view>
 				</view> -->
-				<view v-if="isShowMoneyPay" class="statistics-box-item"
-					@click="goNav('/me/yaoqing/ymg-yaoqing-tixian')">
+				<view v-if="isiosExamine" class="statistics-box-item" @click="goNav('/me/yaoqing/ymg-yaoqing-tixian')">
 					<view class="statistics-box-item-btn">
 						我的红包
 					</view>
@@ -99,33 +98,33 @@
 			</view>
 		</view> -->
 		<!-- 钱包 -->
-
-		<view class="money" v-if="isWxIosPay == true" style="position: relative;">
-		<!-- 	<view
+		<view class="money" v-if="isWxIosPay == '是'" style="position: relative;">
+			<view
 				style="position: relative;background-color: #f2b5b5;width: 700rpx;height: 74rpx;padding:20rpx;border-radius: 14rpx 14rpx 0rpx 0rpx;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: space-between;">
 				<view class="df">
 					<image src="../../static/dwbimgs/money.png" style="width:  47rpx;height: 47rpx;margin-right: 28rpx;"
 						mode=""></image>
 					<view style="font-weight: bold;font-size: 36rpx;color: #FFFFFF;">
 						{{formatNumber(moneyNum)}}
-						元
 					</view>
 				</view>
+				<view @tap="goNav('/me/yaoqing/redPack-mingxi?moneyType=2&viewType=2')"
+					style="font-weight: bold;font-size: 25rpx;color: #977641;width: 160rpx;text-align:center;line-height: 50rpx;background: linear-gradient( 90deg, #FEE7BC 0%, #FDCC89 100%);border-radius: 46rpx 46rpx 46rpx 46rpx;">
+					金币明细
+				</view>
 				<view
-					style="font-weight: bold;font-size: 25rpx;color: #977641;width: 110rpx;text-align:center;line-height: 50rpx;background: linear-gradient( 90deg, #FEE7BC 0%, #FDCC89 100%);border-radius: 46rpx 46rpx 46rpx 46rpx;">
-					提现
+					style="position: absolute;background-color: #fff;width: 40rpx;height: 40rpx;transform: rotate(45deg);bottom: -10rpx;left: 48%;background-color: #f2b5b5;">
+
 				</view>
-				<view style="position: absolute;background-color: #fff;width: 40rpx;height: 40rpx;transform: rotate(45deg);bottom: -10rpx;left: 48%;background-color: #f2b5b5;">
-					
-				</view>
-			</view> -->
-			<view style="margin-top: 0rpx;">观看历史</view>
-			<view class="df" style=" justify-content: space-between;margin-top: 28rpx;">
-				<view style="border-radius:21rpx 21rpx 21rpx 21rpx" v-for="item in list" :key="item">
+			</view>
+			<view  style="margin-top: 40rpx;">观看历史</view>
+			<view  class="df" style=" margin-top: 28rpx;">
+				<view style="border-radius:21rpx 21rpx 21rpx 21rpx;margin-left: 28rpx" v-for="(item,index) in list" :key="(item,index)"
+					@tap="seVideo(item)">
 					<image :src="item.titleImg"
 						style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx" mode=""></image>
 					<view style="font-weight: 400;font-size: 25rpx;color: #333333;">
-						{{item.title}}
+						{{item.title.substr(0,8)}}
 					</view>
 					<view style="font-weight: 400;font-size: 21rpx;color: #999999;">
 						看到{{item.courseDetailsName}}
@@ -304,7 +303,10 @@
 	import ttMsg from '../../components/ttMsg/ttMsg.vue'
 	import httpsRequest from '../../common/httpRequest.js'
 	import otherXuanfu from '@/components/other-xuafu.vue'
-
+	import {init} from '@/common/init.js'
+	import {
+		returnIsSafari
+	} from '@/utils/app.js'
 
 	export default {
 		components: {
@@ -345,10 +347,11 @@
 				isWxIosPay: true, //微信下是否显示支付功能
 				userInfo: {},
 				isShowMoneyPay: true,
+				isiosExamine: false, // 我的金币审核
 			}
 		},
 		onLoad() {
-			this.getBannerList()
+			// this.getBannerList()
 
 			this.zxczxczxczsw(1212, 5)
 			this.zzzzzzzzzzzzzzzzs(1212.5)
@@ -357,7 +360,7 @@
 			this.wwrqx(1212, 5)
 		},
 		onShow() {
-			this.ymfgetDataList()
+			init()
 			const systemInfo = uni.getSystemInfoSync();
 			const isIOS = /iOS/.test(systemInfo.platform);
 			if (!isIOS) {
@@ -369,6 +372,7 @@
 			this.isVips = uni.getStorageSync('isVips') ? uni.getStorageSync('isVips') : '否'
 			this.token = uni.getStorageSync('token')
 			if (this.token) {
+				this.ymfgetDataList()
 				this.getMyMoney()
 				this.getPoints()
 				this.$u.api.userinfo().then(res => {
@@ -425,6 +429,11 @@
 					const sysInfo = uni.getSystemInfoSync();
 					let isIos = sysInfo.platform === 'ios'
 					this.isShowMoneyPay = !(res.data.value === '1' && isIos)
+					if (res.data.value == 1) {
+						this.isiosExamine = false
+					} else {
+						this.isiosExamine = true
+					}
 				}
 			});
 		},
@@ -479,6 +488,38 @@
 				}
 
 			},
+			pageScrollTo(time = 100) {
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop - 50,
+					duration: time,
+					complete() {
+
+					}
+				})
+			},
+			//查看视频
+			seVideo(item) {
+				const time = 100;
+				console.log(item, '调试1')
+				if (returnIsSafari()) {
+					this.pageScrollTo(time)
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item
+								.courseDetailsId +
+								'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+								.dyEpisodeId
+						})
+					}, time)
+				} else {
+					uni.navigateTo({
+						url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+							'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+							.dyEpisodeId
+					})
+				}
+			},
+
 			//获取我喜欢的数量
 			getMyLoveNum() {
 				let data = {
@@ -486,9 +527,9 @@
 					limit: 1,
 					classify: 2
 				}
-				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
+				this.$Request.getT('/app/courseCollect/collectVideoSummary', data).then(res => {
 					if (res.code === 0) {
-						this.myLoveNum = res.data.total
+						this.myLoveNum = res.data.likeCount
 					} else {
 						this.myLoveNum = 0
 					}
@@ -501,9 +542,9 @@
 					limit: 1,
 					classify: 1
 				}
-				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
+				this.$Request.getT('/app/courseCollect/collectVideoSummary', data).then(res => {
 					if (res.code === 0) {
-						this.myZhui = res.data.total
+						this.myZhui = res.data.collectCount
 					} else {
 						this.myZhui = 0
 					}
@@ -518,7 +559,6 @@
 				}
 				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
 					if (res.code === 0) {
-						console.log(res,'debug')
 						let arr = []
 						res.data.records.forEach((ele, index) => {
 							if (index < 3) {
@@ -710,6 +750,10 @@
 					uni.navigateTo({
 						url: '/me/setting/kefu'
 					})
+				} else if (kefu == 4) {
+					uni.navigateTo({
+						url: '/pages/me/webview'
+					})
 				} else if (kefu === 3) {
 					uni.makePhoneCall({
 						phoneNumber: kefuPhone //仅为示例

pages/me/webview.vue

@@ -0,0 +1,17 @@
+<template>
+	<web-view :src="url"></web-view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				url: 'https://chatbot.aliyuncs.com/intl/index.htm?from=pfW5XoA9gt&locale=zh-CN',
+			};
+		},
+		async onLoad(options) {
+			this.url = uni.getStorageSync('kefuPhone');
+			console.log(options)
+			// this.url = options.url
+		}
+	};
+</script>

pages/task/index.vue

@@ -8,9 +8,12 @@
 		<view class="navTitle">
 			<view></view>
 			<view class="title">任务大厅</view>
-			<image @click="goNav({jumpType:1,buttonUrl:'/pages/me/index'})" class="navTitleIcon"
+			<view class="">
+				
+			</view>
+		<!-- 	<image @click="goNav({ jumpType: 1, buttonUrl: '/pages/me/index' })" class="navTitleIcon"
 				src="../../static/images/my.png"></image>
-		</view>
+	 -->	</view>
 		<view class="icon u-relative padding">
 			<image class="task_icon1 u-relative" src="../../static/images/me/task_icon1.png"></image>
 			<view class="icon_title u-font-32 text-bold u-relative">新人好礼送不停</view>
@@ -22,7 +25,7 @@
 				<image src="../../static/dwbimgs/renwubg.png"
 					style="width: 100%;height: 78rpx;position: absolute;left: 0;top: 0;z-index:1" mode=""></image>
 				<view style="z-index: 9999;position: absolute;text-align: center;width: 98%;">已连续签到 <text class="num"
-						style="color: #EC6F48;margin: 0 10rpx;">{{signDays}}</text> 天</view>
+						style="color: #EC6F48;margin: 0 10rpx;">{{ signDays }}</text> 天</view>
 			</view>
 			<!-- 		<view class="signInList flex justify-between">
 				<text class="line"></text>
@@ -40,15 +43,15 @@
 				</view>
 			</view> -->
 			<view style="margin-top: 100rpx; display: flex;align-items: center; justify-content: space-between;">
-				<view class="" v-for="item in signInList" :key="item" style="position: relative;"
-					:style="filterDate(item)=='已签到'?'color:#EFA765':'color:#999'">
-					{{filterDate(item)}}
+				<view class="" v-for="item in signInList" :key="item.id" style="position: relative;"
+					:style="filterDate(item) == '已签到' ? 'color:#EFA765' : 'color:#999'">
+					{{ filterDate(item) }}
 					<view
 						style="margin-top: 20rpx;;width: 80rpx;height: 94rpx;background: linear-gradient( 180deg, #FFF7E3 0%, #FFFFFF 100%);border-radius: 14rpx 14rpx 0rpx 0rpx;"
-						:style="filterDate(item)=='已签到'?'color:#999':'color:#EFA765'">
-						{{item.signDay.substr(5,8)}}
+						:style="filterDate(item) == '已签到' ? 'color:#999' : 'color:#EFA765'">
+						{{ item.signDay.substr(5, 8) }}
 					</view>
-					<image v-if="item.status==0" src="../../static/dwbimgs/xing (1).png"
+					<image v-if="item.status == 0" src="../../static/dwbimgs/xing (1).png"
 						style="width: 52rpx;height: 48rpx;position: absolute;top: 100rpx;left: 14rpx;" mode=""></image>
 					<image v-else src="../../static/dwbimgs/xing (2).png"
 						style="width: 52rpx;height: 48rpx;position: absolute;top: 100rpx;left: 14rpx;" mode="">
@@ -63,44 +66,48 @@
 			</view> -->
 
 		</view>
-
 		<view class="content margin-lr padding bg-white u-relative" v-if="list.length">
-
-			<view class="cell flex justify-between" v-for="(item,index) in list" :key="index"
-				v-if="(item.buttonUrl=='/me/yaoqing/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/yaoqing/ymf-yaoqing-home'&&item.title!='观看视频奖励'">
+			<view class="cell flex justify-between" v-for="(item, index) in list" :key="index" v-if="item.shows">
 				<view class="cell_left flex">
 					<view class="cell_title flex">
 						<view class="u-font-28 text-bold title"
-							:style="{alignSelf: item.rewardImg?'center':'flex-start'}">{{ item.title}}</view>
-						<u-image v-if="item.rewardImg" class="cell_icon" :src="item.rewardImg "></u-image>
-						<view class="u-font-24 tip">{{ item.rewardDetail  }}</view>
+							:style="{ alignSelf: item.rewardImg ? 'center' : 'flex-start' }">{{ item.title }}</view>
+						<u-image v-if="item.rewardImg" class="cell_icon" :src="item.rewardImg"></u-image>
+						<view class="u-font-24 tip" v-if="isShowMoneyPay">{{ item.rewardDetail }}</view>
 					</view>
 					<view class="subhead u-font-24">{{ item.detail }}</view>
 				</view>
 				<view class="cell_right flex">
-					<view v-if=" item.disabled " class="btn u-font-24 text-bold"
-						:style="{backgroundColor: item.buttonBgColor,color: item.buttonFontColor }"
+					<view v-if="item.disabled" class="btn u-font-24 text-bold"
+						:style="{ backgroundColor: item.buttonBgColor, color: item.buttonFontColor }"
 						@click="goNav(item)">
-						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : (
+							item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
 					</view>
 					<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}次`) }}
+						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}`
+									: (item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
 					</view>
 					<!-- <view v-else class="btn u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</view> -->
-					<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-20 tip"
-						@click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">
-						{{ item.buttonUnderContent}}
+					<view v-if="item.buttonUnderContent && item.buttonUnderUrl&&isShowMoneyPay" class="u-font-22 tip"
+						@click="goNav({ id: item.id, buttonUrl: item.buttonUnderUrl, jumpType: 1, title: item.title, disabled: item.disabled, discNumber: item.discNumber })">
+						{{ item.buttonUnderContent }}
 					</view>
 				</view>
 			</view>
-
 		</view>
-
+		<!-- 激励视频广告 -->
+		<ad-rewarded-video v-if="adRewardedVideo" ref="adRewardedVideo" adpid="1531580352" :loadnext="true"
+			v-slot:default="{ loading, error }" :url-callback="urlCallback" @load="onadload" @close="onadclose"
+			@error="onaderror">
+			<view class="ad-error" v-if="error">{{ error }}</view>
+		</ad-rewarded-video>
 	</view>
 </template>
 
 <script>
-	import {
+	import index from '../../tuniao-ui'
+import {
 		data
 	} from '../../tuniao-ui/libs/mixin/mixin'
 
@@ -118,6 +125,10 @@
 				signInList: [],
 				signInBtn: '点击签到',
 				isShowMoneyPay: true,
+				adRewardedVideo: true,
+				adRewardedVideoloadNum: 0,
+				urlCallback: null,
+
 			}
 		},
 		onLoad() {
@@ -135,8 +146,62 @@
 					this.isShowMoneyPay = !(res.data.value == '1' && isIos)
 				}
 			});
+			this.$nextTick(() => {
+				this.adRewardedVideoloadNum = 0
+				this.$refs.adRewardedVideo.load();
+			})
 		},
 		methods: {
+
+			onadload(e) {
+				this.adRewardedVideo = true;
+				console.log('广告数据加载成功');
+			},
+
+			/**
+			 * 广告加载失败回调
+			 * @param {Object} e
+			 */
+			onaderror(e) {
+				if (this.adRewardedVideoloadNum >= 3) {
+					this.adRewardedVideo = false;
+					return
+				}
+				this.adRewardedVideoloadNum++
+				setTimeout(() => {
+					this.$refs.adRewardedVideo.load();
+				}, 1000); // 10
+				console.log("广告加载失败")
+			},
+
+			/**
+			 * 广告播放成功回调
+			 * @param {Object} e
+			 */
+			async onadclose(e) {
+				const detail = e.detail
+				if (detail && detail.isEnded) {
+					// 正常播放结束
+					// /sqx_fast/app/ad/state
+					let res = await this.$Request.getT('app/ad/state', {
+						extraKey: this.urlCallback.extra
+					})
+					this.$Request.getT('/app/common/type/921').then(res => {
+						if (res.code == 0) {
+							console.log(res)
+							uni.showToast({
+								title: '获得' + res.data.value + '分钟免费时长',
+								icon: 'none'
+							})
+						}
+					})
+				} else {
+					// 播放中途退出
+				}
+			},
+
+
+
 			//乘法函数，用来得到精确的乘法结果
 			//说明：javascript的乘法结果会有误差，在两个浮点数相乘的时候会比较明显。这个函数返回较为精确的乘法结果。
 			//调用：mul(arg1,arg2)
@@ -277,6 +342,24 @@
 						// 	}
 						// })
 					} else {
+						this.signDays = 0
+						const dateArray = [];
+						this.signInList=[]
+						for (let i = 0; i < 7; i++) {
+							const date = new Date(Date.now() + i * 24 * 60 * 60 * 1000);
+							const year = date.getFullYear();
+							const month = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : date.getMonth() +
+								1;
+							const day = date.getDate() < 10 ? `0${date.getDate()}` : date.getDate();
+							dateArray.push(`${year}-${month}-${day}`);
+						}
+						console.log(dateArray, 'debug');
+						dateArray.forEach(ele => {
+							this.signInList.push({
+								"signDay": ele,
+								"status": "0",
+							})
+						})
 						// uni.showToast({
 						// 	title: res.msg,
 						// 	icon: 'none'
@@ -300,48 +383,68 @@
 				// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
 				// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
 				// buttonUrl
-				let source, buttonUrl;
-				buttonUrl = item.buttonUrl
-
-				console.log(item)
-				if (item.buttonUrl == '/me/invite/index') {
-					buttonUrl = "/me/yaoqing/ymf-yaoqing-home"
-				}
-				if (item.buttonUrl == '/me/invite/zhifubao') {
-					buttonUrl = "/me/yaoqing/zhifubao-tixain"
-				}
-				if (item.buttonUrl == '/me/choujiang/choujiang') {
-					buttonUrl = "/me/VjgyqAzklr/VjgyqAzklr"
-				}
+				console.log(item, '调试1')
 				if (item.jumpType == 0) {
-					console.log("============", item.buttonTitle);
+
 					if (item.buttonTitle.indexOf("领取") != -1) {
 						this.taskReceive(item.id)
+					} else if (item.buttonTitle.indexOf("观看视频") != -1) {
+						// 首次加载广告 
+						this.urlCallback = {
+							userId: uni.getStorageSync('userId'),
+							extra: uni.getStorageSync('userId') + "" + new Date().getTime(),
+						}
+						this.$refs.adRewardedVideo.show();
 					} else {
-						uni.navigateTo({
-							url: '/pages/index/index'
+						uni.switchTab({
+							url: "/pages/index/index2"
 						})
 					}
 				} else if (item.jumpType == 1) {
-					console.log("--------------");
-					if (item.title && item.title.indexOf('每周') != -1) {
-						source = 2
-						buttonUrl = item.buttonUrl + '?source=' + source
+					let source, buttonUrl;
+
+					buttonUrl = item.buttonUrl
+					if (buttonUrl == '/me/invite/index') {
+						buttonUrl = "/me/yaoqing/ymf-yaoqing-home"
 					}
-					if (item.title && item.title.indexOf('每月') != -1) {
+					if (buttonUrl == '/me/invite/zhifubao') {
+						buttonUrl = "/me/yaoqing/zhifubao-tixain"
+					}
+					if (buttonUrl == '/me/choujiang/choujiang') {
+						buttonUrl = "/me/VjgyqAzklr/VjgyqAzklr"
+					}
+					console.log(buttonUrl, 'debug')
+					if (item.title && item.title.indexOf('每周打卡奖励') != -1) {
+						// source = 2
+						buttonUrl = item.buttonUrl + '?source=2'
+					}
+					if (item.title && item.title.indexOf('每月打卡奖励1') != -1) {
 						source = 3
 						buttonUrl = item.buttonUrl + '?source=' + source
 					}
-					console.log(buttonUrl)
-					uni.navigateTo({
-						url: buttonUrl
-					})
+					if (item.title && item.title.indexOf('每月打卡奖励2') != -1) {
+						buttonUrl =
+							`${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
+					}
+
+					console.log(buttonUrl, 'debug')
+					if (buttonUrl == '/me/invite/index') {
+						uni.navigateTo({
+							url: '/me/yaoqing/ymf-yaoqing-home'
+						})
+					} else {
+
+						uni.navigateTo({
+							url: buttonUrl
+						})
+					}
+
 				} else if (item.jumpType == 3) {
-					uni.navigateTo({
-						url: '/pages/index/index'
+					uni.switchTab({
+						url: item.buttonUrl
 					})
 				} else if (item.jumpType == 2) {
-					plus.runtime.openURL(buttonUrl)
+					plus.runtime.openURL(item.buttonUrl)
 				}
 
 			},
@@ -364,8 +467,8 @@
 							this.getsignIn()
 						}, 1000)
 					} else {
-						uni.navigateTo({
-							url: '/pages/index/index'
+						uni.switchTab({
+							url: '/pages/index/index2'
 						})
 					}
 				})
@@ -378,7 +481,110 @@
 
 				this.$Request.getT('/app/taskCenter/selectTaskCenter', {}).then(res => {
 					if (res.code == 0) {
-						this.list = res.data
+						if (!this.isShowMoneyPay) {
+							let arrData = []
+							res.data.forEach(ele => {
+								if (ele.title.indexOf('分享奖励') == -1 && ele.title.indexOf('新人福利') == -1 &&
+									ele.title.indexOf('观看视频奖励') == -1) {
+									arrData.push(ele)
+								}
+							})
+							arrData[0].detail='奖励666金币'
+							arrData[1].detail='奖励1666金币'
+							arrData[2].detail='奖励6666金币'
+							arrData[3].detail='奖励8888金币'
+							this.list = arrData
+							
+						} else {
+							this.list = res.data
+						}
+					} else {
+						this.list = [{
+								"id": 1,
+								"title": "每日打卡奖励",
+								"type": 2,
+								"detail": "解锁3集视频即可领取",
+								"rewardDetail": "奖励666金币",
+								"number": 3,
+								"buttonTitle": "",
+								"jumpType": 1,
+								"buttonUrl": "",
+								"buttonUnderContent": "",
+								"buttonUnderUrl": "",
+								"updateTime": "2025-01-06 18:08:49",
+								"sort": 0,
+								"shows": 1,
+								"discNumber": 0,
+								"disabled": false
+							},
+							{
+								"id": 17,
+								"title": "每周打卡奖励",
+								"type": 2,
+								"detail": "当月签到满7天即可免费领取",
+								"rewardImg": "https://short-video.hnsiyao.cn/20241210/8aca569a9d544e819f542ce8aa7e7ce5.png",
+								"rewardDetail": "",
+								"number": 7,
+								"buttonTitle": "立即领取",
+								"buttonBgColor": "#EC6F48",
+								"buttonFontColor": "#fff",
+								"jumpType": 1,
+								"buttonUrl": "/pages/task/receiveMember",
+								"buttonUnderContent": "",
+								"buttonUnderUrl": "/pages/task/receiveMember",
+								"createTime": "2024-12-10 17:43:42",
+								"updateTime": "2024-12-25 09:52:09",
+								"sort": 5,
+								"shows": 1,
+								"discNumber": 0,
+								"disabled": false
+							},
+							{
+								"id": 17,
+								"title": "每月打卡奖励1",
+								"type": 2,
+								"detail": "当月签到满25天即可免费领取",
+								"rewardImg": "https://short-video.hnsiyao.cn/20241210/8aca569a9d544e819f542ce8aa7e7ce5.png",
+								"rewardDetail": "会员免费领",
+								"number": 25,
+								"buttonTitle": "立即领取",
+								"buttonBgColor": "#EC6F48",
+								"buttonFontColor": "#fff",
+								"jumpType": 1,
+								"buttonUrl": "/pages/task/receiveMember",
+								"buttonUnderContent": "",
+								"buttonUnderUrl": "/pages/task/receiveMember",
+								"createTime": "2024-12-10 17:43:42",
+								"updateTime": "2024-12-25 09:52:09",
+								"sort": 5,
+								"shows": 1,
+								"discNumber": 0,
+								"disabled": false
+							},
+							{
+								"id": 17,
+								"title": "每月打卡奖励2",
+								"type": 2,
+								"detail": "当月签到满25天即可免费领取",
+								"rewardImg": "https://short-video.hnsiyao.cn/20241210/8aca569a9d544e819f542ce8aa7e7ce5.png",
+								"rewardDetail": "",
+								"number": 25,
+								"buttonTitle": "立即领取",
+								"buttonBgColor": "#EC6F48",
+								"buttonFontColor": "#fff",
+								"jumpType": 1,
+								"buttonUrl": "/pages/task/receiveMember",
+								"buttonUnderContent": "",
+								"buttonUnderUrl": "/pages/task/receiveMember",
+								"createTime": "2024-12-10 17:43:42",
+								"updateTime": "2024-12-25 09:52:09",
+								"sort": 5,
+								"shows": 1,
+								"discNumber": 0,
+								"disabled": false
+							}
+						]
+
 					}
 					uni.stopPullDownRefresh();
 				})

pages/task/prizeList.vue

@@ -74,7 +74,7 @@
 			 * 获取列表
 			 */
 			getList() {
-				this.$Request.getT('app/discSpinning/selectDiscSpinning', {source:this.source}).then(res => {
+				this.$Request.getT('/app/discSpinning/selectDiscSpinning', {source:this.source}).then(res => {
 					if (res.code == 0 ) {
 						this.list = res.data.records
 					}

pages/task/receiveMember.vue

@@ -85,7 +85,7 @@
 			 * 获取列表
 			 */
 			getList() {
-				this.$Request.getT('app/discSpinning/selectDiscSpinning', {source:this.source}).then(res => {
+				this.$Request.getT('/app/discSpinning/selectDiscSpinning', {source:this.source}).then(res => {
 					if (res.code == 0 ) {
 						this.list = res.data.records
 					}

pages/video/video.nvue

@@ -213,7 +213,7 @@
 				this.courseDetailsId = courseDetailsId
 				if ( !this.playFlag ) {
 					this.playFlag = true
-					httpsRequest.getT('app/course/viewCourse', {
+					httpsRequest.getT('/app/course/viewCourse', {
 						courseId: this.courseId,
 						courseDetailsId: courseDetailsId,
 						type: 'start'
@@ -229,7 +229,7 @@
 				if (e.detail.currentTime > e.detail.duration*0.9) {
 					if ( this.playFlag) {
 						this.playFlag = false
-						httpsRequest.getT('app/course/viewCourse', {
+						httpsRequest.getT('/app/course/viewCourse', {
 							courseId: this.courseId,
 							courseDetailsId: this.courseDetailsId,
 							type: 'end'
@@ -392,7 +392,7 @@
 				let data = {
 					page: this.page,
 					limit: this.limit,
-					token: uni.getStorageSync('token') ? uni.getStorageSync('token') : '',
+					token: uni.getStorageSync('token') ? uni.getStorageSync('token') : '1',
 					randomNum: this.randomNum
 				};
 				httpsRequest.getT('/app/course/selectCourseDetailsList', data).then(res => {

pages/video/video.vue

@@ -528,13 +528,13 @@
 				if (e.detail.currentTime > e.detail.duration * 0.9) {
 					if (this.playFlag) {
 						this.playFlag = false
-						this.$Request.getT('app/course/viewCourse', {
-							courseId: this.courseId,
-							courseDetailsId: this.courseDetailsId,
-							type: 'end'
-						}).then(res => {
-							console.log('播放结束')
-						})
+						// this.$Request.getT('/app/course/viewCourse', {
+						// 	courseId: this.courseId,
+						// 	courseDetailsId: this.courseDetailsId,
+						// 	type: 'end'
+						// }).then(res => {
+						// 	console.log('播放结束')
+						// })
 					}
 				}
 			},
@@ -775,7 +775,7 @@
 					classify: 3,
 					type: 1
 				}
-				this.$Request.postJson('/app/courseCollect/insertCourseCollect', data).then(res => {})
+				// this.$Request.postJson('/app/courseCollect/insertCourseCollect', data).then(res => {})
 			},
 			//swiper上下切换事件
 			change(e) {
@@ -916,14 +916,14 @@
 			},
 			//在播放时候的回调
 			videoPlay(videoId) {
-				this.$Request.getT('app/course/viewCourse', {
-					courseId: this.courseId,
-					courseDetailsId: this.courseDetailsId,
-					type: 'start'
-				}).then(res => {
+				// this.$Request.getT('/app/course/viewCourse', {
+				// 	courseId: this.courseId,
+				// 	courseDetailsId: this.courseDetailsId,
+				// 	type: 'start'
+				// }).then(res => {
 					this.playFlag = true
-					console.log('播放开始')
-				})
+				// 	console.log('播放开始')
+				// })
 			},
 			//监听视频播放完成
 			ended() {

pages/video/videoIOS.nvue

@@ -209,7 +209,7 @@
 				this.courseDetailsId = courseDetailsId
 				if ( !this.playFlag ) {
 					this.playFlag = true
-					httpsRequest.getT('app/course/viewCourse', {
+					httpsRequest.getT('/app/course/viewCourse', {
 						courseId: this.courseId,
 						courseDetailsId: courseDetailsId,
 						type: 'start'
@@ -225,7 +225,7 @@
 				if (e.detail.currentTime > e.detail.duration*0.9) {
 					if ( this.playFlag) {
 						this.playFlag = false
-						httpsRequest.getT('app/course/viewCourse', {
+						httpsRequest.getT('/app/course/viewCourse', {
 							courseId: this.courseId,
 							courseDetailsId: this.courseDetailsId,
 							type: 'end'

store/cashe.js

@@ -0,0 +1,143 @@
+import {
+	data
+} from "../tuniao-ui/libs/mixin/mixin"
+
+
+class CACHE {
+	constructor(data) {
+		if (data === '' || data === null || data === undefined) {
+			throw (new Error('请传入缓存name值:index | {name:index}'))
+			return
+		}
+		if (typeof data === 'string') {
+			this._name = data
+			Object.defineProperty(this, '_name', {
+				writable: false
+			});
+		} else {
+			if (!data.name && !data._name) {
+				throw (new Error('请传入缓存name值:index | {name:index}'))
+				return
+			}
+			for (let i in data) {
+				this[i] = data[i]
+				const canWrite = i.slice(0, 1) !== '_'
+				Object.defineProperty(this, i, {
+					writable: canWrite,
+					writable: canWrite
+				});
+			}
+		}
+
+	}
+	isEmpty(){
+		return Object.keys(this).length>=2?false:true;
+	}
+	get(key) {
+		return this[key]
+	}
+	set(key, val) {
+		this[key] = val
+		uni.setStorageSync(this._name, this)
+	}
+	clear() {
+		Object.keys(this).map(v => {
+			if (v.slice(0, 1) !== '_') {
+				this[v] = null
+				delete this[v]
+			}
+		})
+		uni.removeStorageSync(this._name)
+	}
+}
+
+export const $cache_index = new CACHE({
+	_name: 'CACHE_index',
+	...uni.getStorageSync('CACHE_index')
+})
+
+export const $cache_video = new CACHE({
+	_name: 'CACHE_video',
+	...uni.getStorageSync('CACHE_video')
+})
+
+export const $cache_renwu = new CACHE({
+	_name: 'CACHE_renwu',
+	...uni.getStorageSync('CACHE_renwu')
+})
+
+export const $cache_chasingDrama = new CACHE({
+	_name: 'CACHE_chasingDrama',
+	...uni.getStorageSync('CACHE_chasingDrama')
+})
+
+export const $cache_user = new CACHE({
+	_name: 'CACHE_user',
+	...uni.getStorageSync('CACHE_user')
+})
+
+export const $cache_rule = new CACHE({
+	_name: 'CACHE_rule',
+	...uni.getStorageSync('CACHE_rule')
+})
+
+class CACHE_config extends CACHE {
+	constructor(data) {
+		super(data)
+		for (let i in data) {
+			if(i!=='_name'){
+				uni.setStorageSync(i,data[i])
+			}
+		}
+	}
+	set(key, val) {
+		this[key] = val
+		uni.setStorageSync(this._name, this)
+	}
+	set(key, val) {
+		this[key] = val
+		uni.setStorageSync(key, val)
+		uni.setStorageSync(this._name, this)
+	}
+	clear() {
+		Object.keys(this).map(v => {
+			if (v.slice(0, 1) !== '_') {
+				this[v] = null
+				delete this[v]
+			}
+		})
+		uni.removeStorageSync(this._name)
+	}
+}
+export const $cache_config = new CACHE_config({
+	_name: 'CACHE_config',
+	...uni.getStorageSync('CACHE_config')
+})
+
+const $cache={
+	index:$cache_index,
+	video:$cache_video,
+	renwu:$cache_renwu,
+	chasingDrama:$cache_chasingDrama,
+	user:$cache_user,
+	rule:$cache_rule,
+	config:$cache_config
+}
+export function cacheClearAll() {
+	for(let i in $cache){
+		$cache[i].clear()
+	}
+}
+export function cacheClear(arr){
+	if(typeof arr==='string'&&$cache[arr]){
+		$cache[arr].clear()
+	}
+	if(Array.isArray(arr)){
+		for(let i in arr){
+			const key=[arr[i]]
+			if($cache[key]){
+				$cache[key].clear()
+			}
+		}
+	}
+}

tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue

@@ -251,9 +251,9 @@
         const pages = getCurrentPages()
         if (pages && pages.length > 0) {
           const firstPage = pages[0]
-          if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index/index')) {
+          if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index/index2')) {
             uni.reLaunch({
-              url: '/pages/index/index'
+              url: '/pages/index/index2'
             })
           } else {
             uni.navigateBack({
@@ -262,7 +262,7 @@
           }
         } else {
           uni.reLaunch({
-            url: '/pages/index/index'
+            url: '/pages/index/index2'
           })
         }
       }