Merge branch 'master' of ssh://git.xingtongworld.com:10022/luyisha/jiaoyi_cxicoin_h5

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "CXICoin",
-    "appid" : "__UNI__B2BBA70",
+    "appid" : "__UNI__D31CE01",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : 100,

pages/exchange/open-position.vue

@@ -46,7 +46,7 @@
          <view class="item fn-right w-33">
            <view class="label">
              {{ $t("contract.d6") }}
-             <van-icon @click="popshow=true" class="color-theme-1 m-l-xs" name="info-o" />
+             <!-- <van-icon @click="popshow=true" class="color-theme-1 m-l-xs" name="info-o" /> -->
            </view>
            <view class="num color-light fn-right" style="margin-top:8px;">{{
              accountInfo.riskRate || "0%"

utils/class/date.js

@@ -48,7 +48,8 @@ function time2Date(time, isOffset = false) {
 function parseTime(time, isOffset = false, cformat = null) {
 
     // 设置默认格式
-    let format = cformat || '{y}-{m}-{d} {h}:{i}:{s}';
+    // let format = cformat || '{y}-{m}-{d} {h}:{i}:{s}';
+	let format = cformat || '{m}/{d}/{y} {h}:{i}:{s}';
 
     const date = time2Date(time, isOffset);