Skip to content

M
mallapp
Commit 0f22cb84 authored by 罗超's avatar 罗超
Browse files
Options

首店部分修改

parent ceaf350d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1223 additions and 190 deletions
.hbuilderx/launch.json 0 → 100644
View file @ 0f22cb84
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"type": "uniCloud",
"default": {
"launchtype": "remote"
}
}
]
}
components/gridnav/index.vue
View file @ 0f22cb84
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
<image <image
:src="getIconLink(c.icon)" :src="getIconLink(c.icon)"
mode="widthFix" mode="widthFix"
style="width: 64rpx; height: 64rpx;" style="width: 90rpx; height: 90rpx;"
/> />
<text :style="{'color':navs.color}">{{ c.name }}</text> <text :style="{'color':navs.color}" style="font-size:26rpx;margin-top:20rpx;">{{ c.name }}</text>
</u-grid-item> </u-grid-item>
</u-grid> </u-grid>
</view> </view>
...@@ -34,13 +34,14 @@ export default { ...@@ -34,13 +34,14 @@ export default {
return { return {
cols: [], cols: [],
formatStyle: "", formatStyle: "",
height: 160, height: 204,
bg:"" bg:""
}; };
}, },
created() { created() {
let tempArray = []; let tempArray = [];
this.height = this.navs.rows * this.height; this.height = this.navs.rows * this.height;
console.log(this.navs)
this.navs.navs.forEach((x, i) => { this.navs.navs.forEach((x, i) => {
tempArray.push(x); tempArray.push(x);
if ( if (
......
components/miaiactivityCustom/style5.vue
View file @ 0f22cb84
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
'padding-bottom':goodsInfo.PaddingBottom+'px', 'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px' 'padding-left':goodsInfo.PaddingLeft+'px'
}"> }">
<view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)"> <view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" style="margin-right:30rpx" @click="openGood(item)">
<view class="img-box"> <view :class="{'img-box2':(!item.name||item.name==''),'img-box':(item.name&&item.name!='')}" :style="{'background-color': goodsInfo.backgroundColor}">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" /> <image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" :style="{'background-color': goodsInfo.backgroundColor}" />
</view> </view>
<view class="good-info"> <view class="good-info" v-if="item.name && item.name!=''">
<view class="good-name" v-if="item.name">{{ item.name }}</view> <view class="good-name">{{ item.name }}</view>
<view style="width: 130px;"> <view style="width: 130px;">
<view class="style_five_label" <view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex"> :style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted(){ mounted(){
...@@ -92,6 +91,13 @@ ...@@ -92,6 +91,13 @@
overflow: hidden; overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-five-stydy .img-box2 {
width: 278rpx;
height: 144rpx;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-five-stydy .good-info { .good-five-stydy .good-info {
height: 70px; height: 70px;
......
components/miaiactivitytype/style5.vue
View file @ 0f22cb84
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
'padding-bottom':goodsInfo.PaddingBottom+'px', 'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px' 'padding-left':goodsInfo.PaddingLeft+'px'
}"> }">
<view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)"> <view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" style="margin-right:30rpx" @click="openGood(item)">
<view class="img-box"> <view :class="{'img-box2':(!item.name||item.name==''),'img-box':(item.name&&item.name!='')}">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" /> <image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
</view> </view>
<view class="good-info"> <view class="good-info" v-if="item.name && item.name!=''">
<view class="good-name" v-if="item.name">{{ item.name }}</view> <view class="good-name">{{ item.name }}</view>
<view style="width: 130px;"> <view style="width: 130px;">
<view class="style_five_label" <view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex"> :style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue'; import auth from '@/components/auth/index.vue';
export default { export default {
components: { components: {
...@@ -89,6 +88,14 @@ ...@@ -89,6 +88,14 @@
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-five-stydy .img-box2 {
width: 278rpx;
height: 144rpx;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-five-stydy .good-info { .good-five-stydy .good-info {
height: 70px; height: 70px;
padding: 0 12px ; padding: 0 12px ;
...@@ -136,7 +143,11 @@ ...@@ -136,7 +143,11 @@
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; } .her_Two_study {
overflow-x: auto !important;
display: flex;
white-space: nowrap;
}
.style_five_label{ .style_five_label{
float:left; float:left;
padding: 0px 5px; padding: 0px 5px;
......
components/navpage/index.vue
View file @ 0f22cb84
<template> <template>
<!-- <div class="mynav" :style="{'background':bg}" style="padding-bottom:5px;"> --> <!-- <div class="mynav" :style="{'background':bg}" style="padding-bottom:5px;"> -->
<div class="mynav" style="padding-bottom:5px;background-color: #f5f7f9;min-height: 430px;"> <div class="mynav" style="padding-bottom:5px;min-height: 430px;" :style="{'background-color': navs.backgroundColor}">
<swiper :autoplay="false" :style="{'height': height + 'rpx' }"> <swiper v-if="navs.navType==1" :autoplay="false" :style="{'height': height + 'rpx' }">
<swiper-item v-for="(item, index) in cols" :key="index"> <swiper-item v-for="(item, index) in cols" :key="index">
<view :style="[formatStyle]"> <view :style="[formatStyle]">
<u-grid :col="getColumn(navs)" align="left" :border="false"> <u-grid :col="getColumn(navs)" align="left" :border="false">
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
<u-tabs v-if="navs.navType===0" :bg-color="navs.backgroundColor" :is-scroll="true" name="Name" :list="navs.navs" :active-color="mainColor" :current="active" @change="changeHandler2"
:show-bar="true" :activeFontSize="34" :bold="true" height="100" duration="0" font-size="28"></u-tabs>
<template> <template>
<template v-if="clickItem.ShowType==0"> <template v-if="clickItem.ShowType==0">
<cats v-if="clickItem.ComponentName == 'cats'"></cats> <cats v-if="clickItem.ComponentName == 'cats'"></cats>
...@@ -24,6 +26,8 @@ ...@@ -24,6 +26,8 @@
<view v-html='subItem.data.content.replace(new RegExp("max-width: 100%", "gm"), "max-width:100%;display:block")'></view> <view v-html='subItem.data.content.replace(new RegExp("max-width: 100%", "gm"), "max-width:100%;display:block")'></view>
</view> </view>
<rubik v-if="subItem.Id == 'rubik'" :ad="subItem.data"></rubik> <rubik v-if="subItem.Id == 'rubik'" :ad="subItem.data"></rubik>
<!-- 网课列表 -->
<rgoods v-if="subItem.Id == 'educationCustom'" :goods="subItem.data"></rgoods>
</template> </template>
</template> </template>
</template> </template>
...@@ -61,11 +65,13 @@ ...@@ -61,11 +65,13 @@
import cats from "@/components/navpage/category"; import cats from "@/components/navpage/category";
import activity from "@/components/navpage/activity"; import activity from "@/components/navpage/activity";
import rubik from "@/components/rubik/index"; import rubik from "@/components/rubik/index";
import rgoods from "@/components/study/index.vue";
export default { export default {
components: { components: {
cats, cats,
activity, activity,
rubik rubik,
rgoods
}, },
props: ["navs"], props: ["navs"],
data() { data() {
...@@ -81,10 +87,14 @@ ...@@ -81,10 +87,14 @@
Mobile:'', //手机号码 Mobile:'', //手机号码
EMail:'', //邮箱地址 EMail:'', //邮箱地址
CompanyName:'' //公司名-中文 CompanyName:'' //公司名-中文
} },
mainColor:"",
active:0
}; };
}, },
created() { created() {
console.log(this.navs)
this.mainColor = this.$uiConfig.mainColor;
let tempArray = []; let tempArray = [];
this.height = this.navs.rows * this.height; this.height = this.navs.rows * this.height;
this.navs.navs.forEach((x, i) => { this.navs.navs.forEach((x, i) => {
...@@ -126,6 +136,13 @@ ...@@ -126,6 +136,13 @@
this.clickItem = item; this.clickItem = item;
}) })
}, },
changeHandler2(i) {
this.active = i;
this.clickItem={};
this.$nextTick(function(){
this.clickItem = this.navs.navs[i];
})
},
//获取数据 //获取数据
getList(){ getList(){
this.request2({ this.request2({
......
components/rubik/index.vue
View file @ 0f22cb84
<template> <template>
<view <view
class="ad-box" class="ad-box"
:style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',margin:marginStyle }" :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }"
> >
<view <view
class="ad-chi" class="ad-chi"
...@@ -27,6 +27,7 @@ export default { ...@@ -27,6 +27,7 @@ export default {
} }
}, },
created() { created() {
console.log(this.ad)
this.ad.list.forEach((x) => { this.ad.list.forEach((x) => {
x.formatStyle = { x.formatStyle = {
width: x.width, width: x.width,
......
components/study/style1.vue
View file @ 0f22cb84
...@@ -9,12 +9,18 @@ ...@@ -9,12 +9,18 @@
<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{ <div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px' borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
}"> }">
<view class="img-box">
<view class="img-show">
<image style=" <image style="
width: calc(100vw - 24px); width: 100%;
height: 100vw; height:100%;
border-radius: 10rpx 10rpx 0 0; border-radius: 10rpx 10rpx 0 0;
" "
mode='aspectFill' :src="item.picUrl" /> mode='aspectFill' :src="item.picUrl" />
</view>
</view>
<div class="good-info"> <div class="good-info">
<div class="good-name" v-if="item.name">{{ item.name }}</div> <div class="good-name" v-if="item.name">{{ item.name }}</div>
<div class="good-price-info" v-if="item.lableName"> <div class="good-price-info" v-if="item.lableName">
...@@ -91,17 +97,33 @@ ...@@ -91,17 +97,33 @@
position: relative; position: relative;
} }
.good_study_one .guding .img-box { /* .good_study_one .guding .img-box {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
top: 0; top: 0;
} */
.good_study_one .img-box {
width: 100%;
height: 0;
padding-top: 49%;
position: relative;
overflow: hidden;
}
.good_study_one .img-box .img-show {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
overflow: hidden;
} }
.good_study_one .good-info { .good_study_one .good-info {
padding: 12rpx; padding: 12px;
margin-top: -5px; background-color: #fff;
} }
.good_study_one .good-info .good-name { .good_study_one .good-info .good-name {
...@@ -110,7 +132,11 @@ ...@@ -110,7 +132,11 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin-bottom: 13px; font-size: 28rpx;
font-weight: bold;
color: #111;
padding-bottom: 5px;
} }
.good_study_one .good-info .good-price-info { .good_study_one .good-info .good-price-info {
...@@ -119,7 +145,7 @@ ...@@ -119,7 +145,7 @@
.good_study_one .good-info .good-price-info .price { .good_study_one .good-info .good-price-info .price {
color: #999999; color: #999999;
font-size: 11px; font-size: 24rpx;
flex: 1; flex: 1;
} }
......
components/study/style2.vue
View file @ 0f22cb84
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
}"> }">
<u-row gutter="24"> <u-row gutter="24">
<u-col span="6" v-for="(item, gli) in goodsInfo.list" :key="gli"> <u-col span="6" v-for="(item, gli) in goodsInfo.list" :key="gli">
<view class="good_study_two" @click="openGood(item)" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}"> <view class="good_study_two" @click="openGood(item)" :style="{borderRadius:goodsInfo.SearchFilletPX==0?'10px':goodsInfo.SearchFilletPX+'px'}">
<view class="img-box"> <view class="img-box">
<view class="img-show" :style="{'border-top-left-radius':goodsInfo.SearchFilletPX+'px'}"> <view class="img-show" :style="{'border-top-left-radius':goodsInfo.SearchFilletPX+'px'}">
<image style=" <image style="
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
.good_study_two .img-box { .good_study_two .img-box {
width: 100%; width: 100%;
height: 0; height: 0;
padding-top: 60%; padding-top: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
...@@ -135,8 +135,9 @@ ...@@ -135,8 +135,9 @@
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin-bottom: 8px; margin-bottom: 8px;
color: #1B1D1E; color: #111111;
font-size: 13px; font-size: 26rpx;
font-weight: bold;
} }
.good_study_two .good-info .good-price-info { .good_study_two .good-info .good-price-info {
...@@ -147,6 +148,7 @@ ...@@ -147,6 +148,7 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
font-size: 22rpx;
} }
.good_study_two .good-info .good-price-info .price { .good_study_two .good-info .good-price-info .price {
......
components/tabbar/index.vue
View file @ 0f22cb84
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
right: 0; right: 0;
z-index: 99999999; z-index: 99999999;
border-top: 1upx solid #ddd; border-top: 1upx solid #ddd;
padding-top:96rpx;
background: #fff; background: #fff;
} }
.tabbarMainIphone { .tabbarMainIphone {
......
node_modules/uview-ui/components/u-tabs/u-tabs.vue
View file @ 0f22cb84
...@@ -69,6 +69,10 @@ ...@@ -69,6 +69,10 @@
type: [String, Number], type: [String, Number],
default: 30 default: 30
}, },
activeFontSize: {
type: [String, Number],
default: 30
},
// 过渡动画时长, 单位ms // 过渡动画时长, 单位ms
duration: { duration: {
type: [String, Number], type: [String, Number],
...@@ -190,7 +194,7 @@ ...@@ -190,7 +194,7 @@
let style = { let style = {
height: this.height + 'rpx', height: this.height + 'rpx',
'line-height': this.height + 'rpx', 'line-height': this.height + 'rpx',
'font-size': this.fontSize + 'rpx', fontSize: this.fontSize + 'rpx',
'transition-duration': `${this.duration}s`, 'transition-duration': `${this.duration}s`,
padding: this.isScroll ? `0 ${this.gutter}rpx` : '', padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
flex: this.isScroll ? 'auto' : '1' flex: this.isScroll ? 'auto' : '1'
...@@ -198,6 +202,8 @@ ...@@ -198,6 +202,8 @@
// 字体加粗 // 字体加粗
if (index == this.currentIndex && this.bold) style.fontWeight = 'bold'; if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
if (index == this.currentIndex) { if (index == this.currentIndex) {
style.fontSize=this.activeFontSize+ 'rpx'
console.log(style.fontSize)
if(this.typeStyle!=2){ if(this.typeStyle!=2){
style.color = this.activeColor; style.color = this.activeColor;
}else if(this.typeStyle==2) { }else if(this.typeStyle==2) {
......
pages.json
View file @ 0f22cb84
...@@ -633,6 +633,22 @@ ...@@ -633,6 +633,22 @@
"path":"activitysignUp"//活动报名 相亲模式 "path":"activitysignUp"//活动报名 相亲模式
},{ },{
"path":"baomingorder"//报名订单 "path":"baomingorder"//报名订单
},{
"path":"brand/list"//品牌列表
},{
"path":"brand/detail",//品牌详情
"enablePullDownRefresh": true,
"style": {
"navigationStyle": "custom"
}
},{
"path":"carrier/detail",//品牌列表
"enablePullDownRefresh": true,
"style": {
"navigationStyle": "custom"
}
},{
"path":"carrier/list"//品牌详情
}] } }] }
], ],
"globalStyle": { "globalStyle": {
......
pages/goods/goods.vue
View file @ 0f22cb84
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url" <video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url"
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true" :autoplay="false" loop muted show-play-btn :enable-progress-gesture="true"
:controls="true" :show-progress="true" :show-mute-btn="true" objectFit="cover"></video> :controls="true" :show-progress="true" :show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" mode=""></image> <image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" mode="aspectFill"></image>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
......
pages/index/index.vue
View file @ 0f22cb84
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
</view> </view>
</view> </view>
<view @click='yj' style="width: 200px;height: 50px;">活动</view>
<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs" <u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
:is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs> :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs"> <template v-for="(item, i) in myPageData.home_pages.navs">
......
pages/kotra/brand/detail.vue 0 → 100644
View file @ 0f22cb84
<template>
</template>
<script>
</script>
<style>
</style>
pages/kotra/brand/list.vue 0 → 100644
View file @ 0f22cb84
This diff is collapsed.
pages/kotra/carrier/detail.vue 0 → 100644
View file @ 0f22cb84
<template>
<view style="height: 100vh; overflow: hidden;width:100vw;">
<scroll-view scroll-y="true" style="width: 100%;height: 100%;" @scroll="scroll">
<view style="height: 700rpx;position: relative;z-index: 1;" :style="{'opacity':(100-boxOption)+'%'}">
<u-swiper
:list="imgsList"
:effect3d="false"
:height="700"
:interval="5000"
:border-radius="0"
@click="previewImage"
name="url"
v-if="active==0"
></u-swiper>
<view style="background-color: #111;height: 700rpx;position: relative;" v-if="active==1">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616398636000_211.png" style="width: 100%;height: 100%;" mode="aspectFill"></image>
<view style="position: absolute;left: 50%;right: 50%;margin-top: -49px;margin-left: -49px;width: 98px;height: 98px;border-radius: 20px;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616471847000_345.png" style="width: 37px;height: 44px;" mode=""></image>
</view>
</view>
<view style="width: 100px;height: 50rpx;position: absolute;background-color: rgba(255,255,255,.6);border-radius: 50rpx;left: 50%;bottom: 80px;margin-left:-50px;">
<u-tabs bg-color="rgba(0,0,0,0)" :is-scroll="false" name="Name" :list="typeList" :active-color="mainColor"
:current="active" @change="changeHandler" :show-bar="true" :bold="false" height="50"
duration="0" font-size="24" :activeFontSize="24" :typeStyle="2"></u-tabs>
</view>
<view style="height: 50rpx;position: absolute;background-color: rgba(0,0,0,.6);border-radius: 50rpx;left: 30rpx;bottom: 80px;color:#FFF;padding:0 18rpx;display: flex;align-items: center;">
<u-icon name="photo-o" size="26" color="#FFF" style="margin-right: 6rpx;"></u-icon>
<text style="font-size: 22rpx;font-family: pingfang;">15</text>
</view>
<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]" style="position: fixed;top: 0;left: 0;padding-left: 6rpx;">
<u-icon name="arrow-left" size="44" color="#FFF" style="margin-top: 22rpx;"></u-icon>
</view>
</view>
<view class="kotra-title" :style="[titleStyle]">
<view @click="goback">
<u-icon name="arrow-left" size="44"></u-icon>
</view>
<view style="flex: 1;margin-left: 30rpx; text-align: left;">银泰in99</view>
</view>
<view style="position: relative;z-index: 2;">
<view style="position: relative;top: -70px;border-top-left-radius: 30px;border-top-right-radius: 30px;height: 900px;background-color: #FFF;padding:60rpx 40rpx;">
111
</view>
</view>
</scroll-view>
</view>
</template>
<script>
export default {
data() {
return {
imgs:[
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_561.png',
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_819.png'
],
imgsList:[
{
url:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_561.png'
},
{
url:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616400499000_819.png'
}
],
typeList: [{
Id: 0,
Name: '视频'
}, {
Id: 1,
Name: '图片'
}],
boxOption:0,
navsOption:0,
titleStyle:{},
active:0,
mainColor:''
}
},
onLoad(options) {
let that=this
uni.getSystemInfo({
success(res) {
that.titleStyle = {
height: "45px",
paddingTop: `${res.statusBarHeight}px`,
opacity:"0%"
};
},
});
this.mainColor = this.$uiConfig.mainColor;
},
methods: {
changeHandler(i) {
this.active = i;
},
previewImage(i) {
console.log(i)
uni.previewImage({
urls: this.imgs,
current: i,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
success: function(data) {},
fail: function(err) {
console.log(err.errMsg);
},
},
});
},
scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop-50)/1.5);
this.titleStyle.opacity=((e.detail.scrollTop-100)<0?0:Math.floor(e.detail.scrollTop-100))+"%"
this.$forceUpdate()
},
goback() {
uni.navigateBack({
delta: 1,
});
},
}
}
</script>
<style>
.kotra-title {
line-height: 45px !important;
font-size: 16px;
text-align: center;
position: fixed;
left: 0;
top: 0;
width: 100%;
color: #111;
box-sizing: content-box;
z-index: 5;
display: flex;
align-items: center;
background-color: #f6f6f6;
padding-left: 6rpx;
}
</style>
pages/kotra/carrier/list.vue 0 → 100644
View file @ 0f22cb84
This diff is collapsed.
pages/user-center/user-center.vue
View file @ 0f22cb84
<template> <template>
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;"> <scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;">
<view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0"> <view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0" :class="{'dark':isCompany}">
<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle, <view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
{ {
zIndex: scrollTop < 10 ? 'unset' : 2, zIndex: scrollTop < 10 ? 'unset' : 2,
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<view class="titlenav" :style="{paddingTop:nav}">{{pageTitle}}</view> <view class="titlenav" :style="{paddingTop:nav}">{{pageTitle}}</view>
<view class='topheard' :style="{'margin-top':modelstype==0?'52px':(modelstype==1?'37px':(modelstype==2)?'33px':0) }" <view class='topheard' :style="{'margin-top':modelstype==0?'52px':(modelstype==1?'37px':(modelstype==2)?'33px':0) }"
v-if="meueData.user_center.top_style == 1"> v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar> <u-avatar :src="user_info.avatar" size="140" shape="circle" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx"> <view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx">
<Text style="color: #FFF;font-size: 36rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;" <Text class="nickname" style="color: #FFF;font-size: 40rpx;font-weight:800;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
@click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" v-if="is_icon_members_grade == 1&& user_info.nickname"> <view class="member" v-if="is_icon_members_grade == 1&& user_info.nickname">
<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image> <image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
</view> </view>
</view> </view>
<view style="display: flex;flex-direction: column;align-items: center;margin-top: 23px;margin-bottom: 5px;" v-if="meueData.user_center.top_style == 2"> <view style="display: flex;flex-direction: column;align-items: center;margin-top: 23px;margin-bottom: 5px;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="120"></u-avatar> <u-avatar :src="user_info.avatar" shape="circle" size="120"></u-avatar>
<Text style="color: #FFF;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;font-size: 40rpx;font-weight:800;" class="nickname" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" v-if="is_icon_members_grade == 1&&user_info.nickname"> <view class="member" v-if="is_icon_members_grade == 1&&user_info.nickname">
<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image> <image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image>
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text> <Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
...@@ -154,8 +154,8 @@ ...@@ -154,8 +154,8 @@
<view :class="mItem.MenuNavStyle == 1 ? 'menus' : 'menus2'" style="width:100%;"> <view :class="mItem.MenuNavStyle == 1 ? 'menus' : 'menus2'" style="width:100%;">
<view :class="mItem.MenuNavStyle == 1 ? 'menus_item' : 'menus_item2'" v-for="(item, index) in mItem.MeunList" <view :class="mItem.MenuNavStyle == 1 ? 'menus_item' : 'menus_item2'" v-for="(item, index) in mItem.MeunList"
:key="index" :name="item.name" @click="goUrl(item.link_url)" v-if="pandu(item)"> :key="index" :name="item.name" @click="goUrl(item.link_url)" v-if="pandu(item)">
<image :src="item.icon_url" :style="{width:mItem.MenuNavStyle == 1 ?'20px':'12px',height: 'auto'}" mode="widthFix"></image> <image :src="item.icon_url" :style="{width:mItem.MenuNavStyle == 1 ?'20px':'16px',height: 'auto'}" mode="widthFix"></image>
<Text :style="{ 'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx', 'margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '10rpx' }"> <Text style="font-size: 26rpx;" :style="{ 'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx', 'margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '24rpx' }">
{{ item.name }} {{ item.name }}
</Text> </Text>
<button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button> <button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button>
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
IsEducation: 0, //1是0否是网课模式 IsEducation: 0, //1是0否是网课模式
PointNum:0, PointNum:0,
setting: {}, setting: {},
isCompany:true //TODO 完成动态加载系统所属类型
}; };
}, },
components: { components: {
...@@ -232,6 +232,7 @@ ...@@ -232,6 +232,7 @@
0; 0;
this.userinfo(); this.userinfo();
this.setting = uni.getStorageSync("basedata").mall.setting; this.setting = uni.getStorageSync("basedata").mall.setting;
this.isCompany=uni.getStorageSync("user_type")?uni.getStorageSync("user_type")=="company":true; 完成动态加载系统所属类型
}, },
onLoad() { onLoad() {
this.navHeight = this.$navHeight - 2; this.navHeight = this.$navHeight - 2;
...@@ -750,6 +751,12 @@ ...@@ -750,6 +751,12 @@
text-align: center; text-align: center;
} }
.dark .userStyle .headStatus .title{
color:#111 !important;
}
.dark .nickname{
color:#111 !important;
}
.userStyle .topheard { .userStyle .topheard {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
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