Commit 42234a3f by sunchao

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

parent ca54f8e9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
}, function(e) { }, function(e) {
console.error('install fail...'); console.error('install fail...');
}); });
} }
} }
}); });
// uni.getSystemInfo({ // uni.getSystemInfo({
...@@ -64,11 +64,10 @@ ...@@ -64,11 +64,10 @@
<style> <style>
@import "@/static/font/iconfont.css"; @import "@/static/font/iconfont.css";
@import './common/uni.css';
/*每个页面公共css */ /*每个页面公共css */
uni-page-body{ page{
height: 100%; height: 100%;
padding-top: 100rpx; padding-top: 10%;
} }
@font-face { @font-face {
font-family: 'iconfont'; font-family: 'iconfont';
......
/* 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
...@@ -36,5 +36,7 @@ ...@@ -36,5 +36,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.swiper{
height:238rpx;
}
</style> </style>
\ No newline at end of file
...@@ -5,16 +5,12 @@ ...@@ -5,16 +5,12 @@
<view v-for="item in menuList.filter(v=>v.isShow)" :key="item.title" @click="goDetail(item)" <view v-for="item in menuList.filter(v=>v.isShow)" :key="item.title" @click="goDetail(item)"
class="liBox"> class="liBox">
<view class="infoBox"> <view class="infoBox">
<!-- <image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image> -->
<text>{{item.title}}</text> <text>{{item.title}}</text>
</view> </view>
<view class="iconBox"> <view class="iconBox">
<view class="" v-if="item.isType == 'text'"> <view class="" v-if="item.isType == 'text'">
<text>{{item.contentType}}</text> <text>{{item.contentType}}</text>
</view> </view>
<!-- <view class="" v-else-if="item.isType == 'input'">
<input>{{item.contentType}}</input>
</view> -->
<i v-else class="iconfont icon-youjiantou"></i> <i v-else class="iconfont icon-youjiantou"></i>
</view> </view>
</view> </view>
...@@ -96,7 +92,19 @@ ...@@ -96,7 +92,19 @@
height: 52rpx; 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 { &:last-child {
border: none; border: none;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
components:{}, components:{},
onLoad(options){ onLoad(options){
this.queryName = options.queryName; this.queryName = options.queryName;
console.log(this.queryName)
}, },
methods:{ methods:{
jumpToSystemMsg(){ jumpToSystemMsg(){
...@@ -48,7 +49,10 @@ ...@@ -48,7 +49,10 @@
}else{ }else{
//有参数就掉查询否则直接跳转到课程列表页 //有参数就掉查询否则直接跳转到课程列表页
if(this.queryName){ if(this.queryName){
this.$emit("send",this.queryName) // this.$emit("send",this.queryName)
uni.navigateTo({
url:`/pages/courselist/courselist?queryName=${this.queryName}`
})
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url:'/pages/courselist/courselist' url:'/pages/courselist/courselist'
......
{ {
"name" : "CFFP财富中心", "name" : "CFFP财富中心",
"appid" : "__UNI__65C4CDC", "appid" : "__UNI__ED34740",
"description" : "", "description" : "",
"versionName" : "1.1.12", "versionName" : "1.1.12",
"versionCode" : "102", "versionCode" : "102",
......
...@@ -129,21 +129,21 @@ ...@@ -129,21 +129,21 @@
onLoad(options){ onLoad(options){
this.erpInitialize(); this.erpInitialize();
this.queryOrgList(); 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(()=>{ setTimeout(()=>{
if(uni.getStorageSync('applyId')){ if(uni.getStorageSync('applyId')){
this.queryById(uni.getStorageSync('applyId'),null) this.queryById(uni.getStorageSync('applyId'),null)
}else if(options.shareId){
this.queryById(options.id,null)
}else{ }else{
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null,uni.getStorageSync('cffp_userId'))
} }
},500) },500)
// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由,也就是最后一个打开的页面路由
// console.log('当前路由地址',curRoute)
},
mounted() {
this.queryById()
}, },
methods:{ methods:{
erpInitialize(){ erpInitialize(){
...@@ -172,6 +172,8 @@ ...@@ -172,6 +172,8 @@
this.identityIdx = e.detail.value; this.identityIdx = e.detail.value;
this.applyParam.partnerLevel = this.identityArr[this.identityIdx]['partnerLevel']; this.applyParam.partnerLevel = this.identityArr[this.identityIdx]['partnerLevel'];
console.log(this.applyParam.partnerLevel) console.log(this.applyParam.partnerLevel)
this.queryOrgList();
this.areaIdIdx = 0;
}, },
changeIdType:function(e){ changeIdType:function(e){
this.idTypeIdx = e.detail.value; this.idTypeIdx = e.detail.value;
......
...@@ -37,8 +37,9 @@ ...@@ -37,8 +37,9 @@
carousel, carousel,
search search
}, },
onLoad(){ onLoad(options){
this.fileUploadItemCFFPList = uni.getStorageSync('fileUploadItemCFFPList'); this.fileUploadItemCFFPList = uni.getStorageSync('fileUploadItemCFFPList');
this.queryName = options.queryName;
}, },
methods:{ methods:{
goDetail(item){ goDetail(item){
......
...@@ -97,22 +97,22 @@ ...@@ -97,22 +97,22 @@
this.getDetail(); this.getDetail();
}, },
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 = { const param = {
isDtl: 1, isDtl: 1,
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
fortuneDate: "2022-12", fortuneDate: this.fortuneDate,
timeFlag: "M", timeFlag: this.timeFlag,
commissionType:"A01", commissionType:this.commissionType,
productType: 1 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)=>{ api.findForExchangeStatisticDtl(param).then((res)=>{
if(res['success']){ if(res['success']){
this.cffpFortuneDateList = res['data']['cffpFortuneDateList']; this.cffpFortuneDateList = res['data']['cffpFortuneDateList'];
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
export default { export default {
data() { data() {
return { return {
currentPage:'product',
remList: [{ remList: [{
link:'', link:'',
icon: '../../static/SFP/Slice63.png', icon: '../../static/SFP/Slice63.png',
......
...@@ -4,9 +4,9 @@ import {interceptor} from "./interceptor"; ...@@ -4,9 +4,9 @@ import {interceptor} from "./interceptor";
export default (url:string, method:any, params?:any) => { export default (url:string, method:any, params?:any) => {
interceptor(); interceptor();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.showLoading({ // uni.showLoading({
title: '加载中...' // title: '加载中...'
}); // });
uni.request({ uni.request({
url: url, url: url,
method: method, method: method,
...@@ -20,7 +20,7 @@ export default (url:string, method:any, params?:any) => { ...@@ -20,7 +20,7 @@ export default (url:string, method:any, params?:any) => {
reject(err); reject(err);
}, },
complete() { complete() {
uni.hideLoading(); // uni.hideLoading();
} }
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment