Merge branch 'test' into 'qa'

Test See merge request !582

Merge branch 'test' into 'qa'
Test See merge request !582
后端研发-苏明海
2 parents 84e3f81c 7a4a05c1
Showing 11 changed files with 37 additions and 16 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/goods_list/goods_list.js
packageA/pages/activity_share/activity_share.js
packageA/pages/goods_share/goods_share.js
packageA/pages/prom_list/prom_list.js
pages/goods/categoryList/categoryList.js
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_success/team_success.js
pages/user/deposit/prepaid/fil.wxs
pages/user/deposit/prepaid/prepaid.wxml
pages/user/userinfo/userinfo.js
@@ -278,7 +278,7 @@ Component({
 	              if (!user) return false;
 	              clearInterval(ti);
-	              if (user.card_field) {
+	              if (user.card_field && user['card_expiredate']) {
 	                var str = user['card_expiredate'].replace(/-/g, '/');
 	                var end = new Date(str);
 	                end = Date.parse(end) / 1000;
@@ -54,7 +54,7 @@ Component({
                   var user = getApp().globalData.userInfo;
                   if (!user) return false;
                   clearInterval(ti);
-                  if (user.card_field) {
+                  if (user.card_field && user['card_expiredate']) {
                     var str = user['card_expiredate'].replace(/-/g, '/');
                     var end = new Date(str);
                     end = Date.parse(end) / 1000;
@@ -72,7 +72,7 @@ Page({
       getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
       	data:{store_id:os.stoid, type:1, is_use:1 }
       }).then(res=>{
-      	if(res.data.code==0){
+      	if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
       		var poster_data=res.data.data.pageData[0];
       		var json_str=poster_data.jsonStr;
@@ -49,7 +49,7 @@ Page({
 	  getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
 	  	data:{store_id:os.stoid, type:1, is_use:1 }
 	  }).then(res=>{
-	  	if(res.data.code==0){
+	      if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
 	  		var poster_data=res.data.data.pageData[0];
 	  		var json_str=poster_data.jsonStr;
@@ -112,7 +112,7 @@ Page({
 										        if(!user) return false;
 										        clearInterval(ti);			  
-											   if(user.card_field ){
+											   if(user.card_field && user['card_expiredate']){
 												  var str = user['card_expiredate'].replace(/-/g, '/');
 												  var end = new Date(str);
 												  end = Date.parse(end) / 1000;
@@ -221,7 +221,7 @@ Page({
 				  th.getPlusCardType(function(ob){	    			  	 			       
 						var user = getApp().globalData.userInfo;
 						if(user){
-							if(user.card_field ){
+							if(user.card_field && user['card_expiredate']){
 								  var str = user['card_expiredate'].replace(/-/g, '/');
 								  var end = new Date(str);
 								  end = Date.parse(end) / 1000;
@@ -155,7 +155,7 @@ Page({
             //---回调卡的列表---
             th.getPlusCardType(function (ob) {
               th.setData({ card_list: ob.card_list });
-              if (user.card_field) {
+              if (user.card_field && user['card_expiredate']) {
                 var str = user['card_expiredate'].replace(/-/g, '/');
                 var end = new Date(str);
                 end = Date.parse(end) / 1000;
@@ -264,7 +264,7 @@ Page({
 	getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
 		data:{store_id:os.stoid, type:1, is_use:1 }
 	}).then(res=>{
-		if(res.data.code==0){
+		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
 			var poster_data=res.data.data.pageData[0];
 			var json_str=poster_data.jsonStr;
@@ -386,7 +386,7 @@ Page({
             if (!user) return false;
             clearInterval(ti);
-            if(user.card_field ){
+            if(user.card_field && user['card_expiredate']){
               var str = user['card_expiredate'].replace(/-/g, '/');
               var end = new Date(str);
               end = Date.parse(end) / 1000;
@@ -980,6 +980,10 @@ Page({
     if (oo.user_id == null) {
       return s.my_warnning("还未登录！", 0, this);
     }
+	if(!getApp().globalData.userInfo){
+		 return s.my_warnning("还未登录！", 0, this);
+	}
+		
     var e = this,
         th = e,
         a = 0,
@@ -1076,6 +1080,11 @@ Page({
     if (oo.user_id == null) {
       return s.my_warnning("还未登录！", 0, this);
     }
+	
+	if(!getApp().globalData.userInfo){
+		 return s.my_warnning("还未登录！", 0, this);
+	}
+	
     var e = this,
         th = e,
         a = 0,
@@ -1226,9 +1235,11 @@ Page({
     //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
     if(o.prom_type!=1 && ((o.prom_type!=6  && o.prom_type!=4) || th.data.is_normal)){
       var conf=th.data.bconfig;
-      if (conf.switch_list && getApp().globalData.userInfo['card_field']){
+      if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']){
         var s_list=JSON.parse(conf.switch_list);
         var now=ut.gettimestamp();
+		
+
         var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
         var end = new Date(str);
         end = Date.parse(end) / 1000;
@@ -63,8 +63,8 @@ Page({
 	  getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
 	  	data:{store_id:os.stoid, type:1, is_use:1 }
 	  }).then(res=>{
-	  	if(res.data.code==0){
-	  		
+	  	if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
+	 		
 	  		var poster_data=res.data.data.pageData[0];
 	  		var json_str=poster_data.jsonStr;	  		
 	  		if(json_str){
+function set_word(word){
+	if(!word) return '';
+	if(word.indexOf('复核')!==-1) return '';
+	return word;
+}
+
+module.exports = {
+  set_word: set_word
+}
 \ No newline at end of file
+<wxs src="fil.wxs" module="fil"></wxs>
 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid">
 	<view class="coupon-container" wx:if="{{perpaid.NewSum>0 || perpaid.NewSum=='' }}">
 			<image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image>
@@ -12,8 +13,8 @@
 					</view>
 					<view wx:if="{{perpaid.ItemType==2}}" catchtap="go_detail" data-id="{{perpaid.Id}}">充值送大礼 ></view>
 				</view>
-				<view class="right">备注：
-				  <view class="">{{perpaid.ItemName}}</view>
+				<view class="right">备注：				  
+				   	<view class="">{{fil.set_word(perpaid.Remark)}}</view>							   
 					<view  class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}" data-item_type="{{perpaid.ItemType}}"
 					    data-advance="{{perpaid.Id}}" data-money="{{perpaid.NewSum}}">立即充值</view>					
 				</view>
@@ -565,9 +565,9 @@ Page({
   //------初始化加载----------
   onLoad: function(t) {
     var user = getApp().globalData.userInfo;
-    if (user.card_field != '' && user.card_field != null && user.card_field != undefined) {
+    if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
       var now = ut.gettimestamp();
-      var str = user.card_expiredate;
+      var str = user.card_expiredate.replace(/-/g, '/');;
       var end = new Date(str);
       end = Date.parse(end) / 1000;
       if (now < end) {