diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
index 8783a5b7..ffc976a7 100644
--- a/components/goods-buy/goods-buy.vue
+++ b/components/goods-buy/goods-buy.vue
@@ -58,7 +58,7 @@
-
+
@@ -156,7 +156,7 @@
var opt_button = [];
var buy_button = params.buy_button || null;
if (buy_button != null && (buy_button.data || null) != null && buy_button.data.length > 0) {
- var arr = ['buy', 'cart'];
+ var arr = ['buy', 'cart', 'show'];
for (var i in buy_button.data) {
if (arr.indexOf(buy_button.data[i]['type']) != -1) {
opt_button.push(buy_button.data[i]);
@@ -748,6 +748,13 @@
var type = e == null ? this.buy_event_type : e.currentTarget.dataset.type || this.buy_event_type;
var value = e == null ? null : e.currentTarget.dataset.value || null;
switch (type) {
+ // 展示型、商品页面规格选择展示型 拨打电话操作
+ case 'show':
+ case 'spec-show':
+ app.globalData.call_tel(value || app.globalData.get_config('config.common_app_customer_service_tel'));
+ break;
+
+ // 购买
case 'buy':
// 进入订单确认页面
var data = {
diff --git a/lang/cht.json b/lang/cht.json
index 3e0ab10f..ddb4733c 100644
--- a/lang/cht.json
+++ b/lang/cht.json
@@ -41,7 +41,8 @@
"no_relevant_data_tips": "沒有相關資料",
"internet_error_tips": "網絡開小差了哦~",
"sub_error_retry_tips": "提交失敗,請重試!",
- "not_more_list_data_tips": "無更多清單數據"
+ "not_more_list_data_tips": "無更多清單數據",
+ "scan_name": "掃一掃"
},
"pages": {
"index": "ShopXO",
diff --git a/lang/en.json b/lang/en.json
index 24896e96..5da62ecf 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -41,7 +41,8 @@
"not_more_list_data_tips": "No more list data available",
"login_in_text": "Logging in",
"sending_in_text": "Sending",
- "sending": "Sending"
+ "sending": "Sending",
+ "scan_name": "Scan it"
},
"pages": {
"index": "ShopXO",
diff --git a/lang/spa.json b/lang/spa.json
index 34fe4763..76e51cc0 100644
--- a/lang/spa.json
+++ b/lang/spa.json
@@ -41,7 +41,8 @@
"no_relevant_data_tips": "No hay datos relevantes",
"internet_error_tips": "La red está un poco mal.",
"sub_error_retry_tips": "¡La presentación falló, ¡ por favor, vuelva a intentarlo!",
- "not_more_list_data_tips": "No hay más datos de lista"
+ "not_more_list_data_tips": "No hay más datos de lista",
+ "scan_name": "Barrer"
},
"pages": {
"index": "Shopxo",
diff --git a/lang/zh.json b/lang/zh.json
index 390f8d11..e24821f5 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -41,7 +41,8 @@
"no_relevant_data_tips": "没有相关数据",
"internet_error_tips": "网络开小差了哦~",
"sub_error_retry_tips": "提交失败,请重试!",
- "not_more_list_data_tips": "无更多列表数据"
+ "not_more_list_data_tips": "无更多列表数据",
+ "scan_name": "扫一扫"
},
"pages": {
"index": "ShopXO",
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index 183b49dd..f324f6e6 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -535,10 +535,10 @@
overflow-x: hidden;
margin-top: 20rpx;
}
-.plugins-wholesale-container .item>view:nth-child(2n) {
+.plugins-wholesale-container .item:nth-child(2n)>view {
margin-left: 10rpx;
}
-.plugins-wholesale-container .item>view:nth-child(2n+1) {
+.plugins-wholesale-container .item:nth-child(2n+1)>view {
margin-right: 10rpx;
}
.plugins-wholesale-container .spec-tips {
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index e50fe5eb..7cd3e75f 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -242,9 +242,12 @@
-
+
{{$t('goods-detail.goods-detail.u401fi')}}
- {{ goods_spec_selected_text }}
+
+ {{ goods_spec_selected_text }}
+
+
@@ -270,7 +273,7 @@
-
+
@@ -1109,7 +1112,8 @@
case 'show':
app.globalData.call_tel(value || this.common_app_customer_service_tel);
break;
- // 购买、加入购物车
+ // 规格选择(展示模式)、购买、加入购物车
+ case 'spec-show':
case 'buy':
case 'cart':
this.setData({ buy_event_type: type });
diff --git a/pages/plugins/points/scan/scan.vue b/pages/plugins/points/scan/scan.vue
index 6469e9dc..6a471295 100644
--- a/pages/plugins/points/scan/scan.vue
+++ b/pages/plugins/points/scan/scan.vue
@@ -13,7 +13,7 @@
- 扫一扫
+ {{$t('common.scan_name')}}