Skip to content

严立 / mini-shimao

Go to a project
Commit 732b40f0 by TengFengLian
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao 

* 'master' of http://120.77.182.185/yanl/mini-shimao:
  LL - UI 问题修复

# Conflicts:
#	pages/strategy/strategy.wxml
parents 204acb66 df12d924
Inline Side-by-side
Showing with 89 additions and 69 deletions
app.json
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"pages/login/login", "pages/login/login",
"pages/guide/guide", "pages/guide/guide",
"pages/campsite/campsite", "pages/campsite/campsite",
"pages/campsite-mirror/campsite-mirror",
"pages/myInfo/myInfo", "pages/myInfo/myInfo",
"pages/myActivity/myActivity", "pages/myActivity/myActivity",
......
pages/activity/activity.wxml
...@@ -41,5 +41,4 @@ ...@@ -41,5 +41,4 @@
</block> </block>
</view> </view>
</block> </block>
</view> </view>
\ No newline at end of file
pages/activity/activity.wxss
...@@ -111,12 +111,16 @@ ...@@ -111,12 +111,16 @@
} }
.other-item-info text { .other-item-info text {
max-width: 224rpx;
height: 36rpx; height: 36rpx;
margin-top: 12rpx; margin-top: 12rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: bold; font-weight: bold;
color: #15191F; color: #15191F;
line-height: 36rpx; line-height: 36rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.other-item image { .other-item image {
......
pages/guide/guide.js
...@@ -9,7 +9,8 @@ Page({ ...@@ -9,7 +9,8 @@ Page({
mapCss: '', mapCss: '',
pointDetail: './image/card/01.png', pointDetail: './image/card/01.png',
winPointDetail: false, winPointDetail: false,
pointInfo: iPoint pointInfo: iPoint,
selectionPoint: 0,
}, },
onLoad: function (options) { onLoad: function (options) {
...@@ -119,7 +120,20 @@ Page({ ...@@ -119,7 +120,20 @@ Page({
this.setData({ this.setData({
pointInfo: funcPointInfo, pointInfo: funcPointInfo,
pointDetail: funcPointInfo[funcIndex].card, pointDetail: funcPointInfo[funcIndex].card,
winPointDetail: true winPointDetail: true,
// selectionPoint: funcPointInfo[funcIndex].x - (wx.getSystemInfoSync().windowWidth / 2) +
})
this.scrollSelection(funcPointInfo[funcIndex])
},
scrollSelection: function (funcSelectionElement) {
const funcQuery = wx.createSelectorQuery()
funcQuery.select('#selection-' + funcSelectionElement.id).boundingClientRect()
funcQuery.exec((res) => {
this.setData({
selectionPoint: funcSelectionElement.x - (wx.getSystemInfoSync().windowWidth / 2) + res[0].width / 2
})
}) })
}, },
...@@ -151,6 +165,8 @@ Page({ ...@@ -151,6 +165,8 @@ Page({
}, },
onPointDetail: function () { onPointDetail: function () {
console.log(logicData.option)
let funcPointInfo = this.data.pointInfo let funcPointInfo = this.data.pointInfo
for (let i = 0, l = funcPointInfo.length; i < l; i++) { for (let i = 0, l = funcPointInfo.length; i < l; i++) {
if (funcPointInfo[i].isActive) { if (funcPointInfo[i].isActive) {
......
pages/guide/guide.wxml
<!-- 畅玩 - 活动列表 --> <!-- 畅玩 - 活动列表 -->
<navigation class="navigation" titleText="智慧导览" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="智慧导览" backIcon="/image/back.png"></navigation>
<view class="guide"> <scroll-view class="guide" scroll-x scroll-left="{{selectionPoint}}">
<image src="http://sm-web.meiqicloud.com/userfiles/appResources/guide/guide.png" style="{{mapCss}}"></image> <image src="http://sm-web.meiqicloud.com/userfiles/appResources/guide/guide.png" style="{{mapCss}}"></image>
<view class="point-map" style="{{mapCss}}"> <view class="point-map" style="{{mapCss}}">
<block wx:for="{{pointInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{pointInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="point-info row align-c {{item.isActive ? 'button-active' : 'button-inactive'}}" style="{{item.css}}"> <view id="{{'selection-' + item.id}}" class="point-info row align-c {{item.isActive ? 'button-active' : 'button-inactive'}}" style="{{item.css}}">
<!-- 默认样式 --> <!-- 默认样式 -->
<image class="point-info-arrow" src="./image/icon/point-arrow-inactive.png" hidden="{{item.isActive}}"></image> <image class="point-info-arrow" src="./image/icon/point-arrow-inactive.png" hidden="{{item.isActive}}"></image>
<image class="icon-inactive" src="{{item.icon}}" style="{{pointIconCss}}" hidden="{{item.isActive}}"></image> <image class="icon-inactive" src="{{item.icon}}" style="{{pointIconCss}}" hidden="{{item.isActive}}"></image>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</view> </view>
</block> </block>
</view> </view>
</view> </scroll-view>
<view class="point-detail" hidden="{{!winPointDetail}}" bind:tap="onPointDetail"> <view class="point-detail" hidden="{{!winPointDetail}}" bind:tap="onPointDetail">
<image src="{{pointDetail}}"></image> <image src="{{pointDetail}}"></image>
</view> </view>
\ No newline at end of file
pages/home/home.wxml
...@@ -58,13 +58,13 @@ ...@@ -58,13 +58,13 @@
</view> </view>
<!-- 智慧导览 --> <!-- 智慧导览 -->
<view class="guide detail-item"> <view class="guide detail-item" bind:tap="onGuide">
<image src="./image/title-guide.png"></image> <image src="./image/title-guide.png"></image>
<view class="guide-content"> <view class="guide-content">
<image class="background-image" src="./image/guide.png" mode="aspectFit"></image> <image class="background-image" src="./image/guide.png" mode="aspectFit"></image>
<view class="operation col"> <view class="operation col">
<text>探索精彩去处</text> <text>探索精彩去处</text>
<button class="row con-c align-c" bind:tap="onGuide">进入电子地图</button> <button class="row con-c align-c">进入电子地图</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/shop-detail/image/location.png
pages/shop-detail/image/location.png

2.93 KB | W: | H:

pages/shop-detail/image/location.png

3.18 KB | W: | H:

pages/shop-detail/image/location.png
pages/shop-detail/image/location.png
pages/shop-detail/image/location.png
pages/shop-detail/image/location.png
  • 2-up
  • Swipe
  • Onion skin
pages/shop-detail/image/time.png
pages/shop-detail/image/time.png

2.44 KB | W: | H:

pages/shop-detail/image/time.png

2.71 KB | W: | H:

pages/shop-detail/image/time.png
pages/shop-detail/image/time.png
pages/shop-detail/image/time.png
pages/shop-detail/image/time.png
  • 2-up
  • Swipe
  • Onion skin
pages/shop-detail/shop-detail.wxml
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
</view> </view>
</view> </view>
<view wx:if="{{!isBlack}}" class="operation">
<button class="button row con-c align-c" bindtap="onContact">电话预约</button>
</view>
<!-- 黑暗样式 --> <!-- 黑暗样式 -->
<view wx:if="{{isBlack}}" class="detail detail-black"> <view wx:if="{{isBlack}}" class="detail detail-black">
<view class="detail-title title-black row"> <view class="detail-title title-black row">
...@@ -51,9 +55,16 @@ ...@@ -51,9 +55,16 @@
</view> </view>
<view class="detail-other other-black col"> <view class="detail-other other-black col">
<view class="row align-c"> <view class="row align-c">
<text>开放时间</text> <image src="./image/time.png"></image>
<text>时间</text>
<text>{{info.date}}</text> <text>{{info.date}}</text>
</view> </view>
<view class="row align-c" bind:tap="onLocation">
<image src="./image/location.png"></image>
<text>地址</text>
<text>点击查看地址</text>
<image src="../../image/more-g.png"></image>
</view>
</view> </view>
<view class="detail-describe"> <view class="detail-describe">
<block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
...@@ -62,7 +73,7 @@ ...@@ -62,7 +73,7 @@
</view> </view>
</view> </view>
<view class="operation"> <view wx:if="{{isBlack}}" class="operation operation-black">
<button class="button row con-c align-c" bindtap="onContact">电话预约</button> <button class="button row con-c align-c" bindtap="onContact">电话预约</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/shop-detail/shop-detail.wxss
...@@ -117,7 +117,11 @@ ...@@ -117,7 +117,11 @@
height: 32rpx; height: 32rpx;
} }
.other-black view text:nth-child(2) { .other-black {
border-bottom: 1px #3a3a40 solid;
}
.other-black view text:nth-child(3) {
color: #FFFFFF; color: #FFFFFF;
} }
...@@ -148,6 +152,11 @@ ...@@ -148,6 +152,11 @@
background: #ffffff; background: #ffffff;
} }
.operation-black {
background: #272734;
border-top: 1rpx #272734 solid;
}
.operation .button { .operation .button {
width: 670rpx; width: 670rpx;
height: 96rpx; height: 96rpx;
......
pages/strategy/strategy.js
...@@ -7,63 +7,23 @@ const app = getApp() ...@@ -7,63 +7,23 @@ const app = getApp()
Page({ Page({
data: { data: {
testData: [
{
banner: [
'./image/1-banner-1.png',
'./image/1-banner-2.png',
'./image/1-banner-3.png',
],
title: '碧海银湖里的自然系饮食 | 原味舒食',
content: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home-strategy-1.png',
relation: [
{
'cover': '/image/strategy-1.png',
'title': '原味舒食生态餐厅原味舒',
'time': '营业时间 10:00-17:00',
'price': '¥20-¥50/人',
'describe': '',
}
]
}, {
banner: [
'./image/2-banner-1.png',
'./image/2-banner-2.png',
'./image/2-banner-3.png',
],
title: '碧海银湖里的自然系饮食 | 原味舒食',
content: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home-strategy-2.png',
relation: [
{
'cover': '/image/strategy-2.png',
'title': '儿童营地',
'time': '营业时间 10:00-17:00',
'price': '¥20-¥50/人',
'describe': '',
}
]
},
],
isNavigationWhite: false, isNavigationWhite: false,
banner: [], banner: [],
bannerIndex: 0, bannerIndex: 0,
title: '',
content: '', // 内容 content: '', // 内容
detailImage: [], detailImage: [],
detailImageUrl: [], detailImageUrl: [],
detailIndex: 0, detailIndex: 0,
relation: [], relation: [],
date: '',
//接口参数 //接口参数
id: '', id: '',
}, },
onLoad: function (options) { onLoad: function (options) {
console.log('onLoad', options)
// this.setInitData(Number(options.id) - 1)
this.setData({ this.setData({
id: options.id, id: options.id,
}) })
...@@ -76,14 +36,6 @@ Page({ ...@@ -76,14 +36,6 @@ Page({
}, },
setInitData: function (funcIndex) {
this.setData({
banner: this.data.testData[funcIndex].banner,
detailImageUrl: [this.data.testData[funcIndex].content],
relation: this.data.testData[funcIndex].relation
})
},
onSwiperChange: function (funcEvent) { onSwiperChange: function (funcEvent) {
this.setData({ this.setData({
bannerIndex: funcEvent.detail.current bannerIndex: funcEvent.detail.current
...@@ -145,13 +97,12 @@ Page({ ...@@ -145,13 +97,12 @@ Page({
that.setData({ that.setData({
banner: res.data.banners, banner: res.data.banners,
content: content, content: content,
date: res.data.updateDate,
title: res.data.title
}) })
that.getParksByParkIds(res.data.smParkIds) that.getParksByParkIds(res.data.smParkIds)
}, },
}) })
}, },
......
pages/strategy/strategy.wxml
...@@ -23,9 +23,15 @@ ...@@ -23,9 +23,15 @@
</view> </view>
</view> </view>
<view class="detail"> <view class="detail column con-c">
<view class="detail-title">
<text>{{title}}</text>
</view>
<parser html="{{content}}"/> <parser html="{{content}}"/>
<view class="detail-date">
<text>{{date}}</text>
</view>
</view>
<view class="relation" wx:if="{{relation.length>0}}"> <view class="relation" wx:if="{{relation.length>0}}">
<view class="relation-title"> <view class="relation-title">
<text>文中提及</text> <text>文中提及</text>
...@@ -43,6 +49,5 @@ ...@@ -43,6 +49,5 @@
</view> </view>
</view> </view>
</block> </block>
</view>
</view> </view>
</view> </view>
pages/strategy/strategy.wxss
...@@ -31,7 +31,27 @@ ...@@ -31,7 +31,27 @@
.detail { .detail {
width: 750rpx; width: 750rpx;
padding: 6px; padding: 6px 32rpx;
}
.detail-title {
width: 670rpx;
min-height: 104rpx;
margin: 80rpx 0 64rpx 0;
font-size: 38rpx;
font-weight: 800;
color:#15191F;
line-height: 52rpx;
}
.detail-date {
/* width: 152rpx; */
height: 40rpx;
margin: 64rpx 0 32rpx 0;
font-size: 26rpx;
font-weight: 400;
color: #959DA9;
line-height: 40rpx;
} }
.detail > image { .detail > image {
...@@ -41,6 +61,8 @@ ...@@ -41,6 +61,8 @@
/* 攻略相关 */ /* 攻略相关 */
.relation-title { .relation-title {
margin: 0 40rpx 90rpx 40rpx; margin: 0 40rpx 90rpx 40rpx;
padding-top: 64rpx;
border-top: 1px #E2E7EF solid;
} }
.relation-title text { .relation-title text {
width: 120rpx; width: 120rpx;
...@@ -66,6 +88,7 @@ ...@@ -66,6 +88,7 @@
left: 24rpx; left: 24rpx;
width: 176rpx; width: 176rpx;
height: 214rpx; height: 214rpx;
overflow: hidden;
} }
.relation-item { .relation-item {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment