diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a97fd25..4bbcf3c 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -14,6 +14,10 @@
{
"launchtype" : "local"
},
+ "mp-weixin" :
+ {
+ "launchtype" : "local"
+ },
"type" : "uniCloud"
}
]
diff --git a/api/request.js b/api/request.js
index 968f57a..1de1724 100644
--- a/api/request.js
+++ b/api/request.js
@@ -21,7 +21,7 @@ const httpRequest = (params) => {
phoneos:'ANDROID'// 设备系统
}
let data=Object.assign(json_data,params.data)
- console.info(data)
+ // console.info(data)
uni.setStorageSync('appdata',data)
let key=params.key
if(params.isEncryption){
diff --git a/common/common.scss b/common/common.scss
index 35608c8..7685771 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -505,7 +505,30 @@
.login{
padding: 0 32rpx;
+ .login_input1{
+ display: flex;
+ height: 97.33rpx;
+ border: 1px solid #323333;
+ border-radius: 48.67rpx;
+ font-size: 22.67rpx;
+ padding-left: 33.33rpx;
+ // margin-bottom: 10rpx;
+ .login_input1_text{
+ height: 97.33rpx;
+ width: 92%;
+ border-radius: 48.67rpx;
+ font-size: 22.67rpx;
+
+ margin-bottom: 56rpx;
+ }
+ .login_see{
+ font-size: 22.67rpx;
+ margin-bottom: 56rpx;
+ }
+ // padding-top: 10rpx;
+ }
.login_input{
+
height: 97.33rpx;
border: 1px solid #323333;
border-radius: 48.67rpx;
@@ -533,6 +556,7 @@
color: white;
// background-color: #e7e7e7;
// color: #666666;
+ margin-top: 30rpx;
border-radius: 6.67rpx;
margin-bottom: 52rpx;
font-weight: bold;
diff --git a/manifest.json b/manifest.json
index ad98884..b459d2a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,7 +41,9 @@
"autoSdkPermissions" : true
},
/* ios打包配置 */
- "ios" : {},
+ "ios" : {
+ "dSYMs" : false
+ },
/* SDK配置 */
"sdkConfigs" : {
"ad" : {},
diff --git a/package-lock.json b/package-lock.json
index fb7f54c..4405839 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,387 +1,12 @@
{
- "name": "cnic_buyer",
- "lockfileVersion": 2,
"requires": true,
- "packages": {
- "": {
- "dependencies": {
- "base-64": "^1.0.0",
- "crypto-js": "^4.1.1",
- "vuex": "^4.0.2"
- }
- },
- "node_modules/@babel/parser": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz",
- "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==",
- "peer": true,
- "bin": {
- "parser": "bin/babel-parser.js"
- },
- "engines": {
- "node": ">=6.0.0"
- }
- },
- "node_modules/@vue/compiler-core": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
- "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
- "peer": true,
- "dependencies": {
- "@babel/parser": "^7.16.4",
- "@vue/shared": "3.2.37",
- "estree-walker": "^2.0.2",
- "source-map": "^0.6.1"
- }
- },
- "node_modules/@vue/compiler-dom": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
- "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-core": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "node_modules/@vue/compiler-sfc": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
- "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
- "peer": true,
- "dependencies": {
- "@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.37",
- "@vue/compiler-dom": "3.2.37",
- "@vue/compiler-ssr": "3.2.37",
- "@vue/reactivity-transform": "3.2.37",
- "@vue/shared": "3.2.37",
- "estree-walker": "^2.0.2",
- "magic-string": "^0.25.7",
- "postcss": "^8.1.10",
- "source-map": "^0.6.1"
- }
- },
- "node_modules/@vue/compiler-ssr": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
- "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-dom": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "node_modules/@vue/devtools-api": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
- "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
- },
- "node_modules/@vue/reactivity": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
- "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
- "peer": true,
- "dependencies": {
- "@vue/shared": "3.2.37"
- }
- },
- "node_modules/@vue/reactivity-transform": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
- "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
- "peer": true,
- "dependencies": {
- "@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.37",
- "@vue/shared": "3.2.37",
- "estree-walker": "^2.0.2",
- "magic-string": "^0.25.7"
- }
- },
- "node_modules/@vue/runtime-core": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
- "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
- "peer": true,
- "dependencies": {
- "@vue/reactivity": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "node_modules/@vue/runtime-dom": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
- "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
- "peer": true,
- "dependencies": {
- "@vue/runtime-core": "3.2.37",
- "@vue/shared": "3.2.37",
- "csstype": "^2.6.8"
- }
- },
- "node_modules/@vue/server-renderer": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
- "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-ssr": "3.2.37",
- "@vue/shared": "3.2.37"
- },
- "peerDependencies": {
- "vue": "3.2.37"
- }
- },
- "node_modules/@vue/shared": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
- "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
- "peer": true
- },
- "node_modules/base-64": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
- "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
- },
- "node_modules/crypto-js": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
- "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
- },
- "node_modules/csstype": {
- "version": "2.6.20",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
- "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==",
- "peer": true
- },
- "node_modules/estree-walker": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
- "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
- "peer": true
- },
- "node_modules/magic-string": {
- "version": "0.25.9",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
- "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
- "peer": true,
- "dependencies": {
- "sourcemap-codec": "^1.4.8"
- }
- },
- "node_modules/nanoid": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
- "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
- "peer": true,
- "bin": {
- "nanoid": "bin/nanoid.cjs"
- },
- "engines": {
- "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
- }
- },
- "node_modules/picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
- "peer": true
- },
- "node_modules/postcss": {
- "version": "8.4.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/postcss"
- }
- ],
- "peer": true,
- "dependencies": {
- "nanoid": "^3.3.4",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
- },
- "engines": {
- "node": "^10 || ^12 || >=14"
- }
- },
- "node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "peer": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
- "peer": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/sourcemap-codec": {
- "version": "1.4.8",
- "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
- "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
- "peer": true
- },
- "node_modules/vue": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
- "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-dom": "3.2.37",
- "@vue/compiler-sfc": "3.2.37",
- "@vue/runtime-dom": "3.2.37",
- "@vue/server-renderer": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "node_modules/vuex": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz",
- "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==",
- "dependencies": {
- "@vue/devtools-api": "^6.0.0-beta.11"
- },
- "peerDependencies": {
- "vue": "^3.0.2"
- }
- }
- },
+ "lockfileVersion": 1,
"dependencies": {
- "@babel/parser": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz",
- "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==",
- "peer": true
- },
- "@vue/compiler-core": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
- "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
- "peer": true,
- "requires": {
- "@babel/parser": "^7.16.4",
- "@vue/shared": "3.2.37",
- "estree-walker": "^2.0.2",
- "source-map": "^0.6.1"
- }
- },
- "@vue/compiler-dom": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
- "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
- "peer": true,
- "requires": {
- "@vue/compiler-core": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "@vue/compiler-sfc": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
- "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
- "peer": true,
- "requires": {
- "@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.37",
- "@vue/compiler-dom": "3.2.37",
- "@vue/compiler-ssr": "3.2.37",
- "@vue/reactivity-transform": "3.2.37",
- "@vue/shared": "3.2.37",
- "estree-walker": "^2.0.2",
- "magic-string": "^0.25.7",
- "postcss": "^8.1.10",
- "source-map": "^0.6.1"
- }
- },
- "@vue/compiler-ssr": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
- "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
- "peer": true,
- "requires": {
- "@vue/compiler-dom": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
"@vue/devtools-api": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
"integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
},
- "@vue/reactivity": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
- "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
- "peer": true,
- "requires": {
- "@vue/shared": "3.2.37"
- }
- },
- "@vue/reactivity-transform": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
- "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
- "peer": true,
- "requires": {
- "@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.37",
- "@vue/shared": "3.2.37",
- "estree-walker": "^2.0.2",
- "magic-string": "^0.25.7"
- }
- },
- "@vue/runtime-core": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
- "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
- "peer": true,
- "requires": {
- "@vue/reactivity": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "@vue/runtime-dom": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
- "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
- "peer": true,
- "requires": {
- "@vue/runtime-core": "3.2.37",
- "@vue/shared": "3.2.37",
- "csstype": "^2.6.8"
- }
- },
- "@vue/server-renderer": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
- "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
- "peer": true,
- "requires": {
- "@vue/compiler-ssr": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
- "@vue/shared": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
- "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
- "peer": true
- },
"base-64": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
@@ -392,81 +17,6 @@
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
"integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
},
- "csstype": {
- "version": "2.6.20",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
- "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==",
- "peer": true
- },
- "estree-walker": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
- "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
- "peer": true
- },
- "magic-string": {
- "version": "0.25.9",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
- "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
- "peer": true,
- "requires": {
- "sourcemap-codec": "^1.4.8"
- }
- },
- "nanoid": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
- "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
- "peer": true
- },
- "picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
- "peer": true
- },
- "postcss": {
- "version": "8.4.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
- "peer": true,
- "requires": {
- "nanoid": "^3.3.4",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
- }
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "peer": true
- },
- "source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
- "peer": true
- },
- "sourcemap-codec": {
- "version": "1.4.8",
- "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
- "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
- "peer": true
- },
- "vue": {
- "version": "3.2.37",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
- "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
- "peer": true,
- "requires": {
- "@vue/compiler-dom": "3.2.37",
- "@vue/compiler-sfc": "3.2.37",
- "@vue/runtime-dom": "3.2.37",
- "@vue/server-renderer": "3.2.37",
- "@vue/shared": "3.2.37"
- }
- },
"vuex": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz",
diff --git a/pages.json b/pages.json
index f8b9a9b..326fb00 100644
--- a/pages.json
+++ b/pages.json
@@ -30,7 +30,8 @@
"style": {
"app-plus":{
"titleNView":false
- }
+ },
+ "navigationBarTextStyle":"white"
}
@@ -51,10 +52,22 @@
"path": "pages/account/deleteCount",
"style": {
"navigationBarBackgroundColor":"#000000",
- "navigationBarTitleText": "delete Count",
+ "navigationStyle":"custom",
+ "navigationBarTextStyle":"white"
+
+
+
+ }
+ },
+ {
+ "path": "pages/account/deleteOk",
+ "style": {
+ "navigationBarBackgroundColor":"#000000",
+ "navigationStyle":"custom",
"navigationBarTextStyle":"white"
+
}
},
{
@@ -241,8 +254,11 @@
"path": "pages/category/productList",
"style": {
"titleNView":false,
- "enablePullDownRefresh":true
+ "enablePullDownRefresh":true,
+ "navigationBarTextStyle":"white"
}
+
+
},
{
"path": "pages/shippingCart/index",
diff --git a/pages/account/addAddress.vue b/pages/account/addAddress.vue
index e141f76..c28e730 100644
--- a/pages/account/addAddress.vue
+++ b/pages/account/addAddress.vue
@@ -278,14 +278,17 @@
let list =[]
let listAll = []
console.info(res)
- console.log(this.countryText)
+ // console.log(this.countryText)
if(res.error==0){
this.countryList=res.data
if(this.countryText){
res.data.map( item =>{
if(item.region_name == this.countryText){
item.regions.map(item2 =>{
- list.push(item2.region_name)
+ list.push({
+ region_name:item2.region_name,
+ region_id:item2.region_id
+ })
listAll.push({
name:item2.region_name,
list:item2.regions
@@ -298,7 +301,7 @@
})
}
})
- console.log(listAll,'ppp')
+ // console.log(listAll,'ppp')
this.listAll = listAll
}
}
@@ -323,7 +326,10 @@
this.countryList.map( item =>{
if(item.region_name == this.countryText){
item.regions.map(item2 =>{
- list.push(item2.region_name)
+ list.push({
+ region_name:item2.region_name,
+ region_id:item2.region_id
+ })
listAll.push({
name:item2.region_name,
list:item2.regions
@@ -341,8 +347,9 @@
})
}
})
- console.log(listAll)
+ // console.log(listAll)
this.provinceList = list
+ console.log(this.provinceList )
this.listAll = listAll
}
@@ -352,13 +359,15 @@
bindPickerChange1(e){
this.isSelect1 = true
this.provinceIndex=e.detail.value
- this.provinceText=this.provinceList[this.provinceIndex]
+ console.log(this.provinceList)
+ this.provinceText=this.provinceList[this.provinceIndex].region_name
this.listAll.map(item =>{
if(item.name == this.provinceText){
this.cityList = item.list
if(this.cityList&&this.cityList[0].region_name!=undefined)
{
this.cityText = this.cityList[0].region_name
+ this.query.consignee.city=this.cityList[0].region_id
}
else{
this.isSelect1 = false
@@ -382,6 +391,7 @@
// }
this.query.consignee.province=this.provinceList[this.provinceIndex].region_id
+ console.log(this.query.consignee.province)
// this.provinceText=this.provinceList[this.provinceIndex].region_name
},
// ѡ
@@ -394,9 +404,10 @@
}
},
onLoad(e) {
- console.info(e)
+
if(e.type==1){
e.data=JSON.parse(e.data)
+ // console.info(e.data)
this.query.consignee=e.data
this.address=this.query.consignee.address
if(e.data.default_address_id==e.data.address_id){
diff --git a/pages/account/deleteCount.vue b/pages/account/deleteCount.vue
index 7e9fb01..8ef4061 100644
--- a/pages/account/deleteCount.vue
+++ b/pages/account/deleteCount.vue
@@ -1,5 +1,21 @@
+
+
+ Delete account
+
+
+ Once you deactivate account, your account information will no longer be accessible.
+
+
+ 1. Once you deactivate account, your account information will no longer be accessible.
+
+
+ 2. Once you deactivate account, your account information will no longer be accessible.
+
+
+ 3. Once you deactivate account, your account information will no longer be accessible.
+
@@ -29,7 +45,6 @@
uni.showModal({
title: 'Confirm Delet?',
- content: 'All the data of the account will disappear, including the balance of money, historical orders, etc. will disappear',
cancelText: "cancel", // 取消按钮的文字
confirmText: "confirm", // 确认按钮的文字
showCancel: true, // 是否显示取消按钮，默认为 true
@@ -40,19 +55,31 @@
console.log('comfirm') //点击确定之后执行的代码
defaultRequest(this.delete).then(res =>{
if(res.error == 0){
- uni.showToast({
- icon:'none',
- title:'ok to delete!'
+ setTimeout(() =>{
+ uni.showToast({
+ icon:'none',
+ title:'ok to delete!'
+ })
+ },500)
+ uni.navigateTo({
+ url:'./deleteOk'
})
}
})
} else {
- console.log('cancel') //点击取消之后执行的代码
+ console.log('cancel')
+ //点击取消之后执行的代码
+ // uni.navigateTo({
+ // url:'./deleteOk'
+ // })
}
}
})
+ },
+ back(){
+ uni.navigateBack()
}
},
onShow() {
@@ -64,14 +91,30 @@
\ No newline at end of file
diff --git a/pages/account/deleteOk.vue b/pages/account/deleteOk.vue
new file mode 100644
index 0000000..49c2511
--- /dev/null
+++ b/pages/account/deleteOk.vue
@@ -0,0 +1,73 @@
+
+
+
+
+ Delete account
+
+
+
+ Delete account
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/account/message.vue b/pages/account/message.vue
index 3eca412..10ce86f 100644
--- a/pages/account/message.vue
+++ b/pages/account/message.vue
@@ -38,7 +38,7 @@
list:[],
myMes:{
_action:'getmessagelist',
- type:0,
+ type:1,
// importance:'',
// label:'',
page_index:1,
@@ -82,7 +82,7 @@
this.list = item
}
})
- console.log(this.list.blocks[0].block_avaiable_from)
+ console.log(this.list)
let str = this.list.blocks[0].block_avaiable_from
})
diff --git a/pages/account/settings.vue b/pages/account/settings.vue
index 3c52f16..416a8fd 100644
--- a/pages/account/settings.vue
+++ b/pages/account/settings.vue
@@ -41,20 +41,38 @@
methods:{
signOut(){
let data={_action:'logout'}
- defaultRequest2(data).then(res=>{
- console.info(res)
- if(res.error==0){
- uni.clearStorageSync()
- uni.setStorageSync('isLogin',0)
- uni.setStorageSync('user_info',' ')
- // uni.reLaunch({
- // url:'../login/index'
- // })
- uni.navigateTo({
- url:'../login/index'
+ uni.showModal({
+ title: 'Confirm SING OUT?',
+ cancelText: "cancel", // 取消按钮的文字
+ confirmText: "confirm", // 确认按钮的文字
+ showCancel: true, // 是否显示取消按钮，默认为 true
+ // confirmColor:'#ccc',
+ // cancelColor: '#000',
+ success: (res) => {
+ if(res.confirm) {
+ console.log('comfirm')
+ defaultRequest2(data).then(res=>{
+ console.info(res)
+ if(res.error==0){
+ uni.clearStorageSync()
+ uni.setStorageSync('isLogin',0)
+ uni.setStorageSync('user_info',' ')
+ // uni.reLaunch({
+ // url:'../login/index'
+ // })
+ uni.navigateTo({
+ url:'../login/index'
+ })
+ }
})
- }
+
+ } else {
+ console.log('cancel')
+
+ }
+ }
})
+
},
gotopage(a){
if(a==1){
diff --git a/pages/account/wishlist.vue b/pages/account/wishlist.vue
index 8756179..6849ab5 100644
--- a/pages/account/wishlist.vue
+++ b/pages/account/wishlist.vue
@@ -4,10 +4,11 @@
-
+
-
-
+
+
+
US${{item.promote_price?item.promote_price:item.shop_price}}
@@ -16,13 +17,13 @@
+
+
+
+
+
+
+
+
+
+
@@ -320,7 +338,10 @@
// 初始化左右盒子高度
leftH: 0,
rightH: 0,
- isbest:0
+ isbest:0,
+ popImg:'',
+ countdownTime: 6,
+ popUrl:''
}
},
onPullDownRefresh() {
@@ -337,12 +358,22 @@
onLoad() {
this.getIndex()
- // console.info(this.curEndTime)
+ // //console.info(this.curEndTime)
this.getList()
this.getMes()
+ this.getPullMes()
this.getInfo()
+ setTimeout( () =>{
+ this.open()
+ },1000)
},
+ created() {
+ this.getPullMes()
+ this.getCountdownTime()
+
+ },
onShow() {
+
this.getList()
this.getMes()
this.sum=0
@@ -391,6 +422,79 @@
methods: {
+
+ open() {
+ this.$refs.popup.open('center')
+ },
+ close() {
+ if(this.countdownTime == 0){
+ this.$refs.popup.close()
+ }
+ uni.setTabBarStyle({
+ backgroundColor: "#fff",
+ borderStyle: "black",
+ // selectedColor: "#999",
+ // color: "#999",
+ });
+
+ },
+ //获取广告
+ getPullMes(){
+ let data={_action:'getpagedata',pagecode:'001-STARTPAGE'}
+ defaultRequest(data).then( res =>{
+ console.log(res.data.zones)
+ let img
+ let url
+ if(res.error == 0){
+ res.data.zones.map( item =>{
+ if(item.zone_code == "KAIPIN"){
+ img = item.blocks[0].block_pic
+ url = item.blocks[0].block_link
+ }
+ })
+ console.log(img)
+ this.popImg = img
+ this.popUrl = url
+ }
+ })
+ },
+ //5秒倒计时
+ getCountdownTime() {
+ // uni.hideTabBar();
+ uni.setTabBarStyle({
+ backgroundColor: "#ccc",
+ borderStyle: "black",
+ // selectedColor: "#999",
+ // color: "#999",
+ });
+ this.countdownTime = 6
+ let timer = setInterval(() => {
+ this.countdownTime--;
+ if (this.countdownTime < 1) {
+ clearInterval(timer)
+ this.countdownTime = 0
+
+ // uni.redirectTo({
+ // url:'inde'
+ // })
+ }
+ }, 1000)
+ },
+ //gaogaoye 跳转
+ popImgto(){
+ const i = this.popUrl.indexOf('?')
+ if(this.popUrl.includes('dope.dope://?goodslist=1')){
+ const url = this.popUrl.substring(i)
+ console.log(url)
+ uni.navigateTo({
+ url:'/pages/category/productList'+url
+ })
+ }
+ },
+
+
+
+
// 获取首页数据配置
getIndex(){
let data={_action:'getpagedata',pagecode:'HOME'}
@@ -398,23 +502,23 @@
if(res.error==0){
this.indexDate=res.data
- console.log(this.indexDate,'首页配置')
+ //console.log(this.indexDate,'首页配置')
res.data.zones.map(item=>{
if(item.zone_code=='ICON'){
item.content=''
this.info.push(item)
- console.log(item,'info')
+ //console.log(item,'info')
}
if(item.zone_code=='LIST1'){
// this.bestlist.push(item.blocks)
- // console.log(this.bestlist,'精品')
+ // //console.log(this.bestlist,'精品')
this.isbest = 1
this.getCatList()
item.blocks.map( item =>{
this.bestlist.push(item)
})
- console.log(item,'精品')
+ //console.log(item,'精品')
}
})
@@ -423,7 +527,7 @@
defaultRequest({
_action:'getpagedata',pagecode:'HOMECLASS'
}).then(res =>{
- // console.log(res)
+ // //console.log(res)
if(res.error ==0){
this.scrollList = res.data.zones
}
@@ -457,7 +561,7 @@
}
defaultRequest(data).then(res =>{
- // console.log(res,'个人页面配置信息')
+ // //console.log(res,'个人页面配置信息')
res.data.zones.map(item =>{
if(item.zone_code =='XIAOXI'){
let list = item
@@ -472,7 +576,7 @@
let data={_action:'getcartgoods'}
defaultRequest(data).then(res=>{
- // console.info(res.data.goods_list.length,'//////')
+ // //console.info(res.data.goods_list.length,'//////')
if(res.error==0){
this.sum = res.data.goods_list.length
}
@@ -522,7 +626,7 @@
_action:'getinfo'
}
defaultRequest(data).then(res =>{
- console.log(res,'用户信息')
+ //console.log(res,'用户信息')
if(res.error == -1){
uni.setStorageSync('isLogin',0)
}else if(res.error==0){
@@ -534,7 +638,7 @@
getCatList(type){
if(this.isbest ==1){
defaultRequest4(this.catQuery).then(res=>{
- console.info(res,'最好的')
+ //console.info(res,'最好的')
if(res.error==0){
if(res.data){
@@ -545,14 +649,14 @@
goodid:item.id
})
})
- console.log(this.bestlist,'合并')
+ //console.log(this.bestlist,'合并')
const that = this
this.bestlist.forEach(res => {
// 获取图片宽高
uni.getImageInfo({
src: res.block_pic,
success: (image) => {
- // console.log(res.block_pic)
+ // //console.log(res.block_pic)
// 计算图片渲染高度
let showH = (50 * image.height) / image.width
// 判断左右盒子高度
@@ -587,7 +691,7 @@
const a = url.substring(12);
const b = url.substring(url.length - 3)
- console.log(a)
+ //console.log(a)
uni.navigateTo({
url:"../category/productList?typethree="+b+'&type=0'+'&title='+item.block_title
// url:"../category/productList"+ a +'&title='+item.block_title
@@ -610,7 +714,7 @@
if(item.zone_code=='ICON'){
item.content=''
this.info.push(item)
- console.log(item,'info')
+ //console.log(item,'info')
}
})
@@ -626,11 +730,11 @@
},
//轮播图跳转 // 热卖跳转
imgTo(item){
- console.log(item,'item')
+ //console.log(item,'item')
let goodid
if(item.block_link){
goodid = item.block_link.substring(12);
- console.log(item.block_link)
+ //console.log(item.block_link)
if(goodid.includes('goodslist')){
uni.navigateTo({
url:'../category/productList'+ goodid
@@ -648,7 +752,7 @@
}
},
Hotgoto(item1){
- console.log(item1[0].block_title + item1[0].block_link)
+ //console.log(item1[0].block_title + item1[0].block_link)
const url = item1[0].block_link.substring(12)
if(url.includes('goodslist')){
uni.navigateTo({
@@ -666,7 +770,7 @@
this.isScrollShow=true
}else if(res.scrollTop<40){
this.isScrollShow=false
- console.log('ppppp')
+
}
},
@@ -1234,4 +1338,41 @@
.left{margin-right: 2%;}
.left image,
.right image{width: 100%;margin-bottom: 10rpx;margin-top: 20rpx;}
+ .Popup{
+ height: 700rpx;
+ width: 400rpx;
+
+
+ .popup_close{
+ height: 50rpx;
+ width: 50rpx;
+
+ margin-left: 400rpx;
+ // background-color: #000000;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .popup_img{
+ height: 600rpx;
+ width: 400rpx;
+ margin-top: 10rpx;
+ margin-left: 20rpx;
+ color:red;
+ background-color: white;
+ border-radius:25rpx;
+ image{
+ width: 100%;
+ height: 100%;
+ border-radius: 25rpx;
+ position: relative;
+ }
+ text{
+ right:0;
+ position: absolute;
+ z-index:99;
+ }
+ }
+ }
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 7786d7d..5da2ea7 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -5,7 +5,11 @@
-
+
+
+
+
+
{{errMsg}}
Forgot your Password?
@@ -21,14 +25,18 @@
-
+
+
+
+
+
{{errMsg}}
- by continuong, you agree to be terms of use and privacy policy.
+ by continuong, you agree to be terms of use and privacy policy.
@@ -56,6 +64,8 @@
return {
items: ['SIGN IN', 'REGISTER'],
current: 0,
+ tag:false,
+ eye:'../../static/icon/eye_close.png',
loginDate:{
username:'',
password:'',
@@ -98,6 +108,15 @@
// return true;
// },
methods:{
+ seePwd(){
+
+ this.tag = !this.tag;
+ if(this.eye.includes('open')){
+ this.eye = '../../static/icon/eye_close.png'
+ }else{
+ this.eye ='../../static/icon/eye_open.png'
+ }
+ },
forgotPwd(){
if(this.loginDate.username==''){
uni.showToast({
@@ -216,7 +235,11 @@
})
}
else{
-
+ var urlStr = encodeURI("https://dopeplus.com/help/Terms.html")
+ // plus.runtime.openURL(urlStr);
+ uni.navigateTo({
+ url:'../order/paypalWebview?src='+urlStr
+ })
}
@@ -234,6 +257,13 @@
.login_body{
padding-top: 145.33rpx;
}
+ .see{
+ height: 30rpx;
+ width: 30rpx;
+ margin-top: 36rpx;
+ float: right;
+
+ }
.select{
margin-bottom: 80rpx;
font-size: 33.33rpx;
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 35f3a2b..a91a281 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -32,7 +32,7 @@
-
+
Shipping Method
@@ -224,6 +224,7 @@
order:{},
// 支付方式: 0、支付宝 1、银行卡、信用卡 2、谷歌支付 4、苹果支付
pay_index:0,
+ tag:0,
}
},
@@ -355,6 +356,7 @@
defaultRequest3(data,'consignee').then(res=>{
console.info(res)
if(res.error==0){
+ this.tag = 1
this.total=res.data.total
this.order=res.data.order
}
@@ -362,12 +364,14 @@
},
getList(){
defaultRequest3(this.query,'consignee').then(res=>{
+ console.log(this.query)
console.info(res)
if(res.error==0){
this.orderDate=res.data
this.address=res.data.consignee
this.goods_list=res.data.goods_list
this.shipping_list=res.data.shipping_list
+ console.info(res.data.shipping_list,'1111')
if(res.data.bonus_list){
this.bonus_list=res.data.bonus_list
}
@@ -403,16 +407,23 @@
return
}
}else{
- if(!this.address){
+ if(!this.address&&this.tag==1){
uni.showToast({
icon:'none',
title:'please add address'
})
- }else{
- this.isShow=true
+ }
+ else if(this.tag ==0){
+ uni.showToast({
+ icon:'none',
+ title:'please select shipping method'
+ })
+ }
+ else{
+ this.isShow=true
}
}
- // this.isShow=true
+
}
},
onLoad(e) {
@@ -425,11 +436,12 @@
this.getList()
uni.$once('query' ,(query)=>{
console.info(query)
- if(query.type=='address'){
+ if(query.type=='address'){
this.query.consignee=query.consignee
this.query.is_new=0
+ console.log(this.query)
this.getList()
- }
+ }
});
},
filters:{
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index c2c557b..ffb8fdb 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -191,27 +191,45 @@
-