Skip to content

严立 / mini-shimao

Go to a project
Commit ac07ffd7 by wjw
Options

ww-ui反馈修改

parent 6ab7c87a
Inline Side-by-side
Showing with 308 additions and 177 deletions
pages/campsite/home-mirror/home-mirror.js
...@@ -242,18 +242,35 @@ Page({ ...@@ -242,18 +242,35 @@ Page({
}, },
// 点击下载图片 // 点击下载图片
onDownload: function () { onDownload: function () {
wx.showToast({ wx.downloadFile({
title: '已保存到相册', url: this.data.shareImage,
icon: 'success' success: (result) => {
}) wx.saveImageToPhotosAlbum({
this.setData({ filePath: result.tempFilePath,
showPopup: false success: (result) => {
this.setData({
showPopup: false,
winToastSuccess: true
})
},
fail: (error) => {
this.setData({
winToastFail: true
})
}
})
},
fail: (error) => {
this.setData({
winToastFail: true
})
}
}) })
}, },
// 点击位置图标 // 点击位置图标
onLocation: function () { onLocation: function () {
wx.navigateTo({ wx.navigateTo({
url: '/pages/home/guide/guide?id=' + 3 url: '/pages/home/guide/guide?id=' + 3 + '&card=false'
}) })
}, },
// 点击全部活动 // 点击全部活动
......
pages/campsite/home-mirror/home-mirror.wxml
...@@ -22,19 +22,35 @@ ...@@ -22,19 +22,35 @@
<image class="icon-share" src="/image/icon/share-3.png"></image> <image class="icon-share" src="/image/icon/share-3.png"></image>
</view> </view>
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}"> <view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="popupImage"> <view class="col con-c">
<image src="{{shareImage}}"></image> <view class="share-content">
</view> <image src="{{shareImage}}"></image>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view> </view>
<view class="download" bindtap="onDownload"> <view class="share-operation row con-b align-c">
<text>下载图片</text> <button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view> </view>
</view> </view>
</l-popup> </view>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 位置按钮 --> <!-- 位置按钮 -->
<view class="location col con-c align-c" bindtap="onLocation"> <view class="location col con-c align-c" bindtap="onLocation">
<image class="icon-location" src="/image/icon/location-3.png"></image> <image class="icon-location" src="/image/icon/location-3.png"></image>
......
pages/campsite/home-mirror/home-mirror.wxss
...@@ -197,25 +197,61 @@ ...@@ -197,25 +197,61 @@
} }
/* 分享弹窗 */ /* 分享弹窗 */
.popupImage image { .container-share {
z-index: 1700;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding-top: 60rpx;
background: rgba(0, 0, 0, 0.65);
}
.share-content image {
width: 606rpx; width: 606rpx;
height: 977rpx; height: 977rpx;
margin-bottom: 64rpx;
} }
.cancel, .download {
.share-operation {
margin-top: 60rpx;
}
.share-operation button:nth-child(1) {
width: 288rpx; width: 288rpx;
height: 96rpx; height: 96rpx;
border-radius: 4rpx;
background: #FFFFFF;
text-align: center; text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx; line-height: 96rpx;
color: #15191F;
}
.share-operation button:nth-child(2) {
width: 288rpx;
height: 96rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
} }
.cancel { .toast {
color: #15191F; width: 262rpx;
background-color: #fff; height: 262rpx;
border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16);
background: #1F252E;
} }
.download { .toast-icon {
color: #fff; width: 88rpx !important;
background-color: #15191F; height: 88rpx !important;
} }
\ No newline at end of file
pages/campsite/home/home.js
...@@ -211,30 +211,59 @@ Page({ ...@@ -211,30 +211,59 @@ Page({
}, },
// 点击分享图标 // 点击分享图标
onShare: function () { onShare: function () {
wx.hideTabBar({
animation: true,
})
this.setData({ this.setData({
showPopup: true showPopup: true
}) })
}, },
// 点击取消 // 点击取消
onCancel: function () { onCancel: function () {
wx.showTabBar({
animation: true,
})
this.setData({ this.setData({
showPopup: false showPopup: false
}) })
}, },
// 点击下载图片 // 点击下载图片
onDownload: function () { onDownload: function () {
wx.showToast({ wx.downloadFile({
title: '已保存到相册', url: this.data.shareImage,
icon: 'success' success: (result) => {
}) wx.saveImageToPhotosAlbum({
this.setData({ filePath: result.tempFilePath,
showPopup: false success: (result) => {
this.setData({
showPopup: false,
winToastSuccess: true
})
wx.showTabBar({
animation: true,
})
},
fail: (error) => {
this.setData({
winToastFail: true
})
}
})
},
fail: (error) => {
this.setData({
winToastFail: true
})
wx.showTabBar({
animation: true,
})
}
}) })
}, },
// 点击位置图标 // 点击位置图标
onLocation: function () { onLocation: function () {
wx.navigateTo({ wx.navigateTo({
url: '/pages/home/guide/guide?id=' + 3 url: '/pages/home/guide/guide?id=' + 3 + '&card=false'
}) })
}, },
// 点击全部活动 // 点击全部活动
......
pages/campsite/home/home.wxml
...@@ -18,20 +18,36 @@ ...@@ -18,20 +18,36 @@
<view class="share col con-c align-c" bindtap="onShare"> <view class="share col con-c align-c" bindtap="onShare">
<image class="icon-share" src="/image/icon/share-3.png"></image> <image class="icon-share" src="/image/icon/share-3.png"></image>
</view> </view>
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}"> <view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="popupImage"> <view class="col con-c">
<image src="{{shareImage}}"></image> <view class="share-content">
</view> <image src="{{shareImage}}"></image>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view> </view>
<view class="download" bindtap="onDownload"> <view class="share-operation row con-b align-c">
<text>下载图片</text> <button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view> </view>
</view> </view>
</l-popup> </view>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 位置按钮 --> <!-- 位置按钮 -->
<view class="location col con-c align-c" bindtap="onLocation"> <view class="location col con-c align-c" bindtap="onLocation">
<image class="icon-location" src="/image/icon/location-3.png"></image> <image class="icon-location" src="/image/icon/location-3.png"></image>
......
pages/campsite/home/home.wxss
...@@ -194,27 +194,62 @@ ...@@ -194,27 +194,62 @@
.wx-swiper-dots.wx-swiper-dots-horizontal{ .wx-swiper-dots.wx-swiper-dots-horizontal{
margin-bottom: 64rpx; margin-bottom: 64rpx;
} }
/* 分享弹窗 */ /* 分享弹窗 */
.popupImage image { .container-share {
z-index: 1700;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding-top: 60rpx;
background: rgba(0, 0, 0, 0.65);
}
.share-content image {
width: 606rpx; width: 606rpx;
height: 977rpx; height: 977rpx;
margin-bottom: 64rpx;
} }
.cancel, .download {
.share-operation {
margin-top: 60rpx;
}
.share-operation button:nth-child(1) {
width: 288rpx; width: 288rpx;
height: 96rpx; height: 96rpx;
border-radius: 4rpx;
background: #FFFFFF;
text-align: center; text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx; line-height: 96rpx;
color: #15191F;
}
.share-operation button:nth-child(2) {
width: 288rpx;
height: 96rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
} }
.cancel { .toast {
color: #15191F; width: 262rpx;
background-color: #fff; height: 262rpx;
border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16);
background: #1F252E;
} }
.download { .toast-icon {
color: #fff; width: 88rpx !important;
background-color: #15191F; height: 88rpx !important;
} }
\ No newline at end of file
pages/play/service-detail/service-detail.js
...@@ -458,6 +458,7 @@ Page({ ...@@ -458,6 +458,7 @@ Page({
success: (response) => { success: (response) => {
let funcCommodityList = [] let funcCommodityList = []
let funcResponse = response.data let funcResponse = response.data
console.log(JSON.stringify(funcResponse))
for (let i = 0, l = funcResponse.length; i < l; i++) { for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = { let funcItem = {
'id': funcResponse[i].id, // 商品标识 'id': funcResponse[i].id, // 商品标识
...@@ -465,7 +466,7 @@ Page({ ...@@ -465,7 +466,7 @@ Page({
'sidebarId': funcResponse[i].classifyId, // 商品分类标识 'sidebarId': funcResponse[i].classifyId, // 商品分类标识
'name': funcResponse[i].name, 'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面 'cover': funcResponse[i].coverImg, // 商品封面
'img': funcResponse[i].img, // 商品详情图 'img': funcResponse[i].img.split('|'), // 商品详情图
'price': funcResponse[i].sightseerPrice, // 普通价 'price': funcResponse[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].sightseerPrice), // 普通价文本格式 'priceText': App.modular.utils.formatAmount(funcResponse[i].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].ownerPrice, // 业主价 'priceSpecial': funcResponse[i].ownerPrice, // 业主价
...@@ -490,7 +491,6 @@ Page({ ...@@ -490,7 +491,6 @@ Page({
funcItem.priceType = 3 funcItem.priceType = 3
} }
} }
console.log(funcItem.img)
funcCommodityList.push(funcItem) funcCommodityList.push(funcItem)
} }
...@@ -791,12 +791,29 @@ Page({ ...@@ -791,12 +791,29 @@ Page({
}, },
// 点击下载图片 // 点击下载图片
onDownload: function () { onDownload: function () {
wx.showToast({ wx.downloadFile({
title: '已保存到相册', url: this.data.shareImage,
icon: 'success' success: (result) => {
}) wx.saveImageToPhotosAlbum({
this.setData({ filePath: result.tempFilePath,
showPopup: false success: (result) => {
this.setData({
showPopup: false,
winToastSuccess: true
})
},
fail: (error) => {
this.setData({
winToastFail: true
})
}
})
},
fail: (error) => {
this.setData({
winToastFail: true
})
}
}) })
}, },
// 跳转到文创商品商店 // 跳转到文创商品商店
......
pages/play/service-detail/service-detail.wxml
...@@ -25,19 +25,35 @@ ...@@ -25,19 +25,35 @@
<image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image> <image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image>
</view> </view>
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}"> <view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="popupImage"> <view class="col con-c">
<image src="{{shareImage}}"></image> <view class="share-content">
</view> <image src="{{shareImage}}"></image>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view> </view>
<view class="download" bindtap="onDownload"> <view class="share-operation row con-b align-c">
<text>下载图片</text> <button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view> </view>
</view> </view>
</l-popup> </view>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 开放时间信息 --> <!-- 开放时间信息 -->
<view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c"> <view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
<image src="./image/time.png"></image> <image src="./image/time.png"></image>
...@@ -109,7 +125,9 @@ ...@@ -109,7 +125,9 @@
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col"> <view class="commodity-card-item col">
<image mode="center" src="{{item.img}}"></image> <view class="commodity-card-item-cover row con-c align-c">
<image mode="aspectFill" src="{{item.img[0]}}"></image>
</view>
<view class="commodity-card-item-title row con-b align-c"> <view class="commodity-card-item-title row con-b align-c">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
......
pages/play/service-detail/service-detail.wxss
...@@ -309,6 +309,10 @@ ...@@ -309,6 +309,10 @@
width: 562rpx; width: 562rpx;
height: 316rpx; height: 316rpx;
} }
.commodity-card-item-cover image{
width: 562rpx;
height: 316rpx;
}
.movie-card-item > image { .movie-card-item > image {
width: 300rpx; width: 300rpx;
height: 369rpx; height: 369rpx;
...@@ -551,27 +555,63 @@ ...@@ -551,27 +555,63 @@
} }
/* 分享弹窗 */ /* 分享弹窗 */
.popupImage image { .container-share {
z-index: 1700;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding-top: 60rpx;
background: rgba(0, 0, 0, 0.65);
}
.share-content image {
width: 606rpx; width: 606rpx;
height: 977rpx; height: 977rpx;
margin-bottom: 64rpx;
} }
.cancel, .download {
.share-operation {
margin-top: 60rpx;
}
.share-operation button:nth-child(1) {
width: 288rpx; width: 288rpx;
height: 96rpx; height: 96rpx;
border-radius: 4rpx;
background: #FFFFFF;
text-align: center; text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx; line-height: 96rpx;
color: #15191F;
}
.share-operation button:nth-child(2) {
width: 288rpx;
height: 96rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
} }
.cancel { .toast {
color: #15191F; width: 262rpx;
background-color: #fff; height: 262rpx;
border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16);
background: #1F252E;
} }
.download { .toast-icon {
color: #fff; width: 88rpx !important;
background-color: #15191F; height: 88rpx !important;
} }
/* 简介，评论 */ /* 简介，评论 */
......
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": {},
"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