Merge remote-tracking branch 'origin/master'

mallplusui-uniapp-app/manifest.json

@@ -2,8 +2,8 @@
     "name" : "汇融云链",
     "appid" : "__UNI__FB2C9C4",
     "description" : "",
-    "versionName" : "1.0.1.4",
-    "versionCode" : 1014,
+    "versionName" : "1.0.1.5",
+    "versionCode" : 1015,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

mallplusui-uniapp-app/pages/index/index.vue

@@ -122,7 +122,7 @@
 			<text class="get-btn">全部领取</text>
 		</view>
 
-			<!-- <coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#EB331E" ref="SubComponent"
+		<!-- 	<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#EB331E" ref="SubComponent"
 			@callParentMethod="callParentMethod"></coupon>
  -->
 		<!-- 	团购楼层
@@ -339,6 +339,7 @@
 			this.loadData();
 			this.sysInfoMethod();
 		},
+		
 		filters: {
 			formatCreateTime(time) {
 				let date = new Date(time);