components/Card.vue

@@ -28,7 +28,14 @@
       <p class="show-pricing" v-if="showPricing">Pricing</p>
       <!-- </nuxt-link> -->
       <figcaption class="card-info">
-        <h1>{{ cardData.alias_name || cardData.product_name }}</h1>
+        <template v-if="cardData.product_name && cardData.product_name.length > 40">
+          <el-tooltip :content="cardData.product_name" placement="top-start">
+            <h1>{{ cardData.product_name }}</h1>
+          </el-tooltip>
+        </template>
+        <template v-else>
+          <h1>{{ cardData.product_name }}</h1>
+        </template>
         <p class="card-info-point">{{ cardData.product_code }}</p>
         <div class="card-info-icon">
           <img

pages/home/contact.vue

@@ -10,7 +10,7 @@
       <p>General contact info</p>
       <p>Email: info@promocollection.uk</p>
       <p>Phone: (+44) 203 916 5098</p>
-      <p>Address: 63-66 fifth floor suite 23 Hatton Garden, London EC1N 8LE, United Kingdom</p>
+      <p>Address:&nbsp;&nbsp;&nbsp;3 Brunel Court Severalls, Colchester, CO4 9XP Essex United Kingdom</p>
     </div>
     <div class="content">
       <ul class="item">
@@ -149,7 +149,7 @@ export default {
 .description {
   font-family: Proxima Nova;
   margin: 48px auto;
-  width: 800px;
+  width: 712px;
   height: 180px;
   font-size: 18px;
   background: #ffffff;

pages/home/myDetail/components/orderDetailPart.vue

@@ -53,19 +53,10 @@
             </li>
           </ul>
           <ul class="right">
-            <li v-if="orderDetail.Job_Group && isShow">
-              Order Type: {{ orderDetail.Job_Group }}
-            </li>
+            <li v-if="orderDetail.Job_Group && isShow">Order Type: {{ orderDetail.Job_Group }}</li>
             <li>Order No: {{ orderDetail.Reference }}</li>
-            <li>
-              Order Date: {{ formatStepDesc(orderDetail.Sales_Order_Created) }}
-            </li>
-            <li v-if="orderDetail.Expected_Delivery_Date">
-              ETA: {{ formatStepDesc(orderDetail.Expected_Delivery_Date) }}
-            </li>
-            <li v-if="isShow">
-              Payment Status: {{ orderDetail.Payment_Status1 }}
-            </li>
+            <li>Order Date: {{ formatStepDesc(orderDetail.Sales_Order_Created) }}</li>
+            <li v-if="isShow">Payment Status: {{ orderDetail.Payment_Status1 }}</li>
           </ul>
         </div>
         <div class="steps margin-b-30">
@@ -352,10 +343,7 @@
             </tr>
             <tr>
               <td>Total Discount</td>
-              <td>
-                {{ comCurrency }}
-                {{ transformNumber(orderDetail.Total_Including_Discount) }}
-              </td>
+              <td>{{ comCurrency }} {{ transformNumber(orderDetail.Discount_Amount) }}</td>
             </tr>
             <tr>
               <td>Adjustment</td>

push_prod.sh

@@ -8,8 +8,8 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd ..
 
 # 设置TARGET_DIR为当前目录的上一层目录下的\updateFile\pc_au目录
-TARGET_DIR="$(pwd)/updateFile/pc_au"
-REMOTE_REPO="http://git.promocollection.com.au:11180/PromoAu/pc_au.git"
+TARGET_DIR="$(pwd)/updateFile/pc_uk"
+REMOTE_REPO="http://git.promocollection.com.au:11180/peter/uk_front_build.git"
 
 # 删除目标目录及其所有子目录和文件
 rm -rf "$TARGET_DIR"