Commit da281927 authored by 潘永坪's avatar 潘永坪

字体删除

parent c5136c6e
......@@ -14,7 +14,7 @@
.wxParse {
user-select:none;
width: 100%;
font-family: Helvetica, "PingFangSC", 'Microsoft Yahei', '微软雅黑', Arial, sans-serif;
font-family: Helvetica, "PingFangSC", Arial, sans-serif;
color: #333;
line-height: 1.5;
font-size: 1em;
......
......@@ -23,10 +23,10 @@
provider:proRes.provider[0],
success: function (res) {
if(res.code){
let source=""
if(proRes.provider[0]=="weixin"){
let source=''
if(proRes.provider[0]=='weixin'){
source=3
}else if(proRes.provider[0]=="alipay"){
}else if(proRes.provider[0]=='alipay'){
source=4
}
let data={
......@@ -37,25 +37,25 @@
if(res.code=='00'){
let openid=res.data.openid
uni.setStorageSync('openid',openid)
let userId=res.data.userId||""
let userId=res.data.userId||''
let datas={openid,source,userId}
_this.$request("wechatUser/login/findWxUserAndLogin",datas).then((res)=>{//通过openid获取token
if(res.code=="00"){
let token=res.data.token||""
_this.$request('wechatUser/login/findWxUserAndLogin',datas).then((res)=>{//通过openid获取token
if(res.code=='00'){
let token=res.data.token||''
uni.setStorageSync('token',token)
let createUserId=res.data.personId||""
let createUserId=res.data.personId||''
uni.setStorageSync('createUserId',createUserId)
let userId=res.data.userId||""
let userId=res.data.userId||''
uni.setStorageSync('userId',userId)
let enterOptions=uni.getStorageSync("enterOptions")
let queryTotal=""
let enterOptions=uni.getStorageSync('enterOptions')
let queryTotal=''
for(let key in enterOptions.query){
queryTotal+="&"+key+"="+enterOptions.query[key]
queryTotal+='&'+key+'='+enterOptions.query[key]
}
queryTotal=queryTotal.substr(1)
if(token){
uni.redirectTo({
url:"/"+enterOptions.path+"?"+queryTotal
url:'/'+enterOptions.path+'?'+queryTotal
})
// uni.navigateBack({
// delta:1
......@@ -64,27 +64,25 @@
}else{
uni.showToast({
title:res.message,
icon:"none"
icon:'none'
})
}
}).catch((err)=>{
uni.showToast({
title:"登录失败",
icon:"none"
title:'登录失败',
icon:'none'
})
})
}else{
// uni.removeStorageSync('openid')
uni.showToast({
title:res.message,
icon:"none"
icon:'none'
})
}
}).catch((err)=>{
// uni.removeStorageSync('openid')
uni.showToast({
title:"登录失败",
icon:"none"
title:'登录失败',
icon:'none'
})
})
}
......
......@@ -97,34 +97,34 @@
export default {
data() {
return {
merchantName: "", //商户名称
productName: "", //产品名称
orderList: "", //订单列表
unitPrice: "", //单价
merchantName: '', //商户名称
productName: '', //产品名称
orderList: '', //订单列表
unitPrice: '', //单价
depositReceived: 0, //押金
pdDiscountMoney: "", //优惠价格
orderNum: "", //数量
pdOrderMoney: "", //实际总价
totalMoney: "", //原价总价
errorMessage: "", //错误信息
pdDiscountMoney: '', //优惠价格
orderNum: '', //数量
pdOrderMoney: '', //实际总价
totalMoney: '', //原价总价
errorMessage: '', //错误信息
bodyShow: false, //控制初始化数据成功显示
timeStamp:"",//支付参数
nonceStr:"",
package:"",
signType:"",
paySign:"",
background:"",//去支付的背景颜色
orderId:"",//订单Id
openid:"",//用户Id
afterBuyUrl:"",//支付成功后地址跳转
ifyukuaiCode:"",//是否是渝快码跳入,渝快码跳入需要在H5端另外走流程
timeStamp:'',//支付参数
nonceStr:'',
package:'',
signType:'',
paySign:'',
background:'',//去支付的背景颜色
orderId:'',//订单Id
openid:'',//用户Id
afterBuyUrl:'',//支付成功后地址跳转
ifyukuaiCode:'',//是否是渝快码跳入,渝快码跳入需要在H5端另外走流程
}
},
onLoad(option){
this.orderId=option.orderId
this.ifyukuaiCode=option.ifyukuaiCode
this.afterBuyUrl=option.afterBuyUrl||"/pages/my/order/orderList/orderList"
this.openid=uni.getStorageSync("openid")||""
this.afterBuyUrl=option.afterBuyUrl||'/pages/my/order/orderList/orderList'
this.openid=uni.getStorageSync('openid')||''
if(this.openid){
this.initDetail()
}else{
......@@ -142,10 +142,10 @@
provider:proRes.provider[0],
success: function (res) {
if(res.code){
let source=""
if(proRes.provider[0]=="weixin"){
let source=''
if(proRes.provider[0]=='weixin'){
source=3
}else if(proRes.provider[0]=="alipay"){
}else if(proRes.provider[0]=='alipay'){
source=4
}
let data={
......@@ -160,13 +160,13 @@
}else{
uni.showToast({
title:res.message,
icon:"none"
icon:'none'
})
}
}).catch((err)=>{
uni.showToast({
title:"登录失败",
icon:"none"
title:'登录失败',
icon:'none'
})
setTimeout(()=>{
_this.login()
......@@ -184,8 +184,8 @@
userId:this.openid, //用户Id
payType:42, //支付类型
}
this.$request("orderc/order/findOrderInfo", data).then((res) => {
if (res.code == "00") {
this.$request('orderc/order/findOrderInfo', data).then((res) => {
if (res.code == '00') {
this.bodyShow = true
//支付参数开始
this.timeStamp=res.data.timestamp
......@@ -197,14 +197,14 @@
this.pdOrderMoney = res.data.pdOrderMoney
if(this.pdOrderMoney==0&&res.data.subOrderType == -1){//0元购直接跳电子门票页面
uni.navigateTo({
url:"/pages/my/order/electronicTicket/electronicTicket?orderId="+this.orderId+"&ifyukuaiCode="+this.ifyukuaiCode
url:'/pages/my/order/electronicTicket/electronicTicket?orderId='+this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
})
}
this.errorMessage = res.data.errorMessage
this.totalMoney = res.data.totalMoney
this.orderList = res.data.orderList
if (typeof(this.orderList) == "undefined") { //单票
this.orderList = ""
if (typeof(this.orderList) == 'undefined') { //单票
this.orderList = ''
this.merchantName = res.data.merchantName
this.productName = res.data.productName
this.unitPrice = res.data.unitPrice
......@@ -216,7 +216,7 @@
}else{
uni.showToast({
title:res.message,
icon:"none"
icon:'none'
})
}
})
......@@ -226,13 +226,13 @@
if (this.errorMessage) {
uni.showToast({
title:this.errorMessage,
icon:"none"
icon:'none'
})
return
}
this.background="#E6E6E6"
this.background='#E6E6E6'
setTimeout(() => {
this.background="f9690e"
this.background='f9690e'
}, 1000)
uni.requestPayment({
provider: 'wxpay',
......@@ -242,20 +242,14 @@
signType:this.signType,
paySign:this.paySign,
success: function (res) {
//相册完成支付后删除Storage内保存的数据
// uni.removeStorageSync('productVo')
// uni.removeStorageSync('coverInside')
// uni.removeStorageSync('imgList')
// uni.removeStorageSync('checkList')
// uni.removeStorageSync('sortImglist')
uni.navigateTo({
url:_this.afterBuyUrl+"?orderId="+_this.orderId+"&ifyukuaiCode="+_this.ifyukuaiCode
url:_this.afterBuyUrl+'?orderId='+_this.orderId+'&ifyukuaiCode='+_this.ifyukuaiCode
})
},
fail: function (err) {
uni.showToast({
title:err.errMsg,
icon:"none"
icon:'none'
})
}
})
......
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