Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/OfferPriceSubmit.vue

@@ -7,7 +7,7 @@
                 <div class="collection_information">
                     <van-image width="80" height="80" :radius="6" :src="getImg(changeImgs(info.pic))" fit="cover" />
                     <div class="collection_information_right">
-                        <div class="collection_information_right_name">{{ info.domainName }}</div>
+                        <div class="collection_information_right_name">{{ info.domainName || info.name }}</div>
                         <div class="collection_information_right_no">剩余时长：{{ info.endTime }}</div>
                         <div class="collection_information_right_price_one">¥{{ bidamount }}</div>
                     </div>
@@ -22,7 +22,7 @@
                 </div>
             </div>
         </div>
-        <pay-method-pick v-model="payType" cart :onlyBalance="true"></pay-method-pick>
+        <pay-method-pick v-model="payType" cart></pay-method-pick>
         <div class="page_btn van-safe-area-bottom">
             <div class="page_btn_left">
                 <div class="page_btn_left_amount">总计</div>
@@ -116,7 +116,15 @@ export default {
             return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
         },
         getOrder(next = false) {
-            this.$http.get('/domainOrder/get/' + this.id).then(res => {
+            this.$http.get('/domainAsk/get/' + this.id).then(res => {
+                res.endTime = this.dayjs(res.endTime).diff(this.dayjs(), 'second');
+                res.endTime =
+                    Math.floor(res.endTime / 24 / 3600) +
+                    '天' +
+                    this.pad(parseInt(res.endTime / 3600) % 24, 2) +
+                    '时' +
+                    this.pad(parseInt(res.endTime / 60) % 60, 2) +
+                    '分';
                 this.info = res;
                 if (this.timer) {
                     clearTimeout(this.timer);