Tyler 2 лет назад
Родитель
Сommit
94405e0959
3 измененных файлов с 808 добавлено и 410 удалено
  1. 1 1
      src/layout/components/Navbar.vue
  2. 710 272
      src/views/shop/reconsume.vue
  3. 97 137
      src/views/user/welcome-pack.vue

+ 1 - 1
src/layout/components/Navbar.vue

@@ -112,7 +112,7 @@ export default {
   position: relative;
   background: #fff;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
-  z-index: 10000;
+  z-index: 8000;
 
   .hamburger-container {
     line-height: 46px;

Разница между файлами не показана из-за своего большого размера
+ 710 - 272
src/views/shop/reconsume.vue


+ 97 - 137
src/views/user/welcome-pack.vue

@@ -215,153 +215,103 @@
       </el-row>
     </div>
     <el-row type="flex" justify="space-between" class="shoppingCarrt">
-      <el-col :xs="18" :md="18" :lg="21" class="">
-        <div class="left" @click="openShoppingCartTable">
-          <el-badge :value="multipleSelection.length" class="item">
+      <el-col :xs="16" :md="12" :lg="12" class="flexJcfsAc">
+        <div class="left">
+          <el-badge
+            @click="openShoppingCartTable"
+            :value="multipleSelection.length"
+            class="item"
+          >
             <i class="el-icon-shopping-cart-2" />
           </el-badge>
         </div>
+        <div class="center flexFwW">
+          <div>
+            {{ $t("shop.productPrice") }}:{{ $t("currency.sign") }}
+            {{ sellPriceSum | toThousandFilter }}
+          </div>
+          <div>
+            {{ $t("shop.productBV") }}:{{ pricePvSum | toThousandFilter }}
+          </div>
+          <div>
+            {{ $t("shop.taxAmount") }}:{{ $t("currency.sign") }}
+            {{ taxSum }}
+          </div>
+        </div>
       </el-col>
-      <el-col :xs="6" :md="6" :lg="3">
+
+      <el-col :xs="6" :md="2" :lg="5">
         <div class="right">
           <el-button type="primary" round @click="goWePaFrom">去结算</el-button>
         </div>
       </el-col>
-      <el-col :xs="0" :md="0" :lg="0" class="">
-        <div class="shoppingCartDrawer">
-          <el-drawer
-            title=""
-            style="transform: translateY(-55px)"
-            :visible.sync="shoppingCartTable"
-            direction="btt"
-            :with-header="true"
-            :modal="false"
-          >
-            <el-table
-              v-if="multipleSelection.length > 0"
-              class="shoppingCartTable"
-              :data="multipleSelection"
-            >
-              <el-table-column align="center">
-                <template slot-scope="{ row, $index }">
-                  <el-container>
-                    <el-aside
-                      width="80px"
-                      style="
-                        padding: 0;
-                        margin-bottom: 0;
-                        background-color: #ffffff;
-                      "
-                    >
-                      <el-image
-                        style="width: 80px; height: 80px"
-                        :src="tool.getArImage(row.COVER, '/files/')"
-                      />
-                    </el-aside>
-                    <el-main style="padding: 0">
-                      <div style="text-align: left; line-height: 25px">
-                        <span
-                          style="font-weight: bold; cursor: pointer"
-                          @click="handleProduct(row)"
-                          >{{ row.GOODS_NAME }}</span
-                        ><br />
-                        <span>{{ row.GOODS_NO }}</span
-                        ><br />
-                        <span style="color: tomato"
-                          >{{ $t("shop.productPrice") }}:{{
-                            $t("currency.sign")
-                          }}
-                          {{ row.SELL_PRICE | toThousandFilter }}</span
-                        ><br />
-                        <span
-                          >{{ $t("shop.productBV") }}:{{
-                            row.PRICE_PV | toThousandFilter
-                          }}</span
-                        ><br />
-                        <span style="display: inline-block; float: right">
-                          <i class="el-icon-close" />
-                          {{ Number(row.goodsNum) }}
-                        </span>
-                        <br />
-                      </div>
-                    </el-main>
-                  </el-container>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-empty v-else :description="$t('common.noData')" />
-          </el-drawer>
-        </div>
-      </el-col>
     </el-row>
+
     <el-row>
-      <el-col :xs="18" :md="18" :lg="21" class="">
-        <div class="shoppingCartDrawer">
-          <el-drawer
-            title=""
-            style="transform: translateY(-55px)"
-            :visible.sync="shoppingCartTable"
-            direction="btt"
-            :with-header="true"
-            :modal="false"
-          >
-            <el-table
-              v-if="multipleSelection.length > 0"
-              class="shoppingCartTable"
-              :data="multipleSelection"
-            >
-              <el-table-column align="center">
-                <template slot-scope="{ row, $index }">
-                  <el-container>
-                    <el-aside
-                      width="80px"
-                      style="
-                        padding: 0;
-                        margin-bottom: 0;
-                        background-color: #ffffff;
-                      "
-                    >
-                      <el-image
-                        style="width: 80px; height: 80px"
-                        :src="tool.getArImage(row.COVER, '/files/')"
-                      />
-                    </el-aside>
-                    <el-main style="padding: 0">
-                      <div style="text-align: left; line-height: 25px">
-                        <span
-                          style="font-weight: bold; cursor: pointer"
-                          @click="handleProduct(row)"
-                          >{{ row.GOODS_NAME }}</span
-                        ><br />
-                        <span>{{ row.GOODS_NO }}</span
-                        ><br />
-                        <span style="color: tomato"
-                          >{{ $t("shop.productPrice") }}:{{
-                            $t("currency.sign")
-                          }}
-                          {{ row.SELL_PRICE | toThousandFilter }}</span
-                        ><br />
-                        <span
-                          >{{ $t("shop.productBV") }}:{{
-                            row.PRICE_PV | toThousandFilter
-                          }}</span
-                        ><br />
-                        <span style="display: inline-block; float: right">
-                          <i class="el-icon-close" />
-                          {{ Number(row.goodsNum) }}
-                        </span>
-                        <br />
-                      </div>
-                    </el-main>
-                  </el-container>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-empty v-else :description="$t('common.noData')" />
-          </el-drawer>
-        </div>
-      </el-col>
+      <el-col :xs="18" :md="18" :lg="21" class=""> </el-col>
     </el-row>
+    <div class="shoppingCartDrawer">
+      <el-drawer
+        title=""
+        style="transform: translateY(-55px)"
+        :visible.sync="shoppingCartTable"
+        direction="btt"
+        :with-header="true"
+        :modal="false"
+      >
+        <el-table
+          v-if="multipleSelection.length > 0"
+          class="shoppingCartTable"
+          :data="multipleSelection"
+        >
+          <el-table-column align="center">
+            <template slot-scope="{ row, $index }">
+              <el-container>
+                <el-aside
+                  width="80px"
+                  style="
+                    padding: 0;
+                    margin-bottom: 0;
+                    background-color: #ffffff;
+                  "
+                >
+                  <el-image
+                    style="width: 80px; height: 80px"
+                    :src="tool.getArImage(row.COVER, '/files/')"
+                  />
+                </el-aside>
+                <el-main style="padding: 0">
+                  <div style="text-align: left; line-height: 25px">
+                    <span
+                      style="font-weight: bold; cursor: pointer"
+                      @click="handleProduct(row)"
+                      >{{ row.GOODS_NAME }}</span
+                    ><br />
+                    <span>{{ row.GOODS_NO }}</span
+                    ><br />
+                    <span style="color: tomato"
+                      >{{ $t("shop.productPrice") }}:{{ $t("currency.sign") }}
+                      {{ row.SELL_PRICE | toThousandFilter }}</span
+                    ><br />
+                    <span
+                      >{{ $t("shop.productBV") }}:{{
+                        row.PRICE_PV | toThousandFilter
+                      }}</span
+                    ><br />
+                    <span style="display: inline-block; float: right">
+                      <i class="el-icon-close" />
+                      {{ Number(row.goodsNum) }}
+                    </span>
+                    <br />
+                  </div>
+                </el-main>
+              </el-container>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-empty v-else :description="$t('common.noData')" />
+      </el-drawer>
+    </div>
     <!-- payStack模态框 -->
     <el-dialog
       v-loading="payStackLoading"
@@ -915,7 +865,7 @@ export default {
       this.fromDataDialog = true;
     },
     openShoppingCartTable() {
-      // this.shoppingCartTable = !this.shoppingCartTable;
+      this.shoppingCartTable = !this.shoppingCartTable;
     },
     // header start
     chooseNav(item, index) {
@@ -1399,6 +1349,9 @@ export default {
   .el-table__header-wrapper {
     display: none;
   }
+  .el-tabs--border-card > .el-tabs__header{
+    opacity: 0 !important;
+  }
 }
 
 .flex {
@@ -1561,10 +1514,17 @@ export default {
   align-items: center;
   .left {
     width: 50px;
+    margin-right: 10px;
+    cursor: pointer;
     i {
       font-size: 30px;
     }
   }
+  .center{
+    div{
+      margin-right: 10px;
+    }
+  }
 }
 
 .shoppingCartDrawer {

Некоторые файлы не были показаны из-за большого количества измененных файлов