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

Merge branch 'dev-sws' into dev

master
gongfuxiang 2024-01-16 19:59:51 +08:00
parent c4330d8dba a7ce9bbe7a
commit 04c5bf11f4
6 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
components/cart/cart.vue
View File

@ -4,10 +4,10 @@
<block v-if="is_first == 0">
<block v-if="(plugins_realstore_info || null) != null">
<!-- 顶部导航 -->
<component-nav-back propClass="bg-white" propNameClass="cr-black" :propFixed="false" :propIsShowBack="false" :propIsRightSlot="false">
<template slot="content">
<component-nav-back propClass="bg-white" propColor="#333" :propFixed="false" :propIsShowBack="is_nav_show_back">
<template slot="right" class="flex-1 cart-right-title">
<view class="cart-top-nav tc auto">
<view class="cart-top-nav-content bg-grey-f7 round padding-xss">
<view class="cart-top-nav-content bg-grey-f7 round padding-xss cr-black">
<view :class="'item dis-inline-block round cp ' + (cart_type_value == 'shop' ? 'bg-white cr-main' : '')" data-type="shop" @tap="cart_type_event">{{ $t('cart.cart.v37ow8') }}</view>
<view :class="'item dis-inline-block round cp ' + (cart_type_value == 'realstore' ? 'bg-white cr-main' : '')" data-type="realstore" @tap="cart_type_event">{{ $t('cart.cart.09gl3g') }}</view>
</view>
@ -381,6 +381,8 @@
discount_detail_goods_list_status: false,
// 预下单计算开关
pre_order_status: 1,
// 商城门户切换开关
is_nav_show_back: false,
};
},
@ -490,6 +492,12 @@
app.globalData.page_share_handle();
}
},
cart_nav_back(status){
// 请求数据
this.setData({
is_nav_show_back: status || false,
});
},
// 获取数据
get_data(type = 0) {
@ -1001,6 +1009,14 @@
}
}
if (selected_count <= 0) {
this.setData({
preferential_price: 0,
increase_price: 0,
total_price: 0,
all_total_price: 0,
total_num: 0,
discount_detail_list: [],
});
return false;
}
@ -1433,12 +1449,11 @@
/**
* 顶部导航
*/
.cart-right-title {
padding-right: 40rpx;
}
.cart-top-nav {
width: 260rpx;
height: 80rpx;
/* #ifdef H5 */
padding-top: 20rpx;
/* #endif */
}
.cart-top-nav .item {
width: 50%;

2
components/nav-back/nav-back.vue
View File

@ -3,7 +3,7 @@
<view class="pa-w" :class="(propFixed ? 'pf z-i left-0 top-0 right-0' : '') + ' ' + propClass" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0) + 'px;background-color:rgba(255,255,255,' + opacity + ');' + propStyle">
<!-- 返回 -->
<!-- #ifndef MP-ALIPAY -->
<view v-if="(propName || null) != null || propIsRightSlot" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? '' : 'padding-vertical-main')">
<view v-if="(propName || null) != null || propIsRightSlot || propIsShowBack" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? '' : 'padding-vertical-main')">
<view v-if="(propName || null) != null" :class="'text-size-md tc pa left-0 right-0 padding-top-xs '+propNameClass" :style="propNameOpacity ? (opacity ? 'color:rgba(51,51,51,' + opacity + ')' : '') : ''">{{ propName }}</view>
<iconfont v-if="propIsShowBack" name="icon-arrow-left" size="40rpx" @tap="top_nav_left_back_event" propClass="pr top-xs z-i" :color="propColor"></iconfont>
<slot v-if="propIsRightSlot" name="right"></slot>

8
lang/zh.json
View File

@ -6,10 +6,10 @@
"es": "西班牙语"
},
"common": {
"home":"首页",
"category":"分类",
"cart":"购物车",
"my":"我的",
"home": "首页",
"category": "分类",
"cart": "购物车",
"my": "我的",
"confirm": "确认",
"cancel": "取消",
"not_yet": "暂不",

17
pages.json
View File

@ -79,9 +79,22 @@
{
"path": "pages/cart-page/cart-page",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
"navigationStyle": "custom",
// #endif
// #ifndef MP-ALIPAY
"navigationBarTitleText": "购物车",
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "always",
"titlePenetrate": "YES",
"navigationBarTitleText": "",
// 该页不显示滚动条
"scrollIndicator": "none",
// #endif
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationBarTitleText": "购物车"
// 禁止页面下拉
"disableScroll": true
}
},
{

14
pages/cart-page/cart-page.vue
View File

@ -9,8 +9,8 @@
</template>
<script>
const app = getApp();
import componentQuickNav from "../../components/quick-nav/quick-nav";
import componentCart from "../../components/cart/cart";
import componentQuickNav from '../../components/quick-nav/quick-nav';
import componentCart from '../../components/cart/cart';
export default {
data() {
return {
@ -19,7 +19,7 @@
},
components: {
componentQuickNav,
componentCart
componentCart,
},
onLoad(params) {
@ -32,13 +32,13 @@
app.globalData.page_event_onshow_handle();
// 数据加载
if((this.$refs.cart || null) != null) {
if ((this.$refs.cart || null) != null) {
this.$refs.cart.init();
this.$refs.cart.cart_nav_back(true);
}
},
methods: {}
methods: {},
};
</script>
<style>
</style>
<style></style>

2
pages/plugins/ask/index/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view :class="theme_view">
<component-nav-back :propFixed="false" propClass="bg-white" propColor="#333">
<component-nav-back :propFixed="false" propClass="bg-white cr-black" propColor="#333">
<template slot="right" :class="is_mp_env ? 'top-search-width' : ''">
<view class="margin-left-main" :class="is_mp_env ? '' : 'flex-1 flex-width'">
<component-search @onsearch="search_button_event" propIsOnEvent :propIsRequired="false" propIconColor="#ccc" propPlaceholderClass="cr-grey-c" propBgColor="#f6f6f6"></component-search>