更改提交

master
chen 2021-08-19 17:27:37 +08:00
parent 3339584000
commit b66f536c1b
52 changed files with 242 additions and 112 deletions

View File

@ -24,10 +24,12 @@
.list-cont-box15{bottom: 10rpx;left: 0rpx;right: 0; padding-top: 100rpx; background:-webkit-linear-gradient(bottom,rgba(0,0,0,0.79),rgba(255,255,255,0));padding-left: 22rpx;padding-right: 22rpx;padding-bottom: 18rpx;border-bottom-left-radius: 15rpx;border-bottom-right-radius: 15rpx;}
.list-headimg{width: 28rpx;height: 28rpx;margin-right: 6rpx;border-radius: 100%;}
/* 分类 */
.catemo{color: #4D4D4D;padding: 10rpx;text-align: center;margin-left: 10rpx;}
.cateActive{background-color: #F5F5F5;border-radius: 10rpx 0rpx 0rpx 10rpx;padding: 10rpx;text-align: center;margin-left: 10rpx;}
.catemo{color: #4D4D4D;padding: 20rpx 10rpx;text-align: center;margin-left: 10rpx;}
.cateActive{background-color: #F5F5F5;border-radius: 10rpx 0rpx 0rpx 10rpx;padding: 20rpx 10rpx;text-align: center;margin-left: 10rpx;}
.cate-tu-item{padding: 8rpx 10rpx;background-color: #DFDFDF;}
.cate-box{position: fixed;top: 0;left: 0;bottom: 0;background-color: #FFFFFF;}
.list-min{min-height: 260rpx;}
.cate-box .fon26 .mar-s20:first-child {margin-top: 50rpx;}
/* 搜索 */
.search-input-box{width: 100%;padding-bottom: 20rpx;}
.tank-box{margin: 0 85rpx;}

View File

@ -49,34 +49,36 @@
titleList:{
type:Array,
default:function(){
return ['首页','分类','客服','商城','我的']
return uni.getStorageSync('footTitle')
// return ['','','','','']
}
},
imgList:{
type:Array,
default:function(){
return [
{
iconPath: '/static/tabbar/homem.png',//icon
selectedIconPath: '/static/tabbar/homeAc.png',//icon
},
{
iconPath: '/static/tabbar/catem.png',//icon
selectedIconPath: '/static/tabbar/cates.png',//icon
},
{
iconPath: '/static/tabbar/customerm.png',//icon
selectedIconPath: '/static/tabbar/customerm.png',//icon
},
{
iconPath: '/static/tabbar/shopm.png',//icon
selectedIconPath: '/static/tabbar/shopa.png',//icon
},
{
iconPath: '/static/tabbar/mym.png',//icon
selectedIconPath: '/static/tabbar/mya.png',//icon
}
]
return uni.getStorageSync('imgList')
// return [
// {
// iconPath: '/static/tabbar/homem.png',//icon
// selectedIconPath: '/static/tabbar/homeAc.png',//icon
// },
// {
// iconPath: '/static/tabbar/catem.png',//icon
// selectedIconPath: '/static/tabbar/cates.png',//icon
// },
// {
// iconPath: '/static/tabbar/customerm.png',//icon
// selectedIconPath: '/static/tabbar/customerm.png',//icon
// },
// {
// iconPath: '/static/tabbar/shopm.png',//icon
// selectedIconPath: '/static/tabbar/shopa.png',//icon
// },
// {
// iconPath: '/static/tabbar/mym.png',//icon
// selectedIconPath: '/static/tabbar/mya.png',//icon
// }
// ]
}
}
},
@ -130,6 +132,7 @@
// this.current = index
switch (index){
case 0:
console.log(this.imgList[index].selectedIcoPath);
uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
break;
case 1:

View File

@ -5,7 +5,7 @@
<view class="list-box">
<view @tap="goDetail(index)" v-if="index%2==0" :class="radiu?'radius15 mar-x10':'radius30 mar-x30'" class="posir colf zou" v-for="(item,index) in list" :key="index">
<!-- 背景图 -->
<image :class="radiu?'radius15':'radius30'" class=" width100" :src="item.main_img" style="min-height: 430rpx;" mode="widthFix"></image>
<image :class="radiu?'radius15':'radius30'" class=" width100 list-min" :src="item.main_img" mode="widthFix"></image>
<view class="posia list-like-box" @tap.stop="chooseLike(index)">
<!-- 不喜欢 -->
<image v-if="item.is_collected!=1" src="/static/public/no-like.png" mode="aspectFill"></image>
@ -33,7 +33,7 @@
<view class="list-box">
<view @tap="goDetail(index)" v-if="index%2!=0" :class="radiu?'radius15 mar-x10':'radius30 mar-x30'" class="posir colf zou" v-for="(item,index) in list" :key="index">
<!-- 背景图 -->
<image :class="radiu?'radius15':'radius30'" class="width100" :src="item.main_img" style="min-height: 430rpx;" mode="widthFix"></image>
<image :class="radiu?'radius15':'radius30'" class="width100 list-min" :src="item.main_img" mode="widthFix"></image>
<view class="posia list-like-box" @tap.stop="chooseLike(index)">
<!-- 不喜欢 -->
<image v-if="item.is_collected!=1" src="/static/public/no-like.png" mode="aspectFill"></image>

View File

@ -15,8 +15,8 @@
</view>
</view>
<view v-else class="tc tank-box-itemone">{{contentVal}}</view>
<view :class="isCenter?'disjcac':'disjb'" class="fon28 colf pad-x20 pad-zy30 tc">
<view @tap="cancleEv" v-if="!isCenter" class="pad-sx10 radius10 tank-btn" style="background-color: rgba(230, 230, 230,1);">{{clearVal}}</view>
<view :class="isCenter?'disjcac':'disjb'" class="fon28 colf pad-x30 pad-zy30 tc">
<view @tap="cancleEv" v-if="!isCenter" class="pad-sx10 radius10 tank-btn" style="background-color: rgba(230, 230, 230,1);color: #000000;">{{clearVal}}</view>
<view @tap="comfirEv" :style="{background:publicColor}" class="pad-sx10 radius10 tank-btn">{{comfrimVal}}</view>
</view>
</view>

View File

@ -60,6 +60,10 @@
uni.navigateTo({
url:'/pages/tabbar/pagehome/pagehome'
})
} else if(this.whereCome==2){
uni.navigateTo({
url:'/pages/tabbar/my/my'
})
} else {
uni.navigateBack({delta:1})
}

View File

@ -6,17 +6,17 @@ const tools = {
daoTime(){
let daoTime = uni.getStorageSync('daoTime')
if(daoTime==''){//初次判断倒计时是否为空
uni.setStorageSync('daoTime',600)//设置倒计时
uni.setStorageSync('daoTime',6000)//设置倒计时
daoTime = uni.getStorageSync('daoTime')
this.timer = setInterval(()=>{
uni.setStorageSync('daoTime',daoTime--)//设置倒计时
// console.log('埋点倒计时初次:',daoTime);
// console.log('埋点长度初次:',uni.getStorageSync('maiList').length);
if(uni.getStorageSync('daoTime')<=0 || uni.getStorageSync('maiList').length==500){
if(uni.getStorageSync('daoTime')<=0 || uni.getStorageSync('maiList').length==100){
uni.removeStorageSync('daoTime')//清空倒计时
clearInterval(this.timer)//关闭倒计时
// console.log('上报,埋点');
// reportBuriedPoint(uni.getStorageSync('maiList'))//上报事件
reportBuriedPoint(uni.getStorageSync('maiList'))//上报事件
uni.removeStorageSync('maiList')//清空上报参数
this.daoTime()//重新倒计时
}
@ -26,11 +26,11 @@ const tools = {
uni.setStorageSync('daoTime',daoTime--)//设置倒计时
// console.log('埋点倒计时:',daoTime);
// console.log('埋点长度:',uni.getStorageSync('maiList').length);
if(uni.getStorageSync('daoTime')<=0 || uni.getStorageSync('maiList').length==500){
if(uni.getStorageSync('daoTime')<=0 || uni.getStorageSync('maiList').length==100){
uni.removeStorageSync('daoTime')//清空倒计时
clearInterval(this.timer)//关闭倒计时
// console.log('上报,埋点');
// reportBuriedPoint(uni.getStorageSync('maiList'))//上报事件
reportBuriedPoint(uni.getStorageSync('maiList'))//上报事件
uni.removeStorageSync('maiList')//清空上报参数
this.daoTime()//重新倒计时
}

View File

@ -13,6 +13,8 @@
<!-- <button v-else class='login-btn' type='primary' open-type="getUserInfo" withCredentials="true" lang="zh_CN" @getuserinfo="bindGetUserInfo"></button> -->
<view class="xie-box">登录代表您已同意<text @tap="goXie" class="xieCon">用户服务协议</text></view>
</view>
<!-- 弹框 -->
<pu-po :isShowT="isShowT" :contentVal="'请完善个人资料'" :clearVal="'否'" :comfrimVal="'是'" @comfirmev="goInfo" @cancleev="quXiao"></pu-po>
</view>
</template>
<script>
@ -25,10 +27,13 @@
imgSrc: '/static/public/logo.png',//logo
invite_code:'',//()
channel:'',//()
invite_source:''//[def|link|qr]
invite_source:'',//[def|link|qr]
isShowT:false,
infoObj:{}
};
},
onLoad(options) {
if(uni.getStorageSync('showPhone')!='') this.isShowT = uni.getStorageSync('showPhone')
let ya = this;
// ,
if (options && options.q) {
@ -46,6 +51,22 @@
}
},
methods: {
goInfo(){
uni.setStorageSync('uinfo',this.infoObj)
uni.navigateTo({
url:'/pagesA/nodifyData/nodifyData?whereNum=2'
})
this.isShowT = false
},
quXiao(){
this.$toolAll.tools.showToast('登录成功','success')
setTimeout(()=>{
uni.reLaunch({
url:'/pages/tabbar/pagehome/pagehome'
})
},1000)
this.isShowT = false
},
goXie(){
uni.navigateTo({
url:'/pages/login/xiey'
@ -92,6 +113,7 @@
uni.showToast({
title: '登录中...',
icon:'loading',
duration:10000
})
var params = {
code:code,
@ -119,12 +141,19 @@
}
uni.setStorageSync('comeOn',comeOn)
uni.setStorageSync('token',res.data.token)//token
ya.$toolAll.tools.showToast('登录成功','success')
setTimeout(()=>{
uni.reLaunch({
url:'/pages/tabbar/pagehome/pagehome'
})
},1000)
this.isShowT = true
this.$requst.post('user/info').then(res=>{
// console.log('',res);
if(res.code==0 && res.data.length!=0) {
this.infoObj = res.data;
}
},error=>{})
// ya.$toolAll.tools.showToast('','success')
// setTimeout(()=>{
// uni.reLaunch({
// url:'/pages/tabbar/pagehome/pagehome'
// })
// },1000)
}
},error => {})
}

View File

@ -6,7 +6,7 @@
<template v-if="cateList.length!=0">
<view class="cate-box" :style="{paddingTop:statusHNH+'px'}" style="overflow: hidden;overflow-y: scroll;">
<view class="fon26">
<view class="mar-s50 flexs" :style="{color : ccurrent==indexc ? publicColor:''}"
<view class="mar-s20 flexs" :style="{color : ccurrent==indexc ? publicColor:''}"
:class="ccurrent==indexc?'bold cateActive':'catemo'"
v-for="(itemc,indexc) in cateList" :key="indexc"
@tap="chooseCate(indexc)">{{itemc.title}}</view>

View File

@ -84,7 +84,7 @@
</view>
</view>
<!-- 底部tab -->
<foot-tab :newcurrent='4'></foot-tab>
<foot-tab :titleList="titleList" :imgList="imgList" :newcurrent='4'></foot-tab>
<!-- 弹框授权 -->
<empower :vision="vision" @cancleEv="cancleEv"></empower>
</view>
@ -128,6 +128,8 @@
is_doctor:'',//01
is_servicer:'',//01
is_staff:'',//01
titleList:[],
imgList:[]
}
},
onUnload: function() {
@ -140,6 +142,9 @@
this.checkInfo()
},
onLoad() {
this.titleList = uni.getStorageSync('footTitle')
this.imgList = uni.getStorageSync('footimg')
uni.setStorageSync('footimg',this.imgList)
uni.removeStorageSync('shareAll')//
if(uni.getStorageSync('gao')==''){
const query = wx.createSelectorQuery()

View File

@ -37,10 +37,10 @@
</view>
<!-- 发问 -->
<view class="mar-zy30 mar-sx20 disjb">
<image class="flexs mar-y20 radius30 fawen-img" src="/static/public/wen-one.png" mode="aspectFill"></image>
<image class="flexs mar-y20 radius30 fawen-img" @tap="tapChoose(0)" :src="gaoone.imgSrc" mode="aspectFill"></image>
<view class="disjb fc width100">
<image class="radius30 width100 fawen-itemImg" src="/static/public/wen-two.png" mode=""></image>
<image class="radius30 width100 fawen-itemImg" src="/static/public/wen-three.png" mode=""></image>
<image class="radius30 width100 fawen-itemImg" @tap="tapChoose(1)" :src="gaotwo.imgSrc" mode=""></image>
<image class="radius30 width100 fawen-itemImg" @tap="tapChoose(2)" :src="gaothree.imgSrc" mode=""></image>
</view>
</view>
<!-- 热门搜索 -->
@ -65,7 +65,7 @@
</view>
</view>
<!-- 底部tab -->
<foot-tab></foot-tab>
<foot-tab :titleList="titleList" :imgList="imgList"></foot-tab>
<!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
</view>
@ -91,16 +91,16 @@
// {src:'/static/public/tous.png',title:''},
// {src:'/static/public/zhir.png',title:''},
// {src:'/static/public/zhij.png',title:''},
{src:'/static/public/zhis.png',title:'植发医生'},
{src:'/static/public/gengd.png',title:'更多'},
// {src:'/static/public/zhis.png',title:''},
// {src:'/static/public/gengd.png',title:''},
],
fwList:[//
{title:'植发需要多少钱'},
{title:'疤痕植发'},
{title:'眉毛种植'},
{title:'胡须种植'},
{title:'我为什么会脱发'},
{title:'头发如何保养'},
// {title:''},
// {title:''},
// {title:''},
// {title:''},
// {title:''},
// {title:''},
],
kcurrent:0,//
ktList:[//
@ -130,6 +130,12 @@
isZanw:true,
course_id:0,
isLoading:false,
isShowT:true,
titleList:[],//
imgList:[],//
gaoone:{},
gaotwo:{},
gaothree:{}
}
},
onPageScroll(e) {
@ -168,17 +174,34 @@
this.$toolAll.tools.buriedPointAll()//id
},
methods: {
checkKey(){
tapChoose(index){//
let newUrl = ''
if(index==0) newUrl = this.gaoone.url
if(index==1) newUrl = this.gaotwo.url
if(index==2) newUrl = this.gaothree.url
uni.navigateTo({
url:newUrl
})
},
checkKey(){//
this.$requst.get('index/hot-keywords').then(res=>{
console.log('关键词列表:',res);
// console.log('',res);
if(res.code==0){
if(res.data.length!=0){
res.data.forEach(item=>{
let reObj = {title:item.keyword}
this.fwList.push(reObj)
})
}
}
},error=>{})
},
checkBCate(){
checkBCate(){//
this.$requst.post('index/mini-program-setting').then(res=>{
// console.log('',res);
if(res.code==0){
if(res.data.length!=0){
if(res.data.recommend.length!=0){
if(res.data.recommend.length!=0){//
res.data.recommend.forEach(item=>{
let bcObj = {
src:this.$http + item.icon,
@ -187,7 +210,52 @@
}
this.gonggList.push(bcObj)
})
this.gonggList.push({src:'/static/public/gengd.png',title:'更多'},)
this.gonggList.push({src:this.$http + res.data.recommendMore,title:'更多'})
}
if(res.data.footBar.length!=0){//
res.data.footBar.forEach(item=>{
let newName = item.name
let newObj = {
iconPath:this.$http + item.icon[0],
selectedIconPath:this.$http + item.icon[1],
}
if(item.key=="home"){
this.imgList[0] = newObj
this.titleList[0] = newName
}
if(item.key=="category"){
this.imgList[1] = newObj
this.titleList[1] = newName
}
if(item.key=="service"){
this.imgList[2] = newObj
this.titleList[2] = newName
}
if(item.key=="shop"){
this.imgList[3] = newObj
this.titleList[3] = newName
}
if(item.key=="my"){
this.imgList[4] = newObj
this.titleList[4] = newName
}
})
uni.setStorageSync('footTitle',this.titleList)
uni.setStorageSync('footimg',this.imgList)
}
if(res.data.ad.length!=0){//
this.gaoone = {
imgSrc:this.$http + res.data.ad[0].img,
url:res.data.ad[0].link,
}
this.gaotwo = {
imgSrc:this.$http + res.data.ad[1].img,
url:res.data.ad[1].link,
}
this.gaothree = {
imgSrc:this.$http + res.data.ad[2].img,
url:res.data.ad[2].link,
}
}
}
}

View File

@ -6,7 +6,7 @@
<!-- 底部tab -->
<foot-tab :newcurrent='3'></foot-tab>
<foot-tab :titleList="titleList" :imgList="imgList" :newcurrent='3'></foot-tab>
</view>
</template>
@ -14,9 +14,14 @@
export default {
data() {
return {
titleList:[],
imgList:[]
}
},
onLoad() {
this.titleList = uni.getStorageSync('footTitle')
this.imgList = uni.getStorageSync('footimg')
},
methods: {
}

View File

@ -1,7 +1,7 @@
<template>
<view>
<!-- 状态栏 -->
<status-nav :titleVal="'修改资料'" :statusTitle="true"></status-nav>
<status-nav :titleVal="'修改资料'" :whereCome="whereCome" :statusTitle="true"></status-nav>
<!-- 自定义二级分类 -->
<!-- 列表 -->
<view :style="{paddingTop: statusHNH+'px'}" class="fon28">
@ -106,10 +106,14 @@
addressInfo:[],
newProvice:'',//
newCity:'',//
newDistrict:''//
newDistrict:'',//
whereCome:1
}
},
onLoad() {
onLoad(options) {
if(options.whereNum==2){
this.whereCome = options.whereNum
}
let chuo = new Date().getTime()//
let time = this.$toolAll.tools.timestampToTime(chuo)// XXXX-XX-XX
//

View File

@ -18,7 +18,7 @@
<view class="fon30 col3 clips2" style="height: 84rpx;">{{item.title}}</view>
<view class="fon24 col9 mar-s25">{{item.time}}</view>
</view>
<image class="flexs mar-z30" style="width: 140rpx;height: 140rpx;" :src="item.imgSrc" mode="aspectFill"></image>
<image v-if="item.imgSrc!=''" class="flexs mar-z30" style="width: 140rpx;height: 140rpx;" :src="item.imgSrc" mode="aspectFill"></image>
</view>
</view>
<view v-if="dataList.length==0" class="disjcac fc" style="margin-top: 20%;">

View File

@ -6,7 +6,7 @@
<!-- 列表 -->
<view :style="{paddingTop: statusHNH+'px'}" class="pad-zy32">
<view class="radius20 pad20 bacf mar-s20 col3">
<view class="fon28 bold mar-x40">我的分享</view>
<view class="fon28 bold mar-x40 pad-z10">我的分享</view>
<view class="disja">
<view @tap="goPage(index)" class="disac fc flexs width33" v-for="(item,index) in dataList" :key="index">
<view class="fon36 bold clips1">{{item.num}}</view>
@ -15,13 +15,13 @@
</view>
</view>
<!-- 分享按钮 -->
<view class="disjcac radius20 posir" style="height: 90rpx;margin: 70rpx 80rpx;background-color: #38CE51;line-height: 90rpx;">
<view @tap="shareEv" class="disjcac radius20 posir" style="height: 90rpx;margin: 70rpx 80rpx;background-color: #38CE51;line-height: 90rpx;">
<view class="disac">
<image src="/static/public/sharef.png" style="width: 54rpx;height: 54rpx;" mode=""></image>
<view class="fon40 bold colf mar-z10">分享给好友</view>
</view>
<!-- <button open-type="share" class="posia width100" style="opacity: 0;">分享给好友</button> -->
<button @tap="shareEv" class="posia width100" style="opacity: 0;">分享给好友</button>
<!-- <button @tap="shareEv" class="posia width100" style="opacity: 0;">分享给好友</button> -->
</view>
</view>
<!-- 弹框 -->
@ -38,10 +38,11 @@
isShowT:false,
imgSrc:'/static/public/shareh.png',
dataList:[
{num:'0',title:'佣金'},
{num:'0',title:'积分'},
{num:'0',title:'分享人'},
{num:'0',title:'分享订单'},
]
],
imgSrcP:uni.getStorageSync('imgSrcP')
}
},
onShareAppMessage(options) {
@ -75,6 +76,15 @@
uni.getStorageSync('shareAll')!='' ? this.dataList[1].num = uni.getStorageSync('shareAll').share_users.total : this.dataList[1].num = 0
},
methods: {
shareEv(){//
if(this.imgSrcP==''){
this.$toolAll.tools.showToast('请先前往个人海报申请海报')
} else {
wx.showShareImageMenu({
path: this.imgSrcP
})
}
},
goPage(index){
let newUrl = ''
if(index==1) newUrl = '/pagesB/mysharer/mysharer'
@ -82,9 +92,9 @@
url:newUrl
})
},
shareEv(){
this.isShowT = true
}
// shareEv(){
// this.isShowT = true
// }
}
}
</script>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long