Commit bfca366b authored by zhengke's avatar zhengke

no message

parent ccc02112
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<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>
<activity v-if="clickItem.ComponentName == 'activity'"></activity> <activity v-if="clickItem.ComponentName == 'activity'"></activity>
</template> </template>
<template v-else> <template v-else>
<template v-if="clickItem&&clickItem.TemplateData" v-for="subItem in clickItem.TemplateData"> <template v-if="clickItem&&clickItem.TemplateData" v-for="subItem in clickItem.TemplateData">
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
<rgoods v-if="subItem.Id == 'educationCustom'" :goods="subItem.data"></rgoods> <rgoods v-if="subItem.Id == 'educationCustom'" :goods="subItem.data"></rgoods>
<matchmaking v-if="subItem.Id == 'miaiuser'" :navs="subItem.data"></matchmaking> <matchmaking v-if="subItem.Id == 'miaiuser'" :navs="subItem.data"></matchmaking>
<pagetitle v-if="subItem.Id == 'link'" :ts="subItem.data" ></pagetitle> <pagetitle v-if="subItem.Id == 'link'" :ts="subItem.data" ></pagetitle>
<goods v-if="subItem.Id == 'goods'" :goods="subItem.data" ></goods>
</template> </template>
</template> </template>
</template> </template>
...@@ -70,6 +72,7 @@ ...@@ -70,6 +72,7 @@
import rgoods from "@/components/study/index.vue"; import rgoods from "@/components/study/index.vue";
import matchmaking from "@/components/matchmaking/index"; import matchmaking from "@/components/matchmaking/index";
import pagetitle from "@/components/pagetitle/index"; import pagetitle from "@/components/pagetitle/index";
import goods from "@/components/goods/index";
export default { export default {
components: { components: {
cats, cats,
...@@ -77,7 +80,8 @@ ...@@ -77,7 +80,8 @@
rubik, rubik,
rgoods, rgoods,
matchmaking, matchmaking,
pagetitle pagetitle,
goods
}, },
props: ["navs"], props: ["navs"],
data() { data() {
......
...@@ -46,6 +46,14 @@ ...@@ -46,6 +46,14 @@
} }
}, },
inject: ['UIndexList'], inject: ['UIndexList'],
wacth:{
index: {
handler: function (val, oldval) {
console.log(val,'----')
},
deep: true,
},
},
mounted() { mounted() {
this.UIndexList.children.push(this); this.UIndexList.children.push(this);
this.UIndexList.updateData(); this.UIndexList.updateData();
......
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
.u-index-bar__index { .u-index-bar__index {
font-weight: 500; font-weight: 500;
padding: 8rpx 18rpx; padding: 8rpx 30rpx;
font-size: 22rpx; font-size: 22rpx;
line-height: 1 line-height: 1
} }
......
...@@ -3,21 +3,7 @@ ...@@ -3,21 +3,7 @@
<view class="ctrl-box"> <view class="ctrl-box">
<u-searchB action-text="搜索" :focus="false" :clearabled="true" :show-action="false" <u-searchB action-text="搜索" :focus="false" :clearabled="true" :show-action="false"
radius="40" v-model="Keywords" @chang="changeHandler"></u-searchB> radius="40" v-model="Keywords" @chang="changeHandler"></u-searchB>
<!-- @search="searchHandler" @custom="searchHandler" @change="changeHandler" -->
</view> </view>
<!-- <view class="search-box" :style="{ background: bg }" @click="goSearch">
<u-search
:placeholder="styleStr.placeholder"
v-model="Keywords"
:input-align="styleStr.textPosition"
:value="Keywords"
:bg-color="styleStr.color"
:text-color="styleStr.textColor"
:radius="styleStr.radius"
:show-action="false"
:margin="marginStyle"
></u-search>
</view> -->
<div <div
style="height: calc(100vh - 0px);width: calc(100vw);overflow: hidden;margin-top: 105rpx;"> style="height: calc(100vh - 0px);width: calc(100vw);overflow: hidden;margin-top: 105rpx;">
<view class="right-box"> <view class="right-box">
...@@ -26,45 +12,24 @@ ...@@ -26,45 +12,24 @@
<u-empty text="没有找到相关品牌信息" mode="order"></u-empty> <u-empty text="没有找到相关品牌信息" mode="order"></u-empty>
</view> </view>
</view> </view>
<!-- <view class="ClassList-form">
<view class="form-left">
<view v-for="(item,index) in classData" :key="index"
class="name-box" :class="{'active':classObj.Name==item.Name}"
@click="chooseType(item)">
<view></view>
<text>{{item.Name}}</text>
</view>
</view>
<view class="form-right">
<view class="right-box">
<uni-indexed-list :Image="classObj.Image" :options="list" :show-select="true" @click="bindClick" />
</view>
</view>
</view> -->
</div> </div>
<!-- <div style='height: calc(100vh - 50px);'> <!-- <div style='height: calc(100vh - 150px);'>
<u-index-list :scrollTop="scrollTop"> <u-index-list :scrollTop="scrollTop">
<view v-for="(item,index) in indexList" :key="index"> <view v-for="(item,index) in indexList" :key="index">
<u-index-anchor :index="item.ti" /> <u-index-anchor :index="item.ti" :customStyle="customStyle"/>
{{item.children}} <view class="imgList">
<view class="list-cell" v-for="(x,y) in item.children" :key='y' @click="goback(x,2)"> <view v-if="x.IsHot" v-for="(x,y) in item.children" :key='y' @click="goback(x,2)">
{{x.Name}} <image :src="x.Logo" mode="scaleToFill"/>
<template v-if="item.ti=='*'"> </view>
<view class="imgList" v-for="(i,indexs) in x" :key="indexs"> </view>
<view v-for="(b,k) in i.BrandImgList" :key="k"> <view v-for="(x,y) in item.children" :key='y' @click="goback(x,2)"
<image :src="b.Path" mode="scaleToFill"/> class="list-cel imgList-box">
</view> <template v-if="!x.IsHot">
<view class="img">
<image :src="x.Logo" mode="scaleToFill"/>
</view> </view>
</template> <view class="text">
<template v-else> {{x.Name}}
<view v-for="(i,indexs) in x" :key="indexs">
<view v-for="(b,k) in x.BrandImgList" :key="k">
<view class="imgs" style="margin-right: 20rpx;">
<image :src="b.Path" mode="scaleToFill"/>
</view>
<text>b.Name</text>
</view>
</view> </view>
</template> </template>
</view> </view>
...@@ -101,6 +66,9 @@ ...@@ -101,6 +66,9 @@
navHeight: 0, navHeight: 0,
Keywords:'', Keywords:'',
marginStyle:"", marginStyle:"",
customStyle:{
top:'101rpx'
},
styleStr: { styleStr: {
placeholder: "搜索", placeholder: "搜索",
background: "rgb(240,239,244)", background: "rgb(240,239,244)",
...@@ -380,7 +348,7 @@ ...@@ -380,7 +348,7 @@
x.children=[]; x.children=[];
this.AllList.forEach(j=>{ this.AllList.forEach(j=>{
let obj={} let obj={}
if(x.ti==j.PinYin.substr(0,1)){ if(x.ti==j.PinYin){
x.children.push(j) x.children.push(j)
} }
if(x.ti=='*'&&j.IsHot){ if(x.ti=='*'&&j.IsHot){
...@@ -388,7 +356,7 @@ ...@@ -388,7 +356,7 @@
} }
}) })
}) })
console.log(this.indexList,'---') console.log(this.indexList,'6555')
this.AllList.forEach(item=>{ this.AllList.forEach(item=>{
this.list.forEach(i=>{ this.list.forEach(i=>{
if(!item.IsHot){ if(!item.IsHot){
...@@ -487,4 +455,40 @@ ...@@ -487,4 +455,40 @@
background: #F7F7F7; background: #F7F7F7;
z-index: 3; z-index: 3;
} }
.imgList{
width: 100%;
display: flex;
flex-wrap: wrap;
}
.imgList view{
flex-shrink: 0;
width: 33.33%;
text-align: center;
padding: 20rpx 0 0 0;
text-align: center;
}
.imgList view image{
width: 100rpx;
height: 80rpx;
border-radius: 15rpx;
}
.imgList-box{
display: flex;
padding: 0 20rpx;
}
.imgList-box image{
width: 80rpx;
height: 80rpx;
border-radius: 50%;
}
.imgList-box view:last-child{
width: 470rpx;
flex: 1;
font-size: 30rpx;
color: #191919;
font-weight:600;
font-family: -webkit-pictograph;
margin-left: 20rpx;
word-wrap: break-word;
}
</style> </style>
\ No newline at end of file
...@@ -223,8 +223,7 @@ ...@@ -223,8 +223,7 @@
this.showAuth = true; this.showAuth = true;
} else { } else {
this.getDetails() this.getDetails()
this.showOpenSettingDialog = uni.getStorageSync('showOpenSettingDialog') || false; this.showOpenSettingDialog = uni.getStorageSync('showOpenSettingDialog') || false;
} }
}, },
...@@ -520,11 +519,10 @@ ...@@ -520,11 +519,10 @@
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 28rpx;
} }
.title-text{ .title-text{
color: black; color: black;
font-size: 30rpx; font-size: 28rpx;
margin-left: 15rpx; margin-left: 15rpx;
} }
.ReplyDate-text{ .ReplyDate-text{
......
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