Skip to content

F
FlashMan
Commit e4adeb6f authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

冲突

parents b3b277b3 5fb170c7
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 37 deletions
app.json
View file @ e4adeb6f
{
"pages": [
"pages/GroupTour/GroupList/GroupList",
"pages/GroupTour/GroupTour",
"pages/Home/home",
"pages/product/product",
"pages/visa/visa",
"pages/GroupTour/GroupTour",
"pages/Voucher/Voucher",
"pages/Voucher/rating/rating",
"pages/Voucher/VoucherDetails/VoucherDetails",
"pages/Voucher/write/write",
"pages/freeTravel/free",
"pages/Home/home",
"pages/Ticket/Ticket",
"pages/local/localhome",
"pages/login/smsLogin/smsLogin",
"pages/login/revisePwd/revisePwd",
"pages/product/SametradeZW/prizelist/prizelist",
"pages/product/SametradeZW/luckdraw/luckdraw",
"pages/product/product",
"pages/product/productAll/productAll",
"pages/product/productCheck/productCheck",
"pages/product/productDetail/productDetail",
......
pages/Voucher/Voucher.js
View file @ e4adeb6f
......@@ -41,6 +41,9 @@ Page({
ID: res.Id,
}
})
this.setData({
orderId: res.OrderId
})
wx.navigateTo({
url: '/pages/Voucher/VoucherDetails/VoucherDetails?&orderId=' + _this.data.orderId + '&tcId=' + _this.data.tcId
})
......@@ -65,16 +68,9 @@ 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';
let tcId = options.hasOwnProperty('tcId') ? options.tcId : '3037';
this.setData({
tcId: tcId,
orderId: orderId
tcId: tcId
})
//修改title
wx.setNavigationBarTitle({
......
pages/Voucher/Voucher.wxml
View file @ e4adeb6f
<view class='page-Voucher'>
<text class='text'>身份确认</text>
<input bindinput='TelPhone' placeholder='请输入手机号以确认身份'></input>
<button class='next' type="default" size="mini" bindtap="Details">确认</button>
<button class='next {{telPhone !== "" ? "active" : ""}}' type="default" size="mini" bindtap="Details">确认</button>
</view>
\ No newline at end of file
pages/Voucher/Voucher.wxss
View file @ e4adeb6f
......@@ -28,7 +28,7 @@ button.next{
color: #666666;
font-size: 32rpx;
}
button.next:active{
button.next.active{
background:rgba(238,68,84,1);
border-color: rgba(238,68,84,1);
color: white;
......
pages/Voucher/VoucherDetails/VoucherDetails.js
View file @ e4adeb6f
......@@ -21,7 +21,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options)
let info = wx.getStorageSync('info'),
orderId = options.orderId,
tcId = options.tcId;
......@@ -42,6 +41,9 @@ Page({
},
// 保存数据
saveMessage: function () {
this.setData({
voucherData: this.data.voucherData
})
let data = JSON.parse(JSON.stringify(this.data.voucherData)),
showYouJi = true;
data.forEach(x=>{
......
pages/Voucher/VoucherDetails/VoucherDetails.wxml
View file @ e4adeb6f
......@@ -26,7 +26,7 @@
<checkbox value="{{CItem.ID}}" checked="{{CItem.IsCheckS}}"/>{{CItem.OptionsName}}
</label>
</checkbox-group>
<textarea wx:elif="{{item.SurveyType === 4}}" bindinput='inputMessage' id="{{index}}" placeholder='点击输入'></textarea>
<textarea wx:elif="{{item.SurveyType === 4 && !showYouJi}}" bindinput='inputMessage' id="{{index}}" placeholder='点击输入'></textarea>
</view>
<view class='btn'>
<button class='next' type="default" size="mini" bindtap="saveMessage">确认</button>
......
pages/Voucher/VoucherDetails/VoucherDetails.wxss
View file @ e4adeb6f
......@@ -53,13 +53,13 @@ page{
button.next{
width: 350rpx;
height: 84rpx;
background-color: #DEDEDE;
line-height:84rpx;
margin-top: 50rpx;
border-color: #DEDEDE;
color: #666666;
font-size: 32rpx;
margin-bottom: 30rpx;
background:rgba(238,68,84,1);
border-color: rgba(238,68,84,1);
color: white;
}
button.next:active{
background:rgba(238,68,84,1);
......
pages/Voucher/rating/rating.wxml
View file @ e4adeb6f
......@@ -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 ? 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 class='rating-on' style='width:{{rating >= (max/5)*item ? 1.5 : rating < (max/5)*(item-1) ? 0 : (rating*15)%(max/5*15)/(max/5*15)}}em'>
<image src='../../../images/voucher/rating_on_icon.png' mode='widthFix' style='width:1.5em' />
</view>
<view class='rating-off' style='width:2em;'>
<image src='../../../images/voucher/rating_off_icon.png' mode='widthFix' style='width:2em' />
<view class='rating-off' style='width:1.5em;'>
<image src='../../../images/voucher/rating_off_icon.png' mode='widthFix' style='width:1.5em' />
</view>
</view>
<view class='pingfen-tips'>
......
pages/Voucher/write/write.js
View file @ e4adeb6f
......@@ -13,6 +13,7 @@ Page({
tag: [],
infoMessage: '',
showBadYouJi: false,
tag2: [],
},
// 退出
logOut: function () {
......@@ -36,10 +37,14 @@ Page({
})
}
this.data.tag.map(x=>{
console.log('x.Content', x.Content)
if (x.Content !== '') {
msg.GuestTravelLableList.push(x)
}
})
this.setData({
tag: this.data.tag2
})
app.$api('survey_post_SetGuestTravelNotes', msg).then(res => {
this.setData({
showBadYouJi: true,
......@@ -85,7 +90,8 @@ Page({
},
// 选择图片
chooseImage: function () {
let _this = this;
let _this = this,
path = '/Upload/DMC/';
wx.chooseImage({
count: 9,
sizeType: ['original', 'compressed'],
......@@ -102,13 +108,24 @@ Page({
})
return
}
arr.push(x)
})
wx.uploadFile({
url: 'http://upload.oytour.com/Upload?filePath=' + path, //仅为示例，非真实的接口地址
filePath: x,
name: 'file',
formData: {
'user': x
},
success: function (res) {
var data = JSON.parse(res.data)
arr.push("http://imgfile.oytour.com"+data.FilePath)
_this.setData({
imgList: arr
})
}
})
})
}
})
},
/**
* 生命周期函数--监听页面加载
......@@ -140,7 +157,8 @@ Page({
)
})
_this.setData({
tag: arr
tag: arr,
tag2: JSON.parse(JSON.stringify(arr))
})
console.log(this.data.tag)
}).catch(err => {
......
pages/Voucher/write/write.wxml
View file @ e4adeb6f
......@@ -5,7 +5,7 @@
<view class='no-list'>
<textarea placeholder='我来说说在这里游玩的感受吧~' bindinput='inputMessage'></textarea>
</view>
<view class='tag-item' wx:for="{{tag}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:if="{{item.click}}">
<view class='tag-item' wx:for="{{tag}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:if="{{item.click && !showBadYouJi}}">
<text class='lable'>{{item.Name}}：</text>
<textarea placeholder='请输入...' bindinput='inputItemMessage' id="{{index}}"></textarea>
</view>
......
pages/Voucher/write/write.wxss
View file @ e4adeb6f
......@@ -9,7 +9,7 @@ page{
min-height: 310rpx;
background: rgba(245,245,245,1);
box-sizing: border-box;
padding: 23rpx 20rpx 120rpx 20rpx;
padding: 23rpx 20rpx 130rpx 20rpx;
position: relative;
}
.no-list{
......@@ -101,7 +101,7 @@ page{
text-align: center;
}
.tag-list{
padding: 56rpx 38rpx;
padding: 56rpx 38rpx 0 38rpx;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
......@@ -187,7 +187,8 @@ page{
margin-top: 25rpx;
}
navigator{
position: absolute;z-index: 2;
position: absolute;
z-index: 2;
width: 100%;
height: 100%;
}
\ No newline at end of file
project.config.json
View file @ e4adeb6f
......@@ -37,7 +37,7 @@
"list": []
},
"miniprogram": {
"current": 6,
"current": 5,
"list": [
{
"id": 0,
......@@ -79,10 +79,10 @@
"referrerInfo": {}
},
{
"id": -1,
"id": 5,
"name": "写游记",
"pathName": "pages/Voucher/write/write",
"query": "",
"query": "orderId='20914'&tcid='3037'",
"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