Skip to content

严立 / mini-shimao

Go to a project
Commit ed0c0804 by 严立
Options

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

parents dedb5739 5ffe5416
Inline Side-by-side
Showing with 81 additions and 161 deletions
pages/campsite/home-mirror/home-mirror.js
......@@ -257,9 +257,9 @@ Page({
})
},
// 点击全部活动
onAllActivity: function () {
onActivityAll: function () {
wx.navigateTo({
url: '/pages/play/activity/activity',
})
url: '/pages/play/activity/activity?fromPage=serviceDetail',
})
},
})
\ No newline at end of file
pages/campsite/home-mirror/home-mirror.wxml
......@@ -77,7 +77,12 @@
</view>
</view>
<!-- 滚动图片 -->
<!-- 全部活动 -->
<view class="activity" bindtap="onActivityAll">
<image src="{{appResourcesBase + 'campsite/title.png'}}"></image>
</view>
<!-- 滚动图片 -->
<!-- 无活动 -->
<view class="activity-empty" wx:if="{{childActivity.length === 0}}">
<block>
......@@ -86,7 +91,7 @@
</view>
<!-- 单活动 -->
<view class="swiper" wx:if="{{childActivity.length === 1}}">
<image mode="scaleToFill" src="{{childActivity[0].childImg}}"></image>
<image mode="scaleToFill" src="{{childActivity[0].childImg}}" bindtap="onActivityDetail" data-id="{{childActivity[0].id}}"></image>
</view>
<!-- 多活动 -->
<swiper class="swiper" indicator-dots indicator-color="#F6DADA" indicator-active-color="#E57C99" autoplay circular wx:if="{{childActivity.length > 1}}">
......
pages/campsite/home/home.js
......@@ -238,9 +238,9 @@ Page({
})
},
// 点击全部活动
onAllActivity: function () {
onActivityAll: function () {
wx.navigateTo({
url: '/pages/play/activity/activity',
})
url: '/pages/play/activity/activity?fromPage=serviceDetail',
})
},
})
\ No newline at end of file
pages/campsite/home/home.wxml
......@@ -75,20 +75,20 @@
</view>
<!-- 全部活动 -->
<view class="activity" bindtap="onAllActivity">
<view class="activity" bindtap="onActivityAll">
<image src="{{appResourcesBase + 'campsite/title.png'}}"></image>
</view>
<!-- 滚动图片 -->
<!-- 无活动 -->
<view class="activity-empty" wx:if="{{true}}">
<view class="activity-empty" wx:if="{{childActivity.length === 0}}">
<block>
<image src="{{appResourcesBase + 'campsite/empty.png'}}"></image>
</block>
</view>
<!-- 单活动 -->
<view class="swiper" wx:if="{{childActivity.length === 1}}">
<image mode="scaleToFill" src="{{childActivity[0].childImg}}"></image>
<image mode="scaleToFill" src="{{childActivity[0].childImg}}" bindtap="onActivityDetail" data-id="{{childActivity[0].id}}"></image>
</view>
<!-- 多活动 -->
<swiper class="swiper" indicator-dots indicator-color="#F6DADA" indicator-active-color="#E57C99" autoplay circular wx:if="{{childActivity.length > 1}}">
......
pages/mine/home/home.js
......@@ -78,7 +78,8 @@ Page({
isMonthCard: false,
authInfo: null,
goodTypeCountData: {},
enrollSubscribeData: {}
enrollSubscribeData: {},
isLoadingOrder:true
},
// 去活动预约列表
......@@ -187,6 +188,9 @@ Page({
//获取待使用订单
getWillUseOrders() {
let that = this
this.setData({
isLoadingOrder:true
})
App.wxRequest({
url: '/api/v1/order/getOrderList',
data: {
......@@ -216,7 +220,8 @@ Page({
list.length = 1
that.setData({
[orderList]: list,
orderListBackup: listBackUp
orderListBackup: listBackUp,
isLoadingOrder:false
})
......
pages/mine/home/home.wxml
......@@ -207,7 +207,7 @@
</view>
</view>
<!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder">
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder}}">
<text wx:if="{{!showMoreOrder}}">展开更多</text>
<text wx:else>收起</text>
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
......
pages/pay/order-comment/order-comment.js
......@@ -207,18 +207,13 @@ Page({
eventImageAdd: function (event) {
let that = this
// let imgUrl = event.detail.all[0].url
console.log(event, '8989');
let imgUrls = event.detail.all
let imgUrls = event.detail.current
let urlArr = []
imgUrls.forEach(item => {
urlArr.push(item.url)
})
// imgUrls.push(imgUrl)
// this.setData({
// imgUrls
// })
for (let i = 0; i < urlArr.length; i++) {
wx.showLoading({
title: '上传中',
......@@ -236,9 +231,9 @@ Page({
wx.hideLoading({
success: (res) => {},
})
console.log(res, '9999');
let data = typeof (res.data) == 'string' ? JSON.parse(res.data) : res.data
that.data.fileResults.push(data.data.fileUrl[0])
}
})
}
......
pages/pay/order-detail/order-detail.wxml
......@@ -183,7 +183,7 @@
<view class="info-content col con-c">
<view class="info-content-item row">
<text class="info-content-item-label">电影</text>
<text class="info-content-item-title">{{}}</text>
<text class="info-content-item-title">{{orderInfo.commodity[0].name}}</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">场次</text>
......@@ -191,11 +191,11 @@
</view>
<view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">{{rderInfo.contactName}}</text>
<text class="info-content-item-tip">{{orderInfo.contactName}}</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{rderInfo.contactPhone}}</text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}">
</image>
......
pages/pay/order-input/order-input.wxml
......@@ -229,7 +229,7 @@
<view class="contact" wx:if="{{winContact && !winNoticeDetail && !winStockTip}}">
<view class="contact-title col">
<text>{{contactTitle}}</text>
<text>仅用于接收订单确认短信</text>
<text hidden>仅用于接收订单确认短信</text>
</view>
<view class="contact-input col">
<text class="contact-input-mark">姓名</text>
......
pages/play/activity-detail/activity-detail.wxml
......@@ -31,7 +31,7 @@
<image src="/image/icon/g-location.png"></image>
<text>地址</text>
<text style="height:auto;">{{info.address}}</text>
<image src="/image/icon/arrow-r-1.png"></image>
<image hidden src="/image/icon/arrow-r-1.png"></image>
</view>
<view class="row align-c">
<image src="/image/icon/g-custom.png"></image>
......
pages/play/home/home.js
......@@ -170,7 +170,7 @@ Page({
//跳转到艺文
onToArt: function () {
wx.navigateTo({
url: '/pages/play/service/service?type=0&title=文艺'
url: '/pages/play/service/service?type=0&title=艺文'
})
},
//跳转到健康
......
pages/play/home/home.wxml
......@@ -47,9 +47,7 @@
<text>{{item.movieName}}</text>
</view>
<view class="movie-tags row">
<block wx:for="{{item.tags}}" wx:for-index="index" wx:for-item="tags" wx:key="index">
<text>{{tags}}</text>
</block>
<text wx:if="{{item.tags}}">{{item.tags[0]}}</text>
</view>
</view>
<view class="movie-info row">
......
pages/play/home/home.wxss
......@@ -169,14 +169,12 @@
max-width: 240rpx;
color: #15191f;
font-size: 30rpx;
overflow:hidden;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.movie-tags {
flex: 1;
flex-wrap: wrap;
overflow: hidden;
height: 32rpx;
line-height: 32rpx;
......
pages/play/movie-detail/movie-detail.wxml
......@@ -27,11 +27,9 @@
<view class="movie-info-wrapper">
<view class="movie-name row">
<text>{{movieInfo.filmName}}</text>
<block wx:for="{{movieInfo.tags}}" wx:for-item="tags" wx:key="index">
<view class="movie-tags">
<text>{{tags}}</text>
</view>
</block>
<view class="movie-tags">
<text wx:if="{{movieInfo.tags}}">{{movieInfo.tags[0]}}</text>
</view>
</view>
<view class="movie-info row">
<view class="movie-info-left">
......
pages/play/movie/movie.js
......@@ -87,9 +87,9 @@ Page({
let movieToday = funcResponse.list
movieToday.forEach(v => {
v.endTime = v.endTime + ' 散场'
v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ')
v.filmType = v.filmType
v.filmDirector = v.filmDirector
v.filmLead = v.filmLead
v.priceSpecialText = App.modular.utils.formatAmount(v.ownerPrice),
v.priceText = App.modular.utils.formatAmount(v.visitorPrice),
v.tags = v.tags.replace(/( )?热映影片( )?/, ' ').split(' ')
......
pages/play/movie/movie.wxml
......@@ -33,9 +33,7 @@
<text>{{item.filmName}}</text>
</view>
<view class="movie-tags row">
<block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex">
<text wx:if="{{tagsItem}}">{{tagsItem}}</text>
</block>
<text wx:if="{{item.tags}}">{{item.tags[0]}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -111,9 +109,7 @@
<text>{{item.filmName}}</text>
</view>
<view class="movie-tags row">
<block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex">
<text>{{tagsItem}}</text>
</block>
<text wx:if="{{item.tags}}">{{item.tags[0]}}</text>
</view>
</view>
<view class="movie-info row">
......@@ -163,7 +159,7 @@
</view>
</block>
</view>
<view class="footer-img">
<view class="footer-img {{movieToday.length > 3 || movieAll.movieWeek.list.length > 3 || movieAll.movieNextWeek.list.length > 3 ? '' : 'footer-fixed'}}">
<image src="/image/movie-bottom.png"></image>
</view>
</view>
\ No newline at end of file
pages/play/movie/movie.wxss
......@@ -63,6 +63,7 @@ page {
.movie-time-start {
color: #fff;
font-size: 38rpx;
font-weight: 600;
}
.movie-time-end {
margin-left: 12rpx;
......@@ -99,16 +100,13 @@ page {
white-space:nowrap;
}
.movie-tags {
flex: 1;
flex-wrap: wrap;
overflow: hidden;
height: 32rpx;
line-height: 32rpx;
}
.movie-tags text {
margin-left: 12rpx;
padding: 2rpx 13rpx;
color: #fff;
color: #fff !important;
font-size: 20rpx;
background: #15191f;
opacity: 0.5;
......@@ -155,6 +153,7 @@ page {
height: 56rpx;
color: #fff;
font-size: 26rpx;
font-weight: 600;
text-align: center;
line-height: 56rpx;
background: rgba(255, 255, 255, 0.2);
......@@ -194,7 +193,7 @@ page {
.line {
width: 80rpx;
height: 1rpx;
background: #E2E7EF;
background: #3A3A40;
}
......@@ -215,12 +214,18 @@ page {
width: 246rpx;
height: 366rpx;
background-color: #fff;
border-radius: 4rpx;
}
.footer-img {
width: 750rpx;
height: 150rpx;
margin-top: 64rpx;
}
.footer-fixed {
position: fixed;
left: 0;
bottom: 0;
}
.show-end {
width: 750rpx;
......
pages/play/service-detail/service-detail.js
......@@ -326,9 +326,9 @@ Page({
let funcData = res.list
funcDetail.forEach(shop => {
funcData.forEach(item => {
if (shop.id === item .id) {
if (shop.id === item.id) {
shop.banner = item.rotationImg
shop.name = item.name
shop.name = item.name === '故宫里的海洋世界—海错图' ? '海错图' : item.name
shop.date = item.businessTime
shop.describe = item.content
shop.contact = item.hotTel
......@@ -465,6 +465,7 @@ Page({
'sidebarId': funcResponse[i].classifyId, // 商品分类标识
'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面
'img': funcResponse[i].img, // 商品详情图
'price': funcResponse[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].ownerPrice, // 业主价
......@@ -489,6 +490,7 @@ Page({
funcItem.priceType = 3
}
}
console.log(funcItem.img)
funcCommodityList.push(funcItem)
}
......@@ -569,7 +571,7 @@ Page({
for (let i = 0, l = funcResponse.list.length; i< l; i++) {
let funcItem = {
'star': 4,
'scoreService': funcResponse.list[i].environmentalEvaluation, // 服务评价
'scoreService': funcResponse.list[i].serviceEvaluation, // 服务评价
'scoreCommodity': funcResponse.list[i].productEvaluation, // 商品评价
'scoreEnvironmental': funcResponse.list[i].environmentalEvaluation, // 环境评价
'userName': funcResponse.list[i].nickname,
......
pages/play/service-detail/service-detail.wxml
......@@ -54,7 +54,7 @@
<view class="commodity-card-list row">
<block wx:for="{{detailActivity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col" bindtap="onActivityDetail" data-id="{{item.id}}">
<image src="{{item.cover}}"></image>
<image mode="aspectFill" src="{{item.cover}}"></image>
<view class="commodity-card-item-title row con-b align-c">
<text>{{item.title}}</text>
<text>{{item.tagNames[0]}}</text>
......@@ -90,6 +90,7 @@
</view>
</view>
</block>
<view class="commodity-card-item col" wx:if="{{detailActivity.length !== 0}}"></view>
<block wx:if="{{detailActivity.length === 0}}">
<view class="commodity-card-item-nothing col con-c align-c">
<image src="{{imageBase + 'icon/fireworks-2.png'}}"></image>
......@@ -108,7 +109,7 @@
<view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col">
<image src="{{item.cover}}"></image>
<image mode="center" src="{{item.img}}"></image>
<view class="commodity-card-item-title row con-b align-c">
<text>{{item.name}}</text>
</view>
......@@ -143,6 +144,7 @@
</view>
</view>
</block>
<view class="commodity-card-item col"></view>
</view>
</view>
</view>
......@@ -328,7 +330,7 @@
<view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="movie-card-item col" data-id="{{item.name}}" bindtap="onBuy">
<image src="{{item.cover}}"></image>
<image mode="aspectFill" src="{{item.cover}}"></image>
<view class="movie-card-item-title row align-c">
<text>{{item.movieName}}</text>
</view>
......@@ -358,6 +360,7 @@
</view>
</view>
</block>
<view class="movie-card-item col"></view>
</view>
</view>
</view>
......
pages/play/service-detail/service-detail.wxss
......@@ -247,6 +247,15 @@
width: 0;
}
.commodity-card-item:last-child {
width: 1rpx !important;
min-width: 1rpx !important;
}
.movie-card-item:last-child {
width: 1rpx !important;
min-width: 1rpx !important;
}
.commodity-card-item-nothing {
width: 670rpx;
height: 544rpx;
......@@ -339,7 +348,7 @@
text-align: center;
font-size: 18rpx;
font-weight: 500;
line-height: 24rpx;
line-height: 32rpx;
color: #86C5E1;
}
......@@ -460,7 +469,7 @@
text-align: center;
font-size: 18rpx;
font-weight: 500;
line-height: 28rpx;
line-height: 32rpx;
color: #E8D0AF;
}
......
pages/play/service/service.js
......@@ -59,7 +59,7 @@ Page({
id: App.globalData.pointInfo[5].id,
name: '原味舒食',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-3-1.png',
logo: App.globalData.appResourcesBase + 'shop/logo-6.png',
logo: App.globalData.appResourcesBase + 'shop/logo-6-2.png',
shopType: '5'
}, {
appId: 4,
......
project.config.json deleted 100644 → 0
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": false,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"compileType": "miniprogram",
"libVersion": "2.10.0",
"appid": "wx37a9b7a3d92029f2",
"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
"cloudfunctionTemplateRoot": "",
"watchOptions": {
"ignore": []
},
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": [
{
"id": -1,
"name": "pages/commodity/menu-food/menu-food",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/home/home",
"pathName": "pages/play/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/service-detail/service-detail",
"pathName": "pages/play/service-detail/service-detail",
"query": "id=1&type=4",
"scene": null
},
{
"id": -1,
"name": "pages/mine/home/home",
"pathName": "pages/mine/home/home",
"query": "",
"scene": null
}
]
}
}
}
\ No newline at end of file
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