Merge branch 'shop-mall' into dev

src/views/app/PaymentResult.vue

@@ -117,6 +117,7 @@ export default {
               this.getGoodsInfo(tempResult.detail);
             } else if (tempResult.type == "MALL_BUY") {
               // 订单购买
+              this.getSaleGoods(tempResult.detail);
             }
           } else {
             // 订单处理中
@@ -140,6 +141,14 @@ export default {
         this.goodsInfo.push(goods.goodsName + " ×" + goods.goodsNum);
       });
     },
+    getSaleGoods(item) {
+      const goodsJson = item.goodsJson ? JSON.parse(item.goodsJson) : {};
+      this.goodsInfo = [];
+      const orderItemList = goodsJson.orderItemList || [];
+      orderItemList.forEach((goods) => {
+        this.goodsInfo.push(goods.productName + " ×" + goods.productQuantity);
+      });
+    },
     showStatus(status, type) {
       if (status == "ING") {
         this.pageStatus = "paying";

src/views/shopMall/GoodsSale.vue

@@ -109,7 +109,7 @@
               }}
             </span>
           </div>
-          <div class="emtry" v-else>去填写收货地址</div>
+          <div class="emtry" v-else>请选择收货地址</div>
         </template>
         <template #label v-if="addressInfo.id">
           <span class="addressInfo"
@@ -1032,4 +1032,4 @@ export default {
     height: 0.2rem;
   }
 }
-</style>
+</style>