Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -2,8 +2,8 @@
|
|||||||
"name" : "汇融云链",
|
"name" : "汇融云链",
|
||||||
"appid" : "__UNI__FB2C9C4",
|
"appid" : "__UNI__FB2C9C4",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.1.4",
|
"versionName" : "1.0.1.5",
|
||||||
"versionCode" : 1014,
|
"versionCode" : 1015,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"usingComponents" : true,
|
"usingComponents" : true,
|
||||||
|
|||||||
@@ -122,7 +122,7 @@
|
|||||||
<text class="get-btn">全部领取</text>
|
<text class="get-btn">全部领取</text>
|
||||||
</view>
|
</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>
|
@callParentMethod="callParentMethod"></coupon>
|
||||||
-->
|
-->
|
||||||
<!-- 团购楼层
|
<!-- 团购楼层
|
||||||
@@ -339,6 +339,7 @@
|
|||||||
this.loadData();
|
this.loadData();
|
||||||
this.sysInfoMethod();
|
this.sysInfoMethod();
|
||||||
},
|
},
|
||||||
|
|
||||||
filters: {
|
filters: {
|
||||||
formatCreateTime(time) {
|
formatCreateTime(time) {
|
||||||
let date = new Date(time);
|
let date = new Date(time);
|
||||||
|
|||||||
Reference in New Issue
Block a user