Skip to content

M
million
Commit badaeef3 authored by 沈良进's avatar 沈良进
Browse files
Options

save

parents a967a832 b339b648
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 65 deletions
package.json
View file @ badaeef3
{
"name": "million",
"version": "0.0.1",
"productDescription": "订完机票和饭店，当地旅游体验就交给印象之旅。自己的行程自己排- 海外潜水、户外攀岩、料理课程、私房景点、 一日游、票券、包车旅游、机场接驳，各式世界当地旅游行程任您挑选",
"productName": "印象之旅 - 当地旅游,在地旅游,旅游体验 - 印象之旅",
"productDescription": "订完机票和饭店，当地旅游体验就交给四川和平国际旅行社。自己的行程自己排- 海外潜水、户外攀岩、料理课程、私房景点、 一日游、票券、包车旅游、机场接驳，各式世界当地旅游行程任您挑选",
"productName": "四川和平国际旅行社 - 当地旅游,在地旅游,旅游体验 - 四川和平国际旅行社",
"cordovaId": "org.cordova.quasar.app",
"capacitorId": "",
"author": "罗超 <alex9012@vip.qq.com>",
......
src/boot/utils.js
View file @ badaeef3
......@@ -25,8 +25,8 @@ Vue.prototype.domainManager = function() {
if (domainNameUrl.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
//domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
// domainUrl = "http://reborn.oytour.com";
domainUrl = 'http://192.168.10.226:8015' //'http://192.168.10.226:8015' ''http://192.168.10.9:8083' '
}
var obj = {
//主地址
......@@ -130,6 +130,7 @@ Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) {
return
}
successCall(res);
}, faildCall)
}
......
src/components/common/end.vue
View file @ badaeef3
......@@ -2,12 +2,12 @@
<div class="page-foot">
<div class="row" style="max-width: 1200px; margin: 0 auto">
<div class="col">
<div class="text-h6">為什麼選擇印象之旅</div>
<div class="text-h6">為什麼選擇四川和平国际旅行社</div>
<div
class="text-subtitle2 q-mt-md text-grey-8"
style="font-weight: 400"
>
你知道印象每年為10萬+的遊客提供出行旅遊規劃，他們透過我們體驗到旅遊最原始的感動。感動，與世界同步！
你知道四川和平国际旅行社每年為10萬+的遊客提供出行旅遊規劃，他們透過我們體驗到旅遊最原始的感動。感動，與世界同步！
</div>
<div class="q-mt-xl">
<q-btn
......
src/components/pay/alipay.vue 0 → 100644
View file @ badaeef3
<template>
<div>
<q-dialog v-model="$q.platform.is.desktop" persistent>
<q-card flat class="q-pa-lg" style="width:600px !important;max-width:600px !important">
<div class="text-h6 text-weight-bold q-mb-lg">支付宝支付</div>
<div class="text-center">
<q-inner-loading :showing="loading" label="正在加載中"></q-inner-loading>
<div v-if="$q.platform.is.desktop && orderNo && payUrl!='' && !loading">
<div class="row justify-center">
<!-- <QrcodeVue level="H" size="200" :value="payUrl" class="light-shadow"></QrcodeVue>
<img src="../../assets/img/pay/wx_tip.jpg" class="q-ml-md" style="height:200px;"> -->
</div>
<div class="text-body2 q-mt-lg text-grey-6">請點擊支付，前往支付寶（Alipay）支付，使用支付寶[掃一掃]掃描二維碼進行支付</div>
<div class="q-mt-lg text-right">
<q-btn outline dense label="取消支付" color="primary" class="q-px-md q-mr-md" @click="cancelPayHandler"></q-btn>
<q-btn v-if="isPay" unelevated dense label="已完成付款" :loading="checkLoading" color="primary" class="q-px-md q-mr-md"
@click="checkPaySatausHandler(1)"></q-btn>
<!-- <q-btn v-if="isPay" unelevated dense label="退款" :loading="checkLoading" color="primary" class="q-px-md"
@click="GetAliPayReturn"></q-btn> -->
<q-btn v-if="!isPay" unelevated dense label="支付" :loading="checkLoading" color="primary" class="q-px-md" @click="Gotopay"></q-btn>
</div>
</div>
<div class="q-ma-xl" v-if="!orderNo && !loading">
創建付款連接失敗，請刷新頁面重試
</div>
</div>
</q-card>
</q-dialog>
</div>
</template>
<script>
import QrcodeVue from 'qrcode.vue'
export default {
data() {
return {
loading:true,
showDialog:true,
payUrl:'weixin://wxpay/bizpayurl?pr=CDXqaD1zz',
checkLoading:false,
isPay: true
}
},
props:{
orderNo:{
type:String,
required:true
}
},
components:{QrcodeVue},
created () {
if(this.orderNo){
this.initPayInfo()
}else{
this.loading=false
}
},
methods: {
Gotopay(){
this.OpenNewUrl(this.payUrl)
},
initPayInfo(){
this.apipost("GetAliPayByOrderNo_post",{OrderNo:this.orderNo},r=>{
if(r.data.resultCode==1){
this.payUrl = r.data.data.QrCode
this.checkPaySatausHandler()
}
this.loading=false
})
},
checkPaySatausHandler(type){
this.apipost("GetDetailsByOrderNo_post",{OrderNo:this.orderNo},r=>{
if(r.data.resultCode==1){
if(r.data.data.OrderStatus==2||r.data.data.OrderStatus==3){
if(type==1){
this.CommonJump("/paysuccess/" + this.orderNo, {});
}
}else{
this.isPay = false
if(type==1){
this.$message.error("當前訂單未支付，請您繼續完成訂單支付")
}
}
}else{
this.isPay = false
if(type==1){
location.reload()
}
}
},e=>{
this.isPay = false
})
},
// 支付宝退款
GetAliPayReturn(){
this.apipost("GetAliPayReturn_post",{OrderNo:this.orderNo},r=>{
if(r.data.resultCode==1){
this.$message.success("退款成功")
}else{
this.$message.error("退款失败")
}
},e=>{
})
},
cancelPayHandler(){
this.$emit("cancel")
}
},
}
</script>
<style>
</style>
\ No newline at end of file
src/pages/About.vue
View file @ badaeef3
......@@ -305,7 +305,7 @@
關於我們
<span class="absolute" :class="$q.platform.is.desktop ? 'about' : 'about-m'">ABOUTUS</span>
</div>
<div class="bold q-my-md" :class="$q.platform.is.desktop ? 'f20' : 'f14'">〝印象之旅”旅遊品牌成立於2009年3月</div>
<div class="bold q-my-md" :class="$q.platform.is.desktop ? 'f20' : 'f14'">〝四川和平国际旅行社”旅遊品牌成立於2009年3月</div>
<div class="tips"></div>
<div class=" lh200 q-my-md" :class="$q.platform.is.desktop ? 'f16' : 'f12'">
公司原本为一单纯的日本专线供货商公司营运初期为日本出境游，经过几年来的转变<br />
......@@ -370,7 +370,7 @@
<div class="line-1"></div>
<div class="line-2"></div>
<div class="text-center lh150 q-mt-lg" :class="$q.platform.is.desktop ? 'f20' : 'f12'">
印象之旅专注出境旅游产品的供货商<br />目前主要业务范畴定位同业销售为主(B2B)，目前为西南地区最大日本专线供应商
四川和平国际旅行社专注出境旅游产品的供货商<br />目前主要业务范畴定位同业销售为主(B2B)，目前为西南地区最大日本专线供应商
</div>
<q-carousel
v-model="hotSilder"
......
src/pages/ScenicSpotTicket/details.vue
View file @ badaeef3
......@@ -120,7 +120,7 @@
class="transparent no-padding"
square
icon="iconfont iconOwner-1"
label=" 印象自有"
label=" 直營產品"
:class="{'q-mr-xl':$q.platform.is.desktop,'q-mr-lg':$q.platform.is.mobile}"
/>
<q-chip
......
src/pages/detailHotal.vue
View file @ badaeef3
......@@ -419,7 +419,7 @@
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconOwner-1"
label=" 印象自組團"
label=" 直營產品"
/>
<q-chip
class="transparent q-mr-xl no-padding"
......@@ -1570,7 +1570,7 @@ export default {
}
} else {
this.SimilarList = []
this.$message.error(res.data.message=='No results match your search.'?'當前入住日期未報價,請選擇其他日期看看吧':res.data.message)
//this.$message.error(res.data.message=='No results match your search.'?'當前入住日期未報價,請選擇其他日期看看吧':res.data.message)
}
......
src/pages/detailsCar.vue
View file @ badaeef3
......@@ -137,7 +137,7 @@
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconOwner-1"
label=" 印象自組團"
label=" 直營產品"
/>
<q-chip
v-if="dataList.TravelHours>0" class="transparent q-mr-xl no-padding"
......@@ -631,7 +631,7 @@ export default {
options: {
currentPage: 0,
speed: 300,
itemAnimation: true,
itemAnimation: false,
centeredSlides: true,
thresholdDistance: 100,
thresholdTime: 300,
......
src/pages/detailsNew.vue
View file @ badaeef3
......@@ -161,7 +161,7 @@
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconOwner-1"
label=" 印象自組團"
label=" 直營產品"
/>
<q-chip
v-if="dataList.dayList"
......@@ -170,12 +170,12 @@
icon="iconfont icontime"
:label="` 行程時間 ${dataList.dayList.length} 天`"
/>
<q-chip
<!-- <q-chip
class="transparent q-mr-xl no-padding"
square
icon="iconfont iconnetwork-fill"
label="日本語/中文 導覽"
/>
/> -->
<q-chip
class="transparent q-mr-xl no-padding"
square
......@@ -708,7 +708,7 @@ export default {
options: {
currentPage: 0,
speed: 300,
itemAnimation: true,
itemAnimation: false,
centeredSlides: true,
thresholdDistance: 100,
thresholdTime: 300,
......
src/pages/login.vue
View file @ badaeef3
......@@ -228,7 +228,7 @@
<div class="flex items-start no-wrap">
<div><q-checkbox v-model="isAgree"></q-checkbox></div>
<span
>在使用印象的产品和服务前，我已阅读 理解并同意印象的<a
>在使用和平的产品和服务前，我已阅读 理解并同意和平的<a
href="http://www.oytour.com/#/customer/15"
target="_blank"
class="text-primary"
......
src/pages/mailTemplate/eMailCancel.html
View file @ badaeef3
......@@ -39,7 +39,7 @@
<div style="padding: 36px 0 0 0;display: flex;flex-direction: row-reverse; font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
<div>谢谢！</div>
<div>印象之旅 团队</div>
<div>四川和平国际旅行社 团队</div>
</div>
</div>
<div style="padding: 88px 0 47px 0; display: flex;justify-content: center; font-size: 12px;font-family: Microsoft JhengHei;font-weight: 400;color: #717171;line-height: 20px;">
......
src/pages/mailTemplate/eMailCode.html
View file @ badaeef3
......@@ -23,7 +23,7 @@
<div style="font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
我们需要验证您的邮箱，以便帮助我们
验证你在印象的身份，这组验证码只能
验证你在和平的身份，这组验证码只能
使用一次。如果您并未请求获得验证码
请忽略这封邮件，同时请勿与他人分享
这组验证码。
......@@ -48,7 +48,7 @@
<div style="padding: 123px 0 0 0;display: flex;flex-direction: row-reverse; font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
<div>谢谢！</div>
<div>印象之旅 团队</div>
<div>四川和平国际旅行社 团队</div>
</div>
</div>
<div style="padding: 88px 0 47px 0; display: flex;justify-content: center; font-size: 12px;font-family: Microsoft JhengHei;font-weight: 400;color: #717171;line-height: 20px;">
......
src/pages/mailTemplate/eMailPassword.html
View file @ badaeef3
......@@ -47,7 +47,7 @@
<div style="padding: 123px 0 0 0;display: flex;flex-direction: row-reverse; font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
<div>谢谢！</div>
<div>印象之旅 团队</div>
<div>四川和平国际旅行社 团队</div>
</div>
</div>
<div style="padding: 88px 0 47px 0; display: flex;justify-content: center; font-size: 12px;font-family: Microsoft JhengHei;font-weight: 400;color: #717171;line-height: 20px;">
......
src/pages/mailTemplate/eMailPin.html
View file @ badaeef3
......@@ -48,7 +48,7 @@
<div style="padding: 123px 0 0 0;display: flex;flex-direction: row-reverse; font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
<div>谢谢！</div>
<div>印象之旅 团队</div>
<div>四川和平国际旅行社 团队</div>
</div>
</div>
<div style="padding: 88px 0 47px 0; display: flex;justify-content: center; font-size: 12px;font-family: Microsoft JhengHei;font-weight: 400;color: #717171;line-height: 20px;">
......
src/pages/mailTemplate/eMailRegister.html
View file @ badaeef3
......@@ -17,7 +17,7 @@
src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1679021994000_531.png'/>
</div>
<div style="margin-top: 41px;font-size: 28px;font-family: Microsoft JhengHei;font-weight: bold;color: #000000;">
欢迎加入印象之旅
欢迎加入四川和平国际旅行社
</div>
<div style="display: flex;align-items: stretch;flex-direction: row;justify-content: space-between;flex-wrap: nowrap;margin-top: 41px;">
<div style="font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
......@@ -50,7 +50,7 @@
<div style="display: flex;flex-direction: row-reverse; font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
<div>谢谢您的使用！</div>
<div>印象之旅 团队</div>
<div>四川和平国际旅行社 团队</div>
</div>
</div>
<div style="padding: 88px 0 47px 0; display: flex;justify-content: center; font-size: 12px;font-family: Microsoft JhengHei;font-weight: 400;color: #717171;line-height: 20px;">
......
src/pages/mailTemplate/eMailReplace.html
View file @ badaeef3
......@@ -47,7 +47,7 @@
<div style="padding: 123px 0 0 0;display: flex;flex-direction: row-reverse; font-size: 16px;font-family: Microsoft JhengHei;font-weight: 400;color: #000000;line-height: 24px;">
<div>
<div>谢谢！</div>
<div>印象之旅 团队</div>
<div>四川和平国际旅行社 团队</div>
</div>
</div>
<div style="padding: 88px 0 47px 0; display: flex;justify-content: center; font-size: 12px;font-family: Microsoft JhengHei;font-weight: 400;color: #717171;line-height: 20px;">
......
src/pages/pay/pay.vue
View file @ badaeef3
......@@ -67,15 +67,17 @@
<q-img
src="../../assets/img/pay/wepay.png"
spinner-color="white"
style="width: 100px"
style="width: 100px;"
/>
</div>
<!-- <div class="rounded-borders q-pa-sm bg-grey-2 cursor-pointer">
<q-img src="../assets/img/pay/alipay.png" spinner-color="white" style="height:25px;max-width: 150px;min-width: 30px" />
</div> -->
<div class="rounded-borders q-pa-sm bg-grey-2 cursor-pointer" @click="showPayFormHandler('alipay')">
<!-- height:25px;max-width: 150px;min-width: 30px drop-shadow(0px 0px black)-->
<q-img src="../../assets/img/pay/alipay.png" spinner-color="white" style="width: 80px;filter: invert(100%) hue-rotate(180deg);" />
</div>
</div>
<div class="q-mt-md" v-if="showPay != ''">
<wechatpay @cancel="cancelPayHandler" v-if="showPay == 'wechat'" :order-no="orderNo"></wechatpay>
<alichatpay @cancel="cancelPayHandler" v-if="showPay == 'alipay'" :order-no="orderNo"></alichatpay>
</div>
</q-card>
......@@ -115,6 +117,7 @@
<script>
import wechatpay from "../../components/pay/wepay";
import alichatpay from "../../components/pay/alipay";
import NoneData from "src/components/common/noneData.vue";
export default {
data() {
......@@ -126,13 +129,31 @@ export default {
orderInfo:null
};
},
components: { wechatpay,NoneData },
components: { wechatpay,alichatpay,NoneData },
created() {
this.checkParamsHandler()
},
methods: {
showPayFormHandler(payStr) {
this.showPay = payStr;
// 打开支付宝二维码支付界面
// if(this.showPay&&this.showPay=='alipay'){
// this.getAliPay()
// }
},
getAliPay(){
this.apipost("GetAliPayByOrderNo_post",{OrderNo:this.orderNo},r=>{
if(r.data.resultCode==1){
let url = r.data.data.QrCode
if(url){
this.OpenNewUrl(url)
}
}else{
location.reload()
}
},e=>{
})
},
checkParamsHandler() {
if (this.$route.params && this.$route.params.id) {
......
src/pages/usercenter/components/removeAccount.vue
View file @ badaeef3
<style>
<style scoped>
.login-box-pc {
width: 436px;
}
......@@ -56,8 +56,8 @@
cursor: pointer;
}
.login-box .q-field__control {
height: 46px;
::v-deep .q-field__control {
height: 46px !important;
}
.type-item {
width: 50px;
......@@ -75,32 +75,9 @@
<div class="login-box" :class="$q.platform.is.desktop ? 'login-box-pc' : ''">
<div class="f34 bold">注销账户</div>
<div class="login_row">
<div class="form-group">
<div class="login_labelName">輸入郵箱</div>
<q-input outlined v-model="loginMsg.EMail" />
<div class="primary q-mt-sm" v-show="tips">邮箱格式有误,请核实</div>
</div>
<div>
<q-btn
v-if="!isSend" class="q-mb-lg"
unelevated
color="grey-3"
style="width: 100%; color: #8B8B8B !important; height: 50px; margin-top: 20px"
filled
label="发送验证码"
@click="sendVerify"
/>
<div
@click="sendVerify" v-else class="mt q-mb-sm">
<q-input outlined v-model="loginMsg.Code" type="text" />
<div class="q-mt-sm" :class="cutDown ? 'text-grey-6' : ''">
{{ cutDown ? cutDown + "秒后可重新发送" : "重新發送驗證碼" }}
</div>
</div>
</div>
<q-input
filled
v-model="loginMsg.Mailbox"
v-model="loginMsg.EMail"
class="q-mt-xl"
label="輸入郵箱"
style="ime-mode: disabled"
......@@ -120,7 +97,7 @@
color="text-white bg-secondary"
:disable="
!/^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/.test(
loginMsg.Mailbox
loginMsg.EMail
) || cutDown > 0
"
style="height: 46px; margin-top: -10px"
......@@ -144,7 +121,7 @@
:digit="6"
hint="請輸入正確的驗證碼"
ref="verify"
v-model="loginMsg.MailCode"
v-model="loginMsg.Code"
></verify-code>
</div>
<div class="q-mb-xl">
......
src/pages/usercenter/payInfo.vue
View file @ badaeef3
......@@ -61,7 +61,7 @@
<div>
<div class="q-mt-lg q-mb-sm">優惠及更新信息</div>
<div class="text-grey-6">
抢先获取印象最新优惠活动、优惠码、折扣信息及最新动向
抢先获取和平最新优惠活动、优惠码、折扣信息及最新动向
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
......
src/pages/usercenter/setInfo.vue
View file @ badaeef3
......@@ -109,7 +109,7 @@
<div>
<div class="q-mt-lg q-mb-sm">優惠及更新信息</div>
<div class="text-grey-6">
抢先获取印象最新优惠活动、优惠码、折扣信息及最新动向
抢先获和平最新优惠活动、优惠码、折扣信息及最新动向
</div>
<checkboxGroupVue
:checkboxList="emailType"
......
src/pages/usercenter/setUserInfo.vue
View file @ badaeef3
......@@ -38,7 +38,7 @@
<div class="q-ma-lg">
<div class="tips q-mb-lg">
個人信息<span class="text-grey-6"
>(以下信息仅用于帮助你在支付时自动填写你的个人资料，你的信息将会安全地被印象保存且不会公开)</span
>(以下信息仅用于帮助你在支付时自动填写你的个人资料，你的信息将会安全地和平保存且不会公开)</span
>
</div>
<div>
......
src/pages/usercenter/setUsersList.vue
View file @ badaeef3
......@@ -169,7 +169,7 @@
v-model="form.EnName"
outlined
ref="EnName"
:rules="[(val) => !!val || '请输入姓氏（请输入英文字母）']"
:rules="[(val) => (!!val && /^[A-Za-z]+$/.test(val)) || '请输入姓氏（请输入英文字母）']"
></q-input>
</div>
<div class="col">
......@@ -179,7 +179,7 @@
class="form-item"
v-model="form.EnSurName"
outlined
:rules="[(val) => !!val || '请输入名字（请输入英文字母）']"
:rules="[(val) => (!!val && /^[A-Za-z]+$/.test(val)) || '请输入名字（请输入英文字母）']"
></q-input>
</div>
</div>
......
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