From 47746564904afb95dc1d4d98fb74dfd072d21eea Mon Sep 17 00:00:00 2001 From: chenshengle <954534408@qq.com> Date: Wed, 11 May 2022 17:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 5 +- config/config.js | 2 +- custom-tab-bar/index.js | 136 ++++++++++++++++------------------ ext.json | 2 +- index/index.js | 5 +- index/index.wxml | 2 +- index/user.wxml | 2 +- pages/coupon/detail/index.js | 2 +- pages/integralmall/index.js | 4 +- pages/integralmall/index.wxml | 3 +- pages/order/detail/index.js | 1 + pages/theme/index1/index.js | 9 ++- pages/theme/index1/index.wxml | 2 +- pages2/fengMap/fengMap.js | 1 - utils/HttpBasics.js | 2 +- 15 files changed, 90 insertions(+), 88 deletions(-) diff --git a/app.js b/app.js index 4c4ec1e..daf1263 100644 --- a/app.js +++ b/app.js @@ -132,7 +132,9 @@ App({ } Http.setToken(res.data.token); that.globalData.token = res.data.token; - console.log(that.globalData.token) + console.log(that.tokenCallback,"that.tokenCallback") + + if (that.tokenCallback) { that.tokenCallback(res.data.token); } @@ -223,6 +225,7 @@ App({ }) }, globalData: { + userName:"",//用户名 userAvatarUrl:"",//用户头像地址 goHomeUrl:'/index/index', mouldConfig:{},//模板尺寸 diff --git a/config/config.js b/config/config.js index 7f5f9b4..56fad9c 100755 --- a/config/config.js +++ b/config/config.js @@ -2,7 +2,7 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let weappId = extConfig.weappId; let configUrls = extConfig.attr.configUrl; let sockUrls = extConfig.attr.socketUrl; -var config = { +var config = { url: configUrls, wsurl: sockUrls, api: { diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index d9355db..e3333ce 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -5,7 +5,7 @@ var config = require("../config/config.js"); let app = getApp(); Component({ data: { - home_a_img:[], + home_a_img: [], selected: 0, "color": "#abb1be", "selectedColor": "#FD782D", @@ -35,15 +35,15 @@ Component({ } ] }, - created(){ - if(app.globalData.token){ + created() { + if (app.globalData.token) { this.getType() } }, // lifetimes: { // attached: function () { // // 在组件实例进入页面节点树时执行 - + // }, // }, attached() { @@ -89,14 +89,14 @@ Component({ }, methods: { switchTab(e) { - + // this.setData({ // list: this.data.home_a_img // }) // console.log(this.data.home_a_img) const data = e.currentTarget.dataset; - this.setData({ + this.setData({ selected: data.index }) console.log(data.index) @@ -104,7 +104,7 @@ Component({ if (data.index == 0 || data.index == 3) { this.getTemplateId() } - + wx.switchTab({ url }); @@ -112,7 +112,7 @@ Component({ /** * 获取全局样式 */ - getType() { + getType() { Http.get({ url: config.api.setType, data: { @@ -131,71 +131,71 @@ Component({ }) }, // 初始换底部导航栏 - setTabStyle: function () { - console.log(app.globalData.mouldType,"mouldType") - if(app.globalData.mouldType==0){ + setTabStyle: function() { + console.log(app.globalData.mouldType, "mouldType") + if (app.globalData.mouldType == 0) { this.getTabBar().setData({ selectedColor: `${app.globalData.styleLsit.t_in_std.styleClass}`, list: [{ - "pagePath": "/index/index", - "iconPath": `${app.globalData.styleLsit.t_in.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_in_std.icon}`, - "text": "首页" - }, - { - "pagePath": "/index/searchbar", - "iconPath": `${app.globalData.styleLsit.t_md.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_md_std.icon}`, - "text": "门店" - }, - { - "pagePath": "/index/passCar", - "iconPath": `${app.globalData.styleLsit.t_tc.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_tc_std.icon}`, - "text": "停车" - }, - { - "pagePath": "/index/user", - "iconPath": `${app.globalData.styleLsit.t_uc.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_uc_std.icon}`, - "text": "我的" - } + "pagePath": "/index/index", + "iconPath": `${app.globalData.styleLsit.t_in.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_in_std.icon}`, + "text": "首页" + }, + { + "pagePath": "/index/searchbar", + "iconPath": `${app.globalData.styleLsit.t_md.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_md_std.icon}`, + "text": "门店" + }, + { + "pagePath": "/index/passCar", + "iconPath": `${app.globalData.styleLsit.t_tc.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_tc_std.icon}`, + "text": "停车" + }, + { + "pagePath": "/index/user", + "iconPath": `${app.globalData.styleLsit.t_uc.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_uc_std.icon}`, + "text": "我的" + } ], }) - }else if(app.globalData.mouldType==1){ + } else if (app.globalData.mouldType == 1) { this.getTabBar().setData({ selectedColor: `${app.globalData.styleLsit.t_in_std.styleClass}`, list: [{ - "pagePath": "/pages/theme/index1/index", - "iconPath": `${app.globalData.styleLsit.t_in.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_in_std.icon}`, - "text": "首页" - }, - { - "pagePath": "/index/searchbar", - "iconPath": `${app.globalData.styleLsit.t_md.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_md_std.icon}`, - "text": "门店" - }, - { - "pagePath": "/index/passCar", - "iconPath": `${app.globalData.styleLsit.t_tc.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_tc_std.icon}`, - "text": "停车" - }, - { - "pagePath": "/index/user", - "iconPath": `${app.globalData.styleLsit.t_uc.icon}`, - "selectedIconPath": `${app.globalData.styleLsit.t_uc_std.icon}`, - "text": "我的" - } + "pagePath": "/pages/theme/index1/index", + "iconPath": `${app.globalData.styleLsit.t_in.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_in_std.icon}`, + "text": "首页" + }, + { + "pagePath": "/index/searchbar", + "iconPath": `${app.globalData.styleLsit.t_md.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_md_std.icon}`, + "text": "门店" + }, + { + "pagePath": "/index/passCar", + "iconPath": `${app.globalData.styleLsit.t_tc.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_tc_std.icon}`, + "text": "停车" + }, + { + "pagePath": "/index/user", + "iconPath": `${app.globalData.styleLsit.t_uc.icon}`, + "selectedIconPath": `${app.globalData.styleLsit.t_uc_std.icon}`, + "text": "我的" + } ], }) } - + }, - + getTemplateId() { // console.log("隐藏") // wx.hideTabBar() @@ -239,7 +239,7 @@ Component({ Http.post({ url: config.api.wxMsg }).then(res => { - + wx.setStorageSync({ key: 'ifShowTab', data: true, @@ -248,20 +248,14 @@ Component({ }) return } - - - // for (let i = 0; i < tmplIds.length;i++){ - // if (res.tmplIds[i] == 'accept'){ - // console.log("发送") - // } - // } + }, - complete(){ - + complete() { + } }) }, } - + }) \ No newline at end of file diff --git a/ext.json b/ext.json index 9e6b657..40b0286 100644 --- a/ext.json +++ b/ext.json @@ -81,7 +81,7 @@ "provider": "wxfab2bf944bfc4da6" }, "live-player-plugin": { - "version": "1.2.5", + "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, diff --git a/index/index.js b/index/index.js index 5bf7ed0..57a5fa2 100644 --- a/index/index.js +++ b/index/index.js @@ -681,8 +681,9 @@ Page({ token: token } }).then(res => { - if (res.data.avatarUrl){ - app.globalData.userAvatarUrl = res.data.avatarUrl + if (res.data.avatarUrl && res.data.nickName){ + app.globalData.userAvatarUrl = res.data.avatarUrl, + app.globalData.userName = res.data.nickName } that.setData({ levelName: res.data.levelName, diff --git a/index/index.wxml b/index/index.wxml index b842fbc..958c85b 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -23,7 +23,7 @@ -

{{userName}}

+

{{userName}}

{{levelName}} diff --git a/index/user.wxml b/index/user.wxml index 495cc1f..ea9c60a 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -20,7 +20,7 @@
-

{{userName}}

+

{{userName}}

+

{{userName}}

{{levelName}} diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 8fc5e4c..0dca7f4 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -112,6 +112,7 @@ Page({ // } else { // if (that.data.orderFlag) { + that.getStaticGame() var createDate = util.formatTime(res.data.orders[0].createDate, "yyyy-MM-dd hh:mm:ss"); let tempData = res.data.orders[0] tempData.deliveryInfo = tempData.deliveryInfo ? JSON.parse(tempData.deliveryInfo) : "" diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js index 0aef2c0..d915137 100644 --- a/pages/theme/index1/index.js +++ b/pages/theme/index1/index.js @@ -690,8 +690,9 @@ Page({ token: token } }).then(res => { - if (res.data.avatarUrl) { - app.globalData.userAvatarUrl = res.data.avatarUrl + if (res.data.avatarUrl && res.data.nickName) { + app.globalData.userAvatarUrl = res.data.avatarUrl, + app.globalData.userName = res.data.nickName } that.setData({ levelName: res.data.levelName, @@ -699,8 +700,8 @@ Page({ upgradeScore: res.data.upgradeScore, memberId: res.data.id, credit: res.data.credit, - userAvatarUrl: res.data.avatarUrl, - userName: res.data.nickName, + userAvatarUrl: res.data.avatarUrl ? res.data.avatarUrl:'', + userName: res.data.nickName ? res.data.nickName:'', }) }) .catch(err => { diff --git a/pages/theme/index1/index.wxml b/pages/theme/index1/index.wxml index 62feda6..49d73fe 100644 --- a/pages/theme/index1/index.wxml +++ b/pages/theme/index1/index.wxml @@ -23,7 +23,7 @@ -

{{userName}}

+

{{userName}}

{{levelName}} 积分:{{credit}} diff --git a/pages2/fengMap/fengMap.js b/pages2/fengMap/fengMap.js index 6f7089f..40a9f73 100644 --- a/pages2/fengMap/fengMap.js +++ b/pages2/fengMap/fengMap.js @@ -67,7 +67,6 @@ Page({ mapThemeURL: config.url + `/fengniaoMapfile/${this.data.initMap.tenantId}/theme/`, defaultThemeName: this.data.initMap.defaultThemeName, defaultMapScaleLevel:19, - // compassOffset:[28,100] }; console.log(canvas,"canvas") diff --git a/utils/HttpBasics.js b/utils/HttpBasics.js index 6ca5c9f..f25e7ac 100644 --- a/utils/HttpBasics.js +++ b/utils/HttpBasics.js @@ -2,7 +2,7 @@ const config = require("../config/config.js"); class HttpBasics { constructor(address) { if (address) { - this.address = address; + this.address = address; } } /**