diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/pages/goods-detail/goods-detail.acss index 1764c7686..8241a08bc 100644 --- a/sourcecode/alipay/pages/goods-detail/goods-detail.acss +++ b/sourcecode/alipay/pages/goods-detail/goods-detail.acss @@ -154,13 +154,19 @@ { height: 100rpx; } -.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; } -.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; } +.goods-buy-nav .collect { + border-left: 1px solid #e1e1e1; +} +.goods-buy-nav .fl image { + width: 25px; + height: 25px; + margin: 0 auto; +} .goods-title { font-size: 32rpx; - line-height: 44rpx; + line-height: 48rpx; font-weight: 500; - padding: 8rpx 10rpx; + padding: 5rpx 10rpx; } .goods-base { padding: 15rpx 10rpx; diff --git a/sourcecode/alipay/pages/goods-search/goods-search.acss b/sourcecode/alipay/pages/goods-search/goods-search.acss index 9caa480a3..04e3a4408 100644 --- a/sourcecode/alipay/pages/goods-search/goods-search.acss +++ b/sourcecode/alipay/pages/goods-search/goods-search.acss @@ -70,11 +70,10 @@ border-radius: 6rpx; } .screening-price input { - width: calc(50% - 45rpx); + width: calc(50% - 20px); } .screening-price .separator { - margin-top: 20rpx; - width: 30rpx; + line-height: 50rpx; } .popup-form .item { width: 480rpx; diff --git a/sourcecode/alipay/pages/goods-search/goods-search.axml b/sourcecode/alipay/pages/goods-search/goods-search.axml index 4d3569474..d7ac670e7 100755 --- a/sourcecode/alipay/pages/goods-search/goods-search.axml +++ b/sourcecode/alipay/pages/goods-search/goods-search.axml @@ -41,12 +41,12 @@
- 价格区间(元) + 价格区间(元) + + + ~ + - - ~ - - 关键字 diff --git a/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml b/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml index b756fea39..10d91d5ae 100644 --- a/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml +++ b/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml @@ -12,7 +12,7 @@ 返佣比例 - + 一级 {{item.level_rate_one}}% 二级 {{item.level_rate_two}}% 三级 {{item.level_rate_three}}% @@ -20,7 +20,7 @@ 消费金额 - {{item.rules_msg}} + {{item.rules_msg}} diff --git a/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml b/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml index 7382316f9..8067f79c3 100644 --- a/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml +++ b/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml @@ -3,14 +3,14 @@ 用户头像 - + {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml b/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml index 63074a2b2..c44d5d246 100644 --- a/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml +++ b/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml @@ -3,7 +3,7 @@ {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml b/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml index 63074a2b2..c44d5d246 100644 --- a/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml +++ b/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml @@ -3,7 +3,7 @@ {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml b/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml index 63074a2b2..c44d5d246 100644 --- a/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml +++ b/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml @@ -3,7 +3,7 @@ {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml b/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml index 63074a2b2..c44d5d246 100644 --- a/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml +++ b/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml @@ -3,7 +3,7 @@ {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml b/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml index 63074a2b2..c44d5d246 100644 --- a/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml +++ b/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml @@ -3,7 +3,7 @@ {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml b/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml index 63074a2b2..c44d5d246 100644 --- a/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml +++ b/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml @@ -3,7 +3,7 @@ {{item.name}} - {{item.value}} + {{item.value}} diff --git a/sourcecode/baidu/.wx2swaninfo b/sourcecode/baidu/.wx2swaninfo deleted file mode 100644 index 2d30a9388..000000000 --- a/sourcecode/baidu/.wx2swaninfo +++ /dev/null @@ -1,5 +0,0 @@ -{ - 'toolName': 'wx2swan', - 'toolCliVersion': '1.2.8', - 'createTime': '1563280015494' -} \ No newline at end of file diff --git a/sourcecode/baidu/app.js b/sourcecode/baidu/app.js index cd10f49ab..e7d6e9d59 100755 --- a/sourcecode/baidu/app.js +++ b/sourcecode/baidu/app.js @@ -71,7 +71,7 @@ App({ // 请求地址 request_url: "{{request_url}}", // request_url: 'http://shopxo.com/', - // request_url: 'https://dev.shopxo.net/', + request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", @@ -84,64 +84,36 @@ App({ /** * 小程序初始化 */ - onLaunch(options) { + onLaunch(params) { + // 启动参数处理 + params = this.launch_params_handle(params); + // 设置设备信息 this.set_system_info(); - // 启动query参数处理 - this.startup_query(options); - // 初始化配置 this.init_config(); }, /** - * 启动query参数处理 + * 启动参数处理 */ - startup_query(params) { - // 没有启动参数则返回 - if ((params || null) == null) { - return false; + launch_params_handle(params) { + // 启动参数处理 + if ((params.query || null) != null) { + params = params.query; } - // 启动处理类型 - var type = params.type || null; - switch (type) { - // type=page - case "page": - // 页面 - var page = params.page || null; - - // 参数名 - var params_field = params.params_field || null; - - // 参数值 - var params_value = params.params_value || null; - - // 页面跳转 - if (page != null) { - swan.navigateTo({ - url: "/pages/" + page + "/" + page + "?" + params_field + "=" + params_value - }); - } - break; - - // type=view - case "view": - var url = params.url || null; - - // 页面跳转 - if (url != null) { - swan.navigateTo({ - url: '/pages/web-view/web-view?url=' + url - }); - } - break; - - // 默认 - default: - break; + if ((params.scene || null) != null) { + params = this.url_params_to_json(decodeURIComponent(params.scene)); } + + // 缓存启动参数 + swan.setStorage({ + key: this.data.cache_launch_info_key, + data: params + }); + return params; }, /** @@ -198,12 +170,13 @@ App({ // 用户信息 var user = this.get_user_cache_info(); var token = (user == false) ? '' : user.token || ''; + var uuid = this.request_uuid(); return this.data.request_url + "index.php?s=/api/" + c + "/" + a + plugins_params+ "&application=app&application_client_type=baidu" + - "&token=" + - token + + "&token=" + token + "&ajax=ajax" + + "&uuid="+ uuid + params; }, @@ -554,12 +527,7 @@ App({ return false; } - swan.openLocation({ - name: values[0], - address: values[1], - longitude: parseFloat(values[2]), - latitude: parseFloat(values[3]) - }); + this.open_location(values[2], values[3], values[0], values[1]); break; // 拨打电话 @@ -722,4 +690,163 @@ App({ } }, + /** + * 获取配置信息、可指定默认值 + * key 数据key（支持多级读取、以 . 分割key名称） + * default_value 默认值 + */ + get_config(key, default_value) { + var value = null; + var config = swan.getStorageSync(this.data.cache_config_info_key) || null; + + if (config != null) { + // 数据读取 + var arr = key.split('.'); + + if (arr.length == 1) { + value = config[key] == undefined ? null : config[key]; + } else { + value = config; + + for (var i in arr) { + if (value[arr[i]] != undefined) { + value = value[arr[i]]; + } else { + value = null; + break; + } + } + } + } + + return value === null ? default_value === undefined ? value : default_value : value; + }, + + // 初始化 配置信息 + init_config() { + var self = this; + swan.request({ + url: this.get_request_url('common', 'base'), + method: 'POST', + data: {}, + dataType: 'json', + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + success: res => { + if (res.data.code == 0) { + swan.setStorage({ + key: this.data.cache_config_info_key, + data: res.data.data, + fail: () => { + this.showToast('配置信息缓存失败'); + } + }); + } else { + this.showToast(res.data.msg); + } + }, + fail: () => { + this.showToast('服务器请求出错'); + } + }); + }, + + /** + * 配置是否有效(100毫秒检验一次、最多检验100次) + * object 回调操作对象 + * method 回调操作对象的函数 + */ + is_config(object, method) { + var self = this; + var count = 0; + var timer = setInterval(function () { + if (self.get_config('status') == 1) { + clearInterval(timer); + + if (typeof object === 'object' && (method || null) != null) { + object[method](true); + } + } + + count++; + + if (count >= 100) { + clearInterval(timer); + } + }, 100); + }, + + /** + * 百度坐标BD-09到火星坐标GCJ02(高德，谷歌，腾讯坐标) + * object 回调操作对象 + * method 回调操作对象的函数 + */ + map_bd_to_gcj(lng, lat) { + let x_pi = 3.14159265358979324 * 3000.0 / 180.0; + let x = lng - 0.0065; + let y = lat - 0.006; + let z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi); + let theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi); + let lngs = z * Math.cos(theta); + let lats = z * Math.sin(theta); + return { + lng: lngs, + lat: lats + }; + }, + + /** + * 百度坐标BD-09到火星坐标GCJ02(高德，谷歌，腾讯坐标) + * lng 经度 + * lat 纬度 + * name 地图上面显示的名称 + * address 地图上面显示的详细地址 + * scale 缩放比例，范围5~18 + */ + open_location(lng, lat, name, address, scale) { + if (lng == undefined || lat == undefined || lng == '' || lat == '') { + this.showToast('坐标有误'); + return false; + } + + // 转换坐标打开位置 + var position = this.map_bd_to_gcj(parseFloat(lng), parseFloat(lat)); + swan.openLocation({ + name: name || '', + address: address || '', + scale: scale || 18, + longitude: position.lng, + latitude: position.lat + }); + }, + + // uuid生成 + uuid() { + var d = new Date().getTime(); + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + var r = (d + Math.random() * 16) % 16 | 0; + d = Math.floor(d / 16); + return (c == 'x' ? r : r & 0x3 | 0x8).toString(16); + }); + }, + + // 获取当前uuid + request_uuid() { + var uuid = swan.getStorageSync(this.data.cache_user_uuid_key) || null; + + if (uuid == null) { + uuid = this.uuid(); + swan.setStorage({ + key: this.data.cache_user_uuid_key, + data: uuid, + fail: () => { + this.showToast('uuid缓存失败'); + } + }); + } + + return uuid; + } + }); \ No newline at end of file diff --git a/sourcecode/baidu/app.json b/sourcecode/baidu/app.json index aad8e4eeb..b15ce9bc5 100755 --- a/sourcecode/baidu/app.json +++ b/sourcecode/baidu/app.json @@ -40,7 +40,8 @@ "pages/plugins/distribution/extraction/extraction", "pages/plugins/distribution/extraction-apply/extraction-apply", "pages/plugins/distribution/extraction-order/extraction-order", - "pages/plugins/distribution/introduce/introduce" + "pages/plugins/distribution/introduce/introduce", + "pages/plugins/exchangerate/currency/currency" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.css b/sourcecode/baidu/components/quick-nav/quick-nav.css new file mode 100644 index 000000000..3171674c0 --- /dev/null +++ b/sourcecode/baidu/components/quick-nav/quick-nav.css @@ -0,0 +1,101 @@ +/** + * 按钮 + */ + .quick-nav-movable-container { + position: fixed; + width: 100%; + height: 100%; + top: 150rpx; + left: 0; + background:transparent; + pointer-events: none; + z-index: 2; +} +.quick-nav-event-submit { + pointer-events: auto; + position: fixed; + bottom: 150rpx; + width: 100rpx; + height: 100rpx; + border-radius: 50%; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + background-color: rgb(210 54 76 / 80%); +} +.quick-nav-event-submit image { + width: 50rpx; + height: 50rpx; + margin: 25rpx auto 25rpx auto; + display: block; +} + +/** + * 弹窗 + */ +.quick-nav-popup-container { + padding: 20rpx 10rpx 0 10rpx; + background: #fff; +} +.quick-nav-popup-container .close { + overflow: hidden; +} +.quick-nav-popup-container .close .icon-right { + float: right; +} +.quick-nav-popup-content { + max-height: 80vh; + overflow-y: scroll; + overflow-x: hidden; + padding-bottom: 20rpx; +} + +/** + * 内容 + */ +.quick-nav-data-list { + overflow: hidden; + background: #fff; +} +.quick-nav-data-list .items { + width: calc(25% - 60rpx); + float: left; + padding: 30rpx; +} +.quick-nav-data-list .items-content { + border-radius: 50%; + padding: 20rpx; + text-align: center; + width: 70rpx; + height: 70rpx; + margin: 0 auto; +} +.quick-nav-data-list .items image { + width: 60rpx !important; + height: 60rpx !important; + margin-top: 5rpx; +} +.quick-nav-data-list .items .title { + margin-top: 10rpx; + font-size: 28rpx !important; + text-align:center; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + max-width: 100%; +} + +/* + * 没有数据 + */ +.quick-nav-popup-container .no-data-box { + padding: 80rpx 0; + text-align: center; +} +.quick-nav-popup-container .no-data-box image { + width: 160rpx; + margin-bottom: 30rpx; +} +.quick-nav-popup-container .no-data-box .no-data-tips { + font-size: 28rpx; + color: #a6a6a6; +} \ No newline at end of file diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.js b/sourcecode/baidu/components/quick-nav/quick-nav.js new file mode 100644 index 000000000..9158b4ede --- /dev/null +++ b/sourcecode/baidu/components/quick-nav/quick-nav.js @@ -0,0 +1,56 @@ +const app = getApp(); +Component({ + data: { + popup_status: false, + data_list: [], + system: null, + x: 0, + y: 0, + is_first: 1, + }, + pageLifetimes: { + // 页面被展示 + show: function() { + this.init_config(); + + // 非首次进入则重新初始化配置接口 + if(this.data.is_first == 0) { + app.init_config(); + } + + // 数据设置 + var system = app.get_system_info(); + this.setData({ + is_first: 0, + system: system, + x: 5, + y: (system.windowHeight || 450)-160, + }); + }, + }, + methods: { + // 初始化配置 + init_config(status) { + if((status || false) == true) { + this.setData({ data_list: app.get_config('quick_nav') || [] }); + } else { + app.is_config(this, 'init_config'); + } + }, + + // 弹层开启 + quick_open_event(e) { + this.setData({popup_status: true, data_list: app.get_config('quick_nav') || []}); + }, + + // 弹层关闭 + quick_close_event(e) { + this.setData({ popup_status: false }); + }, + + // 操作事件 + navigation_event(e) { + app.operation_event(e); + }, + }, +}); diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.json b/sourcecode/baidu/components/quick-nav/quick-nav.json new file mode 100644 index 000000000..66d926bfe --- /dev/null +++ b/sourcecode/baidu/components/quick-nav/quick-nav.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "component-popup": "/components/popup/popup" + } +} \ No newline at end of file diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.swan b/sourcecode/baidu/components/quick-nav/quick-nav.swan new file mode 100644 index 000000000..07b7897b9 --- /dev/null +++ b/sourcecode/baidu/components/quick-nav/quick-nav.swan @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/baidu/pages/buy/buy.js b/sourcecode/baidu/pages/buy/buy.js index 3f997c234..76b679d0f 100755 --- a/sourcecode/baidu/pages/buy/buy.js +++ b/sourcecode/baidu/pages/buy/buy.js @@ -1,7 +1,6 @@ const app = getApp(); Page({ data: { - currency_symbol: app.data.currency_symbol, data_list_loding_status: 1, buy_submit_disabled_status: false, data_list_loding_msg: '', @@ -16,11 +15,17 @@ Page({ is_first: 1, extension_data: [], payment_id: 0, - common_order_is_booking: 0, common_site_type: 0, extraction_address: [], site_model: 0, - buy_header_nav: [{ name: "快递邮寄", value: 0 }, { name: "自提点取货", value: 2 }], + buy_header_nav: [ + { name: "快递邮寄", value: 0 }, + { name: "自提点取货", value: 2 } + ], + + // 基础配置 + currency_symbol: app.data.currency_symbol, + common_order_is_booking: 0, // 优惠劵 plugins_coupon_data: null, @@ -40,11 +45,27 @@ Page({ }, onShow() { + // 数据加载 this.init(); this.setData({ is_first: 0 }); + + // 初始化配置 + this.init_config(); }, - // 获取数据列表 + // 初始化配置 + init_config(status) { + if((status || false) == true) { + this.setData({ + currency_symbol: app.get_config('currency_symbol'), + common_order_is_booking: app.get_config('config.common_order_is_booking'), + }); + } else { + app.is_config(this, 'init_config'); + } + }, + + // 获取数据 init() { // 订单参数信息是否正确 if (this.data.params == null) { @@ -95,7 +116,6 @@ Page({ total_price: data.base.actual_price, extension_data: data.extension_data || [], data_list_loding_status: 3, - common_order_is_booking: data.common_order_is_booking || 0, common_site_type: data.common_site_type || 0, extraction_address: data.base.extraction_address || [], plugins_coupon_data: data.plugins_coupon_data || null @@ -341,14 +361,9 @@ Page({ return false; } - var lng = parseFloat(data.lng || 0); - var lat = parseFloat(data.lat || 0); - swan.openLocation({ - latitude: lat, - longitude: lng, - scale: 18, - name: data.name || data.alias || '', - address: (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '') - }); + // 打开地图 + var name = data.name || data.alias || ''; + var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); + app.open_location(data.lng, data.lat, name, address); } }); \ No newline at end of file diff --git a/sourcecode/baidu/pages/buy/buy.json b/sourcecode/baidu/pages/buy/buy.json index 7d179bfd5..1ea7faef3 100755 --- a/sourcecode/baidu/pages/buy/buy.json +++ b/sourcecode/baidu/pages/buy/buy.json @@ -1,6 +1,7 @@ { "enablePullDownRefresh": true, "usingComponents": { + "component-quick-nav": "/components/quick-nav/quick-nav", "component-popup": "/components/popup/popup" } } \ No newline at end of file diff --git a/sourcecode/baidu/pages/buy/buy.swan b/sourcecode/baidu/pages/buy/buy.swan index 1a1edddfd..8aebd345c 100755 --- a/sourcecode/baidu/pages/buy/buy.swan +++ b/sourcecode/baidu/pages/buy/buy.swan @@ -10,7 +10,7 @@ {{item.name}} - + @@ -31,7 +31,7 @@ - + @@ -83,16 +83,13 @@ {{currency_symbol}}{{group.order_base.actual_price}} - + - -