diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss index 1b8cdee68..4b730869a 100644 --- a/public/appmini/old/alipay/app.acss +++ b/public/appmini/old/alipay/app.acss @@ -71,6 +71,7 @@ textarea { .br-r { border-right: solid 1px #efefef; } /* 虚线边框 */ +.br-dashed { border: dashed 1px #efefef; } .br-b-dashed { border-bottom: dashed 1px #efefef; } .br-t-dashed { border-top: dashed 1px #efefef; } .br-l-dashed { border-left: dashed 1px #efefef; } diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index 066468b84..d0012e09b 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -62,6 +62,7 @@ App({ "user_order_comments": "订单评论", "coupon": "领劵中心", "user_coupon": "优惠劵", + "extraction_address": "自提地址", }, // 请求地址 @@ -645,4 +646,27 @@ App({ } }, + // 登录校验 + is_login_check(res) { + if(res.code == -400) + { + my.clearStorage(); + my.confirm({ + title: '温馨提示', + content: '授权用户信息', + confirmButtonText: '确认', + cancelButtonText: '暂不', + success: (result) => { + if (result.confirm) { + my.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + return false; + } + return true; + }, + }); diff --git a/public/appmini/old/alipay/pages/cart/cart.axml b/public/appmini/old/alipay/pages/cart/cart.axml index 4f3e3fa0a..e8a329582 100755 --- a/public/appmini/old/alipay/pages/cart/cart.axml +++ b/public/appmini/old/alipay/pages/cart/cart.axml @@ -1,8 +1,8 @@ - - + + - + @@ -43,13 +43,13 @@ - + - + diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js index acc754df0..98c3d5e54 100644 --- a/public/appmini/old/alipay/pages/cart/cart.js +++ b/public/appmini/old/alipay/pages/cart/cart.js @@ -10,8 +10,8 @@ Page({ is_selected_all: false, buy_submit_disabled_status: true, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点模式 + common_site_type: 0, common_is_exhibition_mode_btn_text: null, customer_service_tel: null, }, @@ -93,8 +93,8 @@ Page({ data_bottom_line_status: true, data_list_loding_msg: '购物车空空如也', - // 是否展示型 - common_is_exhibition_mode: data.common_is_exhibition_mode || 0, + // 站点模式 + common_site_type: data.common_site_type || 0, common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询', customer_service_tel: data.customer_service_tel || null, }); 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 84f852eae..b8d78e7ac 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml @@ -120,13 +120,13 @@ {{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 7478f63aa..2e6c49db7 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -47,8 +47,8 @@ Page({ // 购物车快捷导航 quick_nav_cart_count: 0, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点类型 + common_site_type: 0, customer_service_tel: null, }, @@ -161,9 +161,9 @@ Page({ } } - // 是否展示型 - var common_is_exhibition_mode = data.common_is_exhibition_mode || 0; - if (common_is_exhibition_mode == 1) { + // 站点模式 - 是否展示型 + var common_site_type = data.common_site_type || 0; + if (common_site_type == 1) { nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询'; } @@ -171,7 +171,7 @@ Page({ this.setData({ nav_submit_text: nav_submit_text, nav_submit_is_disabled: nav_submit_is_disabled, - common_is_exhibition_mode: common_is_exhibition_mode, + common_site_type: common_site_type, customer_service_tel: data.customer_service_tel || null, }); } else { diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js index be6f58387..83169be09 100644 --- a/public/appmini/old/alipay/pages/user/user.js +++ b/public/appmini/old/alipay/pages/user/user.js @@ -118,7 +118,7 @@ Page({ // 清除缓存 clear_storage(e) { - my.clearStorage() + my.clearStorage(); app.showToast('清除缓存成功', 'success'); }, diff --git a/public/appmini/old/baidu/app.css b/public/appmini/old/baidu/app.css index 235ac2f4b..6ba7a57c3 100755 --- a/public/appmini/old/baidu/app.css +++ b/public/appmini/old/baidu/app.css @@ -78,6 +78,7 @@ textarea { .br-r { border-right: solid 1px #efefef; } /* 虚线边框 */ +.br-dashed { border: dashed 1px #efefef; } .br-b-dashed { border-bottom: dashed 1px #efefef; } .br-t-dashed { border-top: dashed 1px #efefef; } .br-l-dashed { border-left: dashed 1px #efefef; } diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js index 13f29fc49..882cb74fd 100755 --- a/public/appmini/old/baidu/app.js +++ b/public/appmini/old/baidu/app.js @@ -57,6 +57,7 @@ App({ "user_order_comments": "订单评论", "coupon": "领劵中心", "user_coupon": "优惠劵", + "extraction_address": "自提地址", }, // 请求地址 @@ -499,4 +500,27 @@ App({ } }, + // 登录校验 + is_login_check(res) { + if(res.code == -400) + { + swan.clearStorage(); + swan.showModal({ + title: '温馨提示', + content: '授权用户信息', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + if (result.confirm) { + swan.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + return false; + } + return true; + }, + }); \ 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 b748b4611..9f15daa47 100755 --- a/public/appmini/old/baidu/pages/cart/cart.js +++ b/public/appmini/old/baidu/pages/cart/cart.js @@ -10,8 +10,8 @@ Page({ is_selected_all: false, buy_submit_disabled_status: true, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点模式 + common_site_type: 0, common_is_exhibition_mode_btn_text: null, customer_service_tel: null, }, @@ -76,8 +76,8 @@ Page({ data_bottom_line_status: true, data_list_loding_msg: '购物车空空如也', - // 是否展示型 - common_is_exhibition_mode: data.common_is_exhibition_mode || 0, + // 站点模式 + common_site_type: data.common_site_type || 0, common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询', customer_service_tel: data.customer_service_tel || null, }); diff --git a/public/appmini/old/baidu/pages/cart/cart.swan b/public/appmini/old/baidu/pages/cart/cart.swan index b6f453afe..cf69b2ad8 100755 --- a/public/appmini/old/baidu/pages/cart/cart.swan +++ b/public/appmini/old/baidu/pages/cart/cart.swan @@ -1,7 +1,7 @@ - + - + @@ -46,13 +46,13 @@ - + - + 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 747d5629a..92da9d404 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js @@ -50,8 +50,8 @@ Page({ // 购物车快捷导航 quick_nav_cart_count: 0, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点类型 + common_site_type: 0, customer_service_tel: null, }, @@ -152,9 +152,9 @@ Page({ } } - // 是否展示型 - var common_is_exhibition_mode = data.common_is_exhibition_mode || 0; - if (common_is_exhibition_mode == 1) { + // 站点模式 - 是否展示型 + var common_site_type = data.common_site_type || 0; + if (common_site_type == 1) { nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询'; } @@ -162,7 +162,7 @@ Page({ this.setData({ nav_submit_text: nav_submit_text, nav_submit_is_disabled: nav_submit_is_disabled, - common_is_exhibition_mode: common_is_exhibition_mode, + common_site_type: common_site_type, customer_service_tel: data.customer_service_tel || 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 974b86c56..13d32e7cf 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan @@ -124,13 +124,13 @@ {{goods_favor_text}} - + - + - + diff --git a/public/appmini/old/qq/app.js b/public/appmini/old/qq/app.js index 7cd487376..352012c24 100755 --- a/public/appmini/old/qq/app.js +++ b/public/appmini/old/qq/app.js @@ -62,6 +62,7 @@ App({ "user_order_comments": "订单评论", "coupon": "领劵中心", "user_coupon": "优惠劵", + "extraction_address": "自提地址", }, // 请求地址 @@ -527,4 +528,27 @@ App({ } }, + // 登录校验 + is_login_check(res) { + if(res.code == -400) + { + qq.clearStorage(); + qq.showModal({ + title: '温馨提示', + content: '授权用户信息', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + if (result.confirm) { + qq.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + return false; + } + return true; + }, + }); \ No newline at end of file diff --git a/public/appmini/old/qq/app.qss b/public/appmini/old/qq/app.qss index 3fe0892f0..429d51cbf 100755 --- a/public/appmini/old/qq/app.qss +++ b/public/appmini/old/qq/app.qss @@ -78,6 +78,7 @@ textarea { .br-r { border-right: solid 1px #efefef; } /* 虚线边框 */ +.br-dashed { border: dashed 1px #efefef; } .br-b-dashed { border-bottom: dashed 1px #efefef; } .br-t-dashed { border-top: dashed 1px #efefef; } .br-l-dashed { border-left: dashed 1px #efefef; } diff --git a/public/appmini/old/qq/pages/cart/cart.js b/public/appmini/old/qq/pages/cart/cart.js index f7b692c55..68b4919e3 100755 --- a/public/appmini/old/qq/pages/cart/cart.js +++ b/public/appmini/old/qq/pages/cart/cart.js @@ -10,8 +10,8 @@ Page({ is_selected_all: false, buy_submit_disabled_status: true, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点模式 + common_site_type: 0, common_is_exhibition_mode_btn_text: null, customer_service_tel: null, }, @@ -76,8 +76,8 @@ Page({ data_bottom_line_status: true, data_list_loding_msg: '购物车空空如也', - // 是否展示型 - common_is_exhibition_mode: data.common_is_exhibition_mode || 0, + // 站点模式 + common_site_type: data.common_site_type || 0, common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询', customer_service_tel: data.customer_service_tel || null, }); diff --git a/public/appmini/old/qq/pages/cart/cart.qml b/public/appmini/old/qq/pages/cart/cart.qml index ce5372326..eb3f7c447 100755 --- a/public/appmini/old/qq/pages/cart/cart.qml +++ b/public/appmini/old/qq/pages/cart/cart.qml @@ -1,7 +1,7 @@ - + - + @@ -44,13 +44,13 @@ - + - + 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 d470f3a6d..851288d4b 100755 --- a/public/appmini/old/qq/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.js @@ -53,8 +53,8 @@ Page({ // 购物车快捷导航 quick_nav_cart_count: 0, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点模式 + common_site_type: 0, customer_service_tel: null, }, @@ -160,9 +160,9 @@ Page({ } } - // 是否展示型 - var common_is_exhibition_mode = data.common_is_exhibition_mode || 0; - if (common_is_exhibition_mode == 1) { + // 站点模式 - 是否展示型 + var common_site_type = data.common_site_type || 0; + if (common_site_type == 1) { nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询'; } @@ -170,7 +170,7 @@ Page({ this.setData({ nav_submit_text: nav_submit_text, nav_submit_is_disabled: nav_submit_is_disabled, - common_is_exhibition_mode: common_is_exhibition_mode, + common_site_type: common_site_type, customer_service_tel: data.customer_service_tel || null, }); } else { 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 0081475d9..ee49e6642 100755 --- a/public/appmini/old/qq/pages/goods-detail/goods-detail.qml +++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.qml @@ -131,13 +131,13 @@ {{goods_favor_text}} - + - + - + diff --git a/public/appmini/old/qq/pages/user/user.js b/public/appmini/old/qq/pages/user/user.js index e186a99c6..00980006d 100755 --- a/public/appmini/old/qq/pages/user/user.js +++ b/public/appmini/old/qq/pages/user/user.js @@ -118,7 +118,7 @@ Page({ // 清除缓存 clear_storage(e) { - qq.clearStorage() + qq.clearStorage(); app.showToast("清除缓存成功", "success"); }, diff --git a/public/appmini/old/toutiao/app.js b/public/appmini/old/toutiao/app.js index 969291d0a..75c2c8c81 100755 --- a/public/appmini/old/toutiao/app.js +++ b/public/appmini/old/toutiao/app.js @@ -62,6 +62,7 @@ App({ "user_order_comments": "订单评论", "coupon": "领劵中心", "user_coupon": "优惠劵", + "extraction_address": "自提地址", }, // 请求地址 @@ -588,4 +589,27 @@ App({ } }, + // 登录校验 + is_login_check(res) { + if(res.code == -400) + { + tt.clearStorage(); + tt.showModal({ + title: '温馨提示', + content: '授权用户信息', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + if (result.confirm) { + tt.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + return false; + } + return true; + }, + }); \ No newline at end of file diff --git a/public/appmini/old/toutiao/app.ttss b/public/appmini/old/toutiao/app.ttss index 7c179f576..4b7ea7d5a 100755 --- a/public/appmini/old/toutiao/app.ttss +++ b/public/appmini/old/toutiao/app.ttss @@ -79,6 +79,7 @@ textarea { .br-r { border-right: solid 1px #efefef; } /* 虚线边框 */ +.br-dashed { border: dashed 1px #efefef; } .br-b-dashed { border-bottom: dashed 1px #efefef; } .br-t-dashed { border-top: dashed 1px #efefef; } .br-l-dashed { border-left: dashed 1px #efefef; } diff --git a/public/appmini/old/toutiao/pages/cart/cart.js b/public/appmini/old/toutiao/pages/cart/cart.js index 3374f5ee3..ff1cd53ce 100755 --- a/public/appmini/old/toutiao/pages/cart/cart.js +++ b/public/appmini/old/toutiao/pages/cart/cart.js @@ -10,8 +10,8 @@ Page({ is_selected_all: false, buy_submit_disabled_status: true, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点模式 + common_site_type: 0, common_is_exhibition_mode_btn_text: null, customer_service_tel: null, }, @@ -76,8 +76,8 @@ Page({ data_bottom_line_status: true, data_list_loding_msg: '购物车空空如也', - // 是否展示型 - common_is_exhibition_mode: data.common_is_exhibition_mode || 0, + // 站点模式 + common_site_type: data.common_site_type || 0, common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询', customer_service_tel: data.customer_service_tel || null, }); diff --git a/public/appmini/old/toutiao/pages/cart/cart.ttml b/public/appmini/old/toutiao/pages/cart/cart.ttml index 48294c887..2b1539a8e 100755 --- a/public/appmini/old/toutiao/pages/cart/cart.ttml +++ b/public/appmini/old/toutiao/pages/cart/cart.ttml @@ -1,7 +1,7 @@ - + - + @@ -44,13 +44,13 @@ - + - + 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 fe9c15082..082738f95 100755 --- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js @@ -48,8 +48,8 @@ Page({ // 购物车快捷导航 quick_nav_cart_count: 0, - // 是否展示型 - common_is_exhibition_mode: 0, + // 站点模式 + common_site_type: 0, customer_service_tel: null, }, @@ -155,9 +155,9 @@ Page({ } } - // 是否展示型 - var common_is_exhibition_mode = data.common_is_exhibition_mode || 0; - if (common_is_exhibition_mode == 1) { + // 站点模式 - 是否展示型 + var common_site_type = data.common_site_type || 0; + if (common_site_type == 1) { nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询'; } @@ -165,7 +165,7 @@ Page({ this.setData({ nav_submit_text: nav_submit_text, nav_submit_is_disabled: nav_submit_is_disabled, - common_is_exhibition_mode: common_is_exhibition_mode, + common_site_type: common_site_type, customer_service_tel: data.customer_service_tel || null, }); } else { 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 c09f76e37..b44d77564 100755 --- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml +++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml @@ -131,13 +131,13 @@ {{goods_favor_text}} - + - + - + diff --git a/public/appmini/old/toutiao/pages/user/user.js b/public/appmini/old/toutiao/pages/user/user.js index a389eac31..450cb549a 100755 --- a/public/appmini/old/toutiao/pages/user/user.js +++ b/public/appmini/old/toutiao/pages/user/user.js @@ -117,7 +117,7 @@ Page({ // 清除缓存 clear_storage(e) { - tt.clearStorage() + tt.clearStorage(); app.showToast("清除缓存成功", "success"); }, diff --git a/public/appmini/old/weixin/pages/cart/cart.js b/public/appmini/old/weixin/pages/cart/cart.js index 653865c4c..fe11f7814 100755 --- a/public/appmini/old/weixin/pages/cart/cart.js +++ b/public/appmini/old/weixin/pages/cart/cart.js @@ -10,7 +10,7 @@ Page({ is_selected_all: false, buy_submit_disabled_status: true, - // 是否展示型 + // 站点模式 common_site_type: 0, common_is_exhibition_mode_btn_text: null, customer_service_tel: null, 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 d1d15c03a..98fa7ce28 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -184,7 +184,7 @@ Page({ } } - // 是否展示型 + // 站点模式 - 是否展示型 var common_site_type = data.common_site_type || 0; if (common_site_type == 1) { nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';