diff --git a/components/exchange/exchange.vue b/components/exchange/exchange.vue index e86aa39..d7ec31f 100644 --- a/components/exchange/exchange.vue +++ b/components/exchange/exchange.vue @@ -7,7 +7,8 @@ - + 兑换 @@ -37,36 +38,38 @@ + + \ No newline at end of file diff --git a/pages/other/qf-image/qf-image.vue b/pages/other/qf-image/qf-image.vue index 12a493b..e0ff1d1 100644 --- a/pages/other/qf-image/qf-image.vue +++ b/pages/other/qf-image/qf-image.vue @@ -1,6 +1,6 @@ @@ -25,42 +25,60 @@ proxy } = getCurrentInstance(); const data = reactive({ - src: "" + src: "", + width:196, + height:230, + isCard:true }) onLoad((option) => { console.log(option) data.src = option.src + if(option.width){ + data.width=option.width*2 + data.isCard=false + } + if(option.height){ + data.height=option.height*2 + data.isCard=false + } }) function handleCrop(e) { - uni.showLoading({ - title:"抠图中" - }) - convertLocalImageToFile(e.tempFilePath).then(file => { - proxy.$imageUpload(file.split(',', 2)[1]).then(resimage => { - uni.hideLoading() - // editForm.value.photo = decodeURI(resimage.data); - uni.$emit("editFormPhoto", decodeURI(resimage.data)) - uni.navigateBack() - }).catch(err => { - uni.hideLoading() - console.log(err.data.message) - uni.showToast({ - icon: "none", - title: "图片不是人像或者过大" - }) + if(data.isCard){ + uni.showLoading({ + title:"抠图中" }) + convertLocalImageToFile(e.tempFilePath).then(file => { + proxy.$imageUpload(file.split(',', 2)[1]).then(resimage => { + uni.hideLoading() + // editForm.value.photo = decodeURI(resimage.data); + uni.$emit("editFormPhoto", decodeURI(resimage.data)) + uni.navigateBack() + }).catch(err => { + uni.hideLoading() + console.log(err.data.message) + uni.showToast({ + icon: "none", + title: "图片不是人像或者过大" + }) + }) + + }).catch(err => { + uni.hideLoading() + }) + }else{ + uni.saveFile({ + tempFilePath: e.tempFilePath, + success: function(res) { + console.log(res) + uni.$emit("editFormPhoto", decodeURI(res.savedFilePath)) + uni.navigateBack() + // res.avatar = res.savedFilePath + } + }); + } + - }).catch(err => { - uni.hideLoading() - }) - // uni.saveFile({ - // tempFilePath: e.tempFilePath, - // success: function(res) { - // console.log(res) - // // res.avatar = res.savedFilePath - // } - // }); } /** * 将本地图片路径通过 Canvas 转换为 File 对象 diff --git a/static/image/other/certificate/certificate.png b/static/image/other/certificate/certificate.png new file mode 100644 index 0000000..df401dc Binary files /dev/null and b/static/image/other/certificate/certificate.png differ diff --git a/static/image/other/certificate/certificate/bgImg.png b/static/image/other/certificate/certificate/bgImg.png new file mode 100644 index 0000000..ce26b43 Binary files /dev/null and b/static/image/other/certificate/certificate/bgImg.png differ diff --git a/static/image/other/certificate/certificate/bgImg2.png b/static/image/other/certificate/certificate/bgImg2.png new file mode 100644 index 0000000..ae4079b Binary files /dev/null and b/static/image/other/certificate/certificate/bgImg2.png differ diff --git a/static/image/other/certificate/couple/bgImage.png b/static/image/other/certificate/couple/bgImage.png new file mode 100644 index 0000000..ed54a67 Binary files /dev/null and b/static/image/other/certificate/couple/bgImage.png differ diff --git a/static/image/other/certificate/couple/bgImage2.png b/static/image/other/certificate/couple/bgImage2.png new file mode 100644 index 0000000..5ea0b6c Binary files /dev/null and b/static/image/other/certificate/couple/bgImage2.png differ diff --git a/static/image/other/certificate/couple/icon1.png b/static/image/other/certificate/couple/icon1.png new file mode 100644 index 0000000..050820c Binary files /dev/null and b/static/image/other/certificate/couple/icon1.png differ diff --git a/static/image/other/certificate/couple/icon12.png b/static/image/other/certificate/couple/icon12.png new file mode 100644 index 0000000..24eba4c Binary files /dev/null and b/static/image/other/certificate/couple/icon12.png differ diff --git a/static/image/other/certificate/couple/icon2.png b/static/image/other/certificate/couple/icon2.png new file mode 100644 index 0000000..7a4d0f7 Binary files /dev/null and b/static/image/other/certificate/couple/icon2.png differ diff --git a/static/image/other/certificate/couple/icon22.png b/static/image/other/certificate/couple/icon22.png new file mode 100644 index 0000000..f221297 Binary files /dev/null and b/static/image/other/certificate/couple/icon22.png differ diff --git a/static/image/other/certificate/couple/image.png b/static/image/other/certificate/couple/image.png new file mode 100644 index 0000000..b64d344 Binary files /dev/null and b/static/image/other/certificate/couple/image.png differ diff --git a/static/image/other/certificate/couple/imageDask.png b/static/image/other/certificate/couple/imageDask.png new file mode 100644 index 0000000..3c93ea5 Binary files /dev/null and b/static/image/other/certificate/couple/imageDask.png differ diff --git a/static/image/other/certificate/couple/love.png b/static/image/other/certificate/couple/love.png new file mode 100644 index 0000000..584061d Binary files /dev/null and b/static/image/other/certificate/couple/love.png differ diff --git a/static/image/other/certificate/couple/noLove.png b/static/image/other/certificate/couple/noLove.png new file mode 100644 index 0000000..5b30da7 Binary files /dev/null and b/static/image/other/certificate/couple/noLove.png differ diff --git a/static/image/other/certificate/god/bgImg.png b/static/image/other/certificate/god/bgImg.png new file mode 100644 index 0000000..104701e Binary files /dev/null and b/static/image/other/certificate/god/bgImg.png differ diff --git a/static/image/other/certificate/god/bgImg2.png b/static/image/other/certificate/god/bgImg2.png new file mode 100644 index 0000000..3c405f0 Binary files /dev/null and b/static/image/other/certificate/god/bgImg2.png differ diff --git a/static/image/other/certificate/god/image1.png b/static/image/other/certificate/god/image1.png new file mode 100644 index 0000000..4ba98f8 Binary files /dev/null and b/static/image/other/certificate/god/image1.png differ diff --git a/static/image/other/certificate/god/image2.png b/static/image/other/certificate/god/image2.png new file mode 100644 index 0000000..fa28881 Binary files /dev/null and b/static/image/other/certificate/god/image2.png differ diff --git a/static/image/other/certificate/graduate/graduate1.png b/static/image/other/certificate/graduate/graduate1.png new file mode 100644 index 0000000..566f4f3 Binary files /dev/null and b/static/image/other/certificate/graduate/graduate1.png differ diff --git a/static/image/other/certificate/graduate/graduate2.png b/static/image/other/certificate/graduate/graduate2.png new file mode 100644 index 0000000..a16add9 Binary files /dev/null and b/static/image/other/certificate/graduate/graduate2.png differ diff --git a/static/image/other/certificate/graduate/icon1.png b/static/image/other/certificate/graduate/icon1.png new file mode 100644 index 0000000..15be66c Binary files /dev/null and b/static/image/other/certificate/graduate/icon1.png differ diff --git a/static/image/other/certificate/graduate/icon2.png b/static/image/other/certificate/graduate/icon2.png new file mode 100644 index 0000000..37c0cbe Binary files /dev/null and b/static/image/other/certificate/graduate/icon2.png differ diff --git a/static/image/other/certificate/graduate/title1.png b/static/image/other/certificate/graduate/title1.png new file mode 100644 index 0000000..f25c270 Binary files /dev/null and b/static/image/other/certificate/graduate/title1.png differ diff --git a/static/image/other/certificate/graduate/title2.png b/static/image/other/certificate/graduate/title2.png new file mode 100644 index 0000000..88ed9e6 Binary files /dev/null and b/static/image/other/certificate/graduate/title2.png differ diff --git a/static/image/other/notice.png b/static/image/other/notice.png new file mode 100644 index 0000000..80f5096 Binary files /dev/null and b/static/image/other/notice.png differ diff --git a/utils/requests.js b/utils/requests.js index c090312..9d68e5f 100644 --- a/utils/requests.js +++ b/utils/requests.js @@ -222,13 +222,13 @@ const request = (method = 'GET', serverUrl, domainUrl, params, dataType = "json" res: res } }) + uni.showToast({ + icon: 'none', + title: res.data.message + }) } uni.hideLoading(); - uni.showToast({ - icon: 'none', - title: res.data.message - }) return reject(res); }