li.shaoyi il y a 2 ans
Parent
commit
f44f37e89f

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/packages/pc/assets/themes/base/iconfont.less


+ 2 - 2
src/packages/pc/components/base/icon/index.less

@@ -15,7 +15,7 @@
 
 /*挂牌大厅*/
 .g-icon--listing-filled::before {
-    content: '\e7c3';
+    content: '\e64e';
 }
 
 /*我的收藏*/
@@ -65,7 +65,7 @@
 
 /*预售大厅*/
 .g-icon--presale-filled::before {
-    content: '\e646';
+    content: '\e78a';
 }
 
 /*集采交易*/

+ 10 - 0
src/packages/pc/views/warehousing/goods/components/details/index.less

@@ -2,7 +2,17 @@
     padding: 20px 48px;
     width: 1200px;
 
+    &__close {
+        position: absolute;
+        top: 15px;
+        right: 15px;
+        font-size: 28px;
+        color: #666;
+        cursor: pointer;
+    }
+
     &__wrapper {
+        position: relative;
         display: flex;
         background-color: #fff;
         border-radius: 4px;

+ 12 - 12
src/packages/pc/views/warehousing/goods/components/details/index.vue

@@ -1,8 +1,11 @@
 <!-- 商品详情 -->
 <template>
     <teleport :to="teleportTo">
-        <div class="goods-details" v-if="details">
-            <div class="goods-details__wrapper">
+        <div class="goods-details">
+            <div class="goods-details__wrapper" v-if="details">
+                <el-icon class="goods-details__close" @click="onCancel(false)">
+                    <CircleClose />
+                </el-icon>
                 <div class="goods-details__aside">
                     <div class="sku-gallery">
                         <app-image :width="300" :height="300" :src="getFileUrl(details.imagepath)" />
@@ -19,17 +22,14 @@
                             </li>
                             <li>
                                 <span>仓库地址</span>
-                                <span>{{
-                                    [details.provincename, details.cityname, details.districtname,
-                                    details.address].join(' ')
-                                }}</span>
+                                <span>{{ [details.provincename, details.cityname,
+                                details.districtname, details.address].join(' ') }}</span>
                             </li>
                         </ul>
                     </div>
                 </div>
                 <div class="goods-details__main">
                     <div class="sku-title">
-                        <el-button @click="onCancel(false)">返回</el-button>
                         <h1>【{{ details.zscategorydisplay }}】 商品编号 {{ details.goodsno }}</h1>
                     </div>
                     <div class="sku-info" v-if="details.remark">
@@ -38,26 +38,26 @@
                     <div class="sku-spec">
                         <ul>
                             <li>
-                                <span>克拉重量:</span>
+                                <span>克拉重量</span>
                                 <span>{{ details.weight }}克拉</span>
                             </li>
                             <li>
-                                <span>价格:</span>
+                                <span>价格</span>
                                 <span>{{ details.zscurrencytypedisplayunit + formatDecimal(details.price) }}</span>
                             </li>
                             <li>
-                                <span>克拉单价:</span>
+                                <span>克拉单价</span>
                                 <span>{{ details.zscurrencytypedisplayunit + formatDecimal(details.priceper) }}</span>
                             </li>
                             <li>
-                                <span>市场价:</span>
+                                <span>市场价</span>
                                 <span>{{ details.zscurrencytypedisplayunit + formatDecimal(details.marketprice) }}</span>
                             </li>
                         </ul>
                     </div>
                     <div class="sku-price">
                         <span>{{ exchangeRate(details.zscurrencytype, details.price) }}</span>
-                        <span v-if="details.zscurrencytype !== CurrencyType.CNY">汇率: {{
+                        <span v-if="details.zscurrencytype !== CurrencyType.CNY">汇率{{
                             getExrate(details.zscurrencytype)
                         }}</span>
                     </div>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff