diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html index 7e33440800a4f023e8784eb63e6aacced0fc000d..7499c2700d59bb60fae61f3c6bececbc6ac72e5c 100644 --- a/application/admin/view/default/appconfig/app.html +++ b/application/admin/view/default/appconfig/app.html @@ -87,6 +87,15 @@ +
+ + +
+
diff --git a/application/admin/view/default/site/exhibition.html b/application/admin/view/default/site/exhibition.html new file mode 100644 index 0000000000000000000000000000000000000000..93c96743b56763eb72483ca6323cf85d59dca9f2 --- /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 69bfb642e089dd1b8360ff1084fbe91869a1d829..acc754df028c5c2538121214dcfb40abb6739426 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 d7569624604b2f886879a0c637efe0a1a46e9b81..08034dd585072cc2a48b45123e18691edb32eeae 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 073f49fc4c975b441a23b5d7fc22b074ee22478b..84f852eaefa90560b165a2b86bcd469bdbfef1c3 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 e8893cbc462123a997f1727f8825d4284d4ef1cb..7478f63aaa7a4ae0b751b9d23efa0434f1b8e6c3 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 ae1e3cf2ad5ea8e2e3f8062ace3a64d17595b0c2..e628357297170ac839a8914b7e16aa730a0a5ef5 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 023d37bc208398ba12c43f8b89c80e196ad6595f..07951fa4cbad02672bfd5a1700bee217f05a6bbc 100644 --- a/public/appmini/old/alipay/pages/user/user.axml +++ b/public/appmini/old/alipay/pages/user/user.axml @@ -1,42 +1,46 @@ - - - {{nickname}} - - - - - - - {{item.count}} - {{item.name}} - - - - + + + {{nickname}} + - - - - 消息 - {{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 e7f6b07276f8cbdbc929a6be07c4c074362b7ed9..be6f58387e031121eb30af50bb85be68da75fb06 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 0aadab483659ca4b9c5e0be9474a959eb98e75d2..73528e436e82cebecec6b17e3e560633d160f606 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 5caf4d933017de0ff1f6c55c6cab57b281246768..ad0b3e874986d7b05002809e831a1d9d5325c285 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 656432b8691d5eef8b0788d369344050bc63fc61..160f2627877dde9e336acd6bb1fe0a907a10f366 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 bdc01136a0b4c97b681bc74c2eb9ac012107f022..b748b4611b9d9cdb2fe93a53bc0e5289daf96900 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 87d242f825fd9a620bf8c412197345db7d679ba3..b6f453afe9427e61e9973c9c4492dc9d29c4b5c2 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 c9d25944073785788c2b7a71d5c02fdb632f26ca..d32fad3107fa3721f919b48d12b17f2f2ea773d4 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 eca492777f41a88da0c80e7f8429ff45e4f02c9c..747d5629ae5ab03ff839c4a6679a5d31aa36c2e5 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 8c51a0c352088c93f2cc63e967ade4d5e75317e0..974b86c56cb83e865629e9a5d66e08ca1d77ac2b 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 5b593a0df8355f04809ded2c3fd20e900f266edc..4b4b1168236fc9c08ce1596c0c8fcc3bb8de82b1 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 461dc77b0f1c595ac18161a31665f8c0fb3ac9e1..f0702b6f4443d8292ff86b40156008f3b75b4347 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 ac209174da8f4f8d3669cf4d3a5ce4866cf0f5fa..b6465db22af2565daa63e433baa10866a5880ef5 100755 --- a/public/appmini/old/baidu/pages/user/user.swan +++ b/public/appmini/old/baidu/pages/user/user.swan @@ -1,40 +1,47 @@ - - - {{nickname}} - - - - - - - {{item.count}} - {{item.name}} - - - - + + + {{nickname}} + - - - - 消息 - {{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 0b4c507b23bd082c20a77dcaada3c35158e3422f..81e32b7785954b739e6afdbe69cac9bf06360c9d 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 a48234485b02dcfed88a9bda55131cebb3080f31..e9abf6d6421f172ed240782c61f641d86c40bcac 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 29e35a10921940ba8115be61b6f4b6005ac0e42b..f7b692c55895ebd92278d39792217198cc04fce0 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 67c6979bb89e808da9b3f2cedfb2630e73126b8a..ce537232698408644115f9101faf7ed8639f710d 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 79a6ced92d665b0ec4548498be9c9f4f07226d62..99dbebc94c300ea0d827e668bb82eaf57cf2110b 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 3024e7d879ed15268fe1ed4a66e086765dadcbe5..d470f3a6dcbdabe2acb1836b9a73ed17f54bd41a 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 450ad9a78ca9fd4806de9fd536c253acb39edeca..0081475d9fbd54d160cdef17b33f3411f86f73e0 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 8ad6ee4fb0f4713a65cda72ef4373d9ff36c6093..4d0f904da3ed70632b81518be4935515ab675fd1 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 f778e8a653e9d6a73ce0b1afba5404bd39e75be4..e186a99c6fe4f569b17a06ef1cfc72b3abb005d4 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 59793d724d40303c9ecd4c1dbbf0ff9d62803572..b955ee8723a66e5e8aeac4ef6377678b6a827342 100755 --- a/public/appmini/old/qq/pages/user/user.qml +++ b/public/appmini/old/qq/pages/user/user.qml @@ -1,40 +1,46 @@ - - - {{nickname}} - - - - - - - {{item.count}} - {{item.name}} - - - - + + + {{nickname}} + - - - - 消息 - {{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 5b593a0df8355f04809ded2c3fd20e900f266edc..4b4b1168236fc9c08ce1596c0c8fcc3bb8de82b1 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 8ce8eb9aadad4f5fd9d54e3ef1a3823dd9b80e93..6e4ff9ca4fd8326256f49621e5703939607cac28 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 8f3502276216f20eb595e2f8f97eed088982788b..3374f5ee34e522b0288f5f60ac99054cd199b969 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 eb96b34e53bb5f6a4bab71c52ba69407b921c387..52807e978cbbfba29124dce1c52d2f07a35bcbd8 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 79a6ced92d665b0ec4548498be9c9f4f07226d62..99dbebc94c300ea0d827e668bb82eaf57cf2110b 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 9336ded856b8d2e01a5653047404b3e6052de571..fe9c15082f64422648d624bfd79d077673935ad6 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 1dd49cc369efe9b0ae25edf5e08a9da17ef7e414..c09f76e37509cb32d198c0292f3b066a6ae8992c 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 8ad6ee4fb0f4713a65cda72ef4373d9ff36c6093..4d0f904da3ed70632b81518be4935515ab675fd1 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 6863b1789946bc84de1cddbfc127599251e2ee35..a389eac319c5a960a934056cf99077b46c37e017 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 2b0d80ed4caaeaa916d14b6da30b8511a086abd7..f214b1ae2eb4dd484c2766dec042c971c2f47584 100755 --- a/public/appmini/old/toutiao/pages/user/user.ttml +++ b/public/appmini/old/toutiao/pages/user/user.ttml @@ -1,40 +1,46 @@ - - - {{nickname}} - - - - - - - {{item.count}} - {{item.name}} - - - - + + + {{nickname}} + - - - - 消息 - {{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 5b593a0df8355f04809ded2c3fd20e900f266edc..4b4b1168236fc9c08ce1596c0c8fcc3bb8de82b1 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 8ae2b85831779e35d871787a386db7389a8df2e1..856e9477114f3d8fe2ae3c7326b16a53899d20da 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 03112e0d8cd73b6ee38ad0c4bcdc85cb66d3e0a9..fb6f9e583c740ddd8d90724c985824ecfc195500 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 635612f98b95726598c0aaf1b7c0b9d2e8d5ce09..fb1dfc3576d488b646b66acfc0a079df6dc3568d 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 79a6ced92d665b0ec4548498be9c9f4f07226d62..99dbebc94c300ea0d827e668bb82eaf57cf2110b 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 49a5bd3efbedd24e2261243ce8096cd174eb7c97..b1fbbcaef9bc87116994d118809e18543f6c45bc 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 1870ec10a294e0e530a6281842c18000c8afb365..616b0c19b9613a78e11c38163d52427f5dab223c 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 07c6570790ae5b31a6d07c6f47b04c4ac48273a8..d68c160af632237cf02d0e098f4da08534282566 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 c8147f11f32c409d767bdd0a91e5d1cb7582b919..3333542caefc6094546356d6c94fdeef8aece9b8 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 dcb2c837888bdb10c6d2ddc562c7232ff587d4e6..95a363c113712a07ba091ba4a0fcf82f8fa1a77c 100755 --- a/public/appmini/old/weixin/pages/user/user.wxml +++ b/public/appmini/old/weixin/pages/user/user.wxml @@ -1,40 +1,46 @@ - - - {{nickname}} - - - - - - - {{item.count}} - {{item.name}} - - - - + + + {{nickname}} + - - - - 消息 - {{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 5b593a0df8355f04809ded2c3fd20e900f266edc..4b4b1168236fc9c08ce1596c0c8fcc3bb8de82b1 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 0000000000000000000000000000000000000000..511b5ffbd8e26393c0d1d62e9c62b10e787f25fb Binary files /dev/null and b/public/static/upload/images/app_center_nav/2019/11/05/1572932149956815.png differ