代码问题修改

ab8ed886 · kyle · e352e70a · ab8ed886 · ab8ed886 · ab8ed886
Commit ab8ed886 authored Nov 26, 2022 by kyle
11 changed files
--- a/App.vue
+++ b/App.vue
@@ -125,4 +125,7 @@
 		left: 0;
 		right: 0;
 	}
+	.uni-calendar-item--extra{
+		white-space: nowrap !important;
+	}
 </style>
--- a/components/charts/charts.vue
+++ b/components/charts/charts.vue
@@ -39,7 +39,8 @@ export default {
 				data:[{
 					title:'（分钟）',
 					titleFontSize:10,
-					titleOffsetY:-5
+					titleOffsetY:-5,
+					min:0
 				}]
 			},
 			legend:{

--- a/pages.json
+++ b/pages.json
@@ -416,6 +416,14 @@
                "enablePullDownRefresh": false
            }
+        } ,{
+            "path" : "pages/invitationRegister/invitationRegister",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "邀请注册",
+                "enablePullDownRefresh": false
+            }
        }
    ],
 	// "tabBar": {

--- a/pages/afterSaleDetail/afterSaleDetail.vue
+++ b/pages/afterSaleDetail/afterSaleDetail.vue
@@ -81,7 +81,7 @@
 				options:[
 					{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收',time:'XXXX'},
 					{title:'退款中',desc:'您的退款申请已通过，待财务退款',time:'XXXX'},
-					{title:'退款成功',desc:'您的退款申请已成功，待审核',time:'XXXX'},
+					{title:'退款成功',desc:'您的退款申请已成功',time:'XXXX'},
 				]
 			};
 		},
@@ -114,7 +114,7 @@
 						this.options = [
 							{title:'提交申请',desc:'退款将退回到您的支付宝/微信账号请注意查收',time:this.courseInfoItem.refundTime},
 							{title:'退款中',desc:'您的退款申请已通过，待财务退款',time:this.courseInfoItem.refundingTime},
-							{title:'退款成功',desc:'您的退款申请已成功，待审核',time:this.courseInfoItem.applyRefundTime},
+							{title:'退款成功',desc:'您的退款申请已成功',time:this.courseInfoItem.applyRefundTime},
 						]
 					}
 				})

--- a/pages/announcement/announcement_detail.vue
+++ b/pages/announcement/announcement_detail.vue
@@ -34,7 +34,7 @@
 		name:'announcement_detail',
 		components:{
 		},
-		onLoad(option){
+		onLoad(options){
 			this.id = options.id;
 			this.getAnnouncementDetail();
 		},
@@ -95,6 +95,7 @@
 			margin-top: 20rpx;
 			padding: 20rpx;
 			background: #fff;
+			word-break: break-word;
 		}
 	}
 </style>
\ No newline at end of file
--- a/pages/invitationRegister/invitationRegister.vue
+++ b/pages/invitationRegister/invitationRegister.vue
@@ -37,6 +37,7 @@
 			border-radius: 30rpx;
 			overflow: hidden;
 			font-size: 40rpx;
+			width:100rpx;
 			image{
 				margin-bottom: 20rpx;
 				width: 160rpx;

--- a/pages/learningStatistics/learningStatistics.vue
+++ b/pages/learningStatistics/learningStatistics.vue
@@ -85,7 +85,7 @@
 			<h4>学习明细</h4>
 			<view class="lineChartBox">
 				<view v-if="studyInfos && chartData">
-					<charts :chartData="chartData" @getIndex="tap"></charts>
+					<charts :chartData="chartData" :reload="false" @getIndex="tap"></charts>
 					<view class="chartTips">
 						 <view class="imgBox">
 							<image src="../../static/point.png" mode="widthFix"></image>
@@ -206,6 +206,8 @@
 			},
 			tap(e){
 				this.index = e;
+				this.chartData.series[0]['data'].forEach(item=>item.color = '#9EB4FF');
+				this.chartData.series[0]['data'][this.index].color = '#5F83FF';
 				this.month = this.studyInfos[this.index].month;
 				this.calendarSelected = [];
 				this.currentDate = this.month;

--- a/pages/myCertify/myCertify.vue
+++ b/pages/myCertify/myCertify.vue
@@ -31,7 +31,7 @@
 			</view>
 			<view class="getCertifyListsBox" v-if="tabType===2">
 				<view class="certifyListContent" v-if="userCertificates.length>0">
-					<view class="certifyInfoItem" v-for="item in userCertificates" :key="item.cerNo">
+					<view class="certifyInfoItem" v-for="item in userCertificates" :key="item.cerNo" @click="previewImg(item)">
 						<h4>{{item.cerName}}</h4>
 						<view class="certifyImgBox">
 							<image :src="item.cerUrl" alt="" srcset="" mode="widthFix"></image>
@@ -117,6 +117,22 @@
 					statusInfo.statusClass = 'certifing'
 				}
 				return statusInfo;
+			},
+			// 预览图片
+			previewImg(e){
+				// 预览图片
+				uni.previewImage({
+					urls:[e.cerUrl],
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
 			}
 		},
 		onLoad(){
@@ -223,6 +239,11 @@
 						max-width: 60%;
 						height: auto;
 					}
+					.certifyImgBox{
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+					}
 				}
 			}
 		}

--- a/pages/orderConfirm/orderConfirm.vue
+++ b/pages/orderConfirm/orderConfirm.vue
@@ -157,7 +157,8 @@
 					orderId:this.orderId,
 					amount:this.totalPrice,
 					paymentMethod:this.paymentMethod,
-					userId:this.userId
+					userId:this.userId,
+					integralExchange:parseFloat(this.deductionCore)
 				}
 				if(this.paymentMethod==1){
 					api.wxAppPay(param).then(res=>{

--- a/pages/personalCenter/personalCenter.vue
+++ b/pages/personalCenter/personalCenter.vue
@@ -79,7 +79,7 @@
 		data() {
 			return {
 				userId:'1',
-				inviteEqrode:'XXXXXXX',
+				inviteEqrode:'',
 				currentPage:'personalCenter',
 				customerBasicInfo:{},
 				mainMenuLists:[
@@ -120,7 +120,7 @@
 					{title:'我的邀请码',icon:'shareEcode',link:'',isOpen:true,isShow:true},
 					{title:'我的卡包',icon:'card',link:'',isOpen:true,isShow:false},
 					{title:'我的认证',icon:'myCertify',link:'/pages/myCertify/myCertify',isOpen:true,isShow:true},
-					{title:'申请修改公司周边',icon:'setting',link:'',isOpen:true,isShow:true},
+					{title:'申请修改公司周边',icon:'setting',link:'',isOpen:true,isShow:false},
 					{title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true},
 					{title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true}
 				]
@@ -181,6 +181,7 @@
 				api.queryInfo({userId:this.userId}).then(res=>{
 					if(res['success']){
 						this.customerBasicInfo = res['data'];
+						this.inviteEqrode = this.customerBasicInfo.invitationCode;
 					}else{
 						uni.showToast({
 							title: res['message'],

--- a/pages/systemMsg/system_msg_detail.vue
+++ b/pages/systemMsg/system_msg_detail.vue
@@ -90,6 +90,7 @@
 			margin-top: 20rpx;
 			padding: 20rpx;
 			background: #fff;
+			word-break: break-word;
 		}
 	}
 </style>
\ No newline at end of file