Skip to content

T
TripFriend
Commit e155220f authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 1c7c5e88
Hide whitespace changes
Inline Side-by-side
Showing with 893 additions and 69 deletions
app.json
View file @ e155220f
......@@ -2,7 +2,6 @@
"pages": [
"pages/msg/index/index",
"pages/index/index",
"pages/welcome/welcome",
"pages/validateForm/validate/validate",
"pages/validateForm/validateEnd/validateEnd",
......@@ -15,7 +14,10 @@
"components/inputmodal/inputmodal",
"pages/index/tripDay/tripDay",
"pages/index/sceneDetail/sceneDetail",
"pages/index/hotelDetails/hotelDetails"
"pages/index/hotelDetails/hotelDetails",
"pages/index/mealDetail/mealDetail",
"pages/index/strateDateil/strateDateil",
"pages/Clockin/Clockin"
],
"window": {
"backgroundTextStyle": "light",
......
app.wxss
View file @ e155220f
......@@ -71,4 +71,10 @@
}
.bold{
font-weight: 700;
}
.clearfix::after{
display: block;
height: 0;
clear: both;
content: '';
}
\ No newline at end of file
pages/Clockin/Clockin.js 0 → 100644
View file @ e155220f
// pages/Clockin/Clockin.js
var util = require('../../utils/util.js')
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
uploadimgList:[],
msg:{
Name:'22222wwww',
Type:1,
SourceId:'2',
Score:0,
Description:'',
CreateBy:'37284',
ImgList:[],
},
grey:5,
index:false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log("options", options)
if (options.CreateBy){
let msg=this.data.msg;
msg.CreateBy = options.CreateBy;
msg.Name = options.Name;
msg.SourceId = options.SourceId;
msg.Type = options.Type;
this.setData({
msg:msg
})
}
if (options.index){
this.setData({
index:true
})
}
},
tiJiao(){
let msg=this.data.msg;
if (msg.Description==''){
util.showToast('text', '说些什么吧！', { duration: 2000 })
return;
}
app.$api('b2b_post_SetMXYToDayTourPunchCard', msg).then(res => {
console.log("res",res)
let pathUrl = (wx.getStorageSync('pathUrl'))
if (this.data.index){
wx.switchTab({ url: '/pages/index/index' })
}else{
wx.navigateTo({
url: pathUrl
})
}
}).catch(err => { })
},
bindinputText(e){
let val = e.detail.value;
let msg = this.data.msg;
msg.Description=val;
this.setData({
msg:msg
})
},
scoreColor(e){
let index = e.currentTarget.dataset.index;
let msg = this.data.msg;
msg.Score = index;
let grey = 5 - msg.Score;
this.setData({
msg: msg,
grey: grey
})
},
scoreGrey(e){
let index = e.currentTarget.dataset.index;
let msg=this.data.msg;
msg.Score = index + msg.Score;
let grey = 5 - msg.Score;
this.setData({
msg: msg,
grey: grey
})
},
deleteImg(e) {
let imgIndex= e.currentTarget.dataset.index;
let that = this;
let uploadimgList = that.data.uploadimgList;
uploadimgList.splice(imgIndex, 1)
let msg = that.data.msg;
msg.ImgList = uploadimgList;
that.setData({
uploadimgList: uploadimgList,
msg: msg,
})
},
upload() {
let that = this;
let uploadimgList = that.data.uploadimgList;
wx.chooseImage({
sourceType: ['album', 'camera'],
success: function (res) {
setTimeout(() => {
wx.showLoading({
title: '上传中，请稍后',
mask: true,
})
var tempFilePaths = res.tempFilePaths;
wx.uploadFile({
url: "https://upload.oytour.com/Upload?filePath=/Upload/Temporary/",
filePath: tempFilePaths[0],
name: 'file',
formData: {
'myfile': tempFilePaths[0],
},
// contentType:'multipart/form-data',
success: function (res) {
wx.hideLoading()
if (res.statusCode == 200) {
let url = "http://imgfile.oytour.com";
// let uploadInfo = that.data.uploadInfo;
let path = url + JSON.parse(res.data).FilePath;
uploadimgList.push(path)
let msg=that.data.msg;
msg.ImgList = uploadimgList;
that.setData({
uploadimgList: uploadimgList,
msg: msg
})
}
},
fail: function (res) {
wx.hideLoading();
util.showToast('text', '上传失败！', { duration: 2000 })
}
})
}, 300)
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/Clockin/Clockin.json 0 → 100644
View file @ e155220f
{
"usingComponents": {},
"navigationBarTitleText": "打卡",
"navigationStyle": "default"
}
\ No newline at end of file
pages/Clockin/Clockin.wxml 0 → 100644
View file @ e155220f
<view class="clock">
<view style="padding:30rpx;position:relative">
<image style="width:70rpx;height:70rpx;position: absolute;" src="../../images/index/adress.png"></image>
<view class="title">
<view style="padding-top:15rpx" class="f26">{{msg.Name}}</view>
<!-- <view class="f22 c99">大字汤本字居平14 岩瀬郡 天栄村, 福岛県 〒962-0621大字汤本字居平14 岩瀬郡 天栄村, 福岛県 〒962-0621</view> -->
</view>
</view>
<view class="hr"></view>
<view style="padding:30rpx;position:relative;">
<view style="border-bottom:1px solid #E2E2E2;padding:20rpx 0">
<text class="f26" style="margin-right:30rpx;position:relative;top:-10rpx">评分</text>
<image bindtap="scoreColor" wx:for="{{msg.Score}}" data-index="{{index+1}}" wx:key="index" style="width:40rpx;height:40rpx;margin-right:30rpx" src="../../images/index/all.png"></image>
<image bindtap="scoreGrey" wx:for="{{grey}}" data-index="{{index+1}}" wx:key="index" style="width:40rpx;height:40rpx;margin-right:30rpx" src="../../images/index/grey.png"></image>
<text class="f26" style="margin-right:12rpx;position:relative;top:-10rpx;color:#BAB9C1">{{msg.Score}}.0</text>
</view>
<view class="textarea">
<textarea bindinput="bindinputText" value="{{msg.Description}}" placeholder="来评价你游玩的这个地方吧" />
</view>
<view class="clearfix" style="padding:30rpx 0">
<view wx:for="{{uploadimgList}}" wx:key="index" class="picItem">
<image bindtap="deleteImg" data-index="{{index}}" class="closeImg" src="../../images/index/close.png"></image>
<image src="{{item}}"></image>
</view>
<view bindtap="upload" class="picItem upload">
<image src="../../images/index/pic.png"></image>
<view style="margin-top:15rpx" class="c99 f24">添加图片</view>
</view>
</view>
</view>
<view class="hr"></view>
<view bindtap="tiJiao" class="sumbitBtn">提交</view>
</view>
\ No newline at end of file
pages/Clockin/Clockin.wxss 0 → 100644
View file @ e155220f
/* pages/Clockin/Clockin.wxss */
.title{
width: 100%;
padding-left: 85rpx;
box-sizing: border-box;
}
.hr{
width: 100%;
height: 30rpx;
background: #FAFAFA;
}
.textarea{
font-size: 26rpx;
padding: 20rpx 0;
}
.textarea textarea{
height: 200rpx;
}
.picItem image{
max-width: 100%;
width: 100%;
border-radius:20rpx;
max-height: 100%;
}
.picItem{
position: relative;
width:210rpx;
height:210rpx;
border-radius:20rpx;
margin-right: 20rpx;
float: left;
margin-bottom: 20rpx;
}
.upload{
background:rgba(255,255,255,1);
box-shadow:0px 4rpx 10rpx 0px rgba(207,207,207,0.2);
display: inline-flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.upload image{
width: 61rpx;
height: 49rpx;
}
.sumbitBtn{
width:690rpx;
height:90rpx;
line-height:90rpx;
background:rgba(255,49,102,1);
border-radius:45rpx;
color:rgba(255,255,255,1);
font-size: 30rpx;
text-align: center;
margin:0 auto;
margin-top: 150rpx;
}
.closeImg{
position: absolute;
width: 40rpx!important;
height: 40rpx;
right: -20rpx;
top: -20rpx;
}
\ No newline at end of file
pages/index/hotelDetails/hotelDetails.js
View file @ e155220f
......@@ -12,6 +12,7 @@ Page({
GuestId:'37284'
},
dataInfo:{},
pathUrl:'',
},
/**
......@@ -19,8 +20,8 @@ Page({
*/
onLoad: function (options) {
console.log("options",options)
let msg = this.data.msg;
if (options.GuestId){
let msg = this.data.msg;
msg.GuestId = options.GuestId;
msg.Id = options.Id;
this.setData({
......@@ -28,6 +29,20 @@ Page({
})
}
this.getData();
let pathUrl = '/pages/index/hotelDetails/hotelDetails?GuestId=' + msg.GuestId + '&Id=' + msg.Id;
this.setData({
pathUrl: pathUrl
})
},
DakaBtn(e) {
let that = this;
let info = that.data.msg;
let Id = info.Id;
let GuestId = info.GuestId;
wx.navigateTo({
url: '/pages/Clockin/Clockin?CreateBy=' + GuestId + '&SourceId=' + Id + '&Type=' + info.Type + '&Name=' + this.data.dataInfo.Name
})
wx.setStorageSync('pathUrl', this.data.pathUrl)
},
getData(){
let msg = this.data.msg;
......
pages/index/hotelDetails/hotelDetails.wxml
View file @ e155220f
......@@ -3,13 +3,14 @@
<!-- <view class="index f30 bold">景点一</view> -->
<view style="position:relative" class="f42 bold">{{dataInfo.Name}}
<view class="dkBtn">
<text>打卡</text>
<text bindtap="DakaBtn" class="dk" wx:if="{{dataInfo.IsPunchCard==2}}">打卡</text>
<text class="wdk" wx:if="{{dataInfo.IsPunchCard==1}}">已打卡</text>
</view>
</view>
<view class="dakaView">
<view>
<image style="width:40rpx;height:40rpx" src="../../../images/index/adress.png"></image>
<text style="position:relative;top:-6rpx;margin-left:10rpx" class="f26">{{dataInfo.Address}}</text>
<view class="f26">
<image style="width:40rpx;height:40rpx;margin-right:10rpx;position:relative;top:8rpx" src="../../../images/index/adress.png"></image>
{{dataInfo.Address}}
</view>
</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:20rpx 0 20rpx 0">
......
pages/index/hotelDetails/hotelDetails.wxss
View file @ e155220f
......@@ -29,12 +29,18 @@
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(255, 49, 102, 1);
border-radius:25rpx;
text-align: center;
color:#FF3166;
font-size: 24rpx;
}
.dkBtn .dk{
border:2rpx solid rgba(255, 49, 102, 1);
color:#FF3166;
}
.dkBtn .wdk{
border:2rpx solid #E2E2E2;
color:#E2E2E2;
}
.funView{
border-top: 1px solid #E2E2E2;
height:90rpx;
......
pages/index/index.js
View file @ e155220f
......@@ -22,6 +22,7 @@ Page({
TCID:'',
// Date: util.YYMMDD(new Date()),
Date: '2019-11-03',
GuestId:0,
},
todayList:[],
......@@ -30,7 +31,9 @@ Page({
airState:true,
configId:'',
tcid:'',
pathUrl:'/pages/index/index'
},
//事件处理函数
bindViewTap: function() {
// wx.navigateTo({
......@@ -64,17 +67,36 @@ Page({
// }
// })
// }
let that=this;
},
onShow: function (){
let that = this;
let userInfo = (wx.getStorageSync('userInfo'))
if (userInfo){
if (userInfo) {
that.setData({
userInfo:userInfo,
loginState:false
userInfo: userInfo,
loginState: false
})
}
that.getData();
},
DakaBtn(e) {
console.log("e", e)
let that = this;
let userInfo = (wx.getStorageSync('userInfo'))
if (!userInfo) {
util.showToast('text', '请先核对身份！', { duration: 3000 })
return;
}
let info = e.currentTarget.dataset.item;
let Id = info.Id;
let GuestId = userInfo.GuestId;
wx.navigateTo({
url: '/pages/Clockin/Clockin?CreateBy=' + GuestId + '&SourceId=' + Id + '&Type=' + info.Type + '&Name=' + info.Name + '&index=true'
})
wx.setStorageSync('pathUrl', this.data.pathUrl)
},
goDetail(e){
let that = this;
let userInfo = (wx.getStorageSync('userInfo'))
......@@ -83,11 +105,32 @@ Page({
return;
}
let info = e.currentTarget.dataset.item;
console.log("info", info)
let Id = info.Id;
let GuestId = userInfo.GuestId;
let src="";
if (info.Type==4){
src ='/pages/index/hotelDetails/hotelDetails';
wx.navigateTo({
url: '/pages/index/hotelDetails/hotelDetails?GuestId=' + GuestId + '&Id=' + Id
url: src+'?GuestId=' + GuestId + '&Id=' + Id
})
}
if (info.Type==2) {
src = '/pages/index/sceneDetail/sceneDetail';
wx.navigateTo({
url: src + '?GuestId=' + GuestId + '&Id=' + Id
})
}
if (info.Type == 3) {
src = '/pages/index/mealDetail/mealDetail';
wx.navigateTo({
url: src + '?GuestId=' + GuestId + '&Id=' + Id
})
}
if (info.Type == 1) {
src = '/pages/index/strateDateil/strateDateil';
wx.navigateTo({
url: src + '?GuestId=' + GuestId + '&Id=' + Id
})
}
......@@ -190,12 +233,21 @@ Page({
},
getToday(){
let todayMsg = this.data.todayMsg;
let userInfo = (wx.getStorageSync('userInfo'))
if (userInfo){
todayMsg.GuestId = userInfo.GuestId;
this.setData({
todayMsg: todayMsg,
})
}
app.$api('b2b_get_GetMXYToDayTourList', todayMsg).then(res => {
if (res.Status==1){
this.setData({
todayList: res.List
})
console.log("todayList", this.data.todayList)
}
}).catch(err => { })
......
pages/index/index.wxml
View file @ e155220f
......@@ -141,20 +141,31 @@
</scroll-view>
</view>
<!-- 今日游玩 -->
<view class="toDayView">
<view wx:if="{{todayList.length>0}}" class="toDayView">
<view style="font-size:30rpx;font-weight:700;padding-left:30rpx">今日游玩</view>
<view bindtap="goDetail" data-item="{{item}}" wx:for="{{todayList}}" wx:key="index" class="ListItem">
<view class="imgLeft">
<image wx:if="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image>
<image wx:else src="../../images/index/default1.png"></image>
<image class="img1" src="{{item.ImgCover}}"></image>
<image class="img2" src="{{item.ImgCover}}"></image>
<block>
<image wx:if="{{item.ImgList && item.ImgList[0]}}" src="{{item.ImgList[0]}}"></image>
<image wx:elif="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image>
<image wx:else src="../../images/index/default1.png"></image>
</block>
<block>
<image class="img1" wx:if="{{item.ImgList && item.ImgList[1]}}" src="{{item.ImgList[1]}}"></image>
<image class="img1" wx:elif="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image>
<image class="img1" wx:else src="../../images/index/default1.png"></image>
</block>
<block>
<image class="img2" wx:if="{{item.ImgList && item.ImgList[2]}}" src="{{item.ImgList[1]}}"></image>
<image class="img2" wx:elif="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image>
<image class="img2" wx:else src="../../images/index/default1.png"></image>
</block>
</view>
<view class="right">
<view style="margin-top:10rpx" class="text2 c11 f30">{{item.Name}}</view>
<view style="margin:15rpx 0" class="text2 c99 f24">{{item.Address}}</view>
<view style="text-align:right;margin-top:20rpx">
<text wx:if="{{item.IsPunchCard==2}}" class="daka">打卡</text>
<text catchtap="DakaBtn" data-item="{{item}}" wx:if="{{item.IsPunchCard==2}}" class="daka">打卡</text>
<text wx:if="{{item.IsPunchCard==1}}" class="yidaka">已打卡</text>
</view>
......@@ -202,7 +213,8 @@
{{contactInfo.MobilePhone}}
</view>
<view style="color:#E2E2E2">————
<text class="c11 f22">收客信息</text> ————
<text class="c11 f22" wx:if="{{contactInfo.type==1}}">带团信息</text>
<text class="c11 f22" wx:else>收客信息</text> ————
</view>
</view>
<view style="margin:30rpx 0 30rpx 0" class="f32 bold">30</view>
......
pages/index/index.wxss
View file @ e155220f
......@@ -317,11 +317,9 @@
position: relative;
}
.ContactTc .contentView .typeView{
width:60rpx;
height:32rpx;
line-height:32rpx;
padding:8rpx 16rpx;
background:rgba(255,49,102,0.3);
border-radius:16rpx;
border-radius:24rpx;
color:#FF3166;
font-size: 20rpx;
text-align: center;
......
pages/index/mealDetail/mealDetail.js 0 → 100644
View file @ e155220f
// pages/index/sceneDetail/sceneDetail.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
msg: {
Id: '1540',
Type: 3,
GuestId: '37284'
},
dataInfo: {},
pathUrl:'',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log("options", options)
let msg = this.data.msg;
if (options.GuestId) {
msg.GuestId = options.GuestId;
msg.Id = options.Id;
this.setData({
msg: msg
})
}
this.getData();
let pathUrl = '/pages/index/mealDetail/mealDetail?GuestId=' + msg.GuestId + '&Id=' + msg.Id;
this.setData({
pathUrl: pathUrl
})
},
DakaBtn(e) {
let that = this;
let info = that.data.msg;
let Id = info.Id;
let GuestId = info.GuestId;
wx.navigateTo({
url: '/pages/Clockin/Clockin?CreateBy=' + GuestId + '&SourceId=' + Id + '&Type=' + info.Type + '&Name=' + this.data.dataInfo.Name
})
wx.setStorageSync('pathUrl', this.data.pathUrl)
},
getData() {
let msg = this.data.msg;
app.$api('b2b_get_GetMXYToDayTourInfo', msg).then(res => {
console.log("sfdasf", res)
this.setData({
dataInfo: res
})
}).catch(err => { })
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/index/mealDetail/mealDetail.json 0 → 100644
View file @ e155220f
{
"usingComponents": {},
"navigationBarTitleText": "详情",
"navigationStyle": "default"
}
\ No newline at end of file
pages/index/mealDetail/mealDetail.wxml 0 → 100644
View file @ e155220f
<view class="sceneDetail">
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<!-- <view class="index f30 bold">景点一</view> -->
<view style="word-break: break-all;" class="f42 bold">{{dataInfo.Name}}
</view>
<view class="dakaView">
<view class="f26">
<image style="width:40rpx;height:40rpx;margin-right:10rpx;position:relative;top:6rpx" src="../../../images/index/adress.png"></image>
{{dataInfo.Address}}
</view>
<view style="position:relative;top:-8rpx" class="dkBtn">
<text bindtap="DakaBtn" class="dk" wx:if="{{dataInfo.IsPunchCard==2}}">打卡</text>
<text class="wdk" wx:if="{{dataInfo.IsPunchCard==1}}">已打卡</text>
</view>
</view>
<view wx:if="{{dataInfo.OpeningHours && dataInfo.OpeningHours!=''}}" style="margin-top:10rpx" class="f24 c99">营业时间：{{dataInfo.OpeningHours}}</view>
<view wx:if="{{dataInfo.SupportCount && dataInfo.SupportCount!=''}}" style="margin-top:10rpx" class="f24 c99">餐厅人数：{{dataInfo.SupportCount}}</view>
<view wx:if="{{dataInfo.ParkInfo && dataInfo.ParkInfo!=''}}" style="margin-top:10rpx" class="f24 c99">停车说明：{{dataInfo.ParkInfo}}</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:40rpx 0 30rpx 0">
<image wx:if="{{item}}" style="width:100%" src="{{item}}"></image>
<image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
{{dataInfo.Feature}}
</view>
</view>
<!-- <view class="funView">
<image style="width:26rpx;height:26rpx" src="../../../images/index/jh.png"></image>
展开
</view> -->
</view>
\ No newline at end of file
pages/index/mealDetail/mealDetail.wxss 0 → 100644
View file @ e155220f
.sceneDetail{
width: 100%;
background: #FAFAFA;
}
.sceneDetail .item{
background: #fff;
margin-bottom: 20rpx;
}
.sceneDetail:last-child .item{
margin-bottom: 0;
}
.dakaView{
display: flex;
justify-content: space-between;
margin-top: 35rpx;
align-items: center;
}
.dakaView>view{
display: inline-block;
}
.dkBtn text{
display: inline-block;
width:128rpx;
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border-radius:25rpx;
text-align: center;
font-size: 24rpx;
}
.dkBtn .dk{
border:2rpx solid rgba(255, 49, 102, 1);
color:#FF3166;
}
.dkBtn .wdk{
border:2rpx solid #E2E2E2;
color:#E2E2E2;
}
.funView{
border-top: 1px solid #E2E2E2;
height:90rpx;
line-height:90rpx;
text-align: center;
font-size: 30rpx;
}
\ No newline at end of file
pages/index/sceneDetail/sceneDetail.js
View file @ e155220f
// pages/index/sceneDetail/sceneDetail.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
msg: {
Id: '2162',
Type: 2,
GuestId: '37284'
},
dataInfo: {},
pathUrl:'',
},
/**
......@@ -13,6 +20,40 @@ Page({
*/
onLoad: function (options) {
console.log("options", options)
let msg = this.data.msg;
if (options.GuestId) {
msg.GuestId = options.GuestId;
msg.Id = options.Id;
this.setData({
msg: msg
})
}
let pathUrl = '/pages/index/sceneDetail/sceneDetail?GuestId=' + msg.GuestId + '&Id=' + msg.Id;
this.setData({
pathUrl: pathUrl
})
this.getData();
},
DakaBtn(e) {
let that = this;
let info = that.data.msg;
let Id = info.Id;
let GuestId = info.GuestId;
wx.navigateTo({
url: '/pages/Clockin/Clockin?CreateBy=' + GuestId + '&SourceId=' + Id + '&Type=' + info.Type + '&Name=' + this.data.dataInfo.Name
})
wx.setStorageSync('pathUrl', this.data.pathUrl)
},
getData() {
let msg = this.data.msg;
app.$api('b2b_get_GetMXYToDayTourInfo', msg).then(res => {
console.log("sfdasf", res)
this.setData({
dataInfo: res
})
}).catch(err => { })
},
/**
......
pages/index/sceneDetail/sceneDetail.wxml
View file @ e155220f
<view class="sceneDetail">
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<view class="index f30 bold">景点一</view>
<view class="f42 bold">六本木之丘森大樓52F TokyoCityVie w展望台（夜景）
<!-- <view class="index f30 bold">景点一</view> -->
<view style="word-break: break-all;" class="f42 bold">{{dataInfo.Name}}
</view>
<view class="dakaView">
<view>
<image style="width:40rpx;height:40rpx" src="../../../images/index/adress.png"></image>
<text style="position:relative;top:-6rpx;margin-left:10rpx" class="f26">日本.东京</text>
<view class="f26">
<image style="width:40rpx;height:40rpx;margin-right:10rpx;position:relative;top:6rpx" src="../../../images/index/adress.png"></image>
{{dataInfo.Address}}
</view>
<view class="dkBtn">
<text>打卡</text>
<view style="position:relative;top:-8rpx" class="dkBtn">
<text bindtap="DakaBtn" class="dk" wx:if="{{dataInfo.IsPunchCard==2}}">打卡</text>
<text class="wdk" wx:if="{{dataInfo.IsPunchCard==1}}">已打卡</text>
</view>
</view>
<view style="margin:40rpx 0 30rpx 0">
<image style="width:100%" src="../../../images/index/default.png"></image>
<view style="margin-top:12rpx" class="f26">{{dataInfo.Remark}}</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:30rpx 0 30rpx 0">
<image wx:if="{{item}}" style="width:100%" src="{{item}}"></image>
<image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
我发现其实我没有单篇文章好好的写过六本木之丘，森大楼顶端的展望台(Tokyo City View) 这个景点。来分夜景和日景介绍一番吧。从2004年到现在，我应该已经上去不下五次了。本篇照的比较好的六张是网友尼克的大作啦，很感谢他。照片出自 [尼克的东京自助摄影旅行;东京铁塔与六本木之丘夜景] 。如果要我推荐东京只去一个景点，比方说跟团有一天可以自由行动，我就会推荐这里。
{{dataInfo.Feature}}
</view>
</view>
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<view class="index f30 bold">景点一</view>
<view class="f42 bold">六本木之丘森大樓52F TokyoCityVie w展望台（夜景）
</view>
<view class="dakaView">
<view>
<image style="width:40rpx;height:40rpx" src="../../../images/index/adress.png"></image>
<text style="position:relative;top:-6rpx;margin-left:10rpx" class="f26">日本.东京</text>
</view>
<view class="dkBtn">
<text>打卡</text>
</view>
</view>
<view style="margin:40rpx 0 30rpx 0">
<image style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
我发现其实我没有单篇文章好好的写过六本木之丘，森大楼顶端的展望台(Tokyo City View) 这个景点。来分夜景和日景介绍一番吧。从2004年到现在，我应该已经上去不下五次了。本篇照的比较好的六张是网友尼克的大作啦，很感谢他。照片出自 [尼克的东京自助摄影旅行;东京铁塔与六本木之丘夜景] 。如果要我推荐东京只去一个景点，比方说跟团有一天可以自由行动，我就会推荐这里。
</view>
</view>
<view class="funView">
<!-- <view class="funView">
<image style="width:26rpx;height:26rpx" src="../../../images/index/jh.png"></image>
展开
</view>
</view> -->
</view>
\ No newline at end of file
pages/index/sceneDetail/sceneDetail.wxss
View file @ e155220f
.sceneDetail{
width: 100%;
background: #FAFAFA;
......@@ -12,7 +13,7 @@
.dakaView{
display: flex;
justify-content: space-between;
margin-top: 35rpx;
margin-top: 28rpx;
align-items: center;
}
.dakaView>view{
......@@ -24,12 +25,18 @@
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(255, 49, 102, 1);
border-radius:25rpx;
text-align: center;
color:#FF3166;
font-size: 24rpx;
}
.dkBtn .dk{
border:2rpx solid rgba(255, 49, 102, 1);
color:#FF3166;
}
.dkBtn .wdk{
border:2rpx solid #E2E2E2;
color:#E2E2E2;
}
.funView{
border-top: 1px solid #E2E2E2;
height:90rpx;
......
pages/index/strateDateil/strateDateil.js 0 → 100644
View file @ e155220f
// pages/index/sceneDetail/sceneDetail.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
msg: {
Id: '2',
Type: 1,
GuestId: '37284'
},
dataInfo: {},
pathUrl:'',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log("options", options)
let msg = this.data.msg;
if (options.GuestId) {
msg.GuestId = options.GuestId;
msg.Id = options.Id;
this.setData({
msg: msg
})
}
this.getData();
let pathUrl = '/pages/index/strateDateil/strateDateil?GuestId=' + msg.GuestId + '&Id=' + msg.Id;
this.setData({
pathUrl: pathUrl
})
},
DakaBtn(e) {
let that = this;
let info = that.data.msg;
let Id = info.Id;
let GuestId = info.GuestId;
wx.navigateTo({
url: '/pages/Clockin/Clockin?CreateBy=' + GuestId + '&SourceId=' + Id + '&Type=' + info.Type + '&Name=' + this.data.dataInfo.Name
})
wx.setStorageSync('pathUrl', this.data.pathUrl)
},
getData() {
let msg = this.data.msg;
app.$api('b2b_get_GetMXYToDayTourInfo', msg).then(res => {
let content = res.Content;
res.Content = content.replace(/\<img/gi, '<img style="width:100%;height:auto;border-radius:20rpx" ')
console.log("res", res)
this.setData({
dataInfo: res
})
}).catch(err => { })
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/index/strateDateil/strateDateil.json 0 → 100644
View file @ e155220f
{
"usingComponents": {},
"navigationBarTitleText": "详情",
"navigationStyle": "default"
}
\ No newline at end of file
pages/index/strateDateil/strateDateil.wxml 0 → 100644
View file @ e155220f
<view class="sceneDetail">
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<!-- <view class="index f30 bold">景点一</view> -->
<view style="word-break: break-all;" class="f42 bold">{{dataInfo.Name}}
</view>
<view class="dakaView">
<view class="f26">
<image style="width:40rpx;height:40rpx;margin-right:10rpx;position:relative;top:6rpx" src="../../../images/index/adress.png"></image>
{{dataInfo.Address}}
</view>
<view class="dkBtn">
<text class="dk" wx:if="{{dataInfo.IsPunchCard==2}}">打卡</text>
<text class="wdk" wx:if="{{dataInfo.IsPunchCard==1}}">已打卡</text>
</view>
</view>
<view style="margin-top:12rpx" class="f26">{{dataInfo.Remark}}</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:30rpx 0 30rpx 0">
<image wx:if="{{item}}" style="width:100%;border-radius:20rpx" src="{{item}}"></image>
<image wx:else style="width:100%;border-radius:20rpx" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
<rich-text nodes="{{dataInfo.Content}}"></rich-text>
</view>
</view>
<!-- <view class="funView">
<image style="width:26rpx;height:26rpx" src="../../../images/index/jh.png"></image>
展开
</view> -->
</view>
\ No newline at end of file
pages/index/strateDateil/strateDateil.wxss 0 → 100644
View file @ e155220f
.sceneDetail{
width: 100%;
background: #FAFAFA;
}
.sceneDetail .item{
background: #fff;
margin-bottom: 20rpx;
}
.sceneDetail:last-child .item{
margin-bottom: 0;
}
.dakaView{
display: flex;
justify-content: space-between;
margin-top: 28rpx;
align-items: center;
}
.dakaView>view{
display: inline-block;
}
.dkBtn text{
display: inline-block;
width:128rpx;
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border-radius:25rpx;
text-align: center;
font-size: 24rpx;
}
.dkBtn .dk{
border:2rpx solid rgba(255, 49, 102, 1);
color:#FF3166;
}
.dkBtn .wdk{
border:2rpx solid #E2E2E2;
color:#E2E2E2;
}
.funView{
border-top: 1px solid #E2E2E2;
height:90rpx;
line-height:90rpx;
text-align: center;
font-size: 30rpx;
}
\ No newline at end of file
pages/index/tripDay/tripDay.wxml
View file @ e155220f
......@@ -13,7 +13,7 @@
<text class="circle"></text>
<view>
<text class="f22 c99">景点</text>
<text style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.CouponsName}}</text>
<text wx:if="{{item.childItem.CouponsName}}" style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.CouponsName}}</text>
<text wx:if="{{item.childItem.PlayTimeHour && item.childItem.PlayTimeHour!=''}}" class="f22 c99">{{item.childItem.PlayTimeHour}}小时</text>
<text wx:if="{{item.childItem.PlayTimeMinutes && item.childItem.PlayTimeMinutes!=''}}" class="f22 c99">{{item.childItem.PlayTimeMinutes}}分钟</text>
</view>
......@@ -49,7 +49,7 @@
<text class="circle"></text>
<view>
<text class="f22 c99">酒店</text>
<text style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.NewHotelName}}</text>
<text style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.HotelName}}</text>
</view>
<!-- <view wx:for="{{item.childItem.ImaArray}}" wx:key="index" wx:for-item="img" class="img">
<image wx:if="{{img.Url && img.Url!=''}}" src="{{img.Url}}"></image>
......
pages/validateForm/validateEnd/validateEnd.js
View file @ e155220f
......@@ -51,17 +51,13 @@ Page({
})
},
getInfo(){
let info = this.data.info;
console.log("info", info)
app.$api('b2b_get_GetMXYTravelOrderInfo', info).then(res => {
console.log("res", res);
if (res.IsOK==1){
let userInfo = res.Info
wx.setStorageSync('userInfo', userInfo)
wx.navigateTo({
url: '/pages/index/index'
})
wx.switchTab({ url: '/pages/index/index' })
}
}).catch(err => { })
......
project.config.json
View file @ e155220f
......@@ -102,6 +102,27 @@
"id": -1,
"name": "酒店详情",
"pathName": "pages/index/hotelDetails/hotelDetails",
"query": "",
"scene": null
},
{
"id": -1,
"name": "餐厅",
"pathName": "pages/index/mealDetail/mealDetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "攻略详情",
"pathName": "pages/index/strateDateil/strateDateil",
"query": "",
"scene": null
},
{
"id": -1,
"name": "打卡",
"pathName": "pages/Clockin/Clockin",
"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