diff --git a/application/admin/view/default/site/exhibition.html b/application/admin/view/default/site/exhibition.html
new file mode 100644
index 000000000..93c96743b
--- /dev/null
+++ b/application/admin/view/default/site/exhibition.html
@@ -0,0 +1,37 @@
+{{include file="public/header" /}}
+
+
+
+
+
+ {{include file="site/nav" /}}
+
+
+
+
+
+
+
+
+
+
+{{include file="public/footer" /}}
+
-
+
@@ -42,20 +42,29 @@
-
-
-
-
- 全选
+
+
+
+
-
- ￥{{total_price}}
- 合计：
+
+
+
+
+
+
+
+ 全选
+
+
+ ￥{{total_price}}
+ 合计：
+
-
-
-
-
+
+
+
+
diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js
index 69bfb642e..acc754df0 100644
--- a/public/appmini/old/alipay/pages/cart/cart.js
+++ b/public/appmini/old/alipay/pages/cart/cart.js
@@ -9,6 +9,11 @@ Page({
total_price: '0.00',
is_selected_all: false,
buy_submit_disabled_status: true,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ common_is_exhibition_mode_btn_text: null,
+ customer_service_tel: null,
},
onShow() {
@@ -73,16 +78,25 @@ Page({
my.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
- if (data.length > 0) {
- for (var i in data) {
- data[i]['right'] = [{ type: 'edit', text: '加入收藏' }, { type: 'delete', text: '删除' }];
+
+ // 购物车操作数据处理
+ if (data.data.length > 0) {
+ for (var i in data.data) {
+ data.data[i]['right'] = [{ type: 'edit', text: '加入收藏' }, { type: 'delete', text: '删除' }];
}
}
+
+ // 数据赋值
this.setData({
- data_list: data,
- data_list_loding_status: data.length == 0 ? 0 : 3,
+ data_list: data.data,
+ data_list_loding_status: data.data.length == 0 ? 0 : 3,
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
+
+ // 是否展示型
+ common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
+ common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
+ customer_service_tel: data.customer_service_tel || null,
});
} else {
this.setData({
@@ -308,9 +322,13 @@ Page({
// 选中计算
selected_calculate() {
var total_price = 0;
+ var data_count = 0;
var selected_count = 0;
var temp_data_list = this.data.data_list;
for (var i in temp_data_list) {
+ if ((temp_data_list[i]['is_error'] || 0) == 0) {
+ data_count++;
+ }
if ((temp_data_list[i]['selected'] || false) == true) {
total_price += temp_data_list[i]['stock'] * temp_data_list[i]['price'];
selected_count++;
@@ -320,7 +338,7 @@ Page({
this.setData({
total_price: total_price.toFixed(2),
buy_submit_disabled_status: (selected_count <= 0),
- is_selected_all: (selected_count >= temp_data_list.length),
+ is_selected_all: (selected_count >= data_count),
});
},
@@ -349,6 +367,11 @@ Page({
my.navigateTo({
url: '/pages/buy/buy?data=' + JSON.stringify(data)
});
- }
+ },
+
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
});
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
index d75696246..08034dd58 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -313,4 +313,11 @@
position: absolute;
top: -5px;
left: calc(50% + 10rpx);
+}
+
+/*
+ * 展示型
+ */
+.goods-buy-nav .exhibition-mode button {
+ width: 100%;
}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
index 073f49fc4..84f852eae 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -120,9 +120,17 @@
{{goods_favor_text}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
index e8893cbc4..7478f63aa 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -46,6 +46,10 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ customer_service_tel: null,
},
onLoad(params) {
@@ -104,10 +108,8 @@ Page({
temp_buy_number: data.goods.buy_min_number || 1,
goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
- nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约',
data_bottom_line_status: true,
data_list_loding_status: 3,
- nav_submit_is_disabled: (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true,
goods_spec_base_price: data.goods.price,
goods_spec_base_original_price: data.goods.original_price,
@@ -146,19 +148,32 @@ Page({
// 不能选择规格处理
this.goods_specifications_choose_handle_dont(0);
+ // 购买按钮处理
+ var nav_submit_text = ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约';
+ var nav_submit_is_disabled = (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true;
if (data.goods.is_shelves != 1) {
- this.setData({
- nav_submit_text: '商品已下架',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '已下架';
+ nav_submit_is_disabled = true;
} else {
if(data.goods.inventory <= 0) {
- this.setData({
- nav_submit_text: '商品卖光了',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '卖光了';
+ nav_submit_is_disabled = true;
}
}
+
+ // 是否展示型
+ var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
+ if (common_is_exhibition_mode == 1) {
+ nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
+ }
+
+ // 数据赋值
+ this.setData({
+ nav_submit_text: nav_submit_text,
+ nav_submit_is_disabled: nav_submit_is_disabled,
+ common_is_exhibition_mode: common_is_exhibition_mode,
+ customer_service_tel: data.customer_service_tel || null,
+ });
} else {
self.setData({
data_bottom_line_status: false,
@@ -766,6 +781,11 @@ Page({
}
},
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
+
// 自定义分享
onShareAppMessage() {
diff --git a/public/appmini/old/alipay/pages/user/user.acss b/public/appmini/old/alipay/pages/user/user.acss
index ae1e3cf2a..e62835729 100644
--- a/public/appmini/old/alipay/pages/user/user.acss
+++ b/public/appmini/old/alipay/pages/user/user.acss
@@ -3,6 +3,9 @@
padding-top: 30rpx;
font-size: 24rpx;
}
+.head-item {
+ padding-bottom: 30rpx;
+}
.head-item .avatar {
width: 160rpx;
height: 160rpx;
@@ -21,7 +24,6 @@
.head-nav {
padding: 5px 0;
background: rgba(0,0,0,0.1);
- margin-top: 30rpx;
}
.head-nav-item {
width: 25%;
diff --git a/public/appmini/old/alipay/pages/user/user.axml b/public/appmini/old/alipay/pages/user/user.axml
index 023d37bc2..07951fa4c 100644
--- a/public/appmini/old/alipay/pages/user/user.axml
+++ b/public/appmini/old/alipay/pages/user/user.axml
@@ -1,42 +1,46 @@
-
-
- {{nickname}}
-
+
+
+ {{nickname}}
+
-
-
-
-
- {{item.count}}
- {{item.name}}
-
-
-
-
-
-
-
-
- 消息
- {{message_total}}
+
+
+
+
+
+ {{item.count}}
+ {{item.name}}
+
-
+
+
+
+
+
+
+
+ 消息
+ {{message_total}}
+
+
-
-
-
-
-
- {{item.name}}
-
-
+
+
+
+
+
+ {{item.name}}
+ {{item.desc}}
+
-
+
+
+
@@ -49,17 +53,6 @@
-
-
-
-
-
- {{item.name}}
- {{item.desc}}
-
-
-
-
清除缓存
diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js
index e7f6b0727..be6f58387 100644
--- a/public/appmini/old/alipay/pages/user/user.js
+++ b/public/appmini/old/alipay/pages/user/user.js
@@ -19,17 +19,11 @@ Page({
{ name: "已完成", status: 4, count: 0, url: "/pages/user-order/user-order?status=4" },
{ name: "退款/售后", status: 101, count: 0, url: "/pages/user-orderaftersale/user-orderaftersale" },
],
- nav_lists: [
- {
- url: "user-order",
- icon: "user-nav-order-icon",
- is_show: 1,
- name: "我的订单",
- }
- ],
// 远程自定义导航
navigation: [],
+
+ common_app_is_head_vice_nav: 0,
},
onShow() {
@@ -109,6 +103,7 @@ Page({
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
+ common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
} else {
app.showToast(res.data.msg);
@@ -133,7 +128,7 @@ Page({
{
app.showToast('客服电话有误');
} else {
- my.makePhoneCall({ number: this.data.customer_service_tel });
+ app.call_tel(this.data.customer_service_tel);
}
},
diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js
index 0aadab483..73528e436 100755
--- a/public/appmini/old/baidu/app.js
+++ b/public/appmini/old/baidu/app.js
@@ -61,12 +61,12 @@ App({
// 请求地址
request_url: "{{request_url}}",
- // request_url: 'http://tp5-dev.com/',
+ request_url: 'http://tp5-dev.com/',
// request_url: 'https://test.shopxo.net/',
// 基础信息
- application_title: "{{application_title}}",
- application_describe: "{{application_describe}}"
+ application_title: "ShopXO",
+ application_describe: "国内领先企业级B2C开源电商系统！"
},
/**
@@ -490,6 +490,13 @@ App({
}
});
return arr;
- }
+ },
+
+ // 拨打电话
+ call_tel(value) {
+ if ((value || null) != null) {
+ swan.makePhoneCall({ phoneNumber: value });
+ }
+ },
});
\ No newline at end of file
diff --git a/public/appmini/old/baidu/app.json b/public/appmini/old/baidu/app.json
index 5caf4d933..ad0b3e874 100755
--- a/public/appmini/old/baidu/app.json
+++ b/public/appmini/old/baidu/app.json
@@ -30,7 +30,7 @@
"pages/user-coupon/user-coupon"
],
"window": {
- "navigationBarTitleText": "{{application_title}}",
+ "navigationBarTitleText": "ShopXO",
"navigationBarBackgroundColor": "#d2364c"
},
"tabBar": {
diff --git a/public/appmini/old/baidu/pages/cart/cart.css b/public/appmini/old/baidu/pages/cart/cart.css
index 656432b86..160f26278 100755
--- a/public/appmini/old/baidu/pages/cart/cart.css
+++ b/public/appmini/old/baidu/pages/cart/cart.css
@@ -1,7 +1,7 @@
/**
* 商品列表
*/
- .page {
+.page {
padding-bottom: 120rpx;
}
.goods-item {
@@ -124,9 +124,6 @@
.nav-submit button {
border-radius: 0;
}
-.page {
- padding-bottom: 120rpx;
-}
.selected .icon {
width: 50rpx;
height: 50rpx !important;
@@ -138,4 +135,14 @@
}
.buy-nav .sales-price {
max-width: calc(100% - 40px);
+}
+
+/*
+ * 展示型
+ */
+.exhibition-mode {
+ padding: 0 10rpx;
+}
+.exhibition-mode-data .items {
+ padding-left: 0;
}
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/cart/cart.js b/public/appmini/old/baidu/pages/cart/cart.js
index bdc01136a..b748b4611 100755
--- a/public/appmini/old/baidu/pages/cart/cart.js
+++ b/public/appmini/old/baidu/pages/cart/cart.js
@@ -8,7 +8,12 @@ Page({
swipe_index: null,
total_price: '0.00',
is_selected_all: false,
- buy_submit_disabled_status: true
+ buy_submit_disabled_status: true,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ common_is_exhibition_mode_btn_text: null,
+ customer_service_tel: null,
},
onShow() {
@@ -63,16 +68,18 @@ Page({
swan.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
- if (data.length > 0) {
- for (var i in data) {
- data[i]['right'] = [{ type: 'edit', text: '加入收藏' }, { type: 'delete', text: '删除' }];
- }
- }
+
+ // 数据赋值
this.setData({
- data_list: data,
- data_list_loding_status: data.length == 0 ? 0 : 3,
+ data_list: data.data,
+ data_list_loding_status: data.data.length == 0 ? 0 : 3,
data_bottom_line_status: true,
- data_list_loding_msg: '购物车空空如也'
+ data_list_loding_msg: '购物车空空如也',
+
+ // 是否展示型
+ common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
+ common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
+ customer_service_tel: data.customer_service_tel || null,
});
} else {
this.setData({
@@ -287,9 +294,13 @@ Page({
// 选中计算
selected_calculate() {
var total_price = 0;
+ var data_count = 0;
var selected_count = 0;
var temp_data_list = this.data.data_list;
for (var i in temp_data_list) {
+ if ((temp_data_list[i]['is_error'] || 0) == 0) {
+ data_count++;
+ }
if ((temp_data_list[i]['selected'] || false) == true) {
total_price += temp_data_list[i]['stock'] * temp_data_list[i]['price'];
selected_count++;
@@ -298,8 +309,8 @@ Page({
this.setData({
total_price: total_price.toFixed(2),
- buy_submit_disabled_status: selected_count <= 0,
- is_selected_all: selected_count >= temp_data_list.length
+ buy_submit_disabled_status: (selected_count <= 0),
+ is_selected_all: (selected_count >= data_count),
});
},
@@ -328,6 +339,11 @@ Page({
swan.navigateTo({
url: '/pages/buy/buy?data=' + JSON.stringify(data)
});
- }
+ },
+
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
});
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/cart/cart.swan b/public/appmini/old/baidu/pages/cart/cart.swan
index 87d242f82..b6f453afe 100755
--- a/public/appmini/old/baidu/pages/cart/cart.swan
+++ b/public/appmini/old/baidu/pages/cart/cart.swan
@@ -1,7 +1,7 @@
-
+
-
+
@@ -45,20 +45,29 @@
-
-
-
-
- 全选
+
+
+
+
-
- ￥{{total_price}}
- 合计：
+
+
+
+
+
+
+
+ 全选
+
+
+ ￥{{total_price}}
+ 合计：
+
-
-
-
-
+
+
+
+
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
index c9d259440..d32fad310 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
@@ -342,4 +342,11 @@
position: absolute;
top: -5px;
left: calc(50% + 23rpx);
+}
+
+/*
+ * 展示型
+ */
+.goods-buy-nav .exhibition-mode button {
+ width: 100%;
}
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
index eca492777..747d5629a 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
@@ -49,6 +49,10 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ customer_service_tel: null,
},
onLoad(params) {
@@ -106,10 +110,8 @@ Page({
temp_buy_number: data.goods.buy_min_number || 1,
goods_favor_text: data.goods.is_favor == 1 ? '已收藏' : '收藏',
goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor + '.png',
- nav_submit_text: (data.common_order_is_booking || 0) == 0 ? '立即购买' : '立即预约',
data_bottom_line_status: true,
data_list_loding_status: 3,
- nav_submit_is_disabled: data.goods.is_shelves == 1 && data.goods.inventory > 0 ? false : true,
goods_spec_base_price: data.goods.price,
goods_spec_base_original_price: data.goods.original_price,
@@ -137,22 +139,35 @@ Page({
// 不能选择规格处理
this.goods_specifications_choose_handle_dont(0);
- // 页面信息设置
- this.set_page_info();
-
+ // 购买按钮处理
+ var nav_submit_text = ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约';
+ var nav_submit_is_disabled = (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true;
if (data.goods.is_shelves != 1) {
- this.setData({
- nav_submit_text: '商品已下架',
- nav_submit_is_disabled: true
- });
+ nav_submit_text = '已下架';
+ nav_submit_is_disabled = true;
} else {
- if (data.goods.inventory <= 0) {
- this.setData({
- nav_submit_text: '商品卖光了',
- nav_submit_is_disabled: true
- });
+ if(data.goods.inventory <= 0) {
+ nav_submit_text = '卖光了';
+ nav_submit_is_disabled = true;
}
}
+
+ // 是否展示型
+ var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
+ if (common_is_exhibition_mode == 1) {
+ nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
+ }
+
+ // 数据赋值
+ this.setData({
+ nav_submit_text: nav_submit_text,
+ nav_submit_is_disabled: nav_submit_is_disabled,
+ common_is_exhibition_mode: common_is_exhibition_mode,
+ customer_service_tel: data.customer_service_tel || null,
+ });
+
+ // 页面信息设置
+ this.set_page_info();
} else {
self.setData({
data_bottom_line_status: false,
@@ -718,6 +733,11 @@ Page({
}
},
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
+
// 自定义分享
onShareAppMessage() {
var user = app.get_user_cache_info(this, 'onShareAppMessage') || null;
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
index 8c51a0c35..974b86c56 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
@@ -124,9 +124,17 @@
{{goods_favor_text}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/appmini/old/baidu/pages/user/user.css b/public/appmini/old/baidu/pages/user/user.css
index 5b593a0df..4b4b11682 100755
--- a/public/appmini/old/baidu/pages/user/user.css
+++ b/public/appmini/old/baidu/pages/user/user.css
@@ -3,6 +3,9 @@
padding-top: 30rpx;
font-size: 24rpx;
}
+.head-item {
+ padding-bottom: 30rpx;
+}
.head-item .avatar {
width: 160rpx;
height: 160rpx;
@@ -21,7 +24,6 @@
.head-nav {
padding: 5px 0;
background: rgba(0,0,0,0.1);
- margin-top: 30rpx;
}
.head-nav-item {
width: 25%;
diff --git a/public/appmini/old/baidu/pages/user/user.js b/public/appmini/old/baidu/pages/user/user.js
index 461dc77b0..f0702b6f4 100755
--- a/public/appmini/old/baidu/pages/user/user.js
+++ b/public/appmini/old/baidu/pages/user/user.js
@@ -29,6 +29,7 @@ Page({
navigation: [],
common_app_is_online_service: 0,
+ common_app_is_head_vice_nav: 0,
},
onShow() {
@@ -108,6 +109,7 @@ Page({
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
common_app_is_online_service: data.common_app_is_online_service || 0,
+ common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
} else {
app.showToast(res.data.msg);
@@ -131,7 +133,7 @@ Page({
if (this.data.customer_service_tel == null) {
app.showToast("客服电话有误");
} else {
- swan.makePhoneCall({ phoneNumber: this.data.customer_service_tel });
+ app.call_tel(this.data.customer_service_tel);
}
},
diff --git a/public/appmini/old/baidu/pages/user/user.swan b/public/appmini/old/baidu/pages/user/user.swan
index ac209174d..b6465db22 100755
--- a/public/appmini/old/baidu/pages/user/user.swan
+++ b/public/appmini/old/baidu/pages/user/user.swan
@@ -1,40 +1,47 @@
-
-
- {{nickname}}
-
+
+
+ {{nickname}}
+
-
-
-
-
- {{item.count}}
- {{item.name}}
-
-
-
-
-
-
-
-
- 消息
- {{message_total}}
+
+
+
+
+
+ {{item.count}}
+ {{item.name}}
+
-
+
+
+
+
+
+
+
+ 消息
+ {{message_total}}
+
+
-
-
+
+
+
+
-
+
{{item.name}}
+ {{item.desc}}
-
-
+
+
+
+
@@ -49,17 +56,6 @@
-
-
-
-
-
- {{item.name}}
- {{item.desc}}
-
-
-
-
清除缓存
diff --git a/public/appmini/old/qq/app.js b/public/appmini/old/qq/app.js
index 0b4c507b2..81e32b778 100755
--- a/public/appmini/old/qq/app.js
+++ b/public/appmini/old/qq/app.js
@@ -66,8 +66,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
- // request_url: 'http://tp5-dev.com/',
- // request_url: 'https://test.shopxo.net/',
+ request_url: 'http://tp5-dev.com/',
+ //request_url: 'https://test.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
@@ -514,6 +514,13 @@ App({
}
}
return json;
- }
+ },
+
+ // 拨打电话
+ call_tel(value) {
+ if ((value || null) != null) {
+ qq.makePhoneCall({ phoneNumber: value });
+ }
+ },
});
\ No newline at end of file
diff --git a/public/appmini/old/qq/app.json b/public/appmini/old/qq/app.json
index a48234485..e9abf6d64 100755
--- a/public/appmini/old/qq/app.json
+++ b/public/appmini/old/qq/app.json
@@ -30,7 +30,7 @@
"pages/user-coupon/user-coupon"
],
"window": {
- "navigationBarTitleText": "{{application_title}}",
+ "navigationBarTitleText": "ShopXO",
"navigationBarBackgroundColor": "#d2364c"
},
"tabBar": {
diff --git a/public/appmini/old/qq/pages/cart/cart.js b/public/appmini/old/qq/pages/cart/cart.js
index 29e35a109..f7b692c55 100755
--- a/public/appmini/old/qq/pages/cart/cart.js
+++ b/public/appmini/old/qq/pages/cart/cart.js
@@ -9,6 +9,11 @@ Page({
total_price: '0.00',
is_selected_all: false,
buy_submit_disabled_status: true,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ common_is_exhibition_mode_btn_text: null,
+ customer_service_tel: null,
},
onShow() {
@@ -63,16 +68,18 @@ Page({
qq.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
- if (data.length > 0) {
- for (var i in data) {
- data[i]['right'] = [{ type: 'edit', text: '加入收藏' }, { type: 'delete', text: '删除' }];
- }
- }
+
+ // 数据赋值
this.setData({
- data_list: data,
- data_list_loding_status: data.length == 0 ? 0 : 3,
+ data_list: data.data,
+ data_list_loding_status: data.data.length == 0 ? 0 : 3,
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
+
+ // 是否展示型
+ common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
+ common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
+ customer_service_tel: data.customer_service_tel || null,
});
} else {
this.setData({
@@ -289,9 +296,13 @@ Page({
// 选中计算
selected_calculate() {
var total_price = 0;
+ var data_count = 0;
var selected_count = 0;
var temp_data_list = this.data.data_list;
for (var i in temp_data_list) {
+ if ((temp_data_list[i]['is_error'] || 0) == 0) {
+ data_count++;
+ }
if ((temp_data_list[i]['selected'] || false) == true) {
total_price += temp_data_list[i]['stock'] * temp_data_list[i]['price'];
selected_count++;
@@ -301,7 +312,7 @@ Page({
this.setData({
total_price: total_price.toFixed(2),
buy_submit_disabled_status: (selected_count <= 0),
- is_selected_all: (selected_count >= temp_data_list.length),
+ is_selected_all: (selected_count >= data_count),
});
},
@@ -330,6 +341,11 @@ Page({
qq.navigateTo({
url: '/pages/buy/buy?data=' + JSON.stringify(data)
});
- }
+ },
+
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
});
diff --git a/public/appmini/old/qq/pages/cart/cart.qml b/public/appmini/old/qq/pages/cart/cart.qml
index 67c6979bb..ce5372326 100755
--- a/public/appmini/old/qq/pages/cart/cart.qml
+++ b/public/appmini/old/qq/pages/cart/cart.qml
@@ -1,7 +1,7 @@
-
+
-
+
@@ -43,20 +43,29 @@
-
-
-
-
- 全选
+
+
+
+
-
- ￥{{total_price}}
- 合计：
+
+
+
+
+
+
+
+ 全选
+
+
+ ￥{{total_price}}
+ 合计：
+
-
-
-
-
+
+
+
+
diff --git a/public/appmini/old/qq/pages/cart/cart.qss b/public/appmini/old/qq/pages/cart/cart.qss
index 79a6ced92..99dbebc94 100755
--- a/public/appmini/old/qq/pages/cart/cart.qss
+++ b/public/appmini/old/qq/pages/cart/cart.qss
@@ -1,7 +1,7 @@
/**
* 商品列表
*/
- .page {
+.page {
padding-bottom: 120rpx;
}
.goods-item {
@@ -125,9 +125,6 @@
.nav-submit button {
border-radius: 0;
}
-.page {
- padding-bottom: 120rpx;
-}
.selected .icon {
width: 50rpx;
height: 50rpx !important;
@@ -139,4 +136,14 @@
}
.buy-nav .sales-price {
max-width: calc(100% - 40px);
+}
+
+/*
+ * 展示型
+ */
+.exhibition-mode {
+ padding: 0 10rpx;
+}
+.exhibition-mode-data .items {
+ padding-left: 0;
}
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.js b/public/appmini/old/qq/pages/goods-detail/goods-detail.js
index 3024e7d87..d470f3a6d 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.js
@@ -52,6 +52,10 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ customer_service_tel: null,
},
onLoad(params) {
@@ -114,10 +118,8 @@ Page({
temp_buy_number: data.goods.buy_min_number || 1,
goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
- nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约',
data_bottom_line_status: true,
data_list_loding_status: 3,
- nav_submit_is_disabled: (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true,
goods_spec_base_price: data.goods.price,
goods_spec_base_original_price: data.goods.original_price,
@@ -145,19 +147,32 @@ Page({
// 不能选择规格处理
this.goods_specifications_choose_handle_dont(0);
+ // 购买按钮处理
+ var nav_submit_text = ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约';
+ var nav_submit_is_disabled = (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true;
if (data.goods.is_shelves != 1) {
- this.setData({
- nav_submit_text: '商品已下架',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '已下架';
+ nav_submit_is_disabled = true;
} else {
if(data.goods.inventory <= 0) {
- this.setData({
- nav_submit_text: '商品卖光了',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '卖光了';
+ nav_submit_is_disabled = true;
}
}
+
+ // 是否展示型
+ var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
+ if (common_is_exhibition_mode == 1) {
+ nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
+ }
+
+ // 数据赋值
+ this.setData({
+ nav_submit_text: nav_submit_text,
+ nav_submit_is_disabled: nav_submit_is_disabled,
+ common_is_exhibition_mode: common_is_exhibition_mode,
+ customer_service_tel: data.customer_service_tel || null,
+ });
} else {
self.setData({
data_bottom_line_status: false,
@@ -802,6 +817,11 @@ Page({
}
},
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
+
// 自定义分享
onShareAppMessage() {
var user = app.get_user_cache_info(this, 'goods_favor_event') || null;
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
index 450ad9a78..0081475d9 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml
@@ -131,9 +131,17 @@
{{goods_favor_text}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.qss b/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
index 8ad6ee4fb..4d0f904da 100755
--- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
+++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qss
@@ -338,4 +338,11 @@
position: absolute;
top: -5px;
left: calc(50% + 23rpx);
+}
+
+/*
+ * 展示型
+ */
+.goods-buy-nav .exhibition-mode button {
+ width: 100%;
}
\ No newline at end of file
diff --git a/public/appmini/old/qq/pages/user/user.js b/public/appmini/old/qq/pages/user/user.js
index f778e8a65..e186a99c6 100755
--- a/public/appmini/old/qq/pages/user/user.js
+++ b/public/appmini/old/qq/pages/user/user.js
@@ -19,18 +19,12 @@ Page({
{ name: "已完成", status: 4, count: 0, url: "/pages/user-order/user-order?status=4" },
{ name: "退款/售后", status: 101, count: 0, url: "/pages/user-orderaftersale/user-orderaftersale" },
],
- nav_lists: [
- {
- url: "user-order",
- icon: "user-nav-order-icon",
- name: "我的订单",
- }
- ],
// 远程自定义导航
navigation: [],
common_app_is_online_service: 0,
+ common_app_is_head_vice_nav: 0,
},
onShow() {
@@ -109,6 +103,7 @@ Page({
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
+ common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
} else {
app.showToast(res.data.msg);
@@ -133,7 +128,7 @@ Page({
{
app.showToast("客服电话有误");
} else {
- qq.makePhoneCall({ phoneNumber: this.data.customer_service_tel });
+ app.call_tel(this.data.customer_service_tel);
}
},
diff --git a/public/appmini/old/qq/pages/user/user.qml b/public/appmini/old/qq/pages/user/user.qml
index 59793d724..b955ee872 100755
--- a/public/appmini/old/qq/pages/user/user.qml
+++ b/public/appmini/old/qq/pages/user/user.qml
@@ -1,40 +1,46 @@
-
-
- {{nickname}}
-
+
+
+ {{nickname}}
+
-
-
-
-
- {{item.count}}
- {{item.name}}
-
-
-
-
-
-
-
-
- 消息
- {{message_total}}
+
+
+
+
+
+ {{item.count}}
+ {{item.name}}
+
-
+
+
+
+
+
+
+
+ 消息
+ {{message_total}}
+
+
-
-
+
+
+
-
+
{{item.name}}
+ {{item.desc}}
-
-
+
+
+
+
@@ -49,17 +55,6 @@
-
-
-
-
-
- {{item.name}}
- {{item.desc}}
-
-
-
-
清除缓存
diff --git a/public/appmini/old/qq/pages/user/user.qss b/public/appmini/old/qq/pages/user/user.qss
index 5b593a0df..4b4b11682 100755
--- a/public/appmini/old/qq/pages/user/user.qss
+++ b/public/appmini/old/qq/pages/user/user.qss
@@ -3,6 +3,9 @@
padding-top: 30rpx;
font-size: 24rpx;
}
+.head-item {
+ padding-bottom: 30rpx;
+}
.head-item .avatar {
width: 160rpx;
height: 160rpx;
@@ -21,7 +24,6 @@
.head-nav {
padding: 5px 0;
background: rgba(0,0,0,0.1);
- margin-top: 30rpx;
}
.head-nav-item {
width: 25%;
diff --git a/public/appmini/old/toutiao/app.js b/public/appmini/old/toutiao/app.js
index 8ce8eb9aa..6e4ff9ca4 100755
--- a/public/appmini/old/toutiao/app.js
+++ b/public/appmini/old/toutiao/app.js
@@ -581,4 +581,11 @@ App({
});
},
+ // 拨打电话
+ call_tel(value) {
+ if ((value || null) != null) {
+ tt.makePhoneCall({ phoneNumber: value });
+ }
+ },
+
});
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/cart/cart.js b/public/appmini/old/toutiao/pages/cart/cart.js
index 8f3502276..3374f5ee3 100755
--- a/public/appmini/old/toutiao/pages/cart/cart.js
+++ b/public/appmini/old/toutiao/pages/cart/cart.js
@@ -9,6 +9,11 @@ Page({
total_price: '0.00',
is_selected_all: false,
buy_submit_disabled_status: true,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ common_is_exhibition_mode_btn_text: null,
+ customer_service_tel: null,
},
onShow() {
@@ -63,16 +68,18 @@ Page({
tt.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
- if (data.length > 0) {
- for (var i in data) {
- data[i]['right'] = [{ type: 'edit', text: '加入收藏' }, { type: 'delete', text: '删除' }];
- }
- }
+
+ // 数据赋值
this.setData({
- data_list: data,
- data_list_loding_status: data.length == 0 ? 0 : 3,
+ data_list: data.data,
+ data_list_loding_status: data.data.length == 0 ? 0 : 3,
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
+
+ // 是否展示型
+ common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
+ common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
+ customer_service_tel: data.customer_service_tel || null,
});
} else {
this.setData({
@@ -289,9 +296,13 @@ Page({
// 选中计算
selected_calculate() {
var total_price = 0;
+ var data_count = 0;
var selected_count = 0;
var temp_data_list = this.data.data_list;
for (var i in temp_data_list) {
+ if ((temp_data_list[i]['is_error'] || 0) == 0) {
+ data_count++;
+ }
if ((temp_data_list[i]['selected'] || false) == true) {
total_price += temp_data_list[i]['stock'] * temp_data_list[i]['price'];
selected_count++;
@@ -301,7 +312,7 @@ Page({
this.setData({
total_price: total_price.toFixed(2),
buy_submit_disabled_status: (selected_count <= 0),
- is_selected_all: (selected_count >= temp_data_list.length),
+ is_selected_all: (selected_count >= data_count),
});
},
@@ -330,6 +341,11 @@ Page({
tt.navigateTo({
url: '/pages/buy/buy?data=' + JSON.stringify(data)
});
- }
+ },
+
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
});
diff --git a/public/appmini/old/toutiao/pages/cart/cart.ttml b/public/appmini/old/toutiao/pages/cart/cart.ttml
index eb96b34e5..52807e978 100755
--- a/public/appmini/old/toutiao/pages/cart/cart.ttml
+++ b/public/appmini/old/toutiao/pages/cart/cart.ttml
@@ -1,7 +1,7 @@
-
+
-
+
@@ -45,8 +45,7 @@
-
-
+
全选
diff --git a/public/appmini/old/toutiao/pages/cart/cart.ttss b/public/appmini/old/toutiao/pages/cart/cart.ttss
index 79a6ced92..99dbebc94 100755
--- a/public/appmini/old/toutiao/pages/cart/cart.ttss
+++ b/public/appmini/old/toutiao/pages/cart/cart.ttss
@@ -1,7 +1,7 @@
/**
* 商品列表
*/
- .page {
+.page {
padding-bottom: 120rpx;
}
.goods-item {
@@ -125,9 +125,6 @@
.nav-submit button {
border-radius: 0;
}
-.page {
- padding-bottom: 120rpx;
-}
.selected .icon {
width: 50rpx;
height: 50rpx !important;
@@ -139,4 +136,14 @@
}
.buy-nav .sales-price {
max-width: calc(100% - 40px);
+}
+
+/*
+ * 展示型
+ */
+.exhibition-mode {
+ padding: 0 10rpx;
+}
+.exhibition-mode-data .items {
+ padding-left: 0;
}
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
index 9336ded85..fe9c15082 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
@@ -47,6 +47,10 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ customer_service_tel: null,
},
onLoad(params) {
@@ -109,10 +113,8 @@ Page({
temp_buy_number: data.goods.buy_min_number || 1,
goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
- nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约',
data_bottom_line_status: true,
data_list_loding_status: 3,
- nav_submit_is_disabled: (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true,
goods_spec_base_price: data.goods.price,
goods_spec_base_original_price: data.goods.original_price,
@@ -140,19 +142,32 @@ Page({
// 不能选择规格处理
this.goods_specifications_choose_handle_dont(0);
+ // 购买按钮处理
+ var nav_submit_text = ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约';
+ var nav_submit_is_disabled = (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true;
if (data.goods.is_shelves != 1) {
- this.setData({
- nav_submit_text: '商品已下架',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '已下架';
+ nav_submit_is_disabled = true;
} else {
if(data.goods.inventory <= 0) {
- this.setData({
- nav_submit_text: '商品卖光了',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '卖光了';
+ nav_submit_is_disabled = true;
}
}
+
+ // 是否展示型
+ var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
+ if (common_is_exhibition_mode == 1) {
+ nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
+ }
+
+ // 数据赋值
+ this.setData({
+ nav_submit_text: nav_submit_text,
+ nav_submit_is_disabled: nav_submit_is_disabled,
+ common_is_exhibition_mode: common_is_exhibition_mode,
+ customer_service_tel: data.customer_service_tel || null,
+ });
} else {
self.setData({
data_bottom_line_status: false,
@@ -797,6 +812,11 @@ Page({
}
},
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
+
// 自定义分享
onShareAppMessage() {
var user = app.get_user_cache_info(this, 'goods_favor_event') || null;
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
index 1dd49cc36..c09f76e37 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
@@ -131,9 +131,17 @@
{{goods_favor_text}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
index 8ad6ee4fb..4d0f904da 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
@@ -338,4 +338,11 @@
position: absolute;
top: -5px;
left: calc(50% + 23rpx);
+}
+
+/*
+ * 展示型
+ */
+.goods-buy-nav .exhibition-mode button {
+ width: 100%;
}
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/user/user.js b/public/appmini/old/toutiao/pages/user/user.js
index 6863b1789..a389eac31 100755
--- a/public/appmini/old/toutiao/pages/user/user.js
+++ b/public/appmini/old/toutiao/pages/user/user.js
@@ -19,16 +19,11 @@ Page({
{ name: "已完成", status: 4, count: 0, url: "/pages/user-order/user-order?status=4" },
{ name: "退款/售后", status: 101, count: 0, url: "/pages/user-orderaftersale/user-orderaftersale" },
],
- nav_lists: [
- {
- url: "user-order",
- icon: "user-nav-order-icon",
- name: "我的订单",
- }
- ],
// 远程自定义导航
navigation: [],
+
+ common_app_is_head_vice_nav: 0,
},
onShow() {
@@ -107,6 +102,7 @@ Page({
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
+ common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
} else {
app.showToast(res.data.msg);
@@ -131,7 +127,7 @@ Page({
{
app.showToast("客服电话有误");
} else {
- tt.makePhoneCall({ phoneNumber: this.data.customer_service_tel });
+ app.call_tel(this.data.customer_service_tel);
}
},
diff --git a/public/appmini/old/toutiao/pages/user/user.ttml b/public/appmini/old/toutiao/pages/user/user.ttml
index 2b0d80ed4..f214b1ae2 100755
--- a/public/appmini/old/toutiao/pages/user/user.ttml
+++ b/public/appmini/old/toutiao/pages/user/user.ttml
@@ -1,40 +1,46 @@
-
-
- {{nickname}}
-
+
+
+ {{nickname}}
+
-
-
-
-
- {{item.count}}
- {{item.name}}
-
-
-
-
-
-
-
-
- 消息
- {{message_total}}
+
+
+
+
+
+ {{item.count}}
+ {{item.name}}
+
-
+
+
+
+
+
+
+
+ 消息
+ {{message_total}}
+
+
-
-
+
+
+
-
+
{{item.name}}
+ {{item.desc}}
-
-
+
+
+
+
@@ -49,17 +55,6 @@
-
-
-
-
-
- {{item.name}}
- {{item.desc}}
-
-
-
-
清除缓存
diff --git a/public/appmini/old/toutiao/pages/user/user.ttss b/public/appmini/old/toutiao/pages/user/user.ttss
index 5b593a0df..4b4b11682 100755
--- a/public/appmini/old/toutiao/pages/user/user.ttss
+++ b/public/appmini/old/toutiao/pages/user/user.ttss
@@ -3,6 +3,9 @@
padding-top: 30rpx;
font-size: 24rpx;
}
+.head-item {
+ padding-bottom: 30rpx;
+}
.head-item .avatar {
width: 160rpx;
height: 160rpx;
@@ -21,7 +24,6 @@
.head-nav {
padding: 5px 0;
background: rgba(0,0,0,0.1);
- margin-top: 30rpx;
}
.head-nav-item {
width: 25%;
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 8ae2b8583..856e94771 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -66,7 +66,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
- // request_url: 'http://tp5-dev.com/',
+ request_url: 'http://tp5-dev.com/',
// request_url: 'https://test.shopxo.net/',
// 基础信息
@@ -514,6 +514,13 @@ App({
}
}
return json;
- }
+ },
+
+ // 拨打电话
+ call_tel(value) {
+ if ((value || null) != null) {
+ wx.makePhoneCall({ phoneNumber: value });
+ }
+ },
});
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/cart/cart.js b/public/appmini/old/weixin/pages/cart/cart.js
index 03112e0d8..fb6f9e583 100755
--- a/public/appmini/old/weixin/pages/cart/cart.js
+++ b/public/appmini/old/weixin/pages/cart/cart.js
@@ -9,6 +9,11 @@ Page({
total_price: '0.00',
is_selected_all: false,
buy_submit_disabled_status: true,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ common_is_exhibition_mode_btn_text: null,
+ customer_service_tel: null,
},
onShow() {
@@ -63,16 +68,18 @@ Page({
wx.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
- if (data.length > 0) {
- for (var i in data) {
- data[i]['right'] = [{ type: 'edit', text: '加入收藏' }, { type: 'delete', text: '删除' }];
- }
- }
+
+ // 数据赋值
this.setData({
- data_list: data,
- data_list_loding_status: data.length == 0 ? 0 : 3,
+ data_list: data.data,
+ data_list_loding_status: data.data.length == 0 ? 0 : 3,
data_bottom_line_status: true,
data_list_loding_msg: '购物车空空如也',
+
+ // 是否展示型
+ common_is_exhibition_mode: data.common_is_exhibition_mode || 0,
+ common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
+ customer_service_tel: data.customer_service_tel || null,
});
} else {
this.setData({
@@ -289,9 +296,13 @@ Page({
// 选中计算
selected_calculate() {
var total_price = 0;
+ var data_count = 0;
var selected_count = 0;
var temp_data_list = this.data.data_list;
for (var i in temp_data_list) {
+ if ((temp_data_list[i]['is_error'] || 0) == 0) {
+ data_count++;
+ }
if ((temp_data_list[i]['selected'] || false) == true) {
total_price += temp_data_list[i]['stock'] * temp_data_list[i]['price'];
selected_count++;
@@ -301,7 +312,7 @@ Page({
this.setData({
total_price: total_price.toFixed(2),
buy_submit_disabled_status: (selected_count <= 0),
- is_selected_all: (selected_count >= temp_data_list.length),
+ is_selected_all: (selected_count >= data_count),
});
},
@@ -330,6 +341,11 @@ Page({
wx.navigateTo({
url: '/pages/buy/buy?data=' + JSON.stringify(data)
});
- }
+ },
+
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
});
diff --git a/public/appmini/old/weixin/pages/cart/cart.wxml b/public/appmini/old/weixin/pages/cart/cart.wxml
index 635612f98..fb1dfc357 100755
--- a/public/appmini/old/weixin/pages/cart/cart.wxml
+++ b/public/appmini/old/weixin/pages/cart/cart.wxml
@@ -1,7 +1,7 @@
-
+
-
+
@@ -43,20 +43,29 @@
-
-
-
-
- 全选
+
+
+
+
-
- ￥{{total_price}}
- 合计：
+
+
+
+
+
+
+
+ 全选
+
+
+ ￥{{total_price}}
+ 合计：
+
-
-
-
-
+
+
+
+
diff --git a/public/appmini/old/weixin/pages/cart/cart.wxss b/public/appmini/old/weixin/pages/cart/cart.wxss
index 79a6ced92..99dbebc94 100755
--- a/public/appmini/old/weixin/pages/cart/cart.wxss
+++ b/public/appmini/old/weixin/pages/cart/cart.wxss
@@ -1,7 +1,7 @@
/**
* 商品列表
*/
- .page {
+.page {
padding-bottom: 120rpx;
}
.goods-item {
@@ -125,9 +125,6 @@
.nav-submit button {
border-radius: 0;
}
-.page {
- padding-bottom: 120rpx;
-}
.selected .icon {
width: 50rpx;
height: 50rpx !important;
@@ -139,4 +136,14 @@
}
.buy-nav .sales-price {
max-width: calc(100% - 40px);
+}
+
+/*
+ * 展示型
+ */
+.exhibition-mode {
+ padding: 0 10rpx;
+}
+.exhibition-mode-data .items {
+ padding-left: 0;
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 49a5bd3ef..b1fbbcaef 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -65,6 +65,10 @@ Page({
// 购物车快捷导航
quick_nav_cart_count: 0,
+
+ // 是否展示型
+ common_is_exhibition_mode: 0,
+ customer_service_tel: null,
},
onLoad(params) {
@@ -127,10 +131,8 @@ Page({
temp_buy_number: data.goods.buy_min_number || 1,
goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
- nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约',
data_bottom_line_status: true,
data_list_loding_status: 3,
- nav_submit_is_disabled: (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true,
goods_spec_base_price: data.goods.price,
goods_spec_base_original_price: data.goods.original_price,
@@ -169,19 +171,32 @@ Page({
// 不能选择规格处理
this.goods_specifications_choose_handle_dont(0);
+ // 购买按钮处理
+ var nav_submit_text = ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约';
+ var nav_submit_is_disabled = (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true;
if (data.goods.is_shelves != 1) {
- this.setData({
- nav_submit_text: '商品已下架',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '已下架';
+ nav_submit_is_disabled = true;
} else {
if(data.goods.inventory <= 0) {
- this.setData({
- nav_submit_text: '商品卖光了',
- nav_submit_is_disabled: true,
- });
+ nav_submit_text = '卖光了';
+ nav_submit_is_disabled = true;
}
}
+
+ // 是否展示型
+ var common_is_exhibition_mode = data.common_is_exhibition_mode || 0;
+ if (common_is_exhibition_mode == 1) {
+ nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
+ }
+
+ // 数据赋值
+ this.setData({
+ nav_submit_text: nav_submit_text,
+ nav_submit_is_disabled: nav_submit_is_disabled,
+ common_is_exhibition_mode: common_is_exhibition_mode,
+ customer_service_tel: data.customer_service_tel || null,
+ });
} else {
self.setData({
data_bottom_line_status: false,
@@ -836,6 +851,11 @@ Page({
}
},
+ // 展示型事件
+ exhibition_submit_event(e) {
+ app.call_tel(this.data.customer_service_tel);
+ },
+
// 自定义分享
onShareAppMessage() {
var user = app.get_user_cache_info(this, 'goods_favor_event') || null;
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index 1870ec10a..616b0c19b 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -129,9 +129,17 @@
{{goods_favor_text}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index 07c657079..d68c160af 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -337,4 +337,11 @@
position: absolute;
top: -5px;
left: calc(50% + 23rpx);
+}
+
+/*
+ * 展示型
+ */
+.goods-buy-nav .exhibition-mode button {
+ width: 100%;
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/user/user.js b/public/appmini/old/weixin/pages/user/user.js
index c8147f11f..3333542ca 100755
--- a/public/appmini/old/weixin/pages/user/user.js
+++ b/public/appmini/old/weixin/pages/user/user.js
@@ -19,18 +19,12 @@ Page({
{ name: "已完成", status: 4, count: 0, url: "/pages/user-order/user-order?status=4" },
{ name: "退款/售后", status: 101, count: 0, url: "/pages/user-orderaftersale/user-orderaftersale" },
],
- nav_lists: [
- {
- url: "user-order",
- icon: "user-nav-order-icon",
- name: "我的订单",
- }
- ],
// 远程自定义导航
navigation: [],
common_app_is_online_service: 0,
+ common_app_is_head_vice_nav: 0,
},
onShow() {
@@ -110,6 +104,7 @@ Page({
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
common_app_is_online_service: data.common_app_is_online_service || 0,
+ common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
});
} else {
app.showToast(res.data.msg);
@@ -134,7 +129,7 @@ Page({
{
app.showToast("客服电话有误");
} else {
- wx.makePhoneCall({ phoneNumber: this.data.customer_service_tel });
+ app.call_tel(this.data.customer_service_tel);
}
},
diff --git a/public/appmini/old/weixin/pages/user/user.wxml b/public/appmini/old/weixin/pages/user/user.wxml
index dcb2c8378..95a363c11 100755
--- a/public/appmini/old/weixin/pages/user/user.wxml
+++ b/public/appmini/old/weixin/pages/user/user.wxml
@@ -1,40 +1,46 @@
-
-
- {{nickname}}
-
+
+
+ {{nickname}}
+
-
-
-
-
- {{item.count}}
- {{item.name}}
-
-
-
-
-
-
-
-
- 消息
- {{message_total}}
+
+
+
+
+
+ {{item.count}}
+ {{item.name}}
+
-
+
+
+
+
+
+
+
+ 消息
+ {{message_total}}
+
+
-
-
+
+
+
-
+
{{item.name}}
+ {{item.desc}}
-
-
+
+
+
+
@@ -49,17 +55,6 @@
-
-
-
-
-
- {{item.name}}
- {{item.desc}}
-
-
-
-
清除缓存
diff --git a/public/appmini/old/weixin/pages/user/user.wxss b/public/appmini/old/weixin/pages/user/user.wxss
index 5b593a0df..4b4b11682 100755
--- a/public/appmini/old/weixin/pages/user/user.wxss
+++ b/public/appmini/old/weixin/pages/user/user.wxss
@@ -3,6 +3,9 @@
padding-top: 30rpx;
font-size: 24rpx;
}
+.head-item {
+ padding-bottom: 30rpx;
+}
.head-item .avatar {
width: 160rpx;
height: 160rpx;
@@ -21,7 +24,6 @@
.head-nav {
padding: 5px 0;
background: rgba(0,0,0,0.1);
- margin-top: 30rpx;
}
.head-nav-item {
width: 25%;
diff --git a/public/static/upload/images/app_center_nav/2019/11/05/1572932149956815.png b/public/static/upload/images/app_center_nav/2019/11/05/1572932149956815.png
new file mode 100644
index 000000000..511b5ffbd
Binary files /dev/null and b/public/static/upload/images/app_center_nav/2019/11/05/1572932149956815.png differ