Browse Source

员工管理手机号改为手机

huangb 7 years ago
parent
commit
3c9e71bc61

+ 1 - 1
assets/scss/common.scss

@@ -635,7 +635,7 @@ a {
   text-decoration: none;
   outline: 0;
   cursor: pointer;
-  transition: color .2s ease;
+  //transition: color .2s ease;
 }
 .select-adder {
   background:url("../../static/images/all/xiala.png") right no-repeat #fff !important;

+ 1 - 1
components/brandCenter/RecommendBrand.vue

@@ -21,7 +21,7 @@
     data () {
       return {
         swiperOption: {
-          autoplay: 6000,
+          // autoplay: 6000,
           pagination: '.swiper-pagination',
           paginationClickable: true,
           mousewheelControl: false,

+ 2 - 2
components/mobile/staffManagement/StaffAdd.vue

@@ -28,7 +28,7 @@
                                         @change="checkPhone()"
                                         @input="checkPhone()"
                                         maxlength="11"
-                                        placeholder="请输入手机"></li>
+                                        placeholder="请输入手机"></li>
             <li><span>邮箱:</span><input type="text"
                                        v-model="newUserEmail"
                                        @change="checkEmail()"
@@ -46,7 +46,7 @@
           <input type="text"
                  v-model="searchKeyword"
                  @click="addApply"
-                 placeholder="请输入UU号、手机或邮箱">
+                 placeholder="请输入UU号、手机或邮箱">
           <span @click="addApply"><i class="iconfont icon-sousuo"></i></span>
         </div>
         <div class="list-content" v-if="showSearchUser">

+ 13 - 2
components/provider/Suppliers.vue

@@ -28,8 +28,18 @@
           <td colspan="3">
             <a class="store-name"><div :title="store.storeName">{{store.storeName}}</div></a>
             <div class="store-message">
-              <span>企业介绍:</span>
-              <span style="word-break: break-word;">{{showLittleDescription(store.enterprise.description)}}<em v-if="store.description && store.description.length > 160">...</em></span>
+              <div>
+                <span>主营产品:</span>
+                <span>123</span>
+                <span class="split_line" style="margin: 0 5px;">|</span>
+                <span>经营范围:</span><span>1212324</span>
+              </div>
+              <div>
+                <span>电话:</span>
+                <span>123</span>
+                <span class="split_line" style="margin: 0 5px;">|</span>
+                <span>地址:</span><span>1212324</span>
+              </div>
             </div>
           </td>
           <td class="vertical-middle" style="text-align: center">
@@ -79,6 +89,7 @@ export default {
       return this.$route.params.type
     },
     stores () {
+      console.log(this.$store.state.provider.stores.storeList.data)
       return this.$store.state.provider.stores.storeList.data
     },
     user () {

+ 10 - 9
components/provider/ToggleStore.vue

@@ -84,7 +84,6 @@ export default {
   },
   computed: {
     storeType () {
-      console.log(this.$route.params.type, '1111')
       return this.$route.params.type
     },
     store () {
@@ -98,14 +97,16 @@ export default {
     },
     count () {
       let allCount =  this.$store.state.option.counter.data ? this.$store.state.option.counter.data : []
-      allCount.forEach((value) => {
-        if (value.item === '供应商') {
-          this.supplierArr.push(value.count)
-        }
-        if (value.item === '品   牌') {
-          this.brandArr.push(value.count)
-        }
-      })
+      if (allCount) {
+        allCount.forEach((value) => {
+          if (value.item === '供应商') {
+            this.supplierArr.push(value.count)
+          }
+          if (value.item === '品   牌') {
+            this.brandArr.push(value.count)
+          }
+        })
+      }
     }
   },
   mounted () {

+ 1 - 1
nuxt.config.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 // b2c后台
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.3:36002/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.3:36006/')
 // 公共询价
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共物料