Преглед изворни кода

Merge branch 'feature/v1.0.30' into dev/v1.0.30_yf

yangfeng пре 1 година
родитељ
комит
88219190db

+ 2 - 2
apps/bigmember_pc/src/views/business/detail.vue

@@ -121,10 +121,10 @@ export default {
       'bigmember' // 是否大会员
       'bigmember' // 是否大会员
     ]),
     ]),
     publishtime() {
     publishtime() {
-      return this.info.publishtime ? this.info.publishtime * 1000 : Date.now()
+      return this.info.publishtime ? this.info.publishtime * 1000 : 0
     },
     },
     yuceendtime() {
     yuceendtime() {
-      return this.info.yuceendtime ? this.info.yuceendtime * 1000 : Date.now()
+      return this.info.yuceendtime ? this.info.yuceendtime * 1000 : 0
     },
     },
     similarProject() {
     similarProject() {
       return this.info.results && this.info.results[0]
       return this.info.results && this.info.results[0]

+ 5 - 5
apps/mobile/src/views/business/Detail.vue

@@ -29,7 +29,7 @@
               <span class="unit_label">采购单位</span>
               <span class="unit_label">采购单位</span>
               <span class="list_pur_name">{{ info.buyer }}</span>
               <span class="list_pur_name">{{ info.buyer }}</span>
             </div>
             </div>
-            <div class="unit_row">
+            <div class="unit_row mt8">
               <span class="unit_label"><span class="point"></span>预测线索</span>
               <span class="unit_label"><span class="point"></span>预测线索</span>
               <span class="poten_name">{{ info.title && info.title.indexOf('】') ? info.title.substring(info.title.indexOf('】') + 1) : info.title }}</span>
               <span class="poten_name">{{ info.title && info.title.indexOf('】') ? info.title.substring(info.title.indexOf('】') + 1) : info.title }}</span>
             </div>
             </div>
@@ -42,7 +42,7 @@
             <div class="unit_row mt8">
             <div class="unit_row mt8">
               <span class="unit_label">
               <span class="unit_label">
                 <span class="point"></span>预测采购时间:
                 <span class="point"></span>预测采购时间:
-                <span style="color: #1d1d1d;">{{ dateFormatter(info.yuceendtime, 'yyyy-MM-dd') }}</span>
+                <span style="color: #1d1d1d;">{{ dateFormatter(yuceendtime, 'yyyy-MM-dd') }}</span>
               </span>
               </span>
             </div>
             </div>
           </div>
           </div>
@@ -68,7 +68,7 @@
               <span class="unit_label">联系电话:</span>
               <span class="unit_label">联系电话:</span>
               <span class="unit_name phone">
               <span class="unit_name phone">
                 {{ similarProject.p_phone }}
                 {{ similarProject.p_phone }}
-                <i class="icon_phone" @click="telHandle(similarProject.p_phone)"></i>
+                <i class="icon_phone" v-if="similarProject.p_phone" @click="telHandle(similarProject.p_phone)"></i>
               </span>
               </span>
             </div>
             </div>
           </div>
           </div>
@@ -101,10 +101,10 @@ export default {
       'isMember',
       'isMember',
     ]),
     ]),
     publishtime () {
     publishtime () {
-      return this.info.publishtime ? this.info.publishtime * 1000 : Date.now()
+      return this.info.publishtime ? this.info.publishtime * 1000 : 0
     },
     },
     yuceendtime () {
     yuceendtime () {
-      return this.info.yuceendtime ? this.info.yuceendtime * 1000 : Date.now()
+      return this.info.yuceendtime ? this.info.yuceendtime * 1000 : 0
     },
     },
     similarProject () {
     similarProject () {
       return this.info.results && this.info.results[0] ? this.info.results[0] : {}
       return this.info.results && this.info.results[0] ? this.info.results[0] : {}