diff --git a/App.vue b/App.vue
index 082d49a8..04b7e83d 100644
--- a/App.vue
+++ b/App.vue
@@ -7,12 +7,10 @@
data: {
// 基础配置
// 数据接口请求地址
- request_url: 'https://new.shopxo.vip/',
- // request_url: 'https://new.shopxo.vip/',
+ request_url: 'http://shopxo.com/',
// 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/)
- static_url: 'https://new.shopxo.vip/',
- // static_url: 'https://new.shopxo.vip/',
+ static_url: 'http://shopxo.com/',
// 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立)
system_type: 'default',
diff --git a/components/goods-batch-buy/goods-batch-buy.vue b/components/goods-batch-buy/goods-batch-buy.vue
index 4a5076c8..2389d972 100644
--- a/components/goods-batch-buy/goods-batch-buy.vue
+++ b/components/goods-batch-buy/goods-batch-buy.vue
@@ -7,15 +7,20 @@
-
-
+
+
+
+
+
+
+
-
+
-
-
- {{ item.name }}
+
+
+ {{ item.name }}
@@ -23,15 +28,16 @@
-
+
-
+
{{ item.name }}
- {{ currency_symbol }}{{ item.base.price }}
+ {{ propCurrencySymbol }}{{ item.base.price }}
-
+ {{$t('goods-batch-buy.goods-batch-buy.dsfd98')}}
+
-
+
@@ -45,15 +51,16 @@
-
+
-
+
{{ item.name }}
- {{ currency_symbol }}{{ item.base.price }}
+ {{ propCurrencySymbol }}{{ item.base.price }}
-
+ {{$t('goods-batch-buy.goods-batch-buy.dsfd98')}}
+
-
+
@@ -63,7 +70,7 @@
-
+
{{$t('buy.buy.g2vt78')}}
@@ -72,7 +79,7 @@
{{ base_data.quantity }}
{{ goods.inventory_unit }}
- {{$t('goods-batch-buy.goods-batch-buy.geq82x')}}{{ currency_symbol }}{{ base_data.amount_money }}
+ {{$t('goods-batch-buy.goods-batch-buy.geq82x')}}{{ propCurrencySymbol }}{{ base_data.amount_money }}
@@ -84,7 +91,7 @@
-
+
{{$t('goods-batch-buy.goods-batch-buy.ypby1k')}}
@@ -95,14 +102,14 @@
\ No newline at end of file
diff --git a/lang/en.json b/lang/en.json
index 9d0ee07d..3339f052 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1547,7 +1547,8 @@
"9ectyf": "species",
"geq82x": "Amount:",
"ypby1k": "No relevant information available",
- "7tp1tc": "Incorrect operation event type"
+ "7tp1tc": "Incorrect operation event type",
+ "dsfd98": "Out of stock"
}
},
"goods-buy": {
diff --git a/lang/zh.json b/lang/zh.json
index 527bda48..9396b6d9 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -1539,7 +1539,8 @@
"9ectyf": "种",
"geq82x": "金额:",
"ypby1k": "无相关信息",
- "7tp1tc": "操作事件类型有误"
+ "7tp1tc": "操作事件类型有误",
+ "dsfd98": "无库存"
}
},
"goods-buy": {
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index 6271f147..9209bcad 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -522,54 +522,6 @@
font-size: 46rpx;
}
-/**
- * 批发 - 插件
- */
-.plugins-wholesale-container-view {
- display: flex;
- justify-content: space-around;
-}
-.plugins-wholesale-container-view .item {
- margin-bottom: 0 !important;
-}
-.plugins-wholesale-container-view .item .price > .unit {
- border: 0.05rem solid #cdcdcd;
- color: #969696;
- border-radius: 50%;
- padding: 1rpx 6rpx;
- vertical-align: top;
- margin-left: 5rpx;
-}
-.plugins-wholesale-container-view .spec-tips {
- color: #ffefc0;
- border: 1rpx solid #ff9800;
- background: #FF9800;
- padding: 0 16rpx;
- position: absolute;
- top: 0;
- right: 0;
-}
-.plugins-wholesale-container {
- max-height: 50vh;
- overflow-y: scroll;
- overflow-x: hidden;
- margin-top: 20rpx;
-}
-.plugins-wholesale-container .item:nth-child(2n)>view {
- margin-left: 10rpx;
-}
-.plugins-wholesale-container .item:nth-child(2n+1)>view {
- margin-right: 10rpx;
-}
-.plugins-wholesale-container .spec-tips {
- color: #ffbf00;
- border: 1px solid #333;
- background: #333;
- padding: 2rpx 10rpx;
- top: 22rpx;
- left: 20rpx;
-}
-
/**
* 标签 - 插件
*/
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index d67ead81..bbdceea3 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -80,36 +80,34 @@
+
+
+
+
-
-
-
-
-
- {{currency_symbol}}
- {{item.range_val}}
- {{item.arr.unit}}
-
- {{item.range_msg}}
-
+
+
+
+
+
+
+
+
+
+ {{ show_field_price_text }}
+
+ {{ goods.show_price_symbol }}{{ goods_spec_base_price }}
+ {{ goods.show_price_unit }}
+
+
+ {{ goods.show_original_price_symbol }}{{ goods_spec_base_original_price }}{{ goods.show_original_price_unit }}
+
+
+ {{ goods.plugins_points_data.points_value }}
+ {{goods.plugins_points_data.points_unit}}
-
-
-
- {{ show_field_price_text }}
-
- {{ goods.show_price_symbol }}{{ goods_spec_base_price }}
- {{ goods.show_price_unit }}
-
-
- {{ goods.show_original_price_symbol }}{{ goods_spec_base_original_price }}{{ goods.show_original_price_unit }}
-
-
- {{ goods.plugins_points_data.points_value }}
- {{goods.plugins_points_data.points_unit}}
-
@@ -499,36 +497,6 @@
-
-
-
-
-
-
-
-
-
-
- {{ plugins_wholesale_data.spec_tips }}
-
-
-
-
- {{ item.range_msg }}
- {{ item.range_val }}
- {{ item.arr.unit }}
-
-
-
-
-
-
- {{$t('goods-detail.goods-detail.m3op38')}}
-
-
-
-
-
@@ -612,7 +580,7 @@
-
+
@@ -641,6 +609,7 @@
import componentCouponCard from '@/components/coupon-card/coupon-card';
import componentRealstoreCart from '@/components/realstore-cart/realstore-cart';
import componentGoodsList from '@/components/goods-list/goods-list';
+ import componentWholesaleRules from '@/components/wholesale-rules/wholesale-rules';
var common_static_url = app.globalData.get_static_url('common');
var ask_static_url = app.globalData.get_static_url('ask', true) + 'app/';
@@ -751,9 +720,6 @@
plugins_salerecords_tips_ent: '',
// 多商户插件
plugins_shop_data: null,
- // 批发插件
- plugins_wholesale_data: null,
- popup_wholesale_status: false,
// 标签插件
plugins_label_data: null,
// 智能工具插件
@@ -794,7 +760,8 @@
componentAskCommentsGoods,
componentCouponCard,
componentRealstoreCart,
- componentGoodsList
+ componentGoodsList,
+ componentWholesaleRules
},
onLoad(params) {
@@ -1179,7 +1146,7 @@
// 商品批量下单-加入购物车
case 'plugins-batchbuy-button-cart':
if ((this.$refs.goods_batch_buy || null) != null) {
- this.$refs.goods_batch_buy.init(this.goods, this.plugins_batchbuy_data, this.buy_button);
+ this.$refs.goods_batch_buy.init({goods: this.goods, batchbuy_data: this.plugins_batchbuy_data, buy_button: this.buy_button, plugins_wholesale_data: this.plugins_wholesale_data});
}
break;
// 默认
@@ -1188,6 +1155,15 @@
}
},
+ // 数量和规格详情回调成功
+ goods_buy_back_success_event(e) {
+ if((e.back_data.plugins_wholesale_data || null) != null) {
+ this.setData({
+ plugins_wholesale_data: e.back_data.plugins_wholesale_data
+ });
+ }
+ },
+
// 加入购物车成功回调
goods_cart_back_event(e) {
this.goods_spec_back_event(e);
@@ -1449,20 +1425,6 @@
});
},
- // 批发开启弹层
- popup_wholesale_event(e) {
- this.setData({
- popup_wholesale_status: true,
- });
- },
-
- // 批发弹层关闭
- popup_wholesale_close_event(e) {
- this.setData({
- popup_wholesale_status: false,
- });
- },
-
// 商品服务开启弹层
popup_goodsservice_event(e) {
this.setData({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cf6883f8..28643bf1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -488,11 +488,11 @@
// 获取数据
init(params = {}) {
// 还没有数据则读取缓存
+ var cache_key = app.globalData.data.cache_index_data_key;
if(this.load_status == 0)
{
// 本地缓存数据
- var key = app.globalData.data.cache_index_data_key;
- var upd_data = uni.getStorageSync(key) || null;
+ var upd_data = uni.getStorageSync(cache_key) || null;
if(upd_data != null) {
// 先使用缓存数据展示
this.setData(upd_data);
@@ -556,7 +556,7 @@
this.setData(upd_data);
// 存储缓存
- uni.setStorageSync(key, upd_data);
+ uni.setStorageSync(cache_key, upd_data);
// 弹屏广告插件处理
this.plugins_popupscreen_handle();