sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws

master
sws 2024-10-21 19:11:25 +08:00
parent 4fec8cce82 967034fa95
commit 3df797aa3a
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/css/plugins.css
View File

@ -211,7 +211,8 @@
}
.plugins-realstore-data-list .item .icon-list .icon-item {
width: 46rpx;
height: 46rpx;
height: 46rpx;
line-height: 46rpx;
}
.plugins-realstore-data-list .item .icon-item .badge-icon {
top: -10px;

4
components/online-service/online-service.vue
View File

@ -17,7 +17,7 @@
</button>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<button class="chat-btn" open-type="contact" class="alipay-contact">
<button class="chat-btn alipay-contact" open-type="contact">
<contact-button class="alipay-chat-btn" :tnt-inst-id="mini_alipay_tnt_inst_id" :scene="mini_alipay_scene" :alipay-card-no="mini_alipay_openid || ''" :icon="chat_icon" size="40rpx*40rpx" />
<text class="text dis-block text-size-xs cr-grey">{{$t('online-service.online-service.4l6k22')}}</text>
</button>
@ -84,7 +84,7 @@
</button>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<button class="chat-btn" open-type="contact" :class="'alipay-contact '+common_ent">
<button class="chat-btn alipay-contact" :class="common_ent" open-type="contact">
<contact-button class="alipay-chat-btn" :tnt-inst-id="mini_alipay_tnt_inst_id" :scene="mini_alipay_scene" :alipay-card-no="mini_alipay_openid || ''" :icon="chat_image" size="40rpx*40rpx" />
</button>
<!-- #endif -->

4
components/realstore-list/realstore-list.vue
View File

@ -35,11 +35,11 @@
<!-- 右侧操作 -->
<view class="icon-list pa">
<view v-if="(item.service_data || null) != null && (item.service_data.service_tel || null) != null" class="icon-item dis-inline-block tc cp" :data-value="item.service_data.service_tel" @tap.stop="tel_event">
<iconfont name="icon-md-phone" size="40rpx"></iconfont>
<iconfont name="icon-md-phone" size="30rpx"></iconfont>
</view>
<!-- #ifndef MP-KUAISHOU -->
<view v-if="item.lat != 0 && item.lng != 0" class="icon-item dis-inline-block tc cp" :data-index="index" @tap.stop="address_map_event">
<iconfont name="icon-md-dh" size="40rpx"></iconfont>
<iconfont name="icon-md-dh" size="30rpx"></iconfont>
</view>
<!-- #endif -->
</view>

4
pages/plugins/realstore/detail/detail.vue
View File

@ -45,8 +45,8 @@
<view class="base-right flex-1 flex-width">
<view v-if="is_base_mode != 1 && (info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="use-type-icon pa text-size-xs cr-white bg-main" @tap="buy_use_type_event">
<text class="va-m margin-right-xs">{{ info.buy_use_type_list[buy_use_type_index]['name'] }}</text>
<view class="dis-inline-block va-m pr top-sm">
<iconfont name="icon-arrow-bottom" size="28rpx" color="#fff"></iconfont>
<view class="dis-inline-block va-m pr">
<iconfont name="icon-arrow-bottom" size="24rpx" color="#fff"></iconfont>
</view>
</view>
<view :class="'title fw-b text-size single-text ' + (is_base_mode != 1 && (info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0 ? 'title-length-limit' : '')">

2
pages/plugins/realstore/search/search.vue
View File

@ -5,7 +5,7 @@
<view class="bg-white padding-top-main padding-horizontal-main oh flex-row jc-sb align-c cr-grey">
<!-- 位置 -->
<view class="nav-location flex-row align-c single-text margin-right-sm">
<component-choice-location ref="choice_location" propIconLocationColor="#999" propIconArrowColor="#999" propTextMaxWidth="180rpx" @onBack="user_back_choice_location"></component-choice-location>
<component-choice-location ref="choice_location" propBaseColor="#666" propTextMaxWidth="180rpx" @onBack="user_back_choice_location"></component-choice-location>
</view>
<!-- 搜索 -->
<view class="nav-search">

18
static/icon/iconfont.css
View File

File diff suppressed because one or more lines are too long