From ac2e6bf800aaa27352fcceeb411e20e2d52de4b6 Mon Sep 17 00:00:00 2001 From: Miao_Spring <539943419@qq.com> Date: Mon, 20 Nov 2023 05:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=AA=E6=80=A7=E5=8C=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/pages/index/index.scss | 469 ++++++++++-------- miniprogram/pages/index/index.ts | 375 +++++++++++--- miniprogram/pages/index/index.wxml | 25 +- .../pages/index/static/icons/back_black.svg | 1 + minitest/test.config.json | 3 + project.private.config.json | 2 +- 6 files changed, 589 insertions(+), 286 deletions(-) create mode 100644 miniprogram/pages/index/static/icons/back_black.svg create mode 100644 minitest/test.config.json diff --git a/miniprogram/pages/index/index.scss b/miniprogram/pages/index/index.scss index 33d7fb7..0760a73 100644 --- a/miniprogram/pages/index/index.scss +++ b/miniprogram/pages/index/index.scss @@ -1,5 +1,14 @@ /**index.wxss**/ - +page{ + // // 主要为各个背景 + // --main-color:rgb(246, 255, 252); + // // 目前为主界面的那几个按钮 + // --secondary-color:rgba(125, 235, 202, 0.205); + // // 各界面顶部栏的颜色 + // --tertiary-color:rgba(123, 245, 245, 0.5); + // // 标题文字颜色 + --text-color:rgb(199, 255, 204); +} .container{ display: flex; @@ -7,7 +16,7 @@ height: 100%; width:100%; justify-content: center; - background-color: rgba($color: #fff5d2, $alpha: 1.0); + // background-color: var(--main-color); } #startPage{ @@ -16,15 +25,16 @@ height: 100%; width:100%; justify-content: center; - background-color: rgba($color: #fff5d2, $alpha: 1.0); + background-color: var(--main-color); } .text_startPage{ font-size: 60rpx; + color:var(--text-color) } .buttom_startPage{ - background-color: rgba($color: #d2fff4, $alpha: 1); + background-color: var(--secondary-color); border-radius: 20rpx; box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; display: flex; @@ -162,7 +172,8 @@ display: flex; align-items: center; justify-content: center; - // background-color: aquamarine; + background-color: rgb(240, 255, 247); + border-radius: 50%; bottom: 140rpx; right:80rpx; // font-size: 150rpx; @@ -174,13 +185,15 @@ .title{ width: 100%; height: 10%; - background-color: aqua; + background-color: var(--tertiary-color); position:absolute; top:0rpx; display: flex; justify-content: center; align-items: center; font-size: x-large; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + letter-spacing:10rpx; .page_back{ height: 70rpx; width: 70rpx; @@ -188,8 +201,9 @@ display: flex; align-items: center; justify-content: center; + // rotate: -90deg; // background-color: aquamarine; - top: 50rpx; + // top: 20%; left:30rpx; // font-size: 150rpx; // font-weight: 900; @@ -260,7 +274,7 @@ // 知识库界面 #page_lib{ - background-color: rgba($color: #fff5d2, $alpha: 1.0); + background-color: var(--main-color); display: flex; align-items: center; justify-content: center; @@ -268,7 +282,7 @@ .content{ display: flex; flex-direction: column; - padding-top: 20rpx; + padding-top: 30rpx; // padding-bottom: 40rpx; .lib_search{ margin-bottom: 20rpx; @@ -276,206 +290,196 @@ // // background-color: yellow; // } } - .node{ - background-color: rgba($color: #ffffff, $alpha: 1); + } +} + +// 单配料卡片样式 +.ingredient_card{ + background-color: rgba($color: #ffffff, $alpha: 1); + border-radius: 15rpx; + height: 200rpx; + width: auto; + margin:15rpx 20rpx 15rpx 10rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + .node_content{ + position: relative; + display: block; + height: 100%; + width: auto; + margin-left: 25rpx; + border-radius: 15rpx; + background-color: rgba($color: #ffffff, $alpha: 1); + // background-color: var(--tertiary-color); + // overflow: hidden; + ::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; + } + .node_name{ + font-size: 31rpx; + height:50rpx; + width:max-content; + background-color: rgba(150, 145, 138, 0.5); + padding:0rpx 10rpx; + display: flex; + align-items: center; border-radius: 15rpx; - height: 200rpx; - width: auto; - margin:15rpx 20rpx 15rpx 10rpx; - box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; - .node_content{ - position: relative; - display: block; - height: 100%; - width: auto; - margin-left: 25rpx; + position: absolute; + top:15rpx; + left:20rpx; + max-width: 230rpx; + overflow: scroll; + white-space: nowrap; + // justify-content: center; + } + .node_name_en{ + height:45rpx; + position: absolute; + top:80rpx; + left:20rpx; + max-width: 338rpx; + } + .node_adi{ + font-size: 31rpx; + height:45rpx; + max-width:338rpx; + // background-color: rgba(150, 145, 138, 0.5); + // padding:0rpx 10rpx; + display: flex; + align-items: center; + border-radius: 15rpx; + position: absolute; + bottom:20rpx; + left:20rpx; + overflow: scroll; + white-space: nowrap; + .adi_title{ + height:45rpx; + background-color:salmon; + padding:0rpx 10rpx; + } + .adi_content{ + height:45rpx; + background-color:rgb(224, 224, 224); + padding:0rpx 10rpx; + } + } + .node_danger{ + font-size: 31rpx; + height:50rpx; + width: 80rpx; + background-color: rgba(150, 145, 138, 0.5); + position: absolute; + left:299rpx; + top:15rpx; + // padding: 10rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 15rpx; + background-color: tomato; + // view{ + // position: relative; + // top:-0.5rpx; + // } + } + .node_safe{ + font-size: 31rpx; + height:50rpx; + width: 80rpx; + background-color: rgba(150, 145, 138, 0.5); + position: absolute; + left:299rpx; + top:15rpx; + // padding: 10rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 15rpx; + background-color:springgreen; + // view{ + // position: relative; + // top:-0.5rpx; + // } + } + .node_scores{ + font-size: 31rpx; + height:50rpx; + width: 135rpx; + background-color: rgba(150, 145, 138, 0.5); + position: absolute; + left:399rpx; + top:15rpx; + // padding: 4rpx 0rpx 6rpx 10rpx; + // padding-left: 10rpx; + display: flex; + align-items: center; + // justify-content: center; + border-radius: 15rpx; + overflow: hidden; + .scores_title{ + height:50rpx; + width: 80rpx; + background-color:salmon; + display: flex; + align-items: center; + justify-content: center; + } + .scores_num{ + height:50rpx; + width: 65rpx; + background-color:rgb(224, 224, 224); + display: flex; + align-items: center; + justify-content: center; + } + } + .node_risk{ + font-size: 31rpx; + height:50rpx; + width: 120rpx; + position: absolute; + left:560rpx; + top:15rpx; + // padding: 0rpx 6rpx 6rpx 13rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 15rpx; + overflow: hidden; + } + ::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; + } + .node_extra{ + height:95rpx; + width: 256rpx; + // background-color: white; + border: 3rpx solid rgba(0, 0, 0, 0.356); + position: absolute; + left:400rpx; + bottom:15rpx; + padding: 5rpx 10rpx 10rpx 10rpx; + border-radius: 15rpx; + display: flex; + flex-direction: column; + align-items: center; + overflow: scroll; + .node_extra_empty{ + margin: auto; + font-size: 45rpx; + } + .node_ex_content{ + margin:5rpx; + height: 40rpx; + width: 240rpx; + display: flex; border-radius: 15rpx; - background-color: rgba($color: #ffffff, $alpha: 1); - // overflow: hidden; - ::-webkit-scrollbar { - width: 0; - height: 0; - color: transparent; - } - // .node_nameBar{ - // background-color: teal; - // position: absolute; - // top:20rpx; - // left:20rpx; - // overflow: scroll; - // height: 500rpx; - // width: 350rpx; - // display:flex; - // // flex-direction: column; - // justify-content: center; - // align-items: flex-start; - // } - .node_name{ - font-size: 31rpx; - height:50rpx; - width:max-content; - background-color: rgba(150, 145, 138, 0.5); - padding:0rpx 10rpx; - display: flex; - align-items: center; - border-radius: 15rpx; - position: absolute; - top:15rpx; - left:20rpx; - max-width: 230rpx; - overflow: scroll; - white-space: nowrap; - // justify-content: center; - } - .node_name_en{ - height:45rpx; - position: absolute; - top:80rpx; - left:20rpx; - max-width: 338rpx; - } - .node_adi{ - font-size: 31rpx; - height:45rpx; - max-width:338rpx; - // background-color: rgba(150, 145, 138, 0.5); - // padding:0rpx 10rpx; - display: flex; - align-items: center; - border-radius: 15rpx; - position: absolute; - bottom:20rpx; - left:20rpx; - overflow: scroll; - white-space: nowrap; - .adi_title{ - height:45rpx; - background-color:salmon; - padding:0rpx 10rpx; - } - .adi_content{ - height:45rpx; - background-color:rgb(224, 224, 224); - padding:0rpx 10rpx; - } - } - .node_danger{ - font-size: 31rpx; - height:50rpx; - width: 80rpx; - background-color: rgba(150, 145, 138, 0.5); - position: absolute; - left:299rpx; - top:15rpx; - // padding: 10rpx; - display: flex; - align-items: center; - justify-content: center; - border-radius: 15rpx; - background-color: tomato; - // view{ - // position: relative; - // top:-0.5rpx; - // } - } - .node_safe{ - font-size: 31rpx; - height:50rpx; - width: 80rpx; - background-color: rgba(150, 145, 138, 0.5); - position: absolute; - left:299rpx; - top:15rpx; - // padding: 10rpx; - display: flex; - align-items: center; - justify-content: center; - border-radius: 15rpx; - background-color:springgreen; - // view{ - // position: relative; - // top:-0.5rpx; - // } - } - .node_scores{ - font-size: 31rpx; - height:50rpx; - width: 135rpx; - background-color: rgba(150, 145, 138, 0.5); - position: absolute; - left:399rpx; - top:15rpx; - // padding: 4rpx 0rpx 6rpx 10rpx; - // padding-left: 10rpx; - display: flex; - align-items: center; - // justify-content: center; - border-radius: 15rpx; - overflow: hidden; - .scores_title{ - height:50rpx; - width: 80rpx; - background-color:salmon; - display: flex; - align-items: center; - justify-content: center; - } - .scores_num{ - height:50rpx; - width: 65rpx; - background-color:rgb(224, 224, 224); - display: flex; - align-items: center; - justify-content: center; - } - } - .node_risk{ - font-size: 31rpx; - height:50rpx; - width: 120rpx; - position: absolute; - left:560rpx; - top:15rpx; - // padding: 0rpx 6rpx 6rpx 13rpx; - display: flex; - align-items: center; - justify-content: center; - border-radius: 15rpx; - overflow: hidden; - } - ::-webkit-scrollbar { - width: 0; - height: 0; - color: transparent; - } - .node_extra{ - height:95rpx; - width: 256rpx; - background-color: white; - border: 3rpx solid rgba(0, 0, 0, 0.356); - position: absolute; - left:400rpx; - bottom:15rpx; - padding: 5rpx 10rpx 10rpx 10rpx; - border-radius: 15rpx; - display: flex; - flex-direction: column; - align-items: center; - overflow: scroll; - .node_extra_empty{ - margin: auto; - font-size: 45rpx; - } - .node_ex_content{ - margin:5rpx; - height: 40rpx; - width: 240rpx; - display: flex; - border-radius: 15rpx; - align-items: center; - justify-content: center; - } - } + align-items: center; + justify-content: center; } } } @@ -484,7 +488,7 @@ // 历史记录 #page_history{ - background-color: rgba($color: #fff5d2, $alpha: 1.0); + background-color: var(--main-color); // .date1{ // background-color: rgba($color: #fff5d2, $alpha: 1); // height: 50rpx; @@ -509,7 +513,7 @@ height: 210rpx; width: auto; border-radius: 15rpx; - background-color: rgba(167, 180, 176, 0.863); + background-color: rgba(91, 95, 94, 0.263); margin:15rpx 25rpx; // margin-top:30rpx; // margin-left: 30rpx; @@ -582,7 +586,7 @@ // 收藏界面 #page_collect{ - background-color: rgba($color: #fff5d2, $alpha: 1.0); + background-color: var(--main-color); translate:0 100%; .content{ display: flex; @@ -704,11 +708,32 @@ //个性化界面 #page_style{ - background-color: rgba($color: #fff5d2, $alpha: 1.0); - display: flex; - align-items: center; - justify-content: center; + background-color: var(--main-color); translate:0 100%; + .content{ + display: flex; + flex-wrap: wrap; + justify-content:center; + padding-top: 20rpx; + padding-bottom: 40rpx; + .choose_color{ + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + width: 300rpx; + height: 300rpx; + margin: 20rpx; + border-radius: 30rpx; + display:flex; + flex-direction: row; + overflow: hidden; + .node{ + width:34%; + height: 300rpx; + background-color: white; + } + // background-color: white; + // background: linear-gradient(to right,rgb(255, 255, 255) 33%,blue 66%,rgb(0, 0, 0)100%); + } + } } //遮罩 @@ -725,15 +750,16 @@ } //查询结果 #page_result{ - height: 90%; + height: 89%; width: 100%; position: absolute; bottom: 0; left: 0; overflow: hidden; translate: 0 100%; - background-color: rgba($color: #ffffff, $alpha: 1.0); - border-radius: 50rpx; + // background-color: rgba($color: #ffffff, $alpha: 1.0); + background-color: var(--main-color); + border-radius: 40rpx; .title{ .page_star{ height: 70rpx; @@ -743,7 +769,7 @@ align-items: center; justify-content: center; // background-color: aquamarine; - top: 50rpx; + // top: 50rpx; right:30rpx; // font-size: 150rpx; // font-weight: 900; @@ -757,7 +783,7 @@ align-items: center; justify-content: center; // background-color: aquamarine; - top: 50rpx; + // top: 50rpx; right:100rpx; // font-size: 150rpx; // font-weight: 900; @@ -1051,6 +1077,7 @@ .title{ height: 30%; border-radius: 25rpx 25rpx 0 0; + letter-spacing:0rpx; } .input{ height: 120rpx; @@ -1113,6 +1140,7 @@ .title{ height: 30%; border-radius: 25rpx 25rpx 0 0; + letter-spacing:0rpx; } .input{ height: 120rpx; @@ -1233,4 +1261,5 @@ bottom: 100rpx; left:450rpx; background-color: royalblue; -} \ No newline at end of file +} + diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts index 31b2012..a5aba0f 100644 --- a/miniprogram/pages/index/index.ts +++ b/miniprogram/pages/index/index.ts @@ -2,17 +2,106 @@ // 获取应用实例 const app = getApp() -const serverAddr = "127.0.0.1:5000" +const serverAddr = "http://127.0.0.1:5000" Page({ data: { + miao_style:` + --main-color:rgb(246, 255, 252); + --secondary-color:rgba(125, 235, 202, 0.205); + --tertiary-color:rgba(123, 245, 245, 0.5); + --text-color:rgb(0, 0, 0); + `, + active_style:"warm", + style_lib:{ + bios:{ + name:"生命", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(179, 57, 47)', + secondary:'rgb(214, 212, 205)', + tertiary:'rgb(234, 255, 208)', + text:'rgb(0, 0, 0)', + } + }, + warm:{ + name:"被爱灌溉成长的人", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(206, 90, 103)', + secondary:'rgb(252, 245, 237)', + tertiary:'rgb(244, 191, 150)', + text:'rgb(0, 0, 0)', + } + }, + bin:{ + name:"冰岛", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(57, 62, 70)', + secondary:'rgb(238, 238, 238)', + tertiary:'rgb(66, 125, 157)', + text:'rgb(0, 0, 0)', + } + }, + purple:{ + name:"紫罗兰", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(208, 162, 247)', + secondary:'rgb(241, 234, 255)', + tertiary:'rgb(229, 212, 255)', + text:'rgb(0, 0, 0)', + } + }, + Ukraine:{ + name:"乌克兰", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(12, 53, 106)', + secondary:'rgb(255, 196, 54)', + tertiary:'rgb(1, 116, 190)', + text:'rgb(0, 0, 0)', + } + }, + watermelon:{ + name:"西瓜", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(255, 170, 167)', + secondary:'rgb(213, 236, 194)', + tertiary:'rgb(255, 211, 180)', + text:'rgb(0, 0, 0)', + } + }, + shine:{ + name:"ta", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(242, 190, 209)', + secondary:'rgb(248, 232, 238)', + tertiary:'rgb(253, 206, 223)', + text:'rgb(0, 0, 0)', + } + }, + tree:{ + name:"乌克兰", + intro:"我好像成为你的鹿", + style:{ + main:'rgb(60, 98, 85)', + secondary:'rgb(234, 231, 177)', + tertiary:'rgb(97, 135, 110)', + text:'rgb(0, 0, 0)', + } + }, + }, // motto: 'Hello World', text_startPage1: "知识库", imgUrl_startPage1: "./static/icons/lib.svg", function_startPage1: "popup_lib", imgUrl_startPage2: "./static/icons/history.svg", function_startPage2: "popup_history", - imgUrl_startPage3: "./static/icons/heart.svg", + imgUrl_startPage3: `./static/icons/heart.svg`, function_startPage3: "popup_collect", text_startPage4: "个性化", imgUrl_startPage4: "./static/icons/self.svg", @@ -24,6 +113,7 @@ Page({ remarkTemp: '', resultTitle: "查询结果", + // 没用到 pageStack: [], curtain_hidden: true, @@ -155,6 +245,23 @@ Page({ hidden: false, riskBgColor: "tomato", riskStr: "高风险" + }, { + name: { + zh: "生牛乳", + en: "Hatsune Miku" + }, + scores: 93, + info: "HAHA", + extra: [ + { type: "safe", name: "好喝" }, + ], + ADI: "", + // 搜索用，前端赋值 + hidden: false, + + //前端赋值 + "riskBgColor": "springgreen", + "riskStr": "低风险" } ], @@ -195,15 +302,60 @@ Page({ // 启动时获取session async onLoad() { - await this.updateSession() - setInterval(()=>{ - this.updateSession() - },60*1000*5) + // this.data.session_key = wx.getStorageSync("session_key") + // await this.updateSession() this.readStorageData() - this.updateLib() - this.updateHistory() + this.set_miaoStyle(this.data.active_style) + // this.edit_svg_color() + // this.updateLib() + // this.updateCollection() + // this.updateHistory() }, + // 好像微信小程序没有atob处理base64，此函数放弃 + edit_svg_color(rgb="#000000"){ + return; + rgb + var lib=``; + var history=``; + var heart=``; + var self=`` + var camera=`` + lib=(lib) + + this.setData({ + imgUrl_startPage1: lib, + imgUrl_startPage2: history, + imgUrl_startPage3: heart, + imgUrl_startPage4: self, + }) + + }, + + // 编辑wxss那几个css变量实现风格转换 + set_miaoStyle(e){ + var name = '' + if(typeof e == "string")name = e + else{ + name = e.currentTarget.dataset.index + } + console.log(name) + var style = this.data.style_lib[name].style + var str = ` + --main-color:${style.main}; + --secondary-color:${style.secondary}; + --tertiary-color:${style.tertiary}; + --text-color:${style.text}; + ` + this.setData({ + miao_style:str, + active_style:name + }) + this.save2storage() + + }, + + //开始界面的按钮相关动画 startPage_Bottons_leave() { // var fd = wx.createSelectorQuery() @@ -678,7 +830,7 @@ Page({ //更新成分数据 updateLib() { wx.request({ - url: 'http://' + serverAddr + '/getLib', //仅为示例，并非真实的接口地址 + url: serverAddr + '/getLib', //仅为示例，并非真实的接口地址 data: { session_key:this.data.session_key }, @@ -737,7 +889,7 @@ Page({ //更新历史记录 updateHistory() { wx.request({ - url: 'http://' + serverAddr + '/getHistory', //仅为示例，并非真实的接口地址 + url: '' + serverAddr + '/getHistory', //仅为示例，并非真实的接口地址 data: { session_key:this.data.session_key }, @@ -760,40 +912,145 @@ Page({ }) }, - // 更新session - updateSession() { - return new Promise((resolve, reject) => { - this.getCode().then(code => { - wx.request({ - url: 'http://' + serverAddr + '/updateSession', - data: { - userCode: code - }, - method: "POST", - header: { - 'content-type': 'application/json' - }, - success: res => { - console.log(res) - var data = res.data - this.setData( - { "session_key": data } - ) - resolve() - // setTimeout(this.updateSession,1000*60*5) - }, - fail: res => { - console.log(res) - // setTimeout(this.updateSession,1000) - reject() - } - }) - }) + //更新收藏 + updateCollection() { + wx.request({ + url: '' + serverAddr + '/getCollection', //仅为示例，并非真实的接口地址 + data: { + session_key:this.data.session_key + }, + method: "POST", + header: { + 'content-type': 'application/json' // 默认值 + }, + success: res => { + console.log(res) + var data = res.data + this.setData( + { "data_collect": data } + ) + this.save2storage() + }, + fail(res) { + console.log(res) + } }) }, + // 更新session + updateSession() { + return new Promise((resolve, reject) => { + // 仅测试 + if(this.data.session_key == '' || true){ + this.getCode().then(code => { + wx.request({ + url: '' + serverAddr + '/updateSession', + data: { + userCode: code + }, + method: "POST", + header: { + 'content-type': 'application/json' + }, + success: res => { + console.log(res) + var data = res.data + this.setData( + { "session_key": data } + ) + resolve() + // setTimeout(this.updateSession,1000*60*5) + }, + fail: res => { + console.log(res) + // setTimeout(this.updateSession,1000) + reject() + } + }) + }) + }else{ + wx.checkSession({ + success:resolve, + fail:()=>{ + this.getCode().then(code => { + wx.request({ + url: '' + serverAddr + '/updateSession', + data: { + userCode: code + }, + method: "POST", + header: { + 'content-type': 'application/json' + }, + success: res => { + console.log(res) + var data = res.data + this.setData( + { "session_key": data } + ) + resolve() + // setTimeout(this.updateSession,1000*60*5) + }, + fail: res => { + console.log(res) + // setTimeout(this.updateSession,1000) + reject() + } + }) + }) + } + }) + } + }) + }, + + // 检查session是否过期 + // checkSession() { + // return new Promise((resolve, reject) => { + // this + // }) + // }, + // 上传照片并展示收到的结果 uploadImg(tempImagePath: any) { + wx.showLoading({ // 显示加载中loading效果 + title: "查询中喵", + mask: true //开启蒙版遮罩 + }); + return setTimeout(()=>{ + wx.hideLoading(); + var fake_data = { + id:70582140, + imgUrl:"./static/icons/history.svg", + res:{ + scores: 93, + arr: ["生牛乳"], + } + } + var data = fake_data + var nowdate = new Date(); + var nowyear = nowdate.getFullYear(); + var nowmonth = nowdate.getMonth() + 1; + var nowday = nowdate.getDate(); + var dateStr = nowyear + '.' + nowmonth + '.' + nowday + if (!this.data.data_history[dateStr]) { + this.data.data_history[dateStr] = [] + } + var historyTemp = + { + id: data.id, + imgUrl: data.imgUrl, + res: data.res, + hasCollect: false,//目前全是false。。。 + } + this.data.data_history[dateStr].push(historyTemp) + this.setData({ + data_history: this.data.data_history + }) + this.sortHistory() + this.show_result_byId(data.id) + this.save2storage() + },3000) wx.getFileSystemManager().readFile({ filePath: tempImagePath, encoding: 'base64', @@ -801,7 +1058,7 @@ Page({ // console.log('data:image/png;base64,' + res.data) const imgBase64 = res.data wx.request({ - url: 'http://' + serverAddr + '/rcvImg', //仅为示例，并非真实的接口地址 + url: '' + serverAddr + '/rcvImg', //仅为示例，并非真实的接口地址 data: { imgBase64: imgBase64, session_key:this.data.session_key @@ -847,7 +1104,7 @@ Page({ // 向云发送历史记录和收藏记录数据 uploadHistoryAndCollection(){ wx.request({ - url: 'http://' + serverAddr + '/uploadHistoryAndCollection', //仅为示例，并非真实的接口地址 + url: '' + serverAddr + '/uploadHistoryAndCollection', //仅为示例，并非真实的接口地址 data: { history : this.data.data_history, collection:this.data.data_collect, @@ -871,6 +1128,8 @@ Page({ const ctx = wx.createCameraContext() console.log('takePhoto..') ctx.takePhoto({ + + // quality: 'normal', quality: 'normal', //找时间把这里和choosePhoto的success合并一下(算了) success: res => { @@ -1001,29 +1260,33 @@ Page({ // 将各种数据存入本地 save2storage() { - var list = ['data_history', 'data_collect', 'data_lib'] + var list = ['data_history', 'data_collect', 'data_lib','active_style'] for (var k of list) { - wx.setStorage({ - key: k, - data: this.data[k], - }) + wx.setStorageSync(k,this.data[k]) + + console.log(k,this.data[k]) } }, // 从本地读取各种数据 readStorageData(){ - var list = ['data_history', 'data_collect', 'data_lib'] + var list = ['data_history', 'data_collect', 'data_lib','active_style'] for (var k of list) { - this.data[k]=wx.getStorageSync(k) + var m = {} + m[k] = wx.getStorageSync(k) + this.setData(m) + console.log(k,this.data[k]) + // this.data[k]=wx.getStorageSync(k) // console.log(wx.getStorageSync(k)) } - this.setData( - { - data_history:this.data["data_history"], - data_collect:this.data["data_collect"], - data_lib:this.data["data_lib"], - } - ) + // this.setData( + // { + // data_history:this.data["data_history"], + // data_collect:this.data["data_collect"], + // data_lib:this.data["data_lib"], + // active_style:this.data[''] + // } + // ) }, @@ -1170,7 +1433,7 @@ Page({ const tempFilePaths = res.tempFilePaths console.log(tempFilePaths) wx.uploadFile({ - url: 'http://' + serverAddr + '/rcvImg', //仅为示例，非真实的接口地址 + url: '' + serverAddr + '/rcvImg', //仅为示例，非真实的接口地址 filePath: tempFilePaths[0], name: 'Img', formData: { diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 648c47d..02233d1 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,5 +1,6 @@ - + + @@ -24,7 +25,7 @@ @@ -51,7 +52,7 @@ 知识库 - + @@ -65,7 +66,7 @@ - @@ -166,7 +173,7 @@ {{resultTitle}} - + @@ -201,7 +208,7 @@ -