From 69386222a409f173f433a27ad38e1e480b03419e Mon Sep 17 00:00:00 2001 From: Lee1203 <342694918@qq.com> Date: Thu, 18 Aug 2022 15:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E6=9C=89=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 24 +- components/foot-tab/foot-tab.vue | 4 +- components/list/list-all.vue | 29 +- jsFile/tools.js | 2 +- manifest.json | 2 +- pages/cargo/cargo.vue | 2 +- pages/index/index.vue | 112 +- pages/line/line.vue | 103 +- pages/login/login.vue | 10 +- pagesA/news/detail.vue | 42 +- pagesA/news/news.vue | 54 +- pagesA/video/video.vue | 48 +- static/public/banner.jpg | Bin 17060 -> 0 bytes static/public/cargo.jpg | Bin 44558 -> 44557 bytes static/public/logo.jpg | Bin 0 -> 2903 bytes static/public/news.jpg | Bin 3806 -> 0 bytes static/public/shear-logo.jpg | Bin 0 -> 2986 bytes static/public/video.jpg | Bin 24983 -> 0 bytes .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../components/foot-tab/foot-tab.js.map | 2 +- .../mp-weixin/components/list/list-all.js.map | 2 +- .../components/status-nav/status-nav.js.map | 2 +- .../components/swiper/swiper-pull.js.map | 2 +- .../components/title/title-pull.js.map | 2 +- .../mp-weixin/pages/cargo/cargo.js.map | 2 +- .../.sourcemap/mp-weixin/pages/gps/gps.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../mp-weixin/pages/line/line.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../mp-weixin/pagesA/news/detail.js.map | 2 +- .../mp-weixin/pagesA/news/news.js.map | 2 +- .../mp-weixin/pagesA/video/playVideo.js.map | 2 +- .../mp-weixin/pagesA/video/video.js.map | 2 +- unpackage/dist/dev/mp-weixin/app.json | 71 +- unpackage/dist/dev/mp-weixin/common/main.js | 37 +- unpackage/dist/dev/mp-weixin/common/main.wxss | 22 + unpackage/dist/dev/mp-weixin/common/vendor.js | 1553 +++++++++++------ .../mp-weixin/components/foot-tab/foot-tab.js | 4 +- .../components/foot-tab/foot-tab.wxss | 2 - .../mp-weixin/components/list/list-all.wxml | 2 +- .../mp-weixin/components/list/list-all.wxss | 13 +- .../dist/dev/mp-weixin/pages/cargo/cargo.js | 8 +- .../dist/dev/mp-weixin/pages/cargo/cargo.wxml | 2 +- unpackage/dist/dev/mp-weixin/pages/gps/gps.js | 8 +- .../dist/dev/mp-weixin/pages/index/index.js | 122 +- .../dist/dev/mp-weixin/pages/index/index.wxss | 32 + .../dist/dev/mp-weixin/pages/line/line.js | 107 +- .../dist/dev/mp-weixin/pages/line/line.wxml | 2 +- .../dist/dev/mp-weixin/pages/line/line.wxss | 61 +- .../dist/dev/mp-weixin/pages/login/login.js | 30 +- .../dist/dev/mp-weixin/pagesA/news/detail.js | 48 +- .../dev/mp-weixin/pagesA/news/detail.wxml | 2 +- .../dist/dev/mp-weixin/pagesA/news/news.js | 62 +- .../dist/dev/mp-weixin/pagesA/news/news.wxml | 2 +- .../dev/mp-weixin/pagesA/video/playVideo.js | 8 +- .../dist/dev/mp-weixin/pagesA/video/video.js | 58 +- .../dist/dev/mp-weixin/project.config.json | 2 +- .../dev/mp-weixin/static/public/banner.jpg | Bin 17060 -> 0 bytes .../dev/mp-weixin/static/public/cargo.jpg | Bin 44558 -> 44557 bytes .../dist/dev/mp-weixin/static/public/logo.jpg | Bin 0 -> 2903 bytes .../dist/dev/mp-weixin/static/public/news.jpg | Bin 3806 -> 0 bytes .../mp-weixin/static/public/shear-logo.jpg | Bin 0 -> 2986 bytes .../dev/mp-weixin/static/public/video.jpg | Bin 24983 -> 0 bytes 64 files changed, 1822 insertions(+), 900 deletions(-) delete mode 100644 static/public/banner.jpg create mode 100644 static/public/logo.jpg delete mode 100644 static/public/news.jpg create mode 100644 static/public/shear-logo.jpg delete mode 100644 static/public/video.jpg delete mode 100644 unpackage/dist/dev/mp-weixin/static/public/banner.jpg create mode 100644 unpackage/dist/dev/mp-weixin/static/public/logo.jpg delete mode 100644 unpackage/dist/dev/mp-weixin/static/public/news.jpg create mode 100644 unpackage/dist/dev/mp-weixin/static/public/shear-logo.jpg delete mode 100644 unpackage/dist/dev/mp-weixin/static/public/video.jpg diff --git a/App.vue b/App.vue index f76b725..b501f58 100644 --- a/App.vue +++ b/App.vue @@ -4,7 +4,29 @@ projectname:'', // 项目名称 lat:'', // 公司地址维度 lng:'' ,// 公司地址经度 - hostapi:'https://laonon.scdxtc.cn' // 域名配置 + hostapi:'https://jizheng.scdxtc.cn' // 域名配置 + }, + // 优先于show方法 + onLaunch: function() { + uni.login({ + success: (res) => { + uni.request({ + url: this.globalData.hostapi +'/api/user/login', + data:{code:res.code}, + success: (result) => { + if(result.data.code == 0) { + uni.setStorageSync('userId',result.data.account_id); + uni.setStorageSync('token',result.data.data.token);//缓存token + uni.setStorageSync('openid',result.data.data.openid);//缓存openid + uni.setStorageSync('expire',result.data.data.expire);//缓存失效时间(时间戳格式) + uni.setStorageSync('phone_active',result.data.data.phone_active);//是否授权手机号 + uni.setStorageSync('is_active',result.data.data.is_active);//是否授权头像和昵称 + uni.setStorageSync('invite_code',result.data.data.invite_code);//缓存邀请码 + } + } + }) + } + }) }, }; diff --git a/components/foot-tab/foot-tab.vue b/components/foot-tab/foot-tab.vue index 8890ebc..90c7696 100644 --- a/components/foot-tab/foot-tab.vue +++ b/components/foot-tab/foot-tab.vue @@ -53,9 +53,7 @@ uni.reLaunch({url:'/pages/gps/gps'}) break; case 3: - if(this.$toolAll.tools.judgeAuth()) { - uni.reLaunch({url:'/pages/cargo/cargo'}) - } + uni.reLaunch({url:'/pages/cargo/cargo'}) break; } }, diff --git a/components/list/list-all.vue b/components/list/list-all.vue index 8c014e9..ff12800 100644 --- a/components/list/list-all.vue +++ b/components/list/list-all.vue @@ -16,25 +16,25 @@ - {{item.flag}} + {{item.flag}} {{item.title}} - 始发地:{{item.start_addr}} - 目的地:{{item.arrive_addr}} + 始发地:{{item.start_addr}} + 目的地:{{item.arrive_addr}} - 开始日期:{{item.start_time}} - 结束日期:{{item.end_time}} + 开始日期:{{item.start_time}} + 结束日期:{{item.end_time}} - 最高价:¥ + 最高价:¥ {{item.max_price}} - 最低价:¥ + 最低价:¥ {{item.min_price}} @@ -42,7 +42,7 @@ - + @@ -147,6 +147,12 @@ margin-top: 20rpx; line-height: 1.8; } + .list-line>.item .left{ + min-width: calc(100% - 210rpx); + } + .list-line>.item .right{ + max-width: 200rpx; + } .list-line>.item .top{ align-items: center; width: 100%; @@ -154,15 +160,18 @@ line-height: 1.5; } .list-line>.item .top>.flag{ - width: auto; + width: 62rpx; line-height: 32rpx; - padding: 0 6rpx; margin-right: 6rpx; + text-align: center; background-color: #1c2588; border: 2rpx solid #1551a0; border-radius: 4rpx; color: #ffffff; } + .list-line>.item .top>.title{ + width: calc(100% - 68rpx); + } .list-line>.item .addr>text:nth-of-type(1), .list-line>.item .time>text:nth-of-type(1){ margin-right: 14rpx; diff --git a/jsFile/tools.js b/jsFile/tools.js index 382a605..71aa7de 100644 --- a/jsFile/tools.js +++ b/jsFile/tools.js @@ -285,7 +285,7 @@ const tools = { }) .replace(']*src=['"]([^'"]+)[^>]*>/gi, (match, p1) => { - return ` -1 ? p1 : 'https://laonon.scdxtc.cn' + p1}' />` + return ` -1 ? p1 : 'https://jizheng.scdxtc.cn' + p1}' />` }) }, diff --git a/manifest.json b/manifest.json index 903ad42..a32afbd 100644 --- a/manifest.json +++ b/manifest.json @@ -69,7 +69,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 小程序特有相关 */ - "appid" : "wxa02e44170bc722cd", + "appid" : "wxf97aea6594a7f7ad", "setting" : { "urlCheck" : true, "es6" : true diff --git a/pages/cargo/cargo.vue b/pages/cargo/cargo.vue index c4b4d01..2083132 100644 --- a/pages/cargo/cargo.vue +++ b/pages/cargo/cargo.vue @@ -1,5 +1,5 @@