master
gongfuxiang 2024-09-06 14:02:53 +08:00
parent 0f9fe3bce5
commit e0bff25f57
5 changed files with 23 additions and 11 deletions

View File

@ -2,14 +2,14 @@
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://d1.shopxo.vip/agreement/index/document/userregister.html?is_content=1\">《服务协议》</a>和<a href=\"https://d1.shopxo.vip/agreement/index/document/userprivacy.html?is_content=1\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"message" : "  请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userregister/is_content/1.html\">《服务协议》</a>和<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userprivacy/is_content/1.html\">《隐私政策》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"hrefLoader" : "system|default",
"backToExit" : "false",
"second" : {
"title" : "确认提示",
"message" : "  进入应用前,你需先同意<a href=\"https://d1.shopxo.vip/agreement/index/document/userregister.html?is_content=1\">《服务协议》</a>和<a href=\"https://d1.shopxo.vip/agreement/index/document/userprivacy.html?is_content=1\">《隐私政策》</a>,否则将退出应用。",
"message" : "  进入应用前,你需先同意<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userregister/is_content/1.html\">《服务协议》</a>和<a href=\"https://d1.shopxo.vip/?s=agreement/index/document/userprivacy/is_content/1.html\">《隐私政策》</a>,否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},

View File

@ -46,7 +46,9 @@
<view v-if="(propLabel.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="((lv.bg_color || null) != null ? 'background-color:' + lv.bg_color + ' !important;' : '') + ((lv.text_color || null) != null ? 'color:' + lv.text_color + ' !important;' : '')">
{{ lv.name }}
</view>
<image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
<block v-else>
<image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
</block>
</view>
</block>
</view>
@ -110,7 +112,9 @@
<view v-if="(propLabel.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="((lv.bg_color || null) != null ? 'background-color:' + lv.bg_color + ' !important;' : '') + ((lv.text_color || null) != null ? 'color:' + lv.text_color + ' !important;' : '')">
{{ lv.name }}
</view>
<image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
<block v-else>
<image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
</block>
</view>
</block>
</view>
@ -156,7 +160,9 @@
<view v-if="(propLabel.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="((lv.bg_color || null) != null ? 'background-color:' + lv.bg_color + ' !important;' : '') + ((lv.text_color || null) != null ? 'color:' + lv.text_color + ' !important;' : '')">
{{ lv.name }}
</view>
<image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
<block v-else>
<image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
</block>
</view>
</block>
</view>

View File

@ -225,7 +225,11 @@
"plugins-coin-collection": "收款",
"plugins-antifakecode-index": "正品查询",
"plugins-giftcard-index": "我的礼品卡",
"plugins-giftcard-form": "礼品卡兑换"
"plugins-giftcard-form": "礼品卡兑换",
"plugins-givegift-goods": "购买礼品",
"plugins-givegift-receive": "礼品领取",
"plugins-givegift-gift": "我的送礼",
"plugins-givegift-code": "礼品链接"
},
"login": {
"login": {

View File

@ -157,8 +157,10 @@
<view v-if="(lv.goods_ids || null) != null && lv.goods_ids.indexOf(item.id) != -1" class="lv dis-inline-block va-m" :data-value="(plugins_label_data.base.is_user_goods_label_url || 0) == 1 ? lv.url || '' : ''" @tap="url_event">
<view v-if="(plugins_label_data.base.is_user_goods_label_icon || 0) == 0" class="round cr-white bg-main text-size-xs fl" :style="((lv.bg_color || null) != null ? 'background-color:' + lv.bg_color + ' !important;' : '') + ((lv.text_color || null) != null ? 'color:' + lv.text_color + ' !important;' : '')">
{{ lv.name }}
</view>
<image v-else class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
</view>
<block v-else>
<image v-if="(lv.icon || null) != null" class="dis-block" :src="lv.icon" mode="scaleToFill"></image>
</block>
</view>
</block>
</view>

View File

@ -65,7 +65,7 @@
</view>
<!-- 轮播 -->
<view class="banner-content padding-horizontal-main" v-if="banner_list.length > 0">
<view class="banner-content padding-horizontal-main margin-top-xs" v-if="banner_list.length > 0">
<component-banner :propData="banner_list" @changeBanner="change_banner"></component-banner>
</view>
<!-- 导航 -->
@ -350,10 +350,10 @@
top_content_search_bg_color: '',
top_content_search_content_style: '',
// #ifdef MP
top_content_style: 'padding-top:' + (bar_height + 6) + 'px;',
top_content_style: 'padding-top:' + (bar_height + 10) + 'px;',
// #endif
// #ifdef H5 || MP-TOUTIAO
top_content_style: 'padding-top:' + (bar_height + 10) + 'px;',
top_content_style: 'padding-top:' + (bar_height + 14) + 'px;',
// #endif
// #ifdef APP
top_content_style: 'padding-top:' + (bar_height) + 'px;',