隐藏不可拆卖，erp隐藏头部方式修改

components/search/GoodList.vue

@@ -97,7 +97,7 @@
              <!-- <div class="multiple" v-if="item.reserve > 0">
                 倍数：<span v-text="item.minPackQty"></span>
               </div>-->
-              <div v-if="item.reserve" v-text="item.breakUp?'可拆卖':'不可拆卖'"></div>
+              <div v-if="item.reserve && item.breakUp" v-text="item.breakUp?'可拆卖':'不可拆卖'"></div>
             </td>
             <td>
               <div v-show="!item.prices">

components/store/CommodityInfo.vue

@@ -51,7 +51,7 @@
             <div class="com-info">
               <span class="name">库&nbsp;存</span>：<span v-text="commodity.reserve || 0"></span><em style="margin-left: 3px;">PCS</em>
               （<span v-text="commodity.minBuyQty || 1"></span>个起订）
-              <span :class="commodity.breakUp?'div-sell can-div-sell':'div-sell not-div-sell'" v-text="commodity.breakUp?'可拆卖':'不可拆卖'" ></span>
+              <span :class="commodity.breakUp?'div-sell can-div-sell':'div-sell not-div-sell'" v-if="commodity.breakUp">可拆卖</span>
             </div>
             <div class="com-info">
               <span class="name">交&nbsp;期</span>：

components/store/CommodityList.vue

@@ -73,7 +73,7 @@
               <!--<div class="multiple">
                 倍数：<span>1</span>
               </div>-->
-              <div class="can-div-sell" v-if="commodity.reserve || commodity.status === 602" v-text="commodity.breakUp?'可拆卖':'不可拆卖'"></div>
+              <div class="can-div-sell" v-if="(commodity.reserve || commodity.status === 602) && commodity.breakUp">可拆卖</div>
             </td>
             <td>
               <div v-for="price in commodity.prices" v-text="price.start + '+'"></div>

components/store/RecommendProduct.vue

@@ -15,14 +15,14 @@
             <p class="price" v-if="commodity.minPriceRMB">¥ {{commodity.minPriceRMB | currency}}</p>
             <p class="price" v-if="!commodity.minPriceRMB">$ {{commodity.minPriceUSD | currency}}</p>
           </div>
-          <div class="hover-show" :href="commodity.batchCode ? '/store/productDetail/'  + commodity.batchCode : ''">
-            <a :href="commodity.batchCode ? '/store/productDetail/' + commodity.batchCode : ''" class="href">
+          <div class="hover-show">
+            <nuxt-link :to="commodity.batchCode ? '/store/productDetail/' + commodity.batchCode : ''" class="href">
               <div class="title" v-text="commodity.comCode">MRFE6S9045NF001</div>
               <div class="type" v-text="commodity.brandNameCn">PANFAEFQ</div>
               <div class="hr"><span>抢购价</span></div>
               <div class="price" v-if="commodity.minPriceRMB">¥ {{commodity.minPriceRMB | currency}}</div>
               <div class="price" v-if="!commodity.minPriceRMB">$ {{commodity.minPriceUSD | currency}}</div>
-            </a>
+            </nuxt-link>
             <div class="by-cart"><button title="加入购物车" @click="buyNow(false, commodity)"><img src="/images/store/icon/cart-blue.png"/></button></div>
             <div class="buy-now"><button title="立即购买" @click="buyNow(true, commodity)">立即购买</button></div>
           </div>

layouts/shop.vue

@@ -38,14 +38,19 @@
     },
     computed: {
       isInFrame () {
-        let cookies = this.$store.state.option.cookies
-        let cookieArr = cookies.split(';')
-        let cookieObj = {}
-        for (let i = 0; i < cookieArr.length; i++) {
-          let tmpArr = cookieArr[i].split('=')
-          cookieObj[tmpArr[0].trim()] = tmpArr[1].trim()
+        if (this.$route.query.type === 'erp') {
+          this.$store.commit('option/ADD_COOKIES', 'type=erp;')
+          return true
+        } else {
+          let cookies = this.$store.state.option.cookies
+          let cookieArr = cookies.split(';')
+          let cookieObj = {}
+          for (let i = 0; i < cookieArr.length; i++) {
+            let tmpArr = cookieArr[i].split('=')
+            cookieObj[tmpArr[0].trim()] = tmpArr[1].trim()
+          }
+          return cookieObj.type === 'erp'
         }
-        return cookieObj.type === 'erp'
       },
       title () {
         let path = this.$route.path

nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://192.168.253.121:9090/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://10.1.51.90:8080/platform-b2c/')
 
 module.exports = {
   router: {

pages/mobile/search/_keycode.vue

@@ -32,7 +32,7 @@
 
     <div class="detail-brand" v-for="(item, index) in searchLists" :style="index == 0 ? 'padding-top: .2rem;' : ''" v-if="searchLists.length > 0">
       <div class="brand-item" @click="goComponent(item.uuid)">
-        <p>店铺名称：<span>{{item.storeName || '-'}}</span></p>
+        <p>店铺：<span>{{item.storeName || '-'}}</span></p>
         <p>型号：<span>{{item.code || '-'}}</span></p>
         <p>品牌：<span>{{item.brandEn || item.brand.nameCn || '-'}}</span></p>
         <p>产品描述：<span>{{item.description || '-'}}</span></p>

server.js

@@ -5,7 +5,7 @@ const cookiejar = require('cookiejar')
 const host = process.env.HOST || '127.0.0.1'
 const port = process.env.PORT || 3000
 process.noDeprecation = true
-const url = require('url')
+// const url = require('url')
 
 app.set('port', port)
 
@@ -22,10 +22,10 @@ if (proxyTable) {
     res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE')
     res.header('Access-Control-Allow-Headers', 'Content-Type')
     res.header('Access-Control-Allow-Credentials', 'true')
-    const refer = res.req.headers.referer
-    if (refer && url.parse(refer, true).query.type === 'erp') {
-      res.cookie('type', 'erp')
-    }
+    // const refer = res.req.headers.referer
+    // if (refer && url.parse(refer, true).query.type === 'erp') {
+    //   res.cookie('type', 'erp')
+    // }
     next()
   })
   const defaultOptions = {