Skip to content

F
FlashMan
Commit 36578040 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

tijiao

parent 26ff04ff
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 47 deletions
app.json
View file @ 36578040
{
"pages": [
"pages/Voucher/Voucher",
"pages/Voucher/VoucherDetails/VoucherDetails",
"pages/Voucher/rating/rating",
"pages/Voucher/VoucherDetails/VoucherDetails",
"pages/Voucher/write/write",
"pages/freeTravel/free",
"pages/visa/visa",
......
pages/Voucher/Voucher.js
View file @ 36578040
......@@ -65,6 +65,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
if (options.finish) {
wx.navigateBack({
delta: 1
})
}
let tcId = options.hasOwnProperty('tcId') ? options.tcId : '3037',
orderId = options.hasOwnProperty('orderId') ? options.orderId : '20914';
this.setData({
......
pages/Voucher/Voucher.wxss
View file @ 36578040
......@@ -15,21 +15,9 @@ page{
height: 3.4rem;
box-sizing: border-box;
border-bottom: 2px solid #DEDEDE;
color: #999999;
color: #000000;
margin-top: 70rpx;
}
.page-Voucher input::-webkit-input-placeholder{
color:#999999;
}
.page-Voucher input::-moz-placeholder{ /* Mozilla Firefox 19+ */
color:#999999;
}
.page-Voucher input:-moz-placeholder{ /* Mozilla Firefox 4 to 18 */
color:#999999;
}
.page-Voucher input:-ms-input-placeholder{ /* Internet Explorer 10-11 */
color:#999999;
}
button.next{
width: 350rpx;
height: 84rpx;
......
pages/Voucher/VoucherDetails/VoucherDetails.js
View file @ 36578040
......@@ -14,7 +14,7 @@ Page({
voucherData: {},
rating: '',
Message: '',
showYouJi: false,
showYouJi: true,
showBadYouJi: false
},
/**
......@@ -36,8 +36,8 @@ Page({
},
// 差评直接退出小程序
logOut: function () {
wx.navigateBack({
delta: -1
wx.reLaunch({
url: '../Voucher?finish=true',
})
},
// 保存数据
......
pages/Voucher/VoucherDetails/VoucherDetails.wxml
View file @ 36578040
......@@ -38,6 +38,9 @@
<view class='btn'>
<button class='next' type="default" size="mini" bindtap="goWrite">写游记，领奖品</button>
</view>
<view class='btn'>
<button class='next cancle' type="default" size="mini" bindtap="logOut">取消</button>
</view>
<view class='tips'>
根据自身经历写游记，还可获得奖品
</view>
......
pages/Voucher/VoucherDetails/VoucherDetails.wxss
View file @ 36578040
......@@ -4,7 +4,6 @@ page{
}
.page-details{
padding: 34rpx 49rpx 0 ;
height: 100%;
background-color: white;
}
.page-details .text{
......@@ -37,7 +36,7 @@ page{
}
.pingfen-item .radio-group,.pingfen-item checkbox-group{
display: flex;
margin-top: 10rpx;
margin-top: 20rpx;
padding-left: 10rpx;
}
.pingfen-item textarea{
......@@ -60,6 +59,7 @@ button.next{
border-color: #DEDEDE;
color: #666666;
font-size: 32rpx;
margin-bottom: 30rpx;
}
button.next:active{
background:rgba(238,68,84,1);
......@@ -81,7 +81,7 @@ button.next:active{
.dialog .box{
padding: 54rpx;
border-radius:20rpx;
height: 694rpx;
min-height: 694rpx;
box-sizing: border-box;
background-color: white;
width: 634rpx;
......@@ -100,6 +100,12 @@ button.next:active{
border-color: rgba(238,68,84,1) !important;
color: white;
}
.dialog .box .btn button.next.cancle{
background:white !important;
border-color: #999999 !important;
color: #999999;
margin-top: 0rpx;
}
.dialog .box .tips{
font-size: 28rpx;
color: #999999;
......
pages/Voucher/rating/rating.wxml
View file @ 36578040
......@@ -2,11 +2,11 @@
<text class='pingfen'>评分</text>
<view class='rating-icon' wx:for='{{[1,2,3,4,5]}}' wx:key='*this'
bindtap='_handleTap' data-num='{{item}}'>
<view class='rating-on' style='width:{{rating >= (max/5)*item ? 1 : rating < (max/5)*(item-1) ? 0 : (rating*10)%(max/5*10)/(max/5*10)}}em'>
<image src='../../../images/voucher/rating_on_icon.png' mode='widthFix' style='width:1em' />
<view class='rating-on' style='width:{{rating >= (max/5)*item ? 2 : rating < (max/5)*(item-1) ? 0 : (rating*20)%(max/5*20)/(max/5*20)}}em'>
<image src='../../../images/voucher/rating_on_icon.png' mode='widthFix' style='width:2em' />
</view>
<view class='rating-off' style='width:1em;'>
<image src='../../../images/voucher/rating_off_icon.png' mode='widthFix' style='width:1em' />
<view class='rating-off' style='width:2em;'>
<image src='../../../images/voucher/rating_off_icon.png' mode='widthFix' style='width:2em' />
</view>
</view>
<view class='pingfen-tips'>
......
pages/Voucher/rating/rating.wxss
View file @ 36578040
......@@ -4,6 +4,7 @@
display:flex;
align-items:center;
padding-left: 10rpx;
margin-top: 20rpx;
}
.com-rating .rating-icon,
.com-rating .rating-on,
......
pages/Voucher/write/write.js
View file @ 36578040
......@@ -16,8 +16,8 @@ Page({
},
// 退出
logOut: function () {
wx.navigateBack({
delta: -1
wx.reLaunch({
url: '../Voucher?finish=true',
})
},
//提交游记内容数据
......
pages/Voucher/write/write.wxml
View file @ 36578040
......@@ -13,13 +13,6 @@
<button class='next' type="default" size="mini" bindtap="goWrite">发送</button>
</view>
</view>
<view class='upload'>
<view wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class='item-box'>
<image src='{{item}}'></image>
<text class='delete-img' bindtap='deleteImg' id='{{index}}'>x</text>
</view>
<view class='upload_btn' bindtap='chooseImage'>+</view>
</view>
</view>
</view>
<view class='tag'>
......@@ -31,6 +24,13 @@
<text class='{{item.click ? "active" : ""}}' wx:for="{{tag}}" wx:for-item="item" wx:for-index="index" wx:key="key" bindtap='clickTag' id="{{index}}">{{item.Name}}</text>
</view>
</view>
<view class='upload'>
<view wx:for="{{imgList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class='item-box'>
<image src='{{item}}'></image>
<text class='delete-img' bindtap='deleteImg' id='{{index}}'>x</text>
</view>
<view class='upload_btn' bindtap='chooseImage'>+</view>
</view>
<view class='dialog' wx:if="{{showBadYouJi}}">
<view class='box'>
<view class='tit'>感谢参与调查</view>
......
pages/Voucher/write/write.wxss
View file @ 36578040
......@@ -3,13 +3,13 @@ page{
background-color: white;
}
.content{
padding: 30rpx 40rpx;
padding: 30rpx 40rpx 60rpx 40rpx;
}
.content .top .top-content{
min-height: 310rpx;
background: rgba(245,245,245,1);
box-sizing: border-box;
padding: 23rpx 20rpx 75rpx 20rpx;
padding: 23rpx 20rpx 120rpx 20rpx;
position: relative;
}
.no-list{
......@@ -21,6 +21,9 @@ page{
height: 75px;
}
.top-content .btn button.next{
width: 103px;
height: 54px;
line-height: 54px;
background: rgba(238,68,84,1);
box-shadow: 0px 1px 2px 0px rgba(167,11,26,0.63);
border-radius: 10px;
......@@ -31,8 +34,9 @@ page{
z-index: 2;
}
.upload{
padding: 0rpx 40rpx 40rpx 40rpx;
min-height: 120rpx;
margin: 20rpx 0;
margin: 40rpx 0;
display: flex;
flex-wrap:wrap;
}
......@@ -60,17 +64,17 @@ page{
background-color: rgba(238,68,84,1);
}
.upload_btn{
width: 120rpx;
height: 120rpx;
width: 200rpx;
height: 200rpx;
border: 1px solid #8D8D8D;
border-radius: 20rpx;
font-size: 40px;
font-weight: bold;
line-height: 105rpx;
font-size: 64px;
font-weight: 500;
line-height: 185rpx;
text-align: center;
}
.tag{
margin-top: 70rpx;
/* margin-top: 70rpx; */
box-shadow: 0px -2px 8px 0px rgba(187, 187, 187, 0.63);
}
.tag-tit{
......@@ -119,7 +123,7 @@ page{
}
.tag-item{
display: flex;
margin-bottom: 20rpx;
margin-top: 30rpx;
border-bottom: 1px solid #E0E2E6;
}
.tag-item .lable{
......@@ -136,7 +140,7 @@ page{
.tag-item textarea{
font-size: 26rpx;
height: 75px;
padding: 10rpx 20rpx;
padding: 0 20rpx;
}
.dialog{
height: 100%;
......@@ -171,6 +175,9 @@ page{
background:rgba(238,68,84,1) !important;
border-color: rgba(238,68,84,1) !important;
color: white;
height: 84rpx;
width: 350rpx;
line-height: 84rpx;
}
.dialog .box .tips{
font-size: 28rpx;
......
project.config.json
View file @ 36578040
......@@ -37,7 +37,7 @@
"list": []
},
"miniprogram": {
"current": -1,
"current": 6,
"list": [
{
"id": 0,
......@@ -84,6 +84,13 @@
"pathName": "pages/Voucher/write/write",
"query": "",
"scene": null
},
{
"id": -1,
"name": "调查",
"pathName": "pages/Voucher/VoucherDetails/VoucherDetails",
"query": "",
"scene": null
}
]
}
......
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 to comment