diff --git a/App.vue b/App.vue
index 8187f76..d6a2142 100644
--- a/App.vue
+++ b/App.vue
@@ -1,13 +1,41 @@
diff --git a/api/request.js b/api/request.js
index b204f1e..968f57a 100644
--- a/api/request.js
+++ b/api/request.js
@@ -6,7 +6,7 @@ import cryptoJS from "crypto-js"
const httpRequest = (params) => {
if(params.isLoad){
uni.showLoading({
- title: "努力加载中..."
+ // title: "努力加载中..."
});
}
@@ -22,6 +22,7 @@ const httpRequest = (params) => {
}
let data=Object.assign(json_data,params.data)
console.info(data)
+ uni.setStorageSync('appdata',data)
let key=params.key
if(params.isEncryption){
// console.info(JSON.parse(JSON.stringify(data.consignee)))
@@ -66,11 +67,11 @@ const httpRequest = (params) => {
// res.data=Base64.decode(decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008'));
// console.info(res.data)
if(res.data.error!=0 && params.errMsg){
- uni.showToast({
- title: res.data.message,
- icon:'none',
- duration: 2000
- });
+ // uni.showToast({
+ // // title: res.data.message,
+ // icon:'none',
+ // duration: 2000
+ // });
}
if(res.data.error!=0 && params.isCookies){
let user_info=uni.getStorageSync('user_info')
diff --git a/main.js b/main.js
index afc6b08..87e3eee 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,16 @@
import App from './App'
+import store from '@/store/store.js'
// #ifndef VUE3
import Vue from 'vue'
Vue.config.productionTip = false
App.mpType = 'app'
const app = new Vue({
- ...App
+ ...App,
+ store
+
})
+
app.$mount()
// #endif
diff --git a/manifest.json b/manifest.json
index 79b8e17..ad98884 100644
--- a/manifest.json
+++ b/manifest.json
@@ -18,29 +18,27 @@
},
/* 模块配置 */
"modules" : {
- "Payment" : {}
+ "Payment" : {},
+ "VideoPlayer" : {}
},
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
"android" : {
"permissions" : [
+ "",
"",
+ "",
+ "",
+ "",
"",
- "",
"",
- "",
- "",
- "",
- "",
- "",
"",
- "",
+ "",
"",
- "",
- "",
""
- ]
+ ],
+ "autoSdkPermissions" : true
},
/* ios打包配置 */
"ios" : {},
@@ -50,15 +48,20 @@
"payment" : {
"alipay" : {
"__platform__" : [ "ios", "android" ]
+ },
+ "paypal" : {
+ "__platform__" : [ "ios", "android" ],
+ "returnURL_ios" : "uni.unicoe0831://paypalpay",
+ "returnURL_android" : "uni.unicoe0831://paypalpay"
}
}
},
"splashscreen" : {
"androidStyle" : "default",
"android" : {
- "hdpi" : "unpackage/res/icons/480_8001.9.png",
- "xhdpi" : "unpackage/res/icons/720_1242.9.png",
- "xxhdpi" : "unpackage/res/icons/1080_1882.9.png"
+ "hdpi" : "unpackage/res/icons/dope2.png",
+ "xhdpi" : "unpackage/res/icons/dope2.png",
+ "xxhdpi" : "unpackage/res/icons/dope2.png"
},
"useOriginalMsgbox" : false
},
diff --git a/package-lock.json b/package-lock.json
index 46992d5..fb7f54c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,9 +6,139 @@
"": {
"dependencies": {
"base-64": "^1.0.0",
- "crypto-js": "^4.1.1"
+ "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",
@@ -18,9 +148,240 @@
"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"
+ }
}
},
"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",
@@ -30,6 +391,89 @@
"version": "4.1.1",
"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",
+ "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==",
+ "requires": {
+ "@vue/devtools-api": "^6.0.0-beta.11"
+ }
}
}
}
diff --git a/package.json b/package.json
index 50c348a..62f2ad8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
{
"dependencies": {
"base-64": "^1.0.0",
- "crypto-js": "^4.1.1"
+ "crypto-js": "^4.1.1",
+ "vuex": "^4.0.2"
}
}
diff --git a/pages.json b/pages.json
index c9763d8..f8b9a9b 100644
--- a/pages.json
+++ b/pages.json
@@ -4,9 +4,11 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "uni-app",
+ "enablePullDownRefresh":true,
"app-plus":{
"titleNView":false
- }
+ },
+ "navigationBarTextStyle":"white"
}
},
{
@@ -17,12 +19,20 @@
}
}
},
+ {
+ "path": "pages/index/address",
+ "style": {
+ "navigationStyle":"custom"
+ }
+ },
{
"path": "pages/category/index",
"style": {
"app-plus":{
"titleNView":false
}
+
+
}
},
{
@@ -30,7 +40,21 @@
"style": {
"app-plus":{
"titleNView":false
- }
+ },
+ "navigationBarBackgroundColor":"#000000",
+ "navigationBarTextStyle":"white",
+ "enablePullDownRefresh":true
+
+ }
+ },
+ {
+ "path": "pages/account/deleteCount",
+ "style": {
+ "navigationBarBackgroundColor":"#000000",
+ "navigationBarTitleText": "delete Count",
+ "navigationBarTextStyle":"white"
+
+
}
},
{
@@ -73,10 +97,18 @@
"titleNView":false
}
},
+ {
+ "path": "pages/account/new",
+ "style": {
+ "navigationBarTitleText": "nothing",
+ "navigationBarBackgroundColor":"#FFFFFF"
+ }
+ },
{
"path": "pages/login/index",
"style": {
- "titleNView":false
+ "navigationBarTitleText": " ",
+ "navigationBarBackgroundColor":"#FFFFFF"
}
},
{
@@ -100,10 +132,25 @@
"navigationBarBackgroundColor":"#FFFFFF"
}
},
+ {
+ "path": "pages/order/additems",
+ "style": {
+ "app-plus":{
+ "titleNView":false
+ }
+ }
+ },
{
"path": "pages/order/confirmation",
"style": {
- "navigationBarTitleText": "0rder Confirmation",
+ "navigationBarTitleText": "Order Confirmation",
+ "navigationBarBackgroundColor":"#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/order/paypalWebview",
+ "style": {
+ "navigationBarTitleText": " ",
"navigationBarBackgroundColor":"#FFFFFF"
}
},
@@ -119,6 +166,12 @@
"titleNView":false
}
},
+ {
+ "path": "pages/index/index2",
+ "style": {
+ "titleNView":false
+ }
+ },
{
"path": "pages/order/paySuccess",
"style": {
@@ -194,14 +247,18 @@
{
"path": "pages/shippingCart/index",
"style": {
- "titleNView":false
+ "titleNView":false,
+ "enablePullDownRefresh":true
}
},
{
"path": "pages/productDetails/index",
"style": {
- "titleNView":false
+ "titleNView":false,
+ "navigationBarBackgroundColor": "#000000",
+ "navigationBarTextStyle": "white"
}
+
},
{
"path": "pages/productDetails/goodsReview",
@@ -217,6 +274,13 @@
"navigationBarBackgroundColor":"#FFFFFF"
}
},
+ {
+ "path": "pages/account/demo1",
+ "style": {
+ "navigationBarTitleText": "My demo",
+ "navigationBarBackgroundColor":"#FFFFFF"
+ }
+ },
{
"path": "pages/productDetails/review",
"style": {
@@ -229,15 +293,24 @@
"titleNView":false
}
}
- ],
+ ,{
+ "path" : "pages/specialTitle/index",
+ "style" :
+ {
+ "navigationStyle":"custom",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
"globalStyle": {
+
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "DOPE PLUS",
- "navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
+ "navigationBarTitleText": "DOPE PLUS"
+
},
"tabBar": {
- "borderStyle": "black",
+ "borderStyle": "white",
"backgroundColor": "#FFFFFF",
"color": "#999999",
"selectedColor": "#000000",
@@ -247,12 +320,15 @@
"height":"70px",
"iconWidth":"60px",
"iconPath":"static/img/tabbar_img.png"
+
},
"list": [{
"pagePath": "pages/index/index",
- "iconPath": "static/img/home.png",
- "selectedIconPath": "static/img/home1.png",
+ "iconPath": "static/icon/home3.png",
+ "selectedIconPath": "static/icon/home4.png",
"text": "Home"
+
+
},
{
"pagePath": "pages/category/index",
@@ -264,6 +340,7 @@
"pagePath": "pages/shippingCart/index",
"iconPath": "static/img/Cart.png",
"selectedIconPath": "static/img/cart1.png",
+ "navigationBarTextStyle": "black",
"text": "Cart"
},
{
@@ -273,5 +350,7 @@
"text": "Account"
}
]
+
}
+
}
diff --git a/pages/account/addAddress.vue b/pages/account/addAddress.vue
index 71e548b..e141f76 100644
--- a/pages/account/addAddress.vue
+++ b/pages/account/addAddress.vue
@@ -171,7 +171,8 @@
},
province:'',
city:'',
- address:''
+ address:'',
+ listAll:[]
}
},
methods:{
@@ -274,55 +275,122 @@
getCountry(){
let data={_action:'getregions',parent_region_id:0}
defaultRequest2(data).then(res=>{
- // console.info(res)
+ let list =[]
+ let listAll = []
+ console.info(res)
+ 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)
+ listAll.push({
+ name:item2.region_name,
+ list:item2.regions
+ })
+ this.provinceList = list
+ if(item2.region_name == this.provinceText){
+ this.cityList = item2.regions
+ }
+
+ })
+ }
+ })
+ console.log(listAll,'ppp')
+ this.listAll = listAll
+ }
}
})
},
// ѡ
bindPickerChange(e){
+ this.isSelect = true
+
if(this.index!=e.detail.value){
this.provinceText=''
this.cityText=''
this.query.consignee.city=0
this.query.consignee.province=0
}
+ let list =[]
+ let listAll = []
this.index=e.detail.value
- if(this.countryList[this.index].regions){
- this.isSelect=true
- this.provinceList=this.countryList[this.index].regions
- }else{
- this.isSelect=false
- this.isSelect1=false
- }
-
this.query.consignee.country=this.countryList[this.index].region_id
this.countryText=this.countryList[this.index].region_name
+ if(this.countryText){
+ this.countryList.map( item =>{
+ if(item.region_name == this.countryText){
+ item.regions.map(item2 =>{
+ list.push(item2.region_name)
+ listAll.push({
+ name:item2.region_name,
+ list:item2.regions
+ })
+ if(item2.region_name == this.provinceText){
+ this.cityList = item2.regions
+ if(this.cityList[0].region_name!=undefined)
+ {
+ this.cityText = this.cityList[0].region_name
+ }else{
+ this.isSelect1 = false
+ }
+ }
+
+ })
+ }
+ })
+ console.log(listAll)
+ this.provinceList = list
+ this.listAll = listAll
+ }
+
+
},
// ѡʡ
bindPickerChange1(e){
- if(this.provinceIndex!=e.detail.value){
- this.cityText=''
- this.query.consignee.city=0
- }
+ this.isSelect1 = true
this.provinceIndex=e.detail.value
- if(this.provinceList[this.provinceIndex].regions){
- this.isSelect1=true
- this.cityList=this.provinceList[this.provinceIndex].regions
- }else{
- this.isSelect1=false
- this.cityText=''
- }
+ this.provinceText=this.provinceList[this.provinceIndex]
+ 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
+ }
+ else{
+ this.isSelect1 = false
+ }
+ }
+ })
+ // this.provinceList = this.countryList[this.index].regions
+
+ // if(this.provinceIndex!=e.detail.value){
+ // this.cityText=''
+ // this.query.consignee.city=0
+ // }
+ // this.isSelect1=true
+ // this.cityList=this.provinceList[this.provinceIndex].regions
+ // if(this.provinceList[this.provinceIndex].regions){
+ // this.isSelect1=true
+ // this.cityList=this.provinceList[this.provinceIndex].regions
+ // }else{
+ // this.isSelect1=false
+ // this.cityText=''
+ // }
this.query.consignee.province=this.provinceList[this.provinceIndex].region_id
- this.provinceText=this.provinceList[this.provinceIndex].region_name
+ // this.provinceText=this.provinceList[this.provinceIndex].region_name
},
// ѡ
bindPickerChange2(e){
this.cityIndex=e.detail.value
- this.query.consignee.city=this.cityList[this.cityIndex].region_id
this.cityText=this.cityList[this.cityIndex].region_name
+ this.query.consignee.city=this.cityList[this.cityIndex].region_id
+
+
}
},
onLoad(e) {
diff --git a/pages/account/changeImg.vue b/pages/account/changeImg.vue
index 2f90713..e68408e 100644
--- a/pages/account/changeImg.vue
+++ b/pages/account/changeImg.vue
@@ -1,13 +1,13 @@
@@ -79,24 +79,31 @@
},
// 提交图片
Sub(){
- console.log( this.active_img,'选择的图片')
this.query2.user_head = this.active_img;
defaultRequest(this.query2).then( res => {
- console.log(res,'yyyy')
+
if(res.error==0){
- uni.showToast({
- title:'succuss',
- duration: 2000,
- icon:'none'
-
- })
- uni.navigateBack({
- delta:1
+ setTimeout(() =>{
+ uni.showToast({
+ title:'ok!',
+ icon:'none'
+
+ })
+ },500)
+ uni.switchTab({
+ url:'./index'
})
+
+
}
})
},
+ back(){
+ uni.navigateBack({
+ delta:1
+ })
+ }
}
}
@@ -120,7 +127,7 @@
.detail{
display: flex;
flex-wrap: wrap;
- margin:10rpx 50rpx 10rpx 50rpx;
+ margin:10rpx 4vw 10rpx 2vw;
padding: 100rpx 0;
background-color: #fff;
@@ -133,20 +140,21 @@
border-radius: 15rpx;
}
.contain{
- width: 180rpx;
- height: 160rpx;
+ width: 26vw;
+ height: 200rpx;
display: flex;
+/* background-color: antiquewhite; */
flex-direction: column;
- margin: 50rpx 10rpx 10rpx 10rpx;
- padding: 10rpx;
+ margin: 50rpx 20rpx 10rpx 20rpx;
+ /* padding: 10rpx; */
position: relative;
justify-content: center;
- align-items: center;
+ /* align-items: center; */
}
.icon{
- height: 160rpx;
- width:160rpx;
- margin: 12rpx;
+ height: 100%;
+ width:26vw;
+ /* margin: 15rpx; */
display: flex;
justify-content: flex-end;
position: absolute;
@@ -158,8 +166,8 @@
}
.main-icon-radio {
position: absolute;
- z-index: 9;
- margin-top: 110rpx;
- margin-left: 20rpx;
+
+ margin-top: 15vw;
+
}
\ No newline at end of file
diff --git a/pages/account/deleteCount.vue b/pages/account/deleteCount.vue
new file mode 100644
index 0000000..7e9fb01
--- /dev/null
+++ b/pages/account/deleteCount.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/account/demo1.vue b/pages/account/demo1.vue
new file mode 100644
index 0000000..989db30
--- /dev/null
+++ b/pages/account/demo1.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/account/favorites.vue b/pages/account/favorites.vue
index 3f30c3e..1f7a279 100644
--- a/pages/account/favorites.vue
+++ b/pages/account/favorites.vue
@@ -3,7 +3,7 @@
-
+
@@ -42,8 +42,9 @@
},
methods:{
goDetails(id){
+
uni.navigateTo({
- url:"../productDetails/index?goods_id="+id
+ url:"../productDetails/index?goodid="+id.id
})
},
// 清空浏览记录
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 5be3950..412b921 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -1,10 +1,11 @@
-
+
-
-
-
+
+
+
+
LOGIN / SIGUP>
@@ -17,59 +18,59 @@
-
- 6
+
+ {{ hb_num }}
Coupons
-
- 25
+
+ {{ count }}
Points
-
-
+
+
Wishlist
-
-
+
+
Favorites
- My Orders
+ My Orders
-
+
Unpaid
-
+
Processing
-
+
Shipped
-
+
- Returns
+ Completed
My Service
-
-
-
- Message
+
+
+
+ {{ item.block_title }}
-
+
+
Setting
-
-
+
+ -->
-
+
Recommend
@@ -107,7 +108,7 @@
- {{item.name}}
+
US${{item.is_promote==0? item.shop_price :item.promote_price}}
@@ -132,15 +133,120 @@
_action:'getgoods',
page_index:1,
page_size:30,
- type:'best'
+ type:'hot'
},
- catList:[]
+ catList:[],
+ hb_num:0,
+ noLogin:-1,
+ isLogin:-1,
+ Imglist:[],
+ count:0,
+ backButtonPress:0,
+ indexDate:[],
+ userbg:''
}
},
+ onBackPress(options) {
+ this.backButtonPress++;
+ if (this.backButtonPress > 1) {
+ plus.runtime.quit();
+ } else {
+ plus.nativeUI.toast('Click again to exit');
+ }
+ setTimeout(function() {
+ this.backButtonPress = 0;
+ }, 1000);
+ return true;
+ },
methods:{
goDetails(id){
uni.navigateTo({
- url:'/pages/productDetails/index?goods_id='+id
+ url:'/pages/productDetails/index?goodid='+id
+ })
+ },
+ gotopage(title,url){
+
+ const a = url.indexOf('?')
+ console.log(a)
+ const s = url.substring(17);
+ console.log(title)
+ console.log(url)
+ if(this.isLogin == 1 &&url==''){
+ if(title.includes('Setting')){
+ uni.navigateTo({
+ url:'./settings'
+ })
+ }
+ if(title.includes('Review')){
+ uni.navigateTo({
+ url:'./myReview'
+ })
+ }
+ }
+ else if(this.isLogin == 1 &&url.includes('dope.addressmanage')){
+ uni.navigateTo({
+ url:'./address'
+ })
+ }
+ else if(this.isLogin == 1 &&url.includes('meiqu.meiqu')){
+ uni.navigateTo({
+ url:'./message'
+ })
+ }
+ else if(url.includes('html')){
+ plus.runtime.openURL(url)
+ }
+ else if(url.includes('dope.adspecial')){
+ uni.navigateTo({
+ url:'../specialTitle/index'+s
+ })
+ }
+ else{
+ uni.navigateTo({
+ url:'../login/index'
+ })
+ }
+
+ },
+ getList(){
+ this.isLogin = uni.getStorageSync('isLogin')
+ let data={_action:'getuserbonus'}
+ defaultRequest(data).then(res=>{
+ console.info(res,)
+
+ if(res.error==0&&this.isLogin == 1){
+ this.hb_num=res.data.length
+ }
+ })
+ defaultRequest({
+ _action:'getusersummarydata'
+ }).then(res =>{
+
+ if(res.error ==0){
+ this.count = res.data.user_info.rank_points
+ }
+ })
+ },
+ getImg(){
+ let data ={
+ _action:'getpagedata',
+ pagecode:'006-PERSONALCENTERPAGE'
+ }
+ let imglist
+ defaultRequest(data).then( res =>{
+ if(res.error ==0){
+ console.log(res,'\\')
+ res.data.zones.map(item =>{
+ if(item.zone_code== 'CBANNER'){
+ imglist = item
+ this.Imglist = imglist.blocks
+ }
+ if(item.zone_code =='USERBG'){
+ this.userbg = item.blocks[0].block_pic
+ }
+ })
+
+ }
})
},
// 获取的推荐商品数据
@@ -158,54 +264,97 @@
getIndex(){
let data={_action:'getpagedata',pagecode:'006-PERSONALCENTERPAGE'}
defaultRequest(data).then(res=>{
- console.info(res)
+ console.info(res.data.zones,'页面配置')
if(res.error==0){
- // this.indexDate=res.data
- // res.data.zones.map(item=>{
- // if(item.zone_code=='ICON'){
- // item.content=''
- // this.info.push(item)
- // }
- // })
+ res.data.zones.map( item =>{
+ if(item.zone_code == 'service'){
+ this.indexDate = item
+ }
+ })
+ console.log(this.indexDate,'页面')
}
})
},
getUserInfo(){
let data={_action:'getinfo'}
- defaultRequest2(data).then(res=>{
- console.info(res)
+ defaultRequest(data).then(res=>{
+ // console.info(res,'pppppp')
if(res.error==0){
- res.data.isLogin=true
- this.user_info=res.data
- uni.setStorageSync('user_info',this.user_info)
- }else{
+ res.data.isLogin=true
+ // this.user_info=res.data
+ this.noLogin = 0
+ this.hb_num = 0
+ uni.setStorageSync('user_info',res.data)
this.user_info=uni.getStorageSync('user_info')
+ console.log(this.user_info)
+ }else if(res.error ==-1){
+
+ this.noLogin = 1
+
}
})
+ },
+ imgto(item){
+
+ const i = item.block_link.indexOf('?')
+ const url = item.block_link.substring(i)
+ console.log(item.block_link)
+ if(item.block_link.includes('dope.dope'))
+ {
+ uni.navigateTo({
+ url:'../productDetails/index'+url
+ })
+ }
}
},
- onShow() {
- this.user_info=uni.getStorageSync('user_info')
- if(this.user_info){
- this.getUserInfo()
+ onLoad(e) {
+ this.isLogin = uni.getStorageSync('isLogin')
+ if(this.isLogin==0){
+ this.user_info =' '
+ }else{
+ this.getUserInfo()
}
- // this.getIndex()
+ this.getIndex()
+ // this.getUserInfo()
this.getCatList()
+ this.getList()
+ this.getImg()
+
+
+ },
+ onShow() {
+ this.isLogin = uni.getStorageSync('isLogin')
+ uni.startPullDownRefresh()
+ },
+ onPullDownRefresh() {
+ this.isLogin = uni.getStorageSync('isLogin')
+ console.log(this.isLogin)
+ if(this.isLogin==0){
+ this.user_info =' '
+ }else{
+ this.getUserInfo()
}
+ setTimeout(function() {
+ uni.stopPullDownRefresh();
+ }, 500);
+ },
}
\ No newline at end of file
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 2ad744b..04b8127 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -37,7 +37,7 @@
{{item1.goods_name}}
-
+
{{item1.goods_attr |goodsAttr}}
@@ -63,10 +63,10 @@
total:US${{item.total_fee_o}}
-
+
@@ -114,7 +114,7 @@
{{item1.goods_name}}
-
+
{{item1.goods_attr |goodsAttr}}
@@ -138,10 +138,10 @@
total:US${{item.total_fee_o}}
-
+
@@ -175,7 +175,7 @@
{{item1.goods_name}}
-
+
{{item1.goods_attr |goodsAttr}}
@@ -497,7 +497,7 @@
{{item.goods_name}}
-
+
{{item.goods_attr |goodsAttr}}
@@ -523,7 +523,7 @@
export default {
data() {
return {
- scrollList:[{text:'All'},{text:'Unpaid'},{text:'Processing'},{text:'Shipped'},{text:'Returns'},{text:'Completed'},{text:'Closed'}],
+ scrollList:[{text:'All'},{text:'Unpaid'},{text:'Processing'},{text:'Shipped'},{text:'Completed'},{text:'Closed'}],
scroll_active:0,
isList:true,
orderList:[],
@@ -553,7 +553,7 @@
// 跳转商品详情
goGoodsDetails(id){
uni.navigateTo({
- url:'/pages/productDetails/index?goods_id='+id
+ url:'/pages/productDetails/index?goodid='+id
})
},
// 跳转评论页面
@@ -607,6 +607,15 @@
},
// 获取调用支付信息数据
getPayDate(){
+ if(this.pay_index ==0){
+ let data={_action:'payorder',order_id:this.payQuery.order_id,order_type:'GOODSBUY',payment_method:'paypal'}
+ defaultRequest2(data).then(res=>{
+ console.info(res,'支付')
+ if(res.error == 0){
+ plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
+ }
+ })
+ }else{
defaultRequest2(this.payQuery).then(res=>{
console.info(res)
if(res.error==0){
@@ -632,6 +641,7 @@
});
}
})
+ }
},
payNow(id,type){
this.payQuery.order_id=id
diff --git a/pages/account/myProfile.vue b/pages/account/myProfile.vue
index e18892c..583952a 100644
--- a/pages/account/myProfile.vue
+++ b/pages/account/myProfile.vue
@@ -5,7 +5,7 @@
Photo
-
+
@@ -20,7 +20,8 @@
Email
- {{user_info.is_validated==0?'unverified':user_info.email}}
+
+ {{user_info.is_validated==0?'Unverified':''+user_info.email}}
@@ -34,20 +35,29 @@
Ship to
+
+
+ {{ country }}
+
+
+
+
+
+ Delete account
- {{addressDate.country_name || 'United States'}}
+
-
+
diff --git a/pages/account/new.vue b/pages/account/new.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/pages/account/new.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/account/pointsDetails.vue b/pages/account/pointsDetails.vue
index 29ce004..c68ff25 100644
--- a/pages/account/pointsDetails.vue
+++ b/pages/account/pointsDetails.vue
@@ -1,6 +1,6 @@
-
+
@@ -14,16 +14,39 @@
diff --git a/pages/account/settings.vue b/pages/account/settings.vue
index 85ffdaf..3c52f16 100644
--- a/pages/account/settings.vue
+++ b/pages/account/settings.vue
@@ -1,22 +1,22 @@
-
+
+
My account
-
+
Privacy policy
-
+
Legal
@@ -25,7 +25,7 @@
CHIC BUYER
- Version 1.0
+ Version {{appver}}
@@ -35,7 +35,7 @@
export default {
data() {
return {
-
+ appver:''
}
},
methods:{
@@ -45,12 +45,42 @@
console.info(res)
if(res.error==0){
uni.clearStorageSync()
- uni.reLaunch({
+ uni.setStorageSync('isLogin',0)
+ uni.setStorageSync('user_info',' ')
+ // uni.reLaunch({
+ // url:'../login/index'
+ // })
+ uni.navigateTo({
url:'../login/index'
})
}
})
+ },
+ gotopage(a){
+ if(a==1){
+ uni.navigateTo({
+ url:'./myProfile'
+ })
+ }else if(a==2) {
+ var urlStr = encodeURI("https://en.meixx.com/help/privacy.html")
+ // plus.runtime.openURL(urlStr);
+ uni.navigateTo({
+ url:'../order/paypalWebview?src='+urlStr
+ })
+ }
+ else{
+ var urlStr2 = encodeURI("https://dopeplus.com/help/Terms.html")
+ // plus.runtime.openURL(urlStr);
+ uni.navigateTo({
+ url:'../order/paypalWebview?src='+urlStr2
+ })
+ }
}
+ },
+ onLoad() {
+ let v = uni.getStorageSync('appdata')
+ console.log(v)
+ this.appver = v.appver
}
}
@@ -107,8 +137,9 @@
position: fixed;
bottom: 0;
width: 100%;
- text-align: center;
+ line-height: 50rpx;
font-size: 20rpx;
+ text-align: center;
font-weight: bold;
margin-bottom: 112rpx;
.edition_title{
diff --git a/pages/account/wishlist.vue b/pages/account/wishlist.vue
index 8d7b44c..8756179 100644
--- a/pages/account/wishlist.vue
+++ b/pages/account/wishlist.vue
@@ -1,32 +1,32 @@
-
+
-
-
+
+
US${{item.promote_price?item.promote_price:item.shop_price}}
-
+
@@ -50,12 +50,29 @@
}else{
this.goods_id=id
}
-
+ if(this.isAll ==true){
+ this.isDelete=true
+ }
+ },
+ removeL(e){
+ console.log(e.goods_id)
+ let data={_action:'unsetfaviouritegoods',goods_id:e.goods_id}
+ defaultRequest2(data).then(res=>{
+ console.info(res)
+ if(res.error==0){
+ uni.showToast({
+ title:'ok!',
+ icon:'none'
+ })
+
+ this.getList()
+ }
+ })
},
goDetails(id){
uni.navigateTo({
- url:"../productDetails/index?goods_id="+id
+ url:"../productDetails/index?goodid="+id
})
},
getList(){
@@ -91,12 +108,22 @@
title:res.message,
icon:'none'
})
+ this.isAll = false
+ this.isDelete = false
this.getList()
}
})
},
back(){
uni.navigateBack()
+ },
+ clickRight(){
+ // this.isDelete=!this.isDelete
+ // this.isAll=false
+ if(this.goodsList){
+ this.isAll=false
+ this.isDelete=!this.isDelete
+ }
}
},
onLoad() {
diff --git a/pages/category/index.vue b/pages/category/index.vue
index 3621dcd..dec4bf9 100644
--- a/pages/category/index.vue
+++ b/pages/category/index.vue
@@ -1,6 +1,5 @@
-
-
+
@@ -15,7 +14,7 @@
-
+
@@ -23,51 +22,118 @@
-
-
-
- {{item.cat_name}}
+
-
-
- PICKS FOR YOU
-
-
- ![]()
- {{item1.cat_name}}
+
+
+
+
+
+ {{item.cat_name}}
+
+
+
+
+
+
+ {{item1.cat_name}}
+
+
+
-
-
-
+
-
-
\ No newline at end of file
+ .good_item_img{
+ height: 100rpx;
+ width: 100rpx;
+
+ image{
+ height: 100%;
+ width: 100%;
+ }
+ }
+
+
diff --git a/pages/category/productList.vue b/pages/category/productList.vue
index b3b8f80..ff5d0f0 100644
--- a/pages/category/productList.vue
+++ b/pages/category/productList.vue
@@ -1,6 +1,6 @@
-
+
@@ -11,7 +11,7 @@
-
+
@@ -38,8 +38,8 @@
-
-
+
+
{{item.short_name}}
@@ -51,7 +51,7 @@
-
+
@@ -62,18 +62,56 @@
- {{item.short_name}}
+ {{item.short_name}}
US${{item.shop_price}}
-
+
{{item.tags}}
+
+
+
+
+
+
+
+ {{ goodsDate.goods_name}}
+ US${{goodsDate.is_promote==0? goodsDate.shop_price :goodsDate.promote_price}}
+
+ {{item.name}}
+
+
+
+
+
+
+ 【{{ item1.attr_value}}】
+ {{ item1.attr_value}}
+
+
+
+
+
+
+
+
+
+ Quantity
+
+
+
+
+
+
+
+
@@ -84,19 +122,59 @@
return {
pets_index:0,
navWidth:"160rpx",
+ sum:0,
query:{
_action:'getgoods',
order_type:0,
page_index:1,
page_size:10
},
+ cartBtn:false,
list:[],
- isReachBottom:true
+ isReachBottom:true,
+ isCart:false,
+ goodsDate:{
+ comment_summary:[
+ {comment_summary:'',commentlabel: ""}
+ ],
+ gallery_list:[
+ {content:''}
+ ],
+
+ },
+ gallery_list:[],
+ goods_attr_list:[],
+ // 添加到购物车请求参数
+ cartQuery:{
+ _action:'addtocart',
+ goods_id:'',
+ goods_parent_id:0,
+ goods_number:1,
+ goods_attr_id:'',
+ goods_is_package:0
+ },
+ Is_attr:0,//是否有规格
+ Pet:'',
+ isLogin:-1,
+ current:0,
}
},
methods:{
+
+ getCartNum(){
+ let data={_action:'getcartgoods'}
+ defaultRequest(data).then(res=>{
+ console.info(res)
+ if(res.error==0){
+ this.sum = res.data.goods_list.length
+
+ // uni.setStorageSync('cartSum',this.sum)
+ }
+ })
+ },
// 添加收藏
addLike(id){
+ if(this.isLogin ==1){
let data={_action:'setfaviouritegoods',goods_id:id}
defaultRequest2(data).then(res=>{
console.info(res)
@@ -108,7 +186,13 @@
this.changeImage(id,0)
}
})
+ }else if(this.isLogin ==0){
+ uni.navigateTo({
+ url:'../login/index'
+ })
+ }
},
+
// 取消收藏
removeLike(id){
let data={_action:'unsetfaviouritegoods',goods_id:id}
@@ -116,13 +200,146 @@
console.info(res)
if(res.error==0){
uni.showToast({
- title:res.message,
+ title:'ok',
icon:'none'
})
this.changeImage(id,1)
}
})
},
+ // 添加单个商品 到购物车
+ addCart(){
+ this.isLogin = uni.getStorageSync('isLogin')
+ console.log(this.isLogin)
+ // console.log(this.goods_attr_list.length)
+
+ // if(this.goods_attr_list.length==0&&this.Is_attr>0){
+ // uni.showToast({
+ // title:'Please select the product specification',
+ // icon:'none'
+ // })
+ // return
+ // }else
+ let isall = 1
+ this.goods_attr_list.map(item =>{
+ console.log(item.goods_attr_id)
+ if(item.goods_attr_id==''){
+ isall = 0
+ }
+ })
+
+ if(this.Is_attr>0){
+ let goods_attr_id =''
+ this.goods_attr_list.map(item=>{
+ if(item.goods_attr_id!=''){
+ goods_attr_id+=item.goods_attr_id+','
+ }
+
+ })
+ if(isall==0){
+ uni.showToast({
+ title:'Please select the product specification',
+ icon:'none'
+ })
+ return
+ }
+ this.cartQuery.goods_attr_id=goods_attr_id.substring(0,goods_attr_id.lastIndexOf(','));
+ }
+
+ if(this.isLogin == 1){
+ defaultRequest2(this.cartQuery).then(res=>{
+ console.info(res,'购物车')
+ if(res.error==0){
+ if(res.data[0].success){
+ setTimeout(() =>{
+ uni.showToast({
+ title:'Successfully added',
+ icon:'none'
+ })
+ },500)
+ this.isCart = false
+
+ }
+ else{
+ uni.showToast({
+ title:res.data.message,
+ icon:'none'
+ })
+ }
+ this.getCartNum()
+ }
+ })
+
+ }else if(this.isLogin ==0){
+ uni.navigateTo({
+ url:'../login/index'
+ })
+ }
+ },
+ gotoCart(item){
+ this.goods_attr_list =[]
+ this.cartQuery.goods_id = item.id
+
+ this.isCart = true
+ let query ={
+ _action:'getgoodsdetail',
+ goods_id:item.id
+ }
+ defaultRequest(query).then( res =>{
+ if(res.error==0){
+ this.goodsDate = res.data
+ this.gallery_list = res.data.gallery_list
+ // console.log(this.goodsDate.attr_list[0].goods_attrs.length,'000')
+ if(this.goodsDate.attr_list){
+ this.Is_attr = this.goodsDate.attr_list[0].goods_attrs.length
+ this.goodsDate.attr_list.map(item=>{
+ if(item.attr_name=="Color"){
+ this.colorNum=item.goods_attrs.length
+ }
+ let data={name:item.attr_name,goods_attr_id:'',attr_id:item.attr_id,list:item.goods_attrs}
+ this.goods_attr_list.push(data)
+
+ })
+ }else if (this.goodsDate.attr_list==undefined){
+ this.goods_attr_list =[] //无规格
+ this.Is_attr = 0
+ console.log(this.goods_attr_list,'p')
+ }
+ }
+ })
+ },
+
+ // 选择规格
+ selectAttr(attr_id,goods_attr_id,index){
+ this.current = index
+ let data={attr_id:attr_id,goods_attr_id:goods_attr_id}
+ if(this.goods_attr_list.length==0){
+ this.goods_attr_list.push(data)
+ }else{
+ // 判断是否有新的规格加入
+ let isNew=false
+ for(let i in this.goods_attr_list){
+ let item=this.goods_attr_list[i]
+ if(item.attr_id==attr_id){
+ if(item.goods_attr_id==goods_attr_id){
+ this.goods_attr_list[i].goods_attr_id=''
+ }else{
+ this.goods_attr_list[i].goods_attr_id=goods_attr_id
+ console.log(this.goods_attr_list)
+
+ }
+ isNew=false
+ break
+ }else{
+ isNew=true
+ }
+ }
+ if(isNew){
+ this.goods_attr_list.splice(index,0,data)
+ }
+ }
+ },
+
// 切换图片
changeImage(id,type){
this.list.map(item=>{
@@ -138,10 +355,10 @@
back(){
uni.navigateBack()
},
- goDetails(item){
+ goDetails(item,e){
console.info(item)
uni.navigateTo({
- url:"../productDetails/index?goods_id="+item.id
+ url:`../productDetails/index?goodid=${item.id}&e=${e}`
})
},
goPage(){
@@ -166,8 +383,11 @@
this.getList(0)
},
getList(type){
+
+ console.log(this.query,'指令')
defaultRequest(this.query).then(res=>{
console.info(res)
+
if(res.error==0){
if(res.data){
if(type==0){
@@ -191,18 +411,37 @@
}
},
onLoad(e) {
- if(e.type==0){
- this.query.cat=e.cat_id
- }else{
- this.query.keyword=e.keyword
+ console.log(e)
+ if(e.gid){
+ this.query.gid = e.gid
+ }
+ this.isLogin = uni.getStorageSync('isLogin')
+ const a = parseInt(e.typethree)
+ this.Pet = e.title
+ if(e.type ==0||e.goodslist ==1){
+ this.query.cat= a
+ }
+ else{
+ this.query.keyword=e.keyword
+ this.Pet = e.keyword
}
+
+ this.getCartNum()
this.getList(0)
+
+ },
+ onShow() {
+ this.isLogin = uni.getStorageSync('isLogin')
+ this.getCartNum()
+
},
// 上拉加载
onReachBottom(){
+
if(!this.isReachBottom)return
this.query.page_index++
this.getList(1)
+
},
onPullDownRefresh(){
uni.stopPullDownRefresh()
@@ -244,9 +483,9 @@
position: fixed;
background-color: white;
top: 0;
- margin-top: 155rpx;
+ margin-top: 135rpx;
/* #ifdef H5 */
- margin-top: 85rpx;
+ margin-top: 25rpx;
/* #endif */
width: 100%;
box-sizing: border-box;
@@ -308,6 +547,7 @@
font-weight: 400;
padding-top: 32rpx;
color: #000000;
+
.desc{
margin-top: 28.67rpx;
display: flex;
@@ -335,7 +575,7 @@
}
}
.product{
- padding-top: 34.67rpx;
+ padding-top: 34rpx;
.product_item{
display: flex;
align-items: center;
@@ -350,15 +590,17 @@
}
.product_item_right{
width: 440rpx;
+ height: 213.33rpx;
display: flex;
+ // background-color: #B22234;
flex-direction: column;
- justify-content: center;
+ justify-content: space-between;
margin-left: 36rpx;
.item_right_lable{
display: flex;
flex-wrap: wrap;
- margin-top: 20.33rpx;
+ margin-top: 20.33rpx;
margin-bottom: 30.67rpx;
.right_lable_item{
padding: 11.33rpx 18rpx;
@@ -393,4 +635,285 @@
}
}
}
+
+ .addCard{
+ z-index: 999;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: white;
+ padding-left: 29.33rpx;
+ padding-right: 29.33rpx;
+ box-sizing: border-box;
+ padding-top: 77.67rpx;
+ width: 100%;
+ font-size: 30.67rpx;
+ font-weight: 400;
+ padding-bottom: 44.67rpx;
+
+ .addCard_close{
+ width: 21.33rpx;
+ height: 21.33rpx;
+ position: absolute;
+ right: 24.67rpx;
+ top: 18.67rpx;
+ }
+ .spike1{
+ margin-top: 0;
+ margin-bottom: 34rpx;
+ padding-bottom: 0;
+ border-bottom: none;
+ .addCard_scroll{
+ width: 286.67rpx;
+ height: 286.67rpx;
+ margin-left: 10.67rpx;
+ &:first-child{
+ margin-left: 0;
+ }
+ &:last-child{
+ margin-right: 15rpx;
+ }
+ }
+ }
+ .addCard_body{
+ padding-right: 31.33rpx;
+ max-height: 600rpx;
+ min-height: 400rpx;
+ .addCard_price{
+ font-size: 44rpx;
+ font-weight: 500;
+ margin-top: 27.33rpx;
+ margin-bottom: 51.33rpx;
+ }
+ .color_select{
+
+ display: flex;
+ font-size: 16.67rpx;
+ color: #666666;
+ flex-wrap: wrap;
+ margin-bottom: 59.33rpx;
+ .color_select_item{
+ margin-top: 22rpx;
+ position: relative;
+ background-color: #F9F7FA;
+ border-radius: 6.67rpx;
+ margin-right: 12.67rpx;
+ width: 134.67rpx;
+ image{
+ width: 134.67rpx;
+ height: 133.33rpx;
+ border-radius: 6.67rpx 6.67rpx 0 0;
+ }
+ .color_select_item_zoom{
+ width: 20.33rpx;
+ height: 20.33rpx;
+ // background-color: rgba(0, 0, 0, 0.3);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ right: 12.67rpx;
+ top: 9.33rpx;
+ z-index: 99;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .color_select_item_bottom{
+ padding: 10rpx 0rpx;
+ font-size: 24rpx;
+ text-align: center;
+
+ }
+ }
+ .active_color{
+ color: #B22234;
+ background-color: white;
+ border: 1px solid #000000;
+ }
+ }
+ .variations_select_size{
+ margin-left: 0;
+ margin-top: 26.67rpx;
+ margin-bottom: 40.67rpx;
+ .select_size_item{
+ margin-bottom: 16.67rpx !important;
+ &:nth-child(4n+4){
+ margin-right: 0;
+ }
+ }
+ }
+
+ }
+
+
+ }
+ .quantity{
+ display: flex;
+ align-items: center;
+ background-color: white;
+ justify-content: space-between;
+ margin-bottom: 43.33rpx;
+
+ .uni-numbox{
+ border: 1px solid #999999;
+ border-radius: 14rpx;
+ height: 42.67rpx;
+
+
+ /deep/ .uni-numbox__minus{
+ border-radius: 14rpx;
+ }
+ /deep/.uni-numbox__plus{
+ border-radius: 14rpx;
+ }
+ /deep/.uni-numbox__value{
+ border-left: 1px solid #999999;
+ border-right: 1px solid #999999;
+ height: 100%;
+ width: 63.33rpx;
+ font-size: 21.33rpx;
+ }
+ }
+ }
+ button{
+ width: 100%;
+ height: 73.33rpx;
+ line-height: 73.33rpx;
+ background-color: #191919;
+ color: white;
+ font-weight: bold;
+ font-size: 26.67rpx;
+ }
+ .spike1{
+ white-space: nowrap;
+ width: 100%;
+ margin-top: 36.67rpx;
+ padding-bottom: 34rpx;
+ border-bottom: 1px solid #E2E2E2;
+ ::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background-color: transparent;
+ }
+ .spike1_item{
+ width: 410rpx;
+ background-color: #F6F6F6;
+ padding: 21.33rpx 24.67rpx;
+ margin-right: 19.33rpx;
+ font-size: 20rpx;
+ display: inline-block;
+ color: #737373;
+ &:last-child{
+ margin-right: 0;
+ }
+ view{
+ margin-bottom: 10rpx;
+ }
+ .spike1_item_title{
+ font-weight: bold;
+
+ .text_black{
+ color: black;
+ display: inline-block;
+ margin-left: 10rpx;
+ }
+ .text_red{
+ color: #B22234;
+ display: inline-block;
+ margin-left: 10rpx;
+ }
+ }
+ }
+ .spike1_item1{
+ color: #191919;
+ font-size: 29.33rpx;
+ margin-right: 16.67rpx;
+ width: 200rpx;
+ display: inline-block;
+ font-weight: bold;
+ .spike1_item_img{
+ width: 200rpx;
+ height: 200rpx;
+
+ background-color: #999999;
+ }
+ .spike1_item_bottom{
+ padding-left: 9.33rpx;
+ margin-top: 22.67rpx;
+
+ .spike1_item_text{
+ color: #9D9D9D;
+ font-size: 21.33rpx;
+ text-decoration: line-through;
+ }
+ .spike1_item_text1{
+ color: #9D9D9D;
+ font-size: 21.33rpx;
+ }
+ }
+ .spike1_item_bottom1{
+ padding-left: 9.33rpx;
+ margin-top: 19.33rpx;
+ font-weight: bold;
+
+ .spike1_item_text{
+ color: #000000;
+ font-size: 16rpx;
+ font-weight: 400;
+ margin-bottom: 20.67rpx;
+ white-space: break-spaces;
+
+ }
+ }
+
+ }
+ .spike1_item:last-child{
+ margin-right: 0;
+ }
+ }
+ .variations_select_size{
+ margin-left: 20.67rpx;
+ display: flex;
+ flex-wrap: wrap;
+ .select_size_item{
+ background-color: #F8F8F8;
+ min-width: 121.33rpx;
+ height: 54.67rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 12.67rpx;
+ color: #666666;
+ font-size: 24rpx;
+ margin-right: 18.67rpx;
+ border: 1px solid #F8F8F8;
+ padding: 0 10rpx;
+ margin-bottom: 16.67rpx;
+
+ // &:nth-child(-n+2){
+ // margin-bottom: 16.67rpx;
+ // }
+ }
+ }
+ .item_text{
+ height: 80rpx;
+ line-height: 40rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+
+
+ }
+ .mask {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ background-color: black;
+ opacity: 0.5;
+ z-index: 998;
+ top: 0;
+ left: 0;
+ }
\ No newline at end of file
diff --git a/pages/index/address.vue b/pages/index/address.vue
new file mode 100644
index 0000000..d61b70f
--- /dev/null
+++ b/pages/index/address.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+ Ship to
+
+ Popular Countries/Regions
+
+ {{ item2.name}}
+
+
+
+ {{ item.title}}
+
+ {{ item1.name}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/flashSale.vue b/pages/index/flashSale.vue
index aaafbc8..bba8060 100644
--- a/pages/index/flashSale.vue
+++ b/pages/index/flashSale.vue
@@ -1,7 +1,7 @@
+ color="#000000" @clickLeft="back" @clickRight="isDelete=!isDelete" :border="false"/>
@@ -16,9 +16,9 @@
The quantity of special price commodities is limited and will be sold out
-
+
-
+
{{item.name}}
@@ -26,22 +26,98 @@
US${{item.promote_price?item.promote_price:item.shop_price}}
US${{item.shop_price}}
-
+
+
+
+
+
+
+
+
+ {{ goodsDate.goods_name}}
+ US${{goodsDate.is_promote==0? goodsDate.shop_price :goodsDate.promote_price}}
+
+ {{item.name}}
+
+
+
+
+
+
+
+ 【{{ item1.attr_value}}】
+ {{ item1.attr_value}}
+
+
+
+
+
+
+ Quantity
+
+
+
+
+
+
@@ -166,4 +368,275 @@
margin-bottom: 30rpx;
text-align: center;
}
+ .addCard{
+ z-index: 999;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: white;
+ padding-left: 29.33rpx;
+ box-sizing: border-box;
+ padding-top: 77.67rpx;
+ width: 100%;
+ font-size: 30.67rpx;
+ font-weight: 400;
+ padding-bottom: 44.67rpx;
+
+ .addCard_close{
+ width: 21.33rpx;
+ height: 21.33rpx;
+ position: absolute;
+ right: 24.67rpx;
+ top: 18.67rpx;
+ }
+ .spike1{
+ margin-top: 0;
+ margin-bottom: 34rpx;
+ padding-bottom: 0;
+ border-bottom: none;
+ .addCard_scroll{
+ width: 286.67rpx;
+ height: 286.67rpx;
+ margin-left: 10.67rpx;
+ &:first-child{
+ margin-left: 0;
+ }
+ &:last-child{
+ margin-right: 15rpx;
+ }
+ }
+ }
+ .addCard_body{
+ padding-right: 31.33rpx;
+ min-height: 400rpx;
+ max-height: 600rpx;
+ .addCard_price{
+ font-size: 44rpx;
+ font-weight: 500;
+ margin-top: 27.33rpx;
+ margin-bottom: 51.33rpx;
+ }
+ .color_select{
+
+ display: flex;
+ font-size: 16.67rpx;
+ color: #666666;
+ flex-wrap: wrap;
+ margin-bottom: 59.33rpx;
+ .color_select_item{
+ margin-top: 22rpx;
+ position: relative;
+ background-color: #F9F7FA;
+ border-radius: 6.67rpx;
+ margin-right: 12.67rpx;
+ width: 134.67rpx;
+ image{
+ width: 134.67rpx;
+ height: 133.33rpx;
+ border-radius: 6.67rpx 6.67rpx 0 0;
+ }
+ .color_select_item_zoom{
+ width: 20.33rpx;
+ height: 20.33rpx;
+ // background-color: rgba(0, 0, 0, 0.3);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ right: 12.67rpx;
+ top: 9.33rpx;
+ z-index: 99;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .color_select_item_bottom{
+ padding: 10rpx 0rpx;
+ font-size: 24rpx;
+ text-align: center;
+
+ }
+ }
+ .active_color{
+ color: #B22234;
+ background-color: white;
+ border: 1px solid #000000;
+ }
+ }
+ .variations_select_size{
+ margin-left: 0;
+ margin-top: 26.67rpx;
+ margin-bottom: 40.67rpx;
+ .select_size_item{
+ margin-bottom: 16.67rpx !important;
+ &:nth-child(4n+4){
+ margin-right: 0;
+ }
+ }
+ }
+
+ }
+
+
+ }
+ .quantity{
+ display: flex;
+ background-color: white;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 43.33rpx;
+ margin-left: 10rpx;
+
+ .uni-numbox{
+ border: 1px solid #999999;
+ border-radius: 14rpx;
+ height: 42.67rpx;
+ margin-right: 17rpx;
+ /deep/ .uni-numbox__minus{
+ border-radius: 14rpx;
+ }
+ /deep/.uni-numbox__plus{
+ border-radius: 14rpx;
+ }
+ /deep/.uni-numbox__value{
+ border-left: 1px solid #999999;
+ border-right: 1px solid #999999;
+ height: 100%;
+ width: 63.33rpx;
+ font-size: 21.33rpx;
+ }
+ }
+ }
+ button{
+ width: 98%;
+ margin: 0 1%;
+ height: 73.33rpx;
+ line-height: 73.33rpx;
+ background-color: #191919;
+ color: white;
+ font-weight: bold;
+ font-size: 26.67rpx;
+ }
+ .spike1{
+ white-space: nowrap;
+ width: 100%;
+ margin-top: 36.67rpx;
+ padding-bottom: 34rpx;
+ border-bottom: 1px solid #E2E2E2;
+ ::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background-color: transparent;
+ }
+ .spike1_item{
+ width: 410rpx;
+ background-color: #F6F6F6;
+ padding: 21.33rpx 24.67rpx;
+ margin-right: 19.33rpx;
+ font-size: 20rpx;
+ display: inline-block;
+ color: #737373;
+ &:last-child{
+ margin-right: 0;
+ }
+ view{
+ margin-bottom: 10rpx;
+ }
+ .spike1_item_title{
+ font-weight: bold;
+
+ .text_black{
+ color: black;
+ display: inline-block;
+ margin-left: 10rpx;
+ }
+ .text_red{
+ color: #B22234;
+ display: inline-block;
+ margin-left: 10rpx;
+ }
+ }
+ }
+ .spike1_item1{
+ color: #191919;
+ font-size: 29.33rpx;
+ margin-right: 16.67rpx;
+ width: 200rpx;
+ display: inline-block;
+ font-weight: bold;
+ .spike1_item_img{
+ width: 200rpx;
+ height: 200rpx;
+
+ background-color: #999999;
+ }
+ .spike1_item_bottom{
+ padding-left: 9.33rpx;
+ margin-top: 22.67rpx;
+
+ .spike1_item_text{
+ color: #9D9D9D;
+ font-size: 21.33rpx;
+ text-decoration: line-through;
+ }
+ .spike1_item_text1{
+ color: #9D9D9D;
+ font-size: 21.33rpx;
+ }
+ }
+ .spike1_item_bottom1{
+ padding-left: 9.33rpx;
+ margin-top: 19.33rpx;
+ font-weight: bold;
+
+ .spike1_item_text{
+ color: #000000;
+ font-size: 16rpx;
+ font-weight: 400;
+ margin-bottom: 20.67rpx;
+ white-space: break-spaces;
+
+ }
+ }
+
+ }
+ .spike1_item:last-child{
+ margin-right: 0;
+ }
+ }
+ .variations_select_size{
+ margin-left: 20.67rpx;
+ display: flex;
+ flex-wrap: wrap;
+ .select_size_item{
+ background-color: #F8F8F8;
+ min-width: 121.33rpx;
+ height: 54.67rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 12.67rpx;
+ color: #666666;
+ font-size: 24rpx;
+ margin-right: 18.67rpx;
+ border: 1px solid #F8F8F8;
+ padding: 0 10rpx;
+ margin-bottom: 16.67rpx;
+
+ // &:nth-child(-n+2){
+ // margin-bottom: 16.67rpx;
+ // }
+ }
+ }
+ .mask {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ background-color: black;
+ opacity: 0.5;
+ z-index: 998;
+ top: 0;
+ left: 0;
+ }
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 32ee5d1..ea11d86 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,67 +3,81 @@
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
search
-
+
+
- {{item.text}}
+ {{item.zone_name}}
-
+
-
-
+
+
-
-
+
+
-
-
+
-
+
{{item2.block_title}}
@@ -75,29 +89,29 @@
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -108,21 +122,21 @@
Flash Sale
-
+
-
-
-
-
+
+
+
+
-
- US${{item1.block_price}}
- US${{item1.block_title}}
+
+ US${{item1.promote_price}}
+ US${{item1.shop_price}}
@@ -132,7 +146,7 @@
{{item.blocks[0].block_title}}
-
+
@@ -141,16 +155,16 @@
-
-
+
+
{{item1.block_title}}
-
-
+
+
{{item1.block_title}}
@@ -166,10 +180,10 @@
-->
-
-
-
-
+
+
+
+
@@ -183,14 +197,14 @@
-->
-
+
-
-
+
+
- US${{item1.block_price}}
- {{item1.block_title}}
+ {{item1.block_title}}
+ {{item1.block_title2}}
@@ -226,33 +240,58 @@
-->
-
-
- PRODUCTS FRO YOU
-
-
-
-
-
- {{item1.title}}
- {{item1.block_price}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{item.block_title}}
+ {{item.block_title2}}
+ {{item.block_title3}}
+
+
+
+
+
+
+
+ {{item1.block_title}}
+ {{item1.block_title2}}
+ {{item1.block_title3}}
+
+
+
+
+
@@ -342,18 +681,24 @@
// position: relative;
}
.ONEPIC{
- width: 100%;
- height: auto;
+ width: 100%;
+ height: 100%;
+ margin: -12rpx 0;
image{
- // height: auto;
- width: 100%;
+ height: 100%;
+ width: 100%;
+ }
+ &:nth-last-child(){
+ margin-bottom: 10rpx;
}
}
.TWOPIC{
- width: 100%;
+ width: 100%;
display: flex;
+
image{
- width: 50%;
+ width: 100%;
+ height: 100%;
}
}
.THREEPIC{
@@ -361,15 +706,19 @@
display: flex;
justify-content: space-between;
image{
- width: 33%;
+ width: 100%;
+ height: 100%;
+
}
+
}
.FOURPIC{
width: 100%;
display: flex;
justify-content: space-between;
image{
- width: 25%;
+ width: 100%;
+ height: 100%;
}
}
.FIVEPIC{
@@ -377,7 +726,8 @@
display: flex;
justify-content: space-between;
image{
- width: 20%;
+ width: 100%;
+ height: 100%;
}
}
.SIXPIC{
@@ -385,11 +735,15 @@
display: flex;
justify-content: space-between;
image{
- width: 16.6%;
+ width: 100%;
+ height: 100%;
}
}
.body{
- padding-top: 361.33rpx;
+ padding-top: 300.33rpx;
+ }
+ .flex{
+ display: flex;
}
.index_logo{
width: 270.33rpx !important;
@@ -399,33 +753,55 @@
.isScrollShow{
float: right;
+
+
+
}
.isScrollShow1{
float: left;
- margin-top: 20rpx;
- width: 80% !important;
+ margin-top: 70rpx;
+ width: 65% !important;
}
.isScrollShow2{
float: left;
+
+ }
+ .isScrollShow3{
+ float: left;
+ width: 70rpx;
+ height: 70rpx;
+ margin-top: 70rpx;
+ // margin-left: 20rpx;
+ margin-right: 25rpx;
+ image{
+ height: 100%;
+ width: 100%;
+ }
}
.page_padding{
- padding: 0 26.67rpx;
+ padding-left: 26.37rpx;
+ padding-right: 26.67rpx;
box-sizing: border-box;
+ margin-top: 10rpx;
}
.page_padding_left{
- padding-left: 26.67rpx;
+ padding-left: 16.67rpx;
+ padding-right: 18.67rpx;
}
+
.navigation{
/* display: flex; */
+ background-color:#161616;
position: fixed;
top: 0;
z-index: 99;
- background: white;
+ height: 261rpx;
width: 100%;
.navigation_title{
display: flex;
padding: 30rpx 0;
align-items: center;
+
justify-content: space-between;
image{
@@ -437,21 +813,29 @@
font-weight: 800;
font-style: italic;
font-size: 42.67rpx;
+
}
+ .navigation_title_padding{
+ margin-top: 50rpx !important;
+ padding: 0 !important;
+
+ }
.navigation_title_right{
+
display: flex;
align-items: center;
>uni-navigator:first-child{
margin-right: 32.67rpx;
}
+
}
}
.navigation_seach{
width: 100%;
background-color: #F5F6FA;
- border-radius: 6.67rpx;
+ border-radius: 35rpx;
height: 66.67rpx;
display: flex;
align-items: center;
@@ -467,13 +851,18 @@
}
}
.navigation_scroll{
- padding-top: 28rpx;
- padding-bottom: 37.33rpx;
- padding-left: 40rpx;
+ margin-top: 10rpx;
+ padding-top: 10rpx;
+ padding-bottom: 10rpx;
+ background-color: white;
+
+ // padding-right: 13rpx;
+ padding-left: 24rpx;
+ padding-right: 24rpx;
.scroll-view_H{
white-space: nowrap;
font-size: 26.67rpx;
- color: #161616;
+ color: #484848;
width: 100%;
// display: flex;
@@ -487,7 +876,7 @@
margin-left: 46.67rpx;
display: inline-block;
font-weight: 600;
- padding: 28.67rpx 0;
+ padding: 12.67rpx 0;
}
view:first-child{
margin-left: 0;
@@ -501,19 +890,22 @@
}
.uni-margin-wrap{
width: 100%;
- margin-bottom: 35.33rpx;
-
+ margin-top: 45.33rpx;
+ margin-bottom: 45.33rpx;
.swiper {
- height: 373.33rpx;
-
+ // height: 360.33rpx;
+ width: 720rpx;
+ // height: 100%;
.swiper-item {
display: block;
- height: 373.33rpx;
+ // width: 720rpx;
+ height: 100%;
+
line-height: 373.33rpx;
text-align: center;
color: white;
image{
- width: 100%;
+ width: 100%;
height: 100%;
}
}
@@ -530,40 +922,46 @@
}
.grid_swiper {
height: 380rpx;
-
+ // margin: 0 10rpx 0 10rpx;
.grid_content{
- display: flex;
- justify-content: space-between;
+ display: flex;
flex-wrap: wrap;
- padding: 0 28rpx;
-
+
.grid_item{
- width: 97.33rpx;
+ // width: 97.33rpx;
display: flex;
+ width: 150rpx;
+ height: 150rpx;
flex-direction: column;
- align-items: center;
+ align-items: center;
+ justify-content: space-between;
color: #1B1B1B;
font-size: 24rpx;
- margin-bottom: 53.33rpx;
- margin-right: 84rpx;
+ // margin-right: 6rpx;
+ margin-bottom: 13.33rpx;
font-weight: 500;
-
+
+ padding-right: 10rpx;
+ margin-left: 25.37rpx;
+ &:last-child(){
+ margin-left: 0;
+ }
.grid_item_img{
- width: 100%;
+ width: 97.33rpx;
height: 97.33rpx;
margin-bottom: 6.67rpx;
- background-color: #8F9094;
-
+ // background-color: #8F9094;
+
image{
width: 100%;
height: 100%;
}
}
}
- .grid_item:nth-child(n+4){
- margin-right: 0;
- }
+ // .grid_item:nth-child(n+4){
+ // margin-right: 0;
+ // }
}
}
@@ -580,7 +978,8 @@
font-size: 32rpx;
color: #161616;
font-weight: bold;
- margin-bottom: 40rpx;
+ margin-bottom: 23rpx;
+ margin-top: 37.37rpx;
.title_right{
display: flex;
@@ -593,10 +992,21 @@
}
}
}
+ .item_img{
+ width: 100%;
+ margin-left: 4rpx;
+ image{
+ width: 100%;
+ height: 100%;
+
+ }
+ }
.spike1{
white-space: nowrap;
width: 100%;
- margin-bottom: 70.67rpx;
+ padding-right:16rpx ;
+ padding-left: 16rpx;
+ margin-bottom: 47.67rpx;
::-webkit-scrollbar {
width: 0;
height: 0;
@@ -606,23 +1016,33 @@
.spike1_item{
color: #191919;
font-size: 26.67rpx;
- margin-right: 16.67rpx;
- width: 200rpx;
+ // margin-right: 16.67rpx;
+ // width: 200rpx;
+ // margin-left: 16rpx;
+ padding-right:16rpx ;
display: inline-block;
font-weight: 500;
+ &:last-child{
+ margin-right: 37rpx;
+ }
.spike1_item_img{
- width: 200rpx;
- height: 200rpx;
- // background-color: #999999;
+ width: 180rpx;
+ height: 180rpx;
+ background-color: #999999;
+ padding-right:16rpx ;
image{
width: 100%;
height: 100%;
+
}
}
+ // .padding_honlist2{
+ // margin-right: 280rpx !important;
+ // }
.spike1_item_bottom{
padding-left: 9.33rpx;
- margin-top: 22.67rpx;
+ margin-top: 7.67rpx;
.spike1_item_text{
color: #9D9D9D;
@@ -661,7 +1081,8 @@
color: #000000;
font-size: 28rpx;
font-weight: 400;
- margin-bottom: 69.33rpx;
+ // margin-bottom: 149.33rpx;
+ margin-bottom: 44rpx;
.hotSells1_item{
width: 340rpx;
@@ -670,12 +1091,12 @@
.hotSells1_item_img{
width: 100%;
- height: 266.67rpx;
+ // // height: 266.67rpx;
// background-color: #999999;
- margin-bottom: 23.33rpx;
+ margin-bottom: 5.33rpx;
image{
width: 100%;
- height: 100%;
+ height: 100%;
}
}
}
@@ -683,16 +1104,17 @@
width: 224rpx;
display: flex;
flex-direction: column;
- margin-top: 49.33rpx;
+ // margin-top: 49.33rpx;
+ margin-top: 18.33rpx;
.hotSells2_item_img{
- width: 100%;
- height: 224rpx;
+ // width: 100%;
+ // height: 224rpx;
// background-color: #999999;
- margin-bottom: 25.33rpx;
+ margin-bottom: 5.33rpx;
image{
width: 100%;
- height: 100%;
+ height: 100%;
}
}
}
@@ -738,10 +1160,11 @@
padding: 0 16.67rpx;
padding-bottom: 36.67rpx;
.title{
- font-size: 29.33rpx;
+ font-size: 25.33rpx;
font-weight: 400;
- margin-top: 24.67rpx;
- margin-bottom: 32.67rpx;
+ // margin-top: 24.67rpx;
+ margin-top: 14.67rpx;
+ // margin-bottom: 32.67rpx;
}
.desc{
@@ -751,5 +1174,64 @@
}
}
-
+ .padding_left{
+ margin-left: 17rpx;
+ }
+ .best_item{
+ display: flex;
+ flex-wrap: wrap;
+ flex-direction: row;
+ align-items: center;
+ margin: 0 10rpx 0 10rpx;
+ // width: 80vw;
+ // height:400rpx ;
+
+ .best_one{
+ width: 45vw;
+ height: 400rpx;
+ margin: 10rpx;
+ justify-content: center;
+ align-items: center;
+ background-color: #fff;
+ .best_img{
+ height: 360rpx;
+ width: 360rpx;
+
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .best_text{
+ line-height:40rpx ;
+ text-align: center;
+ }
+ }
+
+
+ }
+ .container {
+ padding: 0 30rpx;
+ font-size: 14rpx;
+ line-height: 24rpx;
+
+ }
+ .title{
+ font-size: 25.33rpx;
+ font-weight: 400;
+ // margin-top: 24.67rpx;
+ margin-top: 10.67rpx;
+ margin-bottom: 10.67rpx;
+
+ }
+ .desc{
+ font-size: 32rpx;
+ font-weight: bold;
+ margin-top: 24.67rpx;
+ }
+ .right,
+ .left{display: inline-block; width: 49%;vertical-align: top;}
+ .left{margin-right: 2%;}
+ .left image,
+ .right image{width: 100%;margin-bottom: 10rpx;margin-top: 20rpx;}
diff --git a/pages/index/index2.vue b/pages/index/index2.vue
new file mode 100644
index 0000000..147373d
--- /dev/null
+++ b/pages/index/index2.vue
@@ -0,0 +1,1126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item2.block_title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Flash Sale
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ US${{item1.promote_price}}
+ US${{item1.shop_price}}
+
+
+
+
+
+
+
+ {{item.blocks[0].block_title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item1.block_title}}
+
+
+
+
+
+
+
+ {{item1.block_title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item1.block_title}}
+ {{item1.block_title2}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PRODUCTS FRO YOU
+
+
+
+
+
+ {{item1.block_title}} {{item1.block_title3}}
+ {{item1.block_title2}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/pickUpCentre.vue b/pages/index/pickUpCentre.vue
index 79f7992..3d80613 100644
--- a/pages/index/pickUpCentre.vue
+++ b/pages/index/pickUpCentre.vue
@@ -1,12 +1,12 @@
-
+
diff --git a/pages/index/search.vue b/pages/index/search.vue
index a147e22..5065af9 100644
--- a/pages/index/search.vue
+++ b/pages/index/search.vue
@@ -10,11 +10,11 @@
Recently Searched
-
+
-
- Gold Necklaces
- Push Up Swimsuit
+
+ {{ item }}
+
@@ -22,11 +22,10 @@
Figured you’d want it
-
-
+
+ {{item.block_title}}
+
+
@@ -55,7 +54,9 @@
page_size:30,
type:'best'
},
- catList:[]
+ searchHistoryList:[],
+ catList:[],
+ searchHot:[]
}
},
methods:{
@@ -65,21 +66,22 @@
})
},
// 获取的推荐商品数据
- getCatList(type){
- defaultRequest4(this.catQuery).then(res=>{
- console.info(res)
- if(res.error==0){
- if(res.data){
- this.catList=res.data
- }
- }
- })
- },
+ // getCatList(type){
+ // defaultRequest4(this.catQuery).then(res=>{
+ // console.info(res)
+ // if(res.error==0){
+ // if(res.data){
+ // this.catList=res.data
+ // }
+ // }
+ // })
+ // },
// 获取首页数据配置
getIndex(){
- let data={_action:'getpagedata',pagecode:'SEARCHHOT'}
+ let searchHot =[]
+ let data={_action:'getpagedata',pagecode:'CLASS'}
defaultRequest(data).then(res=>{
- console.info(res)
+ console.info(res.data.zones,'有毒')
if(res.error==0){
// this.indexDate=res.data
// res.data.zones.map(item=>{
@@ -88,19 +90,84 @@
// this.info.push(item)
// }
// })
+ res.data.zones.map(item =>{
+ if(item.zone_code=='SEARCHHOT'){
+ searchHot= item
+ }
+ console.log(searchHot.blocks,'pp')
+ this.searchHot = searchHot.blocks
+ })
}
})
},
+
search(){
if(this.searchValue=='')return
+ // this.$store.commit('addSave', this.searchValue)
+ // console.log(this.$store.state)
+
+ if (!this.searchHistoryList.includes(this.searchValue)) {
+ this.searchHistoryList.unshift(this.searchValue);
+ uni.setStorage({
+ key: 'searchList',
+ data: JSON.stringify(this.searchHistoryList)
+ });
+ } else {
+ //有搜索记录和之前搜索记录一样，删除之前的旧记录，将新搜索值重新push到数组首位
+ let i = this.searchHistoryList.indexOf(this.searchValue);
+ this.searchHistoryList.splice(i, 1);
+ this.searchHistoryList.unshift(this.searchValue);
+ uni.setStorage({
+ key: 'searchList',
+ data: JSON.stringify(this.searchHistoryList)
+ });
+ }
+ let data ={
+ _action:'getgoods',keyword:this.searchValue
+ }
+ // defaultRequest(data).then(res=>{
+ // console.log(res,'ke')
+ // })
uni.navigateTo({
url:'../category/productList?keyword='+this.searchValue+'&type=1'
})
- }
+ },
+ tapSearch(i){
+ this.searchValue = i
+ },
+ // 清空搜索记录
+ empty() {
+ uni.showToast({
+ title: 'emptied'
+
+ });
+ uni.removeStorage({
+ key: 'searchList'
+ });
+
+ this.searchHistoryList = [];
+ },
+ TapHot(e){
+ this.searchValue = e
+ uni.navigateTo({
+ url:'../category/productList?keyword='+this.searchValue+'&type=1'
+ })
+ }
+
},
- onLoad() {
- // this.getIndex()
- this.getCatList()
+ async onLoad() {
+ this.getIndex()
+ // this.getCatList()
+ let list = await uni.getStorage({
+ key: 'searchList'
+ });
+ if (list.length>1) {
+ // console.log(list[1].data);
+ this.searchHistoryList = JSON.parse(list[1].data);
+ }
+
+
+
}
}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 4acbffb..7786d7d 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -13,7 +13,7 @@
- by continuong, you agree to be terms of use and privacy policy.
+ by continuong, you agree to be terms of use and privacy policy.
@@ -28,7 +28,7 @@
- by continuong, you agree to be terms of use and privacy policy.
+ by continuong, you agree to be terms of use and privacy policy.
@@ -75,6 +75,7 @@
regSelect:false,
loginSelect:false,
// 是否显示错误信息
+ backButtonPress:0,
loginErr:false,
regErr:false,
errMsg:'The email address or password you enterde is incorrect.',
@@ -84,6 +85,18 @@
}
}
},
+ // onBackPress(options) {
+ // this.backButtonPress++;
+ // if (this.backButtonPress > 1) {
+ // plus.runtime.quit();
+ // } else {
+ // plus.nativeUI.toast('Click again to exit');
+ // }
+ // setTimeout(function() {
+ // this.backButtonPress = 0;
+ // }, 1000);
+ // return true;
+ // },
methods:{
forgotPwd(){
if(this.loginDate.username==''){
@@ -116,11 +129,13 @@
this.loginErr=true
return
}
+ console.log(this.loginDate)
defaultRequest1(this.loginDate).then(res=>{
console.info(res)
if(res.error==0){
this.loginErr=false
res.data.isLogin=true
+ uni.setStorageSync('isLogin',1)
uni.setStorageSync('user_info',res.data)
uni.switchTab({
url:'../index/index'
@@ -138,6 +153,7 @@
},
// 验证邮件
dialogConfirm(){
+ console.log(this.query,'////')
defaultRequest(this.query).then(res=>{
console.info(res)
if(res.error==0){
@@ -153,7 +169,7 @@
Reg(){
if(!this.regSelect){
uni.showToast({
- title:'请先同意并勾选用户协议',
+ title:'please agree to and tick the User Agreement first',
icon:'none',
})
return
@@ -164,7 +180,7 @@
if(res.error==0){
this.regErr=false
uni.showToast({
- title:'注册成功,请进行邮箱验证！',
+ title:'Successful registration, please verify your email address!',
icon:'success',
})
}else{
@@ -188,11 +204,28 @@
}else{
this.isReg=true
}
+ },
+ // 跳到页面
+ gotonewpage(e){
+
+ if(e==1){
+ var urlStr = encodeURI("https://en.meixx.com/help/privacy.html")
+ // plus.runtime.openURL(urlStr);
+ uni.navigateTo({
+ url:'../order/paypalWebview?src='+urlStr
+ })
+ }
+ else{
+
+ }
+
+
}
},
onLoad() {
this.configuration()
+
}
}
diff --git a/pages/login/verifyEmail.vue b/pages/login/verifyEmail.vue
index 8cb5c44..9f51125 100644
--- a/pages/login/verifyEmail.vue
+++ b/pages/login/verifyEmail.vue
@@ -28,7 +28,7 @@
export default {
data() {
return {
- isShow:false,
+ isShow:true,
isErr:false,
isLogin:true,
username:'',
@@ -49,14 +49,15 @@
})
},
sendresetcode(){
+ console.log(this.query)
defaultRequest(this.query).then(res=>{
- console.info(res)
+ console.log(res)
if(res.error==0){
uni.showToast({
title:res.message,
icon:'none'
})
- this.isShow=true
+
}
})
},
@@ -68,6 +69,16 @@
this.isLogin=true
}
},
+ // getcode(){
+ // this.isShow = false
+ // let data ={
+ // _action:'sendresetcode',
+ // username:this.username
+ // }
+ // defaultRequest2(data).then(res =>{
+ // console.log(res,'ppppp')
+ // })
+ // }
},
onLoad(e) {
console.info(e)
diff --git a/pages/order/additems.vue b/pages/order/additems.vue
new file mode 100644
index 0000000..03448c8
--- /dev/null
+++ b/pages/order/additems.vue
@@ -0,0 +1,450 @@
+
+
+
+
+
+
+
+
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 53c63a8..35f3a2b 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -1,17 +1,20 @@
-
-
+
+
- {{address.consignee}}
- {{address.mobile}}
+ {{address.consignee}}
+ {{address.mobile}}
+
-
+
{{address.sign_building}}
{{address.country_name}}{{address.province_name}}{{address.city_name}}{{address.address}}{{address.zipcode}}
+ Add Shipping Address
+
@@ -110,7 +113,7 @@
{{item.goods_name}}
-
+
{{item.goods_attr |goodsAttr}}
@@ -193,7 +196,7 @@
-
+
@@ -220,7 +223,8 @@
total:{},
order:{},
// 支付方式: 0、支付宝 1、银行卡、信用卡 2、谷歌支付 4、苹果支付
- pay_index:0
+ pay_index:0,
+
}
},
methods:{
@@ -228,7 +232,7 @@
useCoupons(id){
let data={_action:'cartselectbonus',bonus:id,consignee:this.address}
defaultRequest3(data,'consignee').then(res=>{
- console.info(res)
+
if(res.error==0){
this.total=res.data.total
this.order=res.data.order
@@ -237,30 +241,84 @@
},
// 获取调用支付信息数据
getPayDate(id,will_get_integral){
- let data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
- defaultRequest2(data).then(res=>{
- console.info(res)
- if(res.error==0){
- //订单对象，从服务器获取
- if(res.data.need_pay_amount==0) return
- uni.requestPayment({
- provider: 'alipay',
- orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
- success: function (res) {
- console.log('success:' + JSON.stringify(res));
- uni.redirectTo({
- url: 'paySuccess?type=0&order_id='+id+'&will_get_integral='+will_get_integral
- });
- },
- fail: function (err) {
- console.log('fail:' + JSON.stringify(err));
- uni.redirectTo({
- url: 'paySuccess?type=1&order_id='+id+'&will_get_integral='+will_get_integral
- });
- }
- });
- }
- })
+ let data
+ if(this.pay_index ==0){
+ data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'paypal'}
+ defaultRequest2(data).then(res=>{
+ console.info(res,'支付')
+ if(res.error == 1){
+
+ }
+ if(res.error == 0){
+ if(res.data.need_pay_amount==0) return
+ // plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
+ // this.src = res.data.prepay_data.checkoutnow_url
+ uni.navigateTo({
+ url:'./paypalWebview?src='+res.data.prepay_data.checkoutnow_url
+ })
+ //订单对象，从服务器获取
+ // var paypalorderInfo = {
+ // "clientId": 'AWYz9HwM2yVVK5PUGHIbd7xZvFDJopgMLp-5QlyeP7CjA8v1MRgYmWAqtl1mqRdtzCgvhL7iH5btuBix', //客户端id
+ // "orderId": id, //订单id
+ // "userAction": "continue", // paynow/continue
+ // "currency":"USD", // 币种
+ // "environment":"sandbox", //运行环境 sandbox/live
+ // };
+
+
+
+ // uni.getProvider({
+ // service: 'payment',
+ // success: function (res) {
+ // console.log(res.provider)
+ // if (~res.provider.indexOf('paypal')) {
+ // uni.requestPayment({
+ // "provider": "paypal",
+ // "orderInfo": paypalorderInfo,
+ // success: function (res) {
+ // var rawdata = JSON.parse(res.rawdata);
+ // console.log("orderId：" + rawdata.orderId);
+ // },
+ // fail: function (err) {
+ // console.log('fail:' + JSON.stringify(err));
+ // }
+ // });
+ // }
+ // }
+ // });
+
+
+
+
+ }
+ })
+ }else{
+ data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
+ defaultRequest2(data).then(res=>{
+ console.info(res,'支付宝')
+ if(res.error==0){
+ //订单对象，从服务器获取
+ if(res.data.need_pay_amount==0) return
+ uni.requestPayment({
+ provider: 'alipay',
+ orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
+ success: function (res) {
+ console.log('success:' + JSON.stringify(res));
+ uni.redirectTo({
+ url: 'paySuccess?type=0&order_id='+id+'&will_get_integral='+will_get_integral
+ });
+ },
+ fail: function (err) {
+ console.log('fail:' + JSON.stringify(err));
+ uni.redirectTo({
+ url: 'paySuccess?type=1&order_id='+id+'&will_get_integral='+will_get_integral
+ });
+ }
+ });
+ }
+ })
+ }
+
},
// 选择支付方式
@@ -272,6 +330,7 @@
url:'../account/address?type=1'
})
},
+
// 提交订单
submitorder(){
let data={
@@ -335,6 +394,7 @@
return
}
}else if(i==3){
+
if(this.orderDate.allow_use_integral==0){
uni.showToast({
icon:'none',
@@ -342,15 +402,27 @@
})
return
}
+ }else{
+ if(!this.address){
+ uni.showToast({
+ icon:'none',
+ title:'please add address'
+ })
+ }else{
+ this.isShow=true
+ }
}
- this.isShow=true
+ // this.isShow=true
}
},
onLoad(e) {
+
this.query=JSON.parse(e.query)
+ console.log(this.query,'///')
this.getList()
},
onShow() {
+ this.getList()
uni.$once('query' ,(query)=>{
console.info(query)
if(query.type=='address'){
diff --git a/pages/order/details.vue b/pages/order/details.vue
index 249fd07..39ab882 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -75,7 +75,7 @@
{{goodsDate.address_detail}}
-
+
@@ -87,10 +87,10 @@
{{item.goods_name}}
-
+
{{item.goods_attr |goodsAttr}}
-
+
x{{item.goods_number}}
@@ -125,10 +125,10 @@
Order total
US${{goodsDate.total_fee}}
-
+
@@ -137,7 +137,7 @@
Order id
{{goodsDate.order_sn}}
-
+
@@ -271,7 +271,7 @@
// 跳转商品详情
goDetails(id){
uni.navigateTo({
- url:'/pages/productDetails/index?goods_id='+id
+ url:'/pages/productDetails/index?goodid='+id
})
},
// 跳转评论页面
@@ -328,8 +328,9 @@
},
// 获取调用支付信息数据
getPayDate(){
+ console.info(this.payQuery,'支付宝')
defaultRequest2(this.payQuery).then(res=>{
- console.info(res)
+ console.info(res,'支付宝')
if(res.error==0){
//订单对象，从服务器获取
if(res.data.need_pay_amount==0) return
@@ -377,6 +378,20 @@
this.logisticsinfo=res.data[0]
}
})
+ },
+ // 复制
+ Copy(e){
+ console.log(e)
+ uni.setClipboardData({
+ data:e,
+ success:()=>{
+ uni.showToast({
+ title:'ok!',
+ icon:'none'
+ })
+ }
+
+ })
}
},
onLoad(e){
@@ -384,7 +399,7 @@
this.details_index=e.details_index
this.query.order_id=e.id
this.cancelQuery.order_id=e.id
-
+ this.payQuery.order_id = e.id
this.getDate()
},
filters:{
diff --git a/pages/order/paypalWebview.vue b/pages/order/paypalWebview.vue
new file mode 100644
index 0000000..d3b091b
--- /dev/null
+++ b/pages/order/paypalWebview.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index 1d6f0d2..c4690bb 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -1,8 +1,9 @@
-
+
-
+
+
@@ -11,38 +12,58 @@
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -67,7 +88,7 @@
-
+
{{goodsDate.goods_name}}
@@ -119,7 +140,7 @@
- Shipping to {{addressDate.country_name || 'United States'}}
+
@@ -127,16 +148,16 @@
-
+
- stankard shipping: US$12.5
+ {{ item.shipping_name}}: US${{ item.free_money}}
- free on orders US$59
+ free on orders US${{ item.shipping_fee}}
Estimated to be deliverd on
- 15/05/2022-04/05/2022.
+ {{ item.shipping_desc }}
@@ -151,29 +172,47 @@
-
-
- - Safe Payments
- - Safe Payments
-
-
- - Secure Logistics
- - Secure Logistics
-
+
+
+ •{{item.block_title}}
-
+
Description
{{goodsDate.tags}}
-
+
+
@@ -253,35 +292,17 @@
-
+
@@ -342,8 +380,9 @@
return {
navWidth:'80rpx',
current:0,
- isVedio:false,
+ isvideo:false,
isSecurity:false,
+ sum:0,
query:{
_action:'getgoodsdetail',
goods_id:''
@@ -381,7 +420,34 @@
goods_number:1,
goods_attr_id:'',
goods_is_package:0
- }
+ },
+ Is_attr:0,//是否有规格
+ listtext:[],
+ isLogin:-1,
+ isAttr:false,
+ Attr_list:[],
+ video:false,
+ list:[],
+ pageNum:1,
+ pageSize:10,
+
+ //初始化点击位置的x坐标
+ startX:0,
+ Isshownext:false,
+ current:0,
+ Isshare:false,//分享
+ Ship:{
+ _action:'getgoodsshippingfeelist',
+ goods_id:'',
+ goods_count:1,
+ country:4191,
+ province:0,
+ district:0,
+ city:0
+ },
+ shipping_list:[]
+
+
}
},
computed:{
@@ -420,15 +486,61 @@
url:'./goodsReview?goods_id='+this.query.goods_id
})
},
+ isVideo()
+ {
+ //console.log('//////')
+ this.video = true
+ },
+
+ // 侧滑
+ /**
+ * 触摸开始
+ * @param {Object} e
+ */
+ touchStart(e) {
+ if (e.touches.length == 1) {
+ //设置触摸起始点水平方向位置
+ this.startX=e.touches[0].clientX;
+ }
+ },
+ /**
+ * 触摸结束
+ * @param {Object} e
+ */
+ touchEnd(e) {
+ if (e.changedTouches.length == 1) {
+ //手指移动结束后水平位置
+ var endX = e.changedTouches[0].clientX;
+ let diff = endX-this.startX;
+ if(Math.abs(diff)>20){
+ if(diff>0){
+ //console.log("左滑...");
+
+ }else{
+ //console.log("右滑...");
+ }
+ }
+ }
+
+ },
+ // 视频停止
+ VideoPuse(){
+ this.video = false
+ },
+ getCartNum(){
+ let data={_action:'getcartgoods'}
+ defaultRequest(data).then(res=>{
+ //console.info(res)
+ if(res.error==0){
+ this.sum = res.data.goods_list.length
+
+ // uni.setStorageSync('cartSum',this.sum)
+ }
+ })
+ },
// 添加到购物车
addCart(){
- if(this.goods_attr_list.length==0){
- uni.showToast({
- title:'Please select the product specification',
- icon:'none'
- })
- return
- }else{
+ if(this.Is_attr>0){
let goods_attr_id=''
this.goods_attr_list.map(item=>{
if(item.goods_attr_id!=''){
@@ -436,35 +548,51 @@
}
})
- if(goods_attr_id==''){
+ let isall = 1
+ this.goods_attr_list.map(item =>{
+ //console.log(item.goods_attr_id)
+ if(item.goods_attr_id==''){
+ isall = 0
+ }
+ })
+
+ if(isall == 0){
uni.showToast({
title:'Please select the product specification',
icon:'none'
})
return
}
+
this.cartQuery.goods_attr_id=goods_attr_id.substring(0,goods_attr_id.lastIndexOf(','));
}
+ if(this.isLogin == 1){
defaultRequest2(this.cartQuery).then(res=>{
- console.info(res)
if(res.error==0){
+ this.isCart = false
if(res.data[0].success){
- uni.showToast({
- title:'Successfully added',
- icon:'none'
- })
- }else{
- uni.showToast({
- title:res.data[0].message,
- icon:'none'
- })
+ setTimeout( ()=>{
+ uni.showToast({
+ title:'Successfully added',
+ icon:'none'
+ })
+ },500)
+
}
-
+ this.getCartNum()
}
})
+ }
+ else if (this.isLogin == 0){
+ uni.navigateTo({
+ url:'../login/index'
+ })
+ }
+
},
// 点击预览图片
clickImg(index) {
+
wx.previewImage({
urls: this.info, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
current: index, // 当前显示图片的http链接，默认是第一个
@@ -473,17 +601,19 @@
fail: function(res) {},
complete: function(res) {},
})
+
+
},
// 其他商品详情
goDetails(id){
uni.navigateTo({
- url:'index?goods_id='+id
+ url:'index?goodid='+id
})
},
// 获取该分类的其他商品
getCatList(type){
defaultRequest4(this.catQuery).then(res=>{
- console.info(res)
+ //console.info(res)
if(res.error==0){
if(res.data){
if(type==0){
@@ -504,7 +634,8 @@
})
},
// 选择规格
- selectAttr(attr_id,goods_attr_id,index){
+ selectAttr(attr_id,goods_attr_id,index1){
+ this.current = index1
let data={attr_id:attr_id,goods_attr_id:goods_attr_id}
if(this.goods_attr_list.length==0){
this.goods_attr_list.push(data)
@@ -532,9 +663,10 @@
},
// 添加收藏
addLike(id){
+ if(this.isLogin == 1){
let data={_action:'setfaviouritegoods',goods_id:this.query.goods_id}
defaultRequest2(data).then(res=>{
- console.info(res)
+ //console.info(res)
if(res.error==0){
uni.showToast({
title:res.message,
@@ -543,59 +675,105 @@
this.goodsDate.is_attention=1
}
})
+ }
+ else if (this.isLogin == 0){
+ uni.navigateTo({
+ url:'../login/index'
+ })
+ }
},
// 取消收藏
removeLike(id){
+ if(this.isLogin ==1){
let data={_action:'unsetfaviouritegoods',goods_id:this.query.goods_id}
defaultRequest2(data).then(res=>{
- console.info(res)
+ //console.info(res)
if(res.error==0){
uni.showToast({
- title:res.message,
+ title:'ok!',
icon:'none'
})
this.goodsDate.is_attention=0
}
})
+ }
},
// 添加商品足迹
setFavorites(){
let data={_action:'setgoodsbrowsehistory',goods_id:this.query.goods_id}
defaultRequest2(data).then(res=>{
- console.info(res)
+ //console.info(res)
+ })
+ },
+ //取默认配送方式
+ getShip()
+ {
+ this.Ship.goods_id = this.query.goods_id
+ defaultRequest(this.Ship).then( res => {
+ if(res.error == 0){
+ this.shipping_list = res.shipping_list
+ //console.log(this.shipping_list,'1123')
+ }
})
},
// 获取默认地址
getDefaultAddress(){
let data={_action:'getdefaultconsignee'}
+
defaultRequest2(data).then(res=>{
- console.info(res)
+ //console.info(res)
if(res.error==0){
this.addressDate=res.data
+ //console.log(res)
+ this.Ship = {
+ _action:'getgoodsshippingfeelist',
+ goods_id:this.query.goods_id,
+ goods_count:1,
+ country:res.data.country,
+ province:res.data.province,
+ district:res.data.district,
+ city:res.data.city
+ }
+ defaultRequest(this.Ship).then( res => {
+ if(res.error == 0){
+ this.shipping_list = res.shipping_list
+ //console.log(this.shipping_list,'1122')
+ }
+ })
+
}
})
},
// 获取商品详情数据
getDate(){
defaultRequest(this.query).then(res=>{
- console.info(res)
if(res.error==0){
+ console.log(res.data.url)
this.goodsDate=res.data
this.goodsDate.gallery_list.map(item=>{
item.content=''
this.info.push(item.img_url)
+
+ // this.Attr_list = this.goodsDate.attr_list[0].goods_attrs
+
})
+
if(this.goodsDate.attr_list){
-
+ this.Is_attr = this.goodsDate.attr_list[0].goods_attrs.length
+ if(this.Is_attr>0){
+ this.Attr_list = this.goodsDate.attr_list[0].goods_attrs
+ // //console.log(this.Attr_list,'hats')
+ }
this.goodsDate.attr_list.map(item=>{
if(item.attr_name=="Color"){
this.colorNum=item.goods_attrs.length
}
- let data={goods_attr_id:'',attr_id:item.attr_id}
+ let data={name:item.attr_name,goods_attr_id:'',attr_id:item.attr_id,list:item.goods_attrs}
this.goods_attr_list.push(data)
})
}else{
this.goods_attr_list=[]
+ this.Is_attr = 0
}
this.catQuery.cat=res.data.cat_id
@@ -605,27 +783,74 @@
},
//当录播有视屏时
gridSwiper(e){
- // if(e.detail.current==1){
- // this.isVedio=true
- // }else{
- // this.isVedio=false
- // }
+
+ this.video = false
this.current = e.detail.current
},
+ //获取保障内容
+ getSecuritty(){
+ let data ={
+ pagecode:'PRODUCTDETAILPAGE',_action:'getpagedata'
+ }
+ defaultRequest(data).then(res =>{
+ //console.log(res,'保障内容')
+ if(res.error == 0){
+ this.listtext = res.data.zones[0].blocks
+
+
+ }
+ })
+ },
back(){
uni.navigateBack()
+ },
+ // 分享
+ Copylink(){
+ uni.setClipboardData({
+ data:this.goodsDate.url,//要被复制的内容
+ success:()=>{//复制成功的回调函数
+ uni.showToast({//提示
+ title:'succeeded',
+ icon:'none'
+ })
+ }
+ });
+ },
+ Require(url){
+ return url
}
},
onLoad(e) {
- this.query.goods_id=e.goods_id
- this.cartQuery.goods_id=e.goods_id
+ // let goods = JSON.parse(e)
+ this.isLogin = uni.getStorageSync('isLogin')
+
+ //console.log(e,'p')
+
+ this.query.goods_id=e.goodid
+ this.cartQuery.goods_id=e.goodid
+ //console.log(this.query.goods_id)
+ this.Ship.goods_id = this.query.goods_id
+ //console.log(this.Ship.goods_id)
+
+ this.getSecuritty()
+ this.getCartNum()
this.getDate()
+
this.user_info=uni.getStorageSync('user_info')
if(this.user_info.isLogin){
this.setFavorites()
this.getDefaultAddress()
}
-
+ else{
+ this.getShip()
+ }
+ if(e.e==2){
+ this.isCart = true
+ }
+
+ },
+ onShow(){
+ this.getCartNum()
},
// 上拉加载
onReachBottom(){
@@ -655,13 +880,19 @@
}
\ No newline at end of file
diff --git a/pages/productDetails/review.vue b/pages/productDetails/review.vue
index 7e33441..e71d32d 100644
--- a/pages/productDetails/review.vue
+++ b/pages/productDetails/review.vue
@@ -17,7 +17,7 @@
{{item.goods_name}}
-
+
{{item.goods_attr |goodsAttr}}
@@ -38,17 +38,19 @@
-
-
+
+
+
Upload the video
-
-
+
+
+
Upload pictures
-
+
@@ -82,7 +84,9 @@
order_id:'',
order_sn:'',
comments:[]
- }
+ },
+ VideoSrc:'',
+ imgSrc:''
}
},
methods:{
@@ -130,6 +134,29 @@
back(){
uni.navigateBack()
+ },
+ // 上传视频
+ UploadVideo(){
+ var that = this
+ uni.chooseVideo({
+ sourceType: ['camera', 'album'],
+ success: function (res) {
+ console.log(res)
+ that.VideoSrc = res.tempFilePath;
+ }
+ })
+ },
+
+ // 上传图片
+ Upimg(){
+ uni.chooseImage({
+ count: 6, //默认9
+ sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+ sourceType: ['album'], //从相册选择
+ success: function (res) {
+ console.log(JSON.stringify(res.tempFilePaths));
+ }
+ });
}
},
onLoad(e) {
diff --git a/pages/shippingCart/index.vue b/pages/shippingCart/index.vue
index 9a22a6b..fa83664 100644
--- a/pages/shippingCart/index.vue
+++ b/pages/shippingCart/index.vue
@@ -1,55 +1,59 @@
-
+
-
+
Your cart is empty
-
+
Buy US$32.00 more to enjoy FREE STANDARD SHIPPING!
- Add
+ Add
-
-
-
-
-
-
+
+
+
+
+
+
- {{item.goods_name}}
-
+ {{gitem.goods_name}}
+
- {{item.goods_attr}}
-
+ {{gitem.goods_attr}}
+
+
- US${{item.goods_price}}
-
-
+ US${{gitem.goods_price}}
+
+
-
+
-
+
+
+
+
+ Out of stock
+ Delete them all
+
+
+
+
+
+
+
+
+
+
+ sold out
+
+
+
+ {{item.goods_name}}
+
+
+ {{item.goods_attr}}
+
+
+
+
+
+ US${{item.goods_price}}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
RECOMMEND
-
+
- {{item.short_name}}
- US${{item.is_promote==0? item.shop_price :item.promote_price}}
+
+
+ US${{item.is_promote==0? item.shop_price :item.promote_price}}
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ goodsDate.goods_name}}
+ US${{goodsDate.is_promote==0? goodsDate.shop_price :goodsDate.promote_price}}
+
+ {{item.name}}
+
+
+
+
+
+
+ 【{{ item1.attr_value}}】
+ {{ item1.attr_value}}
+
+
+
+
+
+
+ Quantity
+
+
+
+
+
+
\ No newline at end of file
+
+ .flex {
+ display: flex;
+ }
+
+ .outdate {
+ justify-content: space-between;
+ margin: 30rpx 18rpx;
+ font-weight: 400;
+
+ }
+
+ .imgsize {
+ height: 40rpx;
+ width: 40rpx;
+ }
+
+ .delete_tu {
+ position: absolute;
+ width: 100rpx;
+ height: 100rpx;
+ margin: 25rpx;
+ padding: 25rpx;
+ text-align: center;
+ background-color: #eef;
+ background-color: rgba(0, 0, 0, 0.2);
+ color: #fff;
+ font-size: 26rpx;
+ line-height: 100rpx;
+ border-radius: 50%;
+ z-index: 99;
+ font-weight: 700;
+
+ }
+
+ .outcat {
+ filter: blur(2px);
+ }
+.addCard{
+ z-index: 999;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: white;
+ padding-left: 29.33rpx;
+ padding-right: 29.33rpx;
+ box-sizing: border-box;
+ padding-top: 77.67rpx;
+ width: 100%;
+ font-size: 30.67rpx;
+ font-weight: 400;
+ padding-bottom: 44.67rpx;
+
+ .addCard_close{
+ width: 21.33rpx;
+ height: 21.33rpx;
+ position: absolute;
+ right: 24.67rpx;
+ top: 18.67rpx;
+ }
+ .spike1{
+ margin-top: 0;
+ margin-bottom: 34rpx;
+ padding-bottom: 0;
+ border-bottom: none;
+ .addCard_scroll{
+ width: 286.67rpx;
+ height: 286.67rpx;
+ margin-left: 10.67rpx;
+ &:first-child{
+ margin-left: 0;
+ }
+ &:last-child{
+ margin-right: 15rpx;
+ }
+ }
+ }
+ .addCard_body{
+ padding-right: 31.33rpx;
+ max-height: 600rpx;
+ min-height: 400rpx;
+ .addCard_price{
+ font-size: 44rpx;
+ font-weight: 500;
+ margin-top: 27.33rpx;
+ margin-bottom: 51.33rpx;
+ }
+ .color_select{
+
+ display: flex;
+ font-size: 16.67rpx;
+ color: #666666;
+ flex-wrap: wrap;
+ margin-bottom: 59.33rpx;
+ .color_select_item{
+ margin-top: 22rpx;
+ position: relative;
+ background-color: #F9F7FA;
+ border-radius: 6.67rpx;
+ margin-right: 12.67rpx;
+ width: 134.67rpx;
+ image{
+ width: 134.67rpx;
+ height: 133.33rpx;
+ border-radius: 6.67rpx 6.67rpx 0 0;
+ }
+ .color_select_item_zoom{
+ width: 20.33rpx;
+ height: 20.33rpx;
+ // background-color: rgba(0, 0, 0, 0.3);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ right: 12.67rpx;
+ top: 9.33rpx;
+ z-index: 99;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .color_select_item_bottom{
+ padding: 10rpx 0rpx;
+ font-size: 24rpx;
+ text-align: center;
+
+ }
+ }
+ .active_color{
+ color: #B22234;
+ background-color: white;
+ border: 1px solid #000000;
+ }
+ }
+ .variations_select_size{
+ margin-left: 0;
+ margin-top: 26.67rpx;
+ margin-bottom: 40.67rpx;
+ .select_size_item{
+ margin-bottom: 16.67rpx !important;
+ &:nth-child(4n+4){
+ margin-right: 0;
+ }
+ }
+ }
+
+ }
+
+ .quantity{
+ display: flex;
+ align-items: center;
+ background-color: white;
+ justify-content: space-between;
+ margin-bottom: 43.33rpx;
+ .uni-numbox{
+ border: 1px solid #999999;
+ border-radius: 14rpx;
+ height: 42.67rpx;
+
+
+ /deep/ .uni-numbox__minus{
+ border-radius: 14rpx;
+ }
+ /deep/.uni-numbox__plus{
+ border-radius: 14rpx;
+ }
+ /deep/.uni-numbox__value{
+ border-left: 1px solid #999999;
+ border-right: 1px solid #999999;
+ height: 100%;
+ width: 63.33rpx;
+ font-size: 21.33rpx;
+ }
+ }
+ }
+ button{
+ width: 100%;
+ height: 73.33rpx;
+ line-height: 73.33rpx;
+ background-color: #191919;
+ color: white;
+ font-weight: bold;
+ font-size: 26.67rpx;
+ }
+ }
+
+ .spike1{
+ white-space: nowrap;
+ width: 100%;
+ margin-top: 36.67rpx;
+ padding-bottom: 34rpx;
+ border-bottom: 1px solid #E2E2E2;
+ ::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background-color: transparent;
+ }
+ .spike1_item{
+ width: 410rpx;
+ background-color: #F6F6F6;
+ padding: 21.33rpx 24.67rpx;
+ margin-right: 19.33rpx;
+ font-size: 20rpx;
+ display: inline-block;
+ color: #737373;
+ &:last-child{
+ margin-right: 0;
+ }
+ view{
+ margin-bottom: 10rpx;
+ }
+ .spike1_item_title{
+ font-weight: bold;
+
+ .text_black{
+ color: black;
+ display: inline-block;
+ margin-left: 10rpx;
+ }
+ .text_red{
+ color: #B22234;
+ display: inline-block;
+ margin-left: 10rpx;
+ }
+ }
+ }
+ .spike1_item1{
+ color: #191919;
+ font-size: 29.33rpx;
+ margin-right: 16.67rpx;
+ width: 200rpx;
+ display: inline-block;
+ font-weight: bold;
+ .spike1_item_img{
+ width: 200rpx;
+ height: 200rpx;
+
+ background-color: #999999;
+ }
+ .spike1_item_bottom{
+ padding-left: 9.33rpx;
+ margin-top: 22.67rpx;
+
+ .spike1_item_text{
+ color: #9D9D9D;
+ font-size: 21.33rpx;
+ text-decoration: line-through;
+ }
+ .spike1_item_text1{
+ color: #9D9D9D;
+ font-size: 21.33rpx;
+ }
+ }
+ .spike1_item_bottom1{
+ padding-left: 9.33rpx;
+ margin-top: 19.33rpx;
+ font-weight: bold;
+
+ .spike1_item_text{
+ color: #000000;
+ font-size: 16rpx;
+ font-weight: 400;
+ margin-bottom: 20.67rpx;
+ white-space: break-spaces;
+
+ }
+ }
+
+ }
+ .spike1_item:last-child{
+ margin-right: 0;
+ }
+ }
+
diff --git a/pages/specialTitle/index.vue b/pages/specialTitle/index.vue
new file mode 100644
index 0000000..ab935b0
--- /dev/null
+++ b/pages/specialTitle/index.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/icon/big.png b/static/icon/big.png
new file mode 100644
index 0000000..9222a00
Binary files /dev/null and b/static/icon/big.png differ
diff --git a/static/icon/big2.png b/static/icon/big2.png
new file mode 100644
index 0000000..0a7f432
Binary files /dev/null and b/static/icon/big2.png differ
diff --git a/static/icon/home.png b/static/icon/home.png
new file mode 100644
index 0000000..09ebd93
Binary files /dev/null and b/static/icon/home.png differ
diff --git a/static/icon/home1.png b/static/icon/home1.png
new file mode 100644
index 0000000..d945aea
Binary files /dev/null and b/static/icon/home1.png differ
diff --git a/static/icon/home3.png b/static/icon/home3.png
new file mode 100644
index 0000000..f2a74db
Binary files /dev/null and b/static/icon/home3.png differ
diff --git a/static/icon/home4.png b/static/icon/home4.png
new file mode 100644
index 0000000..5b53073
Binary files /dev/null and b/static/icon/home4.png differ
diff --git a/static/icon/home_white.png b/static/icon/home_white.png
new file mode 100644
index 0000000..1787985
Binary files /dev/null and b/static/icon/home_white.png differ
diff --git a/static/icon/next.png b/static/icon/next.png
new file mode 100644
index 0000000..f32fde1
Binary files /dev/null and b/static/icon/next.png differ
diff --git a/static/icon/nologin.png b/static/icon/nologin.png
new file mode 100644
index 0000000..aafea5c
Binary files /dev/null and b/static/icon/nologin.png differ
diff --git a/static/icon/nologin2.png b/static/icon/nologin2.png
new file mode 100644
index 0000000..d2bd628
Binary files /dev/null and b/static/icon/nologin2.png differ
diff --git a/static/icon/play.png b/static/icon/play.png
new file mode 100644
index 0000000..0f08ab2
Binary files /dev/null and b/static/icon/play.png differ
diff --git a/static/icon/user_bg.png b/static/icon/user_bg.png
new file mode 100644
index 0000000..faf8da8
Binary files /dev/null and b/static/icon/user_bg.png differ
diff --git a/static/img/Mes.png b/static/img/Mes.png
new file mode 100644
index 0000000..fc965b6
Binary files /dev/null and b/static/img/Mes.png differ
diff --git a/static/img/copyLink.png b/static/img/copyLink.png
new file mode 100644
index 0000000..015cce4
Binary files /dev/null and b/static/img/copyLink.png differ
diff --git a/static/img/dope plus_white.png b/static/img/dope plus_white.png
new file mode 100644
index 0000000..92df22c
Binary files /dev/null and b/static/img/dope plus_white.png differ
diff --git a/static/img/down.png b/static/img/down.png
new file mode 100644
index 0000000..ef03aac
Binary files /dev/null and b/static/img/down.png differ
diff --git a/static/img/facebook1.png b/static/img/facebook1.png
new file mode 100644
index 0000000..6b32dd9
Binary files /dev/null and b/static/img/facebook1.png differ
diff --git a/static/img/favorites_white.png b/static/img/favorites_white.png
new file mode 100644
index 0000000..38ef576
Binary files /dev/null and b/static/img/favorites_white.png differ
diff --git a/static/img/like_white.png b/static/img/like_white.png
new file mode 100644
index 0000000..a2f1032
Binary files /dev/null and b/static/img/like_white.png differ
diff --git a/static/img/more1.png b/static/img/more1.png
new file mode 100644
index 0000000..773ff6c
Binary files /dev/null and b/static/img/more1.png differ
diff --git a/static/img/msg_white.png b/static/img/msg_white.png
new file mode 100644
index 0000000..4c1b6df
Binary files /dev/null and b/static/img/msg_white.png differ
diff --git a/static/img/qr.png b/static/img/qr.png
new file mode 100644
index 0000000..6723cc9
Binary files /dev/null and b/static/img/qr.png differ
diff --git a/static/img/shop_cart1.png b/static/img/shop_cart1.png
new file mode 100644
index 0000000..db8ec3e
Binary files /dev/null and b/static/img/shop_cart1.png differ
diff --git a/static/img/summer.jpg b/static/img/summer.jpg
new file mode 100644
index 0000000..56e37cc
Binary files /dev/null and b/static/img/summer.jpg differ
diff --git a/store/store.js b/store/store.js
new file mode 100644
index 0000000..754f91f
--- /dev/null
+++ b/store/store.js
@@ -0,0 +1,25 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+Vue.use(Vuex)
+const store = new Vuex.Store({
+ state(){
+ return{
+ count: 0,
+ goodslist:[]
+ }
+ },
+ mutations: {
+ addSave(state, data) {
+ let str = [];
+ str.push(data);
+ console.log(data)
+ state.goodslist.push(str)
+ },
+ increment (state) {
+ state.count++
+ console.log(store.state.count) // -> 1
+ }
+ },
+ actions: {}
+})
+export default store
\ No newline at end of file
diff --git a/unpackage/res/icons/dope.png b/unpackage/res/icons/dope.png
new file mode 100644
index 0000000..f43a601
Binary files /dev/null and b/unpackage/res/icons/dope.png differ
diff --git a/unpackage/res/icons/dope2.png b/unpackage/res/icons/dope2.png
new file mode 100644
index 0000000..f43a601
Binary files /dev/null and b/unpackage/res/icons/dope2.png differ
diff --git a/unpackage/resources/__UNI__C0E0831/www.zip b/unpackage/resources/__UNI__C0E0831/www.zip
new file mode 100644
index 0000000..4755c72
Binary files /dev/null and b/unpackage/resources/__UNI__C0E0831/www.zip differ
diff --git a/unpackage/resources/__UNI__C0E0831/www/__uniappchooselocation.js b/unpackage/resources/__UNI__C0E0831/www/__uniappchooselocation.js
new file mode 100644
index 0000000..bd11f4b
--- /dev/null
+++ b/unpackage/resources/__UNI__C0E0831/www/__uniappchooselocation.js
@@ -0,0 +1 @@
+!function(e){var t={};function A(a){if(t[a])return t[a].exports;var i=t[a]={i:a,l:!1,exports:{}};return e[a].call(i.exports,i,i.exports,A),i.l=!0,i.exports}A.m=e,A.c=t,A.d=function(e,t,a){A.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:a})},A.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},A.t=function(e,t){if(1&t&&(e=A(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var a=Object.create(null);if(A.r(a),Object.defineProperty(a,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)A.d(a,i,function(t){return e[t]}.bind(null,i));return a},A.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return A.d(t,"a",t),t},A.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},A.p="",A(A.s=41)}([function(e,t){e.exports={}},function(e,t,A){"use strict";function a(e,t,A,a,i,n,o,s,r,c){var l,u="function"==typeof e?e.options:e;if(r){u.components||(u.components={});var d=Object.prototype.hasOwnProperty;for(var h in r)d.call(r,h)&&!d.call(u.components,h)&&(u.components[h]=r[h])}if(c&&((c.beforeCreate||(c.beforeCreate=[])).unshift((function(){this[c.__module]=this})),(u.mixins||(u.mixins=[])).push(c)),t&&(u.render=t,u.staticRenderFns=A,u._compiled=!0),a&&(u.functional=!0),n&&(u._scopeId="data-v-"+n),o?(l=function(e){(e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),i&&i.call(this,e),e&&e._registeredComponents&&e._registeredComponents.add(o)},u._ssrRegister=l):i&&(l=s?function(){i.call(this,this.$root.$options.shadowRoot)}:i),l)if(u.functional){u._injectStyles=l;var f=u.render;u.render=function(e,t){return l.call(t),f(e,t)}}else{var g=u.beforeCreate;u.beforeCreate=g?[].concat(g,l):[l]}return{exports:e,options:u}}A.d(t,"a",(function(){return a}))},function(e,t,A){"use strict";var a;Object.defineProperty(t,"__esModule",{value:!0}),t.weexPlus=t.default=void 0,a="function"==typeof getUni?getUni:function(){var e=function(e){return"function"==typeof e},t=function(e){return e.then((function(e){return[null,e]})).catch((function(e){return[e]}))},A=/^\$|^on|^create|Sync$|Manager$|^pause/,a=["os","getCurrentSubNVue","getSubNVueById","stopRecord","stopVoice","stopBackgroundAudio","stopPullDownRefresh","hideKeyboard","hideToast","hideLoading","showNavigationBarLoading","hideNavigationBarLoading","canIUse","navigateBack","closeSocket","pageScrollTo","drawCanvas"],n=function(e){return(!A.test(e)||"createBLEConnection"===e)&&!~a.indexOf(e)},o=function(A){return function(){for(var a=arguments.length,i=Array(a>1?a-1:0),n=1;n0&&void 0!==arguments[0]?arguments[0]:{};return e(o.success)||e(o.fail)||e(o.complete)?A.apply(void 0,[o].concat(i)):t(new Promise((function(e,t){A.apply(void 0,[Object.assign({},o,{success:e,fail:t})].concat(i)),Promise.prototype.finally=function(e){var t=this.constructor;return this.then((function(A){return t.resolve(e()).then((function(){return A}))}),(function(A){return t.resolve(e()).then((function(){throw A}))}))}})))}},s=[],r=void 0;function c(e){s.forEach((function(t){return t({origin:r,data:e})}))}var l=i.webview.currentWebview().id,u=new BroadcastChannel("UNI-APP-SUBNVUE");function d(e){var t=i.webview.getWebviewById(e);return t&&!t.$processed&&function(e){e.$processed=!0;var t=i.webview.currentWebview().id===e.id,A="uniNView"===e.__uniapp_origin_type&&e.__uniapp_origin_id,a=e.id;if(e.postMessage=function(e){A?u.postMessage({data:e,to:t?A:a}):w({type:"UniAppSubNVue",data:e})},e.onMessage=function(e){s.push(e)},e.__uniapp_mask_id){r=e.__uniapp_host;var n=e.__uniapp_mask,o=i.webview.getWebviewById(e.__uniapp_mask_id);o=o.parent()||o;var c=e.show,l=e.hide,d=e.close,h=function(){o.setStyle({mask:n})},f=function(){o.setStyle({mask:"none"})};e.show=function(){h();for(var t=arguments.length,A=Array(t),a=0;a1&&void 0!==arguments[1]?arguments[1]:"GET",A=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"application/x-www-form-urlencoded";return"object"===(void 0===e?"undefined":j(e))?"POST"===t.toUpperCase()&&"application/json"===A.toLowerCase()?JSON.stringify(e):Object.keys(e).map((function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])})).join("&"):e},G=weex.requireModule("plusstorage"),T=weex.requireModule("clipboard"),Q=function(){if("function"==typeof getUniEmitter)return getUniEmitter;var e={$on:function(){console.warn("uni.$on failed")},$off:function(){console.warn("uni.$off failed")},$once:function(){console.warn("uni.$once failed")},$emit:function(){console.warn("uni.$emit failed")}};return function(){return e}}();function U(e,t,A){return e[t].apply(e,A)}var F=Object.freeze({loadFontFace:function(t){var A=t.family,a=t.source,i=(t.desc,t.success),n=(t.fail,t.complete);E.addRule("fontFace",{fontFamily:A,src:a.replace(/"/g,"'")});var o={errMsg:"loadFontFace:ok",status:"loaded"};e(i)&&i(o),e(n)&&n(o)},ready:N,request:function(t){var A=t.url,a=t.data,i=t.header,n=t.method,o=void 0===n?"GET":n,s=t.dataType,r=void 0===s?"json":s,c=(t.responseType,t.success),l=t.fail,u=t.complete,d=!1,h=!1,f={};if(i)for(var g in i)h||"content-type"!==g.toLowerCase()?f[g]=i[g]:(h=!0,f["Content-Type"]=i[g]);return"GET"===o&&a&&(A=A+(~A.indexOf("?")?"&"===A.substr(-1)||"?"===A.substr(-1)?"":"&":"?")+P(a)),O.fetch({url:A,method:o,headers:f,type:"json"===r?"json":"text",body:"GET"!==o?P(a,o,f["Content-Type"]):""},(function(t){var A=t.status,a=(t.ok,t.statusText,t.data),i=t.headers,n={};!A||-1===A||d?(n.errMsg="request:fail",e(l)&&l(n)):(n.data=a,n.statusCode=A,n.header=i,e(c)&&c(n)),e(u)&&u(n)})),{abort:function(){d=!0}}},getStorage:function(t){var A=t.key,a=(t.data,t.success),i=t.fail,n=t.complete;G.getItem(A+"__TYPE",(function(t){if("success"===t.result){var o=t.data;G.getItem(A,(function(t){if("success"===t.result){var A=t.data;o&&A?("String"!==o&&(A=JSON.parse(A)),e(a)&&a({errMsg:"getStorage:ok",data:A})):(t.errMsg="setStorage:fail",e(i)&&i(t))}else t.errMsg="setStorage:fail",e(i)&&i(t);e(n)&&n(t)}))}else t.errMsg="setStorage:fail",e(i)&&i(t),e(n)&&n(t)}))},setStorage:function(t){var A=t.key,a=t.data,i=t.success,n=t.fail,o=t.complete,s="String";"object"===(void 0===a?"undefined":j(a))&&(s="Object",a=JSON.stringify(a)),G.setItem(A,a,(function(t){"success"===t.result?G.setItem(A+"__TYPE",s,(function(t){"success"===t.result?e(i)&&i({errMsg:"setStorage:ok"}):(t.errMsg="setStorage:fail",e(n)&&n(t))})):(t.errMsg="setStorage:fail",e(n)&&n(t)),e(o)&&o(t)}))},removeStorage:function(t){var A=t.key,a=(t.data,t.success),i=t.fail,n=t.complete;G.removeItem(A,(function(t){"success"===t.result?e(a)&&a({errMsg:"removeStorage:ok"}):(t.errMsg="removeStorage:fail",e(i)&&i(t)),e(n)&&n(t)})),G.removeItem(A+"__TYPE")},clearStorage:function(e){e.key,e.data,e.success,e.fail,e.complete},getClipboardData:function(t){var A=t.success,a=(t.fail,t.complete);T.getString((function(t){var i={errMsg:"getClipboardData:ok",data:t.data};e(A)&&A(i),e(a)&&a(i)}))},setClipboardData:function(t){var A=t.data,a=t.success,i=(t.fail,t.complete),n={errMsg:"setClipboardData:ok"};T.setString(A),e(a)&&a(n),e(i)&&i(n)},onSubNVueMessage:c,getSubNVueById:d,getCurrentSubNVue:function(){return d(i.webview.currentWebview().id)},$on:function(){return U(Q(),"$on",[].concat(Array.prototype.slice.call(arguments)))},$off:function(){return U(Q(),"$off",[].concat(Array.prototype.slice.call(arguments)))},$once:function(){return U(Q(),"$once",[].concat(Array.prototype.slice.call(arguments)))},$emit:function(){return U(Q(),"$emit",[].concat(Array.prototype.slice.call(arguments)))}}),R={os:{nvue:!0}},V={};return"undefined"!=typeof Proxy?V=new Proxy({},{get:function(e,t){if("os"===t)return{nvue:!0};if("postMessage"===t)return w;if("requireNativePlugin"===t)return I;if("onNavigationBarButtonTap"===t)return S;if("onNavigationBarSearchInputChanged"===t)return C;if("onNavigationBarSearchInputConfirmed"===t)return D;if("onNavigationBarSearchInputClicked"===t)return L;var A=F[t];return A||(A=b(t)),n(t)?o(A):A}}):(Object.keys(R).forEach((function(e){V[e]=R[e]})),V.postMessage=w,V.requireNativePlugin=I,V.onNavigationBarButtonTap=S,V.onNavigationBarSearchInputChanged=C,V.onNavigationBarSearchInputConfirmed=D,V.onNavigationBarSearchInputClicked=L,Object.keys({uploadFile:!0,downloadFile:!0,chooseImage:!0,previewImage:!0,getImageInfo:!0,saveImageToPhotosAlbum:!0,chooseVideo:!0,saveVideoToPhotosAlbum:!0,saveFile:!0,getSavedFileList:!0,getSavedFileInfo:!0,removeSavedFile:!0,openDocument:!0,setStorage:!0,getStorage:!0,getStorageInfo:!0,removeStorage:!0,clearStorage:!0,getLocation:!0,chooseLocation:!0,openLocation:!0,getSystemInfo:!0,getNetworkType:!0,makePhoneCall:!0,scanCode:!0,setScreenBrightness:!0,getScreenBrightness:!0,setKeepScreenOn:!0,vibrateLong:!0,vibrateShort:!0,addPhoneContact:!0,showToast:!0,showLoading:!0,hideToast:!0,hideLoading:!0,showModal:!0,showActionSheet:!0,setNavigationBarTitle:!0,setNavigationBarColor:!0,navigateTo:!0,redirectTo:!0,reLaunch:!0,switchTab:!0,navigateBack:!0,getProvider:!0,login:!0,getUserInfo:!0,share:!0,requestPayment:!0,subscribePush:!0,unsubscribePush:!0,onPush:!0,offPush:!0}).forEach((function(e){var t=F[e];t||(t=b(e)),n(e)?V[e]=o(t):V[e]=t}))),V};var i=new WeexPlus(weex);t.weexPlus=i;var n=a(weex,i,BroadcastChannel);t.default=n},function(e,t,A){Vue.prototype.__$appStyle__={},Vue.prototype.__merge_style&&Vue.prototype.__merge_style(A(4).default,Vue.prototype.__$appStyle__)},function(e,t,A){"use strict";A.r(t);var a=A(0),i=A.n(a);for(var n in a)"default"!==n&&function(e){A.d(t,e,(function(){return a[e]}))}(n);t.default=i.a},function(e,t,A){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var A={onLoad:function(){this.initMessage()},methods:{initMessage:function(){var t=this,A=e.webview.currentWebview().extras||{},a=A.from,i=(A.callback,A.runtime),n=A.data,o=void 0===n?{}:n,s=A.useGlobalEvent;this.__from=a,this.__runtime=i,this.__page=e.webview.currentWebview().id,this.__useGlobalEvent=s,this.data=JSON.parse(JSON.stringify(o)),e.key.addEventListener("backbutton",(function(){"function"==typeof t.onClose?t.onClose():e.webview.currentWebview().close("auto")}));var r=this,c=function(e){var t=e.data&&e.data.__message;t&&r.__onMessageCallback&&r.__onMessageCallback(t.data)};this.__useGlobalEvent?weex.requireModule("globalEvent").addEventListener("plusMessage",c):new BroadcastChannel(this.__page).onmessage=c},postMessage:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},A=arguments.length>1&&void 0!==arguments[1]&&arguments[1],a=JSON.parse(JSON.stringify({__message:{__page:this.__page,data:t,keep:A}})),i=this.__from;if("v8"===this.__runtime)if(this.__useGlobalEvent)e.webview.postMessageToUniNView(a,i);else{var n=new BroadcastChannel(i);n.postMessage(a)}else{var o=e.webview.getWebviewById(i);o&&o.evalJS("__plusMessage&&__plusMessage(".concat(JSON.stringify({data:a}),")"))}},onMessage:function(e){this.__onMessageCallback=e}}};t.default=A}).call(this,A(2).weexPlus)},function(e,t,A){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var A={data:function(){return{locale:"en",fallbackLocale:"en",localization:{en:{done:"OK",cancel:"Cancel"},zh:{done:"完成",cancel:"取消"},"zh-hans":{},"zh-hant":{},messages:{}}}},onLoad:function(){this.initLocale()},created:function(){this.initLocale()},methods:{initLocale:function(){if(!this.__initLocale){this.__initLocale=!0;var t=(e.webview.currentWebview().extras||{}).data||{};if(t.messages&&(this.localization.messages=t.messages),t.locale)this.locale=t.locale.toLowerCase();else{var A=e.os.language.toLowerCase().split("/")[0].replace("_","-").split("-"),a=A[1];a&&(A[1]={chs:"hans",cn:"hans",sg:"hans",cht:"hant",tw:"hant",hk:"hant",mo:"hant"}[a]||a),A.length=A.length>2?2:A.length,this.locale=A.join("-")}}},localize:function(e){var t=this.locale,A=t.split("-")[0],a=this.fallbackLocale,i=this.localization;function n(e){return i[e]||{}}return n("messages")[e]||n(t)[e]||n(A)[e]||n(a)[e]||e}}};t.default=A}).call(this,A(2).weexPlus)},function(e,t,A){"use strict";var a=A(29),i=A(12),n=A(1);var o=Object(n.a)(i.default,a.b,a.c,!1,null,null,"14d2bcf2",!1,a.a,void 0);(function(e){this.options.style||(this.options.style={}),Vue.prototype.__merge_style&&Vue.prototype.__$appStyle__&&Vue.prototype.__merge_style(Vue.prototype.__$appStyle__,this.options.style),Vue.prototype.__merge_style?Vue.prototype.__merge_style(A(36).default,this.options.style):Object.assign(this.options.style,A(36).default)}).call(o),t.default=o.exports},,,,,function(e,t,A){"use strict";var a=A(13),i=A.n(a);t.default=i.a},function(e,t,A){"use strict";(function(e,a){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var i=o(A(5)),n=o(A(6));function o(e){return e&&e.__esModule?e:{default:e}}function s(e,t){var A=Object.keys(e);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);t&&(a=a.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),A.push.apply(A,a)}return A}function r(e,t,A){return t in e?Object.defineProperty(e,t,{value:A,enumerable:!0,configurable:!0,writable:!0}):e[t]=A,e}weex.requireModule("dom").addRule("fontFace",{fontFamily:"unichooselocation",src:"url('data:font/truetype;charset=utf-8;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzI8gE4kAAABfAAAAFZjbWFw4nGd6QAAAegAAAGyZ2x5Zn61L/EAAAOoAAACJGhlYWQXJ/zZAAAA4AAAADZoaGVhB94DhgAAALwAAAAkaG10eBQAAAAAAAHUAAAAFGxvY2EBUAGyAAADnAAAAAxtYXhwARMAZgAAARgAAAAgbmFtZWs+cdAAAAXMAAAC2XBvc3SV1XYLAAAIqAAAAE4AAQAAA4D/gABcBAAAAAAABAAAAQAAAAAAAAAAAAAAAAAAAAUAAQAAAAEAAFP+qyxfDzz1AAsEAAAAAADaBFxuAAAAANoEXG4AAP+gBAADYAAAAAgAAgAAAAAAAAABAAAABQBaAAQAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQQAAZAABQAIAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA5grsMgOA/4AAXAOAAIAAAAABAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAFAAAAAwAAACwAAAAEAAABcgABAAAAAABsAAMAAQAAACwAAwAKAAABcgAEAEAAAAAKAAgAAgAC5grmHOZR7DL//wAA5grmHOZR7DL//wAAAAAAAAAAAAEACgAKAAoACgAAAAQAAwACAAEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAEAAAAAAAAAABAAA5goAAOYKAAAABAAA5hwAAOYcAAAAAwAA5lEAAOZRAAAAAgAA7DIAAOwyAAAAAQAAAAAAAAB+AKAA0gESAAQAAP+gA+ADYAAAAAkAMQBZAAABIx4BMjY0JiIGBSMuASc1NCYiBh0BDgEHIyIGFBY7AR4BFxUUFjI2PQE+ATczMjY0JgE1NCYiBh0BLgEnMzI2NCYrAT4BNxUUFjI2PQEeARcjIgYUFjsBDgECAFABLUQtLUQtAg8iD9OcEhwSnNMPIg4SEg4iD9OcEhwSnNMPIg4SEv5SEhwSga8OPg4SEg4+Dq+BEhwSga8OPg4SEg4+Dq8BgCItLUQtLQKc0w8iDhISDiIP05wSHBKc0w8iDhISDiIP05wSHBL+gj4OEhIOPg6vgRIcEoGvDj4OEhIOPg6vgRIcEoGvAAEAAAAAA4ECgQAQAAABPgEeAQcBDgEvASY0NhYfAQM2DCIbAgz+TA0kDfcMGiIN1wJyDQIZIg3+IQ4BDf4NIhoBDd0AAQAAAAADAgKCAB0AAAE3PgEuAgYPAScmIgYUHwEHBhQWMj8BFxYyNjQnAjy4CAYGEBcWCLe3DSIaDLi4DBkjDbe3DSMZDAGAtwgWFxAGBgi4uAwaIg23tw0jGQy4uAwZIw0AAAIAAP/fA6EDHgAVACYAACUnPgE3LgEnDgEHHgEXMjY3FxYyNjQlBiIuAjQ+AjIeAhQOAQOX2CcsAQTCkpLCAwPCkj5uLdkJGRH+ijV0Z08rK09ndGdPLCxPE9MtckGSwgQEwpKSwgMoJdQIEhi3FixOaHNnTywsT2dzaE4AAAAAAAASAN4AAQAAAAAAAAAVAAAAAQAAAAAAAQARABUAAQAAAAAAAgAHACYAAQAAAAAAAwARAC0AAQAAAAAABAARAD4AAQAAAAAABQALAE8AAQAAAAAABgARAFoAAQAAAAAACgArAGsAAQAAAAAACwATAJYAAwABBAkAAAAqAKkAAwABBAkAAQAiANMAAwABBAkAAgAOAPUAAwABBAkAAwAiAQMAAwABBAkABAAiASUAAwABBAkABQAWAUcAAwABBAkABgAiAV0AAwABBAkACgBWAX8AAwABBAkACwAmAdUKQ3JlYXRlZCBieSBpY29uZm9udAp1bmljaG9vc2Vsb2NhdGlvblJlZ3VsYXJ1bmljaG9vc2Vsb2NhdGlvbnVuaWNob29zZWxvY2F0aW9uVmVyc2lvbiAxLjB1bmljaG9vc2Vsb2NhdGlvbkdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAAoAQwByAGUAYQB0AGUAZAAgAGIAeQAgAGkAYwBvAG4AZgBvAG4AdAAKAHUAbgBpAGMAaABvAG8AcwBlAGwAbwBjAGEAdABpAG8AbgBSAGUAZwB1AGwAYQByAHUAbgBpAGMAaABvAG8AcwBlAGwAbwBjAGEAdABpAG8AbgB1AG4AaQBjAGgAbwBvAHMAZQBsAG8AYwBhAHQAaQBvAG4AVgBlAHIAcwBpAG8AbgAgADEALgAwAHUAbgBpAGMAaABvAG8AcwBlAGwAbwBjAGEAdABpAG8AbgBHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAQIBAwEEAQUBBgAKbXlsb2NhdGlvbgZ4dWFuemUFY2xvc2UGc291c3VvAAAAAA==')"});var c=weex.requireModule("mapSearch"),l="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAACcCAMAAAC3Fl5oAAAB3VBMVEVMaXH/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/EhL/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/Dw//AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/GRn/NTX/Dw//Fhb/AAD/AAD/AAD/GRn/GRn/Y2P/AAD/AAD/ExP/Ghr/AAD/AAD/MzP/GRn/AAD/Hh7/AAD/RUX/AAD/AAD/AAD/AAD/AAD/AAD/Dg7/AAD/HR3/Dw//FRX/SUn/AAD/////kJD/DQ3/Zmb/+/v/wMD/mJj/6en/vb3/1NT//Pz/ODj/+fn/3Nz/nJz/j4//9/f/7e3/9vb/7Oz/2Nj/x8f/Ozv/+Pj/3d3/nZ3/2dn//f3/6Oj/2tr/v7//09P/vr7/mZn/l5cdSvP3AAAAe3RSTlMAAhLiZgTb/vztB/JMRhlp6lQW86g8mQ4KFPs3UCH5U8huwlesWtTYGI7RsdVeJGfTW5rxnutLsvXWF8vQNdo6qQbuz7D4hgVIx2xtw8GC1TtZaIw0i84P98tU0/fsj7PKaAgiZZxeVfo8Z52eg1P0nESrENnjXVPUgw/uuSmDAAADsUlEQVR42u3aZ3cTRxgF4GtbYleSLdnGcsENG2ODjbExEHrvhAQCIb1Bem+QdkeuuFMNBBJIfmuOckzZI8/srHYmH3Lm+QNXK632LTvQ03Tu/IWeU/tTGTKT2n+q58L5c00wpXJd47DHEt5w47pKxLbhdLdPKb/7dBYxVLxw1GcI/2h1BcpzKNFHLX2JQ4gumaiitqpEEhEdOMJI9h5AFC3feYzI+7IF2tpSLEOqDXpObPRYFm/jCWho/4Ble7MdoT7fzhhq9yHEz28wltU1UPrJZ0wd66HwicfYvEFIfePTAP8tSLTupBHvtGJFH9bSkNrNWEHzERrT34xSH9Ogr1CijkbVAUH1KRqVqkdQAw07iIAaGlcTqI+/0LjeJJ5J0IIEnkpXMdzs4sTtW9dnZq7fuj2xOMtwVWk88RHDjBYejYvnjD8qjOpfQsUqhvj7oSjxcJIhVj3pyKqpNjYvVjQ/RrXq5YABKi3MCYm5BSrtWO5v11DlmlC4RpU1WRS9SJU7QukOVbpQ9JLu549+Dd0AUOlTbkGEuk85vxLAK5QbuytC3R2j3HoAjZSbFxrmKTcCoJdSk0LLJKV6gSaPMqNTQsvUKGW8JrxKqUWhaZFSeWyh1LTQNE2pHF6mzOy40DQ+S5mLimJcENoKlOnBWsr8KbRNUGYt5LXgd6HtD3lNQIoyN4S2G5RJIUOZm0LbTcqsBqVmhLYZSlkPsP4VWf+Rrd+m1v9o9h8Vv5p42C1R5qL1x7WRglOgVN52yfwNOBu76P+lLPoYidu23KPciIHGa07ZeIW1jvcNtI7q5vexCPGYCmf+m/Y9a3sAwQ5bI9T7ukPgPcn9GToEao+xk1OixJT+GIsvNAbx6eAgPq0xiF+KtkpYKhRXCQ8eFFcJhSWGu3rZ8jJkCM8kz9K4TUnrC6mAgzTsB9tLwQ2W15qfosQ2GrQNpZr7aczbzVjBZsvLcaC1g0bsbIVEnU8DOr6H1KDH2LwtUBi0/JII6Dxm9zUXkH+XMWzfh1Dte1i2Pe3QkC77Zel7aehpO8wyHG6Dtt0NjKxhN6I4uSli/TqJiJJDUQ4NDCURXTrXRy1XcumyD24M+AzhD1RXIIZsl/LoyZmurJHDM7s8lvB2FQ/PmPJ6PseAXP5HGMYAAC7ABbgAF+ACXIALcAEuwAW4ABfgAlyAC3ABLsAFuID/d8Cx4NEt8/byOf0wLnis8zjMq9/Kp7bWw4JOj8u8TlhRl+G/Mp2wpOX48GffvvZ1CyL4B53LAS6zb08EAAAAAElFTkSuQmCC";var u={mixins:[i.default,n.default],data:function(){return{positionIcon:l,mapScale:16,userKeyword:"",showLocation:!0,latitude:39.908692,longitude:116.397477,nearList:[],nearSelectedIndex:-1,nearLoading:!1,nearLoadingEnd:!1,noNearData:!1,isUserLocation:!1,statusBarHeight:20,mapHeight:250,markers:[{id:"location",latitude:39.908692,longitude:116.397477,zIndex:"1",iconPath:l,width:26,height:36}],showSearch:!1,searchList:[],searchSelectedIndex:-1,searchLoading:!1,searchEnd:!1,noSearchData:!1,localization:{en:{search_tips:"Search for a place",no_found:"No results found",nearby:"Nearby",more:"More"},zh:{search_tips:"搜索地点",no_found:"对不起，没有搜索到相关数据",nearby:"附近",more:"更多"}},searchNearFlag:!0,searchMethod:"poiSearchNearBy"}},computed:{disableOK:function(){return this.nearSelectedIndex<0&&this.searchSelectedIndex<0},searchMethods:function(){return[{title:this.localize("nearby"),method:"poiSearchNearBy"},{title:this.localize("more"),method:"poiKeywordsSearch"}]}},filters:{distance:function(e){return e>100?"".concat(e>1e3?(e/1e3).toFixed(1)+"k":e.toFixed(0),"m | "):e>0?"100m内 | ":""}},watch:{searchMethod:function(){this._searchPageIndex=1,this.searchEnd=!1,this.searchList=[],this._searchKeyword&&this.search()}},onLoad:function(){this.statusBarHeight=e.navigator.getStatusbarHeight(),this.mapHeight=e.screen.resolutionHeight/2;var t=this.data;this.userKeyword=t.keyword||"",this._searchInputTimer=null,this._searchPageIndex=1,this._searchKeyword="",this._nearPageIndex=1,this._hasUserLocation=!1,this._userLatitude=0,this._userLongitude=0},onReady:function(){this.mapContext=this.$refs.map1,this.data.latitude&&this.data.longitude?(this._hasUserLocation=!0,this.moveToCenter({latitude:this.data.latitude,longitude:this.data.longitude})):this.getUserLocation()},onUnload:function(){this.clearSearchTimer()},methods:{cancelClick:function(){this.postMessage({event:"cancel"})},doneClick:function(){if(!this.disableOK){var e=this.showSearch&&this.searchSelectedIndex>=0?this.searchList[this.searchSelectedIndex]:this.nearList[this.nearSelectedIndex],t={name:e.name,address:e.address,latitude:e.location.latitude,longitude:e.location.longitude};this.postMessage({event:"selected",detail:t})}},getUserLocation:function(){var t=this;e.geolocation.getCurrentPosition((function(e){var A=e.coordsType,a=e.coords;"wgs84"===A.toLowerCase()?t.wgs84togcjo2(a,(function(e){t.getUserLocationSuccess(e)})):t.getUserLocationSuccess(a)}),(function(e){t._hasUserLocation=!0,a("log","Gelocation Error: code - "+e.code+"; message - "+e.message," at template/__uniappchooselocation.nvue:292")}),{geocode:!1})},getUserLocationSuccess:function(e){this._userLatitude=e.latitude,this._userLongitude=e.longitude,this._hasUserLocation=!0,this.moveToCenter({latitude:e.latitude,longitude:e.longitude})},searchclick:function(t){this.showSearch=t,!1===t&&e.key.hideSoftKeybord()},showSearchView:function(){this.searchList=[],this.showSearch=!0},hideSearchView:function(){this.showSearch=!1,e.key.hideSoftKeybord(),this.noSearchData=!1,this.searchSelectedIndex=-1,this._searchKeyword=""},onregionchange:function(e){var t=this,A=e.detail,a=A.type||e.type;"drag"===(A.causedBy||e.causedBy)&&"end"===a&&this.mapContext.getCenterLocation((function(e){t.searchNearFlag?t.moveToCenter({latitude:e.latitude,longitude:e.longitude}):t.searchNearFlag=!t.searchNearFlag}))},onItemClick:function(e,t){this.searchNearFlag=!1,t.stopPropagation&&t.stopPropagation(),this.nearSelectedIndex!==e&&(this.nearSelectedIndex=e),this.moveToLocation(this.nearList[e]&&this.nearList[e].location)},moveToCenter:function(e){this.latitude===e.latitude&&this.longitude===e.longitude||(this.latitude=e.latitude,this.longitude=e.longitude,this.updateCenter(e),this.moveToLocation(e),this.isUserLocation=this._userLatitude===e.latitude&&this._userLongitude===e.longitude)},updateCenter:function(e){var t=this;this.nearSelectedIndex=-1,this.nearList=[],this._hasUserLocation&&(this._nearPageIndex=1,this.nearLoadingEnd=!1,this.reverseGeocode(e),this.searchNearByPoint(e),this.onItemClick(0,{stopPropagation:function(){t.searchNearFlag=!0}}),this.$refs.nearListLoadmore.resetLoadmore())},searchNear:function(){this.nearLoadingEnd||this.searchNearByPoint({latitude:this.latitude,longitude:this.longitude})},searchNearByPoint:function(e){var t=this;this.noNearData=!1,this.nearLoading=!0,c.poiSearchNearBy({point:{latitude:e.latitude,longitude:e.longitude},key:this.userKeyword,sortrule:1,index:this._nearPageIndex,radius:1e3},(function(e){t.nearLoading=!1,t._nearPageIndex=e.pageIndex+1,t.nearLoadingEnd=e.pageIndex===e.pageNumber,e.poiList&&e.poiList.length?(t.fixPois(e.poiList),t.nearList=t.nearList.concat(e.poiList),t.fixNearList()):t.noNearData=0===t.nearList.length}))},moveToLocation:function(e){e&&this.mapContext.moveToLocation(function(e){for(var t=1;t=2&&"地图位置"===e[0].name){var t=this.getAddressStart(e[1]),A=e[0].address;A.startsWith(t)&&(e[0].name=A.substring(t.length))}},onsearchinput:function(e){var t=this,A=e.detail.value.replace(/^\s+|\s+$/g,"");this.clearSearchTimer(),this._searchInputTimer=setTimeout((function(){clearTimeout(t._searchInputTimer),t._searchPageIndex=1,t.searchEnd=!1,t._searchKeyword=A,t.searchList=[],t.search()}),300)},clearSearchTimer:function(){this._searchInputTimer&&clearTimeout(this._searchInputTimer)},search:function(){var e=this;0===this._searchKeyword.length||this._searchEnd||this.searchLoading||(this.searchLoading=!0,this.noSearchData=!1,c[this.searchMethod]({point:{latitude:this.latitude,longitude:this.longitude},key:this._searchKeyword,sortrule:1,index:this._searchPageIndex,radius:5e4},(function(t){e.searchLoading=!1,e._searchPageIndex=t.pageIndex+1,e.searchEnd=t.pageIndex===t.pageNumber,t.poiList&&t.poiList.length?(e.fixPois(t.poiList),e.searchList=e.searchList.concat(t.poiList)):e.noSearchData=0===e.searchList.length})))},onSearchListTouchStart:function(){e.key.hideSoftKeybord()},onSearchItemClick:function(e,t){t.stopPropagation(),this.searchSelectedIndex!==e&&(this.searchSelectedIndex=e),this.moveToLocation(this.searchList[e]&&this.searchList[e].location)},getAddressStart:function(e){var t=e.addressOrigin||e.address;return e.province+(e.province===e.city?"":e.city)+(/^\d+$/.test(e.district)?"":t.startsWith(e.district)?"":e.district)},fixPois:function(e){for(var t=0;t1?t-1:0),a=1;a1){var r=o.pop();s=o.join("---COMMA---"),0===r.indexOf(" at ")?s+=r:s+="---COMMA---"+r}else s=o[0];console[n](s)}},function(e,t,A){"use strict";A.r(t);var a=A(14),i=A.n(a);for(var n in a)"default"!==n&&function(e){A.d(t,e,(function(){return a[e]}))}(n);t.default=i.a},,,,,function(e,t,A){"use strict";A.r(t);A(3);var a=A(7);a.default.mpType="page",a.default.route="template/__uniappchooselocation",a.default.el="#root",new Vue(a.default)}]);
\ No newline at end of file
diff --git a/unpackage/resources/__UNI__C0E0831/www/__uniapperror.png b/unpackage/resources/__UNI__C0E0831/www/__uniapperror.png
new file mode 100644
index 0000000..4743b25
Binary files /dev/null and b/unpackage/resources/__UNI__C0E0831/www/__uniapperror.png differ
diff --git a/unpackage/resources/__UNI__C0E0831/www/__uniappes6.js b/unpackage/resources/__UNI__C0E0831/www/__uniappes6.js
new file mode 100644
index 0000000..d4018e8
--- /dev/null
+++ b/unpackage/resources/__UNI__C0E0831/www/__uniappes6.js
@@ -0,0 +1 @@
+!function(t){"use strict";!function(t){var r={};function n(e){if(r[e])return r[e].exports;var o=r[e]={i:e,l:!1,exports:{}};return t[e].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=r,n.d=function(t,r,e){n.o(t,r)||Object.defineProperty(t,r,{enumerable:!0,get:e})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,r){if(1&r&&(t=n(t)),8&r)return t;if(4&r&&"object"==typeof t&&t&&t.__esModule)return t;var e=Object.create(null);if(n.r(e),Object.defineProperty(e,"default",{enumerable:!0,value:t}),2&r&&"string"!=typeof t)for(var o in t)n.d(e,o,function(r){return t[r]}.bind(null,o));return e},n.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(r,"a",r),r},n.o=function(t,r){return Object.prototype.hasOwnProperty.call(t,r)},n.p="",n(n.s=0)}([function(t,r,n){n(1),n(54),n(61),n(66),n(68),n(69),n(70),n(71),n(73),n(74),n(76),n(84),n(85),n(86),n(95),n(96),n(98),n(99),n(100),n(102),n(103),n(104),n(105),n(106),n(107),n(109),n(110),n(111),n(112),n(121),n(124),n(125),n(127),n(129),n(130),n(131),n(132),n(133),n(135),n(137),n(140),n(141),n(143),n(145),n(146),n(147),n(148),n(150),n(151),n(152),n(153),n(154),n(156),n(157),n(159),n(160),n(161),n(162),n(163),n(164),n(165),n(166),n(167),n(168),n(170),n(171),n(172),n(174),n(178),n(179),n(180),n(181),n(187),n(189),n(192),n(193),n(194),n(195),n(196),n(197),n(198),n(199),n(201),n(202),n(203),n(206),n(207),n(208),n(209),n(210),n(211),n(212),n(213),n(214),n(215),n(216),t.exports=n(217)},function(r,n,e){var o=e(2),i=e(6),u=e(45),c=e(14),a=e(46),f=e(39),s=e(47),l=e(48),p=e(51),g=e(49),v=e(52),h=g("isConcatSpreadable"),d=v>=51||!i(function(){var t=[];return t[h]=!1,t.concat()[0]!==t}),x=p("concat"),y=function(r){if(!c(r))return!1;var n=r[h];return n!==t?!!n:u(r)};o({target:"Array",proto:!0,forced:!d||!x},{concat:function(t){var r,n,e,o,i,u=a(this),c=l(u,0),p=0;for(r=-1,e=arguments.length;r9007199254740991)throw TypeError("Maximum allowed index exceeded");for(n=0;n=9007199254740991)throw TypeError("Maximum allowed index exceeded");s(c,p++,i)}return c.length=p,c}})},function(r,n,e){var o=e(3),i=e(4).f,u=e(18),c=e(21),a=e(25),f=e(32),s=e(44);r.exports=function(r,n){var e,l,p,g,v,h=r.target,d=r.global,x=r.stat;if(e=d?o:x?o[h]||a(h,{}):(o[h]||{}).prototype)for(l in n){if(g=n[l],p=r.noTargetGet?(v=i(e,l))&&v.value:e[l],!s(d?l:h+(x?".":"#")+l,r.forced)&&p!==t){if(typeof g==typeof p)continue;f(g,p)}(r.sham||p&&p.sham)&&u(g,"sham",!0),c(e,l,g,r)}}},function(t,r){var n=function(t){return t&&t.Math==Math&&t};t.exports=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof global&&global)||Function("return this")()},function(t,r,n){var e=n(5),o=n(7),i=n(8),u=n(9),c=n(13),a=n(15),f=n(16),s=Object.getOwnPropertyDescriptor;r.f=e?s:function(t,r){if(t=u(t),r=c(r,!0),f)try{return s(t,r)}catch(t){}if(a(t,r))return i(!o.f.call(t,r),t[r])}},function(t,r,n){var e=n(6);t.exports=!e(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(t,r){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,r,n){var e={}.propertyIsEnumerable,o=Object.getOwnPropertyDescriptor,i=o&&!e.call({1:2},1);r.f=i?function(t){var r=o(this,t);return!!r&&r.enumerable}:e},function(t,r){t.exports=function(t,r){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:r}}},function(t,r,n){var e=n(10),o=n(12);t.exports=function(t){return e(o(t))}},function(t,r,n){var e=n(6),o=n(11),i="".split;t.exports=e(function(){return!Object("z").propertyIsEnumerable(0)})?function(t){return"String"==o(t)?i.call(t,""):Object(t)}:Object},function(t,r){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(r,n){r.exports=function(r){if(r==t)throw TypeError("Can't call method on "+r);return r}},function(t,r,n){var e=n(14);t.exports=function(t,r){if(!e(t))return t;var n,o;if(r&&"function"==typeof(n=t.toString)&&!e(o=n.call(t)))return o;if("function"==typeof(n=t.valueOf)&&!e(o=n.call(t)))return o;if(!r&&"function"==typeof(n=t.toString)&&!e(o=n.call(t)))return o;throw TypeError("Can't convert object to primitive value")}},function(t,r){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,r){var n={}.hasOwnProperty;t.exports=function(t,r){return n.call(t,r)}},function(t,r,n){var e=n(5),o=n(6),i=n(17);t.exports=!e&&!o(function(){return 7!=Object.defineProperty(i("div"),"a",{get:function(){return 7}}).a})},function(t,r,n){var e=n(3),o=n(14),i=e.document,u=o(i)&&o(i.createElement);t.exports=function(t){return u?i.createElement(t):{}}},function(t,r,n){var e=n(5),o=n(19),i=n(8);t.exports=e?function(t,r,n){return o.f(t,r,i(1,n))}:function(t,r,n){return t[r]=n,t}},function(t,r,n){var e=n(5),o=n(16),i=n(20),u=n(13),c=Object.defineProperty;r.f=e?c:function(t,r,n){if(i(t),r=u(r,!0),i(n),o)try{return c(t,r,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[r]=n.value),t}},function(t,r,n){var e=n(14);t.exports=function(t){if(!e(t))throw TypeError(String(t)+" is not an object");return t}},function(t,r,n){var e=n(3),o=n(22),i=n(18),u=n(15),c=n(25),a=n(26),f=n(27),s=f.get,l=f.enforce,p=String(a).split("toString");o("inspectSource",function(t){return a.call(t)}),(t.exports=function(t,r,n,o){var a=!!o&&!!o.unsafe,f=!!o&&!!o.enumerable,s=!!o&&!!o.noTargetGet;"function"==typeof n&&("string"!=typeof r||u(n,"name")||i(n,"name",r),l(n).source=p.join("string"==typeof r?r:"")),t!==e?(a?!s&&t[r]&&(f=!0):delete t[r],f?t[r]=n:i(t,r,n)):f?t[r]=n:c(r,n)})(Function.prototype,"toString",function(){return"function"==typeof this&&s(this).source||a.call(this)})},function(r,n,e){var o=e(23),i=e(24);(r.exports=function(r,n){return i[r]||(i[r]=n!==t?n:{})})("versions",[]).push({version:"3.3.6",mode:o?"pure":"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})},function(t,r){t.exports=!1},function(t,r,n){var e=n(3),o=n(25),i=e["__core-js_shared__"]||o("__core-js_shared__",{});t.exports=i},function(t,r,n){var e=n(3),o=n(18);t.exports=function(t,r){try{o(e,t,r)}catch(n){e[t]=r}return r}},function(t,r,n){var e=n(22);t.exports=e("native-function-to-string",Function.toString)},function(t,r,n){var e,o,i,u=n(28),c=n(3),a=n(14),f=n(18),s=n(15),l=n(29),p=n(31),g=c.WeakMap;if(u){var v=new g,h=v.get,d=v.has,x=v.set;e=function(t,r){return x.call(v,t,r),r},o=function(t){return h.call(v,t)||{}},i=function(t){return d.call(v,t)}}else{var y=l("state");p[y]=!0,e=function(t,r){return f(t,y,r),r},o=function(t){return s(t,y)?t[y]:{}},i=function(t){return s(t,y)}}t.exports={set:e,get:o,has:i,enforce:function(t){return i(t)?o(t):e(t,{})},getterFor:function(t){return function(r){var n;if(!a(r)||(n=o(r)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}}},function(t,r,n){var e=n(3),o=n(26),i=e.WeakMap;t.exports="function"==typeof i&&/native code/.test(o.call(i))},function(t,r,n){var e=n(22),o=n(30),i=e("keys");t.exports=function(t){return i[t]||(i[t]=o(t))}},function(r,n){var e=0,o=Math.random();r.exports=function(r){return"Symbol("+String(r===t?"":r)+")_"+(++e+o).toString(36)}},function(t,r){t.exports={}},function(t,r,n){var e=n(15),o=n(33),i=n(4),u=n(19);t.exports=function(t,r){for(var n=o(r),c=u.f,a=i.f,f=0;fa;)e(c,n=r[a++])&&(~i(f,n)||f.push(n));return f}},function(t,r,n){var e=n(9),o=n(39),i=n(41),u=function(t){return function(r,n,u){var c,a=e(r),f=o(a.length),s=i(u,f);if(t&&n!=n){for(;f>s;)if((c=a[s++])!=c)return!0}else for(;f>s;s++)if((t||s in a)&&a[s]===n)return t||s||0;return!t&&-1}};t.exports={includes:u(!0),indexOf:u(!1)}},function(t,r,n){var e=n(40),o=Math.min;t.exports=function(t){return t>0?o(e(t),9007199254740991):0}},function(t,r){var n=Math.ceil,e=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?e:n)(t)}},function(t,r,n){var e=n(40),o=Math.max,i=Math.min;t.exports=function(t,r){var n=e(t);return n<0?o(n+r,0):i(n,r)}},function(t,r){t.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},function(t,r){r.f=Object.getOwnPropertySymbols},function(t,r,n){var e=n(6),o=/#|\.prototype\./,i=function(t,r){var n=c[u(t)];return n==f||n!=a&&("function"==typeof r?e(r):!!r)},u=i.normalize=function(t){return String(t).replace(o,".").toLowerCase()},c=i.data={},a=i.NATIVE="N",f=i.POLYFILL="P";t.exports=i},function(t,r,n){var e=n(11);t.exports=Array.isArray||function(t){return"Array"==e(t)}},function(t,r,n){var e=n(12);t.exports=function(t){return Object(e(t))}},function(t,r,n){var e=n(13),o=n(19),i=n(8);t.exports=function(t,r,n){var u=e(r);u in t?o.f(t,u,i(0,n)):t[u]=n}},function(r,n,e){var o=e(14),i=e(45),u=e(49)("species");r.exports=function(r,n){var e;return i(r)&&("function"!=typeof(e=r.constructor)||e!==Array&&!i(e.prototype)?o(e)&&null===(e=e[u])&&(e=t):e=t),new(e===t?Array:e)(0===n?0:n)}},function(t,r,n){var e=n(3),o=n(22),i=n(30),u=n(50),c=e.Symbol,a=o("wks");t.exports=function(t){return a[t]||(a[t]=u&&c[t]||(u?c:i)("Symbol."+t))}},function(t,r,n){var e=n(6);t.exports=!!Object.getOwnPropertySymbols&&!e(function(){return!String(Symbol())})},function(t,r,n){var e=n(6),o=n(49),i=n(52),u=o("species");t.exports=function(t){return i>=51||!e(function(){var r=[];return(r.constructor={})[u]=function(){return{foo:1}},1!==r[t](Boolean).foo})}},function(t,r,n){var e,o,i=n(3),u=n(53),c=i.process,a=c&&c.versions,f=a&&a.v8;f?o=(e=f.split("."))[0]+e[1]:u&&(!(e=u.match(/Edge\/(\d+)/))||e[1]>=74)&&(e=u.match(/Chrome\/(\d+)/))&&(o=e[1]),t.exports=o&&+o},function(t,r,n){var e=n(34);t.exports=e("navigator","userAgent")||""},function(t,r,n){var e=n(2),o=n(55),i=n(56);e({target:"Array",proto:!0},{copyWithin:o}),i("copyWithin")},function(r,n,e){var o=e(46),i=e(41),u=e(39),c=Math.min;r.exports=[].copyWithin||function(r,n){var e=o(this),a=u(e.length),f=i(r,a),s=i(n,a),l=arguments.length>2?arguments[2]:t,p=c((l===t?a:i(l,a))-s,a-f),g=1;for(s0;)s in e?e[f]=e[s]:delete e[f],f+=g,s+=g;return e}},function(r,n,e){var o=e(49),i=e(57),u=e(18),c=o("unscopables"),a=Array.prototype;a[c]==t&&u(a,c,i(null)),r.exports=function(t){a[c][t]=!0}},function(r,n,e){var o=e(20),i=e(58),u=e(42),c=e(31),a=e(60),f=e(17),s=e(29)("IE_PROTO"),l=function(){},p=function(){var t,r=f("iframe"),n=u.length;for(r.style.display="none",a.appendChild(r),r.src=String("javascript:"),(t=r.contentWindow.document).open(),t.write("
+ View
+
+
+
+
+
+
+
+
+
+
+