Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents b9c14d6d 1cda69a5
Showing 2 changed files with 23 additions and 2 deletions
packageD/pages/user/coupons/coupons.wxml
packageD/pages/user/coupons/filter.wxs
@@ -31,7 +31,7 @@
 					</view>
 					<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
 						<!--<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>-->
-						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}"><text style="margin-right: 15rpx">使用说明:</text>购买礼包得优惠券【消费满{{time.toFix(detail.condition,2)}}元可用】</text>
+						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}"><text style="margin-right: 15rpx">使用说明:</text>{{filter.showtypeName(detail.type)}}【消费满{{time.toFix(detail.condition,2)}}元可用】</text>
 					</view>
 				</block>
  
@@ -30,9 +30,30 @@ var numFr = {
 				return '立即使用';
 			};
 		};
+  },
+  
+  showtypeName: function(index) {
+		switch(index) {
+			case 0: {
+				return '从我的礼包获取，';
+				break;
+			};
+			case 1: {
+				return '已过从我的专享礼包，期';
+				break;
+      };
+      case 2: {
+				return '从我的幸运大转盘，';
+				break;
+			};
+			default: {
+				return '';
+			};
+		};
 	},
 }
 module.exports = {
   getNum: numFr.getNum,
-	showBtnText: numFr.showBtnText,
+  showBtnText: numFr.showBtnText,
+  showtypeName: numFr.showtypeName,
 }
 \ No newline at end of file