Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

buyer/src/components/footer/Footer.vue

@@ -39,8 +39,8 @@
             </ul>
             <div class="icp">
               <li v-if="config.icpCard">
-                <a href="https://beian.miit.gov.cn/" target="_blank">
+                <a :href='"https://tsm.miit.gov.cn/dxxzsp/xkz/xkzgl/resource/qiyesearch.jsp?num="+config.icpCard+"&type=xuke"' target="_blank">
-                  
+                  {{config.icpCard}}
                 </a>
               </li>
               <li v-if="config.icpMessage">
@@ -54,7 +54,7 @@
           <div class="information">
 
             <a class="flex " :href="config.company.href">
-              <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.title}}
+              <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.name}}
             </a>
           </div>
         </div>

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -145,8 +145,10 @@
             <div class="item-select-row">
               <InputNumber
                 :min="1"
+                :max="skuDetail.quantity"
                 :disabled="skuDetail.quantity === 0"
                 v-model="count"
+                :precision="0.1"
               ></InputNumber>
               <span class="inventory"> 库存{{ skuDetail.quantity }}</span>
             </div>

buyer/src/pages/home/orderCenter/OrderDetail.vue

@@ -35,14 +35,16 @@
       <h3>配送信息</h3>
       <p>配送方式：{{order.deliveryMethodValue}}</p>
       <p>配送状态：{{order.deliverStatusValue}}</p>
+      <p v-if="logistics">物流信息：{{logistics.shipper || '暂无物流信息'}}</p>
+      <p v-if="logistics">物流单号：{{logistics.logisticCode || '暂无物流单号'}}</p>
       <div class="div-express-log" v-if="logistics">
-          <p class="express-log">
+          <div class="express-log">
             <p>订单日志：</p>
-            <p v-for="(item, index) in logistics.traces" :key="index">
+            <div v-for="(item, index) in logistics.traces" :key="index">
               <span class="time">{{ item.AcceptTime }}</span>
               <span class="detail">{{ item.AcceptStation }}</span>
-            </p>
+            </div>
-          </p>
+          </div>
       </div>
     </div>
     <div class="order-card">