Commit f10612bb1c00957ccdcc71eb7c13a42dacde27c1
1 parent
70dd564a
报警的:getApp().globalData.config.store_name
Showing
6 changed files
with
36 additions
and
10 deletions
packageA/pages/goodsInfo/goodsInfo.js
| @@ -2166,8 +2166,12 @@ Page({ | @@ -2166,8 +2166,12 @@ Page({ | ||
| 2166 | }, | 2166 | }, |
| 2167 | 2167 | ||
| 2168 | onShareTimeline() { | 2168 | onShareTimeline() { |
| 2169 | + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; | ||
| 2170 | + if(!store_name) | ||
| 2171 | + store_name=getApp().globalData.setting.appName; | ||
| 2172 | + | ||
| 2169 | return { | 2173 | return { |
| 2170 | - title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name, | 2174 | + title:this.data.data.goods_name + '-' + store_name, |
| 2171 | imageUrl:this.data.gallery[0].image_url, | 2175 | imageUrl:this.data.gallery[0].image_url, |
| 2172 | } | 2176 | } |
| 2173 | }, | 2177 | }, |
pages/activity/pind_list/pind_list.js
| @@ -27,6 +27,7 @@ Page({ | @@ -27,6 +27,7 @@ Page({ | ||
| 27 | 27 | ||
| 28 | console.log("------------"); | 28 | console.log("------------"); |
| 29 | console.log(first_leader); | 29 | console.log(first_leader); |
| 30 | + getApp().getConfig(); | ||
| 30 | 31 | ||
| 31 | if (first_leader) { | 32 | if (first_leader) { |
| 32 | getApp().globalData.first_leader = first_leader; | 33 | getApp().globalData.first_leader = first_leader; |
| @@ -221,6 +222,15 @@ Page({ | @@ -221,6 +222,15 @@ Page({ | ||
| 221 | if (hei< viewHeight) { | 222 | if (hei< viewHeight) { |
| 222 | this.setData({ max_sw_height: viewHeight }); | 223 | this.setData({ max_sw_height: viewHeight }); |
| 223 | } | 224 | } |
| 224 | - } | 225 | + }, |
| 226 | + | ||
| 227 | + onShareTimeline() { | ||
| 228 | + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; | ||
| 229 | + if(!store_name) | ||
| 230 | + store_name=getApp().globalData.setting.appName; | ||
| 231 | + return { | ||
| 232 | + title: '秒杀活动-' + store_name, | ||
| 233 | + } | ||
| 234 | + }, | ||
| 225 | 235 | ||
| 226 | }); | 236 | }); |
pages/activity/seckill_list/seckill_list.js
| @@ -23,7 +23,8 @@ Page({ | @@ -23,7 +23,8 @@ Page({ | ||
| 23 | var th=this; | 23 | var th=this; |
| 24 | 24 | ||
| 25 | console.log("------------"); | 25 | console.log("------------"); |
| 26 | - console.log(first_leader); | 26 | + console.log(first_leader); |
| 27 | + getApp().getConfig(); | ||
| 27 | 28 | ||
| 28 | if (first_leader) { | 29 | if (first_leader) { |
| 29 | getApp().globalData.first_leader = first_leader; | 30 | getApp().globalData.first_leader = first_leader; |
| @@ -204,8 +205,11 @@ Page({ | @@ -204,8 +205,11 @@ Page({ | ||
| 204 | }, | 205 | }, |
| 205 | 206 | ||
| 206 | onShareTimeline() { | 207 | onShareTimeline() { |
| 208 | + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; | ||
| 209 | + if(!store_name) | ||
| 210 | + store_name=getApp().globalData.setting.appName; | ||
| 207 | return { | 211 | return { |
| 208 | - title: '秒杀活动-' + getApp().globalData.config.store_name, | 212 | + title: '秒杀活动-' + store_name, |
| 209 | } | 213 | } |
| 210 | }, | 214 | }, |
| 211 | 215 |
pages/goods/categoryList/categoryList.js
| @@ -578,7 +578,7 @@ Page({ | @@ -578,7 +578,7 @@ Page({ | ||
| 578 | //---------分享配置-------- | 578 | //---------分享配置-------- |
| 579 | onShareAppMessage: function (e) { | 579 | onShareAppMessage: function (e) { |
| 580 | 580 | ||
| 581 | - url="pages/goods/categoryList/categoryList"; | 581 | + var url="pages/goods/categoryList/categoryList"; |
| 582 | var userInfo=getApp().globalData.userInfo; | 582 | var userInfo=getApp().globalData.userInfo; |
| 583 | //是分销商才带 | 583 | //是分销商才带 |
| 584 | if(userInfo){ | 584 | if(userInfo){ |
| @@ -1042,8 +1042,11 @@ Page({ | @@ -1042,8 +1042,11 @@ Page({ | ||
| 1042 | }, | 1042 | }, |
| 1043 | 1043 | ||
| 1044 | onShareTimeline(){ | 1044 | onShareTimeline(){ |
| 1045 | + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; | ||
| 1046 | + if(!store_name) | ||
| 1047 | + store_name=getApp().globalData.setting.appName; | ||
| 1045 | return { | 1048 | return { |
| 1046 | - title:'商品分类-'+getApp().globalData.config.store_name, | 1049 | + title:'商品分类-'+store_name, |
| 1047 | } | 1050 | } |
| 1048 | } | 1051 | } |
| 1049 | 1052 |
pages/goods/goodsInfo/goodsInfo.js
| @@ -5233,8 +5233,11 @@ Page({ | @@ -5233,8 +5233,11 @@ Page({ | ||
| 5233 | 5233 | ||
| 5234 | 5234 | ||
| 5235 | onShareTimeline() { | 5235 | onShareTimeline() { |
| 5236 | + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; | ||
| 5237 | + if(!store_name) | ||
| 5238 | + store_name=getApp().globalData.setting.appName; | ||
| 5236 | return { | 5239 | return { |
| 5237 | - title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name, | 5240 | + title:this.data.data.goods_name + '-' + store_name, |
| 5238 | imageUrl:this.data.gallery[0].image_url, | 5241 | imageUrl:this.data.gallery[0].image_url, |
| 5239 | } | 5242 | } |
| 5240 | }, | 5243 | }, |
pages/index/index/index.js
| @@ -668,7 +668,7 @@ Page({ | @@ -668,7 +668,7 @@ Page({ | ||
| 668 | } | 668 | } |
| 669 | 669 | ||
| 670 | var ob={ | 670 | var ob={ |
| 671 | - title: getApp().globalData.config.store_name, | 671 | + title: title, |
| 672 | path:url, | 672 | path:url, |
| 673 | }; | 673 | }; |
| 674 | console.log(ob); | 674 | console.log(ob); |
| @@ -1042,9 +1042,11 @@ Page({ | @@ -1042,9 +1042,11 @@ Page({ | ||
| 1042 | // title: '首页-' + getApp().globalData.config.store_name, | 1042 | // title: '首页-' + getApp().globalData.config.store_name, |
| 1043 | // } | 1043 | // } |
| 1044 | // }); | 1044 | // }); |
| 1045 | - | 1045 | + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; |
| 1046 | + if(!store_name) | ||
| 1047 | + store_name=getApp().globalData.setting.appName; | ||
| 1046 | return { | 1048 | return { |
| 1047 | - title: '首页-' + getApp().globalData.config.store_name, | 1049 | + title: '首页-' + store_name, |
| 1048 | } | 1050 | } |
| 1049 | }, | 1051 | }, |
| 1050 | 1052 |