diff --git a/components/alger-simg/alger-simg.vue b/components/alger-simg/alger-simg.vue new file mode 100644 index 0000000..2f5bc70 --- /dev/null +++ b/components/alger-simg/alger-simg.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/main.js b/main.js index 4a51478..a72eab0 100644 --- a/main.js +++ b/main.js @@ -26,3 +26,11 @@ import httpApi from '@/common/http.api.js' Vue.use(httpApi, app) app.$mount() + +//main.js +Vue.prototype.$showimg = function (data) { + uni.navigateTo({ + url: '/pages/showimg/showimg?imgs=' + JSON.stringify(data.imgs) + '¤t=' + data.current, + animationType: "fade-in", + }) +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..8f41ce3 --- /dev/null +++ b/package.json @@ -0,0 +1,19 @@ +{ + "id": "alger-simg", + "name": "图片预览(使用简单 长按可保存分享 插件)", + "version": "1.1.0", + "description": "图片预览(使用简单) 可以双指缩放 可以保存分享", + "keywords": [ + "图片", + "image", + "img", + "图片预览", + "大图" + ], + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 594c5f8..b825c9c 100644 --- a/pages.json +++ b/pages.json @@ -1,114 +1,123 @@ -{ - "easycom": { - "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue", - "^cpn-(.*)": "@/components/cpn-$1.vue" - }, - "pages": [{ - "path": "pages/enter/enter", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/home/home", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "black" - } - }, - { - "path": "pages/list/list", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/todayNursing/todayNursing", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/nursingCalendar/nursingCalendar", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/map/map", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/detailNursing/detailNursing", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/setting/setting", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/login/login", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "uview-ui/components/u-avatar-cropper/u-avatar-cropper", - "style": { - "navigationBarTitleText": "头像裁剪", - "navigationBarBackgroundColor": "#000000" - } - } - ], - "subPackages": [{ - "root": "package_sub", - "pages": [{ - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "分包页面sub_index" - } - }] - }], - "globalStyle": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "tabBar": { - "color": "#ABAEBE", - "selectedColor": "#1479FF", - "list": [{ - "iconPath": "/static/tabbar/home.png", - "selectedIconPath": "/static/tabbar/home-active.png", - "pagePath": "pages/home/home", - "text": "首页" - }, - { - "iconPath": "/static/tabbar/notification.png", - "selectedIconPath": "/static/tabbar/notification-active.png", - "pagePath": "pages/todayNursing/todayNursing", - "text": "今日护理" - }, - { - "iconPath": "/static/tabbar/canlendar.png", - "selectedIconPath": "/static/tabbar/canlendar-active.png", - "pagePath": "pages/nursingCalendar/nursingCalendar", - "text": "护理日历" - }, - { - "iconPath": "/static/tabbar/list.png", - "selectedIconPath": "/static/tabbar/list-active.png", - "pagePath": "pages/list/list", - "text": "护理列表" - } - - ] - } +{ + "easycom": { + "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue", + "^cpn-(.*)": "@/components/cpn-$1.vue" + }, + "pages": [{ + "path": "pages/enter/enter", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/home/home", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "black" + } + }, + { + "path": "pages/list/list", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/todayNursing/todayNursing", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/nursingCalendar/nursingCalendar", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/map/map", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/detailNursing/detailNursing", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/setting/setting", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/login/login", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "uview-ui/components/u-avatar-cropper/u-avatar-cropper", + "style": { + "navigationBarTitleText": "头像裁剪", + "navigationBarBackgroundColor": "#000000" + } + }, { + "path": "pages/showimg/showimg", + "style": { + "navigationBarTextStyle": "white", + "app-plus": { + "animationType": "fade-in", + "animationDuration": 300 + } + } + } + ], + "subPackages": [{ + "root": "package_sub", + "pages": [{ + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "分包页面sub_index" + } + }] + }], + "globalStyle": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "tabBar": { + "color": "#ABAEBE", + "selectedColor": "#1479FF", + "list": [{ + "iconPath": "/static/tabbar/home.png", + "selectedIconPath": "/static/tabbar/home-active.png", + "pagePath": "pages/home/home", + "text": "首页" + }, + { + "iconPath": "/static/tabbar/notification.png", + "selectedIconPath": "/static/tabbar/notification-active.png", + "pagePath": "pages/todayNursing/todayNursing", + "text": "今日护理" + }, + { + "iconPath": "/static/tabbar/canlendar.png", + "selectedIconPath": "/static/tabbar/canlendar-active.png", + "pagePath": "pages/nursingCalendar/nursingCalendar", + "text": "护理日历" + }, + { + "iconPath": "/static/tabbar/list.png", + "selectedIconPath": "/static/tabbar/list-active.png", + "pagePath": "pages/list/list", + "text": "护理列表" + } + + ] + } } diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue index b1dfe67..98604d6 100644 --- a/pages/detailNursing/detailNursing.vue +++ b/pages/detailNursing/detailNursing.vue @@ -132,6 +132,10 @@ {{typeFormat(item.type)}} {{item.created_at}} {{item.address}} + + + + @@ -139,8 +143,9 @@ - - + + + @@ -163,7 +168,7 @@ }, data() { return { - isShowModal:false,//是否超过时间确认 + isShowModal: false, //是否超过时间确认 type: 0, //打卡类型,1签到 2过程打卡 3签退 isShowImg: false, id: '', @@ -202,6 +207,13 @@ } }, methods: { + showimg(img) { + if (img.upload) + this.$showimg({ + imgs: [img.upload.url], + current: 0 + }) + }, load() { this.qqmapsdk = new QQMapWX({ key: 'D5EBZ-C3BWP-HZIDG-VO6BE-P2MN5-ESFZO' @@ -243,8 +255,8 @@ getLoaction() { return new Promise((resolve, reject) => { uni.getLocation({ - type:'gcj02', - isHighAccuracy:true + type: 'gcj02', + isHighAccuracy: true }).then(res => { if (res[1]) { this.location.lat = res[1]?.latitude @@ -451,9 +463,9 @@ }) }) }, - + //签退前检查 - checkSignOut(){ + checkSignOut() { //验证打卡次数是否已满 if (this.detail.logs_count < this.detail.product.process_total) { uni.showToast({ @@ -476,7 +488,7 @@ }) return } - + //时间是否超出120分钟 let totalTime = 0 for (let i of this.skuList) { @@ -484,10 +496,10 @@ totalTime += Number(i.form.time) } } - console.log(11111,totalTime); - if(totalTime > 120){ + console.log(11111, totalTime); + if (totalTime > 120) { this.isShowModal = true - }else{ + } else { this.signOut() } }, diff --git a/pages/showimg/showimg.vue b/pages/showimg/showimg.vue new file mode 100644 index 0000000..2f5bc70 --- /dev/null +++ b/pages/showimg/showimg.vue @@ -0,0 +1,253 @@ + + + + +