Skip to content

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

提交代码

parent 5bfbf84a
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 41 deletions
app.js
View file @ 353bc833
...@@ -51,9 +51,9 @@ App({ ...@@ -51,9 +51,9 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ wx.request({
url: 'http://192.168.2.214:8082/api/Common/Post', // url: 'http://192.168.2.214:8082/api/Common/Post',
// url: 'http://192.168.2.65:8025/api/Common/Post', //春姐 // url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
// url: 'https://reborn.oytour.com/api/common/post', //线上 url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post', // url: ' http://test.viitto.com/api/common/post',
method: 'POST', method: 'POST',
...@@ -91,9 +91,9 @@ App({ ...@@ -91,9 +91,9 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ wx.request({
url: 'http://192.168.2.214:8082/api/Common/Post', // url: 'http://192.168.2.214:8082/api/Common/Post',
url: 'http://192.168.2.65:8025/api/Common/Post', //春姐 // url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
// url: 'https://reborn.oytour.com/api/common/post', //线上 url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post', // url: ' http://test.viitto.com/api/common/post',
method: 'POST', method: 'POST',
...@@ -125,9 +125,9 @@ App({ ...@@ -125,9 +125,9 @@ App({
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
// url: 'https://reborn.oytour.com/api/common/post'+ url, //线上 // url: 'https://reborn.oytour.com/api/common/post'+ url, //线上
// url: 'http://efficient.oytour.com/'+ url, //线上 url: 'http://efficient.oytour.com/'+ url, //线上
// url: 'http://47.96.12.235:9001/' + url, //测试 // url: 'http://47.96.12.235:9001/' + url, //测试
url: 'http://192.168.2.215:9000/'+ url, // url: 'http://192.168.2.215:9000/'+ url,
method: 'POST', method: 'POST',
data: { data: {
...@@ -174,8 +174,8 @@ App({ ...@@ -174,8 +174,8 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
// url: 'https://efficient.oytour.com/'+ url, //线上 url: 'https://efficient.oytour.com/'+ url, //线上
url: 'http://47.96.12.235:9001/' + url, //测试 // url: 'http://47.96.12.235:9001/' + url, //测试
method: 'POST', method: 'POST',
data: { data: {
......
pages/Home/home.wxml
View file @ 353bc833
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
</view> </view>
</view> </view>
<view class="tab2"> <view class="tab2">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103346128.png"></image> <navigator hover-class="Home_hover" url="/pages/activity/activity">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103346128.png"></image>
</navigator>
</view> </view>
<view class="CommonMargin commonF"> <view class="CommonMargin commonF">
......
pages/Home/home.wxss
View file @ 353bc833
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
height: 220rpx; height: 220rpx;
margin: 36rpx 0; margin: 36rpx 0;
} }
.Home .tab2 image{ .Home .tab2 image,navigator{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
......
pages/Voucher/Voucher.js
View file @ 353bc833
...@@ -21,8 +21,7 @@ Page({ ...@@ -21,8 +21,7 @@ Page({
} else { } else {
let data = { let data = {
guestMobile: this.data.telPhone, guestMobile: this.data.telPhone,
// TCID: this.data.tcId TCID: this.data.tcId
TCID: 4018
} }
app.$api('miniProgram_price_GetGuestByPhone', data).then(res => { app.$api('miniProgram_price_GetGuestByPhone', data).then(res => {
if (res.Id === 0) { if (res.Id === 0) {
...@@ -71,7 +70,8 @@ Page({ ...@@ -71,7 +70,8 @@ Page({
onLoad: function (options) { onLoad: function (options) {
const scene = decodeURIComponent(options.scene) const scene = decodeURIComponent(options.scene)
if (scene) { if (scene) {
let tcId = scene.split('=')[1] ? scene.split('=')[1] : options.tcid; // let tcId = scene.split('=')[1] ? scene.split('=')[1] : options.tcid;
let tcId = 4006
console.log(tcId) console.log(tcId)
this.setData({ this.setData({
tcId: tcId tcId: tcId
......
pages/Voucher/write/write.js
View file @ 353bc833
...@@ -14,6 +14,23 @@ Page({ ...@@ -14,6 +14,23 @@ Page({
infoMessage: '', infoMessage: '',
showBadYouJi: false, showBadYouJi: false,
tag2: [], tag2: [],
ActivateCode: '166666666',
},
copyText: function (e) {
let _this = this
wx.setClipboardData({
data: _this.data.ActivateCode,
success: function (res) {
wx.getClipboardData({
success: function (res) {
wx.showToast({
title: '复制成功'
})
}
})
}
})
}, },
// 退出 // 退出
logOut: function () { logOut: function () {
...@@ -46,6 +63,11 @@ Page({ ...@@ -46,6 +63,11 @@ Page({
tag: this.data.tag2 tag: this.data.tag2
}) })
app.$api('survey_post_SetGuestTravelNotes', msg).then(res => { app.$api('survey_post_SetGuestTravelNotes', msg).then(res => {
if (res.Id > 0) {
thi.setData({
ActivateCode: ActivateCode,
})
}
this.setData({ this.setData({
showBadYouJi: true, showBadYouJi: true,
}) })
......
pages/Voucher/write/write.wxml
View file @ 353bc833
...@@ -34,12 +34,15 @@ ...@@ -34,12 +34,15 @@
<view class='dialog' wx:if="{{showBadYouJi}}"> <view class='dialog' wx:if="{{showBadYouJi}}">
<view class='box'> <view class='box'>
<view class='tit'>感谢参与调查</view> <view class='tit'>感谢参与调查</view>
<image src='../../../images/voucher/xieyouji_icon.png'></image> <!-- <image src='../../../images/voucher/xieyouji_icon.png'></image> -->
<view class='ActivateCode'>
<text class='code'>{{ActivateCode}}</text><text class='copy_btn' bindtap='copyText'>复制</text>
</view>
<view class='tips'>为表达对您的感谢，特送上100元跟团游通用优惠券，本券仅限于本次报名的门店使用。在您下次报名的时候请主动出示此优惠码。（建议您截图保存、或复并存到备忘录）</view>
<view class='btn'> <view class='btn'>
<button class='next' type="default" size="mini"><navigator open-type="exit" target="miniProgram">好的</navigator></button> <button class='next' type="default" size="mini"><navigator open-type="exit" target="miniProgram">好的</navigator></button>
<!-- <button class='next' type="default" size="mini" bindtap="logOut">好的，不用谢~</button> --> <!-- <button class='next' type="default" size="mini" bindtap="logOut">好的，不用谢~</button> -->
</view> </view>
<view class='tips'>非常感谢您的配合，请保持电话畅通~客服将在3-5个工作日内与您联系</view>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/Voucher/write/write.wxss
View file @ 353bc833
...@@ -157,7 +157,6 @@ page{ ...@@ -157,7 +157,6 @@ page{
.dialog .box{ .dialog .box{
padding: 54rpx; padding: 54rpx;
border-radius:20rpx; border-radius:20rpx;
height: 694rpx;
box-sizing: border-box; box-sizing: border-box;
background-color: white; background-color: white;
width: 634rpx; width: 634rpx;
...@@ -165,7 +164,7 @@ page{ ...@@ -165,7 +164,7 @@ page{
} }
.dialog .box .tit{ .dialog .box .tit{
font-size: 36rpx; font-size: 36rpx;
margin-bottom: 75rpx; /* margin-bottom: 75rpx; */
} }
.dialog .box image{ .dialog .box image{
width: 278rpx; width: 278rpx;
...@@ -180,15 +179,28 @@ page{ ...@@ -180,15 +179,28 @@ page{
line-height: 84rpx; line-height: 84rpx;
display:flex; display:flex;
justify-content:center; justify-content:center;
margin-top: 35rpx;
} }
.dialog .box .tips{ .dialog .box .tips{
font-size: 28rpx; font-size: 24rpx;
color: #999999; color: #999999;
margin-top: 25rpx;
} }
navigator{ navigator{
position: absolute; position: absolute;
z-index: 2; z-index: 2;
width: 100%; width: 100%;
height: 100%; height: 100%;
}
.ActivateCode{
padding: 35rpx 0;
display: flex;
align-items: center;
justify-content: center;
}
.ActivateCode .code{
padding: 0 30rpx;
}
.copy_btn{
font-size: 26rpx;
color:#999999;
} }
\ No newline at end of file
pages/activity/activity.js 0 → 100644
View file @ 353bc833
// pages/member/invesDetails/invesDetails.js
Page({
/**
* 页面的初始数据
*/
data: {
url: ''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let userInfo = wx.getStorageSync('admin')
console.log(userInfo)
this.setData({
url: "http://activity.oytour.com/html/task/home.html?customerId=" + userInfo.id + "&accountId=" + userInfo.customerAccountId + "&token=" + userInfo.token + "&secretKey=" + userInfo.secretKey
})
console.log(this.data.url)
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/activity/activity.json 0 → 100644
View file @ 353bc833
{
"usingComponents": {}
}
\ No newline at end of file
pages/activity/activity.wxml 0 → 100644
View file @ 353bc833
<view>
<web-view src="{{url}}"></web-view>
</view>
\ No newline at end of file
pages/activity/activity.wxss 0 → 100644
View file @ 353bc833
/* pages/activity/activity.wxss */
\ No newline at end of file
pages/member/invesDetails/invesDetails.js
View file @ 353bc833
...@@ -14,7 +14,7 @@ Page({ ...@@ -14,7 +14,7 @@ Page({
onLoad: function (options) { onLoad: function (options) {
console.log(options) console.log(options)
this.setData({ this.setData({
url: "http://192.168.2.139:8084/html/invesDetails.html" + '?ID=' + options.ID + '&name=' + encodeURI(options.name) + '&MobilePhone=' + options.MobilePhone url: "http://activity.oytour.com/html/invesDetails.html" + '?ID=' + options.ID + '&name=' + encodeURI(options.name) + '&MobilePhone=' + options.MobilePhone
}) })
console.log(this.data.url) console.log(this.data.url)
}, },
......
pages/member/member.js
View file @ 353bc833
...@@ -11,11 +11,13 @@ Page({ ...@@ -11,11 +11,13 @@ Page({
memberNextExp: {}, memberNextExp: {},
gap: 0, gap: 0,
nextExp: 0, nextExp: 0,
isLogin: false,
}, },
formSubmit: function (e) { formSubmit: function (e) {
wx.getStorage({ wx.getStorage({
key: 'admin', key: 'admin',
success: res => { success: res => {
console.log(e)
let url = e.detail.target.dataset.url; let url = e.detail.target.dataset.url;
let formId = e.detail.formId let formId = e.detail.formId
app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => { app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => {
...@@ -53,6 +55,11 @@ Page({ ...@@ -53,6 +55,11 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
let userInfo = wx.getStorageSync('admin'); let userInfo = wx.getStorageSync('admin');
if (wx.getStorageSync('admin')) {
this.setData({
isLogin: true,
})
}
this.setData({ this.setData({
userInfo: userInfo userInfo: userInfo
}) })
...@@ -73,7 +80,17 @@ Page({ ...@@ -73,7 +80,17 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
let userInfo = wx.getStorageSync('admin');
if (wx.getStorageSync('admin')) {
this.setData({
isLogin: true,
})
}
this.setData({
userInfo: userInfo
})
this.getInfo()
this.getUserMemberExp()
}, },
/** /**
......
pages/member/member.wxml
View file @ 353bc833
<view class='page'> <view class='page'>
<view class='page__bd'> <view class='page__bd'>
<view wx:if="{{isLogin===false}}" class='mine1'> <view wx:if="{{isLogin==false}}" class='mine1'>
<view class='mine1_text'>登录行程助理账号后，您可查看对应信息</view> <view class='mine1_text'>登录行程助理账号后，您可查看对应信息</view>
<navigator class='mine1_btn' open-type="navigate" url="/pages/login/login">立即登录</navigator> <navigator class='mine1_btn' open-type="navigate" url="/pages/login/login">立即登录</navigator>
</view> </view>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<view>我的近期订单</view> <view>我的近期订单</view>
<view class='_more'> <view class='_more'>
<form bindsubmit="formSubmit" report-submit> <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/member/orderCenter/orderCenter"> <button hover-class="btn-hover" form-type="submit" data-index="0" data-url="/pages/member/orderCenter/orderCenter">
全部订单>> 全部订单>>
</button> </button>
</form> </form>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<view class="tablist"> <view class="tablist">
<view> <view>
<form bindsubmit="formSubmit" report-submit> <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/Ticket/Ticket"> <button hover-class="btn-hover" form-type="submit" data-index="1" data-url="/pages/member/orderCenter/orderCenter?index=1">
<image mode="aspectFit" src="../../images/menber/order-icon-tuan.png"></image> <image mode="aspectFit" src="../../images/menber/order-icon-tuan.png"></image>
<view class='order-type-name'>跟团游</view> <view class='order-type-name'>跟团游</view>
</button> </button>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</view> </view>
<view> <view>
<form bindsubmit="formSubmit" report-submit> <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/freeTravel/free"> <button hover-class="btn-hover" form-type="submit" data-index="2" data-url="/pages/member/orderCenter/orderCenter?index=2">
<image mode="aspectFit" src="../../images/menber/order-icon-zi.png"></image> <image mode="aspectFit" src="../../images/menber/order-icon-zi.png"></image>
<view class='order-type-name'>自由行</view> <view class='order-type-name'>自由行</view>
</button> </button>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</view> </view>
<view> <view>
<form bindsubmit="formSubmit" report-submit> <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/local/localhome"> <button hover-class="btn-hover" form-type="submit" data-index="3" data-url="/pages/member/orderCenter/orderCenter?index=3">
<image mode="aspectFit" src="../../images/menber/order-icon-dang.png"></image> <image mode="aspectFit" src="../../images/menber/order-icon-dang.png"></image>
<view class='order-type-name'>当地游</view> <view class='order-type-name'>当地游</view>
</button> </button>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</view> </view>
<view> <view>
<form bindsubmit="formSubmit" report-submit> <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/Ticket/Ticket"> <button hover-class="btn-hover" form-type="submit" data-index="4" data-url="/pages/member/orderCenter/orderCenter?index=4">
<image mode="aspectFit" src="../../images/menber/order-icon-ji.png"></image> <image mode="aspectFit" src="../../images/menber/order-icon-ji.png"></image>
<view class='order-type-name'>机票</view> <view class='order-type-name'>机票</view>
</button> </button>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</view> </view>
<view> <view>
<form bindsubmit="formSubmit" report-submit> <form bindsubmit="formSubmit" report-submit>
<button hover-class="btn-hover" form-type="submit" data-url="/pages/visa/visa"> <button hover-class="btn-hover" form-type="submit" data-index="5" data-url="/pages/member/orderCenter/orderCenter?index=5">
<image mode="aspectFit" src="../../images/menber/order-icon-gai.png"></image> <image mode="aspectFit" src="../../images/menber/order-icon-gai.png"></image>
<view class='order-type-name'>签证</view> <view class='order-type-name'>签证</view>
</button> </button>
......
pages/member/orderCenter/orderCenter.js
View file @ 353bc833
...@@ -107,8 +107,7 @@ Page({ ...@@ -107,8 +107,7 @@ Page({
formSubmit: function (e) { formSubmit: function (e) {
wx.getStorage({ wx.getStorage({
key: 'admin', key: 'admin',
success: res => { success: res => {
console.log('form发生了submit事件，携带数据为：', e)
let index = e.detail.target.dataset.index; let index = e.detail.target.dataset.index;
let formId = e.detail.formId let formId = e.detail.formId
app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => { app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => {
...@@ -133,7 +132,6 @@ Page({ ...@@ -133,7 +132,6 @@ Page({
}, },
// 加载更多 // 加载更多
scrollGetMore: function () { scrollGetMore: function () {
console.log(1)
this.setData({ this.setData({
'getOrderMsg.pageIndex': this.data.pageIndex + 1 'getOrderMsg.pageIndex': this.data.pageIndex + 1
}) })
...@@ -145,7 +143,7 @@ Page({ ...@@ -145,7 +143,7 @@ Page({
tagID = this.data.tagID, tagID = this.data.tagID,
msg = this.data.getOrderMsg; msg = this.data.getOrderMsg;
if (tagID !== 6 && tagID !== 8) { if (tagID !== 6 && tagID !== 8) {
console.log(tagID) // console.log(tagID)
url = 'api/b2b/user/getrecentorder' url = 'api/b2b/user/getrecentorder'
} else{ // 8美食 6门票 } else{ // 8美食 6门票
msg.status = msg.orderState msg.status = msg.orderState
...@@ -224,10 +222,21 @@ Page({ ...@@ -224,10 +222,21 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
let userInfo = wx.getStorageSync('admin'); let userInfo = wx.getStorageSync('admin');
this.setData({ let index = options.index ? Number(options.index) : null
userInfo: userInfo, // console.log(index,this.data.tagList[index-1])
TitList: this.data.TitListTc if (index) {
}) this.setData({
tagBoxActive: index - 1,
userInfo: userInfo,
TitList: this.data.TitListTc,
tagID: this.data.tagList[index - 1].id,
})
}else{
this.setData({
userInfo: userInfo,
TitList: this.data.TitListTc
})
}
this.getOrderList() this.getOrderList()
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: '订单中心' title: '订单中心'
......
project.config.json
View file @ 353bc833
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 10, "current": 2,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -57,17 +57,17 @@ ...@@ -57,17 +57,17 @@
"referrerInfo": {} "referrerInfo": {}
}, },
{ {
"id": 5, "id": 2,
"name": "写游记", "name": "写游记",
"pathName": "pages/Voucher/write/write", "pathName": "pages/Voucher/write/write",
"query": "orderId='20914'&tcid='3037'", "query": "orderId=25098&tcId=4006&GuestId=24614",
"scene": null "scene": null
}, },
{ {
"id": 3, "id": 3,
"name": "调查", "name": "调查",
"pathName": "pages/Voucher/Voucher", "pathName": "pages/Voucher/Voucher",
"query": "tcid=4018", "query": "tcid=4006",
"scene": null "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