diff --git a/config.js b/config.js index 4181223..f1f5e4e 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,8 @@ const config = { // api_url: 'http://10.10.11.54:7101/fqsb', // 服务器地址 // api_url: 'http://10.10.11.44:7101/fqsb', // 服务器地址 - api_url: 'https://shibeirencai.elinkit.com.cn:7101/fqsb' // 正式环境 - // api_url: 'https://dingoa.elinkit.com.cn/fqsb', // 测试环境 + api_url: 'https://shibeirencai.elinkit.com.cn:7101/fqsb' // 正式环境 + // api_url: 'http://dingoa.elinkit.com.cn:7100/fqsb', // 测试环境 + // api_url: 'http://10.10.11.132:7101/fqsb/', // 本地环境 } export { config } \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js index ba0ed90..1f2cb52 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -127,24 +127,24 @@ Page({ id: 3, name: '政务服务' }, - // { - // id: 4, - // name: '学历教育' - // }, - // { - // id: 5, - // name: '场景开放' - // }, - // { - // id: 6, - // name: '企业招聘' - // }, - // { - // id: 7, - // name: '名人堂' - // }, { id: 4, + name: '学历教育' + }, + { + id: 5, + name: '场景开放' + }, + { + id: 6, + name: '企业招聘' + }, + { + id: 7, + name: '名人堂' + }, + { + id: 8, name: '法律服务' }, ], @@ -180,11 +180,12 @@ Page({ } }) } - for (let i = 0; i ',service) + // console.log('servicePublic-->',serviceData) this.setData({ service: service, servicePublic: serviceData diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 719ffa2..f7c7324 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -48,15 +48,9 @@ indicator-active-color="rgb(230,208,68)" wx:if="{{talentsType != 0 && talentsType != 9}}"> - + - @@ -65,12 +59,6 @@ - @@ -95,7 +83,6 @@ - @@ -104,7 +91,7 @@ - @@ -127,7 +114,8 @@ - + diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 52d069e..14465eb 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -89,7 +89,12 @@ page{ .tit{ font-size: 13px; margin-top: 5px; - color:rgb(103,103,103) + color:rgb(103,103,103); + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + text-align: center; } .icon{ diff --git a/pages/weChatAuth/index.js b/pages/weChatAuth/index.js index 142d789..f652477 100644 --- a/pages/weChatAuth/index.js +++ b/pages/weChatAuth/index.js @@ -29,7 +29,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - console.log(wx.getUserProfile) + console.log(wx.getUserProfile,"33333333") if (wx.getUserProfile) { this.setData({ canIUseGetUserProfile: true diff --git a/project.private.config.json b/project.private.config.json index db09dfc..f766050 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -167,5 +167,6 @@ } }, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "libVersion": "2.24.2" + "libVersion": "2.24.2", + "projectname": "fqsb_wx" } \ No newline at end of file