Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0

components/UiGoodsItem.vue

@@ -8,7 +8,7 @@
       {{ item.name }}
     </div>
     <div class="goods-item__price">
-      <UiMoney :money="item.startingPrice"></UiMoney>
+      <strong class="goods-item__price--txt">{{ item.startingPrice }}</strong>
     </div>
   </div>
 </template>
@@ -41,9 +41,10 @@ export default {
       return str;
     },
     onItem() {
-      this.$router.push({
-        path: "/goods/detail/" + this.item.id,
-      });
+      // this.$router.push({
+      //   path: "/goods/detail/" + this.item.id,
+      // });
+      window.open("/goods/detail/" + this.item.id);
     },
   },
 };
@@ -55,7 +56,7 @@ export default {
   cursor: pointer;
   background: #ffffff;
 
-  &:hover{
+  &:hover {
     box-shadow: 0px 0px 10px 1px rgba(0, 0, 0, 0.10000000149011612);
   }
 
@@ -92,6 +93,15 @@ export default {
   &__price {
     width: 200px;
     margin: 0 auto;
+
+    &--txt {
+      font-size: 14px;
+      color: #ff512b;
+      &::before {
+        content: "￥";
+        font-size: 14px;
+      }
+    }
   }
 }
 </style>

pages/account/index/order/saleAfter/detail.vue

@@ -0,0 +1,25 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-04 17:48:12
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-04 17:53:11
+ * @Description: file content
+-->
+
+<template>
+  <div>
+   
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

pages/account/index/order/saleAfter/list.vue

@@ -0,0 +1,58 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-04 17:48:12
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-04 17:53:11
+ * @Description: file content
+-->
+
+<template>
+  <main class="main flex flex-column flex-middle">
+    <p class="main-title">售后订单</p>
+    <img class="main-img" src="@/assets/img/common/app-qrcode.png" alt="" />
+    <p class="main-txt">请前往APP查看售后订单</p>
+  </main>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+.main {
+  width: 100%;
+  border: 1px solid #dddddd;
+
+  &-title {
+    width: 100%;
+    height: 42px;
+    background: #f8f8f8;
+    border-bottom: 1px solid #dddddd;
+    font-size: 14px;
+    font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+    font-weight: 400;
+    color: #333333;
+    line-height: 42px;
+    padding-left: 24px;
+  }
+
+  &-img {
+    width: 140px;
+    height: 140px;
+    margin: 110px 0 20px;
+  }
+
+  &-txt {
+    width: 100%;
+    text-align: center;
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+  }
+}
+</style>

pages/goods/detail/_id.vue

@@ -104,13 +104,11 @@
         <div class="main__details-msg">
           <div class="main__details-msg--price flex flex-middle">
             <span class="msg-txt">售价</span>
-            <UiMoney
-              :money="
-                detailData.productActivityVO.isStartActivity
-                  ? detailData.productActivityVO.activityPrice
-                  : detailData.startingPrice
-              "
-            ></UiMoney>
+            <strong class="msg-price">{{
+              detailData.productActivityVO.isStartActivity
+                ? detailData.productActivityVO.activityPrice
+                : detailData.startingPrice
+            }}</strong>
             <div
               v-if="
                 detailData.productActivityVO.isActivity &&
@@ -375,7 +373,9 @@ export default {
         vm.surplus = vm.getSurplus(vm.startTime, vm.endTime);
         if (vm.surplus.lefttime <= 0) {
           clearInterval(vm.timer);
-          location.reload();
+          if (location) {
+            location?.reload();
+          }
         }
       }, 1000);
     },
@@ -531,7 +531,7 @@ export default {
         return false;
       }
       this.$message.success("加入购物车成功~");
-      this.$store.dispatch('getCartProducts');
+      this.$store.dispatch("getCartProducts");
       // this.$Router.push('/cart');
     },
   },
@@ -669,6 +669,15 @@ export default {
         margin-right: 20px;
       }
 
+      .msg-price {
+        font-size: 22px;
+        color: #ff512b;
+        &::before {
+          content: "￥";
+          font-size: 14px;
+        }
+      }
+
       .msg-service {
         font-size: 14px;
         font-family: Microsoft YaHei-Regular, Microsoft YaHei;