Skip to content

C
CFFP-HB
Commit 3a31c0ab by kyle
Options

合并

parents 6bf7235a 282f5ac0
Showing with 423 additions and 256 deletions
androidPrivacy.json 0 → 100644
{
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://mdev.zuihuibi.cn/cffp/components/clause/clause?type=1\">《服务协议》</a>和<a href=\"https://mdev.zuihuibi.cn/cffp/components/clause/clause?type=2\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"second" : {
"title" : "确认提示",
"message" : "　　进入应用前，你需先同意<a href=\"https://mdev.zuihuibi.cn/cffp/components/clause/clause?type=1\">《服务协议》</a>和<a href=\"https://mdev.zuihuibi.cn/cffp/components/clause/clause?type=2\">《隐私政策》</a>，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
"styles" : {
"backgroundColor" : "#ffffff",
"borderRadius" : "5px",
"title" : {
"color" : "#333333"
},
"buttonAccept" : {
"color" : "#333333"
},
"buttonRefuse" : {
"color" : "#9B9AB5"
}
}
}
components/login/login.vue
...@@ -317,7 +317,6 @@ ...@@ -317,7 +317,6 @@
api.checkToken().then(res=>{ api.checkToken().then(res=>{
if(res['success']){}else{ if(res['success']){}else{
api.obtainToken().then(res=>{ api.obtainToken().then(res=>{
console.log(res,222222)
if(res.success){ if(res.success){
uni.setStorageSync('uni-token',res.data['token']); uni.setStorageSync('uni-token',res.data['token']);
} }
...@@ -346,7 +345,7 @@ ...@@ -346,7 +345,7 @@
.wrapper{ .wrapper{
background: #20279B; background: #20279B;
overflow: auto; overflow: auto;
height: 100%; height: 100vh;
.logo{ .logo{
text-align: center; text-align: center;
color: #fff; color: #fff;
......
manifest.json
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
"schemes" : "cffpapp,hbuilder", "schemes" : "cffpapp,hbuilder",
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
}, },
// "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios" : {
"dSYMs" : false, "dSYMs" : false,
......
pages/application-process/application-result.vue
...@@ -29,30 +29,65 @@ ...@@ -29,30 +29,65 @@
<view class="result" v-if="this.partnerLevel=='B1' && approvalStatus==3"> <view class="result" v-if="this.partnerLevel=='B1' && approvalStatus==3">
欢迎您加入{{areaName}}！ 欢迎您加入{{areaName}}！
</view> </view>
<navigator url="../index/index"> <view class="">
返回首页 > <view class="" style="text-align: center;color: #20269B;" v-if="isH5">
</navigator> <text>请前往应用商店下载App</text>
</view>
<view class="" v-else>
<navigator url="../index/index">
返回首页 >
</navigator>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import api from '@/api/api';
export default{ export default{
data(){ data(){
return { return {
partnerLevel:null, partnerLevel:null,
areaName:null, areaName:null,
approvalStatus:null approvalStatus:null,
applyType: null,
isH5: false,
} }
}, },
components:{}, components:{},
onLoad(options){ onLoad(options){
this.shareId = options.shareId
this.areaName = options.areaName; this.areaName = options.areaName;
this.partnerLevel = options.partnerLevel; // this.partnerLevel = options.partnerLevel;
this.approvalStatus = options.approvalStatus; // this.approvalStatus = options.approvalStatus;
if(uni.getStorageSync('isH5')){
this.isH5 = true
}
},
onShow() {
if (uni.getStorageSync('applyId')) {
this.queryById(uni.getStorageSync('applyId'), null)
} else if (this.shareId) {
this.queryById(this.shareId, null)
} else {
this.queryById(null, uni.getStorageSync('cffp_userId'))
}
}, },
methods:{ methods:{
queryById(id, userId) {
api.queryById({
id: id,
userId: userId
}).then((res) => {
console.log(res)
if (res['success']) {
// this.applyParam = res['data']['data'];
this.approvalStatus = res.data.data.approvalStatus
this.partnerLevel = res.data.data.partnerLevel
}
})
},
} }
} }
......
pages/application-process/bank-card.vue
...@@ -19,81 +19,105 @@ ...@@ -19,81 +19,105 @@
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class="title"> <view class="title">
<view> <view>
<text class="line"></text>银行卡号 <text class="line"></text>银行卡号
</view> </view>
<text class="page_mark">5/8</text> <text class="page_mark">5/8</text>
</view> </view>
<view class="content"> <view class="content">
<view class="contentDetail employ"> <view class="contentDetail employ">
<view class="contentItem"> <view class="contentItem">
<text>开户行</text> <text>开户行</text>
<input class="form-control" name="" placeholder="请输入" v-model="applyParam.bankAccountOpening" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> <input class="form-control" name="" placeholder="请输入开户行" v-model="applyParam.bankAccountOpening"
</view> :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
<view class="contentItem"> </view>
<view class="contentItem">
<text>银行卡号</text> <text>银行卡号</text>
<input class="form-control" placeholder="请输入" type="number" maxlength="19" v-model="applyParam.bankAccountId" <input class="form-control" placeholder="请输入银行卡号" type="number" maxlength="19"
auto-blur=true @blur="checkInput(applyParam.bankAccountId)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> v-model="applyParam.bankAccountId" auto-blur=true
</view> @blur="checkInput(applyParam.bankAccountId)"
<view class="contentItem"> :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
<text>确认卡号</text> </view>
<input class="form-control" placeholder="请输入" type="number" v-model="sureBankAccountId" maxlength="19" <view class="contentItem">
auto-blur=true @blur="checkInput(sureBankAccountId)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> <text>确认卡号</text>
</view> <input class="form-control" placeholder="请再次确认卡号" type="number" v-model="sureBankAccountId"
</view> maxlength="19" auto-blur=true @blur="checkInput(sureBankAccountId)"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
</view>
</view>
</view> </view>
</view> </view>
<view class="fixed" @click="saveInfo()"> <view class="fixed" @click="saveInfo()">
{{(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2)?'保存并下一步':'下一步'}} {{(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2)?'保存并下一步':'下一步'}}
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import api from '@/api/api'; import api from '@/api/api';
export default{ export default {
data(){ data() {
return { return {
sureBankAccountId:'', shareId:null,
applyParam:{ sureBankAccountId: '',
bankAccountOpening:'', applyParam: {
bankAccountId:'', bankAccountOpening: '',
approvalStatus:'' bankAccountId: '',
approvalStatus: ''
} }
} }
}, },
components:{}, components: {},
onLoad(options){ onLoad(options) {
if(uni.getStorageSync('applyId')){ this.shareId = options.shareId
this.queryById(uni.getStorageSync('applyId'),null) },
}else if(options.shareId){ onShow() {
this.queryById(options.shareId,null) if (uni.getStorageSync('applyId')) {
}else{ this.queryById(uni.getStorageSync('applyId'), null)
this.queryById(null,uni.getStorageSync('cffp_userId')) } else if (this.shareId) {
this.queryById(this.shareId, null)
} else {
this.queryById(null, uni.getStorageSync('cffp_userId'))
} }
}, },
methods:{ methods: {
queryById(id,userId){ queryById(id, userId) {
api.queryById({id:id,userId:userId}).then((res)=>{ api.queryById({
id: id,
userId: userId
}).then((res) => {
console.log(res) console.log(res)
if(res['success']){ if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
if(this.applyParam.bankAccountId){ if (this.applyParam.bankAccountId) {
this.sureBankAccountId = this.applyParam.bankAccountId; this.sureBankAccountId = this.applyParam.bankAccountId;
}else{ } else {
this.sureBankAccountId = ''; this.sureBankAccountId = '';
} }
} }
}) })
}, },
//去除输入空格 //去除输入空格
checkInput(str){ checkInput(str) {
str = str.replace(/\s*/g,""); str = str.replace(/\s*/g, "");
}, },
saveInfo(){ saveInfo() {
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ console.log(this.applyParam.bankAccountId, 155)
if(this.applyParam.bankAccountId || this.sureBankAccountId){ console.log(this.sureBankAccountId, 155)
if(this.applyParam.bankAccountId != this.sureBankAccountId){ console.log(this.applyParam
.bankAccountOpening, 155)
if (this.applyParam.bankAccountId == '' || this.sureBankAccountId == '' || this.applyParam
.bankAccountOpening == '') {
uni.showToast({
title: '银行卡号与开户行不能为空',
duration: 2000,
icon: 'none'
})
return;
}
if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (this.applyParam.bankAccountId || this.sureBankAccountId) {
if (this.applyParam.bankAccountId != this.sureBankAccountId) {
uni.showToast({ uni.showToast({
title: '两次银行卡号不一致,请重新输入', title: '两次银行卡号不一致,请重新输入',
duration: 2000, duration: 2000,
...@@ -103,16 +127,16 @@ ...@@ -103,16 +127,16 @@
} }
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
operatStep:5, operatStep: 5,
} }
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res) => {
if(res['success']){ if (res['success']) {
uni.navigateTo({ uni.navigateTo({
// url:`personal-statement?id=${res['data']['id']}` // url:`personal-statement?id=${res['data']['id']}`
url:`personal-statement` url: `personal-statement`
}); });
}else{ } else {
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
duration: 2000, duration: 2000,
...@@ -121,10 +145,10 @@ ...@@ -121,10 +145,10 @@
return; return;
} }
}) })
}else{ } else {
uni.navigateTo({ uni.navigateTo({
// url:`personal-statement?id=${res['data']['id']}` // url:`personal-statement?id=${res['data']['id']}`
url:`personal-statement` url: `personal-statement`
}); });
} }
} }
...@@ -134,4 +158,4 @@ ...@@ -134,4 +158,4 @@
<style lang="scss"> <style lang="scss">
@import 'applyCommon.scss'; @import 'applyCommon.scss';
</style> </style>
\ No newline at end of file
pages/application-process/basic-info.vue
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
</view> </view>
<view class="contentItem" v-if="applyParam.partnerLevel == 'B1'"> <view class="contentItem" v-if="applyParam.partnerLevel == 'B1'">
<text>工作室名称</text> <text>工作室名称</text>
<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称" /> <input type="text" class="form-control"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"
v-model="applyParam.b1Name" placeholder="请输入工作室名称" />
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>所属组织</text> <text>所属组织</text>
...@@ -142,7 +144,7 @@ ...@@ -142,7 +144,7 @@
name: '请选择' name: '请选择'
}], }],
idTypeIdx: 0, idTypeIdx: 0,
maxDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}`, maxDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
cffpAreaQuerys: [{ cffpAreaQuerys: [{
areaId: null, areaId: null,
areaName: "请选择所属组织", areaName: "请选择所属组织",
...@@ -303,7 +305,7 @@ ...@@ -303,7 +305,7 @@
}).then((res) => { }).then((res) => {
if (res['success']) { if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
console.log(res, 125115)
if (this.applyParam.inviterInvitationCode) { if (this.applyParam.inviterInvitationCode) {
this.Invitationcodetype = true this.Invitationcodetype = true
} }
......
pages/application-process/contract.vue
...@@ -19,21 +19,20 @@ ...@@ -19,21 +19,20 @@
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class="title"> <view class="title">
<view> <view>
<text class="line"></text>合同文档确认 <text class="line"></text>合同文档确认
</view> </view>
<text class="page_mark">7/8</text> <text class="page_mark">7/8</text>
</view> </view>
<view class="content"> <view class="content">
<view class="ulBox"> <view class="ulBox">
<view class="liBox" v-for="contractItem in contractTermsList" @click="readContract(contractItem)" <view class="liBox" v-for="contractItem in contractTermsList" @click="readContract(contractItem)">
> <text class="iconfont icon-yuanxingweixuanzhong" v-if="!contractItem.confirmStatus"></text>
<text class="iconfont icon-yuanxingweixuanzhong" v-if="!contractItem.confirmStatus"></text> <text class="iconfont icon-selected-copy" v-if="contractItem.confirmStatus"></text>
<text class="iconfont icon-selected-copy" v-if="contractItem.confirmStatus"></text> <text class="itemName"> {{contractItem.termName}}</text>
<text class="itemName"> {{contractItem.termName}}</text> <text class="iconfont icon-gougou" v-if="contractItem.confirmStatus"></text>
<text class="iconfont icon-gougou" v-if="contractItem.confirmStatus"></text> </view>
</view> </view>
</view>
</view> </view>
</view> </view>
<view class="fixed" @click="saveInfo()"> <view class="fixed" @click="saveInfo()">
...@@ -42,76 +41,88 @@ ...@@ -42,76 +41,88 @@
</view> </view>
<view class="toastWrapper toast" v-if="isShow"></view> <view class="toastWrapper toast" v-if="isShow"></view>
<view id="toastContent" v-if="isShow" ref="contractRef"> <view id="toastContent" v-if="isShow" ref="contractRef">
<view class="title"> <view class="title">
{{curTitle}} {{curTitle}}
</view> </view>
<view class="contract" v-html="curContract" ></view> <scroll-view scroll-y style="height: 100vh;">
<view class="agree" @click="agree(curContractId)" >同意</view> <view class="contract" v-html="curContract"></view>
</scroll-view>
<view class="agree" @click="agree(curContractId)">同意</view>
</view> </view>
</template> </template>
<script> <script>
import api from '../../api/api'; import api from '../../api/api';
import { ref, nextTick } from 'vue' import {
export default{ ref,
data(){ nextTick
} from 'vue'
export default {
data() {
return { return {
contractTermsList:[], contractTermsList: [],
isShow: undefined, isShow: undefined,
curTitle: '', curTitle: '',
curContract: '', curContract: '',
curContractId: null, curContractId: null,
isAllAgree: false, isAllAgree: false,
applyParam:{ applyParam: {
contractTerms:'', contractTerms: '',
approvalStatus:'' approvalStatus: ''
}, },
contractTermsConfirmsListParm:[] contractTermsConfirmsListParm: [],
shareId: null
} }
}, },
components:{}, components: {},
onLoad(options){ onLoad(options) {
this.shareId = options.shareId
},
onShow() {
this.getContractList(); this.getContractList();
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){ } else if (this.shareId) {
this.queryById(options.shareId,null) this.queryById(this.shareId, null)
}else{ } else {
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null, uni.getStorageSync('cffp_userId'))
} }
},500) }, 500)
}, },
methods:{ methods: {
getContractList(){ getContractList() {
api.listQuery({systemType:'1'}).then((res)=>{ api.listQuery({
systemType: '1'
}).then((res) => {
this.contractTermsList = res["data"]["contractDtos"]; this.contractTermsList = res["data"]["contractDtos"];
console.log(this.contractTermsList) console.log(this.contractTermsList)
}) })
}, },
saveInfo(){ saveInfo() {
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (!this.isAllAgree) { if (!this.isAllAgree) {
uni.showToast({ uni.showToast({
title: '请详细阅读全部条款！', title: '请详细阅读全部条款！',
duration: 2000, duration: 2000,
icon: 'none' icon: 'none'
}); });
return; return;
} }
this.contractTermsConfirmsListParm = []; this.contractTermsConfirmsListParm = [];
for (let i = 0; i < this.contractTermsList.length; i++) { for (let i = 0; i < this.contractTermsList.length; i++) {
this.contractTermsConfirmsListParm.push(this.contractTermsList[i]["termName"]); this.contractTermsConfirmsListParm.push(this.contractTermsList[i]["termName"]);
} }
this.applyParam.operatStep = 7; this.applyParam.operatStep = 7;
this.applyParam.contractTerms = this.contractTermsConfirmsListParm .join(','); this.applyParam.contractTerms = this.contractTermsConfirmsListParm.join(',');
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res) => {
if(res['success']){ if (res['success']) {
uni.navigateTo({ uni.navigateTo({
// url:`signature?id=${res['data']['id']}` // url:`signature?id=${res['data']['id']}`
url:`signature` url: `signature`
}); });
}else{ } else {
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
duration: 2000, duration: 2000,
...@@ -120,52 +131,56 @@ ...@@ -120,52 +131,56 @@
return; return;
} }
}) })
}else{ } else {
uni.navigateTo({ uni.navigateTo({
// url:`signature?id=${res['data']['id']}` // url:`signature?id=${res['data']['id']}`
url:`signature` url: `signature`
}); });
} }
}, },
readContract(contractItem) { readContract(contractItem) {
console.log(contractItem, 1515) console.log(contractItem, 1515)
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (contractItem.confirmStatus == 1) { if (contractItem.confirmStatus == 1) {
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
} else { } else {
this.isShow = true; this.isShow = true;
this.curContract = contractItem.termNote; this.curContract = contractItem.termNote;
this.curTitle = contractItem.termName; this.curTitle = contractItem.termName;
this.curContractId = contractItem.id; this.curContractId = contractItem.id;
} }
this.isAllAgree = this.contractTermsList.every((item) => { this.isAllAgree = this.contractTermsList.every((item) => {
return item.confirmStatus == 1; return item.confirmStatus == 1;
}); });
} }
}, },
//同意合同条款 //同意合同条款
agree() { agree() {
this.isShow = false; this.isShow = false;
for (let i = 0; i < this.contractTermsList.length; i++) { for (let i = 0; i < this.contractTermsList.length; i++) {
if (this.curContractId == this.contractTermsList[i]["id"]) { if (this.curContractId == this.contractTermsList[i]["id"]) {
this.contractTermsList[i]["confirmStatus"] = 1; this.contractTermsList[i]["confirmStatus"] = 1;
} }
} }
this.isAllAgree = this.contractTermsList.every((item) => { this.isAllAgree = this.contractTermsList.every((item) => {
return item.confirmStatus == 1; return item.confirmStatus == 1;
}); });
}, },
queryById(id,userId){ queryById(id, userId) {
api.queryById({id:id,userId:userId}).then((res)=>{ api.queryById({
if(res['success']){ id: id,
userId: userId
}).then((res) => {
if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
if(this.applyParam.contractTerms){ if (this.applyParam.contractTerms) {
this.contractTermsConfirmsListParm = this.applyParam.contractTerms.split(','); this.contractTermsConfirmsListParm = this.applyParam.contractTerms.split(',');
console.log(this.contractTermsConfirmsListParm) console.log(this.contractTermsConfirmsListParm)
for(let i=0;i<this.contractTermsList.length;i++){ for (let i = 0; i < this.contractTermsList.length; i++) {
for(let j=0;j<this.contractTermsConfirmsListParm.length;j++){ for (let j = 0; j < this.contractTermsConfirmsListParm.length; j++) {
if(this.contractTermsList[i]['termName'] == this.contractTermsConfirmsListParm[j]){ if (this.contractTermsList[i]['termName'] == this
.contractTermsConfirmsListParm[j]) {
this.contractTermsList[i].confirmStatus = 1; this.contractTermsList[i].confirmStatus = 1;
} }
} }
...@@ -181,58 +196,65 @@ ...@@ -181,58 +196,65 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.container { .container {
background-color: #FBFBFB; background-color: #FBFBFB;
} }
.toastWrapper { .toastWrapper {
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
top: 0; top: 0;
} }
.toast { .toast {
position: fixed; position: fixed;
left: 0; left: 0;
right: 0; right: 0;
min-width: 320px; min-width: 320px;
max-width: 640px; max-width: 640px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
z-index: 1; z-index: 1;
} }
#toastContent {
position: fixed; #toastContent {
bottom: 0; position: fixed;
width: 100%; bottom: 0;
height: 75%; width: 100%;
left: 0; height: 70%;
right: 0; left: 0;
margin: 0 auto; right: 0;
background-color: #fff; margin: 0 auto;
z-index: 2; background-color: #fff;
animation: slowUp .5s ease both; z-index: 2;
overflow: auto; animation: slowUp .5s ease both;
.title{ overflow: auto;
text-align: center;
font-weight: bold; .title {
font-size: 16px; text-align: center;
padding: 10px; font-weight: bold;
} font-size: 16px;
.contract{ padding: 10px;
overflow: hidden; }
padding: 10px;
.contract {
// overflow: hidden;
padding: 10px;
font-size: 20rpx; font-size: 20rpx;
} }
.agree{
width: 100%; .agree {
height: 45px; width: 100%;
line-height: 45px; height: 45px;
background: #C81B1E; line-height: 45px;
text-align: center; background: #C81B1E;
color: #fff; text-align: center;
font-size: 20px; color: #fff;
font-weight: bold; font-size: 20px;
position: relative; font-weight: bold;
bottom: 0; position: relative;
} bottom: 0;
} }
</style> }
\ No newline at end of file </style>
pages/application-process/education.vue
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>毕业学校</text> <text>毕业学校</text>
<input type="text" class="form-control" v-model="applyParam.lastGraduateSchool" <input type="text" class="form-control" v-model="applyParam.lastGraduateSchool" placeholder="请输入毕业院校"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view> </view>
<view class="contentItem" style="border:none;"> <view class="contentItem" style="border:none;">
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
lastGraduateCertificationOssPath:'', lastGraduateCertificationOssPath:'',
approvalStatus:'' approvalStatus:''
}, },
shareId:null,
dataForm:{ dataForm:{
loginId: uni.getStorageSync('cffp_userId'), loginId: uni.getStorageSync('cffp_userId'),
targetType: "5", targetType: "5",
...@@ -99,6 +100,9 @@ ...@@ -99,6 +100,9 @@
} }
},500) },500)
}, },
onShow() {
},
methods:{ methods:{
educationLevelQuery(){ educationLevelQuery(){
api.educationLevelQuery().then((res)=>{ api.educationLevelQuery().then((res)=>{
......
pages/application-process/id-card.vue
...@@ -31,8 +31,11 @@ ...@@ -31,8 +31,11 @@
<text class="iconfont icon-weibiaoti553" ></text> <text class="iconfont icon-weibiaoti553" ></text>
<view class="choseBtn" >点击添加身份证正面</view> <view class="choseBtn" >点击添加身份证正面</view>
</view> </view>
<image :src="applyParam.idFrontPageOssPath" mode="widthFix" v-if="applyParam.idFrontPageOssPath" <view class="content_wrapper">
@click="upLoadPhoto('front')"></image> <image :src="applyParam.idFrontPageOssPath" v-if="applyParam.idFrontPageOssPath"
@click="upLoadPhoto('front')"></image>
</view>
<view class="tips"> <view class="tips">
<view>（正确示例：身份证正面，字体清晰）</view> <view>（正确示例：身份证正面，字体清晰）</view>
<view>（jpg,png 文件大小不大于1mb）</view> <view>（jpg,png 文件大小不大于1mb）</view>
...@@ -40,7 +43,7 @@ ...@@ -40,7 +43,7 @@
</view> </view>
<view class="content_wrapper" style="margin-top: 25px;"> <view class="content_wrapper" style="margin-top: 25px;">
<view class="photo" v-if="!applyParam.idBackPageOssPath" @click="upLoadPhoto('back')"> <view class="photo" v-if="!applyParam.idBackPageOssPath" @click="upLoadPhoto('back')">
<image src="../../static/back.png" alt="身份证反面面" mode="widthFix"></image> <image src="../../static/back.png" alt="身份证反面" mode="widthFix"></image>
<text class="iconfont icon-weibiaoti553" ></text> <text class="iconfont icon-weibiaoti553" ></text>
<view class="choseBtn" >点击添加身份证反面</view> <view class="choseBtn" >点击添加身份证反面</view>
</view> </view>
...@@ -70,6 +73,7 @@ ...@@ -70,6 +73,7 @@
idBackPageOssPath:'', idBackPageOssPath:'',
approvalStatus:'' approvalStatus:''
}, },
shareId:null,
dataForm:{ dataForm:{
loginId: uni.getStorageSync('cffp_userId'), loginId: uni.getStorageSync('cffp_userId'),
targetType: "5", targetType: "5",
...@@ -83,6 +87,7 @@ ...@@ -83,6 +87,7 @@
}, },
components:{}, components:{},
onLoad(options){ onLoad(options){
// this.shareId = options.shareId
if(uni.getStorageSync('applyId')){ if(uni.getStorageSync('applyId')){
this.queryById(uni.getStorageSync('applyId'),null) this.queryById(uni.getStorageSync('applyId'),null)
}else if(options.shareId){ }else if(options.shareId){
...@@ -91,6 +96,9 @@ ...@@ -91,6 +96,9 @@
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null,uni.getStorageSync('cffp_userId'))
} }
}, },
onShow() {
},
methods:{ methods:{
queryById(id,userId){ queryById(id,userId){
api.queryById({id:id,userId:userId}).then((res)=>{ api.queryById({id:id,userId:userId}).then((res)=>{
...@@ -116,6 +124,7 @@ ...@@ -116,6 +124,7 @@
if(type == 'back'){ if(type == 'back'){
this.applyParam.idBackPageOssPath = res.data.filePath; this.applyParam.idBackPageOssPath = res.data.filePath;
} }
console.log(this.applyParam.idBackPageOssPath, 151515)
}) })
} }
}, },
......
pages/application-process/personal-statement.vue
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
data(){ data(){
return { return {
dropOptionsInfoList:[], dropOptionsInfoList:[],
shareId: null,
applyParam:{ applyParam:{
personalStatement:'', personalStatement:'',
approvalStatus:'' approvalStatus:''
...@@ -57,17 +58,19 @@ ...@@ -57,17 +58,19 @@
}, },
components:{}, components:{},
onLoad(options){ onLoad(options){
this.shareId = options.shareId
},
onShow() {
this.dropOptionsQuery(); this.dropOptionsQuery();
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){ }else if(this.shareId){
this.queryById(options.shareId,null) this.queryById(this.shareId,null)
}else{ }else{
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null,uni.getStorageSync('cffp_userId'))
} }
},500) },500)
}, },
methods:{ methods:{
dropOptionsQuery(){ dropOptionsQuery(){
......
pages/application-process/signature.vue
...@@ -57,15 +57,16 @@ ...@@ -57,15 +57,16 @@
}, },
components:{eSignature}, components:{eSignature},
onLoad(options) { onLoad(options) {
this.shareId = options.shareId
},
onShow() {
if(uni.getStorageSync('applyId')){ if(uni.getStorageSync('applyId')){
this.queryById(uni.getStorageSync('applyId'),null) this.queryById(uni.getStorageSync('applyId'),null)
}else if(options.shareId){ }else if(this.shareId){
this.queryById(options.shareId,null) this.queryById(this.shareId,null)
}else{ }else{
this.queryById(null,uni.getStorageSync('cffp_userId')) this.queryById(null,uni.getStorageSync('cffp_userId'))
} }
},
mounted() {
this.norebound() this.norebound()
}, },
methods: { methods: {
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){ if(res['success']){
uni.navigateTo({ uni.navigateTo({
url: `application-result?partnerLevel=${this.applyParam.partnerLevel}&areaName=${this.applyParam.areaName}`, url: `application-result?partnerLevel=${this.applyParam.partnerLevel}&areaName=${this.applyParam.areaName}&shareId=${this.shareId}`,
success: res => {}, success: res => {},
fail: () => {}, fail: () => {},
complete: () => {} complete: () => {}
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
@import 'applyCommon.scss'; @import 'applyCommon.scss';
// uni-page-wrapper{ // uni-page-wrapper{
// overflow: hidden!important; // overflow: hidden!important;
......
pages/application-process/work-experience.vue
<template> <template>
<view class="container"> <view class="container">
<scroll-view scroll-y style="height: 100vh;">
<view class="page"> <view class="page">
<text class="num actived pass">1</text> <text class="num actived pass">1</text>
<text class="line line_pass"></text> <text class="line line_pass"></text>
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<view class="contentItem"> <view class="contentItem">
<text>最近一次工作单位</text> <text>最近一次工作单位</text>
<input type="text" class="form-control" placeholder="非必填" v-model="applyParam.workingCompany" <input type="text" class="form-control" placeholder="非必填" v-model="applyParam.workingCompany"
:disabled="false"/> :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>职位</text> <text>职位</text>
...@@ -67,15 +68,15 @@ ...@@ -67,15 +68,15 @@
<text class="iconfont icon-weibiaoti553"></text> <text class="iconfont icon-weibiaoti553"></text>
<view style="margin-top: 10px;">点击添加荣誉证书照片</view> <view style="margin-top: 10px;">点击添加荣誉证书照片</view>
</view> </view>
<view v-if="applyParam.certificate"> <view v-if="applyParam.certificate" style="width: 100%;text-align: center;">
<view class="pic_list" v-for="picItem in picList"> <view class="photo_wrapper" v-for="picItem in picList">
<image :src="picItem" mode="widthFix"></image> <image style="width: 100%;" :src="picItem" mode="widthFix"></image>
</view> </view>
</view> </view>
<view class="tips"> <view class="tips">
<view>（jpg,png 文件大小不大于1mb）</view> <view>（jpg,png 文件大小不大于1mb）</view>
</view> </view>
<view class="upLoadMore" v-if="applyParam.certificate" @click="upLoadPhoto()"> <view class="upLoadMore" v-if="this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2" @click="upLoadPhoto()">
<view class="iconfont icon-jiahao"></view> <view class="iconfont icon-jiahao"></view>
<view>上传更多</view> <view>上传更多</view>
</view> </view>
...@@ -84,6 +85,7 @@ ...@@ -84,6 +85,7 @@
<view class="fixed" @click="saveInfo()"> <view class="fixed" @click="saveInfo()">
{{(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2)?'保存并下一步':'下一步'}} {{(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2)?'保存并下一步':'下一步'}}
</view> </view>
</scroll-view>
</view> </view>
</template> </template>
...@@ -150,15 +152,11 @@ ...@@ -150,15 +152,11 @@
}) })
}, },
upLoadPhoto(event){ upLoadPhoto(event){
console.log(this.applyParam, 1211)
this.dataForm.targetId = this.applyParam.id this.dataForm.targetId = this.applyParam.id
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
CommonUpload(this.dataForm).then(res => { CommonUpload(this.dataForm).then(res => {
console.log(res, 541154)
this.applyParam.certificate = res.data.filePath; this.applyParam.certificate = res.data.filePath;
this.picList.push(this.applyParam.certificate); this.picList.push(this.applyParam.certificate);
}); });
}
}, },
saveInfo(){ saveInfo(){
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
...@@ -175,7 +173,6 @@ ...@@ -175,7 +173,6 @@
operatStep:2, operatStep:2,
certificate:this.picList.join(',') certificate:this.picList.join(',')
} }
console.log(this.applyParam)
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){ if(res['success']){
uni.navigateTo({ uni.navigateTo({
...@@ -224,4 +221,12 @@ ...@@ -224,4 +221,12 @@
<style lang="scss"> <style lang="scss">
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.pic_list-s{
width: 100%;
height: 320rpx;
}
.pic_list-s image {
width: 100%;
height: 100%;
}
</style> </style>
\ No newline at end of file
pages/courseDetail/courseDetail.vue
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
uni.setStorageSync('h5_startTime', this.startTime) uni.setStorageSync('h5_startTime', this.startTime)
this.sharelogin = false this.sharelogin = false
this.userId = val this.userId = val
uni.setStorageSync('h5_userId', this.userId); uni.setStorageSync('cffp_userId', this.userId);
this.getuserRead(1) this.getuserRead(1)
} else { } else {
this.sharelogin = false this.sharelogin = false
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
// 打开微信分享啊 // 打开微信分享啊
reinvite() { reinvite() {
const shareCode = nanoid() + this.userId const shareCode = nanoid() + this.userId
const jumptime = Date.parse(new Date()) / 1000 const jumptime = Date.parse(new Date()) / 1000
let dataWXform = { let dataWXform = {
href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId + href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' + '&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
} }
}, },
h5jump() { h5jump() {
let h5userId = uni.getStorageSync('h5_userId'); let h5userId = uni.getStorageSync('cffp_userId');
if (h5userId) { if (h5userId) {
this.jumppurchase() this.jumppurchase()
} else { } else {
...@@ -275,8 +275,7 @@ ...@@ -275,8 +275,7 @@
const param = { const param = {
productType: '1', productType: '1',
productId: this.courseInfo.fileId, productId: this.courseInfo.fileId,
userId: this.coursesharing == 1 ? uni.getStorageSync('h5_userId') : uni.getStorageSync( userId: uni.getStorageSync('cffp_userId'),
'cffp_userId'),
shareUserId: this.shareUserId, shareUserId: this.shareUserId,
shareReadId: this.shareReadId, shareReadId: this.shareReadId,
shareCode: this.shareCode, shareCode: this.shareCode,
...@@ -286,8 +285,7 @@ ...@@ -286,8 +285,7 @@
if (res['success']) { if (res['success']) {
this.orderId = res['data']['id']; this.orderId = res['data']['id'];
if (this.coursesharing == '1') { if (this.coursesharing == '1') {
this.userId = uni.getStorageSync('h5_userId') ? uni.getStorageSync('h5_userId') : this.userId = uni.getStorageSync('cffp_userId')
this.userId
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}&userId=${this.userId}` url: `/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}&userId=${this.userId}`
...@@ -330,11 +328,9 @@ ...@@ -330,11 +328,9 @@
}, },
// 课程详情页面 // 课程详情页面
courseDetail() { courseDetail() {
console.log('courseDetail')
api.courseDetail({ api.courseDetail({
fileId: this.fileId, fileId: this.fileId,
userId: this.coursesharing == '1' ? uni.getStorageSync('h5_userId') : uni.getStorageSync( userId: uni.getStorageSync('cffp_userId'),
'cffp_userId'),
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId
}).then(res => { }).then(res => {
if (res['success']) { if (res['success']) {
...@@ -358,8 +354,7 @@ ...@@ -358,8 +354,7 @@
relatedCoursesList() { relatedCoursesList() {
api.relatedCoursesList({ api.relatedCoursesList({
fileId: this.fileId, fileId: this.fileId,
userId: this.coursesharing == '1' ? uni.getStorageSync('h5_userId') : uni.getStorageSync( userId: uni.getStorageSync('cffp_userId'),
'cffp_userId'),
orderId: this.courseInfo.orderId, orderId: this.courseInfo.orderId,
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId
}).then(res => { }).then(res => {
...@@ -427,7 +422,7 @@ ...@@ -427,7 +422,7 @@
reject('fail') reject('fail')
}) })
}) })
}, },
findVideoPlayback() { findVideoPlayback() {
console.log('findVideoPlayback') console.log('findVideoPlayback')
...@@ -520,7 +515,7 @@ ...@@ -520,7 +515,7 @@
// 用户阅读 // 用户阅读
getuserRead(type) { getuserRead(type) {
let UserReadRequestVO = { let UserReadRequestVO = {
userId: this.userId ? this.userId : '', userId: uni.getStorageSync('cffp_userId'),
serialsNo: this.serialsNo || 1, serialsNo: this.serialsNo || 1,
shareCode: this.shareCode || 1, shareCode: this.shareCode || 1,
shareUrl: window.location.href shareUrl: window.location.href
...@@ -546,8 +541,8 @@ ...@@ -546,8 +541,8 @@
hshare(data, url) hshare(data, url)
}, },
}, },
onLoad(option) { onLoad(option) {
this.fileId = option.fileId; this.fileId = option.fileId;
this.courseInfo.packFileId = option.packFileId this.courseInfo.packFileId = option.packFileId
...@@ -561,14 +556,15 @@ ...@@ -561,14 +556,15 @@
let endTime = Date.parse(new Date()) / 1000; let endTime = Date.parse(new Date()) / 1000;
let startTime = uni.getStorageSync('h5_startTime') let startTime = uni.getStorageSync('h5_startTime')
if (endTime - startTime > 3600 * 24) { if (endTime - startTime > 3600 * 24) {
uni.setStorageSync('h5_userId', '') uni.setStorageSync('cffp_userId', '')
} }
uni.setStorageSync('h5_coursesharing', this.coursesharing); uni.setStorageSync('h5_coursesharing', this.coursesharing);
this.getshareData() this.getshareData()
} }
let dataForm = uni.getStorageSync('userinfodataForm') let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName this.realName = dataForm.realName
// this.switchTab(1);
}, },
onShow() { onShow() {
this.switchTab(1); this.switchTab(1);
...@@ -591,12 +587,14 @@ ...@@ -591,12 +587,14 @@
page { page {
padding: 0; padding: 0;
} }
.courseBannerBox { .courseBannerBox {
background-color: #ebebeb; background-color: #ebebeb;
display: flex; display: flex;
justify-content: center; justify-content: center;
z-index: 1; z-index: 1;
} }
.courseTitleContent { .courseTitleContent {
height: 150rpx; height: 150rpx;
background-color: #fff; background-color: #fff;
......
pages/exchangeRecord/exchangeRecord.vue
<template> <template>
<view class="container"> <view class="container">
<view class="record_wrapper" v-if="cffpFortuneDeductionList"> <view class="record_wrapper" v-if="cffpFortuneDeductionList.length > 0">
<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index"> <view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
<image :src="item.deductionUrl" mode="widthFix"></image> <image :src="item.deductionUrl" mode="widthFix"></image>
<view class="detail"> <view class="detail">
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="noListTip" v-if="!cffpFortuneDeductionList || cffpFortuneDeductionList.length<=0">暂无数据！</view> <view class="noListTip" v-else>暂无数据！</view>
</view> </view>
</template> </template>
......
pages/invitationRegister/invitationlogin.vue
...@@ -24,7 +24,11 @@ ...@@ -24,7 +24,11 @@
<view class="agree"> <view class="agree">
<label class="radio" style="padding-right: 10rpx;"> <label class="radio" style="padding-right: 10rpx;">
<radio :checked="agreeFlag" @click="agreeFlag=!agreeFlag"/></label> <radio :checked="agreeFlag" @click="agreeFlag=!agreeFlag"/></label>
<text>已阅读并同意</text><a href="#">银盾保险经纪服务协议</a><text>和</text><a href="">隐私政策</a> <!-- <text>已阅读并同意</text><a href="#">银盾保险经纪服务协议</a><text>和</text><a href="">隐私政策</a> -->
<text>已阅读并同意</text>
<text class="file" @click="getFile(1)">服务协议</text>
<text>和</text>
<text class="file" @click="getFile(2)">隐私政策</text>
</view> </view>
<view class="footer" @click="nextstep()"> <view class="footer" @click="nextstep()">
<text>下一步</text> <text>下一步</text>
...@@ -82,6 +86,11 @@ ...@@ -82,6 +86,11 @@
}, },
getFile(type){
uni.navigateTo({
url:`/components/clause/clause?type=${type}`
})
},
delayTime() { delayTime() {
this.disabledSendBtn = true; this.disabledSendBtn = true;
this.timer = setInterval(() => { this.timer = setInterval(() => {
...@@ -123,7 +132,7 @@ ...@@ -123,7 +132,7 @@
this.userId = String(res['data']['userId']); this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1') uni.setStorageSync('isLogin','1')
uni.setStorageSync('cffp_userId', this.userId) uni.setStorageSync('cffp_userId', this.userId)
// uni.setStorageSync('H5_cffpUserId', this.userId) uni.setStorageSync('isH5', 1)
uni.navigateTo({ uni.navigateTo({
url:'/pages/application-process/basic-info?userId=' + this.userId + '&shareId=' + this.form.id url:'/pages/application-process/basic-info?userId=' + this.userId + '&shareId=' + this.form.id
}) })
...@@ -206,6 +215,10 @@ ...@@ -206,6 +215,10 @@
text-decoration: none; text-decoration: none;
} }
} }
.file{
color: #20279B;
text-decoration: none;
}
.footer{ .footer{
background: #20279B; background: #20279B;
color: #fff; color: #fff;
......
pages/myPoints/pointsDetail.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</view> </view>
</view> </view>
<view class="fortuneExchangeList" v-for="(item,index) in fortuneItem.cffpFortuneExchangeList" <view class="fortuneExchangeList" v-for="(item,index) in fortuneItem.cffpFortuneExchangeList"
@click="viewDetail(item.orderId)"> @click="viewDetail(item)">
<text>{{item.productTypeName}}</text> <text>{{item.productTypeName}}</text>
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
</view> </view>
...@@ -152,9 +152,9 @@ ...@@ -152,9 +152,9 @@
}) })
}, },
// 查看订单详情 // 查看订单详情
viewDetail(id){ viewDetail(item){
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${id}&commissionType=${this.commissionType}&type=drop` url:`/pages/orderDetail/orderDetail?id=${item.orderId}&commissionType=${item.commissionType}&type=drop`
}) })
} }
} }
......
pages/myShare/myShare.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<view class="shareStatisticalContent"> <view class="shareStatisticalContent">
<view class="statisticItem"> <view class="statisticItem">
<text>{{coursesCountInfos.shareFrequencyMonth}}</text> <text>{{coursesCountInfos.shareFrequencyMonth}}</text>
<text>本月分享（频次）</text> <text>本月分享(频次)</text>
</view> </view>
<view class="statisticItem" @click="viewIntegral()"> <view class="statisticItem" @click="viewIntegral()">
<text class="colorText">{{coursesCountInfos.integralMonth}}</text> <text class="colorText">{{coursesCountInfos.integralMonth}}</text>
......
pages/orderDetail/orderDetail.vue
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
commissionType:this.commissionType, commissionType:this.commissionType,
} }
api.userCourseInfo(param).then(res=>{ api.userCourseInfo(param).then(res=>{
console.log(res, 15151515)
if(res['success']){ if(res['success']){
const data = this.orderDetail = res['data']['orderDetail']; const data = this.orderDetail = res['data']['orderDetail'];
this.fileId = data.fileId; this.fileId = data.fileId;
......
pages/personalCenter/personalCenter.vue
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<i class="iconfont icon-bianji"></i> <i class="iconfont icon-bianji"></i>
</view> </view>
</view> </view>
<view>昵称：{{customerBasicInfo.nickName || 'CFFP财富中心'}}</view> <view>昵称：{{customerBasicInfo.nickName}}</view>
<view>{{customerBasicInfo.userDescription || 'CFFP财富中心'}}</view> <view>{{customerBasicInfo.userDescription}}</view>
</view> </view>
</view> </view>
<!-- 主要菜单 --> <!-- 主要菜单 -->
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
inviteEqrode:'', inviteEqrode:'',
currentPage:'personalCenter', currentPage:'personalCenter',
customerBasicInfo:{}, customerBasicInfo:{},
loginornot: true,
mainMenuLists:[ mainMenuLists:[
{id:'00',categoryName:'销售管理', {id:'00',categoryName:'销售管理',
children:[ children:[
...@@ -144,8 +145,23 @@ ...@@ -144,8 +145,23 @@
updateData(val){ updateData(val){
console.log('我来修改一些数据') console.log('我来修改一些数据')
}, },
isLogin(){
uni.showToast({
title: "请登陆个人账户使用该功能",
duration: 2000,
icon: 'none'
});
uni.reLaunch({
url:'/components/login/login'
})
uni.clearStorageSync();
return false
},
// 菜单跳转页面 // 菜单跳转页面
goDetail(item){ goDetail(item){
if(!this.loginornot){
this.isLogin()
}
if(item.isShow && item.isOpen){ if(item.isShow && item.isOpen){
if(item.title==='我的邀请码'){ if(item.title==='我的邀请码'){
this.$refs.popup1.open('bottom'); this.$refs.popup1.open('bottom');
...@@ -177,9 +193,11 @@ ...@@ -177,9 +193,11 @@
}, },
userinfo(){ userinfo(){
uni.navigateTo({ if(this.loginornot){
url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo) uni.navigateTo({
}) url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo)
})
}
}, },
// 弹窗 // 弹窗
errorDialog(type,content){ errorDialog(type,content){
...@@ -202,6 +220,9 @@ ...@@ -202,6 +220,9 @@
api.queryInfo({userId:this.userId}).then(res=>{ api.queryInfo({userId:this.userId}).then(res=>{
if(res['success']){ if(res['success']){
this.customerBasicInfo = res['data']; this.customerBasicInfo = res['data'];
if(this.customerBasicInfo.mobile == null){
this.loginornot = false
}
this.inviteEqrode = this.customerBasicInfo.invitationCode; this.inviteEqrode = this.customerBasicInfo.invitationCode;
uni.setStorageSync('user_mobile', res.data.mobile) uni.setStorageSync('user_mobile', res.data.mobile)
uni.setStorageSync('userinfodataForm', res.data) uni.setStorageSync('userinfodataForm', res.data)
......
pages/personalCenter/teamMembers/members.vue
...@@ -76,13 +76,24 @@ ...@@ -76,13 +76,24 @@
.content-header{ .content-header{
display: flex; display: flex;
justify-content: center; justify-content: center;
.concent-title{
width: 446rpx;
height: 80rpx;
background: url('../../../static/Group 1623.png');
background-size: auto 100%;
display: flex;
justify-content: center;
.concent-text{
font-size: 36rpx;
font-weight: 500;
color: #FFFFFF;
align-items: center;
margin-top: 14rpx;
// line-height: 40px;
}
}
} }
.concent-title{
width: 446rpx;
height: 80rpx;
background: url('../../../static/Group 1623.png');
background-size: auto 100%;
}
.d-box { .d-box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -100,12 +111,6 @@ ...@@ -100,12 +111,6 @@
padding: 5rpx 10rpx; padding: 5rpx 10rpx;
} }
} }
.concent-text{
font-size: 18px;
font-weight: 500;
color: #FFFFFF;
line-height: 40px;
}
.table-content{ .table-content{
margin: 10px 20px; margin: 10px 20px;
display: flex; display: flex;
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
justify-content: space-between; justify-content: space-between;
// justify-content: space-around; // justify-content: space-around;
padding: 30rpx 60rpx 0; padding: 30rpx 60rpx 0;
font-size: 28rpx;
text { text {
&.actived { &.actived {
......
uni_modules/uni-share-wx/index.vue
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
}, },
submitsuessc(type){ submitsuessc(type){
let platform = uni.getSystemInfoSync().platform let platform = uni.getSystemInfoSync().platform
let that = this let that = this
let UserShareRequestVO = { let UserShareRequestVO = {
systemType: platform == 'ios'? '1': '0', systemType: platform == 'ios'? '1': '0',
......
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