Commit a7efb8f5 authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/viitto/tripfriend

# Conflicts:
#	app.json
#	utils/util.js
parents 2eae9797 e27d5638
...@@ -46,7 +46,8 @@ import PAGE_CONFIG from './config/pageConfig.js' ...@@ -46,7 +46,8 @@ import PAGE_CONFIG from './config/pageConfig.js'
const { Provider } = WeAppRedux; const { Provider } = WeAppRedux;
const store = createStore(reducer) // redux store const store = createStore(reducer) // redux store
let md5 = require('utils/md5.js')
let netUrl = 'http://testapi.oytour.com/api/common/post';
App( App(
Provider(store)( Provider(store)(
{ {
...@@ -86,7 +87,52 @@ App( ...@@ -86,7 +87,52 @@ App(
height: systemInfo.windowHeight height: systemInfo.windowHeight
} }
this.globalData.isPushBeCallPage = false this.globalData.isPushBeCallPage = false
} },
token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9',
// 请求接口
$api: function (url, data) {
var promise = new Promise((resolve, reject) => {
wx.showLoading({
title: '加载中',
});
let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + "" + '&' + 'key=' + '')
wx.request({
url: netUrl,
method: 'POST',
data: {
cmd: url,
msg: data,
timestamp: timestamp,
token: "",
sign: sign
},
success(res) {
wx.hideLoading()
if (res.data.resultCode === 1) {
resolve(res.data.data);
} else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) {
// wx.navigateTo({
// url: '/pages/login/login'
// })
wx.showToast({
title: res.data.message,
icon: 'none',
duration: 1000
})
} else {
wx.showToast({
title: res.data.message,
icon: 'none',
duration: 1000
})
reject(res.data)
}
}
})
})
return promise;
},
} }
) )
) )
{ {
"pages": [ "pages": [
"pages/msg/index/index",
"pages/index/index", "pages/index/index",
"pages/msg/index/index",
"pages/welcome/welcome", "pages/welcome/welcome",
"pages/validateForm/validate/validate", "pages/validateForm/validate/validate",
"pages/validateForm/validateEnd/validateEnd", "pages/validateForm/validateEnd/validateEnd",
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
"components/emoji/emoji", "components/emoji/emoji",
"components/inputclear/inputclear", "components/inputclear/inputclear",
"components/inputmodal/inputmodal" "components/inputmodal/inputmodal"
"pages/video/index",
"pages/webview/webview"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
......
...@@ -8,3 +8,36 @@ ...@@ -8,3 +8,36 @@
padding: 200rpx 0; padding: 200rpx 0;
box-sizing: border-box; box-sizing: border-box;
} }
.f40{
font-size: 40rpx;
}
.f20{
font-size: 20rpx;
}
.f24{
font-size: 24rpx;
}
.f22{
font-size: 22rpx;
}
.c11{
color:#111111;
}
.c99{
color:#999999;
}
.text1 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.text2 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
\ No newline at end of file
//index.js //index.js
//获取应用实例 //获取应用实例
const app = getApp() const app = getApp()
var util = require('../../utils/util.js')
Page({ Page({
data: { data: {
motto: 'Hello World', motto: 'Hello World',
userInfo: {}, userInfo: {},
hasUserInfo: false, hasUserInfo: false,
canIUse: wx.canIUse('button.open-type.getUserInfo') canIUse: wx.canIUse('button.open-type.getUserInfo'),
indicatorDots: true,
vertical: false,
autoplay: false,
interval: 2000,
duration: 500,
loginState:true,
dataInfo:{},
todayMsg:{
ConfigId:0,
TCID:'',
// Date: util.YYMMDD(new Date()),
Date: '2019-11 - 02',
},
todayList:[],
contactState:true,
contactInfo:{},
}, },
//事件处理函数 //事件处理函数
bindViewTap: function() { bindViewTap: function() {
...@@ -16,35 +35,131 @@ Page({ ...@@ -16,35 +35,131 @@ Page({
// }) // })
}, },
onLoad: function () { onLoad: function () {
if (app.globalData.userInfo) { // if (app.globalData.userInfo) {
// this.setData({
// userInfo: app.globalData.userInfo,
// hasUserInfo: true
// })
// } else if (this.data.canIUse){
// // 由于 getUserInfo 是网络请求,可能会在 Page.onLoad 之后才返回
// // 所以此处加入 callback 以防止这种情况
// app.userInfoReadyCallback = res => {
// this.setData({
// userInfo: res.userInfo,
// hasUserInfo: true
// })
// }
// } else {
// // 在没有 open-type=getUserInfo 版本的兼容处理
// wx.getUserInfo({
// success: res => {
// app.globalData.userInfo = res.userInfo
// this.setData({
// userInfo: res.userInfo,
// hasUserInfo: true
// })
// }
// })
// }
let that=this;
let userInfo = (wx.getStorageSync('userInfo'))
if (userInfo){
that.setData({
userInfo:userInfo,
loginState:false
})
}
that.getData();
},
closeState(e){
this.setData({
contactState:true,
})
},
noThing(e){
},
goWeb(e){
let info = e.currentTarget.dataset.item;
let name = info.Name;
wx.navigateTo({
url: '/pages/webview/webview?name='+name
})
},
getContact(e){
let info = e.currentTarget.dataset.item;
let type = e.currentTarget.dataset.type;
let contactInfo = this.data.contactInfo;
contactInfo.type = type;
if(type==1){
contactInfo.Name = info.Surname + info.Name;
contactInfo.MobilePhone = info.MobilePhone;
contactInfo.LdNum = info.LdNum;
contactInfo.LdPhoto = info.LdPhoto;
}
if (type == 2) {
contactInfo.Name = info.Surname + info.Name;
contactInfo.MobilePhone = info.MobilePhone;
contactInfo.DyNum = info.DyNum;
contactInfo.LdPhoto = info.DyPhoto;
}
if (type == 3) {
contactInfo.Name = info.Contact;
contactInfo.MobilePhone = info.ContactNumber;
contactInfo.DyNum =info.CustomerNum;
contactInfo.LdPhoto = info.CustomerPhoto;
}
this.setData({
contactState:false,
contactInfo: contactInfo,
})
},
getData(){
let userInfo = this.data.userInfo;
let msg={
ConfigId:0,
TCID:'7003',
OrderId: userInfo.OrderId ? userInfo.OrderId:'',
CityId: userInfo.DepartureCityId ? userInfo.DepartureCityId:''
};
app.$api('b2b_get_GetMXYTravelIndexInfo', msg).then(res => {
if (res.CityList.length>0){
res.CityList.forEach(item=>{
item.all = parseInt(item.Score);
item.grey = 5- parseInt(item.Score);
})
}
let todayMsg = this.data.todayMsg;
todayMsg.ConfigId = res.configId;
todayMsg.TCID = res.tcid;
this.setData({ this.setData({
userInfo: app.globalData.userInfo, dataInfo:res,
hasUserInfo: true todayMsg: todayMsg
}) })
} else if (this.data.canIUse){ this.getToday();
// 由于 getUserInfo 是网络请求,可能会在 Page.onLoad 之后才返回 }).catch(err => { })
// 所以此处加入 callback 以防止这种情况 },
app.userInfoReadyCallback = res => { getToday(){
let todayMsg = this.data.todayMsg;
app.$api('b2b_get_GetMXYToDayTourList', todayMsg).then(res => {
if (res.Status==1){
this.setData({ this.setData({
userInfo: res.userInfo, todayList: res.List
hasUserInfo: true
}) })
} }
} else {
// 在没有 open-type=getUserInfo 版本的兼容处理 }).catch(err => { })
wx.getUserInfo({ },
success: res => { goCard(){
app.globalData.userInfo = res.userInfo wx.navigateTo({
this.setData({ url: '/pages/validateForm/validate/validate'
userInfo: res.userInfo, })
hasUserInfo: true
})
}
})
}
}, },
getUserInfo: function(e) { getUserInfo: function(e) {
console.log(e)
app.globalData.userInfo = e.detail.userInfo app.globalData.userInfo = e.detail.userInfo
this.setData({ this.setData({
userInfo: e.detail.userInfo, userInfo: e.detail.userInfo,
......
{ {
"usingComponents": {} "usingComponents": {},
"navigationBarTitleText": "首页",
"navigationStyle": "custom"
} }
\ No newline at end of file
<!--index.wxml--> <!--index.wxml-->
<view class="container"> <!-- <view class="container">
<view class="userinfo"> <view class="userinfo">
<button wx:if="{{!hasUserInfo && canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button> <button wx:if="{{!hasUserInfo && canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
<block wx:else> <block wx:else>
...@@ -10,4 +10,207 @@ ...@@ -10,4 +10,207 @@
<view class="usermotto"> <view class="usermotto">
<text class="user-motto">{{motto}}</text> <text class="user-motto">{{motto}}</text>
</view> </view>
</view> -->
<!-- // -->
<!-- <view hidden="{{!loginState}}" class="titleContent">
<view class="f40" style="font-weight:600">尊敬的客户您好,请进行您的身份识别</view>
<view class="qhd">
<text bindtap="goCard">去核对</text>
</view>
</view> -->
<!-- hidden="{{loginState}}" -->
<view class="Index">
<view class="titleContent">
<view class="f40" style="font-weight:600">{{dataInfo.LtName}} </view>
<view hidden="{{!loginState}}" class="f24">尊敬的客户您好,请进行您的身份识别</view>
<view hidden="{{!loginState}}" class="qhd">
<text bindtap="goCard">去核对</text>
</view>
</view>
<view class="headView">
<scroll-view scroll-x class="scroll-header">
<view bindtap="goWeb" data-item="{{item}}" wx:for="{{dataInfo.CityList}}" wx:key="index" class="scroll-view-item">
<image wx:if="{{item.Images && item.Images!=''}}" class="image" src="{{item.Images}}"></image>
<image wx:else class="image" src="../../images/index/default.png"></image>
<view class="cityView">
<view style="font-size:30rpx">{{item.Name}}</view>
<view style="font-size:26rpx">
<block wx:key="index" wx:for="{{item.all}}">
<image src="../../images/index/all.png"></image>
</block>
<block wx:key="index" wx:for="{{item.grey}}">
<image src="../../images/index/grey.png"></image>
</block>
{{item.Score}}分
</view>
</view>
</view>
</scroll-view>
</view>
<view class="timeView">
<view style="font-size:30rpx;font-weight:700">重要时间</view>
<swiper class="swiper-box" style="height:240rpx" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
<block>
<swiper-item>
<view class="item">
<view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image>
<text class="title">集合时间</text>
<text class="right">{{dataInfo.GatherTime}}</text>
</view>
<view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/hb.png"></image>
<text class="title">启程航班号</text>
<text class="right">{{dataInfo.FlightNumStart}}</text>
</view>
<view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/hbsj.png"></image>
<text class="title">启程航班时间</text>
<text class="right">{{dataInfo.FlightStartTime}}</text>
</view>
</view>
</swiper-item>
</block>
<block>
<swiper-item>
<view class="item">
<!-- <view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image>
<text class="title">集合时间</text>
<text class="right">2020-03-15 09:00</text>
</view> -->
<view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/hb.png"></image>
<text class="title">返程航班号</text>
<text class="right">{{dataInfo.FlightNumBack}}</text>
</view>
<view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/hbsj.png"></image>
<text class="title">返程航班班时间</text>
<text class="right">{{dataInfo.FlightBackTime}}</text>
</view>
</view>
</swiper-item>
</block>
</swiper>
</view>
<view class="ContactView">
<view style="font-size:30rpx;font-weight:700;padding-left:30rpx">重要联系人</view>
<scroll-view scroll-x class="scroll-header">
<view bindtap="getContact" data-item="{{dataInfo.LeaderModel}}" data-type="{{1}}" class="scroll-view-item">
<view>
<image wx:if="{{dataInfo.LeaderModel.LdPhoto && dataInfo.LeaderModel.LdPhoto!=''}}" src="{{dataInfo.LeaderModel.LdPhoto}}"></image>
<image wx:else src="../../images/index/default.png"></image>
</view>
<view class="f24 c11">{{dataInfo.LeaderModel.Surname}}{{dataInfo.LeaderModel.Name}}</view>
<view style="padding:15rpx 0" class="f22 c99">领队</view>
<view class="fgView"></view>
</view>
<view bindtap="getContact" data-item="{{dataInfo.GuideModel}}" data-type="{{2}}" class="scroll-view-item">
<view>
<image wx:if="{{dataInfo.GuideModel.DyPhoto && dataInfo.GuideModel.DyPhoto!=''}}" src="{{dataInfo.GuideModel.DyPhoto}}"></image>
<image wx:else src="../../images/index/default.png"></image>
</view>
<view class="f24 c11">{{dataInfo.GuideModel.Surname}}{{dataInfo.GuideModel.Name}}</view>
<view style="padding:15rpx 0" class="f22 c99">导游</view>
<view class="fgView"></view>
</view>
<view bindtap="getContact" data-item="{{dataInfo.CustomerModel}}" data-type="{{3}}" class="scroll-view-item">
<view>
<image wx:if="{{dataInfo.CustomerModel.CustomerPhoto && dataInfo.CustomerModel.CustomerPhoto!=''}}" src="{{dataInfo.CustomerModel.CustomerPhoto}}"></image>
<image wx:else src="../../images/index/default.png"></image>
</view>
<view class="f24 c11">{{dataInfo.CustomerModel.Contact}}</view>
<view style="padding:15rpx 0" class="f22 c99">销售顾问</view>
<view class="fgView"></view>
</view>
</scroll-view>
</view>
<view class="XcView">
<view style="font-size:30rpx;font-weight:700;padding-left:30rpx">行程概览</view>
<scroll-view scroll-x class="scroll-header">
<view wx:for="{{dataInfo.JourneyDayImgList}}" wx:key="index" class="scroll-view-item">
<image class="img" wx:if="{{item.Images.Url && item.Images.Url!=''}}" src="{{item.Images.Url}}"></image>
<image wx:else src="../../images/index/default.png"></image>
<text style="color:#fff;font-size:36rpx;font-weight:700">Day{{item.DayNum}}</text>
</view>
</scroll-view>
</view>
<!-- 今日游玩 -->
<view class="toDayView">
<view style="font-size:30rpx;font-weight:700;padding-left:30rpx">今日游玩</view>
<view 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>
</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 wx:if="{{item.IsPunchCard==1}}" class="yidaka">已打卡</text>
</view>
</view>
</view>
</view>
<!-- 商品推荐 -->
<!-- <view class="toDayView" style="margin-top:20rpx">
<view style="font-size:30rpx;font-weight:700;padding-left:30rpx">商品推荐</view>
<view class="ListItem">
<view class="imgLeft">
<image src="../../images/index/hb.png"></image>
</view>
<view class="right">
<view class="text1 c11 f30">日本花王尿不湿 XL48片</view>
<view class="labelItem" style="margin:15rpx 0">
<text>12-17</text>
</view>
<view style="color:#FB211E;margin-top:30rpx">
<text class="f22">¥</text>
<text class="f32">105</text>
</view>
<view class="f20 c99">
评价或者店铺或者其他什么吧
</view>
</view>
</view>
</view> -->
</view> </view>
<!-- 弹窗 -->
<view catchtap="closeState" data-self="self" hidden="{{contactState}}" class="ContactTc">
<view catchtap="noThing" data-self="no" class="contentView">
<image wx:if="{{contactInfo.LdPhoto && contactInfo.LdPhoto!=''}}" class="photo" src="{{contactInfo.LdPhoto}}"></image>
<image wx:else class="photo" src="../../images/index/default.png"></image>
<view style="padding-top:85rpx">
<view class="c11 f32">
<text class="bold">{{contactInfo.Name}}</text>
<text class="typeView" wx:if="{{contactInfo.type==1}}">领队</text>
<text class="typeView" wx:if="{{contactInfo.type==2}}">导游</text>
<text class="typeView" wx:if="{{contactInfo.type==3}}">销售顾问</text>
</view>
<view style="margin:30rpx 0 30rpx 0" class="f24 c99">
<image style="width:22rpx;height:22rpx" src="../../images/index/phone.png"></image>
{{contactInfo.MobilePhone}}
</view>
<view style="color:#E2E2E2">————
<text class="c11 f22">收客信息</text> ————
</view>
</view>
<view style="margin:30rpx 0 30rpx 0" class="f32 bold">30</view>
<view wx:if="{{contactInfo.type==3}}" class="f22">报名数量</view>
<view wx:else class="f22">带团次数</view>
<view class="lxView">
<image style="width:30rpx;height:30rpx;position: relative;top:4rpx" src="../../images/index/lx.png"></image>
联系他
</view>
</view>
</view>
\ No newline at end of file
/**index.wxss**/ /**index.wxss**/
.userinfo { .userinfo {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -18,4 +19,289 @@ ...@@ -18,4 +19,289 @@
.usermotto { .usermotto {
margin-top: 200px; margin-top: 200px;
}
\ No newline at end of file }
.titleContent{
padding: 0 30rpx;
box-sizing: border-box;
position: relative;
margin-top:150rpx;
}
.titleContent .qhd{
text-align: center;
line-height:60rpx;
border-radius:30rpx;
font-size: 24rpx;
margin-top: 30rpx;
position: absolute;
right: 20rpx;
top: -8rpx;
}
.titleContent .qhd text{
width:128rpx;
height:60rpx;
display: inline-block;
border: 2rpx solid #FF3166;
color: #FF3166;
border-radius: 40rpx;
}
.Index .titleView {
font-size: 34rpx;
text-align: center;
}
.headView .scroll-header {
display: flex;
white-space: nowrap;
padding: 30rpx;
box-sizing: border-box;
}
.headView .scroll-header .scroll-view-item {
height: 390rpx;
width:604rpx;
display: inline-block;
position: relative;
margin-right: 30rpx;
overflow: hidden;
}
.headView .scroll-header .scroll-view-item .image{
max-width: 100%;
min-height:100%;
}
.headView .scroll-header .scroll-view-item:last-child{
margin-right: 0;
}
.headView .scroll-view-item .cityView{
position: absolute;
bottom: 24rpx;
width: 100%;
padding: 30rpx 30rpx 0 30rpx;
box-sizing: border-box;
/* color:#fff; */
}
.headView .scroll-view-item .cityView image{
width:24rpx;
height: 24rpx;
}
.timeView{
padding: 0 30rpx;
box-sizing: border-box;
}
.timeView .item .itemView{
display: flex;
align-items: center;
margin-top:20rpx;
position: relative;
}
.timeView .item .title{
font-size: 24rpx;
color:#999999;
margin-left: 25rpx;
}
.timeView .item .right{
font-size: 26rpx;
color:#111111;
position: absolute;
right: 0;
}
.swiper-box .wx-swiper-dot{
width:10rpx;
height:6rpx;
display: inline-flex;
margin-left: 6rpx;
justify-content:space-between;
}
.swiper-box .wx-swiper-dot::before{
content: '';
flex-grow: 1;
background:rgba(204,204,204,1);
border-radius: 3rpx;
}
.swiper-box .wx-swiper-dot-active{
width:40rpx!important;
}
.swiper-box .wx-swiper-dot-active::before{
background:rgba(255,49,102,1);
}
/* 联系人 */
.ContactView .scroll-header {
display: flex;
white-space: nowrap;
padding: 30rpx;
box-sizing: border-box;
}
.ContactView .scroll-header .scroll-view-item {
display: inline-flex;
position: relative;
margin-right: 25rpx;
width:210rpx;
height:240rpx;
background:rgba(255,255,255,1);
box-shadow:0px 4rpx 10rpx 0px rgba(207,207,207,0.2);
border-radius:20rpx;
align-items: center;
justify-content: center;
flex-direction: column;
}
.ContactView .scroll-header .scroll-view-item:last-child{
margin-right: 0;
}
.ContactView .scroll-header .scroll-view-item image{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
}
.ContactView .fgView{
width:120rpx;
height:6rpx;
background:rgba(255,49,102,1);
border-radius:3rpx;
}
/* 行程概览 */
.XcView .scroll-header {
display: flex;
white-space: nowrap;
padding: 30rpx;
box-sizing: border-box;
}
.XcView .scroll-header .scroll-view-item {
display: inline-flex;
position: relative;
margin-right: 30rpx;
width:300rpx;
height:140rpx;
border-radius:20rpx;
align-items: center;
justify-content: center;
flex-direction: column;
overflow: hidden;
}
.XcView .scroll-header .scroll-view-item image{
min-height: 100%;
width: 100%;
position: absolute;
}
.XcView .scroll-header .scroll-view-item text{
position: relative;
z-index: 100;
}
.XcView .scroll-header .scroll-view-item:last-child{
margin-right: 0;
}
.toDayView .ListItem{
position: relative;
padding: 30rpx;
box-sizing: border-box;
border-bottom: 1px solid #E2E2E2;
min-height: 300rpx;
}
.toDayView .ListItem:last-child{
border: none;
}
.toDayView .ListItem .imgLeft{
position: absolute;
width:200rpx;
height:260rpx;
border-radius:20rpx;
}
.toDayView .ListItem .imgLeft image{
width: 100%;
height: 100%;
}
.toDayView .ListItem .right{
width: 100%;
padding-left: 230rpx;
box-sizing: border-box;
}
.toDayView .daka{
width:128rpx;
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(255, 49, 102, 1);
border-radius:25rpx;
display: inline-block;
text-align: center;
font-size: 24rpx;
color:#FF3166;
}
.toDayView .yidaka{
display: inline-block;
width:128rpx;
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(188, 188, 188, 1);
border-radius:25rpx;
text-align: center;
font-size: 24rpx;
}
.toDayView .labelItem text{
padding:10rpx 15rpx;
color:#999999;
font-size: 20rpx;
background: #F5F5F5;
border-radius:20rpx;
}
.ContactTc{
position: fixed;
z-index: 100;
background:rgba(0,0,0,0.5);
width: 100%;
height:100%;
top: 0;
left: 0;
}
.ContactTc .contentView{
width:560rpx;
height:640rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
margin: 0 auto;
margin-top: 290rpx;
position: relative;
text-align: center;
}
.ContactTc .contentView .photo{
width:150rpx;
height:150rpx;
border-radius:50%;
top: -75rpx;
position: absolute;
left: 200rpx;
}
.ContactTc .contentView .lxView{
width:440rpx;
height:90rpx;
line-height:90rpx;
background:rgba(255,49,102,1);
border-radius:45rpx;
text-align: center;
display: inline-block;
font-size: 30rpx;
margin-top: 80rpx;
color:#fff;
position: relative;
}
.ContactTc .contentView .typeView{
width:60rpx;
height:32rpx;
line-height:32rpx;
background:rgba(255,49,102,0.3);
border-radius:16rpx;
color:#FF3166;
font-size: 20rpx;
text-align: center;
display: inline-block;
margin-left: 15rpx;
}
{ {
"usingComponents": {} "usingComponents": {},
"navigationStyle": "custom"
} }
\ No newline at end of file
{ {
"usingComponents": {} "navigationStyle": "custom"
} }
\ No newline at end of file
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<text class="h1">选择身份核对</text> <text class="h1">选择身份核对</text>
<text class="h3">尊敬的客人,为保障您能获取到真实的团队信息</text> <text class="h3">尊敬的客人,为保障您能获取到真实的团队信息</text>
</view> </view>
<view class="ci idcard {{chosenType==0?'active':''}}" bindtap="changeChosenType" data-type="0"> <view class="ci idcard {{chosenType==1?'active':''}}" bindtap="changeChosenType" data-type="1">
<text class="h2">身份证</text> <text class="h2">身份证</text>
<text class="h6">ID CARD</text> <text class="h6">ID CARD</text>
</view> </view>
<view class="ci parpt {{chosenType==1?'active':''}}" bindtap="changeChosenType" data-type="1"> <view class="ci parpt {{chosenType==2?'active':''}}" bindtap="changeChosenType" data-type="2">
<text class="h2">护照</text> <text class="h2">护照</text>
<text class="h6">PASSPORT</text> <text class="h6">PASSPORT</text>
</view> </view>
......
// pages/validateForm/validateEnd/validateEnd.js // pages/validateForm/validateEnd/validateEnd.js
let app = getApp();
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
type:0 type:0,
info:{
type:1,
TCID:'7003',
Number:'51010219540703436X',
},
}, },
/** /**
...@@ -13,8 +20,11 @@ Page({ ...@@ -13,8 +20,11 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
if(options.type){ if(options.type){
let info=this.data.info;
info.type = options.type;
this.setData({ this.setData({
type: options.type type: options.type,
info: info
}); });
} }
}, },
...@@ -31,6 +41,30 @@ Page({ ...@@ -31,6 +41,30 @@ Page({
*/ */
onShow: function () { onShow: function () {
},
numberInput(e){
let val = e.detail.value;
let info = this.data.info;
info.Number = val;
this.setData({
info: info,
})
},
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'
})
}
}).catch(err => { })
}, },
/** /**
......
<view class="container"> <view class="container">
<view class="ci idcard active" wx:if="{{type==0}}"> <view class="ci idcard active" wx:if="{{type==1}}">
<text class="h2">身份证</text> <text class="h2">身份证</text>
<text class="h6">ID CARD</text> <text class="h6">ID CARD</text>
</view> </view>
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
<text>{{type==0?'身份证':'护照'}}</text> <text>{{type==0?'身份证':'护照'}}</text>
</view> </view>
<view class="input-box"> <view class="input-box">
<input type="idcard"></input> <input type="idcard" bindinput="numberInput" value="{{info.Number}}"></input>
</view> </view>
<view class="ul"> <!-- <view class="ul">
<view class="li"> <view class="li">
<text>210723********0779</text> <text>210723********0779</text>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
<view class="btn bg"></view> <view bindtap="getInfo" class="btn bg"></view>
\ No newline at end of file \ No newline at end of file
...@@ -44,7 +44,7 @@ page{ ...@@ -44,7 +44,7 @@ page{
background: url('http://imgfile.oytour.com/New/Upload/Cloud/2020-02/20200213050648312.png') no-repeat; background: url('http://imgfile.oytour.com/New/Upload/Cloud/2020-02/20200213050648312.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.container .ci.parpt.active{ .container .parpt{
background: url('http://imgfile.oytour.com/New/Upload/Cloud/2020-02/20200213050856296.png') no-repeat; background: url('http://imgfile.oytour.com/New/Upload/Cloud/2020-02/20200213050856296.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
} }
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.0.4", "libVersion": "2.10.1",
"appid": "wxcf0727a7c78b501e", "appid": "wxcf0727a7c78b501e",
"projectname": "termina", "projectname": "termina",
"debugOptions": { "debugOptions": {
...@@ -41,13 +41,50 @@ ...@@ -41,13 +41,50 @@
"current": -1, "current": -1,
"list": [] "list": []
}, },
"plugin": {
"current": -1,
"list": []
},
"game": { "game": {
"currentL": -1, "currentL": -1,
"list": [] "list": []
}, },
"miniprogram": { "gamePlugin": {
"current": -1, "current": -1,
"list": [] "list": []
},
"miniprogram": {
"current": -1,
"list": [
{
"id": -1,
"name": "首页",
"pathName": "pages/index/index",
"query": "",
"scene": null
},
{
"id": 1,
"name": "身份验证1",
"pathName": "pages/validateForm/validate/validate",
"query": "",
"scene": null
},
{
"id": 2,
"name": "身份验证2",
"pathName": "pages/validateForm/validateEnd/validateEnd",
"query": "",
"scene": null
},
{
"id": -1,
"name": "baidu ",
"pathName": "pages/webview/webview",
"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 to comment