Merge branch 'master' of http://101.43.129.26:10880/psychological_camera/psy_web_share into douyin20240514

newScale/EQtest/paymentPage.vue

@@ -1,20 +1,16 @@
 <template>
 	<view class="payment_bg">
 		<view class="payment_info">
-			<image src="https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_scale_info.png"
-				mode="widthFix">
-			</image>
-			<image class="pay_btn_sm" @click="createOrder"
-				src="https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_button.png"
-				mode="widthFix"></image>
+			<view class="people_num"><text>{{ peopleNum }}人已测</text></view>
+			<view class="price_num"><text>￥{{ orderInfo.total }}</text></view>
+			<view class="pay_btn_sm" @click="createOrder">{{ orderInfo.total }}元解锁专属测试报告</view>
 		</view>
 		<view class="payment_desc">
 			<image src="https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_scale_desc.png"
 				mode="widthFix"></image>
 		</view>
-		<view class="pay_btn_lg" @click="createOrder">
-			<image src="https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_button.png"
-				mode="widthFix"></image>
+		<view class="pay_btn_lg" @click="getH5Pay()">
+			{{ orderInfo.total }}元解锁专属测试报告
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="pay_dialog">
@@ -36,10 +32,22 @@
 		data() {
 			return {
 				orderNo: '',
-				orderInfo: {}
+				orderInfo: {
+					total: 0
+				},
+				peopleNum: 0,
+			}
+		},
+		onLoad(options) {
+			if (options.orderNo) {
+				this.orderNo = options.orderNo;
+				setTimeout(() => {
+					this.payEnsure();
+				}, 200)
 			}
+			this.orderInfo = uni.getStorageSync('orderInfo');
+			this.getPeople();
 		},
-		onLoad(options) {},
 		methods: {
 			// 检查订单支付状态
 			checkOrder() {
@@ -65,7 +73,6 @@
 
 			createOrder() {
 				let _this = this;
-				_this.orderInfo = uni.getStorageSync('orderInfo');
 				let params = {
 					resultId: _this.orderInfo.resultId,
 					subject: _this.orderInfo.description,
@@ -179,6 +186,18 @@
 					.catch((err) => {
 						console.log(err);
 					});
+			},
+			// 查询测试人数
+			getPeople() {
+				let _this = this;
+				_this.$request
+					.get({
+						url: "record/countByFlag?flag=20210820143117",
+						loadingTip: "加载中..."
+					})
+					.then((res) => {
+						_this.peopleNum = res.data + 57000
+					});
 			}
 		}
 	}
@@ -193,7 +212,13 @@
 	}
 
 	.payment_info {
+		width: 750rpx;
+		height: 531rpx;
+		background: url(https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_scale_info.png) no-repeat center;
+		background-size: cover;
 		position: relative;
+		margin-top: 143rpx;
+		overflow: hidden;
 	}
 
 	.payment_info image {
@@ -204,10 +229,19 @@
 
 	.payment_info .pay_btn_sm {
 		width: 640rpx;
-		height: auto;
+		height: 73rpx;
+		line-height: 73rpx;
 		position: absolute;
 		left: 55rpx;
 		bottom: 73rpx;
+		background: url(https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_button.png) no-repeat center;
+		background-size: 100% auto;
+		font-family: 'Alibaba PuHuiTi 2.0';
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 0rpx 5rpx rgba(168, 63, 90, 0.5);
+		text-align: center;
 	}
 
 	.payment_desc image {
@@ -216,12 +250,17 @@
 
 	.pay_btn_lg {
 		width: 640rpx;
-		margin: 40rpx auto;
-	}
-
-	.pay_btn_lg image {
-		width: 640rpx;
-		height: auto;
+		height: 73rpx;
+		line-height: 73rpx;
+		background: url(https://test.jue-ming.com:8849/api/show?filePath=./webo/EQtest/paymentPage/pay_button.png) no-repeat center;
+		background-size: 100% auto;
+		font-family: 'Alibaba PuHuiTi 2.0';
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 0rpx 5rpx rgba(168, 63, 90, 0.5);
+		text-align: center;
+		margin: 20rpx auto 60rpx;
 	}
 
 	.pay_dialog {
@@ -248,4 +287,36 @@
 		opacity: 0.8;
 		border-radius: 28rpx;
 	}
+
+	.people_num {
+		margin-top: 177rpx;
+	}
+
+	.people_num text {
+		min-width: 157rpx;
+		height: 44rpx;
+		padding: 0 10rpx;
+		background: #FFEDF1;
+		border-radius: 22rpx;
+		font-family: 'Alibaba PuHuiTi 2.0';
+		font-size: 28rpx;
+		color: #FC716D;
+		line-height: 44rpx;
+		text-align: center;
+		margin-left: 373rpx;
+	}
+
+	.price_num {
+		margin-top: 64rpx;
+	}
+
+	.price_num text {
+		min-width: 74rpx;
+		font-family: 'Alibaba PuHuiTi 2.0';
+		font-weight: normal;
+		font-size: 32rpx;
+		color: #FC716D;
+		line-height: 24rpx;
+		margin-left: 374rpx;
+	}
 </style>

newScale/EQtest/testPage.vue

@@ -63,7 +63,8 @@
 		},
 		created() {
 			this.loadData();
-			this.userInfo = uni.getStorageSync("user")
+			debugger
+			this.userInfo = uni.getStorageSync("setUerInfo").user
 		},
 		methods: {
 			loadData() {

newScale/EQtest/testResult.vue

@@ -141,7 +141,7 @@
 				improvementSuggestions: '',
 				scoreNum: 0,
 				maxScore: 0,
-				minScore: 0,
+				minScore: 0
 			}
 		},
 		onLoad(options) {

unpackage/dist/dev/mp-toutiao/project.private.config.json

@@ -1,7 +1,7 @@
 {
     "condition": {
         "miniprogram": {
-            "current": 1715760685287,
+            "current": -1,
             "list": [
                 {
                     "id": 1715760685287,