diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 15f1188..e466870 100644
--- 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"
},
{
diff --git a/App.vue b/App.vue
index f0a63fe..19005aa 100644
--- a/App.vue
+++ b/App.vue
@@ -1,123 +1,118 @@
+ .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);
+ }
+
\ No newline at end of file
diff --git a/api/login/login.js b/api/login/login.js
index f1f4109..fe02c70 100644
--- 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
})
-}
\ No newline at end of file
+}
+
+
diff --git a/api/user/user.js b/api/user/user.js
index 90028ef..291cad2 100644
--- 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
+ })
+}
\ No newline at end of file
diff --git a/http/http.js b/http/http.js
index 72572f4..201fd1a 100644
--- 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(`上传失败`);
});
});
}
diff --git a/main.js b/main.js
index 745feb6..a7df640 100644
--- a/main.js
+++ b/main.js
@@ -17,7 +17,6 @@ const app = new Vue({
})
app.$mount()
// #endif
-
// #ifdef VUE3
import {
createSSRApp
diff --git a/package-lock.json b/package-lock.json
index f266ede..1416844 100644
--- 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=="
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cedfe9e..41cb604 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,7 +10,7 @@
-
+
公告
@@ -42,18 +42,18 @@
-
-
-
-
+
+
@@ -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
- // }
}
// 搜索跳转
diff --git a/pages/index/search/index.vue b/pages/index/search/index.vue
index 312970a..a1bacc8 100644
--- a/pages/index/search/index.vue
+++ b/pages/index/search/index.vue
@@ -28,139 +28,147 @@
-
+
+
+ 暂无数据
+
\ No newline at end of file
diff --git a/pages/login/bind.vue b/pages/login/bind.vue
index 1e25199..c757442 100644
--- 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,
diff --git a/pages/login/forgetPwd.vue b/pages/login/forgetPwd.vue
index e0f2e11..11f9710 100644
--- 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);
}
}
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 9509ea1..621940c 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -48,7 +48,7 @@