From 5e90a8b670b4a9f0954f594a9a3017b43ba413c8 Mon Sep 17 00:00:00 2001 From: Miao_Spring <539943419@qq.com> Date: Sat, 11 Nov 2023 02:43:03 +0800 Subject: [PATCH] SOS --- miniprogram/pages/index/index.scss | 211 +++++++++ miniprogram/pages/index/index.ts | 440 +++++++++++------- miniprogram/pages/index/index.wxml | 51 +- .../pages/index/static/icons/delete.svg | 1 + miniprogram/pages/index/static/icons/edit.svg | 1 + .../pages/index/static/icons/star-fill.svg | 1 + .../pages/index/static/icons/star1.svg | 1 + 7 files changed, 543 insertions(+), 163 deletions(-) create mode 100644 miniprogram/pages/index/static/icons/delete.svg create mode 100644 miniprogram/pages/index/static/icons/edit.svg create mode 100644 miniprogram/pages/index/static/icons/star-fill.svg create mode 100644 miniprogram/pages/index/static/icons/star1.svg diff --git a/miniprogram/pages/index/index.scss b/miniprogram/pages/index/index.scss index b2e2a8b..33d7fb7 100644 --- a/miniprogram/pages/index/index.scss +++ b/miniprogram/pages/index/index.scss @@ -734,6 +734,36 @@ translate: 0 100%; background-color: rgba($color: #ffffff, $alpha: 1.0); border-radius: 50rpx; + .title{ + .page_star{ + height: 70rpx; + width: 70rpx; + position: absolute; + display: flex; + align-items: center; + justify-content: center; + // background-color: aquamarine; + top: 50rpx; + right:30rpx; + // font-size: 150rpx; + // font-weight: 900; + // font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; + } + .page_editRemark{ + height: 70rpx; + width: 70rpx; + position: absolute; + display: flex; + align-items: center; + justify-content: center; + // background-color: aquamarine; + top: 50rpx; + right:100rpx; + // font-size: 150rpx; + // font-weight: 900; + // font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; + } + } .content{ position: relative; display: flex; @@ -994,8 +1024,189 @@ } } } +//遮罩2 +#curtain2{ + background-color: rgba(0, 0, 0, 0.19); + // background-color: rgba(0, 0, 0, 0); + height: 100%; + width: 100%; + position: absolute; + top: 0; + left: 0; + opacity: 1; + // transform: ; +} +// 收藏的时候设置备注的输入框 +#star_setRemark{ + height: 200rpx; + width: 70%; + position: absolute; + top: 30%; + left: 15%; + // overflow: hidden; + translate: 0 1300rpx; + background-color: rgba($color: #ffffff, $alpha: 1.0); + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + .title{ + height: 30%; + border-radius: 25rpx 25rpx 0 0; + } + .input{ + height: 120rpx; + width: 90%; + position: absolute; + top:30%; + right: 5%; + border-radius: 25rpx; + overflow: hidden; + input{ + // background-color: #a79f84; + height: 100%; + // width: 100%; + display: flex; + justify-content: center; + font-size: 60rpx; + } + } + .verify{ + position: absolute; + top:110%; + right: 0%; + background-color: greenyellow; + height: 100rpx; + width: 200rpx; + font-size: 50rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + } + .cancel{ + position: absolute; + top:110%; + left: 0%; + background-color: tomato; + height: 100rpx; + width: 200rpx; + font-size: 50rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + } +} + +#editRemark{ + height: 200rpx; + width: 70%; + position: absolute; + top: 30%; + left: 15%; + // overflow: hidden; + translate: 0 1300rpx; + background-color: rgba($color: #ffffff, $alpha: 1.0); + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + .title{ + height: 30%; + border-radius: 25rpx 25rpx 0 0; + } + .input{ + height: 120rpx; + width: 90%; + position: absolute; + top:30%; + right: 5%; + border-radius: 25rpx; + overflow: hidden; + input{ + // background-color: #a79f84; + height: 100%; + // width: 100%; + display: flex; + justify-content: center; + font-size: 60rpx; + } + } + .verify{ + position: absolute; + top:110%; + right: 0%; + background-color: greenyellow; + height: 100rpx; + width: 200rpx; + font-size: 50rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + } + .cancel{ + position: absolute; + top:110%; + left: 0%; + background-color: tomato; + height: 100rpx; + width: 200rpx; + font-size: 50rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + } +} +#removeCollectionVerify{ + height: 130rpx; + width: 70%; + position: absolute; + top: 30%; + left: 15%; + // overflow: hidden; + translate: 0 1300rpx; + background-color: rgba($color: #ffffff, $alpha: 1.0); + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + .title{ + height: 100%; + background-color: unset; + border-radius: 25rpx 25rpx 0 0; + } + .verify{ + position: absolute; + top:110%; + right: 0%; + background-color: greenyellow; + height: 100rpx; + width: 200rpx; + font-size: 50rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + } + .cancel{ + position: absolute; + top:110%; + left: 0%; + background-color: tomato; + height: 100rpx; + width: 200rpx; + font-size: 50rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 25rpx; + box-shadow: rgba(0, 0, 0, 0.19) 0px 10px 20px, rgba(0, 0, 0, 0.23) 0px 6px 6px; + } +} //测试按钮 .testButtom{ diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts index ae84c40..3973b11 100644 --- a/miniprogram/pages/index/index.ts +++ b/miniprogram/pages/index/index.ts @@ -21,8 +21,13 @@ Page({ tip_hidden: false, active_Page: "startPage", currentDate: '', + remarkTemp:'', + resultTitle:"查询结果", + + pageStack:[], curtain_hidden: true, + curtain2_hidden: true, imgUrl_test:"https://tse4-mm.cn.bing.net/th/id/OIP-C.2MyVJAPY4CWrMUIKfruz9AHaHa?w=199&h=199&c=7&r=0&o=5&dpr=1.3&pid=1.7", @@ -33,88 +38,110 @@ Page({ // 历史记录data data_history: { "2023.2.30": [ - { - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: ["山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾",]} + { + id:1, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: ["山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾","山梨酸钾",]}, + hasCollect:false,//目前全是false。。。 },{ - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 75, arr: []} + + id:2, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 75, arr: []} , + hasCollect:false, },{ - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:3, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, },{ - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:4, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, },{ - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:5, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, },{ - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:6, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, }, ], "2023.2.10": [ { - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:7, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, } ], "2023.2.11": [ { - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:8, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, } ], "2023.2.12": [ { - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:9, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, } ], "2023.2.13": [ { - imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} + id:10, + imgUrl:"https://tse3-mm.cn.bing.net/th/id/OIP-C.qM9D7c-Ow-C-xLARJdSwQwHaIO?pid=ImgDet&rs=1" , res:{scores: 1, arr: []} , + hasCollect:false, } ], }, //收藏夹data data_collect: [ - { - "date": "2023.15.16", - "res":{scores: 99, arr: []} , - "imgUrl": "./static/icons/history.svg", - "remark": "方师傅康便面", - "riskBgColor": "springgreen", - "riskStr": "低风险", - }, - { - "date": "2023.5.6", - "res":{scores: 99, arr: []} , - "imgUrl": "./static/icons/history.svg", - "remark": "一二三四五六七", - "riskBgColor": "sandybrown", - "riskStr": "中风险" - }, - { - "date": "2023.5.6", - "res":{scores: 99, arr: []} , - "imgUrl": "./static/icons/history.svg", - "remark": "一二三四五六七", - "riskBgColor": "tomato", - "riskStr": "高风险" - }, - { - "date": "2023.15.16", - "res":{scores: 99, arr: []} , - "imgUrl": "./static/icons/history.svg", - "remark": "方师傅康便面", - "riskBgColor": "springgreen", - "riskStr": "低风险" - }, - { - "date": "2023.5.6", - "res":{scores: 1, arr: []} , - "imgUrl": "./static/icons/history.svg", - "remark": "一二三四五六七", - "riskBgColor": "tomato", - "riskStr": "高风险" - }, - { - "date": "2023.5.6", - "res":{scores: 99, arr: []} , - "imgUrl": "./static/icons/history.svg", - "remark": "一二三四五六七", - "riskBgColor": "tomato", - "riskStr": "高风险" - }, + // { + // "id":1, + // "date": "2023.15.16", + // "res":{scores: 99, arr: []} , + // "imgUrl": "./static/icons/history.svg", + // "remark": "方师傅康便面", + // "riskBgColor": "springgreen", + // "riskStr": "低风险", + // }, + // { + // "date": "2023.5.6", + // "res":{scores: 99, arr: []} , + // "imgUrl": "./static/icons/history.svg", + // "remark": "一二三四五六七", + // "riskBgColor": "sandybrown", + // "riskStr": "中风险" + // }, + // { + // "date": "2023.5.6", + // "res":{scores: 99, arr: []} , + // "imgUrl": "./static/icons/history.svg", + // "remark": "一二三四五六七", + // "riskBgColor": "tomato", + // "riskStr": "高风险" + // }, + // { + // "date": "2023.15.16", + // "res":{scores: 99, arr: []} , + // "imgUrl": "./static/icons/history.svg", + // "remark": "方师傅康便面", + // "riskBgColor": "springgreen", + // "riskStr": "低风险" + // }, + // { + // "date": "2023.5.6", + // "res":{scores: 1, arr: []} , + // "imgUrl": "./static/icons/history.svg", + // "remark": "一二三四五六七", + // "riskBgColor": "tomato", + // "riskStr": "高风险" + // }, + // { + // "date": "2023.5.6", + // "res":{scores: 99, arr: []} , + // "imgUrl": "./static/icons/history.svg", + // "remark": "一二三四五六七", + // "riskBgColor": "tomato", + // "riskStr": "高风险" + // }, ], // 存储所有成分的信息， hidden: false, "riskBgColor": "springgreen", "riskStr": "低风险"由前端实现 @@ -180,104 +207,15 @@ Page({ //查询展示用 data_resultPage: { scores: 65, - circleClip: "", circleColor: "", - arr: [{ - name: { - zh: "山梨酸钾", - en: "Potassium sorbate" - }, - scores: 73, - info: "山梨酸钾，又名2，4-己二烯酸钾，是山梨酸的钾盐，分子式为C6H7O2K，无色或白色鳞片状结晶或结晶性粉末。 [1] 无臭或微有臭味，长期暴露在空气中易吸潮、被氧化分解而变色。易溶于水（67.6g／100mL 20℃），溶于丙二醇（5．8g／100mL）和乙醇（0．3g／10 mL）。山梨酸钾和山梨酸是常用的有机防腐剂，广泛用于食品、化状品、饲料的防腐。易于被人体吸收代谢，在体内无残留，无毒性。", - extra: [], - ADI: "", - - // 搜索用 - hidden: false, - - //前端赋值 - "riskBgColor": "springgreen", - "riskStr": "低风险" - }, { - name: { - zh: "李宁", - en: "L.N.G.N.M.S.L." - }, - scores: 45, - info: "HAHA", - extra: [ - { type: "safe", name: "LPL" }, - { type: "unsafe", name: "飞舞" }, - { type: "unsafe", name: "精忠报国" }, - ], - ADI: "", - hidden: false, - riskBgColor: "sandybrown", - riskStr: "中风险" - }, { - name: { - zh: "丁基羟基茴香醚", - en: "Butyl hydroxyanisole（BHA）" - }, - scores: 21, - info: "丁基羟基茴香醚（BHA），又名叔丁基-4-羟基茴香醚，化学式为C11H16O2，有两种异构体：3-BHA和2-BHA，一般指二者的混合物。2017年10月27日，世界卫生组织国际癌症研究机构公布的致癌物清单初步整理参考，叔丁基对羟基茴香醚（BHA）在2B类致癌物清单中。", - extra: [ - { type: "unsafe", name: "2B类致癌物" } - ], - ADI: "0~0.5mg/kg bw", - hidden: false, - riskBgColor: "tomato", - riskStr: "高风险" - },{ - name: { - zh: "山梨酸钾", - en: "Potassium sorbate" - }, - scores: 73, - info: "山梨酸钾，又名2，4-己二烯酸钾，是山梨酸的钾盐，分子式为C6H7O2K，无色或白色鳞片状结晶或结晶性粉末。 [1] 无臭或微有臭味，长期暴露在空气中易吸潮、被氧化分解而变色。易溶于水（67.6g／100mL 20℃），溶于丙二醇（5．8g／100mL）和乙醇（0．3g／10 mL）。山梨酸钾和山梨酸是常用的有机防腐剂，广泛用于食品、化状品、饲料的防腐。易于被人体吸收代谢，在体内无残留，无毒性。", - extra: [], - ADI: "", - - // 搜索用 - hidden: false, - - //前端赋值 - "riskBgColor": "springgreen", - "riskStr": "低风险" - }, { - name: { - zh: "李宁", - en: "L.N.G.N.M.S.L." - }, - scores: 45, - info: "HAHA", - extra: [ - { type: "safe", name: "LPL" }, - { type: "unsafe", name: "飞舞" }, - { type: "unsafe", name: "精忠报国" }, - ], - ADI: "", - hidden: false, - riskBgColor: "sandybrown", - riskStr: "中风险" - }, { - name: { - zh: "丁基羟基茴香醚", - en: "Butyl hydroxyanisole（BHA）" - }, - scores: 21, - info: "丁基羟基茴香醚（BHA），又名叔丁基-4-羟基茴香醚，化学式为C11H16O2，有两种异构体：3-BHA和2-BHA，一般指二者的混合物。2017年10月27日，世界卫生组织国际癌症研究机构公布的致癌物清单初步整理参考，叔丁基对羟基茴香醚（BHA）在2B类致癌物清单中。", - extra: [ - { type: "unsafe", name: "2B类致癌物" } - ], - ADI: "0~0.5mg/kg bw", - hidden: false, - riskBgColor: "tomato", - riskStr: "高风险" - }], + arr: [], + tr:null,//top right }, + //收藏/取消收藏用 + resultId:-1, + // 收到的查询结果信息 data_rcv: { scores: 1, @@ -297,11 +235,11 @@ Page({ // 启动时获取session async onLoad() { // wx.authorize() - await this.updateSession() + // await this.updateSession() // setInterval(()=>{ // this.updateSession() // },60*1000*5) - console.log(this.data.sessionKey) + // console.log(this.data.sessionKey) }, @@ -384,6 +322,7 @@ Page({ // this.setData({ // camera_hidden:false, // }) + this.data.pageStack.push("camera") this.startPage_Bottons_leave() this.animate('#page_camera', [ { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-100%", ease: 'ease-in-out', }, @@ -393,6 +332,7 @@ Page({ }, exit_camera() { + this.data.pageStack.pop() this.startPage_Bottons_in() this.animate('#page_camera', [ { opacity: 1, translateY: "-100%" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, @@ -404,6 +344,7 @@ Page({ }, popup_history() { + this.data.pageStack.push("history") this.startPage_Bottons_leave() this.animate('#page_history', [ { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-100%", ease: 'ease-in-out', }, @@ -413,6 +354,7 @@ Page({ }, exit_history() { + this.data.pageStack.pop() this.startPage_Bottons_in() this.animate('#page_history', [ { opacity: 1, translateY: "-100%" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, @@ -420,6 +362,7 @@ Page({ }, popup_collect() { + this.data.pageStack.push("collect") this.startPage_Bottons_leave() this.animate('#page_collect', [ { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-100%", ease: 'ease-in-out', }, @@ -429,6 +372,7 @@ Page({ }, exit_collect() { + this.data.pageStack.pop() this.startPage_Bottons_in() this.animate('#page_collect', [ { opacity: 1, translateY: "-100%" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, @@ -436,6 +380,7 @@ Page({ }, popup_lib() { + this.data.pageStack.push("lib") this.startPage_Bottons_leave() this.animate('#page_lib', [ { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-100%", ease: 'ease-in-out', }, @@ -445,6 +390,7 @@ Page({ }, exit_lib() { + this.data.pageStack.pop() this.startPage_Bottons_in() this.animate('#page_lib', [ { opacity: 1, translateY: "-100%" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, @@ -459,6 +405,7 @@ Page({ }, popup_style() { + this.data.pageStack.push("style") this.startPage_Bottons_leave() this.animate('#page_style', [ { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-100%", ease: 'ease-in-out', }, @@ -468,6 +415,7 @@ Page({ }, exit_style() { + this.data.pageStack.pop() this.startPage_Bottons_in() this.animate('#page_style', [ { opacity: 1, translateY: "-100%" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, @@ -519,13 +467,78 @@ Page({ ], 600) }, + //遮罩动画2 + show_curtain2() { + this.setData({ + curtain2_hidden: false + }) + this.animate('#page_curtain2', [ + { opacity: 0 }, { opacity: 1, ease: 'ease-in-out' }, + ], 1000) + }, + + hide_curtain2() { + this.animate('#page_curtain2', [ + { opacity: 1 }, { opacity: 0, ease: 'ease-in-out' }, + ], 1000) + this.setData({ + curtain2_hidden: true + }) + }, + + // 设置备注 + popup_setRemark() { + this.show_curtain2() + this.animate('#star_setRemark', [ + { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-1300rpx", ease: 'ease-in-out', }, + ], 600) + }, + + exit_setRemark() { + this.animate('#star_setRemark', [ + { opacity: 1, translateY: "-1300rpx" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, + ], 600) + this.hide_curtain2() + }, + + popup_editRemark() { + this.show_curtain2() + this.animate('#editRemark', [ + { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-1300rpx", ease: 'ease-in-out', }, + ], 600) + }, + + exit_editRemark() { + this.animate('#editRemark', [ + { opacity: 1, translateY: "-1300rpx" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, + ], 600) + this.hide_curtain2() + }, + + popup_removeCollectionVerify() { + this.show_curtain2() + this.animate('#removeCollectionVerify', [ + { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-1300rpx", ease: 'ease-in-out', }, + ], 600) + }, + + exit_removeCollectionVerify() { + this.animate('#removeCollectionVerify', [ + { opacity: 1, translateY: "-1300rpx" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' }, + ], 600) + this.hide_curtain2() + }, + // 根据传入的包含scores和arr的object更新this.data.data_resultPage并popup_result - show_result(res: { scores: any,arr:Array }) { - console.log(res) + show_result(res: { scores: any,arr:Array } ,tr:string) { + // console.log(res) var data_resultPage={ scores: res.scores, - arr: []} + arr: [], + tr:tr, + } + console.log(tr) for(var name of res.arr){ // 有时间去写个时间复杂度更低的，不过感觉也够用了 for(var n of this.data.data_lib){ @@ -538,11 +551,110 @@ Page({ this.setData({ "data_resultPage":data_resultPage }) + // console.log(data_resultPage) this.popup_result() }, show_result_wxml(e:any){ var res=e.currentTarget.dataset.index; - this.show_result(res) + console.log(res) + this.data.resultId=res.id + // console.log(this.data.resultId) + var tr = "" + switch(this.data.pageStack[this.data.pageStack.length-1]){ + case "collect":{ + tr = "delete" + break; + } + case "history":{ + if(res.hasCollect) + tr = "delete" + else + tr = "heart" + break; + } + } + res=res.res + this.show_result(res,tr) + }, + + getInputRemark(e:any){ + this.data.remarkTemp = e.detail.value + }, + + // 收藏当前页面 + add_collection(){ + var r = this.id2resultAndDate(this.data.resultId) + if(r == null)return + var result = r.result + var date = r.date + var remark = this.data.remarkTemp + + console.log(result,date,remark) + this.data.data_collect.push({ + "id":this.data.resultId, + "date":date, + "res":result.res, + "imgUrl":result.imgUrl, + "remark":this.data.remarkTemp, + "riskBgColor":this.scores2map(result.res.scores).color, + "riskStr": this.scores2map(result.res.scores).content, + }) + result.hasCollect=true + this.data.data_resultPage.tr="delete" + + this.setData( + {data_collect:this.data.data_collect, + data_history:this.data.data_history, + data_resultPage:this.data.data_resultPage} + ) + this.exit_setRemark() + }, + + + editRemark(){ + var r = this.id2resultAndDate(this.data.resultId) + if(r == null)return + var result = r.result + var date = r.date + var remark = this.data.remarkTemp + + for(var i in this.data.data_collect){ + if (this.data.data_collect[i].id == this.data.resultId){ + this.data.data_collect[i].remark=remark + } + } + + this.setData( + {data_collect:this.data.data_collect, + data_history:this.data.data_history, + data_resultPage:this.data.data_resultPage} + ) + this.exit_editRemark() + }, + + //取消收藏。。。。 + remove_collection(){ + var flag = true + var r = this.id2resultAndDate(this.data.resultId) + if(r == null) flag = false + if(flag){ + var result = r.result + result.hasCollect=false + } + + for(var i in this.data.data_collect){ + if (this.data.data_collect[i].id == this.data.resultId){ + this.data.data_collect.splice(i,1) + } + } + this.data.data_resultPage.tr="heart" + + this.setData( + {data_collect:this.data.data_collect, + data_history:this.data.data_history, + data_resultPage:this.data.data_resultPage} + ) + this.exit_removeCollectionVerify() }, // 根据角度计算剪切路径，错了不怪我。。 @@ -835,6 +947,16 @@ Page({ return { "color": "tomato", "content": "高风险" }; }, + id2resultAndDate(id:number){ + for(var i in this.data.data_history){ + for(var n of this.data.data_history[i]) + if(n.id == id){ + return {result:n,date:i} + } + } + return null; + }, + // 事件处理函数 diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index a051035..1702827 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -116,7 +116,7 @@ - + @@ -133,7 +133,7 @@ - + {{ n.date }} @@ -164,10 +164,19 @@ - {{"查询结果"}} + {{resultTitle}} + + + + + + + + + @@ -187,7 +196,7 @@ - + @@ -227,6 +236,40 @@ + + + + + + + {{"输入备注，至多八字"}} + + + + + 确认 + 取消 + + + + + {{"修改备注，至多八字"}} + + + + + 确认 + 取消 + + + + + + {{"确认移除收藏？"}} + + 确认 + 取消 +