ソースを参照

Merge remote-tracking branch 'origin/release-201821-wangcz' into release-201821-wangcz

shenjj 7 年 前
コミット
7349cd247d

+ 1 - 1
components/main/Nav.vue

@@ -41,7 +41,7 @@
       <nuxt-link to="/product/brand/brandList/A" class="item">
         <span>品牌墙</span>
       </nuxt-link>
-      <nuxt-link :to="'/store/' + $store.state.option.pcbUuid" class="item">
+      <nuxt-link :to="'/store/' + process.env.pcbId" class="item">
         <span>PCB专区</span>
       </nuxt-link>
       <nuxt-link to="/news" class="item">

+ 16 - 17
components/mobile/staffManagement/StaffList.vue

@@ -56,9 +56,9 @@
           <span><i class="iconfont icon-sousuo"></i></span>
         </div>
         <div class="list-content">
-          <div class="bg" v-for="item in auditBind">
+          <div class="bg">
             <div class="staff-list">
-              <div class="list-item"><span>用户名:</span><span>{{item}}}</span></div>
+              <div class="list-item"><span>用户名:</span><span>{item}</span></div>
               <div class="list-item"><span>UU账号:</span><span>100000721</span></div>
               <div class="list-item"><span>手机号:</span><span>12345678901</span></div>
               <div class="list-item"><span>邮箱:</span><span>12345678901</span></div>
@@ -69,7 +69,7 @@
             </div>
           </div>
         </div>
-        <div>{{auditBind}}</div>
+        <empty-status :type="'collect'" :showLink="true" :text="'抱歉,没有相关信息'"></empty-status>
       </div>
       <!--<seek-list :keyword="remindKeyword" :isSearch="isSearch" :userType="userType" :seekType="seekType" :purchaseManList="purchaseManListData"></seek-list>-->
       <!--<pull-up :fixId="'mobileFixContent'" :searchMore="fetching" :allPage="allPage" :page="page" @pullUpAction="onPullUpAction"></pull-up>-->
@@ -113,29 +113,28 @@
       staffData () {
         return this.$store.state.staff.infoList.info.data.content
       },
-      auditBind () {
-        console.log(this.$store.state.staff.infoList.audit.data, '13')
-        return this.$store.state.staff.infoList.audit.data.content
-      },
       userInfo () {
         return this.$store.state.option.user.data
       }
     },
-    fetch ({ store }) {
-      return Promise.all([
-        store.dispatch('staff/bindAudit', {size: this.count, page: this.page, speaceUU: this.user.userUU, status: 311, keyword: this.auditSearch})
-      ])
-    },
+    // fetch ({ store }) {
+    //   return Promise.all([
+    //     store.dispatch('staff/bindAudit', {size: this.count, page: this.page, speaceUU: this.user.userUU, status: 311, keyword: this.auditSearch})
+    //   ])
+    // },
     methods: {
       setSwitchType (type) {
         this.switchType = type
-        // this.$jsonp(`${process.env.ssoUrl}/api/userspace/apply/info/mall?count=10&page=1&speaceUU=10049698&status=311`, {timeout: 5000, name: 'successCallback'}, (err, data) => {
-        //   console.log(err, data, '231')
-        // })
         this.$http({
           method: 'get',
-          dataType: 'jsonp',
-          url: `${process.env.ssoUrl}/api/userspace/apply/info/mall?count=10&page=1&speaceUU=10049698&status=311`
+          baseURL: process.env.ssoUrl,
+          url: `/api/userspace/apply/info/mall`,
+          data: {
+            count: 10,
+            page: 1,
+            speaceUU: 10049698,
+            status: 311
+          }
         }).then(res => {
             console.log('1', res.data)
           }, err => {

+ 3 - 3
components/store/home/EnterpriseInfo.vue

@@ -4,7 +4,7 @@
       <ul class="main-list clearfix">
         <li>
           <div>
-            <div class="list" v-if="$route.params.uuid !== $store.state.option.pcbUuid">
+            <div class="list" v-if="$route.params.uuid !== process.env.pcbId">
               <div class="information-list">
                 <div>主营产品&nbsp;:</div>
                 <div v-if="storeInfo.description" :title="storeInfo.description">{{storeInfo.description | introduceFilter}}</div>
@@ -47,8 +47,8 @@
               <!--<qualification-certificate></qualification-certificate>-->
             </div>
             <div class="product-show">
-              <recommend-list v-if="$route.params.uuid !== $store.state.option.pcbUuid"></recommend-list>
-              <recommend-pcb v-if="$route.params.uuid === $store.state.option.pcbUuid"></recommend-pcb>
+              <recommend-list v-if="$route.params.uuid !== process.env.pcbId"></recommend-list>
+              <recommend-pcb v-if="$route.params.uuid === process.env.pcbId"></recommend-pcb>
             </div>
           </div>
         </li>

+ 1 - 1
components/store/home/StoreBanner.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container" id="title-fragment">
-    <div class="container" v-if="$route.params.uuid === $store.state.option.pcbUuid">
+    <div class="container" v-if="$route.params.uuid === process.env.pcbId">
       <div class="shop-pcb">
         <ul class="pk-list">
           <li class="pk-item" v-for="kind in kinds">

+ 4 - 1
nuxt.config.js

@@ -14,6 +14,8 @@ const messageUrl = process.env.MESSAGE_URL || (isProdMode ? 'https://api-message
 const uasUrl = process.env.uasUrl || (isProdMode ? 'http://uas.ubtob.com/' : 'http://192.168.253.12:9000/b2b-test/')
 // 帐户中心
 const ssoUrl = process.env.ssoUrl || (isProdMode ? 'https://sso.ubtob.com/' : 'http://192.168.253.6:32323')
+// pcb展示ID
+const pcbId = process.env.pcbId || (isProdMode ? '9612c0a894894c1aabbfe9192749bbfa' : 'shengfang')
 
 module.exports = {
   router: {
@@ -100,7 +102,8 @@ module.exports = {
     cmsUrl,
     messageUrl,
     ssoUrl,
-    uasUrl
+    uasUrl,
+    pcbId
   },
   plugins: [
     // {

+ 0 - 2
store/option.js

@@ -2,8 +2,6 @@
  * 全局设置
  */
 export const state = () => ({
-  // PCB 深圳市英唐致盈供应链管理
-  pcbUuid: '9612c0a894894c1aabbfe9192749bbfa',
   userAgent: '',
   // 是否移动端
   isMobile: false,

+ 17 - 7
yarn.lock

@@ -1038,6 +1038,13 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
+babel-runtime@^6.0.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
   version "6.23.0"
   resolved "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
@@ -1045,13 +1052,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-runtime@^6.23.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "http://registry.npm.taobao.org/babel-template/download/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
@@ -1160,6 +1160,12 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+better-scroll@^1.11.1:
+  version "1.12.6"
+  resolved "https://registry.yarnpkg.com/better-scroll/-/better-scroll-1.12.6.tgz#7548860f8b8c08c87e5af062e1da6e2c68c98337"
+  dependencies:
+    babel-runtime "^6.0.0"
+
 bezier-easing@^2.0.3:
   version "2.0.3"
   resolved "http://registry.npm.taobao.org/bezier-easing/download/bezier-easing-2.0.3.tgz#cb493fddb7f8920ecca00973344ce0518885f17e"
@@ -5730,6 +5736,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "http://registry.npm.taobao.org/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
+prettier@^1.12.1:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
+
 prettier@^1.7.0:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"