diff --git a/application/api/controller/Buy.php b/application/api/controller/Buy.php index ef2d12789..0799ae22d 100755 --- a/application/api/controller/Buy.php +++ b/application/api/controller/Buy.php @@ -80,6 +80,13 @@ class Buy extends Common $result['plugins_coupon_data'] = $ret['data']['data']; } + // 积分 + $ret = PluginsService::PluginsControlCall('points', 'index', 'buy', 'api', ['order_goods'=>$buy_goods, 'params'=>$params]); + if($ret['code'] == 0 && isset($ret['data']['code']) && $ret['data']['code'] == 0) + { + $result['plugins_points_data'] = $ret['data']['data']; + } + return DataReturn('操作成功', 0, $result); } return $buy_ret; diff --git a/application/service/ToutiaoService.php b/application/service/ToutiaoService.php index 047c39b5c..c5ec26e60 100644 --- a/application/service/ToutiaoService.php +++ b/application/service/ToutiaoService.php @@ -43,7 +43,7 @@ class ToutiaoService // 线上支付信息处理 $order_info = []; $service = 0; - if($ret['data']['is_payment_type'] == 0) + if(isset($ret['data']['is_payment_type']) && $ret['data']['is_payment_type'] == 0) { // 配置信息 $merchant_id = MyC('common_app_mini_toutiao_pay_merchant_id'); diff --git a/sourcecode/alipay/default/app.json b/sourcecode/alipay/default/app.json index 818e5a374..eed14eb52 100644 --- a/sourcecode/alipay/default/app.json +++ b/sourcecode/alipay/default/app.json @@ -75,7 +75,8 @@ "pages/plugins/signin/user-qrcode/user-qrcode", "pages/plugins/signin/user-qrcode-detail/user-qrcode-detail", "pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo", - "pages/plugins/signin/user-coming-list/user-coming-list" + "pages/plugins/signin/user-coming-list/user-coming-list", + "pages/plugins/points/index/index" ], "window": { "defaultTitle": "{{application_title}}", diff --git a/sourcecode/alipay/default/components/icon-nav/icon-nav.acss b/sourcecode/alipay/default/components/icon-nav/icon-nav.acss index 7fa545a7f..d68988745 100755 --- a/sourcecode/alipay/default/components/icon-nav/icon-nav.acss +++ b/sourcecode/alipay/default/components/icon-nav/icon-nav.acss @@ -20,6 +20,12 @@ margin-top: 5rpx; } .data-list .items .title { - margin-top: 10rpx; - font-size: 32rpx; + margin-top: 10rpx; + font-size: 30rpx; + text-align:center; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + max-width: 100%; } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/buy/buy.acss b/sourcecode/alipay/default/pages/buy/buy.acss index 5bfb2acc7..127d713f6 100644 --- a/sourcecode/alipay/default/pages/buy/buy.acss +++ b/sourcecode/alipay/default/pages/buy/buy.acss @@ -180,10 +180,10 @@ width: 50%; } -/** +/* * 插件样式区域 */ - /** +/* * 优惠劵 */ .plugins-coupon { @@ -209,4 +209,24 @@ .coupon-container .not-use-tips { color: #f7b240; font-size: 32rpx; +} + +/* + * 积分 + */ +.plugins-points-buy-container { + padding: 20rpx; +} +.plugins-points-buy-container .select .icon { + width: 45rpx; + height: 45rpx !important; + vertical-align: middle; +} +.plugins-points-buy-container .select .sales-price { + margin-left: 30rpx; + font-size: 28rpx; + font-weight: 400; +} +.plugins-points-buy-container .desc { + color: #F37B1D; } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/buy/buy.axml b/sourcecode/alipay/default/pages/buy/buy.axml index 8703a6335..6a10be18f 100644 --- a/sourcecode/alipay/default/pages/buy/buy.axml +++ b/sourcecode/alipay/default/pages/buy/buy.axml @@ -90,6 +90,22 @@ {{user_note_value || '留言'}} + + + + 使用{{plugins_points_data.use_integral}}个积分兑换商品 + 使用积分{{plugins_points_data.use_integral}}个 + -{{currency_symbol}}{{plugins_points_data.discount_price}} + + + + + + 你有积分{{plugins_points_data.user_integral}}个 + 你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个 + + + diff --git a/sourcecode/alipay/default/pages/buy/buy.js b/sourcecode/alipay/default/pages/buy/buy.js index 31f1e825f..b24e475f4 100644 --- a/sourcecode/alipay/default/pages/buy/buy.js +++ b/sourcecode/alipay/default/pages/buy/buy.js @@ -33,21 +33,16 @@ Page({ plugins_choice_coupon_value: [], popup_plugins_coupon_status: false, popup_plugins_coupon_index: null, + + // 积分 + plugins_points_data: null, + plugins_points_status: false, }, onLoad(params) { //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}'; - if((params.data || null) == null || app.get_length(JSON.parse(params.data)) == 0) + if((params.data || null) != null && app.get_length(JSON.parse(decodeURIComponent(params.data))) > 0) { - my.alert({ - title: '温馨提示', - content: '订单信息有误', - buttonText: '确认', - success: () => { - my.navigateBack(); - }, - }); - } else { - this.setData({ params: JSON.parse(params.data)}); + this.setData({ params: JSON.parse(decodeURIComponent(params.data))}); // 删除地址缓存 my.removeStorageSync({key: app.data.cache_buy_user_address_select_key}); @@ -117,7 +112,7 @@ Page({ my.request({ url: app.get_request_url("index", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", headers: { 'content-type': 'application/x-www-form-urlencoded' }, success: res => { @@ -137,6 +132,7 @@ Page({ common_site_type: data.common_site_type || 0, extraction_address: data.base.extraction_address || [], plugins_coupon_data: data.plugins_coupon_data || null, + plugins_points_data: data.plugins_points_data || null, }); // 优惠劵选择处理 @@ -192,8 +188,9 @@ Page({ }); }, - // 请求参数合并优惠券参数 - request_data_coupon_merge(data) { + // 请求参数合并 + request_data_ext_params_merge(data) { + // 优惠券 var coupon_ids = this.data.plugins_use_coupon_ids; if((coupon_ids || null) != null && coupon_ids.length > 0) { @@ -202,6 +199,10 @@ Page({ data['coupon_id_'+i] = coupon_ids[i]; } } + + // 积分 + data['is_points'] = (this.data.plugins_points_status === true) ? 1 : 0; + return data; }, @@ -251,7 +252,7 @@ Page({ my.request({ url: app.get_request_url("add", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", headers: { 'content-type': 'application/x-www-form-urlencoded' }, success: res => { @@ -396,4 +397,10 @@ Page({ var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); app.open_location(data.lng, data.lat, name, address); }, + + // 积分选择事件 + points_event(e) { + this.setData({plugins_points_status: !this.data.plugins_points_status}); + this.init(); + }, }); diff --git a/sourcecode/alipay/default/pages/cart/cart.js b/sourcecode/alipay/default/pages/cart/cart.js index 3bbb7edef..1cd84bac9 100644 --- a/sourcecode/alipay/default/pages/cart/cart.js +++ b/sourcecode/alipay/default/pages/cart/cart.js @@ -439,7 +439,7 @@ Page({ "ids": ids.join(',') }; my.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); }, diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss index 8241a08bc..42552d871 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.acss @@ -369,4 +369,45 @@ } .goods-parameters .content-item .item:nth-child(2n) { float: right; +} + +/* + * 商品简述 + */ +.goods-simple-desc { + color: #f00; + padding: 0 10rpx; + margin: 5rpx 0 15rpx 0; +} + +/* + * icon + */ +.goods-icon-container { + padding: 20rpx 10rpx 10rpx 10rpx; +} +.goods-icon-container view { + background: #fff; + border: 1px solid #3bb4f2; + color: #3bb4f2; + padding: 3rpx 15rpx; + border-radius: 8rpx; + margin-bottom: 10rpx; +} +.goods-icon-container view:not(:last-child) { + margin-right: 10rpx; +} + +/* + * 面板 + */ +.goods-panel-container { + background: #fffbfc; + color: #d2354c; +} +.goods-panel-container view { + padding: 15rpx 10rpx; +} +.goods-panel-container view:not(:first-child) { + border-top: 1px dashed #fff1f2; } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml index 0a633274e..8c691a919 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml @@ -29,6 +29,23 @@ {{goods.title}} + + {{goods.simple_desc}} + + + + + {{item.name}} + + + + + + + {{item}} + + + diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js index e68847033..f2ebca4d4 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js @@ -629,7 +629,7 @@ Page({ "spec": JSON.stringify(spec) }; my.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); this.popup_close_event(); break; diff --git a/sourcecode/alipay/default/pages/message/message.axml b/sourcecode/alipay/default/pages/message/message.axml index e7af3a4a9..984dd7d7f 100755 --- a/sourcecode/alipay/default/pages/message/message.axml +++ b/sourcecode/alipay/default/pages/message/message.axml @@ -7,10 +7,6 @@ {{item.detail}} - - - - diff --git a/sourcecode/alipay/default/pages/plugins/points/index/index.acss b/sourcecode/alipay/default/pages/plugins/points/index/index.acss new file mode 100644 index 000000000..0829a602b --- /dev/null +++ b/sourcecode/alipay/default/pages/plugins/points/index/index.acss @@ -0,0 +1,107 @@ +/** + * 顶部 + */ +.points-user { + background-color: #fe3e28; + position: relative; + padding: 100rpx 0 120rpx 0; +} +.points-user .avatar { + padding: 1px; + background: #ff9589; + margin: 0 auto; +} +.points-user .avatar, +.points-user .avatar image { + width: 160rpx; + height: 160rpx; + border-radius: 50%; +} +.points-user .user-name { + color: #fff; + margin: 10rpx 0 20rpx 0; +} +.points-user .user-desc { + color: #ffe7b2; +} +.points-user-menu-submit { + border: 1px solid #ffd606; + color: #fae501; + position: absolute; + top: 20rpx; + right: 20rpx; + padding: 6rpx 20rpx; + border-radius: 3rpx; +} +.submit-container { + position: absolute; + bottom: 20rpx; + right: 20rpx; +} +.submit-container button:not(:first-child) { + margin-left: 30rpx; +} +button.login-submit { + color: #5eb95e; + background-color: #E4F3E4; + border-color: #d2e8d2; + margin-bottom: 30rpx; +} +.submit-container button.share-submit { + color: #F37B1D; + background-color: #ffe5be; + border-color: #f8d093; +} + +/** + * 商品导航 + */ +.spacing-nav-title { + color: #fe3e28; +} +.spacing-nav-title .line { + background: #fe3e28; +} + +/** + * 商品列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + overflow: hidden; +} +.data-list .items { + width: calc(50% - 5rpx); + margin-bottom: 10rpx; + padding-bottom: 20rpx; +} +.data-list .items:nth-child(2n) { + float: right; +} +.data-list .items:nth-child(2n+1) { + float: left; +} +.data-list .items image { + width: 100%; + height: 200px !important; +} +.data-list .items .base { + text-align: left; + font-size: 32rpx; + padding: 0 15rpx; +} +.data-list .items .base, +.data-list .items .base .price { + margin-top: 10rpx; +} +.data-list .items .base .original-price { + margin-left: 0; +} +.data-list .items .base .price .sales-price { + margin: 0 5rpx; +} +.data-list .items .base .price .unit { + color: #f40; +} \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/points/index/index.axml b/sourcecode/alipay/default/pages/plugins/points/index/index.axml new file mode 100644 index 000000000..47975a1a7 --- /dev/null +++ b/sourcecode/alipay/default/pages/plugins/points/index/index.axml @@ -0,0 +1,64 @@ + + + + 我的积分 + + + 获知会员积分详情 + + + + + + {{user.user_name_view}} + 当前可用 {{user.integral}} 积分 + + + + + + + + + + + + + + + {{item}} + + + + + + + + 商品兑换 + + + + + + + {{item.goods.title}} + {{currency_symbol}}{{item.goods.price}} + + 需 + {{item.integral}} + 积分 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/points/index/index.js b/sourcecode/alipay/default/pages/plugins/points/index/index.js new file mode 100644 index 000000000..4a2ea8327 --- /dev/null +++ b/sourcecode/alipay/default/pages/plugins/points/index/index.js @@ -0,0 +1,122 @@ +const app = getApp(); +Page({ + data: { + data_bottom_line_status: false, + data_list_loding_status: 1, + data_list_loding_msg: '', + params: null, + user: null, + data_base: null, + avatar_default: app.data.default_user_head_src, + }, + + onLoad(params) { + this.setData({ + params: params, + user: app.get_user_cache_info(), + }); + }, + + onShow() { + app.set_nav_bg_color_main('#fe3e28'); + this.get_data(); + }, + + // 获取数据 + get_data() { + var self = this; + my.request({ + url: app.get_request_url("index", "index", "points"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + my.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + data_base: data.base || null, + data_list_loding_msg: '', + data_list_loding_status: 0, + data_bottom_line_status: true, + }); + } else { + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: res.data.msg, + }); + } + }, + fail: () => { + my.stopPullDownRefresh(); + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: '服务器请求出错', + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.get_data(); + }, + + // 立即登录 + login_event() { + var user = app.get_user_info(this, "login_event") + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + my.confirm({ + title: '温馨提示', + content: '绑定手机号码', + confirmButtonText: '确认', + cancelButtonText: '暂不', + success: (result) => { + my.stopPullDownRefresh(); + if (result.confirm) { + my.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + } + } + this.setData({user: user || null}); + }, + + // 图片事件 + right_images_event(e) { + if((this.data.data_base.right_images_url || null) != null) + { + my.navigateTo({ + url: this.data.data_base.right_images_url, + }); + } + }, + + // 头像查看 + preview_event() { + if (app.data.default_user_head_src != this.data.user.avatar) { + my.previewImage({ + current: 0, + urls: [this.data.user.avatar] + }); + } + }, + + // 自定义分享 + onShareAppMessage() { + var user_id = app.get_user_cache_info('id', 0) || 0; + return { + title: this.data.data_base.seo_title || '积分商城 - '+app.data.application_title, + desc: this.data.data_base.seo_desc || '积分抵扣、兑换 - '+app.data.application_describe, + path: '/pages/plugins/signin/index-detail/index-detail?referrer=' + user_id + }; + }, +}); \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/points/index/index.json b/sourcecode/alipay/default/pages/plugins/points/index/index.json new file mode 100644 index 000000000..2e29edba9 --- /dev/null +++ b/sourcecode/alipay/default/pages/plugins/points/index/index.json @@ -0,0 +1,5 @@ +{ + "pullRefresh": true, + "titleBarColor": "#fe3e28", + "defaultTitle": "积分商城" +} \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss index e842d8b1e..7fe7ed8cc 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss +++ b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss @@ -97,6 +97,16 @@ border-radius: 1000rpx; } +/** + * 商品导航 + */ +.spacing-nav-title { + color: #f6b015; +} +.spacing-nav-title .line { + background: #f6b015; +} + /** * 商品列表 */ diff --git a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.axml b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.axml index 32905d316..d1f1fd750 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.axml +++ b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.axml @@ -55,8 +55,8 @@ {{item.title}} - - {{currency_symbol}}{{item.min_price}} + + {{currency_symbol}}{{item.price}} @@ -75,7 +75,7 @@ 获得 {{coming_integral}} 积分 - + diff --git a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.js b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.js index 87b07ba70..4b61aba7f 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.js +++ b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.js @@ -24,6 +24,7 @@ Page({ }, onShow() { + app.set_nav_bg_color_main('#f6b015'); this.get_data(); }, diff --git a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.json b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.json index 92fe49b49..1b4f71d09 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.json +++ b/sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "签到" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.js b/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.js index f3dc0a6d3..352fa8c8b 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.js +++ b/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.js @@ -16,7 +16,9 @@ Page({ this.init(); }, - onShow() { }, + onShow() { + app.set_nav_bg_color_main('#f6b015'); + }, init() { var user = app.get_user_info(this, 'init'); diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.json b/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.json index 310b71244..d1abccccd 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.json +++ b/sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "用户签到" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.js b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.js index 7f8161314..35b9b95df 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.js +++ b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.js @@ -16,7 +16,9 @@ Page({ this.init(); }, - onShow() {}, + onShow() { + app.set_nav_bg_color_main('#f6b015'); + }, init() { var self = this; diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.json b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.json index bdd144ab4..069d92608 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.json +++ b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "签到码详情" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js index 192a7ce88..360c04dd3 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js +++ b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js @@ -14,7 +14,9 @@ Page({ this.init(); }, - onShow() {}, + onShow() { + app.set_nav_bg_color_main('#f6b015'); + }, init() { var self = this; diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json index 178a157d3..add807a20 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json +++ b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "签到码新增/编辑" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.js b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.js index aa00b60e2..1fbb8bf7e 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.js +++ b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.js @@ -17,6 +17,7 @@ Page({ }, onShow() { + app.set_nav_bg_color_main('#f6b015'); this.init(); }, diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.json b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.json index 39486c60f..28b38d217 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.json +++ b/sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "签到码管理" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.js b/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.js index 07dcd5347..99cffe8a1 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.js +++ b/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.js @@ -16,7 +16,9 @@ Page({ this.init(); }, - onShow() { }, + onShow() { + app.set_nav_bg_color_main('#f6b015'); + }, init() { var user = app.get_user_info(this, 'init'); diff --git a/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.json b/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.json index d4637d83e..34ee03a30 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.json +++ b/sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "我的签到" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/plugins/signin/user/user.js b/sourcecode/alipay/default/pages/plugins/signin/user/user.js index 06a0756e8..07c9653ae 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user/user.js +++ b/sourcecode/alipay/default/pages/plugins/signin/user/user.js @@ -11,6 +11,7 @@ Page({ onLoad(params) {}, onShow() { + app.set_nav_bg_color_main('#f6b015'); this.init(); }, diff --git a/sourcecode/alipay/default/pages/plugins/signin/user/user.json b/sourcecode/alipay/default/pages/plugins/signin/user/user.json index 92fe49b49..1b4f71d09 100644 --- a/sourcecode/alipay/default/pages/plugins/signin/user/user.json +++ b/sourcecode/alipay/default/pages/plugins/signin/user/user.json @@ -1,8 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#f6b015", "titleBarColor": "#f6b015", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "签到" } \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/user-integral/user-integral.axml b/sourcecode/alipay/default/pages/user-integral/user-integral.axml index 6e1187963..ac00babd0 100755 --- a/sourcecode/alipay/default/pages/user-integral/user-integral.axml +++ b/sourcecode/alipay/default/pages/user-integral/user-integral.axml @@ -2,7 +2,6 @@ - {{item.type_text}} {{item.operation_integral}} {{item.add_time_time}} @@ -12,10 +11,6 @@ {{item.msg}} - - - - diff --git a/sourcecode/baidu/default/app.json b/sourcecode/baidu/default/app.json index 5d49cf9d8..999946bf4 100755 --- a/sourcecode/baidu/default/app.json +++ b/sourcecode/baidu/default/app.json @@ -53,7 +53,8 @@ "pages/plugins/signin/user-qrcode/user-qrcode", "pages/plugins/signin/user-qrcode-detail/user-qrcode-detail", "pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo", - "pages/plugins/signin/user-coming-list/user-coming-list" + "pages/plugins/signin/user-coming-list/user-coming-list", + "pages/plugins/points/index/index" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/sourcecode/baidu/default/components/icon-nav/icon-nav.css b/sourcecode/baidu/default/components/icon-nav/icon-nav.css index b0691a9ee..00fbaab54 100755 --- a/sourcecode/baidu/default/components/icon-nav/icon-nav.css +++ b/sourcecode/baidu/default/components/icon-nav/icon-nav.css @@ -23,7 +23,7 @@ } .data-list .items .title { margin-top: 10rpx; - font-size: 32rpx; + font-size: 30rpx; text-align:center; -o-text-overflow: ellipsis; text-overflow: ellipsis; diff --git a/sourcecode/baidu/default/pages/buy/buy.css b/sourcecode/baidu/default/pages/buy/buy.css index 5bfb2acc7..127d713f6 100755 --- a/sourcecode/baidu/default/pages/buy/buy.css +++ b/sourcecode/baidu/default/pages/buy/buy.css @@ -180,10 +180,10 @@ width: 50%; } -/** +/* * 插件样式区域 */ - /** +/* * 优惠劵 */ .plugins-coupon { @@ -209,4 +209,24 @@ .coupon-container .not-use-tips { color: #f7b240; font-size: 32rpx; +} + +/* + * 积分 + */ +.plugins-points-buy-container { + padding: 20rpx; +} +.plugins-points-buy-container .select .icon { + width: 45rpx; + height: 45rpx !important; + vertical-align: middle; +} +.plugins-points-buy-container .select .sales-price { + margin-left: 30rpx; + font-size: 28rpx; + font-weight: 400; +} +.plugins-points-buy-container .desc { + color: #F37B1D; } \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/buy/buy.js b/sourcecode/baidu/default/pages/buy/buy.js index 49850dce9..91ab83d36 100755 --- a/sourcecode/baidu/default/pages/buy/buy.js +++ b/sourcecode/baidu/default/pages/buy/buy.js @@ -32,12 +32,17 @@ Page({ plugins_use_coupon_ids: [], plugins_choice_coupon_value: [], popup_plugins_coupon_status: false, - popup_plugins_coupon_index: null + popup_plugins_coupon_index: null, + + // 积分 + plugins_points_data: null, + plugins_points_status: false, }, onLoad(params) { //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}'; - if ((params.data || null) != null && app.get_length(JSON.parse(params.data)) > 0) { - this.setData({ params: JSON.parse(params.data) }); + if((params.data || null) != null && app.get_length(JSON.parse(decodeURIComponent(params.data))) > 0) + { + this.setData({ params: JSON.parse(decodeURIComponent(params.data))}); // 删除地址缓存 swan.removeStorageSync(app.data.cache_buy_user_address_select_key); @@ -101,7 +106,7 @@ Page({ swan.request({ url: app.get_request_url("index", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { swan.stopPullDownRefresh(); @@ -118,7 +123,8 @@ Page({ data_list_loding_status: 3, common_site_type: data.common_site_type || 0, extraction_address: data.base.extraction_address || [], - plugins_coupon_data: data.plugins_coupon_data || null + plugins_coupon_data: data.plugins_coupon_data || null, + plugins_points_data: data.plugins_points_data || null, }); // 优惠劵选择处理 @@ -172,14 +178,19 @@ Page({ }); }, - // 请求参数合并优惠券参数 - request_data_coupon_merge(data) { + // 请求参数合并 + request_data_ext_params_merge(data) { + // 优惠券 var coupon_ids = this.data.plugins_use_coupon_ids; if ((coupon_ids || null) != null && coupon_ids.length > 0) { for (var i in coupon_ids) { data['coupon_id_' + i] = coupon_ids[i]; } } + + // 积分 + data['is_points'] = (this.data.plugins_points_status === true) ? 1 : 0; + return data; }, @@ -229,7 +240,7 @@ Page({ swan.request({ url: app.get_request_url("add", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { swan.hideLoading(); @@ -365,5 +376,11 @@ Page({ var name = data.alias || data.name || ''; var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); app.open_location(data.lng, data.lat, name, address); - } + }, + + // 积分选择事件 + points_event(e) { + this.setData({plugins_points_status: !this.data.plugins_points_status}); + this.init(); + }, }); \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/buy/buy.swan b/sourcecode/baidu/default/pages/buy/buy.swan index 66fad2c82..8f7f87959 100755 --- a/sourcecode/baidu/default/pages/buy/buy.swan +++ b/sourcecode/baidu/default/pages/buy/buy.swan @@ -90,6 +90,22 @@ {{user_note_value || '留言'}} + + + + 使用{{plugins_points_data.use_integral}}个积分兑换商品 + 使用积分{{plugins_points_data.use_integral}}个 + -{{currency_symbol}}{{plugins_points_data.discount_price}} + + + + + + 你有积分{{plugins_points_data.user_integral}}个 + 你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个 + + + diff --git a/sourcecode/baidu/default/pages/cart/cart.js b/sourcecode/baidu/default/pages/cart/cart.js index b20571d87..f0f88b6c5 100755 --- a/sourcecode/baidu/default/pages/cart/cart.js +++ b/sourcecode/baidu/default/pages/cart/cart.js @@ -391,7 +391,7 @@ Page({ "ids": ids.join(',') }; swan.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); }, diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.css b/sourcecode/baidu/default/pages/goods-detail/goods-detail.css index ac7ccd827..f3f10182f 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.css +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.css @@ -368,4 +368,45 @@ } .goods-parameters .content-item .item:nth-child(2n) { float: right; +} + +/* + * 商品简述 + */ +.goods-simple-desc { + color: #f00; + padding: 0 10rpx; + margin: 5rpx 0 15rpx 0; +} + +/* + * icon + */ +.goods-icon-container { + padding: 20rpx 10rpx 10rpx 10rpx; +} +.goods-icon-container view { + background: #fff; + border: 1px solid #3bb4f2; + color: #3bb4f2; + padding: 3rpx 15rpx; + border-radius: 8rpx; + margin-bottom: 10rpx; +} +.goods-icon-container view:not(:last-child) { + margin-right: 10rpx; +} + +/* + * 面板 + */ +.goods-panel-container { + background: #fffbfc; + color: #d2354c; +} +.goods-panel-container view { + padding: 15rpx 10rpx; +} +.goods-panel-container view:not(:first-child) { + border-top: 1px dashed #fff1f2; } \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js index 740667c66..9683479e0 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js @@ -563,7 +563,7 @@ Page({ "spec": JSON.stringify(spec) }; swan.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); this.popup_close_event(); break; diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan index 54717059e..b140c04b7 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan @@ -23,6 +23,23 @@ {{goods.title}} + + {{goods.simple_desc}} + + + + + {{item.name}} + + + + + + + {{item}} + + + diff --git a/sourcecode/baidu/default/pages/message/message.swan b/sourcecode/baidu/default/pages/message/message.swan index fbadbc414..45790e643 100755 --- a/sourcecode/baidu/default/pages/message/message.swan +++ b/sourcecode/baidu/default/pages/message/message.swan @@ -7,10 +7,6 @@ {{item.detail}} - - - - diff --git a/sourcecode/baidu/default/pages/plugins/points/index/index.css b/sourcecode/baidu/default/pages/plugins/points/index/index.css new file mode 100644 index 000000000..0829a602b --- /dev/null +++ b/sourcecode/baidu/default/pages/plugins/points/index/index.css @@ -0,0 +1,107 @@ +/** + * 顶部 + */ +.points-user { + background-color: #fe3e28; + position: relative; + padding: 100rpx 0 120rpx 0; +} +.points-user .avatar { + padding: 1px; + background: #ff9589; + margin: 0 auto; +} +.points-user .avatar, +.points-user .avatar image { + width: 160rpx; + height: 160rpx; + border-radius: 50%; +} +.points-user .user-name { + color: #fff; + margin: 10rpx 0 20rpx 0; +} +.points-user .user-desc { + color: #ffe7b2; +} +.points-user-menu-submit { + border: 1px solid #ffd606; + color: #fae501; + position: absolute; + top: 20rpx; + right: 20rpx; + padding: 6rpx 20rpx; + border-radius: 3rpx; +} +.submit-container { + position: absolute; + bottom: 20rpx; + right: 20rpx; +} +.submit-container button:not(:first-child) { + margin-left: 30rpx; +} +button.login-submit { + color: #5eb95e; + background-color: #E4F3E4; + border-color: #d2e8d2; + margin-bottom: 30rpx; +} +.submit-container button.share-submit { + color: #F37B1D; + background-color: #ffe5be; + border-color: #f8d093; +} + +/** + * 商品导航 + */ +.spacing-nav-title { + color: #fe3e28; +} +.spacing-nav-title .line { + background: #fe3e28; +} + +/** + * 商品列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + overflow: hidden; +} +.data-list .items { + width: calc(50% - 5rpx); + margin-bottom: 10rpx; + padding-bottom: 20rpx; +} +.data-list .items:nth-child(2n) { + float: right; +} +.data-list .items:nth-child(2n+1) { + float: left; +} +.data-list .items image { + width: 100%; + height: 200px !important; +} +.data-list .items .base { + text-align: left; + font-size: 32rpx; + padding: 0 15rpx; +} +.data-list .items .base, +.data-list .items .base .price { + margin-top: 10rpx; +} +.data-list .items .base .original-price { + margin-left: 0; +} +.data-list .items .base .price .sales-price { + margin: 0 5rpx; +} +.data-list .items .base .price .unit { + color: #f40; +} \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/plugins/points/index/index.js b/sourcecode/baidu/default/pages/plugins/points/index/index.js new file mode 100644 index 000000000..765d77fdd --- /dev/null +++ b/sourcecode/baidu/default/pages/plugins/points/index/index.js @@ -0,0 +1,128 @@ +const app = getApp(); +Page({ + data: { + data_bottom_line_status: false, + data_list_loding_status: 1, + data_list_loding_msg: '', + params: null, + user: null, + data_base: null, + avatar_default: app.data.default_user_head_src + }, + + onReady() {}, + + onLoad(params) { + this.setData({ + params: params, + user: app.get_user_cache_info() + }); + }, + + onShow() { + this.get_data(); + }, + + // 获取数据 + get_data() { + var self = this; + swan.request({ + url: app.get_request_url("index", "index", "points"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + swan.stopPullDownRefresh(); + + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + data_base: data.base || null, + data_list_loding_msg: '', + data_list_loding_status: 0, + data_bottom_line_status: true + }); + } else { + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: res.data.msg + }); + } + }, + fail: () => { + swan.stopPullDownRefresh(); + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: '服务器请求出错' + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.get_data(); + }, + + // 立即登录 + login_event() { + var user = app.get_user_info(this, "login_event"); + + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + swan.showModal({ + title: '温馨提示', + content: '绑定手机号码', + confirmText: '确认', + cancelText: '暂不', + success: result => { + swan.stopPullDownRefresh(); + + if (result.confirm) { + swan.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + } + }); + } + } + + this.setData({ + user: user || null + }); + }, + + // 图片事件 + right_images_event(e) { + if ((this.data.data_base.right_images_url || null) != null) { + swan.navigateTo({ + url: this.data.data_base.right_images_url + }); + } + }, + + // 头像查看 + preview_event() { + if (app.data.default_user_head_src != this.data.user.avatar) { + swan.previewImage({ + current: this.data.user.avatar, + urls: [this.data.user.avatar] + }); + } + }, + + // 自定义分享 + onShareAppMessage() { + var user_id = app.get_user_cache_info('id', 0) || 0; + return { + title: this.data.data_base.seo_title || '积分商城 - ' + app.data.application_title, + desc: this.data.data_base.seo_desc || '积分抵扣、兑换 - ' + app.data.application_describe, + path: '/pages/plugins/signin/index-detail/index-detail?referrer=' + user_id + }; + }, +}); \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/plugins/points/index/index.json b/sourcecode/baidu/default/pages/plugins/points/index/index.json new file mode 100644 index 000000000..88daf634b --- /dev/null +++ b/sourcecode/baidu/default/pages/plugins/points/index/index.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#fe3e28", + "backgroundColorTop": "#fe3e28", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "积分商城" +} \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/plugins/points/index/index.swan b/sourcecode/baidu/default/pages/plugins/points/index/index.swan new file mode 100644 index 000000000..d8bc9d8c4 --- /dev/null +++ b/sourcecode/baidu/default/pages/plugins/points/index/index.swan @@ -0,0 +1,64 @@ + + + + 我的积分 + + + 获知会员积分详情 + + + + + + {{user.user_name_view}} + 当前可用 {{user.integral}} 积分 + + + + + + + + + + + + + + + {{item}} + + + + + + + + 商品兑换 + + + + + + + {{item.goods.title}} + {{currency_symbol}}{{item.goods.price}} + + 需 + {{item.integral}} + 积分 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css b/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css index e842d8b1e..7fe7ed8cc 100644 --- a/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css +++ b/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css @@ -97,6 +97,16 @@ border-radius: 1000rpx; } +/** + * 商品导航 + */ +.spacing-nav-title { + color: #f6b015; +} +.spacing-nav-title .line { + background: #f6b015; +} + /** * 商品列表 */ diff --git a/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.swan b/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.swan index 2e435ed5a..1341e0ffb 100644 --- a/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.swan +++ b/sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.swan @@ -55,8 +55,8 @@ {{item.title}} - - {{currency_symbol}}{{item.min_price}} + + {{currency_symbol}}{{item.price}} @@ -75,7 +75,7 @@ 获得 {{coming_integral}} 积分 - + diff --git a/sourcecode/baidu/default/pages/user-integral/user-integral.swan b/sourcecode/baidu/default/pages/user-integral/user-integral.swan index 819b6b0ac..9a426c663 100755 --- a/sourcecode/baidu/default/pages/user-integral/user-integral.swan +++ b/sourcecode/baidu/default/pages/user-integral/user-integral.swan @@ -2,7 +2,6 @@ - {{item.type_text}} {{item.operation_integral}} {{item.add_time_time}} @@ -12,10 +11,6 @@ {{item.msg}} - - - - diff --git a/sourcecode/qq/default/app.json b/sourcecode/qq/default/app.json index ff52b7735..5e6ded909 100755 --- a/sourcecode/qq/default/app.json +++ b/sourcecode/qq/default/app.json @@ -53,7 +53,8 @@ "pages/plugins/signin/user-qrcode/user-qrcode", "pages/plugins/signin/user-qrcode-detail/user-qrcode-detail", "pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo", - "pages/plugins/signin/user-coming-list/user-coming-list" + "pages/plugins/signin/user-coming-list/user-coming-list", + "pages/plugins/points/index/index" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/sourcecode/qq/default/components/icon-nav/icon-nav.qss b/sourcecode/qq/default/components/icon-nav/icon-nav.qss index b0691a9ee..00fbaab54 100755 --- a/sourcecode/qq/default/components/icon-nav/icon-nav.qss +++ b/sourcecode/qq/default/components/icon-nav/icon-nav.qss @@ -23,7 +23,7 @@ } .data-list .items .title { margin-top: 10rpx; - font-size: 32rpx; + font-size: 30rpx; text-align:center; -o-text-overflow: ellipsis; text-overflow: ellipsis; diff --git a/sourcecode/qq/default/pages/buy/buy.js b/sourcecode/qq/default/pages/buy/buy.js index 8665512ef..90e27c255 100755 --- a/sourcecode/qq/default/pages/buy/buy.js +++ b/sourcecode/qq/default/pages/buy/buy.js @@ -33,12 +33,16 @@ Page({ plugins_choice_coupon_value: [], popup_plugins_coupon_status: false, popup_plugins_coupon_index: null, + + // 积分 + plugins_points_data: null, + plugins_points_status: false, }, onLoad(params) { //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}'; - if((params.data || null) != null && app.get_length(JSON.parse(params.data)) > 0) + if((params.data || null) != null && app.get_length(JSON.parse(decodeURIComponent(params.data))) > 0) { - this.setData({ params: JSON.parse(params.data)}); + this.setData({ params: JSON.parse(decodeURIComponent(params.data))}); // 删除地址缓存 qq.removeStorageSync(app.data.cache_buy_user_address_select_key); @@ -106,7 +110,7 @@ Page({ qq.request({ url: app.get_request_url("index", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { qq.stopPullDownRefresh(); @@ -125,6 +129,7 @@ Page({ common_site_type: data.common_site_type || 0, extraction_address: data.base.extraction_address || [], plugins_coupon_data: data.plugins_coupon_data || null, + plugins_points_data: data.plugins_points_data || null, }); // 优惠劵选择处理 @@ -181,8 +186,9 @@ Page({ }); }, - // 请求参数合并优惠券参数 - request_data_coupon_merge(data) { + // 请求参数合并 + request_data_ext_params_merge(data) { + // 优惠券 var coupon_ids = this.data.plugins_use_coupon_ids; if((coupon_ids || null) != null && coupon_ids.length > 0) { @@ -191,6 +197,10 @@ Page({ data['coupon_id_'+i] = coupon_ids[i]; } } + + // 积分 + data['is_points'] = (this.data.plugins_points_status === true) ? 1 : 0; + return data; }, @@ -241,7 +251,7 @@ Page({ qq.request({ url: app.get_request_url("add", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { qq.hideLoading(); @@ -383,4 +393,10 @@ Page({ var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); app.open_location(data.lng, data.lat, name, address); }, + + // 积分选择事件 + points_event(e) { + this.setData({plugins_points_status: !this.data.plugins_points_status}); + this.init(); + }, }); diff --git a/sourcecode/qq/default/pages/buy/buy.qml b/sourcecode/qq/default/pages/buy/buy.qml index 7c8379375..8971080e1 100755 --- a/sourcecode/qq/default/pages/buy/buy.qml +++ b/sourcecode/qq/default/pages/buy/buy.qml @@ -90,6 +90,22 @@ {{user_note_value || '留言'}} + + + + 使用{{plugins_points_data.use_integral}}个积分兑换商品 + 使用积分{{plugins_points_data.use_integral}}个 + -{{currency_symbol}}{{plugins_points_data.discount_price}} + + + + + + 你有积分{{plugins_points_data.user_integral}}个 + 你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个 + + + diff --git a/sourcecode/qq/default/pages/buy/buy.qss b/sourcecode/qq/default/pages/buy/buy.qss index 5bfb2acc7..127d713f6 100755 --- a/sourcecode/qq/default/pages/buy/buy.qss +++ b/sourcecode/qq/default/pages/buy/buy.qss @@ -180,10 +180,10 @@ width: 50%; } -/** +/* * 插件样式区域 */ - /** +/* * 优惠劵 */ .plugins-coupon { @@ -209,4 +209,24 @@ .coupon-container .not-use-tips { color: #f7b240; font-size: 32rpx; +} + +/* + * 积分 + */ +.plugins-points-buy-container { + padding: 20rpx; +} +.plugins-points-buy-container .select .icon { + width: 45rpx; + height: 45rpx !important; + vertical-align: middle; +} +.plugins-points-buy-container .select .sales-price { + margin-left: 30rpx; + font-size: 28rpx; + font-weight: 400; +} +.plugins-points-buy-container .desc { + color: #F37B1D; } \ No newline at end of file diff --git a/sourcecode/qq/default/pages/cart/cart.js b/sourcecode/qq/default/pages/cart/cart.js index 9a00e01d8..5988cc2d6 100755 --- a/sourcecode/qq/default/pages/cart/cart.js +++ b/sourcecode/qq/default/pages/cart/cart.js @@ -393,7 +393,7 @@ Page({ "ids": ids.join(',') }; qq.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); }, diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.js b/sourcecode/qq/default/pages/goods-detail/goods-detail.js index 92c39c411..fb8aa4cbd 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.js @@ -610,7 +610,7 @@ Page({ "spec": JSON.stringify(spec) }; qq.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); this.popup_close_event(); break; diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml index e341512b4..4a262d168 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml @@ -29,6 +29,23 @@ {{goods.title}} + + {{goods.simple_desc}} + + + + + {{item.name}} + + + + + + + {{item}} + + + diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.qss b/sourcecode/qq/default/pages/goods-detail/goods-detail.qss index 3e049bda1..d01ba7441 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.qss +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.qss @@ -364,4 +364,45 @@ } .goods-parameters .content-item .item:nth-child(2n) { float: right; +} + +/* + * 商品简述 + */ +.goods-simple-desc { + color: #f00; + padding: 0 10rpx; + margin: 5rpx 0 15rpx 0; +} + +/* + * icon + */ +.goods-icon-container { + padding: 20rpx 10rpx 10rpx 10rpx; +} +.goods-icon-container view { + background: #fff; + border: 1px solid #3bb4f2; + color: #3bb4f2; + padding: 3rpx 15rpx; + border-radius: 8rpx; + margin-bottom: 10rpx; +} +.goods-icon-container view:not(:last-child) { + margin-right: 10rpx; +} + +/* + * 面板 + */ +.goods-panel-container { + background: #fffbfc; + color: #d2354c; +} +.goods-panel-container view { + padding: 15rpx 10rpx; +} +.goods-panel-container view:not(:first-child) { + border-top: 1px dashed #fff1f2; } \ No newline at end of file diff --git a/sourcecode/qq/default/pages/message/message.qml b/sourcecode/qq/default/pages/message/message.qml index bb922f652..6b36f5427 100755 --- a/sourcecode/qq/default/pages/message/message.qml +++ b/sourcecode/qq/default/pages/message/message.qml @@ -7,10 +7,6 @@ {{item.detail}} - - - - diff --git a/sourcecode/qq/default/pages/plugins/points/index/index.js b/sourcecode/qq/default/pages/plugins/points/index/index.js new file mode 100644 index 000000000..a1f51e556 --- /dev/null +++ b/sourcecode/qq/default/pages/plugins/points/index/index.js @@ -0,0 +1,121 @@ +const app = getApp(); +Page({ + data: { + data_bottom_line_status: false, + data_list_loding_status: 1, + data_list_loding_msg: '', + params: null, + user: null, + data_base: null, + avatar_default: app.data.default_user_head_src, + }, + + onLoad(params) { + this.setData({ + params: params, + user: app.get_user_cache_info(), + }); + }, + + onShow() { + this.get_data(); + }, + + // 获取数据 + get_data() { + var self = this; + qq.request({ + url: app.get_request_url("index", "index", "points"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + qq.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + data_base: data.base || null, + data_list_loding_msg: '', + data_list_loding_status: 0, + data_bottom_line_status: true, + }); + } else { + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: res.data.msg, + }); + } + }, + fail: () => { + qq.stopPullDownRefresh(); + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: '服务器请求出错', + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.get_data(); + }, + + // 立即登录 + login_event() { + var user = app.get_user_info(this, "login_event") + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + qq.showModal({ + title: '温馨提示', + content: '绑定手机号码', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + qq.stopPullDownRefresh(); + if (result.confirm) { + qq.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + } + } + this.setData({user: user || null}); + }, + + // 图片事件 + right_images_event(e) { + if((this.data.data_base.right_images_url || null) != null) + { + qq.navigateTo({ + url: this.data.data_base.right_images_url, + }); + } + }, + + // 头像查看 + preview_event() { + if (app.data.default_user_head_src != this.data.user.avatar) { + qq.previewImage({ + current: this.data.user.avatar, + urls: [this.data.user.avatar] + }); + } + }, + + // 自定义分享 + onShareAppMessage() { + var user_id = app.get_user_cache_info('id', 0) || 0; + return { + title: this.data.data_base.seo_title || '积分商城 - '+app.data.application_title, + desc: this.data.data_base.seo_desc || '积分抵扣、兑换 - '+app.data.application_describe, + path: '/pages/plugins/signin/index-detail/index-detail?referrer=' + user_id + }; + }, +}); \ No newline at end of file diff --git a/sourcecode/qq/default/pages/plugins/points/index/index.json b/sourcecode/qq/default/pages/plugins/points/index/index.json new file mode 100644 index 000000000..971a839fa --- /dev/null +++ b/sourcecode/qq/default/pages/plugins/points/index/index.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#fe3e28", + "backgroundColorTop": "#fe3e28", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "积分商城" +} \ No newline at end of file diff --git a/sourcecode/qq/default/pages/plugins/points/index/index.qml b/sourcecode/qq/default/pages/plugins/points/index/index.qml new file mode 100644 index 000000000..fee3a12ea --- /dev/null +++ b/sourcecode/qq/default/pages/plugins/points/index/index.qml @@ -0,0 +1,64 @@ + + + + 我的积分 + + + 获知会员积分详情 + + + + + + {{user.user_name_view}} + 当前可用 {{user.integral}} 积分 + + + + + + + + + + + + + + + {{item}} + + + + + + + + 商品兑换 + + + + + + + {{item.goods.title}} + {{currency_symbol}}{{item.goods.price}} + + 需 + {{item.integral}} + 积分 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/qq/default/pages/plugins/points/index/index.qss b/sourcecode/qq/default/pages/plugins/points/index/index.qss new file mode 100644 index 000000000..0829a602b --- /dev/null +++ b/sourcecode/qq/default/pages/plugins/points/index/index.qss @@ -0,0 +1,107 @@ +/** + * 顶部 + */ +.points-user { + background-color: #fe3e28; + position: relative; + padding: 100rpx 0 120rpx 0; +} +.points-user .avatar { + padding: 1px; + background: #ff9589; + margin: 0 auto; +} +.points-user .avatar, +.points-user .avatar image { + width: 160rpx; + height: 160rpx; + border-radius: 50%; +} +.points-user .user-name { + color: #fff; + margin: 10rpx 0 20rpx 0; +} +.points-user .user-desc { + color: #ffe7b2; +} +.points-user-menu-submit { + border: 1px solid #ffd606; + color: #fae501; + position: absolute; + top: 20rpx; + right: 20rpx; + padding: 6rpx 20rpx; + border-radius: 3rpx; +} +.submit-container { + position: absolute; + bottom: 20rpx; + right: 20rpx; +} +.submit-container button:not(:first-child) { + margin-left: 30rpx; +} +button.login-submit { + color: #5eb95e; + background-color: #E4F3E4; + border-color: #d2e8d2; + margin-bottom: 30rpx; +} +.submit-container button.share-submit { + color: #F37B1D; + background-color: #ffe5be; + border-color: #f8d093; +} + +/** + * 商品导航 + */ +.spacing-nav-title { + color: #fe3e28; +} +.spacing-nav-title .line { + background: #fe3e28; +} + +/** + * 商品列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + overflow: hidden; +} +.data-list .items { + width: calc(50% - 5rpx); + margin-bottom: 10rpx; + padding-bottom: 20rpx; +} +.data-list .items:nth-child(2n) { + float: right; +} +.data-list .items:nth-child(2n+1) { + float: left; +} +.data-list .items image { + width: 100%; + height: 200px !important; +} +.data-list .items .base { + text-align: left; + font-size: 32rpx; + padding: 0 15rpx; +} +.data-list .items .base, +.data-list .items .base .price { + margin-top: 10rpx; +} +.data-list .items .base .original-price { + margin-left: 0; +} +.data-list .items .base .price .sales-price { + margin: 0 5rpx; +} +.data-list .items .base .price .unit { + color: #f40; +} \ No newline at end of file diff --git a/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qml b/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qml index 44484385f..c757dddcb 100644 --- a/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qml +++ b/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qml @@ -55,8 +55,8 @@ {{item.title}} - - {{currency_symbol}}{{item.min_price}} + + {{currency_symbol}}{{item.price}} @@ -75,7 +75,7 @@ 获得 {{coming_integral}} 积分 - + diff --git a/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss b/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss index e842d8b1e..7fe7ed8cc 100644 --- a/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss +++ b/sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss @@ -97,6 +97,16 @@ border-radius: 1000rpx; } +/** + * 商品导航 + */ +.spacing-nav-title { + color: #f6b015; +} +.spacing-nav-title .line { + background: #f6b015; +} + /** * 商品列表 */ diff --git a/sourcecode/qq/default/pages/user-integral/user-integral.qml b/sourcecode/qq/default/pages/user-integral/user-integral.qml index 3a1ae96be..53c70a18f 100755 --- a/sourcecode/qq/default/pages/user-integral/user-integral.qml +++ b/sourcecode/qq/default/pages/user-integral/user-integral.qml @@ -2,7 +2,6 @@ - {{item.type_text}} {{item.operation_integral}} {{item.add_time_time}} @@ -12,10 +11,6 @@ {{item.msg}} - - - - diff --git a/sourcecode/toutiao/default/app.json b/sourcecode/toutiao/default/app.json index 632255b7d..010aa6860 100755 --- a/sourcecode/toutiao/default/app.json +++ b/sourcecode/toutiao/default/app.json @@ -72,7 +72,8 @@ "pages/plugins/signin/user-qrcode/user-qrcode", "pages/plugins/signin/user-qrcode-detail/user-qrcode-detail", "pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo", - "pages/plugins/signin/user-coming-list/user-coming-list" + "pages/plugins/signin/user-coming-list/user-coming-list", + "pages/plugins/points/index/index" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss b/sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss index b0691a9ee..00fbaab54 100755 --- a/sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss +++ b/sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss @@ -23,7 +23,7 @@ } .data-list .items .title { margin-top: 10rpx; - font-size: 32rpx; + font-size: 30rpx; text-align:center; -o-text-overflow: ellipsis; text-overflow: ellipsis; diff --git a/sourcecode/toutiao/default/pages/buy/buy.js b/sourcecode/toutiao/default/pages/buy/buy.js index 644f0e159..bc20f3a29 100755 --- a/sourcecode/toutiao/default/pages/buy/buy.js +++ b/sourcecode/toutiao/default/pages/buy/buy.js @@ -33,13 +33,17 @@ Page({ plugins_choice_coupon_value: [], popup_plugins_coupon_status: false, popup_plugins_coupon_index: null, + + // 积分 + plugins_points_data: null, + plugins_points_status: false, }, onLoad(params) { //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}'; - if((params.data || null) != null && app.get_length(JSON.parse(params.data)) > 0) + if((params.data || null) != null && app.get_length(JSON.parse(decodeURIComponent(params.data))) > 0) { - this.setData({ params: JSON.parse(params.data)}); + this.setData({ params: JSON.parse(decodeURIComponent(params.data))}); // 删除地址缓存 tt.removeStorageSync(app.data.cache_buy_user_address_select_key); @@ -107,7 +111,7 @@ Page({ tt.request({ url: app.get_request_url("index", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { tt.stopPullDownRefresh(); @@ -128,7 +132,8 @@ Page({ data_list_loding_status: 3, common_site_type: data.common_site_type || 0, extraction_address: data.base.extraction_address || [], - plugins_coupon_data: data.plugins_coupon_data || null + plugins_coupon_data: data.plugins_coupon_data || null, + plugins_points_data: data.plugins_points_data || null, }); // 优惠劵选择处理 @@ -186,8 +191,9 @@ Page({ }); }, - // 请求参数合并优惠券参数 - request_data_coupon_merge(data) { + // 请求参数合并 + request_data_ext_params_merge(data) { + // 优惠券 var coupon_ids = this.data.plugins_use_coupon_ids; if ((coupon_ids || null) != null && coupon_ids.length > 0) { @@ -196,6 +202,9 @@ Page({ } } + // 积分 + data['is_points'] = (this.data.plugins_points_status === true) ? 1 : 0; + return data; }, @@ -256,7 +265,7 @@ Page({ tt.request({ url: app.get_request_url("add", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { tt.hideLoading(); @@ -413,6 +422,11 @@ Page({ var name = data.alias || data.name || ''; var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); app.open_location(data.lng, data.lat, name, address); - } + }, + // 积分选择事件 + points_event(e) { + this.setData({plugins_points_status: !this.data.plugins_points_status}); + this.init(); + }, }); \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/buy/buy.ttml b/sourcecode/toutiao/default/pages/buy/buy.ttml index 70aaf9c9d..bd384df21 100755 --- a/sourcecode/toutiao/default/pages/buy/buy.ttml +++ b/sourcecode/toutiao/default/pages/buy/buy.ttml @@ -90,6 +90,22 @@ {{user_note_value || '留言'}} + + + + 使用{{plugins_points_data.use_integral}}个积分兑换商品 + 使用积分{{plugins_points_data.use_integral}}个 + -{{currency_symbol}}{{plugins_points_data.discount_price}} + + + + + + 你有积分{{plugins_points_data.user_integral}}个 + 你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个 + + + diff --git a/sourcecode/toutiao/default/pages/buy/buy.ttss b/sourcecode/toutiao/default/pages/buy/buy.ttss index 5bfb2acc7..127d713f6 100755 --- a/sourcecode/toutiao/default/pages/buy/buy.ttss +++ b/sourcecode/toutiao/default/pages/buy/buy.ttss @@ -180,10 +180,10 @@ width: 50%; } -/** +/* * 插件样式区域 */ - /** +/* * 优惠劵 */ .plugins-coupon { @@ -209,4 +209,24 @@ .coupon-container .not-use-tips { color: #f7b240; font-size: 32rpx; +} + +/* + * 积分 + */ +.plugins-points-buy-container { + padding: 20rpx; +} +.plugins-points-buy-container .select .icon { + width: 45rpx; + height: 45rpx !important; + vertical-align: middle; +} +.plugins-points-buy-container .select .sales-price { + margin-left: 30rpx; + font-size: 28rpx; + font-weight: 400; +} +.plugins-points-buy-container .desc { + color: #F37B1D; } \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/cart/cart.js b/sourcecode/toutiao/default/pages/cart/cart.js index 54301648d..6f1d11e65 100755 --- a/sourcecode/toutiao/default/pages/cart/cart.js +++ b/sourcecode/toutiao/default/pages/cart/cart.js @@ -393,7 +393,7 @@ Page({ "ids": ids.join(',') }; tt.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); }, diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js index a85275ac4..9c0e4f606 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js @@ -610,7 +610,7 @@ Page({ "spec": JSON.stringify(spec) }; tt.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); this.popup_close_event(); break; diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml index d7b78f3ba..4d35d4a62 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml @@ -29,6 +29,23 @@ {{goods.title}} + + {{goods.simple_desc}} + + + + + {{item.name}} + + + + + + + {{item}} + + + diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss index 3e049bda1..d01ba7441 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss @@ -364,4 +364,45 @@ } .goods-parameters .content-item .item:nth-child(2n) { float: right; +} + +/* + * 商品简述 + */ +.goods-simple-desc { + color: #f00; + padding: 0 10rpx; + margin: 5rpx 0 15rpx 0; +} + +/* + * icon + */ +.goods-icon-container { + padding: 20rpx 10rpx 10rpx 10rpx; +} +.goods-icon-container view { + background: #fff; + border: 1px solid #3bb4f2; + color: #3bb4f2; + padding: 3rpx 15rpx; + border-radius: 8rpx; + margin-bottom: 10rpx; +} +.goods-icon-container view:not(:last-child) { + margin-right: 10rpx; +} + +/* + * 面板 + */ +.goods-panel-container { + background: #fffbfc; + color: #d2354c; +} +.goods-panel-container view { + padding: 15rpx 10rpx; +} +.goods-panel-container view:not(:first-child) { + border-top: 1px dashed #fff1f2; } \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/message/message.ttml b/sourcecode/toutiao/default/pages/message/message.ttml index a9ad2652d..c4f37bee3 100755 --- a/sourcecode/toutiao/default/pages/message/message.ttml +++ b/sourcecode/toutiao/default/pages/message/message.ttml @@ -7,10 +7,6 @@ {{item.detail}} - - - - diff --git a/sourcecode/toutiao/default/pages/plugins/points/index/index.js b/sourcecode/toutiao/default/pages/plugins/points/index/index.js new file mode 100644 index 000000000..152abe16e --- /dev/null +++ b/sourcecode/toutiao/default/pages/plugins/points/index/index.js @@ -0,0 +1,121 @@ +const app = getApp(); +Page({ + data: { + data_bottom_line_status: false, + data_list_loding_status: 1, + data_list_loding_msg: '', + params: null, + user: null, + data_base: null, + avatar_default: app.data.default_user_head_src, + }, + + onLoad(params) { + this.setData({ + params: params, + user: app.get_user_cache_info(), + }); + }, + + onShow() { + this.get_data(); + }, + + // 获取数据 + get_data() { + var self = this; + tt.request({ + url: app.get_request_url("index", "index", "points"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + tt.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + data_base: data.base || null, + data_list_loding_msg: '', + data_list_loding_status: 0, + data_bottom_line_status: true, + }); + } else { + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: res.data.msg, + }); + } + }, + fail: () => { + tt.stopPullDownRefresh(); + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: '服务器请求出错', + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.get_data(); + }, + + // 立即登录 + login_event() { + var user = app.get_user_info(this, "login_event") + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + tt.showModal({ + title: '温馨提示', + content: '绑定手机号码', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + tt.stopPullDownRefresh(); + if (result.confirm) { + tt.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + } + } + this.setData({user: user || null}); + }, + + // 图片事件 + right_images_event(e) { + if((this.data.data_base.right_images_url || null) != null) + { + tt.navigateTo({ + url: this.data.data_base.right_images_url, + }); + } + }, + + // 头像查看 + preview_event() { + if (app.data.default_user_head_src != this.data.user.avatar) { + tt.previewImage({ + current: this.data.user.avatar, + urls: [this.data.user.avatar] + }); + } + }, + + // 自定义分享 + onShareAppMessage() { + var user_id = app.get_user_cache_info('id', 0) || 0; + return { + title: this.data.data_base.seo_title || '积分商城 - '+app.data.application_title, + desc: this.data.data_base.seo_desc || '积分抵扣、兑换 - '+app.data.application_describe, + path: '/pages/plugins/signin/index-detail/index-detail?referrer=' + user_id + }; + }, +}); \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/plugins/points/index/index.json b/sourcecode/toutiao/default/pages/plugins/points/index/index.json new file mode 100644 index 000000000..971a839fa --- /dev/null +++ b/sourcecode/toutiao/default/pages/plugins/points/index/index.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#fe3e28", + "backgroundColorTop": "#fe3e28", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "积分商城" +} \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/plugins/points/index/index.ttml b/sourcecode/toutiao/default/pages/plugins/points/index/index.ttml new file mode 100644 index 000000000..64672fc53 --- /dev/null +++ b/sourcecode/toutiao/default/pages/plugins/points/index/index.ttml @@ -0,0 +1,64 @@ + + + + 我的积分 + + + 获知会员积分详情 + + + + + + {{user.user_name_view}} + 当前可用 {{user.integral}} 积分 + + + + + + + + + + + + + + + {{item}} + + + + + + + + 商品兑换 + + + + + + + {{item.goods.title}} + {{currency_symbol}}{{item.goods.price}} + + 需 + {{item.integral}} + 积分 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/plugins/points/index/index.ttss b/sourcecode/toutiao/default/pages/plugins/points/index/index.ttss new file mode 100644 index 000000000..0829a602b --- /dev/null +++ b/sourcecode/toutiao/default/pages/plugins/points/index/index.ttss @@ -0,0 +1,107 @@ +/** + * 顶部 + */ +.points-user { + background-color: #fe3e28; + position: relative; + padding: 100rpx 0 120rpx 0; +} +.points-user .avatar { + padding: 1px; + background: #ff9589; + margin: 0 auto; +} +.points-user .avatar, +.points-user .avatar image { + width: 160rpx; + height: 160rpx; + border-radius: 50%; +} +.points-user .user-name { + color: #fff; + margin: 10rpx 0 20rpx 0; +} +.points-user .user-desc { + color: #ffe7b2; +} +.points-user-menu-submit { + border: 1px solid #ffd606; + color: #fae501; + position: absolute; + top: 20rpx; + right: 20rpx; + padding: 6rpx 20rpx; + border-radius: 3rpx; +} +.submit-container { + position: absolute; + bottom: 20rpx; + right: 20rpx; +} +.submit-container button:not(:first-child) { + margin-left: 30rpx; +} +button.login-submit { + color: #5eb95e; + background-color: #E4F3E4; + border-color: #d2e8d2; + margin-bottom: 30rpx; +} +.submit-container button.share-submit { + color: #F37B1D; + background-color: #ffe5be; + border-color: #f8d093; +} + +/** + * 商品导航 + */ +.spacing-nav-title { + color: #fe3e28; +} +.spacing-nav-title .line { + background: #fe3e28; +} + +/** + * 商品列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + overflow: hidden; +} +.data-list .items { + width: calc(50% - 5rpx); + margin-bottom: 10rpx; + padding-bottom: 20rpx; +} +.data-list .items:nth-child(2n) { + float: right; +} +.data-list .items:nth-child(2n+1) { + float: left; +} +.data-list .items image { + width: 100%; + height: 200px !important; +} +.data-list .items .base { + text-align: left; + font-size: 32rpx; + padding: 0 15rpx; +} +.data-list .items .base, +.data-list .items .base .price { + margin-top: 10rpx; +} +.data-list .items .base .original-price { + margin-left: 0; +} +.data-list .items .base .price .sales-price { + margin: 0 5rpx; +} +.data-list .items .base .price .unit { + color: #f40; +} \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttml b/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttml index 012c25e5d..8c617e569 100644 --- a/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttml +++ b/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttml @@ -55,8 +55,8 @@ {{item.title}} - - {{currency_symbol}}{{item.min_price}} + + {{currency_symbol}}{{item.price}} @@ -75,7 +75,7 @@ 获得 {{coming_integral}} 积分 - + diff --git a/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss b/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss index e842d8b1e..7fe7ed8cc 100644 --- a/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss +++ b/sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss @@ -97,6 +97,16 @@ border-radius: 1000rpx; } +/** + * 商品导航 + */ +.spacing-nav-title { + color: #f6b015; +} +.spacing-nav-title .line { + background: #f6b015; +} + /** * 商品列表 */ diff --git a/sourcecode/toutiao/default/pages/user-integral/user-integral.ttml b/sourcecode/toutiao/default/pages/user-integral/user-integral.ttml index 65aaafa3a..899ae7723 100755 --- a/sourcecode/toutiao/default/pages/user-integral/user-integral.ttml +++ b/sourcecode/toutiao/default/pages/user-integral/user-integral.ttml @@ -2,7 +2,6 @@ - {{item.type_text}} {{item.operation_integral}} {{item.add_time_time}} @@ -12,10 +11,6 @@ {{item.msg}} - - - - diff --git a/sourcecode/weixin/default/app.json b/sourcecode/weixin/default/app.json index d12983f58..74eeb4ca2 100755 --- a/sourcecode/weixin/default/app.json +++ b/sourcecode/weixin/default/app.json @@ -78,7 +78,8 @@ "pages/plugins/signin/user-qrcode/user-qrcode", "pages/plugins/signin/user-qrcode-detail/user-qrcode-detail", "pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo", - "pages/plugins/signin/user-coming-list/user-coming-list" + "pages/plugins/signin/user-coming-list/user-coming-list", + "pages/plugins/points/index/index" ], "permission": { "scope.userLocation": { diff --git a/sourcecode/weixin/default/components/icon-nav/icon-nav.wxss b/sourcecode/weixin/default/components/icon-nav/icon-nav.wxss index b0691a9ee..00fbaab54 100755 --- a/sourcecode/weixin/default/components/icon-nav/icon-nav.wxss +++ b/sourcecode/weixin/default/components/icon-nav/icon-nav.wxss @@ -23,7 +23,7 @@ } .data-list .items .title { margin-top: 10rpx; - font-size: 32rpx; + font-size: 30rpx; text-align:center; -o-text-overflow: ellipsis; text-overflow: ellipsis; diff --git a/sourcecode/weixin/default/pages/buy/buy.js b/sourcecode/weixin/default/pages/buy/buy.js index 9f5a29c71..2bbea964c 100755 --- a/sourcecode/weixin/default/pages/buy/buy.js +++ b/sourcecode/weixin/default/pages/buy/buy.js @@ -33,13 +33,17 @@ Page({ plugins_choice_coupon_value: [], popup_plugins_coupon_status: false, popup_plugins_coupon_index: null, + + // 积分 + plugins_points_data: null, + plugins_points_status: false, }, onLoad(params) { //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}'; - if((params.data || null) != null && app.get_length(JSON.parse(params.data)) > 0) + if((params.data || null) != null && app.get_length(JSON.parse(decodeURIComponent(params.data))) > 0) { - this.setData({ params: JSON.parse(params.data)}); + this.setData({ params: JSON.parse(decodeURIComponent(params.data))}); // 删除地址缓存 wx.removeStorageSync(app.data.cache_buy_user_address_select_key); @@ -107,7 +111,7 @@ Page({ wx.request({ url: app.get_request_url("index", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { wx.stopPullDownRefresh(); @@ -126,6 +130,7 @@ Page({ common_site_type: data.common_site_type || 0, extraction_address: data.base.extraction_address || [], plugins_coupon_data: data.plugins_coupon_data || null, + plugins_points_data: data.plugins_points_data || null, }); // 优惠劵选择处理 @@ -182,8 +187,9 @@ Page({ }); }, - // 请求参数合并优惠券参数 - request_data_coupon_merge(data) { + // 请求参数合并 + request_data_ext_params_merge(data) { + // 优惠券 var coupon_ids = this.data.plugins_use_coupon_ids; if((coupon_ids || null) != null && coupon_ids.length > 0) { @@ -192,6 +198,10 @@ Page({ data['coupon_id_'+i] = coupon_ids[i]; } } + + // 积分 + data['is_points'] = (this.data.plugins_points_status === true) ? 1 : 0; + return data; }, @@ -242,7 +252,7 @@ Page({ wx.request({ url: app.get_request_url("add", "buy"), method: "POST", - data: this.request_data_coupon_merge(data), + data: this.request_data_ext_params_merge(data), dataType: "json", success: res => { wx.hideLoading(); @@ -384,4 +394,10 @@ Page({ var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''); app.open_location(data.lng, data.lat, name, address); }, + + // 积分选择事件 + points_event(e) { + this.setData({plugins_points_status: !this.data.plugins_points_status}); + this.init(); + }, }); diff --git a/sourcecode/weixin/default/pages/buy/buy.wxml b/sourcecode/weixin/default/pages/buy/buy.wxml index 006f45564..526014401 100755 --- a/sourcecode/weixin/default/pages/buy/buy.wxml +++ b/sourcecode/weixin/default/pages/buy/buy.wxml @@ -90,6 +90,22 @@ {{user_note_value || '留言'}} + + + + 使用{{plugins_points_data.use_integral}}个积分兑换商品 + 使用积分{{plugins_points_data.use_integral}}个 + -{{currency_symbol}}{{plugins_points_data.discount_price}} + + + + + + 你有积分{{plugins_points_data.user_integral}}个 + 你有积分{{plugins_points_data.user_integral}}个，可用{{plugins_points_data.use_integral}}个 + + + diff --git a/sourcecode/weixin/default/pages/buy/buy.wxss b/sourcecode/weixin/default/pages/buy/buy.wxss index 5bfb2acc7..127d713f6 100755 --- a/sourcecode/weixin/default/pages/buy/buy.wxss +++ b/sourcecode/weixin/default/pages/buy/buy.wxss @@ -180,10 +180,10 @@ width: 50%; } -/** +/* * 插件样式区域 */ - /** +/* * 优惠劵 */ .plugins-coupon { @@ -209,4 +209,24 @@ .coupon-container .not-use-tips { color: #f7b240; font-size: 32rpx; +} + +/* + * 积分 + */ +.plugins-points-buy-container { + padding: 20rpx; +} +.plugins-points-buy-container .select .icon { + width: 45rpx; + height: 45rpx !important; + vertical-align: middle; +} +.plugins-points-buy-container .select .sales-price { + margin-left: 30rpx; + font-size: 28rpx; + font-weight: 400; +} +.plugins-points-buy-container .desc { + color: #F37B1D; } \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/cart/cart.js b/sourcecode/weixin/default/pages/cart/cart.js index d64c66c30..def004b3a 100755 --- a/sourcecode/weixin/default/pages/cart/cart.js +++ b/sourcecode/weixin/default/pages/cart/cart.js @@ -393,7 +393,7 @@ Page({ "ids": ids.join(',') }; wx.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); }, diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js index f4276d9c7..37249395d 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js @@ -629,7 +629,7 @@ Page({ "spec": JSON.stringify(spec) }; wx.navigateTo({ - url: '/pages/buy/buy?data=' + JSON.stringify(data) + url: '/pages/buy/buy?data=' + encodeURIComponent(JSON.stringify(data)) }); this.popup_close_event(); break; diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml index 98dfbdf64..d9013cc47 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml @@ -29,6 +29,23 @@ {{goods.title}} + + {{goods.simple_desc}} + + + + + {{item.name}} + + + + + + + {{item}} + + + diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss index fd0140542..a5b7f9146 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss @@ -363,4 +363,45 @@ } .goods-parameters .content-item .item:nth-child(2n) { float: right; +} + +/* + * 商品简述 + */ +.goods-simple-desc { + color: #f00; + padding: 0 10rpx; + margin: 5rpx 0 15rpx 0; +} + +/* + * icon + */ +.goods-icon-container { + padding: 20rpx 10rpx 10rpx 10rpx; +} +.goods-icon-container view { + background: #fff; + border: 1px solid #3bb4f2; + color: #3bb4f2; + padding: 3rpx 15rpx; + border-radius: 8rpx; + margin-bottom: 10rpx; +} +.goods-icon-container view:not(:last-child) { + margin-right: 10rpx; +} + +/* + * 面板 + */ +.goods-panel-container { + background: #fffbfc; + color: #d2354c; +} +.goods-panel-container view { + padding: 15rpx 10rpx; +} +.goods-panel-container view:not(:first-child) { + border-top: 1px dashed #fff1f2; } \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/message/message.wxml b/sourcecode/weixin/default/pages/message/message.wxml index 2ed61ea3c..f3e0b1fe5 100755 --- a/sourcecode/weixin/default/pages/message/message.wxml +++ b/sourcecode/weixin/default/pages/message/message.wxml @@ -7,10 +7,6 @@ {{item.detail}} - - - - diff --git a/sourcecode/weixin/default/pages/plugins/points/index/index.js b/sourcecode/weixin/default/pages/plugins/points/index/index.js new file mode 100644 index 000000000..8a8089ad7 --- /dev/null +++ b/sourcecode/weixin/default/pages/plugins/points/index/index.js @@ -0,0 +1,134 @@ +const app = getApp(); +Page({ + data: { + data_bottom_line_status: false, + data_list_loding_status: 1, + data_list_loding_msg: '', + params: null, + user: null, + data_base: null, + avatar_default: app.data.default_user_head_src, + }, + + onLoad(params) { + this.setData({ + params: params, + user: app.get_user_cache_info(), + }); + }, + + onShow() { + this.get_data(); + + // 显示分享菜单 + app.show_share_menu(); + }, + + // 获取数据 + get_data() { + var self = this; + wx.request({ + url: app.get_request_url("index", "index", "points"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + data_base: data.base || null, + data_list_loding_msg: '', + data_list_loding_status: 0, + data_bottom_line_status: true, + }); + } else { + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: res.data.msg, + }); + } + }, + fail: () => { + wx.stopPullDownRefresh(); + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: '服务器请求出错', + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.get_data(); + }, + + // 立即登录 + login_event() { + var user = app.get_user_info(this, "login_event") + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.showModal({ + title: '温馨提示', + content: '绑定手机号码', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + wx.stopPullDownRefresh(); + if (result.confirm) { + wx.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + } + } + this.setData({user: user || null}); + }, + + // 图片事件 + right_images_event(e) { + if((this.data.data_base.right_images_url || null) != null) + { + wx.navigateTo({ + url: this.data.data_base.right_images_url, + }); + } + }, + + // 头像查看 + preview_event() { + if (app.data.default_user_head_src != this.data.user.avatar) { + wx.previewImage({ + current: this.data.user.avatar, + urls: [this.data.user.avatar] + }); + } + }, + + // 自定义分享 + onShareAppMessage() { + var user_id = app.get_user_cache_info('id', 0) || 0; + return { + title: this.data.data_base.seo_title || '积分商城 - '+app.data.application_title, + desc: this.data.data_base.seo_desc || '积分抵扣、兑换 - '+app.data.application_describe, + path: '/pages/plugins/signin/index-detail/index-detail?referrer=' + user_id + }; + }, + + // 分享朋友圈 + onShareTimeline() { + var user_id = app.get_user_cache_info('id', 0) || 0; + return { + title: this.data.data_base.seo_title || '积分商城 - '+app.data.application_title, + query: 'referrer=' + user_id, + imageUrl: this.data.data_base.right_images || '' + }; + }, +}); \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/plugins/points/index/index.json b/sourcecode/weixin/default/pages/plugins/points/index/index.json new file mode 100644 index 000000000..971a839fa --- /dev/null +++ b/sourcecode/weixin/default/pages/plugins/points/index/index.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#fe3e28", + "backgroundColorTop": "#fe3e28", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "积分商城" +} \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/plugins/points/index/index.wxml b/sourcecode/weixin/default/pages/plugins/points/index/index.wxml new file mode 100644 index 000000000..0dccd95ad --- /dev/null +++ b/sourcecode/weixin/default/pages/plugins/points/index/index.wxml @@ -0,0 +1,64 @@ + + + + 我的积分 + + + 获知会员积分详情 + + + + + + {{user.user_name_view}} + 当前可用 {{user.integral}} 积分 + + + + + + + + + + + + + + + {{item}} + + + + + + + + 商品兑换 + + + + + + + {{item.goods.title}} + {{currency_symbol}}{{item.goods.price}} + + 需 + {{item.integral}} + 积分 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/plugins/points/index/index.wxss b/sourcecode/weixin/default/pages/plugins/points/index/index.wxss new file mode 100644 index 000000000..0829a602b --- /dev/null +++ b/sourcecode/weixin/default/pages/plugins/points/index/index.wxss @@ -0,0 +1,107 @@ +/** + * 顶部 + */ +.points-user { + background-color: #fe3e28; + position: relative; + padding: 100rpx 0 120rpx 0; +} +.points-user .avatar { + padding: 1px; + background: #ff9589; + margin: 0 auto; +} +.points-user .avatar, +.points-user .avatar image { + width: 160rpx; + height: 160rpx; + border-radius: 50%; +} +.points-user .user-name { + color: #fff; + margin: 10rpx 0 20rpx 0; +} +.points-user .user-desc { + color: #ffe7b2; +} +.points-user-menu-submit { + border: 1px solid #ffd606; + color: #fae501; + position: absolute; + top: 20rpx; + right: 20rpx; + padding: 6rpx 20rpx; + border-radius: 3rpx; +} +.submit-container { + position: absolute; + bottom: 20rpx; + right: 20rpx; +} +.submit-container button:not(:first-child) { + margin-left: 30rpx; +} +button.login-submit { + color: #5eb95e; + background-color: #E4F3E4; + border-color: #d2e8d2; + margin-bottom: 30rpx; +} +.submit-container button.share-submit { + color: #F37B1D; + background-color: #ffe5be; + border-color: #f8d093; +} + +/** + * 商品导航 + */ +.spacing-nav-title { + color: #fe3e28; +} +.spacing-nav-title .line { + background: #fe3e28; +} + +/** + * 商品列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list { + overflow: hidden; +} +.data-list .items { + width: calc(50% - 5rpx); + margin-bottom: 10rpx; + padding-bottom: 20rpx; +} +.data-list .items:nth-child(2n) { + float: right; +} +.data-list .items:nth-child(2n+1) { + float: left; +} +.data-list .items image { + width: 100%; + height: 200px !important; +} +.data-list .items .base { + text-align: left; + font-size: 32rpx; + padding: 0 15rpx; +} +.data-list .items .base, +.data-list .items .base .price { + margin-top: 10rpx; +} +.data-list .items .base .original-price { + margin-left: 0; +} +.data-list .items .base .price .sales-price { + margin: 0 5rpx; +} +.data-list .items .base .price .unit { + color: #f40; +} \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.js b/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.js index 4ed99b22e..fedb8b475 100644 --- a/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.js +++ b/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.js @@ -25,6 +25,9 @@ Page({ onShow() { this.get_data(); + + // 显示分享菜单 + app.show_share_menu(); }, // 获取数据 @@ -76,8 +79,7 @@ Page({ // 初始化 init() { - var user = app.get_user_info(this, "init"), - self = this; + var user = app.get_user_info(this, "init"); if (user != false) { // 用户未绑定用户则转到登录页面 if (app.user_is_need_login(user)) { diff --git a/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxml b/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxml index c58922b86..d0acf46e0 100644 --- a/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxml +++ b/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxml @@ -55,8 +55,8 @@ {{item.title}} - - {{currency_symbol}}{{item.min_price}} + + {{currency_symbol}}{{item.price}} @@ -75,7 +75,7 @@ 获得 {{coming_integral}} 积分 - + diff --git a/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss b/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss index e842d8b1e..7fe7ed8cc 100644 --- a/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss +++ b/sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss @@ -97,6 +97,16 @@ border-radius: 1000rpx; } +/** + * 商品导航 + */ +.spacing-nav-title { + color: #f6b015; +} +.spacing-nav-title .line { + background: #f6b015; +} + /** * 商品列表 */ diff --git a/sourcecode/weixin/default/pages/plugins/weixinliveplayer/search/search.js b/sourcecode/weixin/default/pages/plugins/weixinliveplayer/search/search.js index 06b776846..267fd7134 100644 --- a/sourcecode/weixin/default/pages/plugins/weixinliveplayer/search/search.js +++ b/sourcecode/weixin/default/pages/plugins/weixinliveplayer/search/search.js @@ -93,12 +93,12 @@ Page({ } } this.setData({ + data_base: res.data.data.base || null, data_list: temp_data_list, data_total: res.data.data.total, data_page_total: res.data.data.page_total, data_list_loding_status: 3, data_page: this.data.data_page + 1, - data_base: data.base || null, }); // 是否还有数据 diff --git a/sourcecode/weixin/default/pages/user-integral/user-integral.wxml b/sourcecode/weixin/default/pages/user-integral/user-integral.wxml index 34a53aab2..7c46788bf 100755 --- a/sourcecode/weixin/default/pages/user-integral/user-integral.wxml +++ b/sourcecode/weixin/default/pages/user-integral/user-integral.wxml @@ -2,7 +2,6 @@ - {{item.type_text}} {{item.operation_integral}} {{item.add_time_time}} @@ -12,10 +11,6 @@ {{item.msg}} - - - -