Commit 9cd5b870 authored by Zheng Shang Jun's avatar Zheng Shang Jun

修改禅道bug

parent 3c5161bc
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
} }
.color_6F6F72 { .color_6F6F72 {
color: #6f6f72; color: #b2b5b8;
} }
.bd_dashed { .bd_dashed {
......
...@@ -46,11 +46,10 @@ ...@@ -46,11 +46,10 @@
:key="index" :key="index"
> >
<image <image
v-if="item.isMain"
:src="`${imgUrl}${item.fileCode}`" :src="`${imgUrl}${item.fileCode}`"
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
></image> ></image>
<view class="image-tip u-line-1">颜色</view> <view class="image-tip u-line-1">{{ item.describes }}</view>
</view> </view>
</view> </view>
</view> </view>
......
...@@ -12,11 +12,7 @@ ...@@ -12,11 +12,7 @@
<u-card full :head-border-bottom="false"> <u-card full :head-border-bottom="false">
<view slot="body"> <view slot="body">
<view class="hotFlex"> <view class="hotFlex">
<hot-style <hot-style :recordsList="recordsList" @update="update"></hot-style>
v-if="recordsList.length > 0"
:recordsList="recordsList"
@update="update"
></hot-style>
</view> </view>
</view> </view>
</u-card> </u-card>
...@@ -59,7 +55,7 @@ export default { ...@@ -59,7 +55,7 @@ export default {
let { code, data } = res; let { code, data } = res;
if (code === 200) { if (code === 200) {
if (current == 1) { if (current == 1) {
this.recordsList = data.recordspush; this.recordsList = data.records;
} else { } else {
this.recordsList.push(...data.records); this.recordsList.push(...data.records);
} }
......
...@@ -7,11 +7,23 @@ ...@@ -7,11 +7,23 @@
</view> </view>
<view class="u-p-30"> <view class="u-p-30">
<view class="item item--round" @click="edit"> <view class="item item--round" @click="edit">
<view class="u-font-32 u-m-b-8 u-line-1">{{msg.fullName}}</view> <view class="u-font-32 u-m-b-8 u-line-1">{{ msg.fullName }}</view>
<view class="u-font-24">{{msg.userName}}</view> <view class="u-font-24">{{ msg.userName }}</view>
</view> </view>
<view @click="toBrowse" class="u-l-height-44" v-if="type === 2">浏览记录</view> <view
<view @click="toRegister" class="u-l-height-44">切换身份</view> @click="toBrowse"
class="u-l-height-44 commonStyle"
v-if="type === 2"
>
<view>
<u-icon name="clock" class="browseicon"></u-icon>
<text>浏览记录</text>
</view>
<u-icon name="arrow-right" class="comicon"></u-icon>
</view>
<view @click="toRegister" class="u-l-height-44 commonStyle"
>切换身份 <u-icon name="arrow-right" class="comicon"></u-icon
></view>
</view> </view>
<hs-tab-bar></hs-tab-bar> <hs-tab-bar></hs-tab-bar>
...@@ -19,51 +31,51 @@ ...@@ -19,51 +31,51 @@
</template> </template>
<script> <script>
import HsTabBar from "../../../components/hs-tab-bar/hs-tab-bar"; import HsTabBar from "../../../components/hs-tab-bar/hs-tab-bar";
export default { export default {
name: "index", name: "index",
components: {HsTabBar}, components: { HsTabBar },
data(){ data() {
return{ return {
msg: uni.getStorageSync("userInfo"), msg: uni.getStorageSync("userInfo"),
type: uni.getStorageSync("assignType") type: uni.getStorageSync("assignType"),
} };
}, },
created() { created() {
// let msg = uni.getStorageSync("userInfo") // let msg = uni.getStorageSync("userInfo")
// console.log(msg) // console.log(msg)
}, },
methods:{ methods: {
edit(){ edit() {
this.$Router.push({ this.$Router.push({
path: '/pages/user/register/completeInformation', path: "/pages/user/register/completeInformation",
query:{ query: {
type: this.type type: this.type,
}
})
}, },
toBrowse(){ });
},
toBrowse() {
this.$Router.push({ this.$Router.push({
path: '/pages/brands/browse' path: "/pages/brands/browse",
}) });
}, },
toRegister(){ toRegister() {
this.$Router.push({ this.$Router.push({
path: '/pages/user/register/stepSelectType', path: "/pages/user/register/stepSelectType",
query:{ query: {
type: this.type type: this.type,
} },
}) });
} },
} },
} };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.item--round{ border-radius: 8rpx;} .item--round {
.item{ border-radius: 8rpx;
}
.item {
padding: 36rpx 30px; padding: 36rpx 30px;
height: 160rpx; height: 160rpx;
background: url(~@/static/images/myCenter/bg.png) no-repeat; background: url(~@/static/images/myCenter/bg.png) no-repeat;
...@@ -109,4 +121,20 @@ export default { ...@@ -109,4 +121,20 @@ export default {
bottom: 0; bottom: 0;
} }
} }
//浏览和切换身份样式
.commonStyle {
width: 100%;
height: 160rpx;
line-height: 160rpx;
border-bottom: 1px solid #e4e5e7;
display: flex;
justify-content: space-between;
align-content: center;
::v-deep .browseicon {
font-size: 40rpx;
color: red;
margin-right: 20rpx;
vertical-align: middle;
}
}
</style> </style>
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