Pārlūkot izejas kodu

feat:修改部分bug,

xzh 4 gadi atpakaļ
vecāks
revīzija
37b134e626

+ 2 - 2
mobile/src/pages/home/components/plate5.vue

@@ -56,8 +56,8 @@ export default {
     },
     loadNews () {
       let urlMap = {
-        zh: 'https://4dscene.4dage.com/new4dkk/news/news.json',
-        en: 'https://4dscene.4dage.com/new4dkk/news/news-en.json'
+        zh: '../www/newsList/news.json',
+        en: '../www/newsList/news-en.json'
       }
       http.get(`${urlMap[this.language]}?t=${new Date()}`).then(res => {
         this.newsData = res.data.slice(0, 4)

+ 5 - 6
mobile/src/pages/news/index.vue

@@ -29,7 +29,6 @@
 </template>
 
 <script>
-import { News, EnNews } from '@/../../common/data/newsData'
 import { mapState } from 'vuex'
 import http from '@/util/http'
 export default {
@@ -79,7 +78,7 @@ export default {
     }
   },
   mounted () {
-    this.newsList = this.language === 'zh' ? News : EnNews
+    this.loadNews()
   },
   methods: {
     toNewsDetail (item) {
@@ -90,11 +89,11 @@ export default {
     },
     loadNews () {
       let urlMap = {
-        zh: 'https://4dscene.4dage.com/new4dkk/news/news.json',
-        en: 'https://4dscene.4dage.com/new4dkk/news/news-en.json'
+        zh: '../www/newsList/news.json',
+        en: '../www/newsList/news-en.json'
       }
-      http.get(`${urlMap[this.language]}?t=${new Date()}`).then(res => {
-        this.plate05List = res.data.slice(0, 4)
+      http.get(`${urlMap[this.language]}`).then(res => {
+        this.newsList = res.data
       })
     }
   }

+ 1 - 1
pc/build/build.en.js

@@ -10,7 +10,7 @@ const chalk = require('chalk')
 const webpack = require('webpack')
 const config = require('../config')
 const webpackConfig = require('./webpack.prod.conf.en')
-
+process.env.IS_INTERNATIONAL = true
 const spinner = ora('building for production...')
 spinner.start()
 

+ 3 - 1
pc/build/webpack.base.conf.js

@@ -20,6 +20,8 @@ const createLintingRule = () => ({
 })
 
 const isProd = process.env.NODE_ENV === 'production'
+const isInternational = process.env.IS_INTERNATIONAL
+
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
@@ -58,7 +60,7 @@ module.exports = {
         options: {
           limit: 10000,
           name: utils.assetsPath('v2/images/[path][name].[ext]'),
-          publicPath: isProd ? 'https://4dscene.4dage.com/new4dkk/' : ''
+          publicPath: isProd ?  'https://4dscene.4dage.com/new4dkk/' : ''
         }
       },
       {

+ 9 - 1
pc/build/webpack.prod.conf.en.js

@@ -21,7 +21,15 @@ const webpackConfig = merge(baseWebpackConfig, {
       sourceMap: config.build.productionSourceMap,
       extract: true,
       usePostCSS: true
-    })
+    }, {
+      test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+      loader: 'url-loader',
+      options: {
+        limit: 10000,
+        name: utils.assetsPath('v2/images/[path][name].[ext]'),
+        publicPath: './'
+      }
+    },)
   ]
   },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,

+ 0 - 6
pc/build/wepack.dev.server.js

@@ -57,14 +57,8 @@ module.exports = function(app, server) {
         zh: './../common/data/news.json',
         en: './../common/data/news-en.json'
       }
-      const ossPathMap = {
-        zh: 'new4dkk/news/news.json',
-        en: 'new4dkk/news/news-en.json'
-      }
       
       await fs.writeFile(localUrl[req.body.lang], `${JSON.stringify(data, null, 4)}`, async err => {
-        const oss_path = ossPathMap[req.body.lang]
-        const OUTPUT = localUrl[req.body.lang]
         ftpDeploy
         .deploy(config)
         .then(() => {

+ 1 - 1
pc/config/prod.env.en.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  IS_INTERNATIONAL: '"true"'
+  IS_INTERNATIONAL: 'true'
 }

BIN
pc/src/assets/images/refactor/mall/tag-icon.png


+ 1 - 1
pc/src/page/login/components/forget/emailForm.vue

@@ -139,7 +139,7 @@ export default {
       let checkStr = [
         {
           name: this.type === 'email' ? '邮箱' : '手机',
-          En: this.type === 'email' ? 'E-Mail' : 'Phone number',
+          En: this.type === 'email' ? 'E-mail' : 'Phone number',
           val: this.form.phone
         },
         {

+ 1 - 1
pc/src/page/login/components/login.vue

@@ -85,7 +85,7 @@ export default {
         let checkStr = [
           {
             name: this.isInternational ? '邮箱' : '手机',
-            En: this.isInternational ? 'E-Mail' :'Phone number',
+            En: this.isInternational ? 'E-mail' :'Phone number',
             val: this.form.phone
           },
           {

+ 1 - 1
pc/src/page/mall/kankanPro/style.scss

@@ -197,7 +197,7 @@
       display: flex;
       align-items: center;
       margin: 20px 0 36px;
-      background: url('https://4dscene.4dage.com/new4dkk/images/tag-icon.png') no-repeat right bottom;
+      background: url('~@/assets/images/refactor/mall/tag-icon.png') no-repeat right bottom;
       img{
         vertical-align: middle;
         margin-right: 20px;

+ 0 - 133
pc/src/page/manage/style.scss

@@ -1,139 +1,6 @@
 .manage-layout{
   $font-color:#2d2d2d;
   $theme-color:#1fe4dc;
-  .manage-bg{
-    background: url(https://4dscene.4dage.com/new4dkk/images/person-bg.png) no-repeat top center;
-    background-size: cover;
-    .manage-con{
-      padding: 30px 0;
-      .info{
-        color: #cfcfcf;
-        width: 730px;
-        display: block;
-        position: relative;
-        .card-img{
-          font-size: 0;
-          display: inline-block;
-          cursor: pointer;
-          background-position: center;
-          background-size: auto 100%;
-        }
-        .avatar{
-          width: 64px;
-          height: 64px;
-          flex-shrink: 0;
-          margin-right: 14px;
-          background-repeat: no-repeat;
-          background-size: cover;
-        }
-        .member{
-          display:flex;
-          flex-direction: column;
-          justify-content: space-between;
-          height: 64px;
-          padding: 2px 0;
-          p{
-            line-height: 1;
-            color: #cfcfcf;
-            font-size: 16px;
-            &:first-child{
-              font-size: 28px;
-              color: #fff;
-            }
-            .child-name{
-              display: inline-block;
-              position: relative;
-              cursor: pointer;
-              min-width: 120px;
-              ul{
-                background-color: #fff;
-                position: absolute;
-                width: calc(100% + 32px);
-                top: 22px;
-                left: -5px;
-                color: #969696;
-                max-height: 0;
-                overflow: hidden;
-                transition:all 0.3s ease;
-                li{
-                  line-height: 28px;
-                  padding: 0 5px;
-                  &:hover{
-                    background: $theme-color;
-                    color: #2d2d2d;
-                  }
-                }
-              }
-            }
-            .tab-active{
-              ul{
-                max-height: 120px;
-                overflow: auto;
-              }
-            }
-            .sanjiao{
-              display: inline-block;
-              position: relative;
-              &::before{
-                content: '';
-                border: 8px solid transparent;
-                border-top-color: #cfcfcf;
-                border-left-width: 5px;
-                border-right-width: 5px;
-                position: absolute;
-                right: -20px;
-                top: 4px;
-                z-index: 1;
-              }
-            }
-          }
-          
-        }
-        
-      }
-      .open-btn{
-        color: #010101;
-        line-height: 40px;
-        height: 40px;
-        margin-top: 20px;
-        width: 170px;
-        font-size: 16px;
-        text-align: center;
-        background-color: #1fe4dc;
-        cursor: pointer;
-      }
-      .deviceLogin{
-        display: block;
-      }
-      .capacity{
-        margin-top: 10px;
-        width: 680px;
-        .c-line{
-          width: 100%;
-          margin: 15px 0;
-          height: 8px;
-          background-color: #ccc;
-          .active{
-            background-color: $theme-color;
-            height: 100%;
-          }
-        }
-        .c-dec{
-          font-size: 16px;
-          color: #cfcfcf;
-        }
-        .c-detail{
-          color: #fff;
-          display: flex;
-          justify-content: space-between;
-          span{
-            font-size: 14px;
-            color: #cfcfcf;
-          }
-        }
-      }
-    }
-  }
   .manage-body{
     min-height: 676px;
     padding: 80px 0;

+ 0 - 266
pc/src/page/purchase/index.vue

@@ -1,266 +0,0 @@
-<template>
-  <div class="purchase-layout container">
-    <div class="plate01">
-      <div class="main-detail">
-        <browse
-          :idata='browdata'
-          :iactive='browactive'
-          :floder="'probrowse'"
-          class="product-img"
-         />
-        <div class="layout">
-          <img class="pro-logo" :src="language==='en'?`${$cdn}images/pro-logo-en.png`:`${$cdn}images/pro-logo.png`" alt="">
-          <p class="sub b-label" v-html="langPurchase.dec"></p>
-          <p class="price">
-             {{langPurchase.price}}
-            <span>{{langPurchase.yushou}}</span>
-          </p>
-          <template>
-            <p class="title first-title">{{langPurchase.color.key}}</p>
-            <div class="detail-box">
-              <i class="iconfont icon-yuandian">{{langPurchase.color.val}}</i>
-            </div>
-            <p class="title">{{langPurchase.service.key}}</p>
-            <div class="detail-box sceond-box">
-              <i class="iconfont icon-yuandian">{{langPurchase.service.type}}</i>
-              <!-- <span @click="scrollTo('rlgz')">{{langPurchase.why}}</span> -->
-              <ul>
-                <li v-for="(item, i) in langPurchase.service.val" :key="i">{{item}}</li>
-              </ul>
-            </div>
-            <p class="title ">{{langPurchase.gift.peijian}}</p>
-            <div class="detail-box zhijia" :style="{padding:language==='en'?'10px 2.5% 10px 3.5%':'10px 3.5%'}" :class="{'no-active':!selectParts}" @click="selectParts=!selectParts">
-              <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt>
-              <img :src="`${$cdn}images/zhijia.png`" alt>
-              <div>
-                <p>{{langPurchase.gift.val}}</p>
-                <p>{{langPurchase.gift.price}}</p>
-              </div>
-            </div>
-            <p class="title peijian">
-              <img :src="`${$cdn}images/perjian-warn.png`" alt="">
-              <span @click="$router.push({name:'purchasezhijia'})">{{langPurchase.gift.key}}</span>
-            </p>
-          </template>
-          <template v-if="language!=='en'">
-            <p class="title" style="margin-top:20px;">{{langPurchase.count.key}}</p>
-            <spinner class="spinner" @count="handleSpinner"/>
-          </template>
-          <div>
-            <div class="btns">
-              <div v-if="language!=='en'" class="button add-cart" @click="addcart">
-                <vcenter>
-                  <span>加入购物车</span>
-                </vcenter>
-              </div>
-              <div class="button"  @click="pay">
-                <vcenter>
-                  <span>{{langPurchase.buy}}</span>
-                </vcenter>
-              </div>
-            </div>
-            <div class="btn-dec" >{{langPurchase.tiaokuan}}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="plate02" >
-      <div class="b-title">{{langPurchase.guige.name}}</div>
-      <div class="params-img-con">
-        <img class="params-img" :src="`${$cdn}images/product_img_content_6_w.png`" alt="">
-      </div>
-      <div class="params-body">
-        <div class="params-con">
-          <div class="params-item" v-for="(item,index) in langPurchase.guige.arr" :key="index">
-            <div class="p-l">{{item.name}}</div>
-            <div class="p-r">
-              <div v-html="sub" v-for="(sub,i) in item.val" :key="i"></div>
-            </div>
-          </div>
-        </div>
-        <div class="sub">
-          <p>{{langPurchase.guige.dec}}</p>
-        </div>
-      </div>
-    </div>
-    <!-- <div class="plate03" ref="rlgz">
-      <div class="p03">
-        <div class="b-title">{{langPurchase.pricename}}</div>
-        <priceTable/>
-        <ul class="qa-con">
-          <li v-for="(item,i) in langPurchase.pricetxt" :key="i">
-            <p>{{item.q}}</p>
-            <p v-html="item.a"></p>
-          </li>
-          <p class="promise">{{langPurchase.notice}}</p>
-        </ul>
-        <p class="peijian" @click="$router.push({name:'pricedetail'})">
-          <img :src="`${$cdn}images/perjian-warn.png`" alt="">
-          <span>{{langPurchase.view}}</span>
-        </p>
-      </div>
-    </div> -->
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import spinner from '@/components/spinner'
-import vcenter from '@/components/vcenter'
-import browse from '@/components/browse'
-import priceTable from '@/components/priceTable'
-import { getPosition } from '@/util'
-
-export default {
-  components: {
-    spinner,
-    vcenter,
-    browse,
-    priceTable
-  },
-  computed: {
-    ...mapState({
-      isLogin: state => state.user.name,
-      langPurchase: state => state.language.home.purchase,
-      language: state => state.language.current,
-      langToast: state => state.language.home.toast,
-      token: state => state.user.token,
-      cart: state => JSON.parse(state.user.cart)
-    })
-  },
-  data () {
-    let detail = {
-      left: [
-        '数据永久存储',
-        '高速上传计算队列',
-        '场景分享、热点编辑、隐私加密'
-      ],
-      right: ['多种个性化功能', '附送30G终身容量']
-    }
-    let guige = [
-      {
-        name: '容量和内存',
-        val: ['LPDDR4X双通道', '6G内存', 'UFS 2.1', '64GB 机身存储']
-      },
-      {
-        name: '机身尺寸和重量',
-        val: ['高度 = 153.3m', '宽度 = 74.5mm', '厚度 = 7.9mm', '重量 = 170g']
-      },
-      {
-        name: '处理器平台',
-        val: [
-          'Qualcomm® 骁龙™ 845 处理器',
-          '10nm 先进制程',
-          '单核主频可达 2.8GHz',
-          'Adreno™ 630 图形处理器,主频可达 700MHz',
-          '配备人工智能引擎(AI Engine)'
-        ]
-      },
-      {
-        name: '网络',
-        val: ['支持 VoLTE 高质量宽带', '支持三载波聚', '支持 LTE B41 4x4 MIMO']
-      },
-      {
-        name: '屏幕',
-        val: [
-          '6.17 英寸 In-Cell 全高清显示屏',
-          '2242 x 1080 分辨率,403 ppi',
-          '康宁®第三代大猩猩®玻璃'
-        ]
-      }
-    ]
-    let browdata = [
-      {
-        small: 'small-0',
-        big: 'big-0',
-        video: true
-      }, {
-        small: 'small-1',
-        big: 'big-1'
-      },
-      {
-        small: 'small-2',
-        big: 'big-2'
-      },
-      {
-        small: 'small-3',
-        big: 'big-3'
-      }]
-    let browactive = browdata[0]
-    return {
-      detail,
-      guige,
-      browactive,
-      browdata,
-      count: 1,
-      selectParts: true
-    }
-  },
-  methods: {
-    handleSpinner (data) {
-      this.count = data
-    },
-    async addcart () {
-      if (!this.token) {
-        return this.$bus.$emit('showAside')
-      }
-      let zhijia = {
-        goodsId: 7,
-        goodsCount: this.count,
-        skuSn: 'U15604134406280073'
-      }
-      let params = {
-        goodsId: 4,
-        goodsCount: this.count,
-        skuSn: 'U15609161635760015'
-      }
-      await this.$store.dispatch('addCart', params)
-      this.selectParts && await this.$store.dispatch('addCart', zhijia)
-      this.$toast.show('success', this.langToast['39'])
-    },
-    pay () {
-      if (this.language === 'en') {
-        return window.open('https://www.alibaba.com/product-detail/4DKanKan-Pro-3D-camera-3D-space_62183626283.html?spm=a2700.icbuShop.74.1.66b35b10I4miJd')
-      }
-      let params = {
-        type: 'detail',
-        sku: [{
-          goodsId: 4,
-          goodsCount: this.count,
-          price: 12800,
-          skuSn: 'U15609161635760015'
-        }],
-        fromList: false
-      }
-      let zhijia = {
-        goodsId: 7,
-        goodsCount: this.count,
-        price: 899,
-        skuSn: 'U15604134406280073'
-      }
-      this.selectParts && params.sku.push(zhijia)
-      this.$bus.$emit('showAside', params)
-    },
-    scrollTo (href) {
-      this.interval = null
-      let inter = 0
-      let tag = getPosition(this.$refs[href]).y - 90
-      let speed = Math.ceil(tag / 40)
-      this.interval = setInterval(() => {
-        window.scrollTo(0, inter)
-        inter += speed
-        if ((window.scrollY || window.pageYOffset) >= tag) {
-          clearInterval(this.interval)
-        }
-      })
-    }
-  },
-  beforeDestroy () {
-    clearInterval(this.interval)
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "./style.scss";
-</style>

+ 0 - 402
pc/src/page/purchase/style.scss

@@ -1,402 +0,0 @@
-.purchase-layout {
-  overflow: hidden;
-}
-
-.btns{
-  font-size: 0;
-}
-.btns .button{
-  cursor: pointer;
-  width: 250px;
-  height: 50px;
-  padding-top: 0;
-  padding-bottom: 0;
-  margin-top: 24px;
-  line-height: 50px;
-  color: #414141;
-  text-align: center;
-  font-size: 14px;
-  img{
-    vertical-align: middle;
-  }
-  span{
-    vertical-align: middle;
-    padding-left: 2px;
-  }
-}
-
-.plate01{
-  background: url(https://4dscene.4dage.com/new4dkk/images/purchase_bg.png) #f8f9fc top center no-repeat;
-  padding: 0 0 100px;
-  .main-detail{
-    padding-top: 80px;
-  }
-  .p1-banner{
-    background: #fff;
-    height: 65px;
-    text-align: right;
-    padding-right: 120px;
-    span{
-      display: inline-block;
-      margin-left: 50px;
-      padding-top: 40px;
-      cursor: pointer;
-      font-size: 16px;
-    }
-  }
-  .product-img{
-    display: inline-block;
-  }
-  .layout{
-    width: 540px;
-    margin-top: 20px;
-    margin-left: 8%;
-    display: inline-block;
-    vertical-align: top;
-    .pro-logo{
-      margin-bottom: 8px;
-      max-width: 100%;
-    }
-    .price{
-      margin-top: 20px;
-      font-size: 28px;
-      line-height: 1;
-      color: rgba(0,0,0,.7);
-      font-weight: 700;
-      border-bottom: 1px #e2e2e2 solid;
-      padding-bottom: 20px;
-      span{
-        font-size: 14px;
-        color: #1fe4dc;
-        font-weight: bold;
-      }
-    }
-    .title{
-      font-size: 14px;
-      color: rgba(0,0,0,.7);
-      line-height: 18px;
-      font-weight: 600;
-      margin:6px 0 0;
-    }
-   
-    .first-title{
-      margin-top: 20px;
-    }
-    .detail-box{
-      position: relative;
-      display: inline-block;
-      color: rgba(0,0,0,.45);
-      padding: 5px 0;
-      line-height: 1.5;
-      width: 250px;
-      box-sizing: border-box;
-      text-align: left;
-      &:first-of-type{
-        padding: 6px 0 11px;
-        height: auto;
-        box-sizing: border-box;
-        font-size: 16px;
-        color: #000;
-      }
-      .t-click{
-        position: absolute;
-        right: 0;
-        bottom: 0;
-        margin: 0;
-        width: 16px;
-        height: 16px;
-      }
-      .icon-yuandian::before{
-        margin-right: 6px;
-        font-size: 16px;
-      }
-      .line{
-        display: inline-block;
-        width: 1px;
-        height: 56px;
-        background: #e2e2e2;
-        margin: 5px 39px 0 40px;
-      }
-      ul{
-        display: inline-block;
-        vertical-align: top;
-        &:last-child{
-          margin: 2px 20px 10px;
-        }
-        li{
-          font-size: 14px;
-          line-height: 1.5;
-          position: relative;
-          &::before{
-            content: '';
-            width: 3px;
-            height: 3px;
-            border-radius: 50%;
-            display: inline-block;
-            position: absolute;
-            left: -15px;
-            top: 11px;
-            transform: translateY(-50%);
-            background-color: rgba(0,0,0,.45);
-          }
-        }
-      }
-    }
-    .sceond-box{
-      width: 600px;
-      padding-bottom: 2px;
-      .icon-yuandian{
-        padding: 12px 0 16px;
-        height: auto;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        font-size: 16px;
-        color: #000;
-      }
-      span{
-        font-size: 14px;
-        color: #1fe4dc;
-        font-weight: bold;
-        cursor: pointer;
-      }
-    }
-    .zhijia{
-      padding: 10px 3.5%;
-      cursor: pointer;
-      text-align: center;
-      border: 1px solid #70eee9;
-      display: flex;
-      align-items: center;
-      margin: 8px 0 6px;
-      img{
-        vertical-align: middle;
-        margin-right: 20px;
-        height: 60px;
-      }
-      p{
-        text-align: left;
-        vertical-align: middle;
-        font-size: 14px;
-      }
-    }
-    .peijian{
-      vertical-align: middle;
-      color: #486ace;
-      font-weight: normal;
-      img{
-        vertical-align: middle;
-        width: 16px;
-        margin: 0;
-        height: 16px;
-      }
-      span{
-        display: inline-block;
-        cursor: pointer;
-        vertical-align: middle;
-      }
-    }
-    .no-active{
-      border: 1px solid #e3e3e3;
-      background-color: #fff;
-      .t-click{
-        display: none;
-      }
-    }
-    .spinner{
-      margin-top: 10px;
-    }
-    .btns {
-      img{
-        width: 24px;
-      }
-    }
-    .btns .add-cart{
-      background: #e7e7e7;
-      margin-right: 40px;
-    }
-    .btn-dec{
-      margin-top: 12px;
-      font-size: 14px;
-      color: rgba(0,0,0,.7);
-      font-weight: bolder;
-      line-height: 16px;
-    }
-  }
-}
-
-.plate02{
-  width: 100%;
-  margin: 0 auto;
-  padding: 84px 0 0;
-  text-align: center;
-
-  .b-title{
-    font-weight: 700;
-    font-size: 28px;
-    color: rgba(0, 0, 0, 0.7);
-    line-height: 44px;
-    max-width: 300px;
-    margin: 0 auto;
-  }
-  .params-img-con{
-    background: #fff;
-    .params-img{
-      max-width: 1150px;
-      margin: 84px auto;
-    }
-  }
-
-  .params-body{
-    width: 100%;
-    background: #f8f9fc;
-    padding: 84px 0;
-    .params-con{
-      width: 621px;
-      margin: 28px auto 12px;
-      .params-item{
-        width: 100%;
-        border-top: 1px solid #e7e7e7;
-        text-align: left;
-        padding: 28px 0;
-        &:last-of-type{
-         border-bottom: 1px solid #e7e7e7;
-        }
-        &>div{
-          display: inline-block;
-          text-align: left;
-        }
-        .p-l{
-          width: 100px;
-          height: 100%;
-          text-align: left;
-          font-size: 14px;
-          color: rgba(0, 0, 0, 0.7);
-          line-height: 1.5;
-          font-weight: 600;
-          margin: 0;
-          vertical-align: top;
-        }
-        .p-r{
-          width: calc(100% - 120px);
-          height: 100%;
-          text-align: left;
-          div{
-            line-height: 1.5;
-            font-size: 14px;
-            color: rgba(0, 0, 0, 0.45);
-            margin-right: 50px;
-          }
-        }
-      }
-    }
-    .sub{
-      width: 621px;
-      text-indent: 28px;
-      text-align: left;
-      margin: 12px auto 0;
-      font-size: 14px;
-      color: rgba(0, 0, 0, 0.45);
-      line-height: 16px;
-      p:first-of-type{
-        text-indent: 0px;
-      }
-    }
-  }
-  
-}
-
-.plate03{
-  width: 100%;
-  background-color: #fff;
-  .p03{
-    width: 621px;
-    margin: 0 auto;
-    padding: 84px 0;
-    text-align: center;
-    .b-title{
-      font-weight: 700;
-      font-size: 28px;
-      color: rgba(0, 0, 0, 0.7);
-      line-height: 44px;
-      margin: 0 auto 30px;
-    }
-    .price-txt{
-      text-align: justify;
-      font-size: 14px;
-      padding-left: 20px;
-      margin-top: 25px;
-      li{
-        font-size: 14px;
-        color: #666;
-        line-height: 31px;
-        list-style: disc;
-      }
-    }
-    .qa-con{
-      max-width: 1182px;
-      margin: 20px auto 0;
-      li{
-        margin-bottom: 18px;
-        text-align: justify;
-        font-family:'Microsoft Yahei','微软雅黑',Tahoma,Arial,Helvetica,STHeiti;
-        p{
-          font-size: 14px;
-          color: #666;
-          line-height: 31px;
-          &:first-of-type{
-            font-size: 18px;
-            color: #333;
-            font-weight: bold;
-            margin-bottom: 11px;
-          }
-        }
-      }
-      .promise{
-        text-align: left;
-        font-size: 14px;
-        color: #666;
-        line-height: 31px;
-      }
-    }
-    .peijian{
-      vertical-align: middle;
-      color: #486ace;
-      font-weight: normal;
-      text-align: left;
-      font-size: 14px;
-      margin-top: 5px;
-      margin-left: 2px;
-      cursor: pointer;
-      img{
-        vertical-align: middle;
-        width: 16px;
-        height: 16px;
-      }
-      span{
-        display: inline-block;
-        vertical-align: middle;
-      }
-    }
-  }
-}
-
-@media screen and (min-width: 2000px) {
-  .plate01 {
-    .main-detail{
-      max-width: 1920px;
-      margin: 0 auto!important;
-    }
-  }
-}
-
-@media screen and (max-width: 1450px) {
-  .plate01 {
-    .product-img{
-      margin-left: 50px!important;
-
-    }
-    .layout{
-      margin-left:5%;
-    }
-  }
-}

+ 0 - 5
pc/src/router/index.js

@@ -251,11 +251,6 @@ let router = new Router({
       component: resolve => require(['@/page/agent'], resolve)
     },
     {
-      path: '/purchase',
-      name: 'purchase',
-      component: resolve => require(['@/page/purchase'], resolve)
-    },
-    {
       path: '/purchasezhijia',
       name: 'purchasezhijia',
       component: resolve => require(['@/page/purchasezhijia'], resolve)