Skip to content

C
CFFP-HB
Commit 4f69162c by yuzhenWang
Options

禁用注销发布生产

parent e8b051d0
Showing with 174 additions and 159 deletions
App.vue
<script> <script>
import initApp from "@/util/router.js"; import initApp from "@/util/router.js";
import {interceptor} from "@/util/interceptor"; import {interceptor} from "@/util/interceptor";
import {baseURL,apiURL,cffpURL,companyInfo} from "@/environments/environment"; import {baseURL,apiURL,cffpURL,companyInfo} from "@/environments/environment";
import api from './api/api'; import api from './api/api';
import {hshare} from '@/util/fiveshare'; import {hshare} from '@/util/fiveshare';
export default { export default {
data() { data() {
return { return {
invitationHandled: false ,// 在data中明确定义, invitationHandled: false ,// 在data中明确定义,
dataToken:'' dataToken:'',
} }
}, },
onLaunch: function() { onLaunch: function() {
console.log('App Launch'); console.log('App Launch');
if(!uni.getStorageSync('loginType')){ if(!uni.getStorageSync('loginType')){
console.log('走进来了');
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor'); uni.setStorageSync('loginType','visitor');
} }
// 处理外部链接参数 // 处理外部链接参数
...@@ -81,17 +81,19 @@ ...@@ -81,17 +81,19 @@
onShow: function(options) { onShow: function(options) {
console.log('App Show', options); console.log('App Show', options);
if(this.dataToken){ if(this.dataToken){
const params = { const params = {
loginType:'5', loginType:'5',
authToken:this.dataToken authToken:this.dataToken.replace(/\%/g, ' ')
// authToken:'zuihuibi eyJhbGciOiJIUzUxMiJ9.eyJVc2VySWQiOjEyODMsImNyZWF0ZWQiOjE3NTQ2NDk1MDA5NzIsImV4cCI6MTc1NzI0MTUwMH0.udjBlMY4FswgBU7zv9jD-zK8ANGR1KKXk_DiJEQkwhiC9DYwxAc7wAp6BWIKY_oiNr58QJqDtBAJ85bGOcCpeQ'
} }
api.loginVerification(params).then((res)=>{ api.loginVerification(params).then((res)=>{
if(res['success']){ if(res['success']){
uni.setStorageSync('isLogin','1'); uni.setStorageSync('isLogin','1');
uni.setStorageSync('loginType','codelogin'); uni.setStorageSync('loginType','codelogin');
uni.setStorageSync('cffp_userId', this.userId); uni.setStorageSync('cffp_userId', res.data.userId);
uni.setStorageSync('uni-token', res.data['token']); uni.setStorageSync('uni-token', res.data['token']);
this.checkUserStatus(); this.checkUserStatus();
}else{ }else{
uni.showToast({ uni.showToast({
...@@ -101,6 +103,7 @@ ...@@ -101,6 +103,7 @@
}) })
} }
}) })
return
}else { }else {
// 每次进应用显示时检查用户状态 // 每次进应用显示时检查用户状态
this.checkUserStatus(); this.checkUserStatus();
...@@ -118,6 +121,7 @@ ...@@ -118,6 +121,7 @@
console.log('App Hide') console.log('App Hide')
}, },
methods: { methods: {
// 检查用户状态的方法 防止多端操作导致此用户不存在 // 检查用户状态的方法 防止多端操作导致此用户不存在
async checkUserStatus() { async checkUserStatus() {
// 只有已登录用户才需要检查 // 只有已登录用户才需要检查
...@@ -171,7 +175,7 @@ ...@@ -171,7 +175,7 @@
}, },
// 清除登录状态 // 清除登录状态
clearLoginState() { clearLoginState() {
uni.clearStorageSync(); // uni.clearStorageSync();
uni.setStorageSync('loginType', 'visitor'); uni.setStorageSync('loginType', 'visitor');
this.checkToken() this.checkToken()
// 可以在这里添加其他需要清除的状态 // 可以在这里添加其他需要清除的状态
...@@ -261,9 +265,17 @@ ...@@ -261,9 +265,17 @@
// 使用uni.setStorageSync存储到本地 // 使用uni.setStorageSync存储到本地
try { try {
// #ifdef H5
if(params.dataToken){ if(params.dataToken){
this.dataToken = params.dataToken this.dataToken = params.dataToken
} }
// #endif
// #ifdef MP-WEIXIN
if(params.dataToken){
this.dataToken = uni.getStorageSync('hoservice_token')
}
// #endif
if(params.addSystemType){ if(params.addSystemType){
uni.setStorageSync('addSystemType', params.addSystemType); uni.setStorageSync('addSystemType', params.addSystemType);
} }
......
components/bootpage/bootpage.vue
...@@ -48,6 +48,10 @@ ...@@ -48,6 +48,10 @@
// 哪个地方中用到了这个登录 // 哪个地方中用到了这个登录
loginSource:{ loginSource:{
type:String, type:String,
},
// 哪个页面中用到了这个登录
pageSource:{
type:String,
} }
}, },
components:{ components:{
...@@ -149,7 +153,7 @@ ...@@ -149,7 +153,7 @@
this.loginTypeSync = "codelogin"; this.loginTypeSync = "codelogin";
this.queryInfo() this.queryInfo()
uni.$emit('loginUpdate'); uni.$emit('loginUpdate');
this.$emit('afterLogin')
}else{ }else{
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
......
myPackageA/applyFranchise/applyFranchise.vue
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
if(options.shareId){ if(options.shareId){
this.shareId = options.shareId this.shareId = options.shareId
this.getqueryById(options.shareId) this.getqueryById(options.shareId)
uni.clearStorageSync() // uni.clearStorageSync()
uni.setStorageSync('loginType', 'visitor') uni.setStorageSync('loginType', 'visitor')
} }
......
myPackageA/integralExchange/authenticaInfo.vue
...@@ -168,8 +168,8 @@ ...@@ -168,8 +168,8 @@
continueText="暂不解绑" continueText="暂不解绑"
btnType="horizontal" btnType="horizontal"
:tipIcon="false" :tipIcon="false"
@join="continueBind()" @join="$refs.unbindTipPopup.close()"
@continue="$refs.unbindTipPopup.close()" @continue="continueBind()"
/> />
</view> </view>
...@@ -226,6 +226,7 @@ ...@@ -226,6 +226,7 @@
}, },
methods:{ methods:{
continueBind(){ continueBind(){
console.log('解绑');
let params = { let params = {
userId:uni.getStorageSync('cffp_userId'), userId:uni.getStorageSync('cffp_userId'),
oprType:this.paymentMethod oprType:this.paymentMethod
...@@ -593,7 +594,8 @@ ...@@ -593,7 +594,8 @@
color: black; color: black;
font-size: 26rpx; font-size: 26rpx;
text-align: right; text-align: right;
padding-right: 20rpx;
width: 60%;
} }
.error-tip{ .error-tip{
position: absolute; position: absolute;
......
pages.json
...@@ -544,6 +544,11 @@ ...@@ -544,6 +544,11 @@
"style": { "style": {
"navigationBarTitleText": "分销海报" "navigationBarTitleText": "分销海报"
} }
},{
"path": "myTeam/myTeam",
"style": {
"navigationBarTitleText": "我的团队"
}
} }
] ]
},{ },{
......
pages/courseDetail/courseDetail.vue
...@@ -1049,45 +1049,10 @@ ...@@ -1049,45 +1049,10 @@
} }
this.userId = uni.getStorageSync('cffp_userId') this.userId = uni.getStorageSync('cffp_userId')
// #ifdef H5 // #ifdef H5
initJssdkShare(() => { initJssdkShare(() => {
setWechatShare(); setWechatShare();
}, window.location.href); }, window.location.href);
// #endif // #endif
},
mounted() {
let _this = this;
if(this.isWeixin){
//var btn = document.getElementById('launch-btn');
//btn.addEventListener('launch', function(e) {
//console.log('success');
//});
//btn.addEventListener('error', function(e) {
// uni.navigateTo({
// url:'/pages/downloadAppCommon/downloadAppCommon'
// })
// uni.showModal({
// title: '系统消息',
// content: '您的手机未找到当前应用，是否去下载？',
// success: function(res) {
// if (res.confirm) {
// if(uni.getSystemInfoSync().platform == 'ios'){
// window.location.href = "http://itunes.apple.com/us/app/id399608199";
// }else {
// uni.navigateTo({
// url:'/pages/downloadApp/index'
// })
// // alert('android')
// }
// //在App Store Connect中的App Store下的app信息，可找到appleId
// console.log('用户点击确定');
// } else if (res.cancel) {
// console.log('用户点击取消');
// }
// }
// });
//});
}
}, },
onReady() { onReady() {
this.videoContext = uni.createVideoContext('myVideo'); this.videoContext = uni.createVideoContext('myVideo');
......
pages/index/index.vue
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
} }
uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo)); uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo));
uni.setStorageSync('user_mobile', res.data.mobile)
if(cffp_userInfo.partnerType){ if(cffp_userInfo.partnerType){
this.featureLists = [{key: '00',name: '成交订单',icon:'icon-dingdan',link: '/pages/saleCourseLists/saleCourseLists',isOpen: true,enName:'order'}, this.featureLists = [{key: '00',name: '成交订单',icon:'icon-dingdan',link: '/pages/saleCourseLists/saleCourseLists',isOpen: true,enName:'order'},
{key: '01',name: '佣金',icon: 'icon-yongjin',link: '/pages/pointsExchange/pointsExchange',isOpen: true,isJoin: true}, {key: '01',name: '佣金',icon: 'icon-yongjin',link: '/pages/pointsExchange/pointsExchange',isOpen: true,isJoin: true},
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
}, },
querySystemMessage() { querySystemMessage() {
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then(res => { api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then(res => {
if (res['success']&& res['data']['dataList'].length>0) { if (res['success']&& res['data']['dataList']&& res['data']['dataList'].length>0) {
let total = res['data']['dataList'].filter(item=>{ let total = res['data']['dataList'].filter(item=>{
......
pages/inviteJoin/inviteJoin.vue
...@@ -15,13 +15,14 @@ ...@@ -15,13 +15,14 @@
<view v-if="tabType===1"> <view v-if="tabType===1">
<view class="ulBox"> <view class="ulBox">
<view class="liBox"> <view class="liBox">
<text>昵称(被邀请人可修改)：</text> <text>昵称 <text style="font-size: 22rpx;">(被邀请人可修改)</text> ：</text>
<text> <text>
<input <input
v-model="dataForm.name" v-model="dataForm.name"
class="uni-input" class="uni-input"
maxlength="10" maxlength="10"
placeholder="昵称" placeholder="昵称"
style="width: 300rpx;"
/> />
</text> </text>
</view> </view>
...@@ -30,48 +31,6 @@ ...@@ -30,48 +31,6 @@
<text><input v-model="dataForm.mobileNumber" class="uni-input" type="number" maxlength="11" <text><input v-model="dataForm.mobileNumber" class="uni-input" type="number" maxlength="11"
placeholder="手机号" /></text> placeholder="手机号" /></text>
</view> </view>
<!-- <view class="liBox">
<text>申请身份：</text>
<text>
<picker @change="bindPickerChange" :value="applyIdentity" :range="identityArr">
<view class="uni-input">{{identityArr[applyIdentity]}}</view>
</picker>
</text>
</view>
<view class="liBox">
<text>所属组织：</text>
<text>
<input v-if="isCross==true" v-model="dataForm.areaName" class="uni-input"
placeholder="请填写组织名称" />
<picker v-else @change="bindPChange" :value="index" :range="orgdataList">
<view class="uni-input">{{ orgdataList[index]}}</view>
</picker>
</text>
</view>
<view class="liBox">
<text>是否跨区邀请：</text>
<view class="isCrossBox">
<view :class="{checked:isCross}">
<i class="circle" @click="isCross = true"></i>
<text>是</text>
</view>
<view :class="{checked:!isCross}">
<i class="circle" @click="isCross = false"></i>
<text>否</text>
</view>
</view>
</view>
<view class="describeLabel">晋升机制：当事业伙伴成功邀请加盟人数超过10人时，经过人工审核通过后，即可成功晋升为工作室。</view>
-->
<!-- <view class="liBox" v-if="isCross== true">
<text>所属组织名称：</text>
<text>
<picker @change="bindPickerChange" :value="applyIdentity" :range="identityArr">
<view class="uni-input">{{identityArr[applyIdentity]}}</view>
</picker>
</text>
</view> -->
</view> </view>
<!-- <share></share> --> <!-- <share></share> -->
<button type="primary" plain="true" class="sendInvite" @click="shareToggle()">发出邀请</button> <button type="primary" plain="true" class="sendInvite" @click="shareToggle()">发出邀请</button>
......
pages/personalCenter/myTeam.vue
...@@ -121,6 +121,14 @@ ...@@ -121,6 +121,14 @@
</view> </view>
</view> </view>
</view> </view>
<boot-page
loginSource="我的团队"
v-if="sharelogin"
ref="sharelogin"
@close="sharelogin = false"
@afterLogin="afterLogin"
pageSource="myTeam"
></boot-page>
</view> </view>
</template> </template>
...@@ -129,9 +137,11 @@ ...@@ -129,9 +137,11 @@
import dataHandling from "@/util/dataHandling"; import dataHandling from "@/util/dataHandling";
import api from "@/api/api"; import api from "@/api/api";
import { initJssdkShare, setWechatShare } from '@/util/fiveshare'; import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
import BootPage from "@/components/bootpage/bootpage.vue";
export default { export default {
components: { components: {
CommonTimePicker CommonTimePicker,
BootPage
}, },
data() { data() {
return { return {
...@@ -164,7 +174,6 @@ ...@@ -164,7 +174,6 @@
myTeamList:[],//我的团队表格数据， myTeamList:[],//我的团队表格数据，
myTeamData:{},//我的团队总数据， myTeamData:{},//我的团队总数据，
CffpOrgInfoReqVO: { CffpOrgInfoReqVO: {
userId: uni.getStorageSync('cffp_userId'),
startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`, startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`, endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
courseOrPolicy: '1', courseOrPolicy: '1',
...@@ -175,7 +184,8 @@ ...@@ -175,7 +184,8 @@
totalCoursePrice: '0.00', // 总销售额 totalCoursePrice: '0.00', // 总销售额
monthStandardSales:'0.00',//本月团队标准销售额 monthStandardSales:'0.00',//本月团队标准销售额
myTeamAchievementList:[],//我的业绩数据列表, myTeamAchievementList:[],//我的业绩数据列表,
marginTop:'30rpx' marginTop:'30rpx',
sharelogin: false,
} }
}, },
watch: { watch: {
...@@ -260,29 +270,30 @@ ...@@ -260,29 +270,30 @@
} }
}, },
}, },
onLoad(){ onLoad(options){
this.getmyseatem() // 未登录，弹出登录框
this.getqueryTeamAchievement() if(options.myTeam&&(!uni.getStorageSync('loginType')||uni.getStorageSync('loginType')=='visitor' )){
this.sharelogin = true
}else {
this.getmyseatem()
this.getqueryTeamAchievement()
}
}, },
onShow() { onShow() {
// #ifdef H5 // #ifdef H5
initJssdkShare(() => { initJssdkShare(() => {
setWechatShare(); setWechatShare();
}, window.location.href); }, window.location.href);
// #endif // #endif
}, },
methods: { methods: {
sortswitch(obj) { sortswitch(obj) {
this.currentFilterBtn = obj.id this.currentFilterBtn = obj.id
this.CffpOrgInfoReqVO.sortType = obj.sortType this.CffpOrgInfoReqVO.sortType = obj.sortType
this.getqueryTeamAchievement() this.getqueryTeamAchievement()
// if(obj.sortType == 4){
// this.CffpOrgInfoReqVO.sortType = obj.sortType
// this.getqueryTeamAchievement()
// }else{
// delete this.CffpOrgInfoReqVO.sortType
// this.getqueryTeamAchievement()
// }
}, },
changeTab(item){ changeTab(item){
this.currentTab = item.id this.currentTab = item.id
...@@ -292,6 +303,7 @@ ...@@ -292,6 +303,7 @@
}, },
getqueryTeamAchievement() { getqueryTeamAchievement() {
this.CffpOrgInfoReqVO.userId=uni.getStorageSync('cffp_userId'),
this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type this.CffpOrgInfoReqVO.queryType = this.tabList.filter(item=>item.id == this.currentTab)[0].type
this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType this.CffpOrgInfoReqVO.sortType = this.btnList.filter(item=>item.id == this.currentFilterBtn)[0].sortType
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => { api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
...@@ -379,6 +391,11 @@ ...@@ -379,6 +391,11 @@
}) })
} }
}, },
afterLogin(){
this.userId = uni.getStorageSync('cffp_userId'),
this.getmyseatem()
this.getqueryTeamAchievement()
}
}, },
} }
......
pages/personalCenter/personalCenter.vue
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
{title:'申请加盟',icon:'icon-hezuo',link:'/myPackageA/applyFranchise/applyFranchise?',isOpen:true,isShow:true,isApply:true}, {title:'申请加盟',icon:'icon-hezuo',link:'/myPackageA/applyFranchise/applyFranchise?',isOpen:true,isShow:true,isApply:true},
{key:'06',title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true}, {key:'06',title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true},
{title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true}, {title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
// {title:'我的团队',icon:'icon-tuandui',link:'/myPackageA/myTeam/myTeam',isOpen:true,isShow:true,identity: true},
{title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true}, {title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
], ],
}, },
...@@ -408,7 +409,6 @@ ...@@ -408,7 +409,6 @@
url: '/myPackageA/login/login?from=personalCenter' url: '/myPackageA/login/login?from=personalCenter'
}) })
try { try {
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor'); uni.setStorageSync('loginType','visitor');
} catch (e) { } catch (e) {
...@@ -605,8 +605,7 @@ ...@@ -605,8 +605,7 @@
uni.setStorageSync('user_mobile', res.data.mobile) uni.setStorageSync('user_mobile', res.data.mobile)
}else { }else {
// 清空全部本地存储
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor') uni.setStorageSync('loginType','visitor')
this.showMyName = '' this.showMyName = ''
this.loginType = 'visitor' this.loginType = 'visitor'
......
pages/personalCenter/system/settings.vue
...@@ -96,7 +96,6 @@ ...@@ -96,7 +96,6 @@
'pages/personalCenter/system/settings' 'pages/personalCenter/system/settings'
) )
try { try {
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor'); uni.setStorageSync('loginType','visitor');
} catch (e) { } catch (e) {
console.log(e) console.log(e)
......
pages/personalCenter/user-information.vue
...@@ -6,10 +6,15 @@ ...@@ -6,10 +6,15 @@
<!-- #ifdef APP --> <!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<!-- #endif --> <!-- #endif -->
<view class="avartBox" @click="uploadAvatar()"> <view class="headerBox">
<text class="iconfont icon-jiahao2fill" ></text> <view class="add">
<image :src="optionForm.headPicture ? optionForm.headPicture :companyLogo" mode="widthFix"></image> <text class="iconfont icon-jiahao" ></text>
</view>
<view class="avartBox" @click="uploadAvatar()">
<image :src="optionForm.headPicture ? optionForm.headPicture :companyLogo" mode="widthFix"></image>
</view>
</view> </view>
</view> </view>
<view class="userInformation"> <view class="userInformation">
<view style="flex: 1;"> <view style="flex: 1;">
...@@ -408,36 +413,58 @@ ...@@ -408,36 +413,58 @@
height: 300rpx; height: 300rpx;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
.avartBox{ .headerBox{
margin-top: -20rpx;
margin-left: 100rpx;
position: absolute; position: absolute;
bottom: 1%; bottom: 15%;
left: 14%; left: 14%;
z-index: 99; z-index: 99;
margin-top: 50rpx; .add{
margin-left: 100rpx;
width: 200rpx;
height: 200rpx;
border-radius: 50%;
box-sizing: border-box;
box-shadow: 0 0 30rpx 15rpx rgba(150, 150, 150, 0.1);
position: relative;
.icon-jiahao2fill{
position: absolute; position: absolute;
bottom: 2%; bottom: 2%;
right: 3%; right: 3%;
color: #20269B; background-color: #20269B;
font-size: 50rpx;
z-index: 2; z-index: 2;
display: flex;
align-items: center;
justify-content: center;
padding: 8rpx;
border-radius: 50%;
box-sizing: border-box;
.icon-jiahao{
font-size: 28rpx;
color: #fff;
}
}
.avartBox{
width: 200rpx;
height: 200rpx;
border-radius: 50%;
border: 10rpx solid #fff;
box-sizing: border-box;
box-shadow: 0 0 30rpx 15rpx rgba(150, 150, 150, 0.1);
position: relative;
/* 添加以下属性强制硬件加速 */
transform: translateZ(0);
-webkit-transform: translateZ(0);
backface-visibility: hidden;
-webkit-backface-visibility: hidden;
overflow: hidden;
image{
display: block; /* 确保图片是块级元素 */
width: 100%; /* 宽度填满容器 */
height: 100%; /* 高度填满容器 */
// border-radius: 50%; /* 保持圆形 */
object-fit: cover; /* 防止图片变形（可选） */
/* 同样为图片添加硬件加速 */
transform: translateZ(0);
-webkit-transform: translateZ(0);
}
} }
image{
margin-top: 2rpx;
display: block; /* 确保图片是块级元素 */
width: 100%; /* 宽度填满容器 */
height: 100%; /* 高度填满容器 */
border-radius: 50%; /* 保持圆形 */
object-fit: cover; /* 防止图片变形（可选） */
}
} }
} }
.userInformation { .userInformation {
position: relative; position: relative;
...@@ -528,15 +555,10 @@ ...@@ -528,15 +555,10 @@
color: black; color: black;
font-size: 26rpx; font-size: 26rpx;
text-align: right; text-align: right;
padding-right: 20rpx;
} width: 70%;
.error-tip{
position: absolute;
right: 0;
bottom: -30rpx;
color: #F43530;
font-size: 22rpx;
} }
} }
} }
} }
......
static/font1/demo_index.html
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe333;</span>
<div class="name">加号</div>
<div class="code-name">&amp;#xe333;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe302;</span> <span class="icon iconfont">&#xe302;</span>
<div class="name">save</div> <div class="name">save</div>
<div class="code-name">&amp;#xe302;</div> <div class="code-name">&amp;#xe302;</div>
...@@ -396,9 +402,9 @@ ...@@ -396,9 +402,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1754461035462') format('woff2'), src: url('iconfont.woff2?t=1754967710345') format('woff2'),
url('iconfont.woff?t=1754461035462') format('woff'), url('iconfont.woff?t=1754967710345') format('woff'),
url('iconfont.ttf?t=1754461035462') format('truetype'); url('iconfont.ttf?t=1754967710345') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
...@@ -425,6 +431,15 @@ ...@@ -425,6 +431,15 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-jiahao"></span>
<div class="name">
加号
</div>
<div class="code-name">.icon-jiahao
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-save"></span> <span class="icon iconfont icon-save"></span>
<div class="name"> <div class="name">
save save
...@@ -939,6 +954,14 @@ ...@@ -939,6 +954,14 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jiahao"></use>
</svg>
<div class="name">加号</div>
<div class="code-name">#icon-jiahao</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-save"></use> <use xlink:href="#icon-save"></use>
</svg> </svg>
<div class="name">save</div> <div class="name">save</div>
......
static/font1/iconfont.css
@font-face { @font-face {
font-family: "iconfont"; /* Project id 4933433 */ font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1754461035462') format('woff2'), src: url('iconfont.woff2?t=1754967710345') format('woff2'),
url('iconfont.woff?t=1754461035462') format('woff'), url('iconfont.woff?t=1754967710345') format('woff'),
url('iconfont.ttf?t=1754461035462') format('truetype'); url('iconfont.ttf?t=1754967710345') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-jiahao:before {
content: "\e333";
}
.icon-save:before { .icon-save:before {
content: "\e302"; content: "\e302";
} }
......
static/font1/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font1/iconfont.json
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "7192356",
"name": "加号",
"font_class": "jiahao",
"unicode": "e333",
"unicode_decimal": 58163
},
{
"icon_id": "448643", "icon_id": "448643",
"name": "save", "name": "save",
"font_class": "save", "font_class": "save",
......
util/router.js
...@@ -24,7 +24,6 @@ const whiteList = [ ...@@ -24,7 +24,6 @@ const whiteList = [
export default function initApp(){ export default function initApp(){
let date = Date.now() let date = Date.now()
uni.addInterceptor('navigateTo', { uni.addInterceptor('navigateTo', {
// 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转 // 页面跳转前进行拦截, invoke根据返回值进行判断是否继续执行跳转
invoke (e) { invoke (e) {
...@@ -36,7 +35,7 @@ export default function initApp(){ ...@@ -36,7 +35,7 @@ export default function initApp(){
let pages = getCurrentPages() let pages = getCurrentPages()
let pagesLength = pages.length let pagesLength = pages.length
if(whiteList.indexOf(e.url)==-1&&!uni.getStorageSync('loginType')){ if(whiteList.indexOf(e.url)==-1&&!uni.getStorageSync('loginType')){
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor') uni.setStorageSync('loginType','visitor')
uni.navigateTo({ uni.navigateTo({
url: '/myPackageA/login/login' url: '/myPackageA/login/login'
...@@ -45,8 +44,6 @@ export default function initApp(){ ...@@ -45,8 +44,6 @@ export default function initApp(){
if(uni.getStorageSync('cffp_userId')){ if(uni.getStorageSync('cffp_userId')){
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{ api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
if(!res['success']){ if(!res['success']){
// 清空全部本地存储
uni.clearStorageSync();
uni.setStorageSync('loginType','visitor') uni.setStorageSync('loginType','visitor')
uni.navigateTo({ uni.navigateTo({
url: '/myPackageA/login/login' url: '/myPackageA/login/login'
......
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