Skip to content

严立 / mini-shimao

Go to a project
Commit cde5b2e5 by 严立
Options

ui bug 修复。

parent ca192643
Inline Side-by-side
Showing with 225 additions and 29 deletions
app.json
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
"m-tab": "./component/m-tab/m-tab", "m-tab": "./component/m-tab/m-tab",
"m-segment": "./component/m-segment/m-segment", "m-segment": "./component/m-segment/m-segment",
"m-toast": "./component/m-toast/m-toast", "m-toast": "./component/m-toast/m-toast",
"parser": "./component/parser.min/parser",
"swiper-point": "./component/swiper-point/swiper-point", "swiper-point": "./component/swiper-point/swiper-point",
"l-icon": "./miniprogram_npm/lin-ui/icon/index", "l-icon": "./miniprogram_npm/lin-ui/icon/index",
"l-collapse": "./miniprogram_npm/lin-ui/collapse/index", "l-collapse": "./miniprogram_npm/lin-ui/collapse/index",
......
app.wxss
...@@ -97,3 +97,7 @@ ...@@ -97,3 +97,7 @@
margin: 40rpx 0 90rpx 0; margin: 40rpx 0 90rpx 0;
overflow-y: scroll; overflow-y: scroll;
} }
.iphoneX-bottom-fill {
padding-bottom: env(safe-area-inset-bottom);
}
\ No newline at end of file
component/m-image-picker/m-image-picker.js 0 → 100644
Component({
options: {
styleIsolation: 'apply-shared'
},
properties: {
},
data: {
maxSize: 2 * 1024 * 1024,
maxSelection: 9,
allowFormat: ['.jpg', '.jpeg', '.png', '.bmp'],
allowFormatRegExp: {},
selectionImageList: [],
},
// 生命周期
lifetimes: {
attached: function () {
this.initOption()
},
},
methods: {
initOption: function () {
let funcAllowFormat = this.data.allowFormat
for (let i = 0, l = funcAllowFormat.length; i < l; i++) {
funcAllowFormat[i] = funcAllowFormat[i].replace('.', '(\.') + ')'
}
this.setData({
allowFormatRegExp: new RegExp(funcAllowFormat.join('|') + '$')
})
},
imageFormatInspect: function (funcImageList) {
let funcPassImage = []
let funcErrorImage = []
for (let i = 0, l = funcImageList.length; i < l; i++) {
if (this.data.allowFormatRegExp.test(funcImageList[i].path)) {
// 格式正确的图片
funcPassImage.push(funcImageList[i])
} else {
// 格式错误的图片
funcErrorImage.push(funcImageList[i])
}
}
return { 'passImage': funcPassImage, 'errorImage': funcErrorImage }
},
imageSizeInspect: function (funcImageList) {
let funcPassImage = []
let funcErrorImage = []
for (let i = 0, l = funcImageList.length; i < l; i++) {
if (funcImageList[i].size <= this.data.maxSize) {
// 格式正确的图片
funcPassImage.push(funcImageList[i])
} else {
// 格式错误的图片
funcErrorImage.push(funcImageList[i])
}
}
return { 'passImage': funcPassImage, 'errorImage': funcErrorImage }
},
onSelectionImage: function (event) {
let funcSurplusQuantity = this.data.maxSelection - this.data.selectionImageList.length
// 已达图片选择上限
if (funcSurplusQuantity === 0) {
this.triggerEvent('error', { type: 'quantity max', images: [] } )
return
}
wx.chooseImage({
count: funcSurplusQuantity,
sizeType: ['compressed'],
sourceType: ['album'],
success: (response) => {
let funcFileList = response.tempFiles
let funcList = []
for (let i = 0, l = funcFileList.length; i < l; i++) {
funcList.push({
'id': i,
'path': funcFileList[i].path,
'size': funcFileList[i].size,
})
}
// 检查图片格式
let funcFormatInspectResult = this.imageFormatInspect(funcList)
if (funcFormatInspectResult.errorImage.length > 0) {
this.triggerEvent('error', { type: 'format', images: funcFormatInspectResult } )
}
// 检查图片大小
let funcSizeInspectResult = this.imageSizeInspect(funcList)
if (funcSizeInspectResult.errorImage.length > 0) {
this.triggerEvent('error', { type: 'size', images: funcSizeInspectResult } )
}
this.setData({
selectionImageList: this.data.selectionImageList.concat(funcFormatInspectResult.passImage)
})
console.log(this.data.selectionImageList)
this.triggerEvent('change', { type: 'change', images: this.data.selectionImageList } )
},
fail: (response) => {
console.log(response)
}
})
},
onRemoveSelectedImage: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item
let funcSelectionImageList = this.data.selectionImageList
for (let i = 0, l = funcSelectionImageList.length; i < l; i++) {
if (funcItem.id === funcSelectionImageList[i].id) {
let funcRemoveImage = funcSelectionImageList.splice(i, 1)
this.setData({
selectionImageList: funcSelectionImageList
})
this.triggerEvent('remove', { type: 'remove', images: [funcRemoveImage] } )
return
}
}
},
}
})
component/m-image-picker/m-image-picker.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
component/m-image-picker/m-image-picker.wxml 0 → 100644
<view class="m-image-picker row">
<block wx:for="{{selectionImageList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="image-picker-selected-item">
<image class="image-picker-selected-image" src="{{item.path}}"></image>
<view class="image-picker-remove row cc ac" data-item="{{item}}" bindtap="onRemoveSelectedImage">
<image src="./image/remove.png"></image>
</view>
</view>
</block>
<view class="image-picker-selection column cc ac" bindtap="onSelectionImage">
<image class="image-picker-selection-icon" src="./image/camera.png"></image>
<text class="image-picker-selection-tip">添加图片</text>
</view>
</view>
\ No newline at end of file
component/m-image-picker/m-image-picker.wxss 0 → 100644
.m-image-picker {
width: 504;
min-height: 168rpx;
flex-wrap: wrap;
}
.image-picker-selected-item {
position: relative;
width: 144rpx;
height: 144rpx;
margin: 0 24rpx 24rpx 0;
}
.image-picker-selected-image {
width: 144rpx;
height: 144rpx;
}
.image-picker-remove {
position: absolute;
top: -30rpx;
right: -30rpx;
width: 60rpx;
height: 60rpx;
border: 1px red solid;
}
.image-picker-remove > image {
width: 32rpx;
height: 32rpx;
}
.image-picker-selection {
width: 144rpx;
height: 144rpx;
border-radius: 4rpx;
border: 1px #959DA9 dashed;
}
.image-picker-selection-icon {
display: block;
width: 40rpx;
height: 32rpx;
}
.image-picker-selection-tip {
width: 88rpx;
height: 32rpx;
margin: 8rpx 0 0 0;
font-size: 22rpx;
font-weight: 400;
line-height: 32rpx;
color: #959DA9;
}
\ No newline at end of file
pages/home/home/home.wxml
<m-nav scrollHeight="{{navScroll}}" changeHeight="650rpx" styleIndex="{{4}}" isOccupy="{{false}}"></m-nav> <m-nav scrollHeight="{{navScroll}}" changeHeight="650rpx" styleIndex="{{4}}" isOccupy="{{false}}"></m-nav>
<view class="container"> <view class="container iphoneX-bottom-fill">
<view class="banner"> <view class="banner">
<swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="5000" duration="500" bindchange="eventSwiperChange"> <swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="5000" duration="500" bindchange="eventSwiperChange">
<block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
......
pages/mine/home/home.js
...@@ -515,6 +515,7 @@ Page({ ...@@ -515,6 +515,7 @@ Page({
* @returns * @returns
*/ */
onIntegralDetail: function () { onIntegralDetail: function () {
if (!App.globalData.appStatus) return
wx.getStorageSync('userInfo').isSignIn ? wx.navigateTo({ url: '/pages/mall/home/home' }) : wx.navigateTo({ url: '/pages/login/login' }) wx.getStorageSync('userInfo').isSignIn ? wx.navigateTo({ url: '/pages/mall/home/home' }) : wx.navigateTo({ url: '/pages/login/login' })
}, },
......
pages/mine/home/home.wxml
...@@ -266,6 +266,7 @@ ...@@ -266,6 +266,7 @@
</view> </view>
<!-- 我的俱乐部 --> <!-- 我的俱乐部 -->
<block wx:if="{{appStatus}}">
<view class="club row con-b ac" bindtap="onToClub"> <view class="club row con-b ac" bindtap="onToClub">
<view class="club_enter"> <view class="club_enter">
<text>我的俱乐部</text> <text>我的俱乐部</text>
...@@ -275,6 +276,7 @@ ...@@ -275,6 +276,7 @@
</view> </view>
<image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</block>
<!-- 客服中心 --> <!-- 客服中心 -->
<view class="service row con-b ac" bindtap="onService"> <view class="service row con-b ac" bindtap="onService">
......
pages/pay/order-comment/order-comment.wxml
...@@ -79,9 +79,6 @@ ...@@ -79,9 +79,6 @@
</view> </view>
</view> </view>
<view class="order-comment"> <view class="order-comment">
<!-- <l-textarea cursor-spacing="100" placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF" maxlength="200"
l-class="l-textarea" border="{{false}}" bind:linconfirm="eventInputDone" /> -->
<textarea style="padding:24rpx;font-size:26rpx;color:#15191F;line-height:40rpx" cols="30" rows="10" maxlength='200' placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF;font-size:26rpx" bindinput="doInputContent"></textarea> <textarea style="padding:24rpx;font-size:26rpx;color:#15191F;line-height:40rpx" cols="30" rows="10" maxlength='200' placeholder="您的评价与建议，会让园区做的更好" placeholder-style="color: #C2C7CF;font-size:26rpx" bindinput="doInputContent"></textarea>
<view class="text-length-box " style="padding:16rpx 24rpx;text-align:right;font-size:24rpx;color:#C2C7CF;">{{content.length}}/200</view> <view class="text-length-box " style="padding:16rpx 24rpx;text-align:right;font-size:24rpx;color:#C2C7CF;">{{content.length}}/200</view>
......
pages/pay/order-comment/order-comment.wxss
...@@ -115,14 +115,6 @@ ...@@ -115,14 +115,6 @@
border-radius: 4rpx; border-radius: 4rpx;
} }
.l-textarea {
height: 320rpx;
}
.l-textarea > view {
color: #c2c7cf !important;
}
.order-picker { .order-picker {
padding: 19rpx 12rpx 8rpx; padding: 19rpx 12rpx 8rpx;
} }
......
pages/play/activity-detail/activity-detail.json
{ {
"usingComponents": { "usingComponents": {}
"parser": "../../../component/parser.min/parser"
}
} }
\ No newline at end of file
pages/play/activity-detail/activity-detail.wxml
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
</view> </view>
</view> </view>
<view class="detail-describe"> <view class="detail-describe">
<!-- <text>{{info.describe}}</text> --> <rich-text nodes="{{info.describe}}"></rich-text>
<parser html="{{info.describe}}"/>
</view> </view>
</view> </view>
......
pages/play/home/home.wxml
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
</view> </view>
<!-- 俱乐部 --> <!-- 俱乐部 -->
<block wx:if="{{appStatus}}">
<view class="title row cb ac"> <view class="title row cb ac">
<image src="./image/title-club.png"></image> <image src="./image/title-club.png"></image>
<text bindtap="onAllRecent" bindtap="onToClubList">查看全部</text> <text bindtap="onAllRecent" bindtap="onToClubList">查看全部</text>
...@@ -122,6 +123,7 @@ ...@@ -122,6 +123,7 @@
<text>暂无俱乐部信息</text> <text>暂无俱乐部信息</text>
</view> </view>
</block> </block>
</block>
<!-- 游客攻略 --> <!-- 游客攻略 -->
<view class="route"> <view class="route">
......
pages/play/home/home.wxss
...@@ -150,10 +150,6 @@ ...@@ -150,10 +150,6 @@
margin: 90rpx 0 0 0; margin: 90rpx 0 0 0;
} }
.hot_movie_title {
padding: 0 40rpx;
}
.hot_movie_title > image { .hot_movie_title > image {
width: 184rpx; width: 184rpx;
height: 44rpx; height: 44rpx;
......
pages/play/movie/movie.js
...@@ -92,8 +92,6 @@ Page({ ...@@ -92,8 +92,6 @@ Page({
}).then((response) => { }).then((response) => {
let funcData = response.data.list let funcData = response.data.list
let funcList = this.movieDataFormat(funcData) let funcList = this.movieDataFormat(funcData)
console.log('queryMovieToday')
console.log(JSON.stringify(funcList))
App.ui.hideToast() App.ui.hideToast()
this.setData({ this.setData({
movieToday: funcList, movieToday: funcList,
......
pages/play/strategy-detail/strategy-detail.wxml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<view class="detail-title"> <view class="detail-title">
<text>{{title}}</text> <text>{{title}}</text>
</view> </view>
<parser html="{{content}}"/> <rich-text nodes="{{content}}"></rich-text>
<view class="detail-date"> <view class="detail-date">
<text>{{date}}</text> <text>{{date}}</text>
</view> </view>
......
utils/request/option.js
const output = { const output = {
// 二期测试环境
// baseUrl: 'https://sm-web2.meiqicloud.com/api/',
// 三期测试环境 // 三期测试环境
baseUrl: 'https://sm-web.meiqicloud.com/api/', baseUrl: 'https://sm-web.meiqicloud.com/api/',
// 正式环境 // 正式环境
// baseUrl: 'https://smbhyh-web.meiqicloud.com/api/', // baseUrl: 'https://smbhyh-web.meiqicloud.com/api/',
} }
......
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