添加页面、优化支付逻辑

scan/components/my/my.vue

@@ -69,7 +69,7 @@
 					<image style="width: 46rpx;height: 46rpx;"
 						src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/ic_scan_agree.png" mode="widthFix">
 					</image>
-					<view style="font-size: 26rpx;color: #3B3B3B;margin-top: 20rpx;">申请退款</view>
+					<view style="font-size: 26rpx;color: #3B3B3B;margin-top: 20rpx;">关于我们</view>
 				</view>
 				<view @click="handleSet"
 					style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
@@ -122,16 +122,14 @@
 				navigateTo(`/pagesD/setting/setting`)
 			},
 			handleAgree() {
-				// let url = 'https://mints-web.mints-id.com/agreements/scandemon/yhxy.html';
-				// navigateTo(`/pages/brower/brower?url=` + url);
-				this.handlePhone();
+				navigateTo(`/pagesD/about/about`)
 			},
 			handleVipPay() {
 				navigateTo(`/pagesA/vipPay/vipPay`)
 			},
 			handlePhone() {
 				tt.makePhoneCall({
-					number: '4000969950',
+					phoneNumber: '4000969950',
 					success: function(res) {
 						console.log('拨打电话成功！');
 					},

scan/pages.json

@@ -58,7 +58,7 @@
 				"style": {
 					"navigationBarTitleText": "编辑",
 					"navigationStyle": "default",
-					"navigationBarBackgroundColor": "#2196f3",
+					"navigationBarBackgroundColor": "#ffffff",
 					"navigationBarTextStyle": "black"
 				}
 			}, {
@@ -66,7 +66,7 @@
 				"style": {
 					"navigationBarTitleText": "识别结果",
 					"navigationStyle": "default",
-					"navigationBarBackgroundColor": "#2196f3",
+					"navigationBarBackgroundColor": "#ffffff",
 					"navigationBarTextStyle": "black"
 				}
 			},
@@ -75,7 +75,7 @@
 				"style": {
 					"navigationBarTitleText": "AR测量",
 					"navigationStyle": "default",
-					"navigationBarBackgroundColor": "#2196f3",
+					"navigationBarBackgroundColor": "#ffffff",
 					"navigationBarTextStyle": "black"
 				}
 			},
@@ -84,7 +84,7 @@
 				"style": {
 					"navigationBarTitleText": "测量介绍",
 					"navigationStyle": "default",
-					"navigationBarBackgroundColor": "#2196f3",
+					"navigationBarBackgroundColor": "#ffffff",
 					"navigationBarTextStyle": "black"
 				}
 			},
@@ -93,7 +93,7 @@
 				"style": {
 					"navigationBarTitleText": "测量拍摄",
 					"navigationStyle": "default",
-					"navigationBarBackgroundColor": "#2196f3",
+					"navigationBarBackgroundColor": "#ffffff",
 					"navigationBarTextStyle": "black"
 				}
 			},
@@ -102,7 +102,7 @@
 				"style": {
 					"navigationBarTitleText": "测量拍摄",
 					"navigationStyle": "default",
-					"navigationBarBackgroundColor": "#2196f3",
+					"navigationBarBackgroundColor": "#ffffff",
 					"navigationBarTextStyle": "black"
 				}
 			}
@@ -117,6 +117,14 @@
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
+		},{
+			"path": "about/about",
+			"style": {
+				"navigationStyle": "default",
+				"navigationBarTitleText": "关于我们",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
 		}, {
 			"path": "setting/setting",
 			"style": {

scan/pagesA/vipPay/vipPay.vue

@@ -47,16 +47,16 @@
 			</view>
 
 			<image @click="handlePay" style="width: 100%;"
-				src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg_scan/img/bg_vip_about.png" mode="widthFix" />
+				src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/bg_vip_about.png" mode="widthFix" />
 
 		</scroll-view>
 		
 		<view>
 			<uni-popup ref="alertDialog" type="center">
 				<uni-popup-dialog  confirmText="确认" title="付费须知" content="
-						1、看点和会员属于虚拟商品，一经购买不可退换;
+						1、会员属于虚拟商品，一经购买不可退换;
 						2、未满18岁的未成年人需要在监护人主导、同意下进行相关付费操作;
-						3、充值看点一般5分钟内到账，如未到账请在“我的”页面联系客服;"
+						3、充值会员一般5分钟内到账，如未到账请在“我的”页面联系客服;"
 					 @close="dialogClose">
 				</uni-popup-dialog>
 			</uni-popup>
@@ -143,7 +143,7 @@
 			},
 			ttPrePay(ttData, largeType) {
 				if (!tt.canIUse('requestOrder')) {
-					message.notify('请升级抖音APP版本');
+					message.notify('请升级抖音APP版本!');
 					return
 				}
 			
@@ -155,20 +155,21 @@
 						that.ttPay(largeType, res.orderId, ttData);
 					},
 					fail(res) {
-						// message.notify(res.errMsg);
+						message.notify(res.errMsg);
+						console.log('requestOrder res.errMsg',res)
 					},
 				});
 			},
 			ttPay(largeType, oid, ttData) {
 				if (!tt.canIUse('getOrderPayment')) {
-					message.notify('请升级抖音APP版本');
+					message.notify('请升级抖音APP版本~');
 					return
 				}
 			
 				let that = this;
 				if (this.os == 'ios') {
 					if (!tt.canIUse('getOrderPayment.object.imId')) {
-						message.notify('请升级抖音APP版本');
+						message.notify('请升级抖音APP版本.');
 						return
 					}
 					
@@ -179,6 +180,7 @@
 							that.queryOrderStatus(largeType, ttData.tidStr);
 						},
 						fail(res) {
+							console.log('ios=ttPay res.errMsg',res)
 							message.notify(res.errMsg);
 						},
 					});
@@ -189,6 +191,7 @@
 							that.queryOrderStatus(largeType, ttData.tidStr);
 						},
 						fail(res) {
+							console.log('android=ttPay res.errMsg',res)
 							message.notify(res.errMsg);
 						},
 					});

scan/pagesD/about/about.vue

+<!-- <template>
+	<view class="body">
+		<view  >
+			<image src="@/static/logo-about.png" mode="widthFix" style="border-radius: 20rpx;margin-bottom: 200rpx;" />
+			<view style="display: flex;justify-content: center;margin-top: 50rpx;font-size: 26rpx;color: gray;">
+				智能扫描精灵 v{{ versionName }}
+			</view>
+		</view>
+		<view >
+			<view style="color: black;margin-top: 40rpx;font-size: 40rpx;">Copyright 2024 Inc.</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	export default {
+		name: 'about',
+		mixins: [common],
+		data() {
+			return {
+				versionName: app.globalData.versionName
+			};
+		},
+		methods: {
+			
+		}
+	};
+</script>
+
+<style lang="scss">
+	.body {
+		background-color: white;
+	}
+</style> -->
+
+<template>
+	<view class="body">
+		<view  style="display: flex;flex-direction: column;width: 100%;height: 90%;align-items: center;">
+			<image src="@/static/logo-about.png" mode="widthFix" style="width: 120rpx;height: 120rpx;margin-top: 100rpx;" />
+			<view style="margin-top: 50rpx;font-size: 26rpx;color: gray;">
+				智能扫描精灵 {{ versionName }}
+			</view>
+		</view>
+		<view style="display: flex;justify-content: center;">
+			<view style="color: black;font-size: 40rpx;">Copyright 2024 Inc.</view>
+		</view>
+	</view>
+</template>
+<script>
+	import common from '@/mixins/common';
+
+	import {
+		getToLocal
+	} from "@/utils/utils.js"
+
+	import {
+		navigateTo,
+		message,
+		alert,
+		loading
+	} from '@/utils/fun.js';
+	import {
+		openUrl
+	} from '@/utils/app+.js';
+
+	const app = getApp();
+
+	export default {
+		name: 'index',
+		mixins: [common],
+		data() {
+			return {
+				userBean: {},
+				versionName: app.globalData.versionName
+			};
+		},
+		methods: {
+			onShow() {
+				
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import '@/scss/uni.scss';
+
+	.body {
+		background-color: whitesmoke;
+	}
+</style>
\ No newline at end of file

scan/pagesD/setting/setting.vue

 <template>
 	<view class="body">
+		
+		<view class="infobg" style="margin: 20rpx;">
+			<view class="item arrow">
+				用户ID
+				<view class="item_bd ellipsis" style="margin-left: 58rpx;color:black">{{userBean.idcode}}</view>
+			</view>
+		</view>
 		<view style="display: flex;justify-content: center;margin-top: 50rpx;font-size: 26rpx;color: gray;">
 			当前版本：{{ versionName }}
 		</view>
@@ -29,11 +36,22 @@
 		mixins: [common],
 		data() {
 			return {
+				userBean: {},
 				versionName: app.globalData.versionName
 			};
 		},
 		methods: {
-			
+			onShow() {
+				this.post({
+					url: '/user/baseMsg',
+					showLoading: false,
+					success: ({
+						data
+					}) => {
+						this.userBean = data;
+					}
+				});
+			},
 		}
 	};
 </script>