change: uk内容调整(部分).

Dockerfile

@@ -3,6 +3,6 @@ FROM node:16.14.2
 RUN  mkdir -p  /app
 WORKDIR /app
 COPY package.json .
-RUN npm config set registry https://registry.npmmirror.com
+# RUN npm config set registry https://registry.npmmirror.com
 CMD npm i && npm run dev
-EXPOSE 9011
+EXPOSE 9012

components/PcFooter.vue

@@ -10,7 +10,7 @@
         class="footer-banner"
         fit="cover"></el-image>
       <div class="top-item">
-        <p>Need ideas? Samples?  Art assistance?</p>
+        <p>Need ideas? Samples? Art assistance?</p>
         <p>Get in touch, we're here to help</p>
         <!-- <el-button
           class="btn btn-red"
@@ -32,106 +32,107 @@
       </div>
     </div>
     <div class="footer-middle com-margin-auto">
-      <div class="middle  com-margin-auto com-flex">
-          <div class="middle-item-left">
-            <img
-              src="@/assets/img/logo_footer.png"
-              alt="" />
-            <p>{{ indexConfigWebsite.company_introduction }}</p>
-          </div>
-          <div class="middle-item-right">
-            <div class="item-menu">
-              <div class="item-title">OUR PRODUCTS</div>
-              <div class="item-line"></div>
-              <div class="item-content">
-                <div>
-                  <ul>
-                    <li
-                      v-for="item in productList"
-                      :key="item.id">
-                      <nuxt-link
-                        :to="{
-                          name: 'category-firstCategory',
-                          params: {
-                            firstCategory: item.name
-                              .replace(/\s+/g, '-')
-                              .replace('-&', '')
-                              .toLowerCase(),
-                            id: item.id,
-                          },
-                        }">
-                        {{ item.name }}
-                      </nuxt-link>
-                    </li>
-                  </ul>
-                </div>
+      <div class="middle com-margin-auto com-flex">
+        <div class="middle-item-left">
+          <img
+            src="@/assets/img/logo_footer.png"
+            alt="" />
+          <p>{{ indexConfigWebsite.company_introduction }}</p>
+        </div>
+        <div class="middle-item-right">
+          <div class="item-menu">
+            <div class="item-title">OUR PRODUCTS</div>
+            <div class="item-line"></div>
+            <div class="item-content">
+              <div>
+                <ul>
+                  <li
+                    v-for="item in productList"
+                    :key="item.id">
+                    <nuxt-link
+                      :to="{
+                        name: 'category-firstCategory',
+                        params: {
+                          firstCategory: item.name
+                            .replace(/\s+/g, '-')
+                            .replace('-&', '')
+                            .toLowerCase(),
+                          id: item.id,
+                        },
+                      }">
+                      {{ item.name }}
+                    </nuxt-link>
+                  </li>
+                </ul>
               </div>
             </div>
-            <div class="item-menu">
-              <div class="item-title">CUSTOMER SUPPORT</div>
-              <div class="item-line"></div>
-              <div class="item-content">
-                <div>
-                  <!-- <nuxt-link to="/home/helpCenter">Help Center </nuxt-link> -->
-                  <a
-                    href="mailto:Info@promocollection.com.au?subject=Sample%20Request"
-                    v-show="audit_status">
-                    Sample Request
-                  </a>
-                  <nuxt-link to="/home/termsConditions">
-                    Terms & Conditions
-                  </nuxt-link>
-                  <!-- <nuxt-link
+          </div>
+          <div class="item-menu">
+            <div class="item-title">CUSTOMER SUPPORT</div>
+            <div class="item-line"></div>
+            <div class="item-content">
+              <div>
+                <!-- <nuxt-link to="/home/helpCenter">Help Center </nuxt-link> -->
+                <a
+                  href="mailto:Info@promocollection.uk?subject=Sample%20Request"
+                  v-show="audit_status">
+                  Sample Request
+                </a>
+                <nuxt-link to="/home/termsConditions">
+                  Terms & Conditions
+                </nuxt-link>
+                <!-- <nuxt-link
                     to="/home/refundReturns"
                     v-show="audit_status">
                     Refund & Returns
                   </nuxt-link> -->
-                </div>
               </div>
             </div>
-            <div class="item-menu">
-              <div class="item-title">ADDITIONAL INFO</div>
-              <div class="item-line"></div>
-              <div class="item-content">
-                <div>
-                  <nuxt-link to="/media" target="_self">Media Centre
-                  </nuxt-link>
-                  <nuxt-link to="/home/newsLetter"> NewsLetter </nuxt-link>
-                  <nuxt-link
-                    to="/home/downloadCenter"
-                    v-show="audit_status">
-                    Download Center
-                  </nuxt-link>
-                  <!-- <nuxt-link to="/home/FAQs"> FAQ </nuxt-link> -->
-                  <nuxt-link to="/home/privacyPolicy">
-                    Privacy Policy
-                  </nuxt-link>
-                  <nuxt-link
-                    to="/home/contact"
-                    v-if="isLogin">
-                    Contact Us
-                  </nuxt-link>
-                  <nuxt-link
-                    to="/home/contactPromoCollection"
-                    v-else>
-                    Contact Us
-                  </nuxt-link>
-                  <nuxt-link
-                    :to="{
-                      name: 'news-newsName',
-                      params: { newsName: 'About-Us' },
-                    }"
-                    >About Us
-                  </nuxt-link>
-                  <div
-                    class="item-content-a"
-                    @click="goApiWord">
-                    API
-                  </div>
+          </div>
+          <div class="item-menu">
+            <div class="item-title">ADDITIONAL INFO</div>
+            <div class="item-line"></div>
+            <div class="item-content">
+              <div>
+                <nuxt-link
+                  to="/media"
+                  target="_self"
+                  >Media Centre
+                </nuxt-link>
+                <nuxt-link to="/home/newsLetter"> NewsLetter </nuxt-link>
+                <nuxt-link
+                  to="/home/downloadCenter"
+                  v-show="audit_status">
+                  Download Center
+                </nuxt-link>
+                <!-- <nuxt-link to="/home/FAQs"> FAQ </nuxt-link> -->
+                <nuxt-link to="/home/privacyPolicy"> Privacy Policy </nuxt-link>
+                <nuxt-link
+                  to="/home/contact"
+                  v-if="isLogin">
+                  Contact Us
+                </nuxt-link>
+                <nuxt-link
+                  to="/home/contactPromoCollection"
+                  v-else>
+                  Contact Us
+                </nuxt-link>
+                <nuxt-link
+                  :to="{
+                    name: 'news-newsName',
+                    params: { newsName: 'About-Us' },
+                  }"
+                  >About Us
+                </nuxt-link>
+                <div
+                  class="item-content-a"
+                  @click="goApiWord">
+                  API
                 </div>
               </div>
             </div>
           </div>
+        </div>
       </div>
       <div
         v-show="flag_scroll"
@@ -167,13 +168,35 @@
               alt="" />
           </a>
         </div>
+        <div class="contact">
+          <div>(+44)203 916 5098</div>
+          <div>info@promocollection.uk</div>
+        </div>
+        <div class="flex icon-wrap">
+          <img
+            src="@/assets/img/footer/uk_foot3.jpg"
+            height="68.4"
+            width="143"
+            style="margin-right: 20px" />
+          <img
+            src="@/assets/img/footer/uk_foot4.png"
+            height="68.4"
+            width="68.4"
+            style="margin-right: 20px" />
+          <img
+            src="@/assets/img/footer/uk_foot5.jpg"
+            height="64.82"
+            width="261" />
+        </div>
         <div class="footer-bottom-item-right">
           {{ indexConfigWebsite.version_info }}
         </div>
       </div>
     </div>
-    <dialog-XX-success :imgShow=false
-      :visible.sync="xxContentVisible" :desc="xxDesc"></dialog-XX-success>
+    <dialog-XX-success
+      :imgShow="false"
+      :visible.sync="xxContentVisible"
+      :desc="xxDesc"></dialog-XX-success>
   </footer>
 </template>
 
@@ -246,10 +269,13 @@ export default {
       }
     },
     openLoginDialog() {
-      if(this.$utils.checkLogin()){
-        this.$router.push({name: 'news-newsName',params: { newsName: 'About-Us' }})
-      }else{
-        this.openDialog();
+      if (this.$utils.checkLogin()) {
+        this.$router.push({
+          name: 'news-newsName',
+          params: { newsName: 'About-Us' },
+        })
+      } else {
+        this.openDialog()
       }
     },
     goApiWord() {
@@ -262,9 +288,10 @@ export default {
         } else {
           this.submitLoading = false
           this.xxContentVisible = true
-          this.xxDesc = 'If you encounter difficulties, please contact info@promocollection.com.au'
+          this.xxDesc =
+            'If you encounter difficulties, please contact info@promocollection.uk'
           // this.$message.error(
-          //   'If you encounter difficulties, please contact info@promocollection.com.au'
+          //   'If you encounter difficulties, please contact info@promocollection.uk'
           // )
         }
       } else {
@@ -351,7 +378,6 @@ footer {
       height: 377px;
       .footer-middle-item {
         width: 100%;
-        
       }
     }
     .middle-item-left {
@@ -375,15 +401,15 @@ footer {
       justify-content: space-around;
       margin-top: 35px;
       .item-menu {
-        &:nth-child(2){
+        &:nth-child(2) {
           margin-left: 80px;
         }
-        &:last-child{
+        &:last-child {
           margin-left: 35px;
         }
         height: 172px;
         .item-title {
-          white-space:nowrap;
+          white-space: nowrap;
           height: 20px;
           line-height: 20px;
           font-size: 14px;
@@ -403,7 +429,7 @@ footer {
             height: 100%;
             a,
             .item-content-a {
-              white-space:nowrap;
+              white-space: nowrap;
               display: block;
               // width: 120px;
               height: 20px;
@@ -413,9 +439,9 @@ footer {
               color: #4a596c;
               padding-bottom: 5px;
               cursor: pointer;
-              &:hover{
-                    color: #006dc9;
-                  }
+              &:hover {
+                color: #006dc9;
+              }
             }
             ul {
               display: flex;
@@ -423,13 +449,13 @@ footer {
               flex-wrap: wrap;
               width: 200px;
               li {
-                &:nth-child(even){
-                  a{
+                &:nth-child(even) {
+                  a {
                     width: 80px;
                   }
                 }
-                &:nth-child(odd){
-                  a{
+                &:nth-child(odd) {
+                  a {
                     width: 120px;
                   }
                 }
@@ -466,13 +492,25 @@ footer {
   .footer-bottom {
     width: 100%;
     background-color: #f1f4f9;
+    font-size: 12px;
+    line-height: 14px;
+    font-weight: 400;
+    color: #4a596c;
+    .contact div {
+      margin-bottom: 6px;
+    }
+    .icon-wrap {
+      padding: 0 4px;
+    }
     .footer-bottom-item {
-      height: 56px;
+      padding: 4px;
+      min-height: 130px;
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-wrap: wrap;
       .footer-bottom-item-left {
-        margin-left: 50px;
+        padding: 0 10px 0 0;
         a {
           cursor: pointer;
           img {
@@ -482,11 +520,6 @@ footer {
           }
         }
       }
-      .footer-bottom-item-right {
-        font-size: 12px;
-        font-weight: 400;
-        color: #4a596c;
-      }
     }
   }
 }

components/PcHeader.vue

@@ -172,8 +172,8 @@
           src="@/assets/img/help.png"
           alt="help" />
         <div class="topbar-item-right com-flex-item">
-          <!-- <p style="margin-bottom: 8px">Help is here</p> -->
-          <p>1300 369 252</p>
+          <p style="margin-bottom: 6px">(+44)203 916 5098</p>
+          <p>info@promocollection.uk</p>
         </div>
       </div>
       <div class="topbar-item com-flex">
@@ -265,7 +265,7 @@
                   </div>
                   <div class="sub-menu">
                     <a
-                      href="mailto:Info@promocollection.com.au?subject=Sample%20Request">
+                      href="mailto:Info@promocollection.uk?subject=Sample%20Request">
                       <div class="flex">
                         <div class="icon mail"></div>
                         <div class="sub-title">Sample Request</div>
@@ -274,7 +274,7 @@
                   </div>
                   <div class="sub-menu">
                     <a
-                      href="mailto:Info@promocollection.com.au?subject=Free%20Mockup%20Request">
+                      href="mailto:Info@promocollection.uk?subject=Free%20Mockup%20Request">
                       <div class="flex">
                         <div class="icon mail"></div>
                         <div class="sub-title">Mockup Request</div>
@@ -542,7 +542,7 @@
                         'http://promocollection.s3.ap-southeast-2.amazonaws.com'
                       ) != -1
                         ? item.main.image
-                        : 'https://www.promocollection.com.au/' +
+                        : 'https://www.promocollection.uk/' +
                           item.main.image
                     " />
                   <p>{{ item.product_name }}</p>

components/Project.vue

@@ -18,7 +18,7 @@
       <a
         href="https://zfrmz.com/qOMwwPGF2hVWnNheXp3h"
         target="_target"
-        v-if="isLogin && /\@promocollection.com.au/.test(userInfo.email)">
+        v-if="isLogin && /\@promocollection.uk/.test(userInfo.email)">
         <div class="flex btn-nav">
           <img src="@/assets/img/tick.png" /><span>Ticket</span>
         </div>
@@ -73,7 +73,7 @@ export default {
     shouldButtonRecordShow() {
       return (
         this.isLogin &&
-        /\@promocollection.com.au/.test(this.userInfo.email) &&
+        /\@promocollection.uk/.test(this.userInfo.email) &&
         this.productInfo.record &&
         this.productInfo.record?.record_reason?.length
       )

components/ResetPasswordMail.vue

@@ -86,7 +86,7 @@
           <p>
             Email:
             <span style="color: #5c7dd4; text-decoration: underline">
-              Info@promocollection.com.au
+              Info@promocollection.uk
             </span>
           </p>
         </div>

components/product/ProductLeft.vue

@@ -27,15 +27,15 @@
         </el-carousel-item>
       </el-carousel>
       <template v-if="pageData.template.length">
-        <bxh
+        <!-- <bxh
           v-show="btnCurrent"
           :link="pageData.template[current3D].link"
           :bxhType="'3D'"
           :height="'578px'"
           :key="current3D"
-        ></bxh>
+        ></bxh> -->
         <!-- 放大&3D按钮切换 -->
-        <section class="switch-wrap" v-show="btnShow">
+        <!-- <section class="switch-wrap" v-show="btnShow">
           <div class="switch-btn" v-show="btnCurrent">
             <span
               class="primary_button"
@@ -52,7 +52,7 @@
               >{{ item }}</span
             >
           </div>
-        </section>
+        </section> -->
       </template>
     </div>
     <div class="smImgUl" v-show="!btnCurrent">
@@ -82,7 +82,7 @@
       </ul>
     </div>
     <!-- 包小盒3D图列表 -->
-    <div class="smImgUl" v-show="btnCurrent">
+    <!-- <div class="smImgUl" v-show="btnCurrent">
       <ul>
         <li
           @click="selectCurrent3D(index)"
@@ -93,7 +93,7 @@
           :style="{ backgroundImage: 'url(' + item.image + ')' }"
         ></li>
       </ul>
-    </div>
+    </div> -->
     <ElImageViewer
       v-if="showViewer" :initial-index="currentPre"
       :on-close="closeViewer"
@@ -319,4 +319,4 @@ export default {
     object-fit: cover;
   }
 }
-</style>
+</style>

components/product/ProductRight.vue

@@ -170,7 +170,7 @@
             </li>
           </ul>
           <!-- <el-button @click="ticketFormVisible = true"
-          v-if="isLogin && /\@promocollection.com.au/.test(userInfo.email)">Ticket</el-button> -->
+          v-if="isLogin && /\@promocollection.uk/.test(userInfo.email)">Ticket</el-button> -->
           <ul
             v-if="
               comInfo.print_position ||

components/product/Quote.vue

@@ -196,8 +196,8 @@
       v-else
       class="quote-tips">
       Current item prices are missing, please contact<a
-        href="mailto:Info@promocollection.com.au">
-        info@promocollection.com.au</a>
+        href="mailto:Info@promocollection.uk">
+        info@promocollection.uk</a>
     </div>
     <no-ssr>
       <div v-if="quoteLoadState == 1">

deploy_dev.sh

@@ -6,4 +6,4 @@ docker rmi au_front:dev
 
 docker build -t au_front:dev -f ./Dockerfile.dev .
 
-docker run -d -p 9011:9011 -v ${PWD}:/app -e NODE_ENV=development --name au_front_dev au_front:dev
+docker run -d -p 9012:9012 -v ${PWD}:/app -e NODE_ENV=development --name au_front_dev au_front:dev

nuxt.config.js

@@ -2,7 +2,7 @@ import webpack from 'webpack'
 export default {
   loading: false,
   server: {
-    port: process.env.NODE_ENV === 'development' ? 9011 : 3000,
+    port: process.env.NODE_ENV === 'development' ? 9012 : 3000,
     host: '0.0.0.0',
     public: '0.0.0.0',
   },

pages/design/_id.vue

@@ -15,7 +15,7 @@
       </nuxt-link> -->
     </ul>
     <export-dialog :emailForm="exportForm"  :visible.sync="exportDialogVisible" :labelWidth="70" :title="'Export'"></export-dialog>
-    <design-form-dialog :formData="emailForm" :formConfig="formConfig"  :visible.sync="emailDialogVisible" @handleSend="sendMail" :rules="rules" :labelWidth="95" :title="'Email To info@promocollection.com.au'"></design-form-dialog>
+    <!-- <design-form-dialog :formData="emailForm" :formConfig="formConfig"  :visible.sync="emailDialogVisible" @handleSend="sendMail" :rules="rules" :labelWidth="95" :title="'Email To info@promocollection.uk'"></design-form-dialog> -->
   </div>
 </template>
   
@@ -33,7 +33,7 @@ export default {
       emailForm:{
         from:'',
         to:'',
-        cc:'info@promocollection.com.au',
+        cc:'info@promocollection.uk',
         subject:'',
         job_name:'',
         link:'',
@@ -48,7 +48,7 @@ export default {
           type: "selectObj",
           selectList: {
             1:'',
-            2:'on-reply@promocollection.com.au'
+            2:'on-reply@promocollection.uk'
           },
         },
         {
@@ -164,4 +164,4 @@ export default {
     padding: 5px;
   }
 }
-</style>
+</style>

pages/home/api.vue

@@ -30,7 +30,7 @@
                         <h3>Register</h3>
                         <p>Please Login to register.</p>
                         <h3>Support</h3>
-                        <p>For support, please email <a href="mailto:info@promocollection.com.au">info@promocollection.com.au</a>. You are welcome to provide this email to third party IT providers to contact us directly for support.</p>
+                        <p>For support, please email <a href="mailto:info@promocollection.uk">info@promocollection.uk</a>. You are welcome to provide this email to third party IT providers to contact us directly for support.</p>
                     </section>
 
                     <section v-show="indexShow != 'intro'">
@@ -80,7 +80,7 @@ export default {
             indexShow: 'intro',
             apiData: {
                 1: {
-                    address: 'https://promocollection.com.au/api/au.api/authorization',
+                    address: 'https://promocollection.uk/api/uk.api/authorization',
                     description: 'Get interface authorization code.',
                     parameters: [
                         {
@@ -98,7 +98,7 @@ export default {
                 },
 
                 2: {
-                    address: 'https://promocollection.com.au/api/au.api/categories',
+                    address: 'https://promocollection.uk/api/uk.api/categories',
                     description:
                         'Returns a full list of product categories including subcategories.',
                     parameters: [
@@ -112,7 +112,7 @@ export default {
                 },
 
                 3: {
-                    address: 'https://promocollection.com.au/api/au.api/product',
+                    address: 'https://promocollection.uk/api/uk.api/product',
                     description: 'Returns product data for an individual product.',
                     parameters: [
                         {
@@ -139,7 +139,7 @@ export default {
                 },
 
                 4: {
-                    address: 'https://promocollection.com.au/api/au.api/products',
+                    address: 'https://promocollection.uk/api/uk.api/products',
                     description: 'Returns a list of all products.',
                     parameters: [
                         {
@@ -237,4 +237,4 @@ p {
 .content {
     color: #d14;
 }
-</style>
+</style>

pages/home/contact.vue

@@ -8,7 +8,7 @@
     <div class="line"></div>
     <div class="description">
       <p>General contact info</p>
-      <p>Email: Info@promocollection.com.au</p>
+      <p>Email: Info@promocollection.uk</p>
       <p>Phone:1300 369 252</p>
       <p>Address: 15/10 Chilvers Road, Thornleigh, NSW</p>
     </div>
@@ -20,7 +20,7 @@
               :src="
                 $mediaRegExp.test(item.image)
                   ? item.image
-                  : 'https://www.promocollection.com.au/' + item.image
+                  : 'https://www.promocollection.uk/' + item.image
               "
               alt=""
             />
@@ -55,7 +55,7 @@
               :src="
                 $mediaRegExp.test(item.image)
                   ? item.image
-                  : 'https://www.promocollection.com.au/' + item.image
+                  : 'https://www.promocollection.uk/' + item.image
               "
               alt=""
             />

pages/product-record/_code.vue

@@ -135,7 +135,7 @@ export default {
       return !!this.userInfo.email
     },
     isPromocollection() {
-      return /\@promocollection.com.au/.test(this.userInfo.email)
+      return /\@promocollection.uk/.test(this.userInfo.email)
     },
   },
   watch: {