Merge branch 'XK_zy_huoqi20200403'

# Conflicts:
#	view/index.html

src/views/common/zyDetail.vue

@@ -56,7 +56,7 @@
           {{goodDetail.goods_unit_name}}
         </li>
         <li class="fl">
-          <b class="f-orange" v-show="!isYushou">国内现货，当天发货/b>
+          <b class="f-orange" v-show="!isYushou">国内现货，当天发货</b>
           <b class="f-orange" v-show="isYushou">{{goodDetail.cn_delivery_time||"3-7个工作日"}}</b>
         </li>
         <li

view/get_time.php

-<?php 
-	echo "var fwtime =".time().";";
\ No newline at end of file