修改接口问题

修改接口报错
添加抽奖到首页
2024-12-31 17:05:26 +08:00 · 2024-12-31 16:14:19 +08:00 · 2024-12-31 15:41:09 +08:00 · 2024-12-31 14:47:39 +08:00 · 2024-12-31 13:39:17 +08:00 · 2024-12-31 13:28:27 +08:00
29 changed files with 366 additions and 245 deletions
--- a/App.vue
+++ b/App.vue
@@ -461,168 +461,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('取消');
+								// 			}
+								// 		}
+								// 	});
+								// }
 							}
 						}
 					});
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -57,7 +57,7 @@ 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); //帮助中心 详情
--- a/components/pop-choujiang.vue
+++ b/components/pop-choujiang.vue
@@ -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
 				}
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "诗谣短剧",
    "appid" : "__UNI__E0B05B1",
    "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.5.0",
+    "versionCode" : 150,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/me/HEWZtgyqRH/HEWZtgyqRH.vue
+++ b/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);
--- a/me/VjgyqAzklr/VjgyqAzklr.vue
+++ b/me/VjgyqAzklr/VjgyqAzklr.vue
@@ -551,7 +551,7 @@ 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;
 			}
--- a/me/choujiang/choujiang.vue
+++ b/me/choujiang/choujiang.vue
@@ -538,7 +538,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
 				}
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -497,7 +497,7 @@

 				this.getDataList(this.courseId, this.courseDetailsId);
 			}
-			httpsRequest.getT('app/course/getRedEnvelopeTips').then(res => {
+			httpsRequest.getT('/app/course/getRedEnvelopeTips').then(res => {
 				if (res.code == 0) {
 					this.getRedEnvelopeTips = res.data
 				}
@@ -559,7 +559,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 +571,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 +587,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'
--- a/me/detail/detail.vue
+++ b/me/detail/detail.vue
@@ -852,7 +852,7 @@ export default {
 			console.log('has this.courseId getDataList()');
 			this.getDataList(this.courseId, this.courseDetailsId);
 		}
-		this.$Request.getT('app/course/getRedEnvelopeTips').then((res) => {
+		this.$Request.getT('/app/course/getRedEnvelopeTips').then((res) => {
 			if (res.code == 0) {
 				this.getRedEnvelopeTips = res.data;
 			}
@@ -944,7 +944,7 @@ export default {
 		 * 获取金币比例
 		 */
 		getScale() {
-			this.$Request.getT('app/common/type/914', {}).then((res) => {
+			this.$Request.getT('/app/common/type/914', {}).then((res) => {
 				if (res.code == 0) {
 					this.scale = Number(res.data.value);
 				}
@@ -1241,7 +1241,7 @@ export default {
 				if (this.playFlag) {
 					this.playFlag = false;
 					this.$Request
-						.getT('app/course/viewCourse', {
+						.getT('/app/course/viewCourse', {
 							courseId: this.courseId,
 							courseDetailsId: this.courseDetailsId,
 							type: 'end'
@@ -2005,7 +2005,7 @@ export default {
 		//播放时的回掉
 		videoPlay(videoId) {
 			this.$Request
-				.getT('app/course/viewCourse', {
+				.getT('/app/course/viewCourse', {
 					courseId: this.courseId,
 					courseDetailsId: this.courseDetailsId,
 					type: 'start'
--- a/me/detail/detailIOS.nvue
+++ b/me/detail/detailIOS.nvue
@@ -154,11 +154,11 @@
 							{{countPrice*scale}}金币解锁整部视频
 						</text>
 					</view>
-<!-- 					<view v-if="isShowMoneyPay" class="pay-content-itemczg" @click="payVideo(2)">
+					<view v-if="isShowMoneyPay" class="pay-content-itemczg" @click="payVideo(2)">
 						<text class="pay-content-items">
 							{{countPrice}}元解锁单集视频
 						</text>
-					</view> -->
+					</view>
 					<!-- <view class="pay-content-itemczg" @click="goNav('/pages/me/vip/index')" v-if="isVips == '是'">
 						<image class="pay-content-item-iconczg" src="../../static/images/me/rmIcon.png" mode=""></image>
 						<text class="pay-content-items">
@@ -473,7 +473,7 @@
 				this.getDataList(this.courseId, this.courseDetailsId);

 			}
-			httpsRequest.getT('app/course/getRedEnvelopeTips').then(res => {
+			httpsRequest.getT('/app/course/getRedEnvelopeTips').then(res => {
 				if (res.code === 0) {
 					this.getRedEnvelopeTips = res.data
 				}
@@ -533,7 +533,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)
 					}
@@ -544,7 +544,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'
@@ -560,7 +560,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'
--- a/me/feedback/index.vue
+++ b/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
--- a/me/setting/index.vue
+++ b/me/setting/index.vue
@@ -20,10 +20,10 @@
 			<view>隐私协议</view>
 			<view><u-icon name="arrow-right"></u-icon></view>
 		</view>
-		<view class="flex justify-between padding bg-white solid-bottom" @click="goNav('/me/setting/logOff')">
+	<!-- 	<view class="flex justify-between padding bg-white solid-bottom" @click="goNav('/me/setting/logOff')">
 			<view>注销账号</view>
 			<view><u-icon name="arrow-right"></u-icon></view>
-		</view>
+		</view> -->
 		<view class="flex justify-between padding bg-white solid-bottom" @click="loginOut">
 			<view>退出登录</view>
 			<view><u-icon name="arrow-right"></u-icon></view>
--- a/me/setting/logOff.vue
+++ b/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: '提示',
--- a/me/yaoqing/redPack-mingxi.vue
+++ b/me/yaoqing/redPack-mingxi.vue
@@ -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];
--- a/me/yaoqing/ymf-yaoqing-tixian-jilu.vue
+++ b/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];
--- a/me/yaoqing/ymg-yaoqing-tixian.vue
+++ b/me/yaoqing/ymg-yaoqing-tixian.vue
@@ -196,7 +196,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.totalCount = res.data.totalCount;
          if (res.data.list.length > 0) {
            this.list = [...this.list, ...res.data.list];
@@ -241,7 +241,7 @@ export default {
      // 		});
      // 	}
      // })
-      this.$Request.getT('app/moneyDetails/selectUserMoney').then(res => {
+      this.$Request.getT('/app/moneyDetails/selectUserMoney').then(res => {
        if (res.code == 0) {
          this.mayMoney = res.data.amount || 0
        }
--- a/package-lock.json
+++ b/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
 }
--- a/package.json
+++ b/package.json
@@ -6,4 +6,4 @@
    "keywords": [
        "悬浮球,拖拽,浮标,拖动,renderjs"
    ]
-}
+}
--- a/pages/index/components/contentlist.vue
+++ b/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,50 @@
 			}
 		},
 		methods: {
+			pageScrollTo(time = 100) {
+				uni.pageScrollTo({
+					scrollTop: this.scrollTop - 50,
+					duration: time,
+					complete() {
+			
+					}
+				})
+			},
+	//查看视频
+			seVideo(item) {
+				console.log(item,'dubyg2')
+				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
+
+
+			},
+		
 		}
 	}
 </script>
--- a/pages/index/index2.vue
+++ b/pages/index/index2.vue
@@ -8,7 +8,8 @@
 				<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>
@@ -20,7 +21,7 @@
 					</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">
+						<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>
@@ -28,25 +29,27 @@
 			</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>
 	</view>
 </template>

@@ -60,18 +63,46 @@
 			return {
 				noticeList: [], //公告列表
 				list: [],
-				page: 1
+				page: 1,
+				active:1,
+				isShowMoneyPay: true,
 			}
 		},
 		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)
+				}
+			});
 		},
 		onReachBottom() {
 			++this.page
 			this.getrecomVideo()
 		},
 		methods: {
+			// 跳转公告链接
+			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 +110,8 @@
 			},
 			// 列表
 			//获取推荐视频
-			getrecomVideo(sort) {
+			getrecomVideo(sort,active=1) {
+				this.active=active
 				if (sort) {
 					this.page = 1
 				}
--- a/pages/login/register.vue
+++ b/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
+						// });
 					}
 				});
 			},
--- a/pages/login/registerApp.vue
+++ b/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
+						// });
 					}
 				});
 			},
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -8,7 +8,7 @@
 				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="">
@@ -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>
@@ -101,31 +100,32 @@
 		<!-- 钱包 -->

 		<view class="money" v-if="isWxIosPay == true" style="position: relative;">
-		<!-- 	<view
+			<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>
+			<view style="margin-top: 40rpx;">观看历史</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 style="border-radius:21rpx 21rpx 21rpx 21rpx" 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 +304,9 @@
 	import ttMsg from '../../components/ttMsg/ttMsg.vue'
 	import httpsRequest from '../../common/httpRequest.js'
 	import otherXuanfu from '@/components/other-xuafu.vue'
-
+	import {
+		returnIsSafari
+	} from '@/utils/app.js'

 	export default {
 		components: {
@@ -345,6 +347,7 @@
 				isWxIosPay: true, //微信下是否显示支付功能
 				userInfo: {},
 				isShowMoneyPay: true,
+				isiosExamine: false, // 我的金币审核
 			}
 		},
 		onLoad() {
@@ -425,6 +428,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 +487,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 = {
@@ -518,7 +558,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) {
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -40,7 +40,7 @@
 				</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;"
+				<view class="" v-for="item in signInList" :key="item.id" style="position: relative;"
 					:style="filterDate(item)=='已签到'?'color:#EFA765':'color:#999'">
 					{{filterDate(item)}}
 					<view
@@ -67,7 +67,7 @@
 		<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!='观看视频奖励'">
+				v-if="(item.buttonUrl=='/me/yaoqing/ymf-yaoqing-home'&&isShowMoneyPay)||item.buttonUrl!='/me/yaoqing/ymf-yaoqing-home'">
 				<view class="cell_left flex">
 					<view class="cell_title flex">
 						<view class="u-font-28 text-bold title"
--- a/pages/video/video.nvue
+++ b/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'
--- a/pages/video/video.vue
+++ b/pages/video/video.vue
@@ -528,7 +528,7 @@
 				if (e.detail.currentTime > e.detail.duration * 0.9) {
 					if (this.playFlag) {
 						this.playFlag = false
-						this.$Request.getT('app/course/viewCourse', {
+						this.$Request.getT('/app/course/viewCourse', {
 							courseId: this.courseId,
 							courseDetailsId: this.courseDetailsId,
 							type: 'end'
@@ -916,7 +916,7 @@
 			},
 			//在播放时候的回调
 			videoPlay(videoId) {
-				this.$Request.getT('app/course/viewCourse', {
+				this.$Request.getT('/app/course/viewCourse', {
 					courseId: this.courseId,
 					courseDetailsId: this.courseDetailsId,
 					type: 'start'
--- a/pages/video/videoIOS.nvue
+++ b/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'
--- a/static/dwbimgs/sosuo.png
+++ b/static/dwbimgs/sosuo.png
--- a/static/logo.png
+++ b/static/logo.png
Author	SHA1	Message	Date
duan	3b3e167089	修改接口问题	2024-12-31 17:05:26 +08:00
duan	8775b23f6a	修改接口报错	2024-12-31 16:14:19 +08:00
duan	75a0fa06bd	添加抽奖到首页	2024-12-31 15:41:09 +08:00
GYJ	adee64f460	bug fix	2024-12-31 14:47:39 +08:00
duan	2aa9070b0e	隐藏立即更新	2024-12-31 13:39:17 +08:00
duan	48f83a14cb	修改已存在的问题	2024-12-31 13:28:27 +08:00
duan	32d10cc470	修改logo和金币明细	2024-12-31 11:26:32 +08:00
duan	e6aaa97adb	添加搜索图标	2024-12-31 09:41:49 +08:00