Commit c682238f authored by mengcuiguang's avatar mengcuiguang

抖音支付调度,1.0.0发版

parent 7302ed1b
...@@ -19,7 +19,16 @@ ...@@ -19,7 +19,16 @@
// #endif // #endif
this.globalData.windowWidth = res.windowWidth; this.globalData.windowWidth = res.windowWidth;
// 抖音
// #ifdef MP-TOUTIAO
this.globalData.statusBarHeight = 0;
// #endif
// 微信
// #ifdef MP-WEIXIN
this.globalData.statusBarHeight = res.statusBarHeight; this.globalData.statusBarHeight = res.statusBarHeight;
// #endif
// #ifndef H5 // #ifndef H5
this.globalData.bottomSafePadding = Math.max(res.screenHeight - res.safeArea.bottom, 12); this.globalData.bottomSafePadding = Math.max(res.screenHeight - res.safeArea.bottom, 12);
// #endif // #endif
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
// 抖音支付 // 抖音支付
// #ifdef MP-TOUTIAO // #ifdef MP-TOUTIAO
this.post({ this.post({
url: '/vip/getVipPayParams/xdouyin', url: '/vip/getVipPayParams/douyin',
data: { data: {
vedioId: that.point <= 0 ? null : that.vedioId, vedioId: that.point <= 0 ? null : that.vedioId,
pid: vipBean.pid pid: vipBean.pid
...@@ -200,19 +200,18 @@ ...@@ -200,19 +200,18 @@
let that = this; let that = this;
tt.pay({ tt.pay({
orderInfo: { orderInfo: {
order_id: ttData.order_id, order_id: ttData.params.order_id,
order_token: ttData.order_token, order_token: ttData.params.order_token,
}, },
service: 5, service: 5,
success(res) { success(res) {
if (res.code == 0) { if (res.code == 0) {
// 拉取服务器,是否支付成功 // 拉取服务器,是否支付成功
that.queryOrderStatus(largeType, ttData.tid) that.queryOrderStatus(largeType, ttData.tidStr)
}else{
message.notify('支付异常');
} }
}, },
fail(res) { fail(res) {
message.notify(res.errMsg); message.notify(res.errMsg);
}, },
}); });
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- <scroll-view :scroll-y="true"> --> <!-- <scroll-view :scroll-y="true"> -->
<z-paging style="height: 100%;"> <z-paging style="height: 100%;">
<view <view
:style="'display: flex;flex-direction: row;align-items: center;margin: 20rpx;padding-left: 10rpx;margin-top:'+statusBarHeight+'px;'"> :style="'display: flex;flex-direction: row;align-items: center;margin: 20rpx;padding-left: 10rpx;margin-top:'+10+'px;'">
<image class="avatar" src="@/static/logo-about.png"></image> <image class="avatar" src="@/static/logo-about.png"></image>
<view> <view>
<view style="font-size: 32rpx;color: black;margin-left: 20rpx;">用户ID:{{userBean.idcode}}</view> <view style="font-size: 32rpx;color: black;margin-left: 20rpx;">用户ID:{{userBean.idcode}}</view>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
}, },
methods: { methods: {
show() { show() {
this.os = wx.getSystemInfoSync().platform; // this.os = wx.getSystemInfoSync().platform;
this.windowHeight = uni.getSystemInfoSync().windowHeight this.windowHeight = uni.getSystemInfoSync().windowHeight
// loadData() { // loadData() {
this.post({ this.post({
......
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
}, },
}) })
} }
}, },
onShow() { onShow() {
try { try {
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
this.tips1 = options.tips1 this.tips1 = options.tips1
// #ifdef MP-TOUTIAO // #ifdef MP-TOUTIAO
this.appName = '巨爽剧' this.appName = '巨爽剧'
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
......
vedio/static/logo-about.png

6.85 KB | W: | H:

vedio/static/logo-about.png

6.28 KB | W: | H:

vedio/static/logo-about.png
vedio/static/logo-about.png
vedio/static/logo-about.png
vedio/static/logo-about.png
  • 2-up
  • Swipe
  • Onion skin
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