搜索bug和申请加盟第一步保存返回重新保存id未传bug

App.vue

@@ -64,11 +64,10 @@
 
 <style>
 	@import "@/static/font/iconfont.css"; 
-	@import './common/uni.css';
 	/*每个页面公共css */
-	uni-page-body{
+	page{
 		height: 100%;
-		padding-top: 100rpx;
+		padding-top: 10%;
 	}
 	@font-face {
 		font-family: 'iconfont';

common/uni.css

-/* page {
-	height: 100%;
-	width: 100%;
-	background-color: #F8F8F8;
-}
- */
-.container {
-/* 	height: 100%;
-	width: 100%; */
-	padding-top: 10%;
-}
 
-.ptop {
-	padding-top: 10%;
-}
\ No newline at end of file

components/carousel/carousel.vue

@@ -36,5 +36,7 @@
 </script>
 
 <style lang="scss">
-	
+	.swiper{
+		height:238rpx;
+	}
 </style>
\ No newline at end of file

components/menuList/menuList.vue

@@ -5,16 +5,12 @@
 				<view v-for="item in menuList.filter(v=>v.isShow)" :key="item.title" @click="goDetail(item)"
 					class="liBox">
 					<view class="infoBox">
-						<!-- <image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image> -->
 						<text>{{item.title}}</text>
 					</view>
 					<view class="iconBox">
 						<view class="" v-if="item.isType == 'text'">
 							<text>{{item.contentType}}</text>
 						</view>
-				<!-- 		<view class="" v-else-if="item.isType == 'input'">
-							<input>{{item.contentType}}</input>
-						</view> -->
 						<i v-else class="iconfont icon-youjiantou"></i>
 					</view>
 				</view>
@@ -96,7 +92,19 @@
 						height: 52rpx;
 					}
 				}
-
+				& > view:first-child{
+					position: relative;
+					&::after{
+						content:'';
+						position: absolute;
+						left: 0;
+						bottom: -6rpx;
+						background: linear-gradient(90deg,#FA882F, #D9D9D9);
+						border-radius: 4rpx;
+						height: 8rpx;
+						width: 80rpx;
+					}
+				}
 				&:last-child {
 					border: none;
 				}

components/search/search.vue

@@ -22,6 +22,7 @@
 		components:{},
 		onLoad(options){
 			this.queryName = options.queryName;
+			console.log(this.queryName)
 		},
 		methods:{
 			jumpToSystemMsg(){
@@ -48,7 +49,10 @@
 				}else{
 					//有参数就掉查询否则直接跳转到课程列表页
 					if(this.queryName){
-						this.$emit("send",this.queryName)
+						// this.$emit("send",this.queryName)
+						uni.navigateTo({
+							url:`/pages/courselist/courselist?queryName=${this.queryName}`
+						})
 					}else{
 						uni.navigateTo({
 							url:'/pages/courselist/courselist'

manifest.json

 {
     "name" : "CFFP财富中心",
-    "appid" : "__UNI__65C4CDC",
+    "appid" : "__UNI__ED34740",
     "description" : "",
     "versionName" : "1.1.12",
     "versionCode" : "102",

pages/application-process/basic-info.vue

@@ -129,21 +129,21 @@
 		onLoad(options){
 			this.erpInitialize();
 			this.queryOrgList();
+				// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
+				// console.log('当前路由地址',curRoute)
+				if(!uni.getStorageSync('applyId') && options.shareId){
+					this.queryById(options.id,null)
+				}
+		},
+		mounted() {
 			setTimeout(()=>{
 				if(uni.getStorageSync('applyId')){
 					this.queryById(uni.getStorageSync('applyId'),null)
-				}else if(options.shareId){
-					this.queryById(options.id,null)
 				}else{
 					this.queryById(null,uni.getStorageSync('cffp_userId'))
 				}
 			},500)
-				// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-				// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
-				// console.log('当前路由地址',curRoute)
-		},
-		mounted() {
-			this.queryById()
 		},
 		methods:{
 			erpInitialize(){
@@ -172,6 +172,8 @@
 				this.identityIdx = e.detail.value;
 				this.applyParam.partnerLevel = this.identityArr[this.identityIdx]['partnerLevel'];
 				console.log(this.applyParam.partnerLevel)
+				this.queryOrgList();
+				this.areaIdIdx = 0;
 			},
 			changeIdType:function(e){
 				this.idTypeIdx = e.detail.value;

pages/courselist/courselist.vue

@@ -37,8 +37,9 @@
 			carousel,
 			search
 		},
-		onLoad(){
+		onLoad(options){
 			this.fileUploadItemCFFPList = uni.getStorageSync('fileUploadItemCFFPList');
+			this.queryName = options.queryName;
 		},
 		methods:{
 			goDetail(item){

pages/myPoints/pointsDetail.vue

@@ -97,22 +97,22 @@
 				this.getDetail();
 			},
 			getDetail(){
-				// const param = {
-				// 	isDtl: 1,
-				// 	userId: uni.getStorageSync('cffp_userId'),
-				// 	fortuneDate: this.fortuneDate,
-				// 	timeFlag: this.timeFlag,
-				// 	commissionType:this.commissionType,
-				// 	productType: this.productType
-				// }
 				const param = {
 					isDtl: 1,
 					userId: uni.getStorageSync('cffp_userId'),
-				  fortuneDate: "2022-12",
-				  timeFlag: "M",
-				  commissionType:"A01",
-				  productType: 1
+					fortuneDate: this.fortuneDate,
+					timeFlag: this.timeFlag,
+					commissionType:this.commissionType,
+					productType: this.productType
 				}
+				// const param = {
+				//   isDtl: 1,
+				//   userId: uni.getStorageSync('cffp_userId'),
+				//   fortuneDate: "2022-12",
+				//   timeFlag: "M",
+				//   commissionType:"A01",
+				//   productType: 1
+				// }
 			api.findForExchangeStatisticDtl(param).then((res)=>{
 				if(res['success']){
 					this.cffpFortuneDateList = res['data']['cffpFortuneDateList'];

pages/product/product.vue

@@ -31,6 +31,7 @@
 	export default {
 		data() {
 			return {
+				currentPage:'product',
 				remList: [{
 						link:'',
 						icon: '../../static/SFP/Slice63.png',

util/request.ts

@@ -4,9 +4,9 @@ import {interceptor} from "./interceptor";
 export default (url:string, method:any, params?:any) => {
 	interceptor();
 	return new Promise((resolve, reject) => {
-		uni.showLoading({
-		  title: '加载中...'
-		});
+		// uni.showLoading({
+		//   title: '加载中...'
+		// });
 		uni.request({
 			url: url,
 			method: method,
@@ -20,7 +20,7 @@ export default (url:string, method:any, params?:any) => {
 				reject(err);
 			},
 			complete() {
-				uni.hideLoading(); 
+				// uni.hideLoading();
 			}
 		});
 	});