抖音支付调度，1.0.0发版

vedio/App.vue

@@ -19,7 +19,16 @@
 			// #endif
 
 			this.globalData.windowWidth = res.windowWidth;
+			// 抖音
+			// #ifdef MP-TOUTIAO
+			this.globalData.statusBarHeight = 0;
+			// #endif
+
+			// 微信
+			// #ifdef MP-WEIXIN
 			this.globalData.statusBarHeight = res.statusBarHeight;
+			// #endif
+
 			// #ifndef H5
 			this.globalData.bottomSafePadding = Math.max(res.screenHeight - res.safeArea.bottom, 12);
 			// #endif
@@ -66,7 +75,7 @@
 			this.globalData.resetLogin = false
 		},
 		methods: {
-			
+
 		},
 		globalData: {
 			resetLogin: false,
@@ -76,8 +85,8 @@
 			windowWidth: 0,
 			bottomSafePadding: 12,
 			h5Url: 'https://api.mints-id.com/index.html',
-			baseUrl: 'https://api.mints-tech.cn/camera-api/miniApi',
-			// baseUrl: 'http://test.mints-id.com/camera-api/miniApi',
+			baseUrl: 'https://api.mints-tech.cn/camera-api/miniApi',
+			// baseUrl: 'http://test.mints-id.com/camera-api/miniApi',
 			// baseUrl: 'http://192.168.110.71:8301/miniApi',
 			titleButtonWidth: 38,
 			token: '',
@@ -87,7 +96,7 @@
 			downUrl: '', //
 			versionName: 'v 1.0.0',
 			auth: false, // 三要素实名认证
-			userInfo: null,
+			userInfo: null,
 			pkgName: 'com.mints.minivideo'
 		}
 	};
@@ -110,4 +119,4 @@
 	@import './scss/agreement.scss';
 	@import "@/uni_modules/uview-ui/index.scss";
 	@import '@/uni.scss';
-</style>
+</style>
\ No newline at end of file

vedio/components/coin-popup/coin-popup.vue

@@ -163,7 +163,7 @@
 				// 抖音支付
 				// #ifdef MP-TOUTIAO
 				this.post({
-					url: '/vip/getVipPayParams/xdouyin',
+					url: '/vip/getVipPayParams/douyin',
 					data: {
 						vedioId: that.point <= 0 ? null : that.vedioId,
 						pid: vipBean.pid
@@ -200,19 +200,18 @@
 				let that = this;
 				tt.pay({
 					orderInfo: {
-						order_id: ttData.order_id,
-						order_token: ttData.order_token,
+						order_id: ttData.params.order_id,
+						order_token: ttData.params.order_token,
 					},
 					service: 5,
-					success(res) {
+					success(res) {
 						if (res.code == 0) {
 							// 拉取服务器，是否支付成功
-							that.queryOrderStatus(largeType, ttData.tid)
-						}else{
-							message.notify('支付异常');
+							that.queryOrderStatus(largeType, ttData.tidStr)
 						}
 					},
-					fail(res) {
+					fail(res) {
+						
 						message.notify(res.errMsg);
 					},
 				});

vedio/components/home/my.vue

@@ -3,7 +3,7 @@
 		<!-- <scroll-view :scroll-y="true"> -->
 		<z-paging style="height: 100%;">
 			<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>
 				<view>
 					<view style="font-size: 32rpx;color: black;margin-left: 20rpx;">用户ID：{{userBean.idcode}}</view>
@@ -136,7 +136,7 @@
 		},
 		methods: {
 			show() {
-				this.os = wx.getSystemInfoSync().platform;
+				// this.os = wx.getSystemInfoSync().platform;
 				this.windowHeight = uni.getSystemInfoSync().windowHeight
 				// loadData() {
 				this.post({

vedio/pages/home.vue

@@ -126,7 +126,8 @@
 
 					},
 				})
-			}
+			}
+			
 		},
 		onShow() {
 			try {

vedio/pages/loading.vue

@@ -42,7 +42,7 @@
 			this.tips1 = options.tips1
 
 			// #ifdef MP-TOUTIAO
-			this.appName = '巨爽刷剧'
+			this.appName = '巨爽短剧'
 			// #endif
 
 			// #ifdef MP-WEIXIN