Skip to content

严立 / mini-shimao

Go to a project
Commit 38827be9 by 严立
Options

问题修改

parent 4d6c7be7
Inline Side-by-side
Showing with 257 additions and 134 deletions
app.js
...@@ -202,7 +202,7 @@ App({ ...@@ -202,7 +202,7 @@ App({
setUserStatus: function () { setUserStatus: function () {
this.request({ this.request({
url: 'v1/userAuth/getAuth', url: 'v1/userAuth/getAuth',
method: 'GET' method: 'get'
}).then((response) => { }).then((response) => {
let funcData = response.data let funcData = response.data
......
component/m-ui/m-dialog/m-dialog.js
...@@ -58,5 +58,10 @@ Component({ ...@@ -58,5 +58,10 @@ Component({
this.data.success({ input: this.data.inputContent }) this.data.success({ input: this.data.inputContent })
App.ui.hideDialog() App.ui.hideDialog()
}, },
onOpenSetting: function (event) {
this.data.success(event)
App.ui.hideDialog()
},
} }
}) })
component/m-ui/m-dialog/m-dialog.wxml
...@@ -44,6 +44,23 @@ ...@@ -44,6 +44,23 @@
</block> </block>
<!-- 对话框 - 标题和内容，取消确定按钮 --> <!-- 对话框 - 标题和内容，取消确定按钮 -->
<block wx:if="{{type === 'openSetting'}}">
<view class="container-dialog column cb">
<view class="dialog-title row cc ac">
<text class="regular">{{title}}</text>
</view>
<view class="dialog-content row cc">
<text class="fs30 c31">{{content}}</text>
</view>
<view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac fs30 c31" bindtap="onCancel">{{cancel}}</button>
<view class="dialog-operation-line row cc ac border-base"></view>
<button class="dialog-operation-confirm row cc ac" open-type="openSetting" bindopensetting="onOpenSetting">{{confirm}}</button>
</view>
</view>
</block>
<!-- 对话框 - 标题和内容，取消确定按钮 -->
<block wx:if="{{type === 'input'}}"> <block wx:if="{{type === 'input'}}">
<view class="container-dialog column cb"> <view class="container-dialog column cb">
<view class="dialog-title row cc ac"> <view class="dialog-title row cc ac">
......
component/m-ui/m-image-picker/m-image-picker.js
...@@ -44,7 +44,6 @@ Component({ ...@@ -44,7 +44,6 @@ Component({
funcErrorImage.push(funcImageList[i]) funcErrorImage.push(funcImageList[i])
} }
} }
return { 'passImage': funcPassImage, 'errorImage': funcErrorImage } return { 'passImage': funcPassImage, 'errorImage': funcErrorImage }
}, },
...@@ -61,7 +60,6 @@ Component({ ...@@ -61,7 +60,6 @@ Component({
funcErrorImage.push(funcImageList[i]) funcErrorImage.push(funcImageList[i])
} }
} }
return { 'passImage': funcPassImage, 'errorImage': funcErrorImage } return { 'passImage': funcPassImage, 'errorImage': funcErrorImage }
}, },
...@@ -82,7 +80,7 @@ Component({ ...@@ -82,7 +80,7 @@ Component({
let funcList = [] let funcList = []
for (let i = 0, l = funcFileList.length; i < l; i++) { for (let i = 0, l = funcFileList.length; i < l; i++) {
funcList.push({ funcList.push({
'id': i, 'id': 'index' + i + 'time' + new Date().getTime().toString(),
'path': funcFileList[i].path, 'path': funcFileList[i].path,
'size': funcFileList[i].size, 'size': funcFileList[i].size,
}) })
......
component/m-ui/m-image-picker/m-image-picker.wxml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</view> </view>
</view> </view>
</block> </block>
<view class="image-picker-selection column cc ac" bindtap="onSelectionImage"> <view class="image-picker-selection column cc ac" wx:if="{{selectionImageList.length < maxSelection}}" bindtap="onSelectionImage">
<image class="image-picker-selection-icon" src="./image/camera.png"></image> <image class="image-picker-selection-icon" src="./image/camera.png"></image>
<text class="image-picker-selection-tip">添加图片</text> <text class="image-picker-selection-tip">添加图片</text>
</view> </view>
......
component/m-ui/m-init.js
...@@ -12,16 +12,18 @@ function showToast (funcOption) { ...@@ -12,16 +12,18 @@ function showToast (funcOption) {
return return
} }
// 如果传参包含 duration 数值，使用该数值。 // 如果重复调用 showToast 则重置计时器
// 删除该属性是为了不污染 toast 实例中的默认值。 clearTimeout(App.ui.toastTimer)
// funcOption 配置中的 duration 拥有最高优先级。
// 其次 loading 类型的 duration 默认值为 30s
// 最后常规类型的 duration 默认值为 3s
let funcToastDuration = App.ui.toast.data.duration let funcToastDuration = App.ui.toast.data.duration
if (funcOption.duration) { if (funcOption.iconType === 'loading') funcToastDuration = 30000
funcToastDuration = funcOption.duration if (funcOption.duration) funcToastDuration = funcOption.duration
// 设置 loading 默认时间为 30s
if (App.ui.toast.data.iconType === 'loading') funcToastDuration = 30000
delete funcOption.duration
}
// 删除该属性是为了不污染 toast 实例中的默认值。
delete funcOption.duration
funcOption = Object.assign(App.ui.toast.data, funcOption) funcOption = Object.assign(App.ui.toast.data, funcOption)
funcOption.winToast = true funcOption.winToast = true
App.ui.toast.setData(funcOption) App.ui.toast.setData(funcOption)
...@@ -30,6 +32,7 @@ function showToast (funcOption) { ...@@ -30,6 +32,7 @@ function showToast (funcOption) {
App.ui.toastTimer = setTimeout(() => { App.ui.toastTimer = setTimeout(() => {
App.ui.toast.data.ending() App.ui.toast.data.ending()
App.ui.hideToast() App.ui.hideToast()
App.ui.toast.setData({ ending: () => {} })
}, funcToastDuration) }, funcToastDuration)
} }
......
environmental.js
...@@ -23,14 +23,14 @@ let Development = { ...@@ -23,14 +23,14 @@ let Development = {
{ appId: 0, id: '2da1a0cd375447f6b7e51d06b11b5300', logo: 'shop/logo-0.png', commodityLogo: '', cover: 'shop/cover-0.png', printUse: '', print: '', name: '世茂碧海银湖', title: ['碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖'] }, { appId: 0, id: '2da1a0cd375447f6b7e51d06b11b5300', logo: 'shop/logo-0.png', commodityLogo: '', cover: 'shop/cover-0.png', printUse: '', print: '', name: '世茂碧海银湖', title: ['碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖', '碧海银湖'] },
// 普通门店 // 普通门店
{ appId: 1, id: '581be62a80bb4f0485abd87abcf64dc0', logo: 'shop/logo-1.png', commodityLogo: 'shop/commodity-logo-1.png', cover: 'shop/cover-1.png', printUse: 'shop/print/print-1-1.png', print: 'shop/print/print-1-2.png', name: '海错图', title: ['海错图', '海错图购票', '海错图', '海错图文创店', '海错图', '海错图', '海错图'] }, { appId: 1, id: '581be62a80bb4f0485abd87abcf64dc0', logo: 'shop/logo-1.png', commodityLogo: 'shop/commodity-logo-1.png', cover: 'shop/cover-1.png', printUse: 'shop/print/print-1.png', print: 'shop/print/print-1.png', name: '海错图', title: ['海错图', '海错图购票', '海错图', '海错图文创店', '海错图', '海错图', '海错图'] },
{ appId: 2, id: '3cfe2e3b8b4342e8b62f8b45daf60d91', logo: 'shop/logo-2.png', commodityLogo: 'shop/commodity-logo-2.png', cover: 'shop/cover-2.png', printUse: 'shop/print/print-2-1.png', print: 'shop/print/print-2-2.png', name: '星空影院', title: ['星空影院', '星空影院', '星空影院', '星空影院', '星空影院', '星空影院', '星空影院'] }, { appId: 2, id: '3cfe2e3b8b4342e8b62f8b45daf60d91', logo: 'shop/logo-2.png', commodityLogo: 'shop/commodity-logo-2.png', cover: 'shop/cover-2.png', printUse: 'shop/print/print-2.png', print: 'shop/print/print-2.png', name: '星空影院', title: ['星空影院', '星空影院', '星空影院', '星空影院', '星空影院', '星空影院', '星空影院'] },
{ appId: 3, id: '8a3e59c57f564c569b3d7bb278ea50b3', logo: 'shop/logo-3.png', commodityLogo: 'shop/commodity-logo-3.png', cover: 'shop/cover-3.png', printUse: 'shop/print/print-3-1.png', print: 'shop/print/print-3-2.png', name: '儿童营地', title: ['儿童营地', '儿童营地入园购票', '儿童营地', '儿童营地', '儿童营地', '儿童营地接待区', '儿童营地'] }, { appId: 3, id: '8a3e59c57f564c569b3d7bb278ea50b3', logo: 'shop/logo-3.png', commodityLogo: 'shop/commodity-logo-3.png', cover: 'shop/cover-3.png', printUse: 'shop/print/print-3.png', print: 'shop/print/print-3.png', name: '儿童营地', title: ['儿童营地', '儿童营地入园购票', '儿童营地', '儿童营地', '儿童营地', '儿童营地接待区', '儿童营地'] },
{ appId: 4, id: 'c63893bb472f43bca4ec72f890bcb4fd', logo: 'shop/logo-4.png', commodityLogo: 'shop/commodity-logo-4.png', cover: 'shop/cover-4.png', printUse: 'shop/print/print-4-1.png', print: 'shop/print/print-4-2.png', name: '原野MOJITO', title: ['原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO'] }, { appId: 4, id: 'c63893bb472f43bca4ec72f890bcb4fd', logo: 'shop/logo-4.png', commodityLogo: 'shop/commodity-logo-4.png', cover: 'shop/cover-4.png', printUse: 'shop/print/print-4.png', print: 'shop/print/print-4.png', name: '原野MOJITO', title: ['原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO', '原野MOJITO'] },
{ appId: 5, id: '26c40446fc454a02abe61758176597f6', logo: 'shop/logo-5.png', commodityLogo: 'shop/commodity-logo-5.png', cover: 'shop/cover-5.png', printUse: 'shop/print/print-5-1.png', print: 'shop/print/print-5-2.png', name: '拾光花坊', title: ['拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊'] }, { appId: 5, id: '26c40446fc454a02abe61758176597f6', logo: 'shop/logo-5.png', commodityLogo: 'shop/commodity-logo-5.png', cover: 'shop/cover-5.png', printUse: 'shop/print/print-5.png', print: 'shop/print/print-5.png', name: '拾光花坊', title: ['拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊', '拾光花坊'] },
{ appId: 6, id: 'd9436d7018de43809824b6ec221ea01f', logo: 'shop/logo-6.png', commodityLogo: 'shop/commodity-logo-6.png', cover: 'shop/cover-6.png', printUse: 'shop/print/print-6-1.png', print: 'shop/print/print-6-2.png', name: '原味舒食', title: ['原味舒食', '原味舒食', '原味舒食', '原味舒食', '原味舒食', '原味舒食', '原味舒食'] }, { appId: 6, id: 'd9436d7018de43809824b6ec221ea01f', logo: 'shop/logo-6.png', commodityLogo: 'shop/commodity-logo-6.png', cover: 'shop/cover-6.png', printUse: 'shop/print/print-6.png', print: 'shop/print/print-6.png', name: '原味舒食', title: ['原味舒食', '原味舒食', '原味舒食', '原味舒食', '原味舒食', '原味舒食', '原味舒食'] },
{ appId: 7, id: '2614f117406548718bc091f24368c16e', logo: 'shop/logo-7.png', commodityLogo: 'shop/commodity-logo-7.png', cover: 'shop/cover-7.png', printUse: 'shop/print/print-7-1.png', print: 'shop/print/print-7-2.png', name: '元养水韵SPA', title: ['元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA'] }, { appId: 7, id: '2614f117406548718bc091f24368c16e', logo: 'shop/logo-7.png', commodityLogo: 'shop/commodity-logo-7.png', cover: 'shop/cover-7.png', printUse: 'shop/print/print-7.png', print: 'shop/print/print-7.png', name: '元养水韵SPA', title: ['元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA', '元养水韵SPA'] },
{ appId: 8, id: '2614f117406548718bc091f24368c16e', logo: 'shop/logo-7.png', commodityLogo: 'shop/commodity-logo-7.png', cover: 'shop/cover-7.png', printUse: 'shop/print/print-8-1.png', print: 'shop/print/print-8-2.png', name: '星光广场', title: ['星光广场', '星光广场', '星光广场', '星光广场', '星光广场', '星光广场', '星光广场'] }, { appId: 8, id: '2614f117406548718bc091f24368c16e', logo: 'shop/logo-7.png', commodityLogo: 'shop/commodity-logo-7.png', cover: 'shop/cover-7.png', printUse: 'shop/print/print-8.png', print: 'shop/print/print-8.png', name: '星光广场', title: ['星光广场', '星光广场', '星光广场', '星光广场', '星光广场', '星光广场', '星光广场'] },
] ]
} }
......
pages/campsite/evaluate/evaluate.js
...@@ -9,6 +9,10 @@ Page({ ...@@ -9,6 +9,10 @@ Page({
officeEnvironmental: 0, officeEnvironmental: 0,
officeEnvironmentalText: '5.0', // 门店环境评分 officeEnvironmentalText: '5.0', // 门店环境评分
detailEvaluate: [], detailEvaluate: [],
evaluateAlbum: [],
evaluateAlbumActive: 0,
winEvaluateAlbum: false,
}, },
onLoad: function (options) { onLoad: function (options) {
...@@ -104,6 +108,35 @@ Page({ ...@@ -104,6 +108,35 @@ Page({
}, },
/** /**
* 评论查看相册
* @function
* @param
* @returns
*/
onEvaluateAlbum: function(event) {
let funcItem = event.currentTarget.dataset.item
let funcIndex = event.currentTarget.dataset.index
this.setData({
evaluateAlbum: funcItem.userAlbum,
evaluateAlbumActive: funcIndex,
winEvaluateAlbum: true
})
},
/**
* 评论相册隐藏
* @function
* @param
* @returns
*/
onHiddenEvaluateAlbum: function() {
this.setData({
winEvaluateAlbum: false
})
},
/**
* 页面滚动事件 * 页面滚动事件
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
......
pages/campsite/evaluate/evaluate.wxml
...@@ -62,4 +62,15 @@ ...@@ -62,4 +62,15 @@
</view> </view>
</block> </block>
</view> </view>
</view>
<!-- 查看相册 -->
<view class="full-screen-album" wx:if="{{winEvaluateAlbum}}" bindtap="onHiddenEvaluateAlbum">
<swiper circular current="{{evaluateAlbumActive}}" class="full-screen-album-swiper" duration="500">
<block wx:for="{{evaluateAlbum}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="album-item row cc ac">
<image class="album-image" src="{{item}}" mode="aspectFit"></image>
</swiper-item>
</block>
</swiper>
</view> </view>
\ No newline at end of file
pages/campsite/evaluate/evaluate.wxss
...@@ -204,4 +204,43 @@ ...@@ -204,4 +204,43 @@
font-weight: 400; font-weight: 400;
line-height: 52rpx; line-height: 52rpx;
color: #fff; color: #fff;
}
/* 评论相册样式 */
.full-screen-album {
z-index: 7;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #000;
}
.full-screen-album-swiper, .album-item {
width: 750rpx;
height: 100%;
}
.album-image {
width: 750rpx;
min-height: 100%;
}
.detail-price-special {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4rpx;
background: linear-gradient(180deg, #3f4357 0%, #252532 100%);
text-align: center;
font-size: 18rpx;
font-weight: 500;
line-height: 32rpx;
color: #e8d0af;
}
.color-white {
color: #fff !important;
} }
\ No newline at end of file
pages/club/create/create.js
...@@ -58,7 +58,6 @@ Page({ ...@@ -58,7 +58,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在提交', title: '正在提交',
duration: 30000
}) })
let funcPass = true let funcPass = true
......
pages/club/home/home.js
...@@ -259,6 +259,7 @@ Page({ ...@@ -259,6 +259,7 @@ Page({
* @returns * @returns
*/ */
onReachBottom: function () { onReachBottom: function () {
if (this.data.clubInfoList.length === 0) return
this.setData({ this.setData({
pageIndex: this.data.pageIndex + 1 pageIndex: this.data.pageIndex + 1
}) })
......
pages/commodity/menu-food/menu-food.js
...@@ -193,7 +193,6 @@ Page({ ...@@ -193,7 +193,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '加载中', title: '加载中',
duration: 30000
}) })
App.request({ App.request({
url: 'v1/commodity/getCommoditys', url: 'v1/commodity/getCommoditys',
......
pages/commodity/project-detail/project-detail.js
...@@ -315,7 +315,7 @@ Page({ ...@@ -315,7 +315,7 @@ Page({
onBuy: function (event) { onBuy: function (event) {
// 测试 // 测试
// 正式环境临时隐藏儿童营地 // 正式环境临时隐藏儿童营地
// if (this.data.shopInfo.appId === 3) return if (this.data.shopInfo.appId === 3) return
if (this.data.shopInfo.appId === 7) { if (this.data.shopInfo.appId === 7) {
this.onCommodityDetail(event) this.onCommodityDetail(event)
......
pages/commodity/room-appointment/room-appointment.js
...@@ -29,7 +29,7 @@ Page({ ...@@ -29,7 +29,7 @@ Page({
onLoad: function (options) { onLoad: function (options) {
this.setData({ this.setData({
frompage: options.frompage, frompage: options.frompage,
optionsTab: options.tab optionsTab: 'scanHouse'
}) })
this.setReset() this.setReset()
}, },
...@@ -194,7 +194,6 @@ Page({ ...@@ -194,7 +194,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '提交中', title: '提交中',
duration: 60000,
}) })
App.request({ App.request({
......
pages/commodity/shopping-cart/shopping-cart.js
...@@ -258,7 +258,6 @@ Page({ ...@@ -258,7 +258,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
title: '请选购商品后结算', title: '请选购商品后结算',
duration: 30000
}) })
return return
} }
......
pages/home/dynamic/dynamic.js
...@@ -71,7 +71,6 @@ Page({ ...@@ -71,7 +71,6 @@ Page({
}, },
onReachBottom: function () { onReachBottom: function () {
console.log('触底啦')
if (this.data.loading || !this.data.moreData) { if (this.data.loading || !this.data.moreData) {
return return
} }
......
pages/home/guide/guide.js
...@@ -86,8 +86,6 @@ Page({ ...@@ -86,8 +86,6 @@ Page({
this.setData({ this.setData({
arrowCss: JSON.stringify(funcArrowCss).replace(/[{",}]/g, '') arrowCss: JSON.stringify(funcArrowCss).replace(/[{",}]/g, '')
}) })
console.log(funcArrowCss)
}, },
setPointCss: function (funcProportion) { setPointCss: function (funcProportion) {
...@@ -152,7 +150,6 @@ Page({ ...@@ -152,7 +150,6 @@ Page({
const funcQuery = wx.createSelectorQuery() const funcQuery = wx.createSelectorQuery()
funcQuery.select('#guide-map').boundingClientRect() funcQuery.select('#guide-map').boundingClientRect()
funcQuery.exec((result) => { funcQuery.exec((result) => {
console.log(result)
this.setData({ this.setData({
selectionPoint: result[0].width * 0.2 selectionPoint: result[0].width * 0.2
}) })
...@@ -243,9 +240,7 @@ Page({ ...@@ -243,9 +240,7 @@ Page({
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) {
console.log('point', funcPointInfo[i].detail)
wx.navigateTo({ wx.navigateTo({
url: funcPointInfo[i].detail url: funcPointInfo[i].detail
}) })
...@@ -268,6 +263,44 @@ Page({ ...@@ -268,6 +263,44 @@ Page({
}, },
onSaveMap: function () { onSaveMap: function () {
this.inspectAlbumAuthority()
},
inspectAlbumAuthority: function () {
wx.getSetting({
success: (response) => {
if (response.authSetting['scope.writePhotosAlbum'] || response.authSetting['scope.writePhotosAlbum'] === undefined) {
this.onSaveMapConfirm()
}
if (response.authSetting['scope.writePhotosAlbum'] === false) {
App.ui.showDialog({
type: 'openSetting',
title: '授权相册权限？',
content: '用于保存完成地图',
cancel: '取消',
confirm: '打开授权',
success: (response) => {
if (response.detail.authSetting['scope.writePhotosAlbum']) {
this.downloadMap()
}
if (response.detail.authSetting['scope.writePhotosAlbum'] === false) {
App.ui.showToast({
iconType: 'error',
title: '授权失败',
})
}
},
fail: (response) => {
console.log('fail')
},
})
}
}
})
},
onSaveMapConfirm: function () {
if (this.data.isSave) { if (this.data.isSave) {
App.ui.showToast({ App.ui.showToast({
iconType: 'success', iconType: 'success',
...@@ -283,8 +316,7 @@ Page({ ...@@ -283,8 +316,7 @@ Page({
cancel: '取消', cancel: '取消',
confirm: '保存', confirm: '保存',
success: () => { success: () => {
console.log('success') this.downloadMap()
this.onSaveMapConfirm()
}, },
fail: () => { fail: () => {
console.log('fail') console.log('fail')
...@@ -292,17 +324,15 @@ Page({ ...@@ -292,17 +324,15 @@ Page({
}) })
}, },
onSaveMapConfirm: function () { downloadMap: function () {
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在下载...', title: '正在下载...',
duration: 20000,
}) })
wx.downloadFile({ wx.downloadFile({
url: App.globalData.appResourcesBase + 'guide/save-guide.png', url: App.globalData.appResourcesBase + 'guide/save-guide.png',
success: (result) => { success: (result) => {
console.log(result)
wx.saveImageToPhotosAlbum({ wx.saveImageToPhotosAlbum({
filePath: result.tempFilePath, filePath: result.tempFilePath,
success: (result) => { success: (result) => {
...@@ -317,7 +347,7 @@ Page({ ...@@ -317,7 +347,7 @@ Page({
fail: (error) => { fail: (error) => {
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
title: '地图已保存失败', title: '地图保存失败',
}) })
} }
}) })
......
pages/home/night-appointment/night-appointment.js
...@@ -26,7 +26,7 @@ Page({ ...@@ -26,7 +26,7 @@ Page({
onLoad: function (options) { onLoad: function (options) {
this.setData({ this.setData({
frompage: options.frompage, frompage: options.frompage,
optionsTab: options.tab optionsTab: 'garden'
}) })
this.setReset() this.setReset()
}, },
...@@ -244,6 +244,7 @@ Page({ ...@@ -244,6 +244,7 @@ Page({
}, },
onAppointmentComplete: function () { onAppointmentComplete: function () {
console.log('onAppointmentComplete', this.data.optionsTab)
this.setData({ this.setData({
appointmentComplete: false, appointmentComplete: false,
}) })
......
pages/mall/exchange-record/exchange-record.js
...@@ -93,7 +93,6 @@ Page({ ...@@ -93,7 +93,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
...@@ -135,7 +134,6 @@ Page({ ...@@ -135,7 +134,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
...@@ -171,6 +169,7 @@ Page({ ...@@ -171,6 +169,7 @@ Page({
* @returns * @returns
*/ */
onReachBottom: function () { onReachBottom: function () {
if (this.data.recordList.length === 0) return
this.setData({ this.setData({
pageIndex: this.data.pageIndex + 1 pageIndex: this.data.pageIndex + 1
}) })
......
pages/mall/exchange-state/exchange-state.js
...@@ -49,7 +49,6 @@ Page({ ...@@ -49,7 +49,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在获取', title: '正在获取',
duration: 30000
}) })
App.request({ App.request({
...@@ -282,7 +281,6 @@ Page({ ...@@ -282,7 +281,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
...@@ -325,7 +323,6 @@ Page({ ...@@ -325,7 +323,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
......
pages/mall/exchange-state/exchange-state.wxss
...@@ -35,14 +35,15 @@ ...@@ -35,14 +35,15 @@
position: relative; position: relative;
width: 670rpx; width: 670rpx;
margin: 60rpx 0 0 0; margin: 60rpx 0 0 0;
overflow: hidden;
} }
.coupon_seal { .coupon_seal {
z-index: 4; z-index: 4;
position: absolute; position: absolute;
top: 180rpx; top: 180rpx;
right: 0; right: -32rpx;
width: 166rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
} }
...@@ -85,6 +86,7 @@ ...@@ -85,6 +86,7 @@
.coupon_code_point_left, .coupon_code_point_left,
.coupon_code_point_right { .coupon_code_point_right {
z-index: 4;
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; border-radius: 50%;
......
pages/mine/accumulate/accumulate.js
...@@ -42,7 +42,6 @@ Page({ ...@@ -42,7 +42,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '加载中', title: '加载中',
duration: 30000
}) })
App.request({ App.request({
url: 'v1/smUser/getIntegralDetails', url: 'v1/smUser/getIntegralDetails',
......
pages/mine/address-list/address-list.js
...@@ -91,7 +91,6 @@ Page({ ...@@ -91,7 +91,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
title: response.message, title: response.message,
duration: 3000
}) })
}) })
} }
......
pages/mine/address-operate/address-operate.js
...@@ -53,7 +53,6 @@ Page({ ...@@ -53,7 +53,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
title: response.message, title: response.message,
duration: 3000
}) })
}) })
}, },
...@@ -201,7 +200,6 @@ Page({ ...@@ -201,7 +200,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '处理中', 'title': '处理中',
'duration': 30000
}) })
App.request({ App.request({
url: 'v3/shippingAddress/del', url: 'v3/shippingAddress/del',
......
pages/mine/appointment-detail/appointment-detail.js
...@@ -241,17 +241,20 @@ Page({ ...@@ -241,17 +241,20 @@ Page({
params: {}, params: {},
}) })
.then((response) => { .then((response) => {
wx.emit({ event: { type: 'onReload', receivePage: 'pages/mine/appointment/appointment' } })
App.ui.showToast({ App.ui.showToast({
'iconType': 'success', 'iconType': 'success',
'title': '退款申请已提交' 'title': '退款申请已提交',
}) ending: () => {
wx.emit({ this.queryOrderDetail()
event: {
type: 'onReload',
receivePage: 'pages/mine/appointment/appointment',
} }
}) })
this.queryOrderDetail() })
.catch((response) => {
App.ui.showToast({
'iconType': 'error',
'title': response.message
})
}) })
}, },
fail: () => {}, fail: () => {},
......
pages/mine/appointment-ticket/appointment-ticket.js
...@@ -15,10 +15,7 @@ Page({ ...@@ -15,10 +15,7 @@ Page({
let detail = JSON.parse(options.detail) let detail = JSON.parse(options.detail)
console.log('onLoad') console.log('onLoad')
console.log(detail) console.log(detail)
let yyDate = detail.subscribeDate ? Date.parse(detail.subscribeDate.replace(/-/g, '/')) : 0
let nowStr = new Date().toLocaleString().substr(0, 10).replace(/-/g, '/') + " 00:00:00"
let now = Date.parse(nowStr)
this.setData({ this.setData({
tickerInfo: detail, tickerInfo: detail,
type: detail.type, type: detail.type,
...@@ -55,7 +52,6 @@ Page({ ...@@ -55,7 +52,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '处理中', 'title': '处理中',
'duration': 60000
}) })
this.setData({ this.setData({
......
pages/mine/appointment/appointment.js
...@@ -58,7 +58,6 @@ Page({ ...@@ -58,7 +58,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '加载中', 'title': '加载中',
'duration': 30000,
}) })
App.request({ App.request({
url: 'v1/activity/getMyActivityList', url: 'v1/activity/getMyActivityList',
...@@ -217,9 +216,11 @@ Page({ ...@@ -217,9 +216,11 @@ Page({
.then((response) => { .then((response) => {
App.ui.showToast({ App.ui.showToast({
'iconType': 'success', 'iconType': 'success',
'title': '退款申请已提交' 'title': '退款申请已提交',
ending: () => {
this.onReload()
}
}) })
this.onReload()
}) })
.catch((response) => { .catch((response) => {
App.ui.showToast({ App.ui.showToast({
...@@ -327,7 +328,6 @@ Page({ ...@@ -327,7 +328,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '处理中', 'title': '处理中',
'duration': 60000,
}) })
this.setData({ this.setData({
isDoing: true isDoing: true
...@@ -379,7 +379,6 @@ Page({ ...@@ -379,7 +379,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '处理中', 'title': '处理中',
'duration': 60000,
}) })
this.setData({ this.setData({
...@@ -431,6 +430,7 @@ Page({ ...@@ -431,6 +430,7 @@ Page({
// 触底加载 // 触底加载
onReachBottom: function () { onReachBottom: function () {
if (this.data.activityList.length === 0) return
this.setData({ this.setData({
pageNo: this.data.pageNo + 1 pageNo: this.data.pageNo + 1
}) })
......
pages/mine/authentication-input/authentication-input.js
...@@ -94,7 +94,7 @@ Page({ ...@@ -94,7 +94,7 @@ Page({
getAuth() { getAuth() {
App.request({ App.request({
url: 'v1/userAuth/getAuth', url: 'v1/userAuth/getAuth',
method: 'GET', method: 'get',
params: {}, params: {},
}) })
.then((response) => { .then((response) => {
...@@ -148,7 +148,6 @@ Page({ ...@@ -148,7 +148,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '提交中', title: '提交中',
duration: 60000
}) })
App.request({ App.request({
......
pages/mine/card/card.js
...@@ -45,7 +45,6 @@ Page({ ...@@ -45,7 +45,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '加载中', 'title': '加载中',
'duration': 60000
}) })
App.request({ App.request({
url: 'v1/volume/getVolumeList', url: 'v1/volume/getVolumeList',
......
pages/mine/club-manage/club-manage.js
...@@ -217,7 +217,7 @@ Page({ ...@@ -217,7 +217,7 @@ Page({
}) })
this.queryExamine() this.queryExamine()
this.queryStatistics() this.queryStatistics()
wx.setStorageSync('tempOptions', 'clubRefresh') wx.emit({ event: { type: 'onReload', receivePage: 'pages/mine/club/club' }})
}).catch((response) => { }).catch((response) => {
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
......
pages/mine/club/club.js
...@@ -27,7 +27,6 @@ Page({ ...@@ -27,7 +27,6 @@ Page({
}, },
onReload: function () { onReload: function () {
console.log('onReload')
this.setData({ pageIndex: 1 }) this.setData({ pageIndex: 1 })
this.queryClubAuditTotal() this.queryClubAuditTotal()
if (this.data.segmentIndex === 0) { if (this.data.segmentIndex === 0) {
...@@ -152,7 +151,6 @@ Page({ ...@@ -152,7 +151,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
...@@ -193,7 +191,6 @@ Page({ ...@@ -193,7 +191,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
...@@ -234,7 +231,6 @@ Page({ ...@@ -234,7 +231,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
...@@ -275,7 +271,6 @@ Page({ ...@@ -275,7 +271,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在处理', title: '正在处理',
duration: 30000
}) })
App.request({ App.request({
......
pages/mine/home/home.js
...@@ -74,8 +74,6 @@ Page({ ...@@ -74,8 +74,6 @@ Page({
} }
], ],
appointmentList: [], appointmentList: [],
appointmentActivityListBuffer: [], // 活动预约列表缓存，页面不渲染此数组。
appointmentOtherListBuffer: [], // 其他预约列表，页面不渲染此数组。
isMoreAppointment: false, isMoreAppointment: false,
clubExamine: 0, clubExamine: 0,
...@@ -95,7 +93,6 @@ Page({ ...@@ -95,7 +93,6 @@ Page({
switch (funcOptions) { switch (funcOptions) {
case 'exchange': case 'exchange':
wx.removeStorageSync('tempOptions') wx.removeStorageSync('tempOptions')
break break
} }
}, },
...@@ -103,7 +100,7 @@ Page({ ...@@ -103,7 +100,7 @@ Page({
onShow: function () { onShow: function () {
this.setData({ this.setData({
isMoreOrder: false, isMoreOrder: false,
isMoreActivity: false, isMoreAppointment: false,
}) })
this.setData({ appStatus: App.globalData.appStatus }) this.setData({ appStatus: App.globalData.appStatus })
...@@ -115,7 +112,6 @@ Page({ ...@@ -115,7 +112,6 @@ Page({
this.queryOrder() // 查询订单列表 this.queryOrder() // 查询订单列表
this.queryAppointmentCategory() // 查询预约分类 this.queryAppointmentCategory() // 查询预约分类
this.queryAppointmentActivity() // 查询活动预约 this.queryAppointmentActivity() // 查询活动预约
this.queryAppointmentOther() // 查询其他预约
this.queryClubAuditTotal() // 查询俱乐部审核数量 this.queryClubAuditTotal() // 查询俱乐部审核数量
}, },
...@@ -438,9 +434,10 @@ Page({ ...@@ -438,9 +434,10 @@ Page({
} }
this.setData({ this.setData({
appointmentList: funcList.concat(this.data.appointmentOtherListBuffer), appointmentList: funcList,
appointmentActivityListBuffer: funcList,
}) })
this.queryAppointmentOther() // 查询其他预约
}).catch((response) => { }) }).catch((response) => { })
}, },
...@@ -464,20 +461,20 @@ Page({ ...@@ -464,20 +461,20 @@ Page({
let funcItem = { let funcItem = {
'orderId': funcData[i].id, 'orderId': funcData[i].id,
'enrollId': '', 'enrollId': '',
'name': Number(funcData[i].type), 'name': funcData[i].name,
'cover': '', 'cover': '',
'quantity': '预约人数 ' + funcData[i].subscribeNum + '人', 'quantity': '预约人数 ' + funcData[i].subscribeNum + '人',
'phone': funcData[i].mobile, 'phone': funcData[i].mobile,
'date': funcData[i].subscribeDate, 'date': funcData[i].subscribeDate,
'time': funcData[i].subscribeDate, 'time': funcData[i].subscribeDate,
'cardStyle': 1, 'cardStyle': 1,
'type': Number(funcData[i].type),
} }
funcList.push(funcItem) funcList.push(funcItem)
} }
this.setData({ this.setData({
appointmentList: this.data.appointmentActivityListBuffer.concat(funcList), appointmentList: this.data.appointmentList.concat(funcList),
appointmentOtherListBuffer: funcList,
}) })
}).catch((response) => { }) }).catch((response) => { })
}, },
...@@ -495,8 +492,13 @@ Page({ ...@@ -495,8 +492,13 @@ Page({
'state': 0 'state': 0
} }
}).then((response) => { }).then((response) => {
if (response.data.count > 0) { this.setData({ clubExamine: response.data.count })
this.setData({ clubExamine: response.data.count }) if (response.data.count === 0) {
wx.setTabBarItem({
index: 4,
iconPath: '/image/tabbar/mine.png',
selectedIconPath: '/image/tabbar/mine-s.png'
})
} }
}).catch((response) => {}) }).catch((response) => {})
}, },
...@@ -614,20 +616,8 @@ Page({ ...@@ -614,20 +616,8 @@ Page({
console.log('onAppointmentTicket') console.log('onAppointmentTicket')
console.log(funcItem) console.log(funcItem)
// {
// 'orderId': funcData[i].id,
// 'enrollId': '',
// 'name': Number(funcData[i].type),
// 'cover': '',
// 'quantity': '预约人数 ' + funcData[i].subscribeNum + '人',
// 'phone': funcData[i].mobile,
// 'date': funcData[i].subscribeDate,
// 'time': funcData[i].subscribeDate,
// 'cardStyle': 1,
// }
let funcOptionItem let funcOptionItem
if (funcItem.name === 0) { if (funcItem.type === 0) {
funcOptionItem = { funcOptionItem = {
'id': funcItem.orderId, 'id': funcItem.orderId,
'mobile': funcItem.phone, 'mobile': funcItem.phone,
...@@ -641,7 +631,7 @@ Page({ ...@@ -641,7 +631,7 @@ Page({
} }
} }
if (funcItem.name === 1) { if (funcItem.type === 1) {
funcOptionItem = { funcOptionItem = {
'id': funcItem.orderId, 'id': funcItem.orderId,
'mobile': funcItem.phone, 'mobile': funcItem.phone,
......
pages/mine/home/home.wxml
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
<text>{{item.date}}</text> <text>{{item.date}}</text>
</view> </view>
<view class="column"> <view class="column">
<text class="card-list-appointment-name">{{item.name === 0 ? '夜间入园预约' : '看房预约'}}</text> <text class="card-list-appointment-name">{{item.type === 0 ? '夜间入园预约' : '看房预约'}}</text>
<text class="card-list-appointment-tip">{{item.quantity}}</text> <text class="card-list-appointment-tip">{{item.quantity}}</text>
</view> </view>
<view class="card-list-item-operation"> <view class="card-list-item-operation">
......
pages/mine/order/order.js
...@@ -362,7 +362,7 @@ Page({ ...@@ -362,7 +362,7 @@ Page({
'logo': funcItem.shopLogo, 'logo': funcItem.shopLogo,
'shopType': '', 'shopType': '',
} }
console.log('1010')
wx.setStorageSync('shopInfoBuffer', funcShopInfo) wx.setStorageSync('shopInfoBuffer', funcShopInfo)
wx.navigateTo({ wx.navigateTo({
url: `/pages/pay/order-detail/order-detail?id=${funcItem.id}&shopAppId=${funcItem.shopAppId}`, url: `/pages/pay/order-detail/order-detail?id=${funcItem.id}&shopAppId=${funcItem.shopAppId}`,
...@@ -386,7 +386,6 @@ Page({ ...@@ -386,7 +386,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '处理中', 'title': '处理中',
'duration': 60000
}) })
let funcItem = event.target.dataset.item let funcItem = event.target.dataset.item
App.request({ App.request({
...@@ -429,7 +428,6 @@ Page({ ...@@ -429,7 +428,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
'iconType': 'loading', 'iconType': 'loading',
'title': '处理中', 'title': '处理中',
'duration': 60000
}) })
let funcItem = event.target.dataset.item let funcItem = event.target.dataset.item
App.request({ App.request({
...@@ -476,16 +474,20 @@ Page({ ...@@ -476,16 +474,20 @@ Page({
.then((response) => { .then((response) => {
App.ui.showToast({ App.ui.showToast({
'iconType': 'success', 'iconType': 'success',
'title': '退款申请已提交' 'title': '退款申请已提交',
ending: () => {
this.onReload()
}
}) })
this.setData({ })
'orderList': [], .catch((response) => {
'orderPages': 1, App.ui.showToast({
'iconType': 'error',
'title': response.message
}) })
this.queryOrder()
}) })
}, },
fail: () => {}, fail: (response) => {},
}) })
}, },
...@@ -665,6 +667,8 @@ Page({ ...@@ -665,6 +667,8 @@ Page({
* @returns * @returns
*/ */
onReachBottom: function () { onReachBottom: function () {
// 当列表为空时，不触发该事件。
if (this.data.orderList.length === 0) return
this.setData({ this.setData({
orderPages: this.data.orderPages + 1 orderPages: this.data.orderPages + 1
}) })
......
pages/mine/question/question.js
...@@ -71,7 +71,7 @@ Page({ ...@@ -71,7 +71,7 @@ Page({
this.setData({ this.setData({
keyboardHeight: funcEvent.detail.height, keyboardHeight: funcEvent.detail.height,
feedbackOpacity: 1, feedbackOpacity: 1,
feedbackCssMarginTop: this.data.screenHeight - funcEvent.detail.height - 518 * wx.getStorageSync('unitProportion'), feedbackCssMarginTop: this.data.screenHeight - funcEvent.detail.height - 580 * wx.getStorageSync('unitProportion'),
}) })
}, },
......
pages/mine/question/question.wxml
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
placeholder="请留下您的宝贵意见" placeholder="请留下您的宝贵意见"
inputMax="{{200}}" inputMax="{{200}}"
focus="{{true}}" focus="{{true}}"
bindinput="inputFeedbackContent"
bindblur="inputFeedbackContent" bindblur="inputFeedbackContent"
bindfocus="inputFeedbackFocus" bindfocus="inputFeedbackFocus"
> >
......
pages/pay/coupon-detail/coupon-detail.js
...@@ -76,7 +76,6 @@ Page({ ...@@ -76,7 +76,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在核销', title: '正在核销',
duration: 60000
}) })
App.request({ App.request({
...@@ -86,7 +85,6 @@ Page({ ...@@ -86,7 +85,6 @@ Page({
}, },
}) })
.then((response) => { .then((response) => {
console.log(response)
App.ui.showToast({ App.ui.showToast({
iconType: 'success', iconType: 'success',
title: '核销成功', title: '核销成功',
...@@ -96,7 +94,6 @@ Page({ ...@@ -96,7 +94,6 @@ Page({
}) })
}) })
.catch((response) => { .catch((response) => {
console.log(response)
App.ui.showToast({ App.ui.showToast({
iconType: 'error', iconType: 'error',
title: response.message, title: response.message,
......
pages/pay/coupon-input/coupon-input.js
...@@ -52,7 +52,6 @@ Page({ ...@@ -52,7 +52,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '正在识别', title: '正在识别',
duration: 60000
}) })
App.request({ App.request({
......
pages/pay/order-comment/order-comment.js
...@@ -170,8 +170,8 @@ Page({ ...@@ -170,8 +170,8 @@ Page({
}) })
}, },
eventImageError: function (funcEvent) { eventImageError: function (event) {
let funcErrorType = funcEvent.detail.type let funcErrorType = event.detail.type
switch (funcErrorType) { switch (funcErrorType) {
case 'format': case 'format':
......
pages/pay/order-detail/order-detail.js
...@@ -239,9 +239,17 @@ Page({ ...@@ -239,9 +239,17 @@ Page({
.then((response) => { .then((response) => {
App.ui.showToast({ App.ui.showToast({
'iconType': 'success', 'iconType': 'success',
'title': '退款申请已提交' 'title': '退款申请已提交',
ending: () => {
this.onReload()
}
})
})
.catch((response) => {
App.ui.showToast({
'iconType': 'error',
'title': response.message
}) })
this.onReload()
}) })
}, },
fail: () => {}, fail: () => {},
...@@ -355,7 +363,6 @@ Page({ ...@@ -355,7 +363,6 @@ Page({
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
title: '处理中', title: '处理中',
duration: 60000,
}) })
App.request({ App.request({
url: 'v1/order/cancelOrder', url: 'v1/order/cancelOrder',
......
pages/pay/order-detail/order-detail.wxss
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
.info { .info {
margin-top: 50rpx; margin-top: 50rpx;
overflow: hidden;
} }
.info-content { .info-content {
...@@ -124,6 +125,7 @@ ...@@ -124,6 +125,7 @@
} }
.info-line-point-left { .info-line-point-left {
z-index: 4;
position: absolute; position: absolute;
left: -18rpx; left: -18rpx;
width: 36rpx; width: 36rpx;
...@@ -133,6 +135,7 @@ ...@@ -133,6 +135,7 @@
} }
.info-line-point-right { .info-line-point-right {
z-index: 4;
position: absolute; position: absolute;
right: -18rpx; right: -18rpx;
width: 36rpx; width: 36rpx;
...@@ -414,18 +417,18 @@ ...@@ -414,18 +417,18 @@
/* 印章图 */ /* 印章图 */
.seal-shot { .seal-shot {
position: absolute; position: absolute;
right: -30rpx; right: -32rpx;
bottom: -30rpx; bottom: -32rpx;
width: 166rpx; width: 200rpx;
height: 164rpx; height: 200rpx;
} }
.seal-long { .seal-long {
position: absolute; position: absolute;
right: 0; right: -32rpx;
bottom: -30rpx; bottom: -32rpx;
width: 166rpx; width: 200rpx;
height: 164rpx; height: 200rpx;
} }
.p-relative { .p-relative {
......
pages/play/activity/activity.js
...@@ -290,7 +290,6 @@ Page({ ...@@ -290,7 +290,6 @@ Page({
//开启下拉刷新 //开启下拉刷新
onReachBottom: function () { onReachBottom: function () {
console.log('onPullDownRefresh')
this.setData({ this.setData({
pageIndex: this.data.pageIndex + 1 pageIndex: this.data.pageIndex + 1
}) })
......
pages/play/home/home.js
...@@ -284,6 +284,7 @@ Page({ ...@@ -284,6 +284,7 @@ Page({
}, },
onReachBottom: function () { onReachBottom: function () {
if (this.data.touristRouteList.length === 0) return
this.setData({ this.setData({
touristRoutePageNo: this.data.touristRoutePageNo + 1 touristRoutePageNo: this.data.touristRoutePageNo + 1
}) })
......
pages/play/service-detail/service-detail.js
...@@ -27,6 +27,7 @@ Page({ ...@@ -27,6 +27,7 @@ Page({
detailCommodity: [], // 商品 detailCommodity: [], // 商品
detailEvaluate: [], // 评论 detailEvaluate: [], // 评论
evaluateAlbum: [], evaluateAlbum: [],
evaluateAlbumActive: 0,
emptyImg: App.globalData.appResourcesBase + 'play/service/nothing.jpg', emptyImg: App.globalData.appResourcesBase + 'play/service/nothing.jpg',
......
utils/request/corvus.js
...@@ -15,7 +15,7 @@ function inspectOption (funcOption) { ...@@ -15,7 +15,7 @@ function inspectOption (funcOption) {
} }
// 请求方式必须是post或者get之一。 // 请求方式必须是post或者get之一。
if (funcOption.method && ['get', 'post'].indexOf(funcOption.method) >= 0) { if (funcOption.method && ['get', 'post'].indexOf(funcOption.method) < 0) {
console.log('[request] "method" is invalid!') console.log('[request] "method" is invalid!')
return return
} }
......
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