@@ -10,7 +10,12 @@ App({ | |||||
}, | }, | ||||
onShow:function(options){ | onShow:function(options){ | ||||
var that = this; | var that = this; | ||||
if (that.globalData.previewFlag){//解决微信图片预览重复进入app.js onshow | |||||
that.globalData.previewFlag = false | |||||
return | |||||
} | |||||
if (options.query.scene) { | if (options.query.scene) { | ||||
that.globalData.newArr = decodeURIComponent(options.query.scene).split(":"); | that.globalData.newArr = decodeURIComponent(options.query.scene).split(":"); | ||||
} | } | ||||
@@ -161,6 +166,8 @@ App({ | |||||
}) | }) | ||||
}, | }, | ||||
globalData: { | globalData: { | ||||
previewFlag:false,//解决图片预览调用noshow | |||||
typeLsit: [],//初始哈样式 | typeLsit: [],//初始哈样式 | ||||
scene: "", | scene: "", | ||||
// token | // token | ||||
@@ -66,7 +66,8 @@ | |||||
"pages/location/location", | "pages/location/location", | ||||
"pages/tcExplain/tcExplain", | "pages/tcExplain/tcExplain", | ||||
"pages/marketAtlas/marketAtlas", | "pages/marketAtlas/marketAtlas", | ||||
"pages/shareFriend/shareFriend" | |||||
"pages/shareFriend/shareFriend", | |||||
"components/dateLsit/dateLsit" | |||||
], | ], | ||||
"subpackages": [ | "subpackages": [ | ||||
{ | { | ||||
@@ -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 () { | |||||
} | |||||
}) |
@@ -0,0 +1,3 @@ | |||||
{ | |||||
"usingComponents": {} | |||||
} |
@@ -0,0 +1,10 @@ | |||||
<view class="Box"> | |||||
<view class="dateText_box"> | |||||
<view class="dateMinus">{{'<'}}</view> | |||||
<view class="dateText">2021年1月</view> | |||||
<view class="dateAdd">{{'>'}}</view> | |||||
</view> | |||||
<view class="weekBox"> | |||||
<view class="weekItme" wx:for="{{week}}">{{item}}</view> | |||||
</view> | |||||
</view> |
@@ -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%; */ | |||||
} |
@@ -36,26 +36,24 @@ Page({ | |||||
], | ], | ||||
chooseNumFir: [ | chooseNumFir: [ | ||||
['A', 'B', 'C', 'D', 'E', 'F', 'G'], | ['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: [ | chooseNumSco: [ | ||||
['A', 'B', 'C', 'D', 'E', 'F', 'G'], | ['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: [ | chooseSpec: [ | ||||
['A', 'B', 'C', 'D', 'E', 'F', 'G'], | ['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'] | |||||
], | ], | ||||
}, | }, | ||||
@@ -1,4 +1,3 @@ | |||||
// pages/marketAtlas/marketAtlas.js | |||||
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | ||||
const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
const config = require("../../config/config"); | const config = require("../../config/config"); | ||||
@@ -16,6 +15,7 @@ Page({ | |||||
tmpePicture:'',//零时存放 图片 | tmpePicture:'',//零时存放 图片 | ||||
}, | }, | ||||
lookimg(){ | lookimg(){ | ||||
app.globalData.previewFlag = true | |||||
wx.previewImage({ | wx.previewImage({ | ||||
current: this.data.tmpePicture, // 当前显示图片的http链接 | current: this.data.tmpePicture, // 当前显示图片的http链接 | ||||
urls: [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(){//获取楼层信息 | getStoreMap(){//获取楼层信息 | ||||
Http.get({ | Http.get({ | ||||
url: config.api.getStoreMap | url: config.api.getStoreMap | ||||
@@ -1,23 +1,25 @@ | |||||
<!-- <image class="" mode="widthFix" src="http://wayn.xin:9092/upload/2020/12/28/9aada16278ecbb200bb69de0e5ce25df.png" bindtap="lookimg"></image> --> | |||||
<navbar home back text="商场地图"></navbar> | |||||
<navbar home back text="商场地图"> | |||||
</navbar> | |||||
<view style="height:{{navigationBarHeight}} "></view> | <view style="height:{{navigationBarHeight}} "></view> | ||||
<view class="Box"> | <view class="Box"> | ||||
<view class="area"> | |||||
<view class="{{falgFloor==index?'areaItemActivity':'areaItem'}}" wx:for="{{dataLsit}}" wx:key="index" bindtap="setFalgFloor" data-index="{{index}}">{{item.buildingName}}</view> | |||||
<!-- <view class="areaItem">B座</view> --> | |||||
</view> | |||||
<!-- <image mode="widthFix" class="dt_1_img" src="https://formall.oss-accelerate.aliyuncs.com/789/a7524bda-3b36-41c2-89e3-490ef1a3da49.png"></image> --> | |||||
<view class="dt_box"> | |||||
<view class="le_box"> | |||||
<view class="le_box"> | |||||
<view class="{{tierFalg==index?'floor_a':floor}}" wx:for="{{dataLsit[falgFloor].floors}}" wx:key="index" bindtap="setTierFalg" data-index="{{index}}"> | <view class="{{tierFalg==index?'floor_a':floor}}" wx:for="{{dataLsit[falgFloor].floors}}" wx:key="index" bindtap="setTierFalg" data-index="{{index}}"> | ||||
<text class="text">{{item.floorName}}</text> | <text class="text">{{item.floorName}}</text> | ||||
<text class="active" wx:if="{{tierFalg==index}}"></text> | |||||
<!-- <text class="active" wx:if="{{tierFalg==index}}"></text> --> | |||||
</view> | |||||
<view class="area"> | |||||
<view class="{{falgFloor==index?'areaItemActivity':'areaItem'}}" wx:for="{{dataLsit}}" wx:key="index" bindtap="setFalgFloor" data-index="{{index}}">{{item.buildingName}}</view> | |||||
<!-- <view class="areaItem">B座</view> --> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="dt_box"> | |||||
<view class="ri_box"> | <view class="ri_box"> | ||||
<image mode="widthFix" class="dt_2_img" src="{{tmpePicture}}" wx:if="{{tmpePicture!=''}}" bindtap="lookimg"></image> | |||||
<image mode="widthFix" class="dt_2_img" src="{{tmpePicture}}" wx:if="{{tmpePicture!=''}}" bindtap="lookimg" bindload="imgload"></image> | |||||
<!-- <image class="dt_2_img_w_H" src="{{tmpePicture}}" wx:if="{{tmpePicture!=''}}" bindtap="lookimg" bindload="imgload" wx:if="{{img_W_H_flag}}"></image> --> | |||||
<view class="noIMg" wx:if="{{tmpePicture==''}}">暂未配置</view> | <view class="noIMg" wx:if="{{tmpePicture==''}}">暂未配置</view> | ||||
</view> | |||||
</view> | |||||
</view> | </view> | ||||
</view> | </view> |
@@ -13,19 +13,25 @@ | |||||
width: 96%; | width: 96%; | ||||
margin: 0 2%; | margin: 0 2%; | ||||
} | } | ||||
.dt_2_img_w_H{ | |||||
width: 96%; | |||||
height: 800rpx; | |||||
margin: 0 2%; | |||||
transform:rotate(90deg); | |||||
} | |||||
.dt_box { | .dt_box { | ||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
.le_box { | .le_box { | ||||
float: left; | |||||
position: fixed; | |||||
width: 20%; | width: 20%; | ||||
bottom: 200rpx | |||||
} | } | ||||
.ri_box { | .ri_box { | ||||
float: right; | |||||
width: 80%; | |||||
} | } | ||||
.floor_a { | .floor_a { | ||||
@@ -70,8 +76,9 @@ | |||||
border-radius: 7rpx; | border-radius: 7rpx; | ||||
} | } | ||||
.area{ | .area{ | ||||
width: 600rpx; | |||||
overflow: hidden; | overflow: hidden; | ||||
margin-bottom: 30rpx; | |||||
margin-top: 30rpx; | |||||
} | } | ||||
.areaItemActivity{ | .areaItemActivity{ | ||||
float: left; | float: left; | ||||
@@ -636,7 +636,7 @@ button::after{ border: none; } | |||||
.proct text:nth-of-type(2) { | .proct text:nth-of-type(2) { | ||||
display: block; | display: block; | ||||
word-wrap:break-word; | word-wrap:break-word; | ||||
font-size: 22rpx; | |||||
font-size: 26rpx; | |||||
color: #6f6f6f; | color: #6f6f6f; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
margin: 0 auto; | margin: 0 auto; | ||||
@@ -66,7 +66,7 @@ Page({ | |||||
this.getUserInfo(ctx, scale) | this.getUserInfo(ctx, scale) | ||||
ctx.setFillStyle("#fff"); | ctx.setFillStyle("#fff"); | ||||
ctx.fillRect(0, 0, this.data.windowWidth, this.data.windowHeight); | 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, "长按二维码识别", 180 * scale, 360 * scale, 16 * scale, "#000", "left", "middle") | ||||
this.drawNormalText(ctx, "尽享更多优惠活动!", 170 * scale, 390 * scale, 16 * scale, "#000", "left", "middle") | this.drawNormalText(ctx, "尽享更多优惠活动!", 170 * scale, 390 * scale, 16 * scale, "#000", "left", "middle") | ||||
ctx.draw(true); | 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, '客服电话:' + 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 //用户头像 | avatarUrl: data.userInfo.avatarUrl //用户头像 | ||||
}); | }); | ||||
console.log(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) | that.drawAvatarimg(ctx, scale) | ||||
} | } | ||||
}) | }) | ||||
@@ -63,13 +63,13 @@ | |||||
"list": [ | "list": [ | ||||
{ | { | ||||
"id": 0, | "id": 0, | ||||
"name": "pages/shareFriend/shareFriend", | |||||
"pathName": "pages/shareFriend/shareFriend", | |||||
"name": "components/dateLsit/dateLsit", | |||||
"pathName": "components/dateLsit/dateLsit", | |||||
"query": "", | "query": "", | ||||
"scene": null | "scene": null | ||||
}, | }, | ||||
{ | { | ||||
"id": -1, | |||||
"id": 1, | |||||
"name": "直播列表", | "name": "直播列表", | ||||
"pathName": "pages2/live/livelist/index", | "pathName": "pages2/live/livelist/index", | ||||
"query": "", | "query": "", | ||||