diff --git a/app.js b/app.js index 534f3f5..9d5ef39 100644 --- a/app.js +++ b/app.js @@ -10,7 +10,12 @@ App({ }, onShow:function(options){ + var that = this; + if (that.globalData.previewFlag){//解决微信图片预览重复进入app.js onshow + that.globalData.previewFlag = false + return + } if (options.query.scene) { that.globalData.newArr = decodeURIComponent(options.query.scene).split(":"); } @@ -161,6 +166,8 @@ App({ }) }, globalData: { + previewFlag:false,//解决图片预览调用noshow + typeLsit: [],//初始哈样式 scene: "", // token diff --git a/app.json b/app.json index d3f0bec..ea6cb14 100644 --- a/app.json +++ b/app.json @@ -66,7 +66,8 @@ "pages/location/location", "pages/tcExplain/tcExplain", "pages/marketAtlas/marketAtlas", - "pages/shareFriend/shareFriend" + "pages/shareFriend/shareFriend", + "components/dateLsit/dateLsit" ], "subpackages": [ { diff --git a/components/dateLsit/dateLsit.js b/components/dateLsit/dateLsit.js new file mode 100644 index 0000000..eb8e4e0 --- /dev/null +++ b/components/dateLsit/dateLsit.js @@ -0,0 +1,102 @@ +// components/dateLsit/dateLsit.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + week:['日','一','二','三','四','五','六'], + dateLsit:[], + year: new Date().getFullYear(), + month: new Date().getMonth()+1, + }, + showDate(){//刷新日历 + let thenDey = this.getThenWeek() + + }, + + getDays(year, month){//获取每月有多少天 + let tempDateArr = [] + let thenDate = new Date(year, month, 0).getDate() + return thenDate + }, + getLastMonth(year, month){//上一个月最后一天是多少号 + if(month==1){ + month =12 + year = year-1 + }else{ + month = month-1 + } + let tempDateArr = [] + let thenDate = new Date(year, month, 0).getDate() + return thenDate + }, + getThenWeek(year, month){//获取每个月第一天是星期几 + if (month == 1) { + month = 12 + year = year - 1 + } else { + month = month - 1 + } + let date = new Date() + date.setFullYear(year) + date.setMonth(month) + date.setDate(1) + return date.getDay() + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + console.log(this.getThenWeek(2021,3)) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/components/dateLsit/dateLsit.json b/components/dateLsit/dateLsit.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/components/dateLsit/dateLsit.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/components/dateLsit/dateLsit.wxml b/components/dateLsit/dateLsit.wxml new file mode 100644 index 0000000..75727e1 --- /dev/null +++ b/components/dateLsit/dateLsit.wxml @@ -0,0 +1,10 @@ + + + {{'<'}} + 2021年1月 + {{'>'}} + + + {{item}} + + \ No newline at end of file diff --git a/components/dateLsit/dateLsit.wxss b/components/dateLsit/dateLsit.wxss new file mode 100644 index 0000000..b000ecc --- /dev/null +++ b/components/dateLsit/dateLsit.wxss @@ -0,0 +1,44 @@ +.dateText_box{ + width: 60%; + margin: 60rpx auto; + overflow: hidden; + text-align: center; +} + +.dateMinus{ + font-size: 36rpx; + float: left; + line-height: 68rpx; + padding: 10rpx; + height: 68rpx; + margin-left: 100rpx; +} +.dateText{ + float: left; + padding: 10rpx; + line-height: 68rpx; + height: 68rpx; +} +.dateAdd{ + padding: 10rpx; + line-height: 68rpx; + height: 68rpx; + float: left; + font-size: 36rpx; +} +.weekBox{ + width: 96%; + margin: 0 auto; + overflow: hidden +} +.weekItme{ + height: 80rpx; + line-height: 80rpx; + width: 80rpx; + margin: 0 10rpx; + text-align: center; + float: left; + /* background-color: red; + border-radius: 50%; */ + +} diff --git a/pages/addPark/addPark.js b/pages/addPark/addPark.js index 0ca37b9..2b0cbcd 100644 --- a/pages/addPark/addPark.js +++ b/pages/addPark/addPark.js @@ -36,26 +36,24 @@ Page({ ], chooseNumFir: [ ['A', 'B', 'C', 'D', 'E', 'F', 'G'], - ['H', 'I', 'J', 'K', 'L', 'M', 'N'], - ['O', 'P', 'Q', 'R', 'S', 'T', 'U'], - ['V', 'W', 'X', 'Y', 'Z', '', ''], - ['', '', '', '', '', '', 'DEL'] + ['H', 'J', 'K', 'L', 'M', 'N', 'P',], + ['Q', 'R', 'S', 'T', 'U', 'V', 'W'], + ['X', 'Y', 'Z', '', '', '','DEL'], ], chooseNumSco: [ ['A', 'B', 'C', 'D', 'E', 'F', 'G'], - ['H', 'I', 'J', 'K', 'L', 'M', 'N'], - ['O', 'P', 'Q', 'R', 'S', 'T', 'U'], - ['V', 'W', 'X', 'Y', 'Z', '1', '2'], - ['3', '4', '5', '6', '7', '8', '9'], - ['0', '', '', '', '', '', 'DEL'] + ['H', 'J', 'K', 'L', 'M', 'N', 'P'], + ['Q', 'R', 'S', 'T', 'U', 'V', 'W'], + ['X', 'Y', 'Z', '1', '2','3', '4'], + ['5', '6', '7', '8', '9', '0', 'DEL'], ], chooseSpec: [ ['A', 'B', 'C', 'D', 'E', 'F', 'G'], - ['H', 'I', 'J', 'K', 'L', 'M', 'N'], - ['O', 'P', 'Q', 'R', 'S', 'T', 'U'], - ['V', 'W', 'X', 'Y', 'Z', '港', '澳'], - ['1', '2', '3', '4', '5', '6', '7'], - ['8', '9', '0', '', '', '', 'DEL'] + ['H', 'J', 'K', 'L', 'M', 'N', 'P'], + ['Q', 'R', 'S', 'T', 'U', 'V', 'W'], + ['X', 'Y', 'Z', '港', '澳','1', '2'], + ['3', '4', '5', '6', '7', '8', '9'], + ['0', '', '', '', "", "",'DEL'] ], }, diff --git a/pages/marketAtlas/marketAtlas.js b/pages/marketAtlas/marketAtlas.js index 6d09ee5..05fd108 100644 --- a/pages/marketAtlas/marketAtlas.js +++ b/pages/marketAtlas/marketAtlas.js @@ -1,4 +1,3 @@ -// pages/marketAtlas/marketAtlas.js const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); @@ -16,6 +15,7 @@ Page({ tmpePicture:'',//零时存放 图片 }, lookimg(){ + app.globalData.previewFlag = true wx.previewImage({ current: this.data.tmpePicture, // 当前显示图片的http链接 urls: [this.data.tmpePicture] // 需要预览的图片http链接列表 @@ -51,6 +51,19 @@ Page({ }) }, + // imgload(e){ + // console.log(e.detail.width,e.detail.height) + // if (e.detail.width > e.detail.height){ + // this.setData({ + // img_W_H_flag :true + // }) + // }else{ + // this.setData({ + // img_W_H_flag: false + // }) + // } + // }, + getStoreMap(){//获取楼层信息 Http.get({ url: config.api.getStoreMap diff --git a/pages/marketAtlas/marketAtlas.wxml b/pages/marketAtlas/marketAtlas.wxml index 0bd4771..1f3d9d3 100644 --- a/pages/marketAtlas/marketAtlas.wxml +++ b/pages/marketAtlas/marketAtlas.wxml @@ -1,23 +1,25 @@ - - + + - - {{item.buildingName}} - - - - - + {{item.floorName}} - + + + + {{item.buildingName}} + + + + - + + 暂未配置 - + \ No newline at end of file diff --git a/pages/marketAtlas/marketAtlas.wxss b/pages/marketAtlas/marketAtlas.wxss index 4ea789b..ec60a0a 100644 --- a/pages/marketAtlas/marketAtlas.wxss +++ b/pages/marketAtlas/marketAtlas.wxss @@ -13,19 +13,25 @@ width: 96%; margin: 0 2%; } +.dt_2_img_w_H{ + width: 96%; + height: 800rpx; + margin: 0 2%; + transform:rotate(90deg); +} .dt_box { overflow: hidden; } .le_box { - float: left; +position: fixed; width: 20%; + bottom: 200rpx } .ri_box { - float: right; - width: 80%; + } .floor_a { @@ -70,8 +76,9 @@ border-radius: 7rpx; } .area{ + width: 600rpx; overflow: hidden; - margin-bottom: 30rpx; + margin-top: 30rpx; } .areaItemActivity{ float: left; diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss index 626dc58..5eed55c 100644 --- a/pages/radetail/index.wxss +++ b/pages/radetail/index.wxss @@ -636,7 +636,7 @@ button::after{ border: none; } .proct text:nth-of-type(2) { display: block; word-wrap:break-word; - font-size: 22rpx; + font-size: 26rpx; color: #6f6f6f; letter-spacing: 0; margin: 0 auto; diff --git a/pages/shareFriend/shareFriend.js b/pages/shareFriend/shareFriend.js index 46db3df..5b3dce6 100644 --- a/pages/shareFriend/shareFriend.js +++ b/pages/shareFriend/shareFriend.js @@ -66,7 +66,7 @@ Page({ this.getUserInfo(ctx, scale) ctx.setFillStyle("#fff"); ctx.fillRect(0, 0, this.data.windowWidth, this.data.windowHeight); - this.drawNormalText(ctx, " 向您推荐", 70 * scale, 35 * scale, 16 * scale, "#848484", "left", "middle", scale); + this.drawNormalText(ctx, " 向您推荐", 140 * scale, 32 * scale, 16 * scale, "#848484", "left", "middle", scale); this.drawNormalText(ctx, "长按二维码识别", 180 * scale, 360 * scale, 16 * scale, "#000", "left", "middle") this.drawNormalText(ctx, "尽享更多优惠活动!", 170 * scale, 390 * scale, 16 * scale, "#000", "left", "middle") ctx.draw(true); @@ -121,7 +121,7 @@ Page({ that.drawNormalText(ctx, '客服电话:' + res.data.servicePhone, 20 * scale, 540 * scale, 16 * scale, "#888", "left", "middle", scale); } - that.drawNormalText(ctx, "---" + that.data.mallname + "---", 175 * scale, 35 * scale, 16 * scale, "#000", "left", "middle", scale); + that.drawNormalText(ctx, "---" + that.data.mallname + "---", 90 * scale, 62 * scale, 16 * scale, "#000", "left", "middle", scale); }); }, @@ -168,7 +168,7 @@ Page({ avatarUrl: data.userInfo.avatarUrl //用户头像 }); console.log(data.userInfo.avatarUrl, "????--**") - this.drawNormalText(ctx, nickName, 48 * scale, 34 * scale, 16 * scale, "#000", "left", "middle"); + this.drawNormalText(ctx, nickName, 50 * scale, 34 * scale, 16 * scale, "#000", "left", "middle"); that.drawAvatarimg(ctx, scale) } }) diff --git a/project.config.json b/project.config.json index dde5e17..305f0f0 100644 --- a/project.config.json +++ b/project.config.json @@ -63,13 +63,13 @@ "list": [ { "id": 0, - "name": "pages/shareFriend/shareFriend", - "pathName": "pages/shareFriend/shareFriend", + "name": "components/dateLsit/dateLsit", + "pathName": "components/dateLsit/dateLsit", "query": "", "scene": null }, { - "id": -1, + "id": 1, "name": "直播列表", "pathName": "pages2/live/livelist/index", "query": "",