test

Merge branch 'ymf_php' of e.coding.net:g-cphe0354/duanju/new_app into gyq_php
优化提现界面的小数展示
2025-08-25 15:51:40 +08:00 · 2025-08-20 16:23:55 +08:00 · 2025-08-20 16:23:23 +08:00 · 2025-08-11 09:31:48 +08:00 · 2025-08-08 09:27:29 +08:00 · 2025-08-05 21:42:19 +08:00
13 changed files with 1399 additions and 1548 deletions
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,7 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch ');
+			console.log('App Launch 11111');
 			uni.setStorageSync('adRewardedNum',0)

 		},
--- a/api/init.js
+++ b/api/init.js
@@ -5,6 +5,9 @@ export async function init() {
    //热搜词
    http.request({
        url: 'common/type/249',
+		data: {
+			type: 249
+		}
    }).then(res => {
        if (res.code == 0) {
            uni.setStorageSync('moreSearch', res.data.value)
@@ -18,6 +21,9 @@ export async function init() {
 export const commonType = (num) => {
 	return http.request({
 		url: `/common/type/${num}`,
+		data:{
+			type: num
+		}
 	})
 }

--- a/api/login/login.js
+++ b/api/login/login.js
@@ -14,9 +14,13 @@ export const login = (data) => {
 /**
 * 发送验证码
 */
-export const setSendMsg = (mobile,type) => {
+export const setSendMsg = (mobile, type) => {
 	return http.request({
-		url: '/Login/sendMsg/' + mobile + '/'+type
+		url: '/Login/sendMsg/' + mobile + '/' + type,
+		data: {
+			phone: mobile,
+			event: type
+		}
 	})
 }

@@ -72,4 +76,4 @@ export const $bindStatus = (data) => {
 		method: 'GET',
 		data: data
 	})
-}
+}
--- a/api/me/me.js
+++ b/api/me/me.js
@@ -17,7 +17,10 @@ export const selectByUserId = (data) => {
 export const commonType = (type) => {
 	return http.request({
 		url: `/common/type/${type}`,
-		method: 'GET'
+		method: 'GET',
+		data: {
+			type: type
+		}
 	})
 }

--- a/api/user/user.js
+++ b/api/user/user.js
@@ -8,15 +8,16 @@ export const selectNewApp = (data) => {
 	return http.request({
 		url: '/user/selectNewApp',
 		data: data,
+		method: 'POST',
 	})
 }
-
 /**
 * 获取用户信息
 */
 export const selectUserById = (data) => {
 	return http.request({
 		url: '/user/selectUserById',
+		method: 'get',
 		data: data
 	})
 }
--- a/api/video/index.js
+++ b/api/video/index.js
@@ -56,7 +56,10 @@ export function insertHistory(data) {
 export function getJinbiBili(data) {
 	return http.request({
 		url: 'common/type/914',
-		data
+		data: {
+			...data,
+			type: 914
+		}
 	})
 }

@@ -97,14 +100,16 @@ export function payOrder(data) {
 	// #endif
 	return http.request({
 		url: 'wuyou/payOrder/' + data.orderId + '?payType=' + payType,
-		method: 'GET'
+		method: 'GET',
+		data:data
 	})
 }
 //获取订单支付状态
 export function getOrderInfo(data) {
 	return http.request({
 		url: 'wuyou/queryOrder/' + data.orderId,
-		method: 'GET'
+		method: 'GET',
+		data:data
 	})
 }
 //金币解锁
@@ -140,11 +145,11 @@ export function playStatus(data) {
 }

 // 获取支付次数提示
-export function getPayTips(data){
+export function getPayTips(data) {
 	return http.request({
 		url: 'course/getRedEnvelopeTips',
 		method: 'GET',
 		data
 	})
-	
-}
+
+}
--- a/commons/config.js
+++ b/commons/config.js
@@ -1,19 +1,31 @@
 //打包时修改env的值即可
-const env = 'production' //test,production,local
+const env = 'php_production' //test,production,local

 export const encryptKey = '1234567890123456' // http数据加解密的key 

-export const apiUrl = '/czg/'
+export const apiUrl = '/czg/app/'
+// export const apiUrl = '/api/'
 export const h5Config = {
 	production: 'https://web.hnsiyao.cn',
 	test: 'https://web-api.hnsiyao.cn',
-	local: 'http://192.168.1.21:8100'
+	// local: 'http://192.168.1.21:8100',
+	local: 'http://192.168.1.43:1333',
+	zhangsong_local:'http://192.168.1.54:1024',
+	hong:'http://192.168.1.31:8080',
+	php_production:'https://ph.hnsiyao.cn',
+	php_test:'https://playlet.test.sxczgkj.com',
+	
 }

 export const AppConfig = {
 	production: 'https://dj-api.hnsiyao.cn',
 	test: 'https://web-api.hnsiyao.cn',
-	local: 'http://192.168.1.41:8100'
+	// local: 'http://192.168.1.21:8100',
+	local: 'http://192.168.1.43:1333',
+	zhangsong_local:'http://192.168.1.54:1024',
+	hong:'http://192.168.1.31:8080',
+	php_production:'https://ph.hnsiyao.cn',
+	php_test:'https://playlet.test.sxczgkj.com'
 }

 export function returnShareUrl() {
@@ -23,6 +35,9 @@ export function returnShareUrl() {
 	if (env === 'production') {
 		return 'https://dj-h5.hnsiyao.cn'
 	}
+	if (env === 'php_production') {
+		return 'https://ph-h5.hnsiyao.cn'
+	}
 	if (env === 'local') {
 		return AppConfig[env]
 	}
--- a/http/http.js
+++ b/http/http.js
@@ -9,7 +9,8 @@ import {
 import config from "@/commons/config.js";

 // 测试服
-let baseUrl = config.baseApiUrl + "app";
+// let baseUrl = config.baseApiUrl + "app";
+let baseUrl = config.baseApiUrl;
 const loadingShowTime = 200;

 function getHeader(data) {
@@ -22,7 +23,7 @@ function getHeader(data) {
 }

 // 通用处理逻辑
-function commonsProcess(showLoading, httpReqCallback, isreturm) {
+function commonsProcess(showLoading, httpReqCallback, isreturm, url) {
 	// 判断是否请求完成（用作 是否loading ）
 	// 包括： 'ing', 'ingLoading', 'finish'
 	let reqState = "ing";
@@ -49,7 +50,9 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {

 	return httpReqCallback()
 		.then((httpData) => {
-
+			// console.log(url);
+			// console.log('httpData');
+			// console.log(httpData);
 			reqFinishFunc(); // 请求完毕的动作
 			// 从http响应数据中解构响应数据 [ 响应码、 bodyData ]
 			let {
@@ -75,7 +78,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 			// http响应码不正确
 			if (statusCode != 200 && statusCode != 204 && statusCode != 201) {
 				isShowErrorToast = true;
-				infoBox.showToast(data.message || "服务器异常");
+				infoBox.showToast(data.message || data.msg || "服务器异常");
 				return Promise.reject(bodyData); // 跳转到catch函数
 			}
 			if (bodyData.code == 401) {
@@ -117,7 +120,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {


 			if (bodyData.code != 0) {
-				infoBox.showToast(data.message);
+				infoBox.showToast(data.message || data.msg);
 				return;
 			}

@@ -134,7 +137,8 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 			return Promise.resolve(result);
 		})
 		.catch((res) => {
-
+			console.log('catch res');
+			console.log(res);
 			if (res.status == 404) {
 				infoBox.showToast("接口404").then(() => {});
 				reject();
@@ -142,17 +146,18 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
 			}

 			if (res.code == 401) {
+				uni.clearStorageSync()
 				uni.redirectTo({
 					url: "/pages/login/login",
 				});
 				reject();
 			}
 			if (res.code != 0 && res.code != 401) {
-				infoBox.showToast(res.msg).then(() => {});
+				infoBox.showToast(res.message || res.msg).then(() => {});
 				reject();
 			}
 			if (res.code == 500) {
-				infoBox.showToast(res.msg || "服务器异常").then(() => {});
+				infoBox.showToast(res.message || res.msg || "服务器异常").then(() => {});
 				reject();
 			}
 			reqFinishFunc(); // 请求完毕的动作
@@ -207,8 +212,10 @@ function request(args) {
 		url = url + '?' + (result.slice(0, result.length - 1))
 		params = null
 	}
+
 	let headerObject = {}
 	return commonsProcess(showLoading, () => {
+
 		return uni.request(
 			Object.assign({
 				url: slash(baseUrl, url),
@@ -218,7 +225,7 @@ function request(args) {
 			}, extParams)

 		)
-	}, isreturm)
+	}, isreturm, url)
 }
 // 处理/
 function slash(baseUrl, url) {
--- a/manifest.json
+++ b/manifest.json
@@ -150,7 +150,8 @@
        "title" : "斯耀短剧",
        "template" : "template.html",
        "router" : {
-            "mode" : "history"
+            "mode" : "history",
+            "base" : ""
        }
    }
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,295 +1,110 @@
 {
+  "name": "抽奖转盘，非固定图片，可自定义传入奖项列表，v2 v3兼容",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
  "requires": true,
-  "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"
+  "packages": {
+    "": {
+      "name": "抽奖转盘，非固定图片，可自定义传入奖项列表，v2 v3兼容",
+      "version": "1.0.0",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "uview-plus": "^3.3.62"
+      },
+      "devDependencies": {
+        "pinia-plugin-unistorage": "^0.1.2"
      }
    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "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=="
-    },
-    "clipboard": {
+    "node_modules/clipboard": {
      "version": "2.0.11",
      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "requires": {
+      "dependencies": {
        "good-listener": "^1.2.2",
        "select": "^1.1.2",
        "tiny-emitter": "^2.0.0"
      }
    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "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=="
-    },
-    "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-      "requires": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "dayjs": {
+    "node_modules/dayjs": {
      "version": "1.11.13",
      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
    },
-    "delegate": {
+    "node_modules/delegate": {
      "version": "3.2.0",
      "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
    },
-    "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==",
-      "requires": {
-        "buffer": "^5.7.0",
-        "jsbn": "^1.1.0",
-        "to-arraybuffer": "^1.0.1"
-      }
-    },
-    "good-listener": {
+    "node_modules/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==",
-      "requires": {
+      "dependencies": {
        "delegate": "^3.1.2"
      }
    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
-    },
-    "lodash": {
+    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
-    "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==",
-      "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+    "node_modules/node_modules/pinia-plugin-unistorage": {
+      "version": "0.1.2",
+      "integrity": "sha512-WXit2cGnm5rG6CDTcLSLehNWhyJS/Yq7WEeeXAapZbCnqoPJxlszqg7rT8S+OP47az0h5nlajGo+LuyMxUQ2uw==",
+      "extraneous": true,
+      "devDependencies": {
+        "@types/node": "^18.19.8",
+        "bumpp": "^9.3.0",
+        "pinia-plugin-persistedstate": "^3.2.1",
+        "unbuild": "^2.0.0"
      }
    },
-    "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=="
+    "node_modules/node_modules/pre-commit": {
+      "version": "1.2.2",
+      "integrity": "sha512-qokTiqxD6GjODy5ETAIgzsRgnBWWQHQH2ghy86PU7mIn/wuWeTwF3otyNQZxWBwVn8XNr8Tdzj/QfUXpH+gRZA==",
+      "extraneous": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "cross-spawn": "^5.0.1",
+        "spawn-sync": "^1.0.15",
+        "which": "1.2.x"
+      },
+      "devDependencies": {
+        "assume": "1.4.x",
+        "istanbul": "0.4.x",
+        "mocha": "~3.2.0",
+        "pre-commit": "git://github.com/observing/pre-commit.git"
+      }
    },
    "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"
+      "dev": true
    },
-    "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==",
-      "requires": {
-        "cross-spawn": "^5.0.1",
-        "spawn-sync": "^1.0.15",
-        "which": "1.2.x"
-      }
-    },
-    "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=="
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
-    },
-    "readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "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=="
-    },
-    "select": {
+    "node_modules/select": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
    },
-    "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==",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
-    },
-    "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==",
-      "requires": {
-        "concat-stream": "^1.4.7",
-        "os-shim": "^0.1.2"
-      }
-    },
-    "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==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "tiny-emitter": {
+    "node_modules/tiny-emitter": {
      "version": "2.1.0",
      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "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==",
-      "requires": {
+    "node_modules/uview-plus": {
+      "version": "3.5.10",
+      "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.5.10.tgz",
+      "integrity": "sha512-sn92VKgfFqoBEpWrIULIZbd2z5Rf9iM8U/fKSCVVrU2kCFqcGp68IPr+gttQ7I+KZUVwdGLFECplQQJWytEZYA==",
+      "dependencies": {
        "clipboard": "^2.0.11",
        "dayjs": "^1.11.3"
+      },
+      "engines": {
+        "HBuilderX": "^3.1.0",
+        "uni-app": "^4.66",
+        "uni-app-x": ""
      }
-    },
-    "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==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "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/login/register.vue
+++ b/pages/login/register.vue
@@ -1,404 +1,407 @@
 <template>
 	<view class="container">
-		<view class="bg" >
-			<image  src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
+		<view class="bg">
+			<image src="../../static/default/i_bg.png" style="width: 100%; height: 100%" mode="aspectFill"></image>
 		</view>
-		<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
-			<view class="nav" style="width: 100%;height: 96rpx;"></view>
+		<view class="wrapper u-relative" style="padding-top: 48rpx; box-sizing: border-box">
+			<view class="nav" style="width: 100%; height: 96rpx"></view>
 			<view class="input-content">
-				<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">注册</view>
+				<view style="font-size: 58rpx; font-weight: bold; color: #333; margin-bottom: 48rpx">注册</view>

 				<view class="cu-form-group">
 					<view class="title">手机号</view>
-					<view class="input" style="padding-left: 20rpx;">
-						<input  class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
-							@input="inputChange" />
+					<view class="input" style="padding-left: 20rpx">
+						<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile" @input="inputChange" />
 					</view>
-					
 				</view>
 				<view class="cu-form-group">
 					<text class="title">验证码</text>
-					<view class="input flex" style="padding-left: 20rpx;padding-right: 20rpx;">
-						<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code"
-						@input="inputChange" @confirm="toRegister" />
+					<view class="input flex" style="padding-left: 20rpx; padding-right: 20rpx">
+						<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange" @confirm="toRegister" />
 						<button class="send-msg" @click="sendMsg" :disabled="data.sending">{{ data.sendTime }}</button>
 					</view>
 				</view>

 				<view class="cu-form-group">
 					<text class="title">设置密码</text>
-					<view class="input" style="padding-left: 20rpx;">
-						<input class="input" type="password" :value="data.password" placeholder="请设置新密码" placeholder-class="input-empty"
-							maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toRegister" />
+					<view class="input" style="padding-left: 20rpx">
+						<input
+							class="input"
+							type="password"
+							:value="data.password"
+							placeholder="请设置新密码"
+							placeholder-class="input-empty"
+							maxlength="20"
+							minlength="6"
+							data-key="password"
+							@input="inputChange"
+							@confirm="toRegister"
+						/>
 					</view>
-					
 				</view>
 				<button class="confirm-btn" @click="toRegister">注册</button>
 				<button class="confirm-btn" @click="toLogin">登录</button>
 			</view>
 			<view class="footerView">
 				<u-checkbox-group>
-					<u-checkbox v-model="data.checked" label-size='24upx' shape="circle" @change="radioChange"></u-checkbox>
+					<u-checkbox v-model="data.checked" label-size="24upx" shape="circle" @change="radioChange"></u-checkbox>
 				</u-checkbox-group>
 				<view>注册即同意</view>
 				<!-- 协议地址 -->
-				<view @click="linkTo('/pages/me/privacy')" style="color: #37A6FF;">《隐私政策》</view>
+				<view @click="linkTo('/pages/me/privacy')" style="color: #37a6ff">《隐私政策》</view>
 				和
-				<view @click="linkTo('/pages/me/agreement')" style="color: #37A6FF;">《用户服务协议》</view>
-			
+				<view @click="linkTo('/pages/me/agreement')" style="color: #37a6ff">《用户服务协议》</view>
 			</view>
 		</view>
 	</view>
 </template>

 <script setup>
-	import { reactive } from 'vue';
-	import { onLoad} from '@dcloudio/uni-app'
-	import {setSendMsg,register} from '@/api/login/login.js';
-	import {commonType} from '@/api/init.js';
-	import { linkTo } from '@/utils/app.js';
-	
-	let data = reactive({
-		code: '',
-		mobile: '',
-		password: '',
-		sending: false,
-		sendTime: '获取验证码',
-		count: 60,
-		relation: "",
-		invitation: '',
-		isregisterCode: '',
-		qdCodeion: '', //渠道码
-		checked: false,
-	})
-	
-	 onLoad(async ( options ) => {
-		if (uni.getStorageSync('qdCodeion')) { data.qdCodeion = uni.getStorageSync('qdCodeion') }
-		if (options.qdCode) { data.qdCodeion = options.qdCode }
-		if (options.invitation ) { data.invitation = options.invitation }
-		
-		let res = await commonType(3)
-		data.isregisterCode = res.value
-	})
-	
-	/**
-	 * 发送验证码
-	 */
-	async function sendMsg () {
+import { reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { setSendMsg, register } from '@/api/login/login.js';
+import { commonType } from '@/api/init.js';
+import { linkTo } from '@/utils/app.js';
+
+let data = reactive({
+	code: '',
+	mobile: '',
+	password: '',
+	sending: false,
+	sendTime: '获取验证码',
+	count: 60,
+	relation: '',
+	invitation: '',
+	isregisterCode: '',
+	qdCodeion: '', //渠道码
+	checked: false
+});
+
+onLoad(async (options) => {
+	let localQdCodeion = uni.getStorageSync('qdCodeion');
+	if (localQdCodeion && localQdCodeion != 'null') {
+		data.qdCodeion = localQdCodeion;
+	}
+	if (options.qdCode && options.qdCode != 'null') {
+		data.qdCodeion = options.qdCode;
+	}
+	if (options.invitation) {
+		data.invitation = options.invitation;
+	}
+
+	console.log('localQdCodeion===', localQdCodeion);
+	console.log('options.qdCode===', typeof options.qdCode);
+
+	let res = await commonType(3);
+	data.isregisterCode = res.value;
+});
+
+/**
+ * 发送验证码
+ */
+async function sendMsg() {
+	try {
 		if (!data.mobile) {
 			uni.showToast({
 				title: '请输入手机号',
-				icon: 'none',
-			})
+				icon: 'none'
+			});
 		} else if (data.mobile.length !== 11) {
 			uni.showToast({
 				title: '请输入正确的手机号',
-				icon: 'none',
-			})
+				icon: 'none'
+			});
 		} else {
 			uni.showLoading({
 				title: '正在发送验证码...'
-			})
-			let res = await setSendMsg(data.mobile,'login')
-			uni.hideLoading();
-			uni.hideToast();
-			if( res ){
-				data.sending = true;
-				uni.showToast({
-					title: '验证码发送成功请注意查收',
-					icon: 'none',
-					duration: 1000
-				})
-				countDown();
-			} else {
-				uni.showModal({
-					showCancel: false,
-					title: '短信发送失败',
-					content: '请一分钟后再获取验证码'
-				});
-			}
-			
-			
-		}
-	}
-	
-	
-	
-	/**
-	 * 验证码倒计时
-	 */
-	function countDown() {
-		console.log(data.count)
-		if (data.count === 1) {
-			data.count = 60;
-			data.sending = false;
-			data.sendTime = '获取验证码';
-		} else {
-			data.count = data.count - 1;
+			});
+			let res = await setSendMsg(data.mobile, 'login');
+
+			console.log(res);
+
 			data.sending = true;
-			data.sendTime = data.count - 1 + '秒后重新获取';
-			setTimeout(countDown.bind(this), 1000);
+			uni.showToast({
+				title: '验证码发送成功请注意查收',
+				icon: 'none',
+				duration: 1000
+			});
+			countDown();
 		}
-	}
-	
-	/**
-	 * 获取注册值
-	 * @param {Object} e
-	 */
-	function inputChange(e) {
-		const key = e.currentTarget.dataset.key;
-		data[key] = e.detail.value;
-	}
-	
-	/**
-	 * 是否同意协议
-	 * @param {Object} e
-	 */
-	function radioChange(e) {
-		data.checked = e
-	}
-	
-	/**
-	 * 登录
-	 */
-	function toLogin() {
-		uni.reLaunch({
-			url: '/pages/login/login'
+	} catch (error) {
+		console.log(error);
+		uni.showToast({
+			title: error.message,
+			icon: 'none',
+			duration: 1000
 		});
 	}
-	
-	
-	/**
-	 * 注册
-	 */
-	async function toRegister() {
-		const {
-			mobile,
-			password,
-			code,
-			checked,
-			invitation,
-			isregisterCode,
-			qdCodeion
-		} = data;
-		if (!mobile) {
-			uni.showToast({
-				title: '请输入账号',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (!code) {
-			uni.showToast({
-				title: '请输入验证码',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (!password) {
-			uni.showToast({
-				title: '请设置密码',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (password.length < 6) {
-			uni.showToast({
-				title: '密码位数必须大于六位',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (invitation.length == 0 && isregisterCode == '是') {
-			uni.showToast({
-				title: '请输入邀请码',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (!checked) {
-			uni.showToast({
-				title: '请先同意《隐私政策》和《用户协议》',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		data.logining = true;
-		uni.showLoading({
-			title: '注册中...'
-		})
-		let platform = ''
-		// #ifdef APP
-		platform = 'app'
-		// #endif
-		// #ifdef H5
-		platform = 'h5'
-		// #endif
-		
-		
-		let res = await register({
-			password: password,
-			phone: mobile,
-			msg: code,
-			inviterCode: invitation,
-			platform: platform,
-			qdCode: qdCodeion,
-		})
-		if (res.code === 0) {
-			uni.setStorageSync('token', res.token)
-			uni.setStorageSync('userInfo', res.user)
-			
-			uni.showToast({
-				title: '注册成功',
-				icon: 'none'
-			})
-			setTimeout(function() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			}, 1000)
-		} else {
-			uni.showModal({
-				showCancel: false,
-				title: '注册失败',
-				content: res.msg
-			});
-		}
-		uni.hideLoading();
-		
+
+	uni.hideLoading();
+}
+
+/**
+ * 验证码倒计时
+ */
+function countDown() {
+	console.log(data.count);
+	if (data.count === 1) {
+		data.count = 60;
+		data.sending = false;
+		data.sendTime = '获取验证码';
+	} else {
+		data.count = data.count - 1;
+		data.sending = true;
+		data.sendTime = data.count - 1 + '秒后重新获取';
+		setTimeout(countDown.bind(this), 1000);
 	}
-	
+}
+
+/**
+ * 获取注册值
+ * @param {Object} e
+ */
+function inputChange(e) {
+	const key = e.currentTarget.dataset.key;
+	data[key] = e.detail.value;
+}
+
+/**
+ * 是否同意协议
+ * @param {Object} e
+ */
+function radioChange(e) {
+	data.checked = e;
+}
+
+/**
+ * 登录
+ */
+function toLogin() {
+	uni.reLaunch({
+		url: '/pages/login/login'
+	});
+}
+
+/**
+ * 注册
+ */
+async function toRegister() {
+	const { mobile, password, code, checked, invitation, isregisterCode, qdCodeion } = data;
+	if (!mobile) {
+		uni.showToast({
+			title: '请输入账号',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (!code) {
+		uni.showToast({
+			title: '请输入验证码',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (!password) {
+		uni.showToast({
+			title: '请设置密码',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (password.length < 6) {
+		uni.showToast({
+			title: '密码位数必须大于六位',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (invitation.length == 0 && isregisterCode == '是') {
+		uni.showToast({
+			title: '请输入邀请码',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (!checked) {
+		uni.showToast({
+			title: '请先同意《隐私政策》和《用户协议》',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	data.logining = true;
+	uni.showLoading({
+		title: '注册中...'
+	});
+	let platform = '';
+	// #ifdef APP
+	platform = 'app';
+	// #endif
+	// #ifdef H5
+	platform = 'h5';
+	// #endif
+
+	let res = await register({
+		password: password,
+		phone: mobile,
+		msg: code,
+		inviterCode: invitation,
+		platform: platform,
+		qdCode: qdCodeion
+	});
+	if (res.code === 0) {
+		uni.setStorageSync('token', res.token);
+		uni.setStorageSync('userInfo', res.user);
+
+		uni.showToast({
+			title: '注册成功',
+			icon: 'none'
+		});
+		setTimeout(function () {
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		}, 1000);
+	} else {
+		uni.showModal({
+			showCancel: false,
+			title: '注册失败',
+			content: res.msg
+		});
+	}
+	uni.hideLoading();
+}
 </script>

 <style lang="scss" scoped>
-	page {
-		background: #ffffff;
-	}
-	*{
-		box-sizing: border-box;
-	}
-	.bg{
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		top: 0;
-	}
-	.wrapper{
-		position: relative;
-		padding-top: 48rpx;
-		box-sizing: border-box;
-	}
-	.flex{
-		display: flex;
-	}
-	.footerView {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #333333;
-		margin-top: 50rpx;
-		
-	}
-	.cuIcon::before{
-			width: 30rpx;
-			height: 30rpx;
-			margin-right: 12rpx;
-		}
-		.cuIcon-round::before {
-			content: "\e6d7";
-		}
-		.cuIcon-radiobox:before {
-			content: "\e75b";
-			color: #37A6FF;
-		}
-	.send-msg {
-		line-height: initial;
+page {
+	background: #ffffff;
+}
+* {
+	box-sizing: border-box;
+}
+.bg {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	top: 0;
+}
+.wrapper {
+	position: relative;
+	padding-top: 48rpx;
+	box-sizing: border-box;
+}
+.flex {
+	display: flex;
+}
+.footerView {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #333333;
+	margin-top: 50rpx;
+}
+.cuIcon::before {
+	width: 30rpx;
+	height: 30rpx;
+	margin-right: 12rpx;
+}
+.cuIcon-round::before {
+	content: '\e6d7';
+}
+.cuIcon-radiobox:before {
+	content: '\e75b';
+	color: #37a6ff;
+}
+.send-msg {
+	flex-shrink: 0;
+	line-height: initial;
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #ec6f48;
+	border: none;
+	background-color: transparent;
+	margin: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.send-msg::after {
+	border: none;
+	background-color: transparent;
+}
+
+.container {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	background: #ffffff;
+	box-sizing: border-box;
+}
+
+.wrapper {
+	min-height: 100vh;
+	position: relative;
+	z-index: 90;
+}
+
+.input-content {
+	padding: 0 56rpx;
+}
+.cu-form-group {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	margin-bottom: 48rpx;
+	background-color: transparent;
+	padding: 0;
+	.title {
+		margin-bottom: 32rpx;
 		font-weight: 400;
 		font-size: 28rpx;
-		color: #EC6F48;
-		border: none;
-		background-color: transparent;
-		margin: 0;
-		padding: 0;
+		color: #333333;
 	}
-	.send-msg::after{
-		border: none;
-		background-color: transparent;
-	}
-	
-	
-	.container {
-		position: relative;
+	.input {
 		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		background: #ffffff;
-		box-sizing: border-box;
-	}
-
-	.wrapper {
-		min-height: 100vh;
-		position: relative;
-		z-index: 90;
-	}
-
-	.input-content {
-		padding: 0 56rpx;
-	}
-	.cu-form-group{
+		// height: 84rpx;
+		// line-height: 84rpx;
+		background-color: #fff;
+		align-items: center;
+		// padding: 22rpx 32rpx 22rpx 24rpx;
 		display: flex;
-		flex-direction: column;
-		align-items: flex-start;
-		margin-bottom: 48rpx;
-		background-color: transparent;
-		padding: 0;
-		.title{
-			margin-bottom: 32rpx;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
+		align-items: center;
+		justify-content: space-between;
+		input {
+			height: 84rpx !important;
 		}
-		.input{
-			width: 100%;
-			// height: 84rpx;
-			// line-height: 84rpx;
-			background-color: #fff;
-			align-items: center;
-			// padding: 22rpx 32rpx 22rpx 24rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			input{
-				height: 84rpx!important;
-			}
-			v-deep .uni-input-input{
-				height: 84rpx!important;
-			}
+		v-deep .uni-input-input {
+			height: 84rpx !important;
 		}
 	}
+}

-	.confirm-btn {
-		width: 100%;
-		height: 100rpx;
-		text-align: center;
-		line-height: 100rpx;
-		border-radius: 16rpx;
-		margin-top: 40rpx;
-		background: #EC6F48;
-		font-size: 32rpx;
-		color: #FFFFFF;
+.confirm-btn {
+	width: 100%;
+	height: 100rpx;
+	text-align: center;
+	line-height: 100rpx;
+	border-radius: 16rpx;
+	margin-top: 40rpx;
+	background: #ec6f48;
+	font-size: 32rpx;
+	color: #ffffff;

-		&:after {
-			border: none;
-		}
+	&:after {
+		border: none;
 	}
-</style>
+}
+</style>
--- a/pages/login/registerApp.vue
+++ b/pages/login/registerApp.vue
@@ -1,30 +1,37 @@
 <template>
 	<view class="container">
-		<view class="bg" >
-			<image  src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
+		<view class="bg">
+			<image src="../../static/default/i_bg.png" style="width: 100%; height: 100%" mode="aspectFill"></image>
 		</view>
-		<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
+		<view class="wrapper u-relative" style="padding-top: 48rpx; box-sizing: border-box">
 			<view class="input-content">
-				<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">注册</view>
-				<view class="cu-form-group" >
+				<view style="font-size: 58rpx; font-weight: bold; color: #333; margin-bottom: 48rpx">注册</view>
+				<view class="cu-form-group">
 					<view class="title">手机号</view>
-					<input class="input" type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
-						@input="inputChange" />
+					<input class="input" type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile" @input="inputChange" />
 				</view>
-				<view class="cu-form-group" >
+				<view class="cu-form-group">
 					<text class="title">验证码</text>
 					<view class="input flex">
-						<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code"
-						@input="inputChange" @confirm="toLogin" />
+						<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange" @confirm="toLogin" />
 						<button class="send-msg" @click="sendMsg" :disabled="sending">{{ sendTime }}</button>
 					</view>
-					
 				</view>

-				<view class="cu-form-group" >
+				<view class="cu-form-group">
 					<text class="title">设置密码</text>
-					<input class="input" type="password" :value="password" placeholder="请设置新密码" placeholder-class="input-empty"
-						maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
+					<input
+						class="input"
+						type="password"
+						:value="password"
+						placeholder="请设置新密码"
+						placeholder-class="input-empty"
+						maxlength="20"
+						minlength="6"
+						data-key="password"
+						@input="inputChange"
+						@confirm="toLogin"
+					/>
 				</view>
 				<!-- <view class="cu-form-group"
 					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
@@ -39,363 +46,350 @@
 			</view>
 			<view class="footerView">
 				<u-checkbox-group>
-					<u-checkbox v-model="checked" label-size='24upx' shape="circle" @change="radioChange"></u-checkbox>
+					<u-checkbox v-model="checked" label-size="24upx" shape="circle" @change="radioChange"></u-checkbox>
 				</u-checkbox-group>
 				<view>同意</view>
 				<!-- 协议地址 -->
-				<navigator url="/me/setting/mimi" open-type="navigate" style="color: #37A6FF;">《隐私政策》</navigator>
+				<navigator url="/me/setting/mimi" open-type="navigate" style="color: #37a6ff">《隐私政策》</navigator>
 				和
-				<navigator url="/me/setting/xieyi" open-type="navigate" style="color: #37A6FF;">《用户协议》</navigator>
+				<navigator url="/me/setting/xieyi" open-type="navigate" style="color: #37a6ff">《用户协议》</navigator>
 			</view>
 		</view>
-	
 	</view>
 </template>

 <script setup>
-	import { reactive } from 'vue';
-	import { onLoad} from '@dcloudio/uni-app'
-	import http from '@/http/http.js';
-	let data = reactive({
-		code: '',
-		mobile: '',
-		password: '',
-		sending: false,
-		sendTime: '获取验证码',
-		count: 60,
-		relation: "",
-		invitation: '',
-		registerCode: '',
-		qdCodeion: '', //渠道码
-		checked: false,
-	})
-	
-	onLoad(( options ) => {
-		let relation = e.invitation
-		if (relation) {
-			this.relation = relation;
-			this.invitation = relation;
+import { reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import http from '@/http/http.js';
+let data = reactive({
+	code: '',
+	mobile: '',
+	password: '',
+	sending: false,
+	sendTime: '获取验证码',
+	count: 60,
+	relation: '',
+	invitation: '',
+	registerCode: '',
+	qdCodeion: '', //渠道码
+	checked: false
+});
+
+onLoad((options) => {
+	let relation = e.invitation;
+	if (relation) {
+		this.relation = relation;
+		this.invitation = relation;
+	}
+	if (e.qdCode) {
+		this.qdCodeion = e.qdCode;
+	}
+	http.request({
+		url: 'app/common/type/3',
+		data: {
+			type: 3
 		}
-		if (e.qdCode) {
-			this.qdCodeion = e.qdCode
+	}).then((res) => {
+		if (res.code == 0) {
+			this.registerCode = res.data.value;
 		}
-		http.request({
-			url:'app/common/type/3',
-		}).then(res => {
-			if (res.code == 0) {
-				this.registerCode = res.data.value
-			}
+	});
+});
+
+/**
+ * 是否同意协议
+ * @param {Object} e
+ */
+function radioChange(e) {
+	this.checked = e;
+}
+
+function showMa() {
+	//查询官方邀请码
+	this.$Request.getT('/common/type/88', { type: 88 }).then((res) => {
+		if (res.code == 0) {
+			this.invitation = res.data.value;
+		}
+	});
+}
+
+function sendMsg() {
+	const { mobile } = this;
+	if (!mobile) {
+		uni.showToast({
+			title: '请输入手机号',
+			icon: 'none',
+			duration: 1000
 		});
-	})
-	
-	/**
-	 * 是否同意协议
-	 * @param {Object} e
-	 */
-	function radioChange(e) {
-		this.checked = e
-	}
-	
-	function showMa() {
-		//查询官方邀请码
-		this.$Request.getT('/common/type/88').then(res => {
-			if (res.code == 0) {
-				this.invitation = res.data.value;
-			}
+	} else if (mobile.length !== 11) {
+		uni.showToast({
+			title: '请输入正确的手机号',
+			icon: 'none',
+			duration: 1000
 		});
-	}
-	
-	function sendMsg() {
-		const {
-			mobile
-		} = this;
-		if (!mobile) {
-			uni.showToast({
-				title: '请输入手机号',
-				icon: 'none',
-				duration: 1000
-			})
-		} else if (mobile.length !== 11) {
-			uni.showToast({
-				title: '请输入正确的手机号',
-				icon: 'none',
-				duration: 1000
-			})
-		} else {
-			uni.showLoading({
-				title: '正在发送验证码...'
-			})
-			http.request({
-				url:'app/Login/sendMsg/' + mobile + '/login',
-			}).then(res => {
-				if (res.code === 0) {
-					this.sending = true;
-					uni.showToast({
-						title: '验证码发送成功请注意查收',
-						icon: 'none',
-						duration: 1000
-					})
-					this.countDown();
-				} else {
-					uni.showModal({
-						showCancel: false,
-						title: '短信发送失败',
-						content: res.msg ? res.msg : '请一分钟后再获取验证码'
-					});
-				}
-				
-				uni.hideLoading();
-			})
-			
-		}
-	}
-	function countDown() {
-		const {
-			count
-		} = this;
-		if (count === 1) {
-			this.count = 60;
-			this.sending = false;
-			this.sendTime = '获取验证码';
-		} else {
-			this.count = count - 1;
-			this.sending = true;
-			this.sendTime = count - 1 + '秒后重新获取';
-			setTimeout(this.countDown.bind(this), 1000);
-		}
-	}
-	
-	function inputChange(e) {
-		const key = e.currentTarget.dataset.key;
-		this[key] = e.detail.value;
-	}
-	
-	function toLogin() {
-		console.log("123");
-		uni.reLaunch({
-			url: '/pages/login/login'
-		});
-	}
-	
-	function toRegister() {
-		const {
-			mobile,
-			password,
-			code,
-			checked,
-			invitation,
-			registerCode,
-			qdCodeion
-		} = this;
-		if (!mobile) {
-			uni.showToast({
-				title: '请输入账号',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (!code) {
-			uni.showToast({
-				title: '请输入验证码',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (!password) {
-			uni.showToast({
-				title: '请设置密码',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (password.length < 6) {
-			uni.showToast({
-				title: '密码位数必须大于六位',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (invitation.length == 0 && registerCode == '是') {
-			uni.showToast({
-				title: '请输入邀请码',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		if (!checked) {
-			uni.showToast({
-				title: '请先同意《隐私政策》和《用户协议》',
-				icon: 'none',
-				duration: 1000
-			})
-			return
-		}
-		this.logining = true;
+	} else {
 		uni.showLoading({
-			title: '注册中...'
-		})
-		let platform = ''
-		// #ifdef APP
-		platform = 'app'
-		// #endif
-		// #ifdef H5
-		platform = 'h5'
-		// #endif
+			title: '正在发送验证码...'
+		});
 		http.request({
-			url: 'app/Login/registerCode?password=' + password + '&phone=' + mobile + '&msg=' + code +
-			'&inviterCode=' + invitation + '&platform=' + platform + '&qdCode=' + qdCodeion,
-			method: 'post'
-		}).then(res => {
+			url: 'app/Login/sendMsg/' + mobile + '/login'
+		}).then((res) => {
 			if (res.code === 0) {
-				// this.$queue.remove('invitation');
-				uni.setStorageSync('token', res.token)
-				uni.setStorageSync('userId', res.user.userId)
-				uni.setStorageSync('phone', res.user.phone)
-				uni.setStorageSync('invitationCode', res.user.invitationCode)
-				//设置渠道码
-				if (res.user.qdCode) {
-					uni.setStorageSync('qdCode', res.user.qdCode)
-				}
+				this.sending = true;
 				uni.showToast({
-					title: '注册成功',
-					icon: 'none'
-				})
-				setTimeout(function() {
-					uni.navigateTo({
-						url: '/pages/login/appEq'
-					})
-				}, 1000)
+					title: '验证码发送成功请注意查收',
+					icon: 'none',
+					duration: 1000
+				});
+				this.countDown();
 			} else {
-				uni.hideLoading();
 				uni.showModal({
 					showCancel: false,
-					title: '注册失败',
-					content: res.msg
+					title: '短信发送失败',
+					content: res.msg ? res.msg : '请一分钟后再获取验证码'
 				});
 			}
+
+			uni.hideLoading();
 		});
 	}
+}
+function countDown() {
+	const { count } = this;
+	if (count === 1) {
+		this.count = 60;
+		this.sending = false;
+		this.sendTime = '获取验证码';
+	} else {
+		this.count = count - 1;
+		this.sending = true;
+		this.sendTime = count - 1 + '秒后重新获取';
+		setTimeout(this.countDown.bind(this), 1000);
+	}
+}
+
+function inputChange(e) {
+	const key = e.currentTarget.dataset.key;
+	this[key] = e.detail.value;
+}
+
+function toLogin() {
+	console.log('123');
+	uni.reLaunch({
+		url: '/pages/login/login'
+	});
+}
+
+function toRegister() {
+	const { mobile, password, code, checked, invitation, registerCode, qdCodeion } = this;
+	if (!mobile) {
+		uni.showToast({
+			title: '请输入账号',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (!code) {
+		uni.showToast({
+			title: '请输入验证码',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (!password) {
+		uni.showToast({
+			title: '请设置密码',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (password.length < 6) {
+		uni.showToast({
+			title: '密码位数必须大于六位',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (invitation.length == 0 && registerCode == '是') {
+		uni.showToast({
+			title: '请输入邀请码',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	if (!checked) {
+		uni.showToast({
+			title: '请先同意《隐私政策》和《用户协议》',
+			icon: 'none',
+			duration: 1000
+		});
+		return;
+	}
+	this.logining = true;
+	uni.showLoading({
+		title: '注册中...'
+	});
+	let platform = '';
+	// #ifdef APP
+	platform = 'app';
+	// #endif
+	// #ifdef H5
+	platform = 'h5';
+	// #endif
+	http.request({
+		url: 'app/Login/registerCode?password=' + password + '&phone=' + mobile + '&msg=' + code + '&inviterCode=' + invitation + '&platform=' + platform + '&qdCode=' + qdCodeion,
+		method: 'post'
+	}).then((res) => {
+		if (res.code === 0) {
+			// this.$queue.remove('invitation');
+			uni.setStorageSync('token', res.token);
+			uni.setStorageSync('userId', res.user.userId);
+			uni.setStorageSync('phone', res.user.phone);
+			uni.setStorageSync('invitationCode', res.user.invitationCode);
+			//设置渠道码
+			if (res.user.qdCode) {
+				uni.setStorageSync('qdCode', res.user.qdCode);
+			}
+			uni.showToast({
+				title: '注册成功',
+				icon: 'none'
+			});
+			setTimeout(function () {
+				uni.navigateTo({
+					url: '/pages/login/appEq'
+				});
+			}, 1000);
+		} else {
+			uni.hideLoading();
+			uni.showModal({
+				showCancel: false,
+				title: '注册失败',
+				content: res.msg
+			});
+		}
+	});
+}
 </script>

 <style lang="scss" scoped>
-	page {
-		background: #fff;
+page {
+	background: #fff;
+}
+* {
+	box-sizing: border-box;
+}
+.flex {
+	display: flex;
+}
+.bg {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	top: 0;
+}
+.wrapper {
+	position: relative;
+	padding-top: 48rpx;
+	box-sizing: border-box;
+}
+.footerView {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #333333;
+	// position: absolute;
+	// left: 0;
+	// right: 0;
+	// bottom: 178rpx;
+	.cuIcon::before {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 12rpx;
 	}
-	*{
-		box-sizing: border-box;
+	.cuIcon-round::before {
+		content: '\e6d7';
 	}
-	.flex{
-		display: flex;
-	}
-	.bg{
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		top: 0;
-	}
-	.wrapper{
-		position: relative;
-		padding-top: 48rpx;
-		box-sizing: border-box;
-	}
-	.footerView {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #333333;
-		// position: absolute;
-		// left: 0;
-		// right: 0;
-		// bottom: 178rpx;
-		.cuIcon::before{
-			width: 30rpx;
-			height: 30rpx;
-			margin-right: 12rpx;
-		}
-		.cuIcon-round::before {
-			content: "\e6d7";
-		}
-		.cuIcon-radiobox:before {
-			content: "\e75b";
-			color: #37A6FF;
-		}
+	.cuIcon-radiobox:before {
+		content: '\e75b';
+		color: #37a6ff;
 	}
+}

-	.send-msg {
-		line-height: initial;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #EC6F48;
-		border: none;
-		background-color: transparent!important;
-	}
-	.send-msg::after{
-		border: none;
+.send-msg {
+	line-height: initial;
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #ec6f48;
+	border: none;
+	background-color: transparent !important;
+}
+.send-msg::after {
+	border: none;
+	background-color: transparent;
+}
+
+.container {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	background: #fff;
+}
+
+.wrapper {
+	position: relative;
+	z-index: 90;
+	min-height: 100vh;
+}
+
+.input-content {
+	padding: 0 56rpx;
+	.cu-form-group {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		margin-bottom: 48rpx;
 		background-color: transparent;
-	}
-
-	.container {
-		position: relative;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		background: #fff;
-	}
-
-	.wrapper {
-		position: relative;
-		z-index: 90;
-		min-height: 100vh;
-	}
-
-	.input-content {
-		padding: 0 56rpx;
-		.cu-form-group{
-			display: flex;
-			flex-direction: column;
-			align-items: flex-start;
-			margin-bottom: 48rpx;
-			background-color: transparent;
-			padding: 0;
-			.title{
-				margin-bottom: 32rpx;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-			.input{
-				width: 100%;
-				height: 84rpx;
-				line-height: 84rpx;
-				background-color: #fff;
-				align-items: center;
-				padding: 22rpx 32rpx 22rpx 24rpx;
-			}
+		padding: 0;
+		.title {
+			margin-bottom: 32rpx;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+		}
+		.input {
+			width: 100%;
+			height: 84rpx;
+			line-height: 84rpx;
+			background-color: #fff;
+			align-items: center;
+			padding: 22rpx 32rpx 22rpx 24rpx;
 		}
 	}
+}

+.confirm-btn {
+	width: 100%;
+	height: 100rpx;
+	text-align: center;
+	line-height: 100rpx;
+	border-radius: 16rpx;
+	margin-top: 40rpx;
+	background: #ec6f48;
+	font-size: 32rpx;
+	color: #ffffff;

-	.confirm-btn {
-		width: 100%;
-		height: 100rpx;
-		text-align: center;
-		line-height: 100rpx;
-		border-radius: 16rpx;
-		margin-top: 40rpx;
-		background: #EC6F48;
-		font-size: 32rpx;
-		color: #FFFFFF;
-
-		&:after {
-			border: none;
-		}
+	&:after {
+		border: none;
 	}
-</style>
+}
+</style>
--- a/pages/me/withdraw/index.vue
+++ b/pages/me/withdraw/index.vue
Author	SHA1	Message	Date
gyq	07637f1986	test	2025-08-25 15:51:40 +08:00
gyq	50a5e7672c	Merge branch 'ymf_php' of e.coding.net:g-cphe0354/duanju/new_app into gyq_php	2025-08-20 16:23:55 +08:00
gyq	efce59d822	优化提现界面的小数展示	2025-08-20 16:23:23 +08:00
YeMingfei666	5bf0a4e686	请求地址修改	2025-08-11 09:31:48 +08:00
gyq	855a884c4c	切换正式PHP	2025-08-08 09:27:29 +08:00
gyq	85205caa74	优化	2025-08-05 21:42:19 +08:00
gyq	fbfc97bc3f	去除打包/h5/	2025-08-05 19:01:34 +08:00
gyq	d5bd741dde	Merge branch 'ymf_php' of e.coding.net:g-cphe0354/duanju/new_app into gyq_php	2025-08-05 18:54:55 +08:00
gyq	709eff18c3	优化注册渠道码	2025-08-05 18:54:40 +08:00
YeMingfei666	1eb645705d	部分接口调整，修复提现页面点击弹窗确认按钮卡死问题	2025-08-05 18:03:10 +08:00
gyq	c65d4a0e78	优化	2025-08-04 14:21:12 +08:00
YeMingfei666	d3dc2e8a87	代码合并	2025-08-01 10:24:08 +08:00
YeMingfei666	80c07fe756	修复部分问题	2025-08-01 10:21:14 +08:00
gyq	4d85921b48	1	2025-07-31 17:58:07 +08:00
gyq	b01479803a	Merge branch 'ymf_php' of e.coding.net:g-cphe0354/duanju/new_app into gyq_php	2025-07-31 17:55:03 +08:00
gyq	fc64e7b77b	优化	2025-07-31 17:54:23 +08:00
gyq	4306ba1900	更改部分接口传参方式	2025-07-16 09:38:30 +08:00
YeMingfei666	7c2b8b7840	增加本地测试链接	2025-07-15 17:09:49 +08:00
gyq	d1621e78f1	优化	2025-07-07 09:29:14 +08:00