From fa409f4b4c6687d160aec3a203dba0bb0eb8cbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= Date: Mon, 1 Nov 2021 11:33:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=A8=E5=B1=80=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 3 +++ assets/js/common.js | 6 ++++-- assets/js/http/api.js | 11 ++--------- assets/js/http/http.js | 6 +----- assets/js/preview.js | 2 +- assets/js/project.config.js | 8 ++++++++ components/imageUpload/imageUpload.js | 5 +---- pages/home/home.js | 18 +++++++++--------- pages/home/home.wxml | 2 +- pages/login/login.wxml | 4 ++-- .../meetingDetailSigned/meetingDetailSigned.js | 5 +---- pages/mine/mine.js | 4 ++-- pages/scanSign/scanSign.js | 2 +- pages/signUpEntrance/signUpEntrance.js | 5 +---- pages/signUpPageGuoji/signUpPageGuoji.js | 5 +---- readme.txt | 1 + 16 files changed, 39 insertions(+), 48 deletions(-) create mode 100644 assets/js/project.config.js create mode 100644 readme.txt diff --git a/app.js b/app.js index 3593186..61d1808 100644 --- a/app.js +++ b/app.js @@ -7,6 +7,9 @@ App({ const logs = wx.getStorageSync('logs') || [] logs.unshift(Date.now()) wx.setStorageSync('logs', logs) + wx.removeStorage({ + key: 'avatarUrl', + }) // 长时间不操作导致token失效之后执行自动微信登录操作 wx.getStorage({ key: 'rsaPublicKey', diff --git a/assets/js/common.js b/assets/js/common.js index 08a69d0..f36784f 100644 --- a/assets/js/common.js +++ b/assets/js/common.js @@ -1,3 +1,5 @@ +import {appId, secret} from '../js/project.config' +console.log(appId) export function wxBind(callback){ // 获取openid进行手机号和微信的绑定 let count = 1 @@ -7,8 +9,8 @@ export function wxBind(callback){ wx.request({ url: 'https://api.weixin.qq.com/sns/jscode2session', data: { - appid: 'wx457dfcb58fd556ea', - secret: 'e8d2ee25e32c77561efccb7145ba9dc8', + appid: appId, + secret: secret, js_code: res.code, grant_type: 'authorization_code' }, diff --git a/assets/js/http/api.js b/assets/js/http/api.js index 532cec2..635e112 100644 --- a/assets/js/http/api.js +++ b/assets/js/http/api.js @@ -1,6 +1,6 @@ import http from './http.js' -let baseUrl = http.baseUrl -let URL_CONFIG = http.URL_CONFIG +import { baseUrl, URL_CONFIG } from '../project.config' + /* 配置路径 */ @@ -10,8 +10,6 @@ let apiUrl = { } export default { - baseUrl, - URL_CONFIG, //微信账号密码登陆--1 wxLoginByUserName(option, success, error) { http.post1(baseUrl + apiUrl.wxLoginByUserName, option).then(res => { @@ -39,8 +37,3 @@ export default { }) } } - -export{ - baseUrl, - URL_CONFIG -} diff --git a/assets/js/http/http.js b/assets/js/http/http.js index 36aad4d..0da13fd 100644 --- a/assets/js/http/http.js +++ b/assets/js/http/http.js @@ -1,4 +1,4 @@ - +import { baseUrl } from '../project.config' let headerDefault = { 'Accept': 'application/json' } @@ -6,8 +6,6 @@ let headerDefault1 = { 'content-type': 'application/x-www-form-urlencoded' } let TokenKey = 'X-Access-Token' -let baseUrl = 'http://bxxt.hzwlsoft.com:1015' -let URL_CONFIG = '/jero-boot/' const http = (method, url, data, header= headerDefault) => { let Authorization = wx.getStorageSync(TokenKey) ? wx.getStorageSync(TokenKey) : ''; @@ -39,8 +37,6 @@ const http = (method, url, data, header= headerDefault) => { } module.exports = { - baseUrl, - URL_CONFIG, get: (url, data, header) => http('GET', url, data, header), post: (url, data, header) => http('POST', url, data, header), post1: (url, data, header) => http('POST', url, data, headerDefault1), diff --git a/assets/js/preview.js b/assets/js/preview.js index c2af5c3..16432ca 100644 --- a/assets/js/preview.js +++ b/assets/js/preview.js @@ -1,5 +1,5 @@ import MeetingApi from '../js/http/meetingApi' -import { baseUrl } from '../../assets/js/http/api' +import { baseUrl } from '../js/project.config' /** * 预览文件的方法 * @param fileId 文件id diff --git a/assets/js/project.config.js b/assets/js/project.config.js new file mode 100644 index 0000000..f36e597 --- /dev/null +++ b/assets/js/project.config.js @@ -0,0 +1,8 @@ +export const appId = 'wx322b63d1e6ff4765' +export const secret = 'a3e81ffa80aa5f04d0b104b2ccda7f32' + +export let baseUrl = 'http://bxxt.hzwlsoft.com:1015' // 外网环境 +// export let baseUrl = 'http://10.10.10.46:8055/' // 测试环境 +// export const baseUrl = 'http://10.0.1.9:8080' // 本地环境 +export const URL_CONFIG = '/jero-boot/' + diff --git a/components/imageUpload/imageUpload.js b/components/imageUpload/imageUpload.js index ded2776..b71eb25 100644 --- a/components/imageUpload/imageUpload.js +++ b/components/imageUpload/imageUpload.js @@ -1,9 +1,6 @@ // components/imageUpload/imageUpload.js -import { - baseUrl, - URL_CONFIG -} from "../../assets/js/http/api" +import {baseUrl, URL_CONFIG} from '../../assets/js/project.config' Component({ /** * 组件的属性列表 diff --git a/pages/home/home.js b/pages/home/home.js index fc89f4d..f48d6ac 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -49,15 +49,15 @@ Page({ const reg = new RegExp("

","g") const reg1 = new RegExp("

","g") if(res.result.records && res.result.records.length){ - res.result.records.forEach(item=>{ - item.msgContent = item.msgContent.replace(reg,"") - item.msgContent = item.msgContent.replace(reg1,"") - const startIndex = item.msgContent.indexOf("") - if(startIndex > -1 && endIndex > -1 ){ - item.msgContent = item.msgContent.substring(0, startIndex) + item.msgContent.slice(endIndex + 4) + '点击报名' - } - }) + // res.result.records.forEach(item=>{ + // item.msgContent = item.msgContent.replace(reg,"") + // item.msgContent = item.msgContent.replace(reg1,"") + // const startIndex = item.msgContent.indexOf("") + // if(startIndex > -1 && endIndex > -1 ){ + // item.msgContent = item.msgContent.substring(0, startIndex) + item.msgContent.slice(endIndex + 4) + '点击报名' + // } + // }) this.setData({ list: [...this.data.list, ...res.result.records] }) diff --git a/pages/home/home.wxml b/pages/home/home.wxml index a3b4574..457fe54 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -52,7 +52,7 @@ {{item.sendTime}} - {{item.msgContent}} + diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 32e5d60..93437f0 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -30,8 +30,8 @@ 忘记密码？ 或用以下方式登录 - - + + diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index 4d3e70c..10220be 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -7,10 +7,7 @@ import { import MeetingApi from '../../assets/js/http/meetingApi' import signUpApi from '../../assets/js/http/signUp' import UserApi from '../../assets/js/http/userApi' -import { - baseUrl, - URL_CONFIG -} from '../../assets/js/http/api' +import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js' Page({ /** diff --git a/pages/mine/mine.js b/pages/mine/mine.js index d070854..31db9d0 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -166,7 +166,7 @@ Page({ */ onShow: function () { let userInfo = wx.getStorageSync('userInfo') - let userInfoTemp = wx.getStorageSync('userInfoTemp') + let avatarUrl = wx.getStorageSync('avatarUrl') let token = wx.getStorageSync('X-Access-Token') this.setData({ token @@ -177,7 +177,7 @@ Page({ phone: userInfo.phone.substr(0, 3) + '-' + userInfo.phone.substr(3, 4) + '-' + userInfo.phone.substr(7, 4) }) } - if (userInfoTemp) { + if (avatarUrl) { this.setData({ avatarUrl: userInfoTemp.avatarUrl }) diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js index 7751d0d..d5c4bb0 100644 --- a/pages/scanSign/scanSign.js +++ b/pages/scanSign/scanSign.js @@ -1,5 +1,5 @@ import UserApi from '../../assets/js/http/userApi' -import { baseUrl, URL_CONFIG } from '../../assets/js/http/api' +import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js' Page({ /** diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js index 3fdaf51..9e840e8 100644 --- a/pages/signUpEntrance/signUpEntrance.js +++ b/pages/signUpEntrance/signUpEntrance.js @@ -5,10 +5,7 @@ import { previewFile, getFileInfo } from '../../assets/js/preview' -import { - baseUrl, - URL_CONFIG -} from '../../assets/js/http/api' +import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js' Page({ diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js index c453f1f..fd77539 100644 --- a/pages/signUpPageGuoji/signUpPageGuoji.js +++ b/pages/signUpPageGuoji/signUpPageGuoji.js @@ -5,10 +5,7 @@ import { phoneReg, postcode } from '../../utils/validate' -import { - baseUrl, - URL_CONFIG -} from '../../assets/js/http/api' +import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js' Page({ /** diff --git a/readme.txt b/readme.txt new file mode 100644 index 0000000..4b79f32 --- /dev/null +++ b/readme.txt @@ -0,0 +1 @@ +1. assets/js/project.config.js 为全局的配置文件