Merge branch 'dev-changeDetail-20200909' into 'release'

买家自提修改  code reviewer：张平



See merge request !214

src/views/goods/order-detail.vue

@@ -15,25 +15,26 @@
               <span>{{storeType == 1 ? '物流' : '配送'}}信息</span>
             </div>
             <div v-if="showStatus == 1 || showStatus == 2">
-              <div v-if="storeType == 3">
-                <p>无配送信息，买家自提</p>
-              </div>
-              <div v-else>
+<!--              <div v-if="storeType == 3">-->
+<!--                <p>无配送信息，买家自提</p>-->
+<!--              </div>-->
+              <div>
                 <p class="trade-status1">
                   <i class="el-icon-truck" style="font-size: 18px"></i>
                   <span class="send-status" v-if="storeType == 1">已发货</span>
                   <span class="send-status" v-if="storeType == 2">云鹊配送中</span>
+                  <span class="send-status" v-if="storeType == 3">已收货</span>
                 </p>
-                <p>收货地址：{{orderDetailData.receiverAddr}}，{{orderDetailData.receiver}}，{{orderDetailData.receiverMobile}}</p>
+                <p v-if="storeType == 1 || storeType == 2">收货地址：{{orderDetailData.receiverAddr}}，{{orderDetailData.receiver}}，{{orderDetailData.receiverMobile}}</p>
                 <div v-if="storeType == 1">
                   <p>物流公司：{{orderDetailData.expressName}}</p>
                   <p>快递单号：{{orderDetailData.expressNo}}</p>
                 </div>
-                <div v-if="storeType == 2">
+                <div v-if="storeType == 2 || storeType == 3">
                   <p>配送员姓名：{{orderDetailData.sender}}</p>
                   <p>手机号：{{orderDetailData.senderMobile}}</p>
                 </div>
-                <p>备注：{{orderDetailData.remark}}</p>
+                <p v-if="storeType == 1 || storeType == 2">备注：{{orderDetailData.remark}}</p>
               </div>
             </div>
             <div v-if="(showStatus == 3) && (storeType == 1 || storeType == 2)">