Merge branch 'feature/shop-order-v2.1' into release/6.10.1

* feature/shop-order-v2.1:
  运单号不展示

@@ -25,13 +25,13 @@
           <template v-for="(item, index) in logisticsList">
           <template v-for="(item, index) in logisticsList">
             <span v-if="item.id == orderInfo.expressId" :key="index">{{ item.companyName }}</span>
             <span v-if="item.id == orderInfo.expressId" :key="index">{{ item.companyName }}</span>
           </template>
           </template>
-          <template v-if="orderInfo.expressNumber > 0">
+          <template v-if="orderInfo.expressNumber">
             <a style="margin-left:20px;" @click="showExpressInfo()">查看物流信息</a>
             <a style="margin-left:20px;" @click="showExpressInfo()">查看物流信息</a>
           </template>
           </template>
         </i-col>
         </i-col>
       </Row>
       </Row>
       <Row v-if="isShowExpress">
       <Row v-if="isShowExpress">
-        <i-col span="24">运单号：{{ orderInfo.expressNumber > 0 ? orderInfo.expressNumber : '' }} </i-col>
+        <i-col span="24">运单号：{{ orderInfo.expressNumber }} </i-col>
       </Row>
       </Row>
     </div>
     </div>
     <order-express-info ref="showOrderExpressInfo" :show="showOrderExpressInfo"></order-express-info>
     <order-express-info ref="showOrderExpressInfo" :show="showOrderExpressInfo"></order-express-info>

 {
 {
   "name": "yoho-shop-manage",
   "name": "yoho-shop-manage",
-  "version": "6.10.1-beta20",
+  "version": "6.10.1-beta21",
   "description": "",
   "description": "",
   "main": "app.js",
   "main": "app.js",
   "scripts": {
   "scripts": {