Merge branch 'master' of ssh://git.xingtongworld.com:10022/liaoxinyu/GLOBAL_H5

pages/assets/coin-list.vue

@@ -3,7 +3,7 @@
     <view class="main" style="background-color: #121212;">
         <view :style="{height:taskHeight+'px'}"></view>
         <view>
-          <van-search background="transparent" v-model="filterName" show-action @cancel="$emit('close')" @change="filterName=$event.detail" :placeholder="$t('assets.b5')" />
+          <van-search background="transparent" v-model="filterName" show-action @cancel="$emit('close')" @change="filterName=$event.detail" :action-text="$t('common.cancel')" :placeholder="$t('assets.b5')" />
         </view>
         <view class="layout-main">
             <template v-for="item in showList">

pages/base/mine.vue

@@ -434,6 +434,8 @@ export default {
 			let parts = price.split(".");
 			parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 			return parts.join(".");
+		}else{
+			return '0.00';
 		}
 	},
 	tohome(){