Commit 935c5880a4819848e3e09a7ce6366728ae88bb35
1 parent
194efa9c
首页、分类、助力活动页增加分享到朋友圈
Showing
5 changed files
with
49 additions
and
12 deletions
app.wxss
| @@ -446,12 +446,12 @@ background: #ffe3e2; | @@ -446,12 +446,12 @@ background: #ffe3e2; | ||
| 446 | /* 图标字体(ty) */ | 446 | /* 图标字体(ty) */ |
| 447 | @font-face { | 447 | @font-face { |
| 448 | font-family: 'iconfont'; /* project id 2054717 */ | 448 | font-family: 'iconfont'; /* project id 2054717 */ |
| 449 | - src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot'); | ||
| 450 | - src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot?#iefix') format('embedded-opentype'), | ||
| 451 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff2') format('woff2'), | ||
| 452 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff') format('woff'), | ||
| 453 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.ttf') format('truetype'), | ||
| 454 | - url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.svg#iconfont') format('svg'); | 449 | + src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot'); |
| 450 | + src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot?#iefix') format('embedded-opentype'), | ||
| 451 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff2') format('woff2'), | ||
| 452 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff') format('woff'), | ||
| 453 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.ttf') format('truetype'), | ||
| 454 | + url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.svg#iconfont') format('svg'); | ||
| 455 | } | 455 | } |
| 456 | 456 | ||
| 457 | .iconfont { | 457 | .iconfont { |
| @@ -462,6 +462,10 @@ background: #ffe3e2; | @@ -462,6 +462,10 @@ background: #ffe3e2; | ||
| 462 | -moz-osx-font-smoothing: grayscale; | 462 | -moz-osx-font-smoothing: grayscale; |
| 463 | } | 463 | } |
| 464 | 464 | ||
| 465 | +.icon-shanchu:before { | ||
| 466 | + content: "\e61b"; | ||
| 467 | +} | ||
| 468 | + | ||
| 465 | .icon-buqian:before { | 469 | .icon-buqian:before { |
| 466 | content: "\e65f"; | 470 | content: "\e65f"; |
| 467 | } | 471 | } |
pages/goods/categoryList/categoryList.js
| @@ -1012,6 +1012,13 @@ Page({ | @@ -1012,6 +1012,13 @@ Page({ | ||
| 1012 | if(!url || url=='') return; | 1012 | if(!url || url=='') return; |
| 1013 | if(url[0]!='/') url='/'+url; | 1013 | if(url[0]!='/') url='/'+url; |
| 1014 | getApp().goto(url); | 1014 | getApp().goto(url); |
| 1015 | - } | 1015 | + }, |
| 1016 | + | ||
| 1017 | + | ||
| 1018 | + onShareTimeline() { | ||
| 1019 | + return { | ||
| 1020 | + title: '商品分类-' + getApp().globalData.config.store_name, | ||
| 1021 | + } | ||
| 1022 | + }, | ||
| 1016 | 1023 | ||
| 1017 | }); | 1024 | }); |
| 1018 | \ No newline at end of file | 1025 | \ No newline at end of file |
pages/index/index/index.js
| @@ -884,7 +884,17 @@ Page({ | @@ -884,7 +884,17 @@ Page({ | ||
| 884 | }, | 884 | }, |
| 885 | 885 | ||
| 886 | 886 | ||
| 887 | - | 887 | + onShareTimeline() { |
| 888 | + // getApp().getConfig(function(t) { | ||
| 889 | + // return { | ||
| 890 | + // title: '首页-' + getApp().globalData.config.store_name, | ||
| 891 | + // } | ||
| 892 | + // }); | ||
| 893 | + | ||
| 894 | + return { | ||
| 895 | + title: '首页-' + getApp().globalData.config.store_name, | ||
| 896 | + } | ||
| 897 | + }, | ||
| 888 | 898 | ||
| 889 | 899 | ||
| 890 | }); | 900 | }); |
| 891 | \ No newline at end of file | 901 | \ No newline at end of file |
pages/user/assistance/assistance.js
| @@ -228,6 +228,22 @@ Page({ | @@ -228,6 +228,22 @@ Page({ | ||
| 228 | var help_id = this.data.help_id; | 228 | var help_id = this.data.help_id; |
| 229 | var taskid=e.currentTarget.dataset.taskid; | 229 | var taskid=e.currentTarget.dataset.taskid; |
| 230 | getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid); | 230 | getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid); |
| 231 | - } | 231 | + }, |
| 232 | + | ||
| 233 | + onShareAppMessage(res) { | ||
| 234 | + if (res.from === 'button') { | ||
| 235 | + // 来自页面内转发按钮 | ||
| 236 | + console.log(res.target) | ||
| 237 | + } | ||
| 238 | + return { | ||
| 239 | + // title: '自定义转发标题', | ||
| 240 | + } | ||
| 241 | + }, | ||
| 242 | + | ||
| 243 | + onShareTimeline() { | ||
| 244 | + return { | ||
| 245 | + title: '好友助力-' + getApp().globalData.config.store_name, | ||
| 246 | + } | ||
| 247 | + }, | ||
| 232 | 248 | ||
| 233 | }) | 249 | }) |
pages/user/index/index.wxml
| @@ -213,19 +213,19 @@ | @@ -213,19 +213,19 @@ | ||
| 213 | </block> | 213 | </block> |
| 214 | <block wx:elif="{{item.name=='助力活动'}}"> | 214 | <block wx:elif="{{item.name=='助力活动'}}"> |
| 215 | <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}"> | 215 | <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}"> |
| 216 | - <image class="xc-center-img " src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image> | 216 | + <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image> |
| 217 | <view class="four-level-word">助力活动</view> | 217 | <view class="four-level-word">助力活动</view> |
| 218 | </view> | 218 | </view> |
| 219 | </block> | 219 | </block> |
| 220 | <block wx:elif="{{item.name=='我的权益'}}"> | 220 | <block wx:elif="{{item.name=='我的权益'}}"> |
| 221 | <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}"> | 221 | <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}"> |
| 222 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | 222 | + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> |
| 223 | <view class="fs26">我的权益</view> | 223 | <view class="fs26">我的权益</view> |
| 224 | </view> | 224 | </view> |
| 225 | </block> | 225 | </block> |
| 226 | <block wx:else> | 226 | <block wx:else> |
| 227 | <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> | 227 | <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> |
| 228 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | 228 | + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> |
| 229 | <view class="fs26">{{item.name}}</view> | 229 | <view class="fs26">{{item.name}}</view> |
| 230 | </view> | 230 | </view> |
| 231 | </block> | 231 | </block> |