From 3d6d634985eb367be8553e2d9690ae4c85c4c4f5 Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Wed, 27 Apr 2022 10:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E4=BC=81=E4=B8=9A=E5=AE=A2=E6=9C=8D=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B4=E4=BD=93=E8=89=B2=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 +- commons/hengmei.css | 2 +- commons/icon-font.css | 143 +++++ components/bottom-tab.vue | 7 +- components/foot-tab.vue | 16 +- components/list-pu.vue | 4 +- components/nothing-page.vue | 4 +- components/public-customer.vue | 7 +- jsFile/publicAPI.js | 6 +- jsFile/requst.js | 2 +- jsFile/tools.js | 12 +- main.js | 3 +- pages.json | 7 - pages/tabbar/cate/cate.vue | 14 +- pages/tabbar/my/staffDuan.vue | 80 +-- pages/tabbar/pagehome/pagehome.vue | 32 +- pages/tabbar/shop/shop.vue | 9 +- pagesA/activityTask/activityTask.vue | 8 +- pagesA/coupon/coupon.vue | 13 +- pagesA/getReadyDan/getReadyDan-two.vue | 4 +- pagesA/getReadyDan/getReadyDan.vue | 808 ------------------------- pagesA/myAddress/myAddress.vue | 10 +- pagesA/myOrder/myOrder.vue | 13 +- pagesA/pointsMall/pointsMall.vue | 7 +- pagesA/shopCart/shopCart.vue | 27 +- pagesA/suggestions/suggestions.vue | 4 +- pagesB/articleDetail/articleDetail.vue | 7 +- pagesB/messagecenter/messagecenter.vue | 18 +- pagesB/myCollection/myCollection.vue | 12 +- pagesB/shopDetail/shopDetail.vue | 13 +- static/public/aboutus.png | Bin 1135 -> 576 bytes static/public/add.png | Bin 383 -> 188 bytes static/public/address-down.png | Bin 225 -> 181 bytes static/public/address-top.png | Bin 217 -> 176 bytes static/public/address60.png | Bin 1298 -> 559 bytes static/public/addressClose.png | Bin 2124 -> 885 bytes static/public/back-home-02.png | Bin 21393 -> 3835 bytes static/public/back-home.png | Bin 18019 -> 3788 bytes static/public/backBlackm.png | Bin 783 -> 354 bytes static/public/backTop.png | Bin 4234 -> 1120 bytes static/public/birthday50.png | Bin 2087 -> 1121 bytes static/public/bottom-customer.png | Bin 1642 -> 854 bytes static/public/bottom-shear.png | Bin 1817 -> 940 bytes static/public/btnKF.png | Bin 1987 -> 832 bytes static/public/cancle-FS.png | Bin 1162 -> 449 bytes static/public/cancleQuan.png | Bin 976 -> 378 bytes static/public/cart.png | Bin 3777 -> 1396 bytes static/public/cha-close.png | Bin 4683 -> 1021 bytes static/public/chooseFS.png | Bin 1496 -> 598 bytes static/public/chooseQuan.png | Bin 1271 -> 675 bytes static/public/closequan.png | Bin 2589 -> 1129 bytes static/public/cnllection-no.png | Bin 2455 -> 1260 bytes static/public/collection.png | Bin 12961 -> 3375 bytes static/public/conllection.png | Bin 1662 -> 643 bytes static/public/customer-check.png | Bin 1198 -> 511 bytes static/public/dai-fa60.png | Bin 882 -> 377 bytes static/public/dai-fu60.png | Bin 823 -> 362 bytes static/public/dai-shou60.png | Bin 1159 -> 493 bytes static/public/daoh.png | Bin 3017 -> 1061 bytes static/public/day60.png | Bin 1313 -> 529 bytes static/public/del-diary.png | Bin 678 -> 356 bytes static/public/detail-like.png | Bin 2153 -> 864 bytes static/public/detail-nlike.png | Bin 1479 -> 585 bytes static/public/diary-add.png | Bin 1833 -> 570 bytes static/public/fx.png | Bin 1720 -> 736 bytes static/public/gengd.png | Bin 5349 -> 1416 bytes static/public/gou.png | Bin 4032 -> 957 bytes static/public/hb.png | Bin 1612 -> 696 bytes static/public/integral-01-108.png | Bin 2652 -> 934 bytes static/public/integral-02-108.png | Bin 3045 -> 1009 bytes static/public/keh.png | Bin 2611 -> 920 bytes static/public/kf-logo.png | Bin 7850 -> 2447 bytes static/public/kong60.png | Bin 1309 -> 556 bytes static/public/like.png | Bin 4547 -> 1606 bytes static/public/list-nlike.png | Bin 2114 -> 965 bytes static/public/logo.png | Bin 8940 -> 1471 bytes static/public/member-head.png | Bin 9744 -> 2192 bytes static/public/member-scor50.png | Bin 2025 -> 1095 bytes static/public/member.png | Bin 33150 -> 7479 bytes static/public/mybt.png | Bin 15520 -> 2559 bytes static/public/no-like.png | Bin 5407 -> 1808 bytes static/public/nothing.png | Bin 20453 -> 1547 bytes static/public/nothingm.png | Bin 10783 -> 2133 bytes static/public/pay-success.png | Bin 6687 -> 1768 bytes static/public/pin-close.png | Bin 2124 -> 885 bytes static/public/qrcodec.png | Bin 2972 -> 1186 bytes static/public/quan-left-two.png | Bin 2721 -> 740 bytes static/public/quan-left.png | Bin 3293 -> 1218 bytes static/public/quan-over.png | Bin 3859 -> 1423 bytes static/public/quan-use.png | Bin 3859 -> 1431 bytes static/public/read.png | Bin 2016 -> 771 bytes static/public/ru-hui50.png | Bin 2314 -> 1196 bytes static/public/share-hai50.png | Bin 2214 -> 1172 bytes static/public/sharef.png | Bin 1736 -> 883 bytes static/public/sigined.png | Bin 11576 -> 4477 bytes static/public/sign-01.png | Bin 75094 -> 7928 bytes static/public/sign-02.png | Bin 13760 -> 5118 bytes static/public/sign-03.png | Bin 1630 -> 1040 bytes static/public/signIn.png | Bin 1405 -> 588 bytes static/public/staff-head.png | Bin 11377 -> 3562 bytes static/public/task-02-60.png | Bin 1631 -> 630 bytes static/public/task-04-60.png | Bin 1922 -> 721 bytes static/public/te-quan50.png | Bin 1826 -> 973 bytes static/public/toub.png | Bin 2585 -> 771 bytes static/public/tous.png | Bin 3343 -> 1080 bytes static/public/ts.png | Bin 1908 -> 753 bytes static/public/tuof.png | Bin 5145 -> 1475 bytes static/public/unread.png | Bin 2135 -> 799 bytes static/public/video.png | Bin 6482 -> 1833 bytes static/public/weix.png | Bin 2079 -> 795 bytes static/public/weiz.png | Bin 2541 -> 939 bytes static/public/yconllection.png | Bin 2213 -> 1190 bytes static/public/zanwn.png | Bin 12839 -> 3517 bytes static/public/zhif.png | Bin 6543 -> 1836 bytes static/public/zhij.png | Bin 4711 -> 1464 bytes static/public/zhir.png | Bin 2332 -> 708 bytes static/public/zhis.png | Bin 6848 -> 1929 bytes static/public/zu.png | Bin 3061 -> 1014 bytes static/public/zyuy.png | Bin 1950 -> 788 bytes static/tabbar/catea.png | Bin 3871 -> 1281 bytes static/tabbar/catem.png | Bin 3491 -> 1404 bytes static/tabbar/customerm.png | Bin 9285 -> 4107 bytes static/tabbar/homeAc.png | Bin 2982 -> 1101 bytes static/tabbar/homem.png | Bin 2810 -> 1241 bytes static/tabbar/mya.png | Bin 3404 -> 1249 bytes static/tabbar/mym.png | Bin 3141 -> 1361 bytes static/tabbar/shopa.png | Bin 2865 -> 1132 bytes static/tabbar/shopm.png | Bin 2698 -> 1211 bytes 128 files changed, 345 insertions(+), 951 deletions(-) create mode 100644 commons/icon-font.css delete mode 100644 pagesA/getReadyDan/getReadyDan.vue diff --git a/App.vue b/App.vue index f509e36..61ae2c8 100644 --- a/App.vue +++ b/App.vue @@ -4,12 +4,11 @@ export default { globalData:{ outside:true,//是否外界进来,默认是 - hostApi:'https://dxscrm.scdxtc.com/',//域名 + hostApi:'https://dxscrm.scdxtc.com/api/',//域名 latitude:30.656693,//纬度 longitude:104.136425//经度 }, onLaunch: function() { - console.log(this.globalData.hostApi,12); // 获取主题色事件 themeEv(); this.autoUpdate(); @@ -18,7 +17,6 @@ toolAll.tools.isVedio(); }, onShow: function() { - console.log(this.globalData.hostApi,12); if(uni.getStorageSync('token')) { toolAll.tools.networkStatus();//检查当前网络状态 toolAll.tools.refreshToken();//每十分钟刷新token diff --git a/commons/hengmei.css b/commons/hengmei.css index 78c5e08..c3038a2 100644 --- a/commons/hengmei.css +++ b/commons/hengmei.css @@ -70,7 +70,7 @@ /* 病种列表 */ .problem-input{border: 2rpx solid #E0E0E0;padding: 0rpx 20rpx;height: 80rpx;line-height: 80rpx;} /* 暂无内容时，显示的图片大小 */ -.zanw-img{width: 474rpx;height: 273rpx;} +.zanw-img{width: 180rpx;} /* 修改资料页面 */ .head_img{width: 140rpx;height: 140rpx;border-radius: 100%;} .nic{color: #101010;} diff --git a/commons/icon-font.css b/commons/icon-font.css new file mode 100644 index 0000000..a92ebd6 --- /dev/null +++ b/commons/icon-font.css @@ -0,0 +1,143 @@ +@font-face { + font-family: "iconfont"; /* Project id 3180711 */ + src: url('https://at.alicdn.com/t/font_3180711_14xpivprz1c.woff2?t=1650872732612') format('woff2'), + url('https://at.alicdn.com/t/font_3180711_14xpivprz1c.woff?t=1650872732612') format('woff'), + url('https://at.alicdn.com/t/font_3180711_14xpivprz1c.ttf?t=1650872732612') format('truetype'); +} + +.icon { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.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"; +} + +.icon-nothing-collection:before { + content: "\e610"; +} + +.icon-nothing-more:before { + content: "\e624"; +} + +.icon-nothing-data:before { + content: "\e60c"; +} + +.icon-address-check:before { + content: "\e6c2"; +} + +.icon-address-unchecked:before { + content: "\e623"; +} + +.icon-navigate-now:before { + content: "\e640"; +} + +.icon-send-goods:before { + content: "\e601"; +} + +.icon-payment:before { + content: "\e602"; +} + +.icon-finish:before { + content: "\e63f"; +} + +.icon-take:before { + content: "\e649"; +} + +.icon-refund:before { + content: "\e613"; +} + +.icon-customer-black:before { + content: "\ec2e"; +} + +.icon-customer:before { + content: "\e628"; +} + +.icon-check:before { + content: "\e61e"; +} + +.icon-del-white:before { + content: "\e61f"; +} + +.icon-screen:before { + content: "\e60b"; +} + +.icon-search:before { + content: "\e653"; +} + +.icon-caidan-mo:before { + content: "\e73e"; +} + +.icon-renwu-mo:before { + content: "\e73f"; +} + +.icon-shop-cart:before { + content: "\e73d"; +} + +.icon-caidan-active:before { + content: "\e608"; +} + +.icon-renwu-acitve:before { + content: "\e67c"; +} + +.icon-home-mo:before { + content: "\e673"; +} + +.icon-home-active:before { + content: "\e674"; +} + +.icon-return:before { + content: "\e600"; +} + +.icon-next:before { + content: "\e60e"; +} + diff --git a/components/bottom-tab.vue b/components/bottom-tab.vue index cc3d65b..af4fbec 100644 --- a/components/bottom-tab.vue +++ b/components/bottom-tab.vue @@ -7,7 +7,7 @@ 联系客服 - + @@ -34,6 +34,11 @@ }) }, lianK() { //客服 + wx.openCustomerServiceChat({ + extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`}, + corpId: 'ww62997b64e2c56170', + success(res) {} + }) this.$requst.post('user/rand-bind-service').then(res => {}) this.$toolAll.tools.closeTimer() //清空埋点倒计时 this.$requst.post('user/record', { diff --git a/components/foot-tab.vue b/components/foot-tab.vue index 8b7c99c..81e1873 100644 --- a/components/foot-tab.vue +++ b/components/foot-tab.vue @@ -17,7 +17,7 @@ - + @@ -102,11 +102,11 @@ break; case 2: if(existMobile!=''){ - // wx.openCustomerServiceChat({ - // extInfo: {url: `https://work.weixin.qq.com/kfid/kfcb3bba5b57d9a42ba?enc_scene=ENC616HXDjLYNcmsR49PBE75UERg8Ncv3dygpYjfnh3XVvA&scene_param=${uni.getStorageSync('openid')}`}, - // corpId: 'ww1f86f258d4ff5817', - // success(res) {} - // }) + wx.openCustomerServiceChat({ + extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`}, + corpId: 'ww62997b64e2c56170', + success(res) {} + }) this.$requst.post('user/rand-bind-service').then(res=>{}) this.$toolAll.tools.closeTimer()//清空埋点倒计时 this.$requst.post('user/record',{type:'other',action:'ask',id:0}).then(res=>{},error=>{}) @@ -124,7 +124,7 @@ }, // 前往登录页 goLogin(){ - uni.reLaunch({ + uni.reLaunchENCGp1Z2XmC3n4g2NibCrXxyrUbHutgkeVhkAhYr6Qi6Xt2({ url:'/pages/login/login' }) }, @@ -159,7 +159,7 @@ .item-box>view{width: 25%;text-align: center;} .centerBox{display: flex;justify-content: center;align-items: center;} /* .centerBox-item{width: 124rpx;height: 124rpx;background-color: rgba(244, 244, 244, 1);margin-top: -100rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;} */ - .centerBox-item{width: 124rpx;height: 124rpx;margin-top: -100rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;} + .centerBox-item{width: 124rpx;height: 124rpx;margin-top: -100rpx;border-radius: 100%;display: flex;justify-content: center;align-items: center;background-color: transparent;} .centerImg{width: 112rpx;height: 112rpx;} /* 公共 */ diff --git a/components/list-pu.vue b/components/list-pu.vue index b2f352f..270d1d0 100644 --- a/components/list-pu.vue +++ b/components/list-pu.vue @@ -86,8 +86,8 @@ - - + + diff --git a/components/nothing-page.vue b/components/nothing-page.vue index 2ec3496..3640418 100644 --- a/components/nothing-page.vue +++ b/components/nothing-page.vue @@ -1,7 +1,7 @@ @@ -40,6 +40,11 @@ }, methods:{ lianK(){ + wx.openCustomerServiceChat({ + extInfo: {url: `https://work.weixin.qq.com/kfid/kfc0d895c27861955a2?enc_scene=${'ENC6yeVMve4yhC238GG9zc5VYa6WaddYNHvNriZ6KueYvXj'}&scene_param=${uni.getStorageSync('openid')}`}, + corpId: 'ww62997b64e2c56170', + success(res) {} + }) this.$requst.post('user/rand-bind-service').then(res=>{}) this.$toolAll.tools.closeTimer()//清空埋点倒计时 this.$requst.post('user/record',{type:'other',action:'ask',id:this.nid}).then(res=>{},error=>{}) diff --git a/jsFile/publicAPI.js b/jsFile/publicAPI.js index 65a167e..185db3c 100644 --- a/jsFile/publicAPI.js +++ b/jsFile/publicAPI.js @@ -84,8 +84,8 @@ export function themeEv(){//查询主题色 res.data.footBar.forEach(item=>{ let newName = item.name let newObj = { - iconPath:'https://oss.hmzfyy.cn' + item.icon[0], - selectedIconPath:'https://oss.hmzfyy.cn' + item.icon[1], + iconPath:'https://dxscrm.scdxtc.com' + item.icon[0], + selectedIconPath:'https://dxscrm.scdxtc.com' + item.icon[1], } if(item.key=="home"){ imgList[0] = newObj @@ -133,7 +133,7 @@ export function checkQuan(){//查询优惠券 if(res.code==0){ if(res.data.has_coupon==1){ uni.setStorageSync('isQuan',true); - uni.setStorageSync('quanImg','https://oss.hmzfyy.cn' + res.data.home_coupon.cover); + uni.setStorageSync('quanImg','https://dxscrm.scdxtc.com' + res.data.home_coupon.cover); uni.setStorageSync('quanId',res.data.home_coupon.id); } else { uni.setStorageSync('isQuan',false); diff --git a/jsFile/requst.js b/jsFile/requst.js index 75ac0bf..a31bdee 100644 --- a/jsFile/requst.js +++ b/jsFile/requst.js @@ -1,5 +1,5 @@ const ENV = process.env; -let hostapi = 'https://dxscrm.scdxtc.com/'; +let hostapi = 'https://dxscrm.scdxtc.com/api/'; // 请求错误处理 const checkError = (e) => { // console.error("----接口错误----", e) diff --git a/jsFile/tools.js b/jsFile/tools.js index c2a203d..8252b9c 100644 --- a/jsFile/tools.js +++ b/jsFile/tools.js @@ -4,6 +4,7 @@ const tools = { timer:'', // 埋点倒计时 daoTime(){ + clearInterval(this.timer); let daoTime = uni.getStorageSync('daoTime') if(daoTime==''){//初次判断倒计时是否为空 uni.setStorageSync('daoTime',60)//设置倒计时 @@ -216,7 +217,7 @@ const tools = { }) .replace(' { if(res.data.code==0){ res.data.data.v==0 ? uni.setStorageSync('isVedio',false) : uni.setStorageSync('isVedio',true); - let appletImg = 'https://oss.hmzfyy.cn' + res.data.data.logo; + let appletImg = 'https://dxscrm.scdxtc.com' + res.data.data.logo; uni.setStorageSync('appletImg',appletImg); state.commit('updateAppletImgEv',appletImg); } @@ -337,14 +338,15 @@ const tools = { // console.log(hInfo.envVersion);//develop:开发版 trial：体验版 release：正式版 if(hInfo.miniProgram.envVersion == "develop" || hInfo.miniProgram.envVersion == "trial"){ // (开发版,体验版)-配置全局域名 - uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/'); + uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/api/'); + this.daoTime();//开启埋点倒计时 } else { // 清除所有输出日志 console.log = () =>{}; // 正式版-配置全局域名 - uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/'); + uni.setStorageSync('hostapi','https://dxscrm.scdxtc.com/api/'); // 开启埋点倒计时 - // this.daoTime();//开启埋点倒计时 + this.daoTime();//开启埋点倒计时 } // #endif }, diff --git a/main.js b/main.js index d270d37..9f72ff6 100644 --- a/main.js +++ b/main.js @@ -34,7 +34,6 @@ Vue.component('auth-userInfo-mobileInfo',authUserInfoMobileInfo)//全局注册 import share from './jsFile/share.js' Vue.mixin(share) -Vue.prototype.$hostApi = 'https://oss.hmzfyy.cn'; // 常用工具 import tools from '@/jsFile/tools.js' Vue.prototype.$toolAll = tools; @@ -44,7 +43,7 @@ Vue.prototype.$toolAll = tools; import requst from '@/jsFile/requst.js' Vue.prototype.$requst = requst; // 域名，专治后台仔没有返回http/https的图片 -Vue.prototype.$http = 'https://oss.hmzfyy.cn'; +Vue.prototype.$http = 'https://dxscrm.scdxtc.com'; const {log} = console; Vue.prototype.$log = log diff --git a/pages.json b/pages.json index ddf2fee..b64770b 100644 --- a/pages.json +++ b/pages.json @@ -55,13 +55,6 @@ "enablePullDownRefresh": false } - } - ,{ - "path" : "getReadyDan/getReadyDan", - "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } } ,{ "path" : "getReadyDan/getReadyDan-two", diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue index 6461150..8bcc09f 100644 --- a/pages/tabbar/cate/cate.vue +++ b/pages/tabbar/cate/cate.vue @@ -4,7 +4,7 @@