解决冲突

pages/myPoints/pointsDetail.vue

@@ -45,14 +45,10 @@
 			</view>
 			</view>
 			
 			
 		</view>
 		</view>
-=======
-		
->>>>>>> Stashed changes
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-<<<<<<< Updated upstream
 	import api from '../../api/api';
 	import api from '../../api/api';
 	import common from '../../common/common';
 	import common from '../../common/common';
 	export default{
 	export default{
@@ -68,18 +64,11 @@
 				maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
 				maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
 				commissionTypeList:[{dropOptionName:null,dropOptionCode:null}],
 				commissionTypeList:[{dropOptionName:null,dropOptionCode:null}],
 				productTypeList:[{dropOptionName:null,dropOptionCode:null}],
 				productTypeList:[{dropOptionName:null,dropOptionCode:null}],
-				sumCommissionAmount:null
-=======
-	export default{
-		data(){
-			return {
-				
->>>>>>> Stashed changes
+				sumCommissionAmount:null,
 			}
 			}
 		},
 		},
 		components:{},
 		components:{},
 		onLoad(){
 		onLoad(){
-<<<<<<< Updated upstream
 			this.fortuneDate = common.getQueryString('fortuneDate');
 			this.fortuneDate = common.getQueryString('fortuneDate');
 			this.productType = common.getQueryString('productType');
 			this.productType = common.getQueryString('productType');
 			this.timeFlag = common.getQueryString('timeFlag');
 			this.timeFlag = common.getQueryString('timeFlag');
@@ -215,26 +204,4 @@
 			
 			
 		}
 		}
 	}
 	}
-	
-	
+</script>
\ No newline at end of file
-=======
-			
-		},
-		methods:{
-			getDetail(){
-				const param = {
-				  "isDtl": 1,
-				  "userId": 1,
-				  "fortuneDate": "2022-12",
-				  "timeFlag": "M",
-				  "commissionType":"A01",
-				  "productType": 1
-				}
-			}
-		}
-	}
-</script>
-
-<style>
->>>>>>> Stashed changes
-</style>
\ No newline at end of file