Skip to content

严立 / mini-shimao

Go to a project
Commit 3dcf0e94 by 严立
Options

LL - UI 问题修复

parent ed0c0804
Inline Side-by-side
Showing with 118 additions and 42 deletions
pages/pay/order-input/order-input.js
...@@ -93,6 +93,8 @@ Page({ ...@@ -93,6 +93,8 @@ Page({
onLoad: function (options) { onLoad: function (options) {
if (options.type) options.type = Number(options.type) if (options.type) options.type = Number(options.type)
console.log(options.type)
logicData.option = options logicData.option = options
this.setShopInfo() this.setShopInfo()
...@@ -469,6 +471,11 @@ Page({ ...@@ -469,6 +471,11 @@ Page({
} }
} }
console.log(funcTimetable)
console.log(funcDate)
console.log(funcTimeBegin)
console.log(funcTimeEnd)
this.setData({ this.setData({
buyContentTime: funcDate + ' ' + funcTimeBegin + ' - ' + funcTimeEnd buyContentTime: funcDate + ' ' + funcTimeBegin + ' - ' + funcTimeEnd
}) })
...@@ -748,7 +755,6 @@ Page({ ...@@ -748,7 +755,6 @@ Page({
if (this.data.quantity >= this.data.quantityMax) { if (this.data.quantity >= this.data.quantityMax) {
// 针对不同商品类型订制提示语 // 针对不同商品类型订制提示语
let funcErrorMessage = '' let funcErrorMessage = ''
console.log('logicData.option.type', logicData.option.type)
switch (logicData.option.type) { switch (logicData.option.type) {
case 6: case 6:
case 7: case 7:
......
pages/play/movie/movie.js
...@@ -30,9 +30,14 @@ Page({ ...@@ -30,9 +30,14 @@ Page({
navigationScroll: 0, navigationScroll: 0,
statusActive: 0, statusActive: 0,
statusList: [ statusList: [{
{ 'id': 0, 'name': '今日放映' }, 'id': 0,
{ 'id': 1, 'name': '全部热映' }, 'name': '今日放映'
},
{
'id': 1,
'name': '全部热映'
},
], ],
// 今日热映 // 今日热映
...@@ -49,11 +54,11 @@ Page({ ...@@ -49,11 +54,11 @@ Page({
} }
} }
}, },
onLoad: function () { onLoad: function() {
this.getTodayFilm() this.getTodayFilm()
this.getAllFilm() this.getAllFilm()
}, },
onPageScroll: function (funcEvent) { onPageScroll: function(funcEvent) {
// console.log(funcEvent) // console.log(funcEvent)
// 优化滚动事件触发频率 // 优化滚动事件触发频率
if (logicData.pageScrollLock) return if (logicData.pageScrollLock) return
...@@ -64,7 +69,7 @@ Page({ ...@@ -64,7 +69,7 @@ Page({
}) })
// 恢复滚动事件 // 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () { logicData.pageScrollTimer = setTimeout(function() {
logicData.pageScrollLock = false logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer) clearTimeout(logicData.pageScrollTimer)
}, 10) }, 10)
...@@ -75,7 +80,7 @@ Page({ ...@@ -75,7 +80,7 @@ Page({
* @param * @param
* @returns * @returns
*/ */
getTodayFilm: function () { getTodayFilm: function() {
App.wxRequest({ App.wxRequest({
url: '/api/v1/film/getTodayFilm', url: '/api/v1/film/getTodayFilm',
data: { data: {
...@@ -120,7 +125,7 @@ Page({ ...@@ -120,7 +125,7 @@ Page({
* @param * @param
* @returns * @returns
*/ */
getAllFilm: function () { getAllFilm: function() {
// weekType: 0本周热映 1下周 // weekType: 0本周热映 1下周
let movieWeek = [] let movieWeek = []
let movieNextWeek = [] let movieNextWeek = []
...@@ -206,7 +211,7 @@ Page({ ...@@ -206,7 +211,7 @@ Page({
}, },
// 切换今日放映 全部热映 // 切换今日放映 全部热映
onSelectionStatus: function (event) { onSelectionStatus: function(event) {
let statusActive = Number(event.currentTarget.dataset.type) let statusActive = Number(event.currentTarget.dataset.type)
if (statusActive === 0) { if (statusActive === 0) {
this.getTodayFilm() this.getTodayFilm()
...@@ -218,14 +223,14 @@ Page({ ...@@ -218,14 +223,14 @@ Page({
}) })
}, },
// 跳转到电影详情页面 // 跳转到电影详情页面
onToMovieDetail: function (event) { onToMovieDetail: function(event) {
let movieId = event.currentTarget.dataset.movieid let movieId = event.currentTarget.dataset.movieid
wx.navigateTo({ wx.navigateTo({
url: '/pages/play/movie-detail/movie-detail?id=' + movieId, url: '/pages/play/movie-detail/movie-detail?id=' + movieId,
}) })
}, },
// 跳转到报名页面 // 跳转到报名页面
onReportMovie: function (event) { onReportMovie: function(event) {
let funcItem = event.currentTarget.dataset.item let funcItem = event.currentTarget.dataset.item
let funcMovieInfo = { let funcMovieInfo = {
'id': funcItem.activityId, // 活动 id 'id': funcItem.activityId, // 活动 id
......
pages/play/service-detail/service-detail.js
...@@ -582,26 +582,6 @@ Page({ ...@@ -582,26 +582,6 @@ Page({
'content': funcResponse.list[i].content, 'content': funcResponse.list[i].content,
'isMore': false, 'isMore': false,
} }
// funcItem = {
// 'isMore': false,
// 'star': 4,
// 'scoreService': 3,
// 'scoreCommodity': 2,
// 'scoreEnvironmental': 1,
// 'userName': '用户名称',
// 'userAvatar': 'https://gss3.bdstatic.com/84oSdTum2Q5BphGlnYG/timg?wapp&quality=80&size=b150_150&subsize=20480&cut_x=0&cut_w=0&cut_y=0&cut_h=0&sec=1369815402&srctrace&di=6a992d9158ef2273c2e9d0a77fbbbe88&wh_rate=null&src=http%3A%2F%2Ftiebapic.baidu.com%2Fforum%2Fpic%2Fitem%2F4d086e061d950a7be03653981dd162d9f2d3c96f.jpg',
// 'userType': 0,
// 'userAlbum': [
// 'https://dss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=975216563,2695721503&fm=111&gp=0.jpg',
// 'https://dss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2856846879,389279115&fm=26&gp=0.jpg',
// 'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
// 'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
// 'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
// ],
// 'date': '2020.02.09',
// 'content': '/sd12i301!@(#*)(#Updjs',
// }
funcItem.star = Math.floor((funcItem.scoreService + funcItem.scoreCommodity + funcItem.scoreEnvironmental) / 3) funcItem.star = Math.floor((funcItem.scoreService + funcItem.scoreCommodity + funcItem.scoreEnvironmental) / 3)
funcList.push(funcItem) funcList.push(funcItem)
} }
...@@ -636,16 +616,6 @@ Page({ ...@@ -636,16 +616,6 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: '/pages/play/movie-detail/movie-detail?id=' + id, url: '/pages/play/movie-detail/movie-detail?id=' + id,
}) })
// // 补充必要参数
// funcCommodityInfo.quantity = 1
// funcCommodityInfo.quantityMin = 1
// funcCommodityInfo.quantityMax = 1
// funcCommodityInfo.isActive = true
// wx.setStorageSync('shoppingCartBuffer', [funcCommodityInfo])
// wx.navigateTo({
// url: '/pages/pay/order-input/order-input?type=' + funcCommodityInfo.typeId
// })
}, },
onLocation: function () { onLocation: function () {
......
project.config.json 0 → 100644
{
"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": {},
"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