From 7c30d0ca5cd5c87389f3e65b521b01cfb34df5a6 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Fri, 7 Feb 2025 17:10:27 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/login.vue | 6 +- .../exposureFence/detail.vue | 2 +- .../civilConstruction/exposureFence/index.vue | 2 +- .../civilConstruction/sceneMeeting/detail.vue | 2 +- .../civilConstruction/sceneMeeting/index.vue | 2 +- .../thematicActivities/detail.vue | 2 +- .../thematicActivities/index.vue | 2 +- .../noticeInspectionTesting/detail.vue | 2 +- .../attackGroup/detail.vue | 2 +- .../attackGroup/index.vue | 2 +- .../constructionActivitie/detail.vue | 2 +- .../constructionActivitie/index.vue | 2 +- .../constructionAgreement/detail.vue | 2 +- .../constructionAgreement/index.vue | 2 +- .../constructionScheme/detail.vue | 2 +- .../constructionScheme/index.vue | 2 +- .../demonstrationPost/detail.vue | 2 +- .../demonstrationPost/index.vue | 2 +- .../learningWorld/detail.vue | 2 +- .../learningWorld/index.vue | 2 +- .../pioneerModel/detail.vue | 2 +- .../pioneerModel/index.vue | 2 +- .../publicizReport/detail.vue | 1 + .../publicizReport/index.vue | 1 + .../thematicActivitie/detail.vue | 2 +- .../thematicActivitie/index.vue | 2 +- .../trademark/detail.vue | 2 +- .../guidancePartyBuilding/trademark/index.vue | 2 +- pages/projectEnd/projectIndex/appSettings.vue | 56 ++++++++++-------- .../projectEnd/projectIndex/projectIndex.vue | 7 +++ .../detail.vue | 12 ++-- .../index.vue | 8 +-- pages/videoManage/playVideo.vue | 2 + static/bthgIcon/gdhj_icon.png | Bin 3122 -> 23552 bytes utils/request.js | 3 +- 35 files changed, 83 insertions(+), 63 deletions(-) diff --git a/pages/login/login.vue b/pages/login/login.vue index 66ecb23..6e43530 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -34,7 +34,7 @@ + @click.stop="isShowPassword"> @@ -88,6 +88,10 @@ }; }, methods: { + isShowPassword(){ + this.showPassword = !this.showPassword; + console.log(this.showPassword) + }, gotoback() { // uni.navigateBack({ // delta: 1 diff --git a/pages/projectEnd/civilConstruction/exposureFence/detail.vue b/pages/projectEnd/civilConstruction/exposureFence/detail.vue index 28a9014..0b12b87 100644 --- a/pages/projectEnd/civilConstruction/exposureFence/detail.vue +++ b/pages/projectEnd/civilConstruction/exposureFence/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/civilConstruction/exposureFence/index.vue b/pages/projectEnd/civilConstruction/exposureFence/index.vue index 6cfc0ba..528b77a 100644 --- a/pages/projectEnd/civilConstruction/exposureFence/index.vue +++ b/pages/projectEnd/civilConstruction/exposureFence/index.vue @@ -18,7 +18,7 @@ - diff --git a/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue b/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue index 38f388b..e25db87 100644 --- a/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue +++ b/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/civilConstruction/sceneMeeting/index.vue b/pages/projectEnd/civilConstruction/sceneMeeting/index.vue index 57613e3..1094793 100644 --- a/pages/projectEnd/civilConstruction/sceneMeeting/index.vue +++ b/pages/projectEnd/civilConstruction/sceneMeeting/index.vue @@ -18,7 +18,7 @@ - diff --git a/pages/projectEnd/civilConstruction/thematicActivities/detail.vue b/pages/projectEnd/civilConstruction/thematicActivities/detail.vue index 29198a8..49def7f 100644 --- a/pages/projectEnd/civilConstruction/thematicActivities/detail.vue +++ b/pages/projectEnd/civilConstruction/thematicActivities/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/civilConstruction/thematicActivities/index.vue b/pages/projectEnd/civilConstruction/thematicActivities/index.vue index 5a8a826..a31617e 100644 --- a/pages/projectEnd/civilConstruction/thematicActivities/index.vue +++ b/pages/projectEnd/civilConstruction/thematicActivities/index.vue @@ -18,7 +18,7 @@ - diff --git a/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue b/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue index 1fe2446..baf7d93 100644 --- a/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue +++ b/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue @@ -596,7 +596,7 @@ controlPointLevelListUp() { return controlPointLevelId => { const findMap = this.controlPointLevelList - .filter(item => controlPointLevelId.includes(item.id.toString())) + .filter(item => controlPointLevelId.includes(item.id)) .map(item => item.controlPointLevelName); return findMap.length > 0 ? findMap.join('、') : '--'; }; diff --git a/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue b/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue index f60a33a..fca22af 100644 --- a/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue b/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue index ebb74a9..73d4dce 100644 --- a/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue index 24407f9..eb486da 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue index 7764406..b7ce4ef 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue index d149529..91aa8b2 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue index aeb0677..b9081db 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue b/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue index b47b793..45152e8 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue b/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue index 149a1e3..89cb4b4 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue index 447534d..be2f8fa 100644 --- a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue index f3f9dc9..a38f193 100644 --- a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue b/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue index 6c3acda..54db189 100644 --- a/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue b/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue index 39b69ff..b2aaed0 100644 --- a/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue b/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue index d9483f2..a6254fb 100644 --- a/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue b/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue index 72f7ac2..c5c4884 100644 --- a/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue b/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue index 6fdae49..f1b1e79 100644 --- a/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue @@ -13,6 +13,7 @@ diff --git a/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue b/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue index 9888471..e958862 100644 --- a/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue @@ -39,6 +39,7 @@ diff --git a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue index a930cd9..40ff958 100644 --- a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue index 34510f4..80ae99b 100644 --- a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue b/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue index 3e17c32..d13ee6c 100644 --- a/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/trademark/index.vue b/pages/projectEnd/guidancePartyBuilding/trademark/index.vue index f0e2019..20c27cb 100644 --- a/pages/projectEnd/guidancePartyBuilding/trademark/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/trademark/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/projectIndex/appSettings.vue b/pages/projectEnd/projectIndex/appSettings.vue index 33c46df..2be925f 100644 --- a/pages/projectEnd/projectIndex/appSettings.vue +++ b/pages/projectEnd/projectIndex/appSettings.vue @@ -4,12 +4,12 @@ - - - 应用中心 - - - + + + 应用中心 + + + @@ -49,20 +49,22 @@ - - - - - - + + + + + + {{ item.appName || item.moduleName }} + + + - - {{ item.appName || item.moduleName }} - - @@ -190,19 +192,19 @@ const res = that.$recursiveSearch(that.haveModuleList, item.path) // // console.log(5555555, res); // debugger - return res ? true :false + return res ? true : false }); } }) }, - onClickDelete(row){ + onClickDelete(row) { const findIndex = this.commonModuleIdsList.findIndex(item => item.moduleId == row.moduleId); - if(findIndex > -1) { + if (findIndex > -1) { this.commonModuleIdsList.splice(findIndex, 1); this.saveAppUserModules(); } }, - onClickAdd(row){ + onClickAdd(row) { console.log(1111111, row.moduleId, row) delete row.menuList this.commonModuleIdsList.push(row); @@ -452,7 +454,7 @@ url: '../../carViolation/pageIndex' }) break - + case 'standardSchedule': uni.navigateTo({ url: '../standardSchedule/index', @@ -539,7 +541,7 @@ url: '../../projectEnd/pipelineWelding/index' }) break - + case 'guidancePartyBuilding': uni.navigateTo({ url: '../../projectEnd/guidancePartyBuilding/index' @@ -633,7 +635,7 @@ return (row) => { const findIndex = this.commonModuleIdsList.findIndex(item => item.moduleId == row.moduleId); // console.log(findIndex, row.moduleId, this.commonModuleIdsList) - return findIndex > -1 ? false: true + return findIndex > -1 ? false : true } } } @@ -644,6 +646,7 @@ .inner_active { opacity: 0.2; } + .imageAdd { width: 28rpx; height: 28rpx; @@ -654,6 +657,7 @@ top: 16rpx; right: 50rpx; } + .imageDelete { width: 28rpx; height: 28rpx; @@ -816,13 +820,13 @@ .projectIndexPage { - :deep( .uni-scroll-view-content ){ + :deep(.uni-scroll-view-content) { background-image: url(@/static/bthgIcon/prjectIndex_bg3.png); background-repeat: no-repeat; background-size: 100%; } - :deep( .headerBox ){ + :deep(.headerBox) { background-color: transparent; border-bottom: none; } diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index 813ade5..2491b07 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -1255,6 +1255,13 @@ // uni.navigateTo({ // url: '../scan/saoSao?data=' + res.result // }) + if(res.result.includes('http://')) { + uni.showToast({ + icon: 'none', + title: '请使用微信扫一扫打开!' + }) + return + } uni.navigateTo({ url: `${res.result}` }) diff --git a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue index cbb58f1..6ba2280 100644 --- a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue +++ b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue @@ -10,9 +10,9 @@ - + 日期时间区间: {{detailData.dateBegin ? detailData.dateBegin : ""}} - {{ detailData.dateEnd ? detailData.dateEnd : '' }} @@ -118,9 +118,9 @@ 水用量记录及结算说明:{{detailData.waterConsumptionRecordAndSettlementInstruction}} - + 承包商负责人: @@ -129,10 +129,10 @@ 承包商负责人日期:{{detailData.contractorResponsiblePersonDate}} - + 施工管理部负责人: diff --git a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue index 20c41bc..7066248 100644 --- a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue +++ b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue @@ -9,7 +9,7 @@ - + @@ -28,14 +28,14 @@ --> - + 承包商 @@ -152,7 +152,7 @@ }, getWorkList() { let data = { - num: this.searchName, + contractorName: this.searchName, pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectSn diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue index ded86cc..53d9b23 100644 --- a/pages/videoManage/playVideo.vue +++ b/pages/videoManage/playVideo.vue @@ -45,9 +45,11 @@ videoFlag: false, typeName: "", videoConfig:{}, + projectSn:"", }; }, onLoad(options) { + this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; //videoType 1萤石云,2乐橙,3ISC,4大华,5宇视,6国标 // this.url = options.url this.videoInfo=uni.getStorageSync('videoInfo') diff --git a/static/bthgIcon/gdhj_icon.png b/static/bthgIcon/gdhj_icon.png index d91696d929f2b3f046682d0ba8e5ccff772bb790..4da4e4ad80d4c73c1bd6dd538b78bb4eb3e59cc2 100644 GIT binary patch literal 23552 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 ytef z@19#$x4-=phY!)*V6^5SI_GF{=N*7#BR9)n+G~WlnZFa$;1&gETY6rvW&J)~XrfM% z$j;13G6eZSO<8z=3z{T^rArJktg*P*a`U zA*WAgn8Xu~rn*>za~hzodO#$Zu-vrHv#*O-yhVU6U4-+P3-TLJlv__TcTzL^+O#_N zWAJHgxNGOVmo9xS?H&1}>sdT8_$$}uNB{gI*Uw9|?4TLb`+IFXH%wj{!{E<7l@jf@ zNFV0O9KoW)NvAuaCX!o3;pUTi)|^y0gJi34No=^i@z~y(FFvz>+AXbCn}7CS zzWA2^3qH*apX%Uyu3dXWBfNJv76J^Od)IXN2Ohfi&=a&*R|gF!durDTcxHKM*LV&C z=b(MxW2qtg#Y$&Mv*P$>6AYW`oMvhPg;Mo}E(#DiziONbB@@OH$ayFx=|X;*hU>2j z>adp)G~X*x1RYy4+ZWwM>paN5Q&>p0e?*9HCVk3k#TJq-rZPw}z0@Q}i`CEAQ(S)I*LhHg$D%{pf%5iRK1`oysa zh-3vo)Ubtdm~h>9NuxBxSJ1B6${Oq`IShH?5_Pv*+Olrh@tq;PVb|3vyteVinkat& zA1w7}k{bRytEx!>C-1@TBpcN#YrCt6xs$CXUv+x#^p~7mozo6c2VmV>z3T^WKlv}< z8Q4B0(D2rLIGiU2X#I;94j=oO3!6(TkvI~)FG7w{)m2CxHq+OQ zD6@oVLtfU+6kqY+bF*g_?5KRl7wN0T?WE?)Z*5~*@lBzVt6vnKlCSgRMFOktU zCQCXDVHz8Y;DOo%u>5*w7+K{odCTYX%kGss*gds~FuA8hK;}fqrEEJ-?-Rro?Rw=~ zpgB#V?%G-HSNqpKQ8JWTaATt5t>?bF5#84xTb~9);J{3?gNwA^>5jB5!J#HN6rW)L?2vXjTxZ%9>2Q%rjc}C)yGNJrzlP zkeG~YY}kp1NESop0pvknPx3?t7)haAj%A1N$i{wk#&e7{mj#N-?uCnbkmRE2^}0{% z5gn_qN>U@z>&pn+E8?sZkcgU^JoQJe;k2b!@0Vk*JUSiy5034hIl?P~N3Mvtu|9g_ z$f;j^^Etc#&*1j7K;zrJ*RQ|4$-CDaQa!~|fu#-)Fn@2gTmQi!UHj<4X8rzya^wDa zv-!yNwLRu7@xjTUpwfu?*)3$?X02o^iD@tPvU*wP;~ccx1lP^m3|VlXx9j?D%c zAdyO7qorSFN!_tQ6Ng>9OFJfIO!B0F?8|NTYvhv$d~Y&oGDjJ+zQ@xflb!4L@k*3* z-J)zhCIR4lV=Mb;>w`1RV7O}!kKDG}U){N)Bd<6zoj96UGrDR+y3vHtuf6T|GrtMX z!uDx_#<$#eNIr4?;l1pxtD8eS|UW4LM4fjXxJh@qQ#gnSL|B0*n?kq zqeYc}3$L92tvA2yWzWdcy1TZ|2sFO^{uO$`re1$VBdRZM!u1FPV9m;@%}C~m3J420 zF_6@Ssf+LlV8kyjpqnjdO9nzop|WF|pe@P8KEru%H8a#W1YsT8#E%-PgH{sSF}dw* zU)}QQ#I+pY2p~WJs+X;UP42O^rJMXZwSd7^ekj8Onv^WJWx29XR=ubgAX_>Py%j_^ z+6f=r;NI`O_0D7W!*j4bBcRFKZ(q4``-=8%+06A022cxro@(6ZbOz2w#&Q-LdSmHE z^QM7JO-~(s1DJeT>VD-%hIw=69O%MHVv|-|WJ``icd|j`^-=!4-1PC%?PE9FpN>m) zpX!`^ZrusbUcW7o6vxFxzkrn^#_$PP)1&LDKJwN(&pjtV$=kmNR(%ssUoys200000 LNkvXXu0mjfh_XDo literal 3122 zcmV-249)Y2P)Px=>`6pHRA@uZTWgF}R~26C+&eROUKeJDnc-Om>=dC@i-@TY=qn0Ru@!3#(N--` zT9ZCZOr!raZK#^mq-kO)rJxdjX|xa1Xkx6WOrb!b2()F8c>%)=1M_6=`)qUeF8dL1P%g#6TSP? zTb44>6zJuf%wmfK9fv(={rVraF#!s_AH z@o%1aMiijq;SNmh>;4cBZkqa>T|)_kAfP`}Qy7Sx#u*)583e2-7GkBsuhjP`XgDoh zgZe>o*wE4K>SZ!OTprGrgreaim1GfOvOMLTRJjC-252f`GF;J>sxNuhmmSm_sU(?o z$EJ6>U0xErno%rkrp4RSE+lfeGq+*0FxaL^XbMy(>dv)>w^2?ocZB;ogv3g?X-XQx zM5aFsr~HD^h{2N*yY$n7junJ;(2G08 zG@gRm(wJfve0lU61wNd;zsFT+p`0tsq>3l5r4gf^9AU>l!dg^x;r8A49N41IJ? z5;iv1V!~l-j!U@$?6@#a@`S+FIY~Ok>i5q>nyu0N$3{ea#frHo!pwyHqd^ERez&}k zu8%qJuTRd!WSki~ULfRm1LH81E5LVK>(I+%@jTl*Om^$JtQ!=WI7AN?YfC~9KlW}9 zt;5D08eZD;aR0@kCRo!@jk_+4!G)YlHnrB{;_C2D(8XMV+=2t_!LV4}w-K?YrR?a5!(j08aL!TKD^BD}oDh{tloaJBk4U;{C6QzQIe~(aqB1%%55x`Fz>UC+>X(^=JSySRdM+9vS_*dgVPsD$5`5WMq#xvNNsA0vX@=T7h163^25bKx|B5b{bvgs zVSR*IeysB%IWV4%CiEJ$!WEvuI?!4|jp2GY)aF;k;g1n!c}wRYIWj>{Jk-U$o+?^+ z8hNz@-ZF90+sdN7cKDh1f*B50(c!&ak<@IR9X!JRpDt{Kdm4+^P|W>+;AyOeb&%Lhf!mV_e0o6xG*rZ3q~MZ&4^QGhMpL9K zorA$#02x7Qs1%dUqj@$}om2wCdN5gm3;`JY%@?S_>dUL!4p0}K4e=P<-B1G`OlF}c zor9O!Ti~Nq4xa6~Oh;SOPy>G(o|Ga%hZpT{PhVF$a#51q#L;C`kTBpx$ybEViIapbrfKS&|!KGXtADJ@~CS4cqKiN<6 zT%*Rg11sti@b}@#Yj);?cfH@|Z_^r$o=)Y-TbCx_ zpQ9;wZqY30%j79L`*GJ0$+`sAH`d~+nbokZ_cGZ#no?m!UclMb6)J=T=_$RZdf)9C zYq+V=#aeY;zYrPH!fWv ze;S&AthV`AZp7Kr3%^vv;NpYWP5{EaDiC0Mdnz)x;y#LcG$$Vk2bm5AVla)pC5#80Pk;2Hk<5MMLP#D`Z+AxllEp!)i= z%Fh3SHKv@FYmez6T^gU|0&hcy z0KYmnOpc1h1;=ZZyUY6;{ENRyqU){BlF%8~{r4;bE%Q|ng#@l^to8Pq5K-LXvfsN9 z?Gg^chFNu3A9vvRL%0_{UV- zr5ih@t!UasS@c-$R@sOHpAcV8gyd1s+Db@NJ#Ygzcq(~i!}U^luZ*c}Ntf5R^u;y5 z>fUcMxETAUT5{51r87KaqMi(zDvA;z%xM3U{~yg;f@E0q#&1amUrktxizzB%lqV^?vl6v`$k>vX>u@7A zSnH@?_$qQaOv9RK+WN^oj*t0W9_OjqeWfgFD43okx>jN6b~7SvZuOBUcv93ID0ENcvyB_32smnQNn&L(%dqTh4+Mh3>1Nz z@L-~Ky5PF7lJph`j|!=+AgUj{!@J*CcgZGS$-n0)k;=YfX5|LS6zdDIO!>Cj#!Rj?G#7VmoI1 zsCc}SRHgI%F9MQ>r{fnc#nNIbDHEka3;Fc6hYPQcjJQw!;qwdV&R{4FHg%p`9xLEh z1ab!fScCxd_Yhb07_ak|DJd#F^~I7L66_&B-X<}4>6M%2AC*V^KNr}V@;+Y-761SM M07*qoM6N<$g41006#xJL diff --git a/utils/request.js b/utils/request.js index 72bd11f..d635d00 100644 --- a/utils/request.js +++ b/utils/request.js @@ -100,7 +100,8 @@ function baseRequest(url, params, method, options, isToast = false) { // let BaseUrl = uni.getStorageSync("ipPort") || app.config.globalProperties.url_config // let BaseUrl = createApp().app.config.globalProperties.url_config - let BaseUrl = creprocess.env.NODE_ENV === 'development' ? 'http://192.168.34.221:9111/' : 'http://jxj.zhgdyun.com:18000/' + // let BaseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.34.221:9111/' : 'http://jxj.zhgdyun.com:18000/' + let BaseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.34.221:9111/' : "http://219.147.96.219:9809/" // 包头线上地址(正式) console.log(BaseUrl, 777888) uni.request({ url: BaseUrl + url,