Commit 2e7579bb authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

parents 5ea87c78 4f50305d
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</view> </view>
<view class="brand-xinx"> <view class="brand-xinx">
<view class="brand-xinx-item"> <view class="brand-xinx-item">
<view class="brand-xinx-item-t" :style="{color:mainColor}">{{details.ShopNum}}</view> <view class="brand-xinx-item-t" :style="{color:mainColor}">{{details.ShopNum>0?details.ShopNum:'/'}}</view>
<view class="brand-xinx-item-m">店铺数量</view> <view class="brand-xinx-item-m">店铺数量</view>
</view> </view>
<view class="brand-xinx-item" style="padding-left: 10px;"> <view class="brand-xinx-item" style="padding-left: 10px;">
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<template> <template>
<view class="koraNews"> <view class="koraNews">
<view class="koraNewsSearch"> <view class="koraNewsSearch">
<u-search action-text="搜索" :focus="true" :clearabled="true" style="width:95%" :show-action="false" radius="40" v-model="msg.Title" <u-search action-text="搜索" :clearabled="true" style="width:95%" :show-action="false" radius="40" v-model="msg.Title"
@search="getList(1)" @custom="getList(1)"></u-search> @search="getList(1)" @custom="getList(1)"></u-search>
</view> </view>
<view style="display: flex;align-items: center;margin-bottom: 30rpx;padding: 0px 15px;"> <view style="display: flex;align-items: center;margin-bottom: 30rpx;padding: 0px 15px;">
......
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