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

2025-01-14 11:43:53 +08:00 · 2025-01-14 11:43:53 +08:00 · 62e75846a6
parent c39a4d9840 6e153586c9
commit 62e75846a6
16 changed files with 455 additions and 427 deletions
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@ -2,7 +2,7 @@
    "version" : "1.0",
    "configurations" : [
        {
-            "playground" : "custom",
+            "playground" : "standard",
            "type" : "uni-app:app-android"
        },
        {
--- a/App.vue
+++ b/App.vue
@ -1,123 +1,118 @@
 <script>
-import { ref } from 'vue';  
-export default {
-	onLaunch: function () {
-		console.log('App Launch');
-		// const systemInfo = uni.getSystemInfoSync();
-		// const isA = systemInfo.platform === 'android'
-		// if (isA) {
-		// 	uni.setStorageSync('isAI', true)
-		// } else {
-		// 	uni.setStorageSync('isAI', false)
-		// }
-		
-		
-		
-	},
-	onShow: function () {
-		
-		
-	},
-	onHide: function () {
-		console.log('App Hide');
-	}
-};
+	import {
+		ref
+	} from 'vue';
+	export default {
+		onLaunch: function() {
+			console.log('App Launch');
+			const sysInfo = uni.getSystemInfoSync();
+			let isIos = sysInfo.platform == 'ios'
+			uni.setStorageSync('isIos', isIos)
+		},
+		onShow: function() {
+		},
+		onHide: function() {
+			console.log('App Hide');
+		}
+	};
 </script>

 <style lang="scss">
-/*每个页面公共css */
-@import "uview-plus/index.scss";
-@import "@/commons/style/common.scss";
+	/*每个页面公共css */
+	@import "uview-plus/index.scss";
+	@import "@/commons/style/common.scss";

-ul,
-li {
-	list-style: none;
-}
+	ul,
+	li {
+		list-style: none;
+	}

-.show {
-	display: block;
-}
+	.show {
+		display: block;
+	}

-.hidden {
-	display: none !important;
-}
+	.hidden {
+		display: none !important;
+	}

-page,
-view,
-scroll-view,
-swiper,
-swiper-item,
-match-media,
-movable-area,
-movable-view,
-cover-view,
-cover-image,
-icon,
-text,
-rich-text,
-progress,
-button,
-checkbox-group,
-editor,
-form,
-input,
-label,
-picker,
-picker-view,
-radio-group,
-slider,
-switch,
-textarea,
-navigator,
-audio,
-camera,
-image,
-video,
-live-player,
-live-pusher,
-map,
-canvas,
-web-view {
-	box-sizing: border-box;
-	padding: 0;
-	margin: 0;
-	text-decoration: none;
-	outline: none;
-}
+	page,
+	view,
+	scroll-view,
+	swiper,
+	swiper-item,
+	match-media,
+	movable-area,
+	movable-view,
+	cover-view,
+	cover-image,
+	icon,
+	text,
+	rich-text,
+	progress,
+	button,
+	checkbox-group,
+	editor,
+	form,
+	input,
+	label,
+	picker,
+	picker-view,
+	radio-group,
+	slider,
+	switch,
+	textarea,
+	navigator,
+	audio,
+	camera,
+	image,
+	video,
+	live-player,
+	live-pusher,
+	map,
+	canvas,
+	web-view {
+		box-sizing: border-box;
+		padding: 0;
+		margin: 0;
+		text-decoration: none;
+		outline: none;
+	}

-.initStyle {
-	padding: 20rpx;
-	background-color: #2a2a2a;
-	height: 100vh;
-	color: #fff;
-}
+	.initStyle {
+		padding: 20rpx;
+		background-color: #2a2a2a;
+		height: 100vh;
+		color: #fff;
+	}

-.fc {
-	color: #f4f693;
-}
+	.fc {
+		color: #f4f693;
+	}

-.inputClass {
-	line-height: 80rpx;
-}
+	.inputClass {
+		line-height: 80rpx;
+	}

-.inputClass input {
-	background-color: #fff;
-	height: 80rpx;
-	padding: 10rpx;
-	color: #000;
-}
+	.inputClass input {
+		background-color: #fff;
+		height: 80rpx;
+		padding: 10rpx;
+		color: #000;
+	}

-.result {
-	position: absolute;
-	font-size: 100rpx;
-	left: 50%;
-	top: 800rpx;
-	transform: translateX(-50%);
-}
-.u-image {
-	background-color: transparent !important;
-}
-.u-status-bar {
-	height: var(--status-bar-height);
-}
-</style>
+	.result {
+		position: absolute;
+		font-size: 100rpx;
+		left: 50%;
+		top: 800rpx;
+		transform: translateX(-50%);
+	}
+
+	.u-image {
+		background-color: transparent !important;
+	}
+
+	.u-status-bar {
+		height: var(--status-bar-height);
+	}
+</style>
--- a/api/login/login.js
+++ b/api/login/login.js
@ -5,9 +5,9 @@ import http from '@/http/http.js'
 */
 export const login = (data) => {
 	return http.request({
-		url: '/Login/registerCode',
+		url: '/Login',
 		method: 'POST',
-		params: data
+		data: data
 	})
 }

@ -23,10 +23,11 @@ export const setSendMsg = (mobile,type) => {
 /**
 * 注册
 */
-export const registerCode = (params) => {
+export const register = (data) => {
 	return http.request({
-		url: '/Login/registerCode',
-		params: params
+		url: '/Login/register',
+		method: 'POST',
+		data: data
 	})
 }

@ -48,6 +49,8 @@ export const bind = (data) => {
 	return http.request({
 		url: '/Login/registerCode',
 		method: 'POST',
-		params: data
+		data: data
 	})
-}
+}
+
+
--- a/api/user/user.js
+++ b/api/user/user.js
@ -31,3 +31,14 @@ export const updateUsers = (data) => {
 		data: data,
 	})
 }
+
+/**
+ * 修改手机号
+ */
+export const updatePhone = (data) => {
+	return http.request({
+		url: '/user/updatePhone',
+		method: 'POST',
+		params: data
+	})
+}
--- a/http/http.js
+++ b/http/http.js
@ -107,13 +107,13 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 		.catch((res) => {

 			if (res.status == 404) {
-				infoBox.showErrorToast("接口404").then(() => {});
+				infoBox.showToast("接口404").then(() => {});
 				reject();
 				return;
 			}

 			if (res.code == 401) {
-				infoBox.showErrorToast(res.message || "请登录").then(() => {
+				infoBox.showToast(res.message || "请登录").then(() => {
 					uni.redirectTo({
 						url: "/pages/login/login",
 					});
@ -121,18 +121,18 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 				});
 			}
 			if (res.code != 0) {
-				infoBox.showErrorToast(res.msg).then(() => {});
+				infoBox.showToast(res.msg).then(() => {});
 				reject();
 			}
 			if (res.code == 500) {
-				infoBox.showErrorToast(res.msg || "服务器异常").then(() => {});
+				infoBox.showToast(res.msg || "服务器异常").then(() => {});
 				reject();
 			}
 			reqFinishFunc(); // 请求完毕的动作

 			// 如果没有提示错误， 那么此处提示 异常。
 			if (!isShowErrorToast) {
-				infoBox.showErrorToast(`请求网络异常`);
+				infoBox.showToast(`请求网络异常`);
 			}

 			return Promise.reject(res);
@ -233,7 +233,7 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
 			})
 			.catch((err) => {
 				uni.hideLoading();
-				infoBox.showErrorToast(`上传失败`);
+				infoBox.showToast(`上传失败`);
 			});
 	});
 }
--- a/main.js
+++ b/main.js
@ -17,7 +17,6 @@ const app = new Vue({
 })
 app.$mount()
 // #endif
-
 // #ifdef VUE3
 import {
 	createSSRApp
--- a/package-lock.json
+++ b/package-lock.json
@ -1,221 +1,189 @@
 {
-  "name": "new_app",
-  "lockfileVersion": 3,
  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "clipboard": "^2.0.11",
-        "dayjs": "^1.11.13",
-        "gm-crypto": "^0.1.8",
-        "jsbn": "^1.1.0",
-        "lodash": "^4.17.21",
-        "pre-commit": "^1.2.2",
-        "to-arraybuffer": "^1.0.1",
-        "uview-plus": "^3.3.61"
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "requires": {
+        "regenerator-runtime": "^0.14.0"
      }
    },
-    "node_modules/base64-js": {
+    "base64-js": {
      "version": "1.5.1",
      "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
    },
-    "node_modules/buffer": {
+    "buffer": {
      "version": "5.7.1",
      "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
+      "requires": {
        "base64-js": "^1.3.1",
        "ieee754": "^1.1.13"
      }
    },
-    "node_modules/buffer-from": {
+    "buffer-from": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
    },
-    "node_modules/clipboard": {
+    "clipboard": {
      "version": "2.0.11",
      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "dependencies": {
+      "requires": {
        "good-listener": "^1.2.2",
        "select": "^1.1.2",
        "tiny-emitter": "^2.0.0"
      }
    },
-    "node_modules/concat-stream": {
+    "concat-stream": {
      "version": "1.6.2",
      "resolved": "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz",
      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
+      "requires": {
        "buffer-from": "^1.0.0",
        "inherits": "^2.0.3",
        "readable-stream": "^2.2.2",
        "typedarray": "^0.0.6"
      }
    },
-    "node_modules/core-util-is": {
+    "copy-text-to-clipboard": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
+      "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q=="
+    },
+    "core-js": {
+      "version": "3.40.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.40.0.tgz",
+      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ=="
+    },
+    "core-util-is": {
      "version": "1.0.3",
      "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
    },
-    "node_modules/cross-spawn": {
+    "cross-spawn": {
      "version": "5.1.0",
      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz",
      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-      "dependencies": {
+      "requires": {
        "lru-cache": "^4.0.1",
        "shebang-command": "^1.2.0",
        "which": "^1.2.9"
      }
    },
-    "node_modules/dayjs": {
+    "dayjs": {
      "version": "1.11.13",
      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
    },
-    "node_modules/delegate": {
+    "delegate": {
      "version": "3.2.0",
      "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
    },
-    "node_modules/gm-crypto": {
+    "gm-crypto": {
      "version": "0.1.12",
      "resolved": "https://registry.npmmirror.com/gm-crypto/-/gm-crypto-0.1.12.tgz",
      "integrity": "sha512-ercd9ionBqxR+/FCXICr0eo+jzC8BvSK0j9L7/eB0uwbyjgeMPTdBNrcQTqIuRXOtOAKSGsTNvtLYFnIxNEoFg==",
-      "dependencies": {
+      "requires": {
        "buffer": "^5.7.0",
        "jsbn": "^1.1.0",
        "to-arraybuffer": "^1.0.1"
      }
    },
-    "node_modules/good-listener": {
+    "good-listener": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
      "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
-      "dependencies": {
+      "requires": {
        "delegate": "^3.1.2"
      }
    },
-    "node_modules/ieee754": {
+    "ieee754": {
      "version": "1.2.1",
      "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
    },
-    "node_modules/inherits": {
+    "inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
-    "node_modules/isarray": {
+    "isarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
    },
-    "node_modules/isexe": {
+    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
    },
-    "node_modules/jsbn": {
+    "jsbn": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
    },
-    "node_modules/lodash": {
+    "lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
-    "node_modules/lru-cache": {
+    "lru-cache": {
      "version": "4.1.5",
      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz",
      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dependencies": {
+      "requires": {
        "pseudomap": "^1.0.2",
        "yallist": "^2.1.2"
      }
    },
-    "node_modules/os-shim": {
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
+    "os-shim": {
      "version": "0.1.3",
      "resolved": "https://registry.npmmirror.com/os-shim/-/os-shim-0.1.3.tgz",
-      "integrity": "sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "integrity": "sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A=="
+    },
+    "node_modules/pinia-plugin-unistorage": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmmirror.com/pinia-plugin-unistorage/-/pinia-plugin-unistorage-0.1.2.tgz",
+      "integrity": "sha512-WXit2cGnm5rG6CDTcLSLehNWhyJS/Yq7WEeeXAapZbCnqoPJxlszqg7rT8S+OP47az0h5nlajGo+LuyMxUQ2uw==",
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/pre-commit": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/pre-commit/-/pre-commit-1.2.2.tgz",
      "integrity": "sha512-qokTiqxD6GjODy5ETAIgzsRgnBWWQHQH2ghy86PU7mIn/wuWeTwF3otyNQZxWBwVn8XNr8Tdzj/QfUXpH+gRZA==",
-      "hasInstallScript": true,
-      "dependencies": {
+      "requires": {
        "cross-spawn": "^5.0.1",
        "spawn-sync": "^1.0.15",
        "which": "1.2.x"
      }
    },
-    "node_modules/process-nextick-args": {
+    "process-nextick-args": {
      "version": "2.0.1",
      "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
    },
-    "node_modules/pseudomap": {
+    "pseudomap": {
      "version": "1.0.2",
      "resolved": "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz",
      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
    },
-    "node_modules/readable-stream": {
+    "readable-stream": {
      "version": "2.3.8",
      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dependencies": {
+      "requires": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
        "isarray": "~1.0.0",
@ -225,97 +193,100 @@
        "util-deprecate": "~1.0.1"
      }
    },
-    "node_modules/safe-buffer": {
+    "regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "safe-buffer": {
      "version": "5.1.2",
      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
-    "node_modules/select": {
+    "select": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
    },
-    "node_modules/shebang-command": {
+    "shebang-command": {
      "version": "1.2.0",
      "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz",
      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dependencies": {
+      "requires": {
        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
      }
    },
-    "node_modules/shebang-regex": {
+    "shebang-regex": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
    },
-    "node_modules/spawn-sync": {
+    "spawn-sync": {
      "version": "1.0.15",
      "resolved": "https://registry.npmmirror.com/spawn-sync/-/spawn-sync-1.0.15.tgz",
      "integrity": "sha512-9DWBgrgYZzNghseho0JOuh+5fg9u6QWhAWa51QC7+U5rCheZ/j1DrEZnyE0RBBRqZ9uEXGPgSSM0nky6burpVw==",
-      "hasInstallScript": true,
-      "dependencies": {
+      "requires": {
        "concat-stream": "^1.4.7",
        "os-shim": "^0.1.2"
      }
    },
-    "node_modules/string_decoder": {
+    "string_decoder": {
      "version": "1.1.1",
      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
+      "requires": {
        "safe-buffer": "~5.1.0"
      }
    },
-    "node_modules/tiny-emitter": {
+    "tiny-emitter": {
      "version": "2.1.0",
      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
    },
-    "node_modules/to-arraybuffer": {
+    "to-arraybuffer": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
    },
-    "node_modules/typedarray": {
+    "typedarray": {
      "version": "0.0.6",
      "resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
    },
-    "node_modules/util-deprecate": {
+    "util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
    },
-    "node_modules/uview-plus": {
+    "uview-plus": {
      "version": "3.3.61",
      "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.3.61.tgz",
      "integrity": "sha512-1IdZMYd7KuByW+bfBseEuSaKcYB6F4q8bGqAru1UDKIkRVTxkPlqvsTE8Q0+I0+jk6q1ov1KbGFDuyXxVzXcCg==",
-      "dependencies": {
+      "requires": {
        "clipboard": "^2.0.11",
        "dayjs": "^1.11.3"
-      },
-      "engines": {
-        "HBuilderX": "^3.1.0"
      }
    },
-    "node_modules/which": {
+    "vconsole": {
+      "version": "3.15.1",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.1.tgz",
+      "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==",
+      "requires": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
+    "which": {
      "version": "1.2.14",
      "resolved": "https://registry.npmmirror.com/which/-/which-1.2.14.tgz",
      "integrity": "sha512-16uPglFkRPzgiUXYMi1Jf8Z5EzN1iB4V0ZtMXcHZnwsBtQhhHeCqoWw7tsUY42hJGNDWtUsVLTjakIa5BgAxCw==",
-      "dependencies": {
+      "requires": {
        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
      }
    },
-    "node_modules/yallist": {
+    "yallist": {
      "version": "2.1.2",
      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -10,7 +10,7 @@
 			</view>
 		</view>

-		<template v-if="datas.noticeList.length > 0">
+		<template v-if="datas.isExamine == 0">
 			<view class="gongao">
 				<view class="gongaoicon">
 					公告
@ -42,18 +42,18 @@
 		</view>
 	</view>
 	<contentlist :list='datas.list'></contentlist>
-	<image v-if="datas.isExamine == 0" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')" src="@/static/index/red-pack-new.gif"
+	<image v-if="datas.isExamine == 0" @click="goMsg()" src="@/static/index/red-pack-new.gif"
 		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>

-	<u-modal :show="datas.version.show"  :confirm-text="datas.version.confirmText" :showCancelButton="datas.version.cancelText" @confirm='confirmUpdateVersion'
+	<up-modal :show="datas.version.show"  :confirm-text="datas.version.confirmText" :showCancelButton="datas.version.cancelText!=''" @confirm='confirmUpdateVersion'
 		:title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)" @cancel="datas.version.show = false">
 		<view class="" style="padding-top: 30rpx;text-align: left;">
 			<scroll-view scroll-y="true" style="max-height: 50vh;">
 				<rich-text style="color:#666" :nodes="datas.version.content"></rich-text>
 			</scroll-view>
 		</view>
-	</u-modal>
-	<up-modal :show="datas.ruleShow" v-if="datas.isExamine == 0" confirm-text="知道了" title="规则说明" :title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
+	</up-modal>
+	<up-modal :show="datas.ruleShow" v-if="datas.isExamine == 0&&!datas.version.show" confirm-text="知道了" title="规则说明" :title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
 		<view class="u-p-30 u-text-left">
 			<scroll-view scroll-y="true" style="max-height: 50vh;" >
 				<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="datas.rule_content"></rich-text>
@ -76,6 +76,10 @@ import contentlist from './components/contentlist.vue'
 import { selectNewApp } from '@/api/user/user.js';
 import config from '@/commons/config.js';
 import { linkTo } from '@/utils/app.js';
+import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 let datas = reactive({
 	noticeList: [], //公告列表

@ -91,7 +95,7 @@ let datas = reactive({
 	ruleList: [],
 	
 	//ios是否在审核 1是审核
-	isExamine: uni.getStorageSync('isExamine'),
+	isExamine: $common.isExamine,
 	
 	version: {
 		show: false,
@ -200,7 +204,6 @@ function ruleInit(){
 function ruleConfirm() {
 	datas.ruleShow = false
 	datas.ruleIndex++
-	console.log(datas.ruleIndex >= datas.ruleList.length)
 	if( datas.ruleIndex >= datas.ruleList.length) {
 		datas.ruleIndex = 0
 		return
@ -213,20 +216,9 @@ function ruleConfirm() {
 	
 // 跳转公告链接
 function goMsg(url) {
-	// if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {
 	uni.navigateTo({
 		url: '/pages/me/prizeDraw'
 	});
-	// } else {
-	//#ifndef H5
-	// uni.navigateTo({
-	// 	url: '/pages/index/webView?url=' + url
-	// });
-	//#endif
-	//#ifdef H5
-	// window.location.href = url;
-	//#endif	
-	// }
 }

 // 搜索跳转
--- a/pages/index/search/index.vue
+++ b/pages/index/search/index.vue
@ -28,139 +28,147 @@
 		</view>

 	</view>
-
+	<view style="display: flex;flex-direction: column;align-items: center;" v-if="!datas.isSearch&&datas.keywordList.length==0">
+		<image src="/static/index/none.png" style="width: 341rpx;height: 341rpx;" mode=""></image>
+		<text style=";">暂无数据</text>
+	</view>
 </template>

 <script setup>
-import { selectCourseTitles } from '@/api/index/index.js'
-import videoList from './videoList.vue'
-import {
-	reactive
-} from 'vue';
-import {
-	onShow, onReachBottom
-} from '@dcloudio/uni-app'
-let datas = reactive({
-	hotKeywordList: [], //热搜
-	keywordList: [],// 搜索列表
-	keyword: "",// 搜索关键字
-	page: 1,
-	isSearch: true,
-})
-onShow(() => {
-	getList()
-})
-
-function posterSuccess() {
-
-}
-function getList() {
-	if (uni.getStorageSync('moreSearch')) {
-		datas.hotKeywordList = (uni.getStorageSync('moreSearch')).split(',')
-	} else {
-		datas.hotKeywordList = []
-	}
-}
-onReachBottom(() => {
-	++datas.page
-	doSearch()
-})
-function doSearchs(keyWord) {
-	datas.keyword = keyWord
-	doSearch()
-}
-// 搜索
-async function doSearch() {
-	datas.isSearch = false
-	let res = await selectCourseTitles({
-		title: datas.keyword,
-		limit: 20,
-		page: datas.page,
+	import {
+		selectCourseTitles
+	} from '@/api/index/index.js'
+	import videoList from './videoList.vue'
+	import {
+		reactive
+	} from 'vue';
+	import {
+		onShow,
+		onReachBottom
+	} from '@dcloudio/uni-app'
+	let datas = reactive({
+		hotKeywordList: [], //热搜
+		keywordList: [], // 搜索列表
+		keyword: "", // 搜索关键字
+		page: 1,
+		isSearch: true,
 	})
-	if (datas.page == 1) {
-		datas.keywordList = res.list
-	} else {
-		datas.keywordList = [...datas.keywordList, ...res.list]
+	onShow(() => {
+		getList()
+	})
+
+	function posterSuccess() {
+
 	}

-}
+	function getList() {
+		if (uni.getStorageSync('moreSearch')) {
+			datas.hotKeywordList = (uni.getStorageSync('moreSearch')).split(',')
+		} else {
+			datas.hotKeywordList = []
+		}
+	}
+	onReachBottom(() => {
+		++datas.page
+		doSearch()
+	})

-// 取消返回首页
-function goBack() {
-	uni.navigateBack()
-}
+	function doSearchs(keyWord) {
+		datas.keyword = keyWord
+		doSearch()
+	}
+	// 搜索
+	async function doSearch() {
+		datas.isSearch = false
+		let res = await selectCourseTitles({
+			title: datas.keyword,
+			limit: 20,
+			page: datas.page,
+		})
+		if (datas.page == 1) {
+			datas.keywordList = res.list
+		} else {
+			datas.keywordList = [...datas.keywordList, ...res.list]
+		}
+
+	}
+
+	// 取消返回首页
+	function goBack() {
+		uni.navigateBack()
+	}
 </script>

 <style scoped lang="scss">
-.search-box {
-	width: 100%;
-	/* background-color: rgb(242, 242, 242); */
-	padding: 15upx 2.5%;
-	display: flex;
-	justify-content: space-between;
-	// position: sticky;
-	// top: 0;
-	background-color: #ffffff;
-}
-
-.search-keyword {
-	width: 100%;
-}
-
-.keyword-block {
-	padding: 10rpx 0;
-}
-
-.keyword {
-	width: 94%;
-	padding: 3px 3%;
-	display: flex;
-	flex-flow: wrap;
-	justify-content: flex-start;
-
-	>view {
+	.search-box {
+		width: 100%;
+		/* background-color: rgb(242, 242, 242); */
+		padding: 15upx 2.5%;
 		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 60upx;
-		padding: 0 20upx;
-		margin: 10upx 20upx 10upx 0;
-		height: 60upx;
-		font-size: 28upx;
-		// background-color: rgb(242, 242, 242);
-		background: #E6EBFF;
-		color: #6b6b6b;
-	}
-}
-
-.keyword-block .keyword-list-header {
-	width: 94%;
-	padding: 10rpx 3%;
-	font-size: 27rpx;
-	color: #333;
-	display: flex;
-	justify-content: space-between;
-}
-
-.keyword-block .keyword-list-header image {
-	width: 40rpx;
-	height: 40rpx;
-}
-
-.search-list {
-	width: 100%;
-	margin-top: 20rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-
-	.search-list-box {
-		display: flex;
-		align-items: center;
 		justify-content: space-between;
-		flex-wrap: wrap;
-		width: 686rpx;
-		height: 100%;
+		// position: sticky;
+		// top: 0;
+		background-color: #ffffff;
+	}
+
+	.search-keyword {
+		width: 100%;
+	}
+
+	.keyword-block {
+		padding: 10rpx 0;
+	}
+
+	.keyword {
+		width: 94%;
+		padding: 3px 3%;
+		display: flex;
+		flex-flow: wrap;
+		justify-content: flex-start;
+
+		>view {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 60upx;
+			padding: 0 20upx;
+			margin: 10upx 20upx 10upx 0;
+			height: 60upx;
+			font-size: 28upx;
+			// background-color: rgb(242, 242, 242);
+			background: #E6EBFF;
+			color: #6b6b6b;
+		}
+	}
+
+	.keyword-block .keyword-list-header {
+		width: 94%;
+		padding: 10rpx 3%;
+		font-size: 27rpx;
+		color: #333;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.keyword-block .keyword-list-header image {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.search-list {
+		width: 100%;
+		margin-top: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.search-list-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			width: 686rpx;
+			height: 100%;
+		}
 	}
-}
 </style>
--- a/pages/login/bind.vue
+++ b/pages/login/bind.vue
@ -20,6 +20,7 @@
 	import { reactive } from 'vue';
 	import { onLoad} from '@dcloudio/uni-app'
 	import { setSendMsg, bind} from '@/api/login/login.js';
+	import { updatePhone } from '@/api/user/user.js';
 	
 	let data = reactive({
 		mobile: '',
@ -100,7 +101,7 @@
 		} else {
 			uni.showLoading({ title: '正在绑定中...' })
 			
-			let res = await bind({
+			let res = await updatePhone({
 					phone: mobile,
 					// wxId: openId,
 					// userId: userId,
--- a/pages/login/forgetPwd.vue
+++ b/pages/login/forgetPwd.vue
@ -96,9 +96,9 @@
 			data.sending = false;
 			data.sendTime = '获取验证码';
 		} else {
-			data.count = count - 1;
+			data.count = data.count - 1;
 			data.sending = true;
-			data.sendTime = count - 1 + '秒后重新获取';
+			data.sendTime = data.count - 1 + '秒后重新获取';
 			setTimeout(countDown.bind(this), 1000);
 		}
 	}
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@ -48,7 +48,7 @@
 <script setup>
 	import { reactive } from 'vue';
 	import { onLoad} from '@dcloudio/uni-app'
-	import {setSendMsg,registerCode} from '@/api/login/login.js';
+	import {setSendMsg,register} from '@/api/login/login.js';
 	import {commonType} from '@/api/init.js';
 	import { linkTo } from '@/utils/app.js';
 	
@ -122,14 +122,15 @@
 	 * 验证码倒计时
 	 */
 	function countDown() {
+		console.log(data.count)
 		if (data.count === 1) {
 			data.count = 60;
 			data.sending = false;
 			data.sendTime = '获取验证码';
 		} else {
-			data.count = count - 1;
+			data.count = data.count - 1;
 			data.sending = true;
-			data.sendTime = count - 1 + '秒后重新获取';
+			data.sendTime = data.count - 1 + '秒后重新获取';
 			setTimeout(countDown.bind(this), 1000);
 		}
 	}
@ -235,7 +236,7 @@
 		// #endif
 		
 		
-		let res = await registerCode({
+		let res = await register({
 			password: password,
 			phone: mobile,
 			msg: code,
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@ -31,7 +31,7 @@
 						<view class="title">我的追剧</view>
 						<view class="num">{{ likeData.collectCount }}</view>
 					</navigator>
-					<view class="item" @click="linkTo('/pages/me/withdraw/index')">
+					<view class="item" v-if="$common.isExamine==0" @click="linkTo('/pages/me/withdraw/index')">
 						<view class="title">我的红包</view>
 						<view class="num">{{ amount || 0 }}</view>
 					</view>
@ -114,7 +114,10 @@ import { ref, reactive } from 'vue';
 import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app';
 import { selectByUserId, collectVideoSummary, selectUserMoney } from '@/api/me/me.js';
 import { linkTo } from '@/utils/app.js';
-
+import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 const userInfo = ref({});

 // 获取最近的三条观看历史
--- a/pages/me/prizeDraw.vue
+++ b/pages/me/prizeDraw.vue
@ -243,6 +243,7 @@ export default {
 		// 大哥，这里只是模拟，别告诉我你不会对接自己的接口
 		async requestApiGetPrizeList() {
 			const res = await selectDiscSpinning({ source: this.source });
+			console.log(res,'debug')
 			return {
 				ok: true,
 				data: res.records.map((v) => {
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@ -60,15 +60,21 @@
 			</view>
 		</view>
 		<!-- 激励视频广告 -->
-		<!-- <ad-rewarded-video v-if="adRewardedVideo" ref="adRewardedVideo" adpid="1531580352" :loadnext="true"
-			v-slot:default="{ loading, error }" :url-callback="datas.urlCallback" @load="onadload" @close="onadclose"
-			@error="onaderror">
-			<view class="ad-error" v-if="error">{{ error }}</view>
-		</ad-rewarded-video> -->
+		<view style="width: 0;height: 0;overflow: hidden;">
+			<!-- 激励视频广告 -->
+			<ad-rewarded-video  v-if="datas.adRewardedShow" ref="adRewarded" adpid="1507000689" :loadnext="true" 
+				:url-callback="datas.urlCallback" @load="onadload" @close="onadclose" @error="onaderror">
+			</ad-rewarded-video>
+		</view>
 	</view>
 </template>

 <script setup>
+	import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
+	import { selectUserMoney, selectPayDetails, canCash, state, withdraw } from '@/api/me/withdraw.js';
 	import {
 		reactive,
 		getCurrentInstance,
@ -76,6 +82,7 @@
 	} from "vue";
 	import {
 		onShow,
+		onReady,
 		onReachBottom
 	} from '@dcloudio/uni-app'
 	import {
@ -89,37 +96,76 @@
 		signInList: [],
 		list: [],
 		// ios审核
-		isExamine: uni.getStorageSync('isExamine'),
+		isExamine: $common.isExamine,
 		urlCallback: {},
-		adRewardedVideo: true,
+		adRewardedShow: true,
+		adRewardedVideoloadNum: 0,

 	})
+	const adRewarded = ref(null);
 	onShow(() => {
 		getTaskdata()
 		getsignIn()
-
+		const sysInfo = uni.getSystemInfoSync();
+		let isIos = sysInfo.platform == 'ios'
+		console.log("is ios ", isIos);
 		// nextTick(() => {
 		// currentInstance.ctx.$refs.adRewardedVideo.load();
 		// })
 	})
-	//广告播放成功回调
+	onReady(() => {
+		nextTick(()=>{
+			data.adRewardedVideoloadNum = 0
+			adRewarded.value.load();
+		})
+		getCanCash()
+	})
+	/**
+	 * 获取看广告状态
+	 */
+	async function getCanCash() {
+		canCash().then(res => {
+			data.isWithdraw = !res;
+		})
+		
+	}
+	
+	/**
+	 * 广告加载失败回调
+	 * @param {Object} e
+	 */
+	function onaderror(e) {
+		if ( data.adRewardedVideoloadNum >=3 ) {
+			data.adRewardedShow = false;
+			return
+		} 
+		data.adRewardedVideoloadNum++
+		setTimeout(() => {
+			adRewarded.value.load();
+		}, 1000); // 10
+		console.log("广告加载失败")
+	}
+	
+	/**
+	 * 广告数据加载成功回调
+	 * @param {Object} e
+	 */
+	function onadload(e) {
+		data.adRewardedShow = true;
+		console.log('广告数据加载成功');
+	}
+	/**
+	 * 广告播放成功回调
+	 * @param {Object} e
+	 */
 	async function 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'
-					})
-				}
+			let res = await state({
+				extraKey: data.urlCallback.extra
 			})
+			getCanCash()
 		} else {
 			// 播放中途退出
 		}
@ -165,7 +211,7 @@
 						userId: uni.getStorageSync('userId'),
 						extra: uni.getStorageSync('userId') + "" + new Date().getTime(),
 					}
-					currentInstance.ctx.$refs.adRewardedVideo.show();
+					adRewarded.value.show();
 				} else {
 					uni.switchTab({
 						url: "/pages/index/index"
@ -198,9 +244,6 @@

 	}

-	function onadload(e) {
-		datas.adRewardedVideo = true;
-	}
 	// 获得签到
 	async function getsignIn() {
 		let res = await getUserSignData()
--- a/static/index/none.png
+++ b/static/index/none.png