Merge branch 'feature-20260203-解决外部跳转页面登录问题' into 'dev'

修改月份对应的天数，各种情景的支付方式

See merge request !104

pages/orderConfirm/orderConfirm.vue

@@ -36,7 +36,8 @@
 					<!-- 支付方式 -->
 					<view class="paymentMethodContent">
 						<h4>选择支付方式</h4>
-						<view class="paymentItem" @click="selectPaymentMethod(2)">
+						<view  @click="selectPaymentMethod(2)" >
+							<view class="paymentItem" v-if="runEnv!=='wechat-miniprogram'">
 								<view>
 									<i class="iconfont icon-zhifubao"></i>
 									<text class="txtFont">支付宝支付</text>
@@ -45,6 +46,8 @@
 									<i class="iconfont icon-duihao txtFont"></i>
 								</view>
 							</view>
+							
+						</view>
 						<view class="paymentItem" @click="selectPaymentMethod(1)" v-if="deviceType==3">
 							<view>
 								<i class="iconfont icon-py_weixinzhifu txtFont"></i>
@@ -210,7 +213,8 @@
 				calculatedPrice: 0,
 				dataToken:'',
 				oldToken:'',//原始用户token
-				pollTimer:''
+				pollTimer:'',
+				runEnv:dataHandling.h5RuntimeEnv()
 			}
 		},
 		computed: {
@@ -256,6 +260,7 @@
 					fileId: this.fileId,
 					companyType: companyInfo.companyType,
 				}
+				
 				if (this.paymentMethod == 1) {
 					// APP：微信app支付
 					// #ifdef APP-PLUS
@@ -324,8 +329,14 @@
 						}
 						let _this = this
 						param.isPayOrAuth = 1;
+						uni.showToast({
+							title: JSON.stringify(param),
+							duration: 10000,
+							icon: 'none'
+						})
 						api.wxAuthorize(param).then((res) => {
 							_this.paymentBtnDisabled = false;
+							
 							if (res['success']) {
 								if (param.amount == '0.00') {
 									uni.navigateTo({
@@ -418,6 +429,7 @@
 
 			},
 			getunifiedPay(param){
+				
 				api.unifiedPay(param).then((res) => {
 					const data = res['data'];
 					this.paymentBtnDisabled = false;

pages/pointsExchange/customDatePop.vue

@@ -400,6 +400,7 @@
 							this.$emit('comfirm',{year:this.year,month:this.month,current:this.current,timeType:'8'})
 						}
 						if(this.current=='2'){
+							console.log('this.currentDate',this.currentDate);
 							if(!this.currentDate.length){
 								uni.showToast({
 									title: `请选择时间`,