diff --git a/http/index.js b/http/index.js index bcf835b..e1ae0a1 100644 --- a/http/index.js +++ b/http/index.js @@ -4,10 +4,12 @@ import login from './login' import mine from './mine' import series from './series' import airdrop from './airdrop' +import usa from './usa' export default { login, mine, series, - airdrop + airdrop, + usa } diff --git a/http/interface.js b/http/interface.js index 8944e32..207a064 100644 --- a/http/interface.js +++ b/http/interface.js @@ -4,7 +4,7 @@ */ export default { config: { - baseUrl: "https://shop.szjixun.cn", + baseUrl: "http://shop-test.szjixun.cn", // baseUrl: "http://114.218.158.24:9022", header: { "Content-Type": "application/json;charset=UTF-8", @@ -71,9 +71,7 @@ export default { } } if (response.data.status === 401) { - uni.navigateTo({ - url: "/pages/login/login", - }); + } // 统一的响应日志记录 _reslog(response); diff --git a/http/usa.js b/http/usa.js new file mode 100644 index 0000000..561d5ae --- /dev/null +++ b/http/usa.js @@ -0,0 +1,58 @@ +import http from './interface' + +// 1.1 礼包详情 +export const getList = (data) => { + return http.request({ + url: '/mall/gift/active/series/info', + method: 'POST', + data + }) +} +// 藏品列表 +export const getCollectionList = (data) => { + return http.request({ + url: '/mall/gift/active/collections/list', + method: 'POST', + data + }) +} +// 领取 +export const receive = (data) => { + return http.request({ + url: '/mall/gift/active/draw', + method: 'POST', + data + }) +} +// 详情 +export const collectionsInfo = (data) => { + return http.request({ + url: '/mall/gift/active/collections/detail', + method: 'POST', + data + }) +} +// 我的藏品列表 +export const getMyCollectionList = (data) => { + return http.request({ + url: '/mall/gift/active/my/collections/list', + method: 'POST', + data + }) +} +// 获取系列的助记词 +export const getSeriesMnemonic = (data) => { + return http.request({ + url: '/mall/gift/active/scan/by/pwd', + method: 'POST', + data + }) +} +export default { + getList, + getCollectionList, + receive, + collectionsInfo, + getMyCollectionList, + getSeriesMnemonic +} diff --git a/index.html b/index.html index c3ff205..76c1b6c 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,7 @@ + + diff --git a/locale/en.json b/locale/en.json index bfa104f..2a42b34 100644 --- a/locale/en.json +++ b/locale/en.json @@ -1,5 +1,22 @@ { "app.name": "fontree", + "start.title": "Generating a blockchain identity⋯", + "seriesData.detail": "Gift package details", + "seriesData.recive": "Claim all", + "seriesData.success": "Claimed successfully!", + "usa.adress": "Address", + "usa.remember": "Mnemonic words", + "usa.check": "Check", + "usa.hasGet": "Items received", + "usa.popTitle": "Check Mnemonic words", + "usa.inputPassword": "Enter a 6-digit password", + "usa.warningPwd": "Please enter a 6-digit password", + "usa.copySuccess": "Copy successful!", + "usa.back": "Back", + "usa.backAndCopy": "Copy and back", + "usa.cancel": "Cancel", + "usa.confirm": "Confirm", + "usa.Password": "Password", "tabbar.home": "Home", "tabbar.mine": "Mine", "index.title": "Home", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index a24b4cf..7e08fe3 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -1,5 +1,22 @@ { - "app.name": "丰链艺树", + "app.name": "助记词", + "start.title": "正在生成区块链身份中⋯", + "seriesData.detail": "礼包详情", + "seriesData.recive": "全部领取", + "seriesData.success": "领取成功！", + "usa.adress": "地址", + "usa.remember": "助记词", + "usa.check": "点击查看", + "usa.hasGet": "已获取商品", + "usa.popTitle": "查看助记词", + "usa.inputPassword": "请输入6位数字密码", + "usa.warningPwd": "请输入密码", + "usa.copySuccess": "复制成功!", + "usa.back": "返回", + "usa.backAndCopy": "复制并返回", + "usa.cancel": "取消", + "usa.confirm": "确认", + "usa.Password": "密码", "tabbar.home": "首页", "tabbar.mine": "我的", "index.title": "首页", diff --git a/main.js b/main.js index f575f04..d183241 100644 --- a/main.js +++ b/main.js @@ -10,7 +10,7 @@ const messages = { }; let i18nConfig = { - locale: uni.getLocale(), // 获取已设置的语言 + locale: navigator.language === "en" ? "en" : "zh-Hans", messages, }; diff --git a/manifest.json b/manifest.json index 03deebc..bbfbccd 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "艺术商城", + "name" : "助记词", "appid" : "__UNI__7D47507", "description" : "", "versionName" : "1.0.0", @@ -9,7 +9,7 @@ /* 5+App特有相关 */ "app-plus" : { "safearea" : { - "bottom" : "none" + "bottom" : "auto" }, "usingComponents" : true, "nvueStyleCompiler" : "uni-app", @@ -117,6 +117,7 @@ }, "vueVersion" : "2", "h5" : { - "title" : "艺树商城" + "title" : "", + "template" : "" } } diff --git a/pages.json b/pages.json index 95ec0db..28019a2 100644 --- a/pages.json +++ b/pages.json @@ -1,253 +1,257 @@ { - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - }, - "pages": [ - //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/start/start", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/changePhone/changePhone", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/realName/realName", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/index", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/series/series", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/activeSeries/activeSeries", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/detail/detail", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/setting/setting", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/notice/notice", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/comfirm/comfirm", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/payment/payment", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/detail/detail", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/cert/cert", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/login/sendCode/sendCode", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/login/welcome/welcome", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/detail/open3D/open3D", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/mine/confirmOrder/confirmOrder", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/payment/reciveOK", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/activity/index", - "style": { - "navigationBarTitleText": "系列活动详情页", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "pages/index/activity/detail", - "style": { - "navigationBarTitleText": "藏品活动详情页", - "enablePullDownRefresh": false, - "app-plus": { - "titleNView": false // 禁用原生导航 - } - } - }, - { - "path": "components/tabBar/tabBar", - "style": {} - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8", - "app-plus": { - "bounce": "none" - } - }, - "tabBar": { - "list": [{ - "pagePath": "pages/index/index", - "text": "%tabbar.home%" - }, - { - "pagePath": "pages/mine/index", - "text": "%tabbar.mine%" - } - ] - }, - "uniIdRouter": {} -} \ No newline at end of file + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, + "pages": [ + //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/start/start", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/usamine/index", + "style": { + "navigationBarTitleText": "个人中心", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/changePhone/changePhone", + "style": { + "navigationBarTitleText": "loading", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/realName/realName", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "礼包详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, // 禁用原生导航 + "animationType": "fade-in", + "animationDuration": 100 + } + } + }, + { + "path": "pages/mine/index", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/series/series", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/activeSeries/activeSeries", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/detail/detail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/setting/setting", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/notice/notice", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/comfirm/comfirm", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/payment/payment", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/detail/detail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/cert/cert", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/login/sendCode/sendCode", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/login/welcome/welcome", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/detail/open3D/open3D", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/mine/confirmOrder/confirmOrder", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/payment/reciveOK", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/activity/index", + "style": { + "navigationBarTitleText": "系列活动详情页", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "pages/index/activity/detail", + "style": { + "navigationBarTitleText": "藏品活动详情页", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false // 禁用原生导航 + } + } + }, + { + "path": "components/tabBar/tabBar", + "style": {} + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "app-plus": { + "bounce": "none", + "animationType": "fade-in", + "animationDuration": 100 + } + }, + "tabBar": {}, + "uniIdRouter": {} +} diff --git a/pages/index/detail/detail.vue b/pages/index/detail/detail.vue index 6a14f8f..eee31ff 100644 --- a/pages/index/detail/detail.vue +++ b/pages/index/detail/detail.vue @@ -1,76 +1,38 @@ @@ -285,55 +104,30 @@ export default { return { stickyShow: false, showVerfy: false, - CollectionUID: "", + collectionsUID: "", collectionsDetail: {}, - sellPoint: [], - collDetails: [], - companyInfo: [], - copyright: [], - Blockchain: [], - realName: "", - idNum: "", - err: false, - succes: false, - SeriesName: "", - isHave: false, - AirdorpUid: "", - price: "", - isActive: false, - currencyType: "", - pageParams: {}, + carouselFigureImg: "", + detailImgList: [], + containerWidth:300 , // 替换为你的图片容器宽度 + }; }, - onPageScroll(e) { + onLoad: function (option) { + this.collectionsUID = option.collectionUID; + this.getCollectionDetail(); + + + }, + onReady() { + // 页面加载完毕后开始动画 + + }, + + methods: { + onPageScroll(e) { this.stickyShow = e.scrollTop > 5 ? true : false; }, - onLoad: function (option) { - this.pageParams = option; - this.CollectionUID = option.CollectionUID; - this.SeriesName = option.SeriesName; - this.price = option.Price; - this.isActive = !Object.keys(option).length; - }, - onShow() { - this.getCollectionDetail(); - }, - methods: { - calcRouteParams(obj) { - if (obj && JSON.stringify(obj) !== "{}") { - let str = "?"; - for (let key in obj) { - str += key + "=" + obj[key] + "&"; - } - return str.slice(0, -1); - } - return ""; - }, - open3D() { - uni.navigateTo({ - url: "/pages/index/detail/open3D/open3D", - }); - }, + back() { let routesRecord = getCurrentPages(); if (routesRecord.length > 1) { @@ -345,194 +139,26 @@ export default { } }, async getCollectionDetail() { - if (this.isActive) return; let data = { - CollectionsUID: this.CollectionUID, + collectionsUID: this.collectionsUID, }; - let res = await this.$api.series.collectionsInfo(data); + let res = await this.$api.usa.collectionsInfo(data); if (res.status === 0) { - // await this.getPick(res.data.CollectionUID); this.collectionsDetail = res.data; - (this.AllImgList = res.data.CutImg ? JSON.parse(res.data.CutImg) : []), - this.cutImg(); + this.carouselFigureImg = this.collectionsDetail.carouselFigureList[0]; + this.detailImgList = this.collectionsDetail.detailImgList; } else { uni.$u.toast(this.$t("load.failed")); } }, - async getPick(uid) { - if (this.isActive) return; - let parmas = { - uuid: uid, - }; - let res = await this.$api.series.userHaveDropNo(parmas); - if (res.status === 0) { - console.log(res.data.Hava); - this.isHave = res.data.Have != 0 ? false : true; - this.AirdorpUid = res.data.UserAirdorpUid; - } else { - this.isHave = false; - } - }, - cutImg() { - this.AllImgList.forEach((v) => { - if (Array.isArray(v.imgs)) { - v.imgs = v.imgs.filter((img) => { - if (img) { - return img; - } - }); - } - switch (v.label) { - case "卖点": - this.sellPoint = v.imgs; - break; - case "藏品细节": - this.collDetails = v.imgs; - break; - case "工艺/公司介绍": - this.companyInfo = v.imgs; - break; - case "版权声明": - this.copyright = v.imgs; - break; - case "区块链说明": - this.Blockchain = v.imgs; - break; - } - }); - }, - buy() { - // 只有领取和普通购买 才执行下去 - if ( - this.collectionsDetail.CurrencyType === "normal" && - ["normal", "draw"].includes(this.collectionsDetail.SaleType) - ) { - let token = uni.getStorageSync("mall_token"); - let realName = uni.getStorageSync("mall-user-info") - ? uni.getStorageSync("mall-user-info").realName - : ""; - if (!token) { - uni.$u.toast(this.$t("login.pls")); - uni.setStorageSync( - "login-redirect", - "/pages/index/detail/detail" + this.calcRouteParams(this.pageParams) - ); - uni.navigateTo({ - url: "/pages/login/login", - }); - } else if (!realName) { - this.showVerfy = true; - } else { - if (this.collectionsDetail.SaleType === "draw") { - this.directGet(); - return; - } - uni.navigateTo({ - url: - "/pages/index/comfirm/comfirm?Collection=" + - encodeURIComponent(JSON.stringify(this.collectionsDetail)), - }); - } - } - }, - async directGet() { - let data = { - CollectionsUID: this.collectionsDetail.CollectionUID, - }; - let res = await this.$api.airdrop.directGet(data); - if (res.status === 0) { - uni.$u.toast("领取成功！"); - this.getCollectionDetail(); - - let routesRecord = getCurrentPages(); - if (routesRecord.length > 1) { - let that = this; - setTimeout(() => { - that.$common.navigateBack(); - }, 1000); - } else { - setTimeout(() => { - uni.reLaunch({ - url: "/pages/index/index", - }); - }, 1000); - } - } else { - uni.$u.toast(res.msg); - } - }, - async pickUp() { - let data = { - UserId: uni.getStorageSync("mall-user-info").ID, - Uuid: this.AirdorpUid, - }; - let res = await this.$api.airdrop.getCollection(data); - if (res.status === 0) { - this.recive(); - } else { - uni.$u.toast(res.msg); - } - }, - async recive() { - let data = { - collectionsUID: this.CollectionUID, - userAirdropUuid: this.AirdorpUid, - }; - let res = await this.$api.airdrop.getCollectionStepTwo(data); - if (res.status === 0) { - uni.navigateTo({ - url: "/pages/index/payment/reciveOK", - }); - } else { - uni.$u.toast(res.msg); - } - }, - async verifyName() { - let data = { - idNum: this.idNum, - realName: this.realName, - }; - if (!data.idNum || !data.realName) { - return uni.$u.toast("姓名和身份证号不能为空"); - } - if (!uni.$u.test.idCard(data.idNum)) { - return uni.$u.toast("身份证号不正确"); - } - let res = await this.$api.mine.update(data); - if (res.status === 0) { - this.succes = true; - uni.setStorageSync("mall-user-info", res.data); - setTimeout(() => { - this.idNum = ""; - this.realName = ""; - this.showVerfy = false; - this.err = false; - this.succes = false; - }, 1000); - } else { - this.err = true; - this.succes = false; - uni.$u.toast(res.msg); - } - }, - verfFocus() { - this.err = false; - this.succes = false; - }, - doneVerfy() { - this.showVerfy = false; - }, - closeVerfy() { - this.showVerfy = false; - }, + }, }; diff --git a/pages/mine/usamine/index.vue b/pages/mine/usamine/index.vue new file mode 100644 index 0000000..e3c7865 --- /dev/null +++ b/pages/mine/usamine/index.vue @@ -0,0 +1,696 @@ + + + + + diff --git a/pages/start/start.vue b/pages/start/start.vue index 19167b9..3862cb8 100644 --- a/pages/start/start.vue +++ b/pages/start/start.vue @@ -1,46 +1,131 @@ diff --git a/static/3.jpg b/static/3.jpg new file mode 100644 index 0000000..6fb7bd8 Binary files /dev/null and b/static/3.jpg differ diff --git a/static/image/start/loading-word.png b/static/image/start/loading-word.png new file mode 100644 index 0000000..f04b2c2 Binary files /dev/null and b/static/image/start/loading-word.png differ diff --git a/static/image/start/new_bg.png b/static/image/start/new_bg.png index 471f577..8c529c2 100644 Binary files a/static/image/start/new_bg.png and b/static/image/start/new_bg.png differ diff --git a/static/image/usa/left.png b/static/image/usa/left.png new file mode 100644 index 0000000..3a010a0 Binary files /dev/null and b/static/image/usa/left.png differ diff --git a/static/image/usa/right.png b/static/image/usa/right.png new file mode 100644 index 0000000..2b04344 Binary files /dev/null and b/static/image/usa/right.png differ diff --git a/static/log.png b/static/log.png new file mode 100644 index 0000000..052c60f Binary files /dev/null and b/static/log.png differ