diff --git a/config.js b/config.js
index 01fe44f..37f6e3c 100644
--- a/config.js
+++ b/config.js
@@ -9,7 +9,7 @@ module.exports = {
// baseUrl: 'http://192.168.0.244:38380',//测试
// baseUrl: 'http://sgwpdm.ah.sgcc.com.cn/canteen/dev-api',//测试d
// baseUrl: 'http://192.168.0.176:58080',//测试
- // baseUrl: 'http://192.168.2.82:58080',//张天强
+ // baseUrl: 'http://192.168.2.56:58080',//张天强
// baseUrl: 'http://192.168.2.69:58080',//董高文
// baseUrl: 'http://192.168.0.44:58080',//董高文
// baseUrl: 'http://192.168.2.72:58080',//盛旭
diff --git a/package.json b/package.json
index 4398bf8..56abe35 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,9 @@
"license": "ISC",
"dependencies": {
"base-64": "^1.0.0",
+ "compressorjs": "^1.2.1",
"crypto-js": "^4.2.0",
+ "image-compressor.js": "^1.1.4",
"image-tools": "^1.4.0",
"js-cookie": "^3.0.5",
"sm-crypto": "^0.3.13"
diff --git a/pages/mine/me/faceUpload.vue b/pages/mine/me/faceUpload.vue
index 96380f3..9911b4b 100644
--- a/pages/mine/me/faceUpload.vue
+++ b/pages/mine/me/faceUpload.vue
@@ -25,7 +25,7 @@
·五官端正，面部无遮挡（请使用人脸照片）
- ·不要带视频（如墨镜等）
+ ·不要带饰品（如墨镜等）
·请在光线明亮的纯色背景下拍照（建议背景颜色为白色）
·上传照片后需保存，保存失败照片将被清除
@@ -55,6 +55,8 @@
import { queryFacePhotoApi,uploadPhotoGenCodeForAppApi } from '@/api/mine/index'
import { uploadBase64 } from "@/api/upload"
import { pathToBase64, base64ToPath } from 'image-tools';
+ import Compressor from 'compressorjs';
+ import ImageCompressor from 'image-compressor.js';
import config from '@/config'
import { showConfirm } from '@/utils/common'
export default {
@@ -110,20 +112,27 @@
},
handleChooseImage() {
uni.chooseImage({
- count: 1,
+ count: 1,
+ sizeType:["compressed"],
success: resImage => {
console.log(resImage)
this.facePhotoUrl = resImage.tempFilePaths[0]
this.imageUrl = resImage.tempFilePaths[0]
- this.imgToBase64(resImage.tempFilePaths[0]).then(base64 => {
- console.log(base64)
- this.base64=base64;
- this.uploadFaceImg()
+ const tempFile = resImage.tempFiles[0];
+ console.log(tempFile)
+ this.compressFile(tempFile).then(res => {
+ console.log(res)
+ const url = URL.createObjectURL(res)
+ this.imgToBase64(url).then(base64 => {
+ console.log(base64)
+ this.base64=base64;
+ this.uploadFaceImg()
+ })
})
}
});
},
-
+
handleUpload() {
console.log(this.imageUrl)
if (!this.agreed || !this.imageUrl) return
@@ -150,72 +159,56 @@
});
}
// if(res)
- })
-
-
- // uni.showToast({
- // title: '上传成功',
- // icon: 'success',
- // duration: 2000,
- // success: () => {
- // setTimeout(() => {
- // this.goBack()
- // }, 2000)
- // }
- // })
-
- // uni.uploadFile({
- // url: config.baseUrl + '/system/user/profile/avatar',
- // filePath: this.imageUrl,
- // name: 'avatarfile',
- // header: {
- // 'Authorization': 'Bearer ' + getToken()
- // },
- // success: (uploadFileRes) => {
- // console.log(uploadFileRes);
- // if(uploadFileRes.statusCode == 200) {
- // let reslut = JSON.parse(uploadFileRes.data)
- // console.log('reslut',reslut)
- // if(reslut.code == 200) {
- // uni.showToast({
- // title: '上传成功',
- // icon: 'success',
- // duration: 2000,
- // success: () => {
- // setTimeout(() => {
- // this.goBack()
- // }, 2000)
- // }
- // })
- // }else{
- // uni.showToast({ title: reslut.msg,icon: 'none' });
- // }
- // }else if(uploadFileRes.statusCode == 401) {
- // showConfirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then(res => {
- // if (res.confirm) {
- // uni.reLaunch({ url: '/pages/login/login' })
- // }
- // })
- // }else{
- // uni.showToast({ title: uploadFileRes.errMsg,icon: 'none' });
- // }
- // uni.hideLoading()
- // },
- // fail: (uploadFileErr) => {
- // let { message } = uploadFileErr
- // if (message == 'Network Error') {
- // message = '后端接口连接异常'
- // } else if (message.includes('timeout')) {
- // message = '系统接口请求超时'
- // } else if (message.includes('Request failed with status code')) {
- // message = '系统接口' + message.substr(message.length - 3) + '异常'
- // }
- // uni.showToast({ title: message,icon: 'none' });
- // uni.hideLoading()
- // }
- // });
+ })
+ },
+ compressFile(file) {
+ return new Promise((resolve, reject) => {
+ const options = {
+ success(result) {
+ // 将压缩后的 Blob 转换为 File 对象（如果组件支持Blob则不用这一步）
+ const compressedFile = new File([result], file.name, {
+ type: file.type,
+ lastModified: Date.now(),
+ });
+ return resolve(compressedFile);
+ },
+ error(e) {
+ return reject(e);
+ },
+ };
+ // 1-3MB
+ if (file.size > 0.5 * 1024 * 1024 && file.size <= 3 * 1024 * 1024) {
+ options.quality = 0.3; // 压缩质量
+ options.convertSize = false;//不进行图像尺寸的调整
+ options.checkOrientation = false; // 图片翻转，默认为false
+ }
+ // 3-4MB
+ if (file.size > 3 * 1024 * 1024 && file.size <= 4 * 1024 * 1024) {
+ options.quality = 0.25; // 压缩质量
+ options.convertSize = false;//不进行图像尺寸的调整
+ options.checkOrientation = false; // 图片翻转，默认为false
+ }
+ // 5-6MB
+ if (file.size > 5 * 1024 * 1024 && file.size <= 6 * 1024 * 1024) {
+ options.quality = 0.2; // 压缩质量
+ options.convertSize = false;//不进行图像尺寸的调整
+ options.checkOrientation = false; // 图片翻转，默认为false
+ }
+ // 6-7MB
+ if (file.size > 6 * 1024 * 1024 && file.size <= 7 * 1024 * 1024) {
+ options.quality = 0.15; // 压缩质量
+ options.convertSize = false;//不进行图像尺寸的调整
+ options.checkOrientation = false; // 图片翻转，默认为false
+ }
+ // 7-9MB
+ if (file.size > 7 * 1024 * 1024 && file.size <= 9 * 1024 * 1024) {
+ options.quality = 0.1; // 压缩质量
+ options.convertSize = false;//不进行图像尺寸的调整
+ options.checkOrientation = false; // 图片翻转，默认为false
+ }
+ new ImageCompressor(file, options);
+ });
},
-
showAgreement() {
uni.navigateTo({
url: '/pages/privacy-agreement/index'
diff --git a/pages/remainingSum/index.vue b/pages/remainingSum/index.vue
index 7d73197..479672e 100644
--- a/pages/remainingSum/index.vue
+++ b/pages/remainingSum/index.vue
@@ -277,7 +277,15 @@ export default {
// 立即充值按钮
onRechargeNow() {
console.log(this.rechargeAmount)
- this.chosenShow = true
+ if(this.balanceInfo.accAllBal>300000){
+ uni.showToast({
+ title: "总余额大于3000元无法继续充值！",
+ icon: 'none'
+ })
+ }else{
+ this.chosenShow = true
+ }
+
},
goSubPage(){
uni.navigateTo({
diff --git a/pages/weeklyMenu/index.vue b/pages/weeklyMenu/index.vue
index 025b6fc..a314e4b 100644
--- a/pages/weeklyMenu/index.vue
+++ b/pages/weeklyMenu/index.vue
@@ -3,7 +3,7 @@
-
+
本周菜谱
食堂：{{ item.canteenName }}
diff --git a/pages/work/details.vue b/pages/work/details.vue
index 2e0fea5..4c44975 100644
--- a/pages/work/details.vue
+++ b/pages/work/details.vue
@@ -223,8 +223,9 @@ export default {
//退单
refundOrder() {
if(this.detailData.payState==3||this.detailData.payState==6){
- let hours = new Date().getHours();//拿到当前小时
- if(Number(hours)>13){
+ let orderTime = this.detailData.orderDate+" 14:00:00" //
+ let nowTime = new Date().getTime();//拿到当前时间
+ if(nowTime>orderTime){
uni.showToast({
title: "14点以后无法退单！",
icon: 'none'