wxd / MShopWeApp

Commit 7a4a05c192b66ba153ccfdd13be03e4e730d5fe7

Authored by 后端研发-苏明海
2 parents 495b4464 4fcb9f9b

Merge branch 'dev' into 'test' 

Dev

See merge request !581
Inline Side-by-side
Showing 11 changed files with 37 additions and 16 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @7a4a05c
... ... @@ -278,7 +278,7 @@ Component({
278 278 if (!user) return false;
279 279 clearInterval(ti);
280 280  
281   - if (user.card_field) {
  281 + if (user.card_field && user['card_expiredate']) {
282 282 var str = user['card_expiredate'].replace(/-/g, '/');
283 283 var end = new Date(str);
284 284 end = Date.parse(end) / 1000;
... ...
components/goods_list/goods_list.js
  View file @7a4a05c
... ... @@ -54,7 +54,7 @@ Component({
54 54 var user = getApp().globalData.userInfo;
55 55 if (!user) return false;
56 56 clearInterval(ti);
57   - if (user.card_field) {
  57 + if (user.card_field && user['card_expiredate']) {
58 58 var str = user['card_expiredate'].replace(/-/g, '/');
59 59 var end = new Date(str);
60 60 end = Date.parse(end) / 1000;
... ...
packageA/pages/activity_share/activity_share.js
  View file @7a4a05c
... ... @@ -72,7 +72,7 @@ Page({
72 72 getApp().request.promiseGet("/api/weshop/goods/poster/page",{
73 73 data:{store_id:os.stoid, type:1, is_use:1 }
74 74 }).then(res=>{
75   - if(res.data.code==0){
  75 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
76 76  
77 77 var poster_data=res.data.data.pageData[0];
78 78 var json_str=poster_data.jsonStr;
... ...
packageA/pages/goods_share/goods_share.js
  View file @7a4a05c
... ... @@ -49,7 +49,7 @@ Page({
49 49 getApp().request.promiseGet("/api/weshop/goods/poster/page",{
50 50 data:{store_id:os.stoid, type:1, is_use:1 }
51 51 }).then(res=>{
52   - if(res.data.code==0){
  52 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
53 53  
54 54 var poster_data=res.data.data.pageData[0];
55 55 var json_str=poster_data.jsonStr;
... ... @@ -112,7 +112,7 @@ Page({
112 112 if(!user) return false;
113 113 clearInterval(ti);
114 114  
115   - if(user.card_field ){
  115 + if(user.card_field && user['card_expiredate']){
116 116 var str = user['card_expiredate'].replace(/-/g, '/');
117 117 var end = new Date(str);
118 118 end = Date.parse(end) / 1000;
... ...
packageA/pages/prom_list/prom_list.js
  View file @7a4a05c
... ... @@ -221,7 +221,7 @@ Page({
221 221 th.getPlusCardType(function(ob){
222 222 var user = getApp().globalData.userInfo;
223 223 if(user){
224   - if(user.card_field ){
  224 + if(user.card_field && user['card_expiredate']){
225 225 var str = user['card_expiredate'].replace(/-/g, '/');
226 226 var end = new Date(str);
227 227 end = Date.parse(end) / 1000;
... ...
pages/goods/categoryList/categoryList.js
  View file @7a4a05c
... ... @@ -155,7 +155,7 @@ Page({
155 155 //---回调卡的列表---
156 156 th.getPlusCardType(function (ob) {
157 157 th.setData({ card_list: ob.card_list });
158   - if (user.card_field) {
  158 + if (user.card_field && user['card_expiredate']) {
159 159 var str = user['card_expiredate'].replace(/-/g, '/');
160 160 var end = new Date(str);
161 161 end = Date.parse(end) / 1000;
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @7a4a05c
... ... @@ -264,7 +264,7 @@ Page({
264 264 getApp().request.promiseGet("/api/weshop/goods/poster/page",{
265 265 data:{store_id:os.stoid, type:1, is_use:1 }
266 266 }).then(res=>{
267   - if(res.data.code==0){
  267 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
268 268  
269 269 var poster_data=res.data.data.pageData[0];
270 270 var json_str=poster_data.jsonStr;
... ... @@ -386,7 +386,7 @@ Page({
386 386 if (!user) return false;
387 387 clearInterval(ti);
388 388  
389   - if(user.card_field ){
  389 + if(user.card_field && user['card_expiredate']){
390 390 var str = user['card_expiredate'].replace(/-/g, '/');
391 391 var end = new Date(str);
392 392 end = Date.parse(end) / 1000;
... ... @@ -980,6 +980,10 @@ Page({
980 980 if (oo.user_id == null) {
981 981 return s.my_warnning("还未登录！", 0, this);
982 982 }
  983 + if(!getApp().globalData.userInfo){
  984 + return s.my_warnning("还未登录！", 0, this);
  985 + }
  986 +
983 987 var e = this,
984 988 th = e,
985 989 a = 0,
... ... @@ -1076,6 +1080,11 @@ Page({
1076 1080 if (oo.user_id == null) {
1077 1081 return s.my_warnning("还未登录！", 0, this);
1078 1082 }
  1083 +
  1084 + if(!getApp().globalData.userInfo){
  1085 + return s.my_warnning("还未登录！", 0, this);
  1086 + }
  1087 +
1079 1088 var e = this,
1080 1089 th = e,
1081 1090 a = 0,
... ... @@ -1226,9 +1235,11 @@ Page({
1226 1235 //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
1227 1236 if(o.prom_type!=1 && ((o.prom_type!=6 && o.prom_type!=4) || th.data.is_normal)){
1228 1237 var conf=th.data.bconfig;
1229   - if (conf.switch_list && getApp().globalData.userInfo['card_field']){
  1238 + if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']){
1230 1239 var s_list=JSON.parse(conf.switch_list);
1231 1240 var now=ut.gettimestamp();
  1241 +
  1242 +
1232 1243 var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
1233 1244 var end = new Date(str);
1234 1245 end = Date.parse(end) / 1000;
... ...
pages/team/team_success/team_success.js
  View file @7a4a05c
... ... @@ -63,8 +63,8 @@ Page({
63 63 getApp().request.promiseGet("/api/weshop/goods/poster/page",{
64 64 data:{store_id:os.stoid, type:1, is_use:1 }
65 65 }).then(res=>{
66   - if(res.data.code==0){
67   -
  66 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
  67 +
68 68 var poster_data=res.data.data.pageData[0];
69 69 var json_str=poster_data.jsonStr;
70 70 if(json_str){
... ...
pages/user/deposit/prepaid/fil.wxs 0 → 100644
  View file @7a4a05c
  1 +function set_word(word){
  2 + if(!word) return '';
  3 + if(word.indexOf('复核')!==-1) return '';
  4 + return word;
  5 +}
  6 +
  7 +module.exports = {
  8 + set_word: set_word
  9 +}
0 10 \ No newline at end of file
... ...
pages/user/deposit/prepaid/prepaid.wxml
  View file @7a4a05c
  1 +<wxs src="fil.wxs" module="fil"></wxs>
1 2 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid">
2 3 <view class="coupon-container" wx:if="{{perpaid.NewSum>0 || perpaid.NewSum=='' }}">
3 4 <image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image>
... ... @@ -12,8 +13,8 @@
12 13 </view>
13 14 <view wx:if="{{perpaid.ItemType==2}}" catchtap="go_detail" data-id="{{perpaid.Id}}">充值送大礼 ></view>
14 15 </view>
15   - <view class="right">备注：
16   - <view class="">{{perpaid.ItemName}}</view>
  16 + <view class="right">备注：
  17 + <view class="">{{fil.set_word(perpaid.Remark)}}</view>
17 18 <view class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}" data-item_type="{{perpaid.ItemType}}"
18 19 data-advance="{{perpaid.Id}}" data-money="{{perpaid.NewSum}}">立即充值</view>
19 20 </view>
... ...
pages/user/userinfo/userinfo.js
  View file @7a4a05c
... ... @@ -565,9 +565,9 @@ Page({
565 565 //------初始化加载----------
566 566 onLoad: function(t) {
567 567 var user = getApp().globalData.userInfo;
568   - if (user.card_field != '' && user.card_field != null && user.card_field != undefined) {
  568 + if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
569 569 var now = ut.gettimestamp();
570   - var str = user.card_expiredate;
  570 + var str = user.card_expiredate.replace(/-/g, '/');;
571 571 var end = new Date(str);
572 572 end = Date.parse(end) / 1000;
573 573 if (now < end) {
... ...