diff --git a/App.vue b/App.vue index 1a5c86c..6f30caf 100644 --- a/App.vue +++ b/App.vue @@ -11,7 +11,7 @@ // 配置全局域名 // #ifdef H5 // this.globalData.hostapi = 'https://7and5.cn'; - this.globalData.hostapi = '/web'; + // this.globalData.hostapi = '/web'; // #endif }, onShow: function() { diff --git a/commons/icon-font.css b/commons/icon-font.css index 51ae7de..f0eaff7 100644 --- a/commons/icon-font.css +++ b/commons/icon-font.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3180711 */ - src: url('https://at.alicdn.com/t/font_3180711_7fx7wl7itar.woff2?t=1647479558213') format('woff2'), - url('https://at.alicdn.com/t/font_3180711_7fx7wl7itar.woff?t=1647479558213') format('woff'), - url('https://at.alicdn.com/t/font_3180711_7fx7wl7itar.ttf?t=1647479558213') format('truetype'); + src: url('https://at.alicdn.com/t/font_3180711_635f9bvlgje.woff2?t=1652863135237') format('woff2'), + url('https://at.alicdn.com/t/font_3180711_635f9bvlgje.woff?t=1652863135237') format('woff'), + url('https://at.alicdn.com/t/font_3180711_635f9bvlgje.ttf?t=1652863135237') format('truetype'); } .icon { @@ -13,6 +13,66 @@ -moz-osx-font-smoothing: grayscale; } +.icon-sj-left-top:before { + content: "\e603"; +} + +.icon-sj-top:before { + content: "\e604"; +} + +.icon-sj-right-top:before { + content: "\e605"; +} + +.icon-sj-bottom:before { + content: "\e606"; +} + +.icon-sj-right-bottom:before { + content: "\e607"; +} + +.icon-sj-left:before { + content: "\e60d"; +} + +.icon-zsj:before { + content: "\e6bd"; +} + +.icon-del:before { + content: "\e718"; +} + +.icon-cut:before { + content: "\e609"; +} + +.icon-add:before { + content: "\e60a"; +} + +.icon-add-picture05:before { + content: "\e639"; +} + +.icon-add-picture04:before { + content: "\e636"; +} + +.icon-add-picture03:before { + content: "\e642"; +} + +.icon-add-picture02:before { + content: "\e8bc"; +} + +.icon-add-picture01:before { + content: "\e62c"; +} + .icon-sandian:before { content: "\e769"; } @@ -93,7 +153,7 @@ content: "\e73f"; } -.icon-shopp-cart:before { +.icon-shop-cart:before { content: "\e73d"; } diff --git a/components/dates/yy-mm-dd-hh-ss.vue b/components/dates/yy-mm-dd-hh-ss.vue index eab00e0..586f4af 100644 --- a/components/dates/yy-mm-dd-hh-ss.vue +++ b/components/dates/yy-mm-dd-hh-ss.vue @@ -6,7 +6,7 @@ 取消 确定 - + @@ -68,6 +68,7 @@ hour: "", minute: "", value: [0, 0, 0, 0, 0], + ifDate:false }; }, @@ -148,6 +149,10 @@ } } this.minutes = minutes; + // 兼容微信小程序 + setTimeout(()=>{ + this.ifDate = true; + },1000) }, show() { diff --git a/components/foot-tabs/foot-tab-one.vue b/components/foot-tabs/foot-tab-one.vue index 0c02730..6781e3d 100644 --- a/components/foot-tabs/foot-tab-one.vue +++ b/components/foot-tabs/foot-tab-one.vue @@ -126,18 +126,41 @@ break; case 2: // #ifdef APP-PLUS || MP-WEIXIN + this.$toolAll.tools.showToast(3) uni.scanCode({ onlyFromCamera:false, // 是否只能从相机扫码，不允许从相册选择图片 scanType: ['qrCode'], // barCode：一维码， qrCode：二维码， datamatrix：Data Matrix 码， pdf417：PDF417 条码 autoDecodeCharset:true, // 是否启用自动识别字符编码功能，默认为否 success: function (res) { - console.log('条码类型：' + res.scanType); - console.log('条码内容：' + res.result); + // console.log(res); + // console.log('条码类型：' + res.scanType); + // console.log('条码内容：' + res.result); + let project_number = JSON.parse(res.result).project_number; + if(project_number) { + uni.navigateTo({ + url:`/pagesA/repairsPage/repairsPage?project_number=${project_number}` + }) + } else { + this.$toolAll.tools.showToast('请出示正确的码') + } + },fail() { + this.$toolAll.tools.showToast('扫描失败') } }); // #endif // #ifdef H5 - this.scanCode(); + uni.showModal({ + title:'提示', + content:'请使用，飞猴云服务APP进行扫一扫，是否马上下载APP？', + confirmText:'马上下载', + cancelText:'暂不下载', + success: (res) => { + if(res.confirm) { + + } + } + }) + // this.scanCode(); // #endif break; case 3: @@ -157,12 +180,23 @@ sizeType: ['original'], count: 1, success: (res)=> { - qrcode.decode(this.getObjectURL(res.tempFiles[0])) + // uni.showModal({ + // title:'进入了'+JSON.stringify(res) , + // content:JSON.stringify(res.tempFilePaths[0]) + // }) + qrcode.decode(this.getObjectURL(res.tempFilePaths[0])) qrcode.callback = (codeRes) => { if (codeRes.indexOf('error') >= 0) { + this.footList[2].title = 3; // 二维码识别失败 console.log('不合法二维码：' + codeRes); + uni.showModal({ + title:'请出示正确的码', + content:res + }) + // this.$toolAll.tools.showToast('请出示正确的码') } else { + this.footList[2].title = 2; // 二维码识别成功 let r = this.decodeStr(codeRes) // this.qrCodeRes = r @@ -185,6 +219,8 @@ // } // } },fail:(err)=> { + this.footList[2].title = 1; + this.$toolAll.tools.showToast(err) this.$toolAll.tools.checkQx(err.code); } }); @@ -192,13 +228,15 @@ // 获取文件地址函数 getObjectURL(file) { var url = null - if (window.createObjectURL !== undefined) { // basic - url = window.createObjectURL(file) - } else if (window.URL !== undefined) { // mozilla(firefox) - url = window.URL.createObjectURL(file) - } else if (window.webkitURL !== undefined) { // webkit or chrome - url = window.webkitURL.createObjectURL(file) - } + // if (window.createObjectURL !== undefined) { // basic + // url = window.createObjectURL(file) + // } else if (window.URL !== undefined) { // mozilla(firefox) + // url = window.URL.createObjectURL(file) + // } else if (window.webkitURL !== undefined) { // webkit or chrome + // url = window.webkitURL.createObjectURL(file) + // } + url = window.URL.createObjectURL(file) + this.footList[2].title = url; return url }, // 解码，输出：中文 diff --git a/jsFile/index.js b/jsFile/index.js new file mode 100644 index 0000000..1b5014b --- /dev/null +++ b/jsFile/index.js @@ -0,0 +1 @@ +!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n", "", + "", + "", + "", "", "", "", @@ -30,6 +28,7 @@ "", "", "", + "", "", "", "", diff --git a/pages/guide-page/guide-page.vue b/pages/guide-page/guide-page.vue index 024d7e4..7148a2f 100644 --- a/pages/guide-page/guide-page.vue +++ b/pages/guide-page/guide-page.vue @@ -1,6 +1,6 @@ @@ -8,11 +8,18 @@ export default { data() { return { - windowHeight:uni.getSystemInfoSync().windowHeight + windowHeight:uni.getSystemInfoSync().windowHeight, + ad_img:'' } }, onLoad() { this.checkContext(); + this.$requst.get('/universal/api.other/advertise').then(res=>{ + if(res.code) { + this.ad_img = res.data.ad_img; + uni.setStorageSync('adImg',this.ad_img); + } + }) }, methods: { checkContext(){ @@ -45,7 +52,7 @@ '/pages/login/login', '/pages/tabbar/pagehome/pagehome' ] - setTimeout(()=>{uni.reLaunch({url:arr[index]})},3000) + setTimeout(()=>{uni.reLaunch({url:arr[index]})},6000) } } } diff --git a/pagesA/dataQuery/details.vue b/pagesA/dataQuery/details.vue index 79e91d5..f118743 100644 --- a/pagesA/dataQuery/details.vue +++ b/pagesA/dataQuery/details.vue @@ -94,28 +94,26 @@ - - 项目列表 - + 项目列表 - - - 选择年份 + + + {{chooseyear ? chooseyear+'年' : '选择年份'}} + - - - - - - - 南城校区液晶显示屏 - - - 2022/3/1 - - + + + + {{item.project_name}} + {{item.create_time}} + + + + + + @@ -140,14 +138,15 @@ import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; import statusNav from '../../components/status-nav.vue'; import {queryDetail} from '@/jsFile/public-api.js'; + import pitera from '@/components/nothing/pitera.vue'; export default { components: { statusNav, - containerSubgroupTwo + containerSubgroupTwo, + pitera }, data() { return { - time: '12:01', dataArr:{ customerName:"长沙警校", customerCode:"xxxxxxxxx", @@ -159,8 +158,11 @@ area:"长沙", }, - projectList:[], - clientId:''//客户id + clientId:'',//客户id + yearArr:[],//年份 + currentyear: '',//当前年份 + chooseyear:'',//选中的年份 + projectList:[]//项目列表 } }, onLoad(op){ @@ -170,6 +172,13 @@ // 调用查询客户详情信息事件 this.queryDetailEv(); } + let date = new Date(); + this.currentyear = date.getFullYear(); + for (let i = this.currentyear-10; i <= this.currentyear; i++) { + this.yearArr.push(i); + } + // 调用项目列表查询 + this.getProjectList(this.currentyear); }, methods: { // 查询客户详情信息 @@ -182,46 +191,58 @@ } }) }, - getData(){ - - }, - // 拨打电话 - telFun(){ - uni.makePhoneCall({ - phoneNumber: '13608235524' //仅为示例 - }); - }, // 选择年份 bindTimeChange(data) { - console.log(data.detail.value) + let index = data.detail.value; + this.chooseyear = this.yearArr[index]; + // 调用项目列表查询 + this.getProjectList(this.chooseyear); }, + // 项目列表查询 + getProjectList(year) { + this.$requst.post('/universal/api.search/project_year',{year}).then(res=>{ + if(res.code) { + this.projectList = res.data; + } + }) + }, essentialInformation(classText){ - - // uni.createSelectorQuery().select('.'+classText).boundingClientRect(data=>{//目标位置的节点：类或者id - // uni.createSelectorQuery().select(".arc-content").boundingClientRect(res=>{//最外层盒子的节点：类或者id - // uni.pageScrollTo({ - // duration: 100,//过渡时间 - // scrollTop:data.top - res.top -uni.getSystemInfoSync().statusBarHeight-40,//到达距离顶部的top值 - // }) - // }).exec() - // }).exec(); + uni.createSelectorQuery().select('.'+classText).boundingClientRect(data=>{//目标位置的节点：类或者id + uni.createSelectorQuery().select(".arc-content").boundingClientRect(res=>{//最外层盒子的节点：类或者id + uni.pageScrollTo({ + duration: 100,//过渡时间 + scrollTop:data.top - res.top -uni.getSystemInfoSync().statusBarHeight-50,//到达距离顶部的top值 + }) + }).exec() + }).exec(); }, - // 复制微信 copyWxFun(){ - uni.setClipboardData({ - data: 'hello', - success: function () { - console.log('success'); - } - }); - } - + uni.setClipboardData({ + data: 'hello', + success: function () {} + }); + }, + // 拨打电话 + telFun(){ + uni.makePhoneCall({ + phoneNumber: '13608235524' //仅为示例 + }); + } } } diff --git a/pagesA/peopleManagement/peopleManagement.vue b/pagesA/peopleManagement/peopleManagement.vue index 6bf91a4..ac4a6f7 100644 --- a/pagesA/peopleManagement/peopleManagement.vue +++ b/pagesA/peopleManagement/peopleManagement.vue @@ -4,53 +4,56 @@ - - + + - + - + + + - {{item.title}}(正在作业) - (空闲中) + {{item.name}}({{item.isJob ? '正在作业' : '空闲中'}}) 已审核 - + - 编号: YG20211207-001 + 编号: {{item.number}} - - - + + + - 待处理：1单 - 已处理：1305单 + 待处理：{{item.num}}单 + 已处理：{{item.allnum}}单 - 当前定位：湖南省株洲市xxxxxxxx小区1栋202室 + 当前定位：{{item.address}} - 联系电话： 157xxxx8279 + 联系电话： {{$toolAll.tools.hideMPhone(item.phone,'x')}} - 注册时间： 2018-12-12 + 注册时间： {{item.time}} - + + + @@ -59,47 +62,92 @@ diff --git a/pagesA/workOrder/details.vue b/pagesA/workOrder/details.vue index 34df244..f146919 100644 --- a/pagesA/workOrder/details.vue +++ b/pagesA/workOrder/details.vue @@ -1,789 +1,817 @@