企业信息

assets/scss/mobileCommon.scss

@@ -410,9 +410,8 @@ html {
 }
 
 .mobile-fix-content {
-  position: fixed;
+  position: absolute;
   top: .88rem;
   bottom: .98rem;
   width: 100%;
-  overflow-y: auto;
 }

nuxt.config.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://10.1.51.124:8080/platform-b2c')
-const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://10.1.51.77:7070/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://10.1.51.125:8080/platform-b2c/')
+const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 
 module.exports = {
@@ -174,6 +174,7 @@ module.exports = {
     '/productuser/**': materialUrl,
     // 权限管理
     '/account/**': baseUrl,
-    '/vendor/**': baseUrl
+    '/vendor/**': baseUrl,
+    '/internalmessage-service/**': baseUrl
   }
 }

package.json

@@ -21,7 +21,8 @@
     "vue-awesome-swiper": "^2.5.4",
     "vue2-filters": "^0.1.9",
     "node-sass": "^4.5.3",
-    "js-beautify": "1.6.14"
+    "js-beautify": "1.6.14",
+    "better-scroll": "^1.11.1"
   },
   "scripts": {
     "dev": "nodemon --exec node server.js",

pages/mobile/user/enterpriseinfo.vue

@@ -7,130 +7,135 @@
       </p>
     </div>
     <div class="user-content mobile-fix-content">
-      <!-- 账户管理 -->
-      <div class="si-wrap">
-        <ul class="infoul infoul2" :class="{'no-edit': !isAdmin}" v-if="enterpriseInfo.enName">
-          <li class="clearfix" :class="{noupdate:  storeState !== 'look'}">
-            <div class="name pull-left" :class="{update: storeState !== 'look'}" >企业名称：</div>
-            <div class="text pull-left" :class="{update: storeState !== 'look'}">
-              {{enterpriseInfo.enName || '-'}}
-            </div>
-          </li>
+      <div ref="userContent" class="user-center-content">
+        <div class="scroll">
+        <!-- 账户管理 -->
+          <div class="si-wrap">
+            <ul class="infoul infoul2" :class="{'no-edit': !isAdmin}" v-if="enterpriseInfo.enName">
+              <li class="clearfix" :class="{noupdate:  storeState !== 'look'}">
+                <div class="name pull-left" :class="{update: storeState !== 'look'}" >企业名称：</div>
+                <div class="text pull-left" :class="{update: storeState !== 'look'}">
+                  {{enterpriseInfo.enName || '-'}}
+                </div>
+              </li>
 
-          <li class="clearfix" :class="{noupdate:  storeState !== 'look', border:  storeState !== 'look'}">
-            <div class="name pull-left" :class="{update: storeState !== 'look'}">营业执照号：</div>
-            <div class="text pull-left" :class="{update: storeState !== 'look'}">
-              {{enterpriseInfo.enBussinessCode || '-'}}
-            </div>
-          </li>
+              <li class="clearfix" :class="{noupdate:  storeState !== 'look', border:  storeState !== 'look'}">
+                <div class="name pull-left" :class="{update: storeState !== 'look'}">营业执照号：</div>
+                <div class="text pull-left" :class="{update: storeState !== 'look'}">
+                  {{enterpriseInfo.enBussinessCode || '-'}}
+                </div>
+              </li>
 
-          <li class="clearfix" :class="{border:  storeState !== 'look'}" >
-            <div class="name pull-left" :class="{update: storeState !== 'look'}">注册地址：</div>
-            <div class="text pull-left" v-if="storeState === 'look'">
-              {{enterpriseInfo.enAddress || '-'}}
-            </div>
-            <div v-else class="text pull-left">
-              <input v-model="enterpriseInfo.enAddress" type="text" :disabled="enterpriseInfo.enValidCode === 2"/>
-            </div>
-          </li>
+              <li class="clearfix" :class="{border:  storeState !== 'look'}" >
+                <div class="name pull-left" :class="{update: storeState !== 'look'}">注册地址：</div>
+                <div class="text pull-left" v-if="storeState === 'look'">
+                  {{enterpriseInfo.enAddress || '-'}}
+                </div>
+                <div v-else class="text pull-left">
+                  <input v-model="enterpriseInfo.enAddress" type="text" :disabled="enterpriseInfo.enValidCode === 2"/>
+                </div>
+              </li>
 
-          <li class="clearfix" :class="{border:  storeState !== 'look'}">
-            <div class="name pull-left" :class="{update: storeState !== 'look'}">官网地址：</div>
-            <div class="text pull-left" v-if="storeState === 'look'">
-              {{enterpriseInfo.enUrl || '-'}}
-            </div>
-            <div v-else class="text pull-left">
-              <input v-model="enterpriseInfo.enUrl" type="text"/>
-            </div>
-          </li>
+              <li class="clearfix" :class="{border:  storeState !== 'look'}">
+                <div class="name pull-left" :class="{update: storeState !== 'look'}">官网地址：</div>
+                <div class="text pull-left" v-if="storeState === 'look'">
+                  {{enterpriseInfo.enUrl || '-'}}
+                </div>
+                <div v-else class="text pull-left">
+                  <input v-model="enterpriseInfo.enUrl" type="text"/>
+                </div>
+              </li>
 
-          <li class="clearfix" :class="{border:  storeState !== 'look'}">
-            <div class="name pull-left" :class="{update: storeState !== 'look'}">所属行业：</div>
-            <div class="text pull-left" v-if="storeState === 'look'">
-              {{enterpriseInfo.enIndustry || '-'}}
-            </div>
-            <div v-else class="text pull-left clearfix" @click="isShowTypeAlert = true">
-              <div class="text pull-left update" style="width: 4rem">
-                {{enterpriseInfo.enIndustry || '-'}}
-              </div>
-              <div class="moreIcon pull-right">
-                <img src="/images/store/default/moreicon.png" />
-              </div>
-            </div>
-          </li>
+              <li class="clearfix" :class="{border:  storeState !== 'look'}">
+                <div class="name pull-left" :class="{update: storeState !== 'look'}">所属行业：</div>
+                <div class="text pull-left" v-if="storeState === 'look'">
+                  {{enterpriseInfo.enIndustry || '-'}}
+                </div>
+                <div v-else class="text pull-left clearfix" @click="isShowTypeAlert = true">
+                  <div class="text pull-left update" style="width: 4rem">
+                    {{enterpriseInfo.enIndustry || '-'}}
+                  </div>
+                  <div class="moreIcon pull-right">
+                    <img src="/images/store/default/moreicon.png" />
+                  </div>
+                </div>
+              </li>
 
-          <li class="clearfix" :class="{border:  storeState !== 'look'}">
-            <div class="name pull-left" :class="{update: storeState !== 'look'}" style="margin-top: 0.04rem;">经营范围：</div>
-            <div class="text pull-left" v-if="storeState === 'look'" >
-            <span v-for="item in scopeLabel" class="label">
-              {{item}}
-            </span>
-              <span class="text pull-left nolabel"  v-if="scopeLabel.length == 0">
-              无标签信息
-            </span>
-            </div>
-            <div v-else class="text pull-left">
-              <label v-for="item in scopeLabel" class="labelKuang" v-show="AddBtnShow">
-              <span class="Updatelabel">
-                {{item}}
-              </span>
-                <span class="updatespan"@click="addBtn(item)">删除</span>
-              </label>
-              <span class="addBtn" v-show="AddBtnShow" @click="addBtn()"></span>
-              <div class="commit" v-show="!AddBtnShow">
-                <input type="text" placeholder="请输入不大于10个字符" maxlength="10" class="inputText" v-model="labelText"/>
-                <button @click="saveLabel()">确定</button>
-              </div>
-            </div>
-          </li>
-        </ul>
-      </div>
-      <div class="control clearfix" v-if="storeState !== 'look'">
-        <div class="cancel" @click="storeInfosave('cancel')">取消</div>
-        <div class="save" @click="storeInfosave()">保存</div>
+              <li class="clearfix" :class="{border:  storeState !== 'look'}">
+                <div class="name pull-left" :class="{update: storeState !== 'look'}" style="margin-top: 0.04rem;">经营范围：</div>
+                <div class="text pull-left" v-if="storeState === 'look'" >
+                <span v-for="item in scopeLabel" class="label">
+                  {{item}}
+                </span>
+                  <span class="text pull-left nolabel"  v-if="scopeLabel.length == 0">
+                  无标签信息
+                </span>
+                </div>
+                <div v-else class="text pull-left">
+                  <label v-for="item in scopeLabel" class="labelKuang" v-show="AddBtnShow">
+                  <span class="Updatelabel">
+                    {{item}}
+                  </span>
+                    <span class="updatespan"@click="addBtn(item)">删除</span>
+                  </label>
+                  <span class="addBtn" v-show="AddBtnShow" @click="addBtn()"></span>
+                  <div class="commit" v-show="!AddBtnShow">
+                    <input type="text" placeholder="请输入不大于10个字符" maxlength="10" class="inputText" v-model="labelText"/>
+                    <button @click="saveLabel()">确定</button>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div class="control clearfix" v-if="storeState !== 'look'">
+            <div class="cancel" @click="storeInfosave('cancel')">取消</div>
+            <div class="save" @click="storeInfosave()">保存</div>
+          </div>
+          <!-- 选择行业弹窗 -->
+        </div>
       </div>
-      <!-- 选择行业弹窗 -->
-      <div class="mobile-modal" v-show="isShowTypeAlert">
-        <div class="modal-content">
-          <div class="content-title">
-            所属行业
-            <i class="el-icon-close" @click="isShowTypeAlert = false"></i>
+    </div>
+    <!-- /end 账户管理 -->
+    <div class="mobile-modal" v-show="isShowTypeAlert">
+      <div class="modal-content">
+        <div class="content-title">
+          所属行业
+          <i class="el-icon-close" @click="isShowTypeAlert = false"></i>
+        </div>
+        <div class="content-title-label clearfix" >
+          <div v-for="(item, index) in ContentTitleArray" @click="chooseTitle(index)">
+            <a :class="{active: index === titleActive}">{{item}}</a>
           </div>
-          <div class="content-title-label clearfix" >
-            <div v-for="(item, index) in ContentTitleArray" @click="chooseTitle(index)">
-              <a :class="{active: index === titleActive}">{{item}}</a>
-            </div>
+        </div>
+        <div class="content-info" v-if="TypeListShow.firstListShow">
+          <div v-for="(item, index) in TypeList.firstList" class="content-info-item" :class="{active: index === TypeListActive.firstListActive}"  @click="chooseItem('firstList', item, index)" >
+            {{item}}<img src="/images/mobile/@2x/getlabel_icon.png" v-show="index === TypeListActive.firstListActive"/>
           </div>
-          <div class="content-info" v-if="TypeListShow.firstListShow">
-            <div v-for="(item, index) in TypeList.firstList" class="content-info-item" :class="{active: index === TypeListActive.firstListActive}"  @click="chooseItem('firstList', item, index)" >
-              {{item}}<img src="/images/mobile/@2x/getlabel_icon.png" v-show="index === TypeListActive.firstListActive"/>
-            </div>
+        </div>
+        <div class="content-info" v-if="TypeListShow.secondsListShow">
+          <div v-for="(item, index) in TypeList.secondsList" class="content-info-item" :class="{active: index === TypeListActive.secondsListActive}"  @click="chooseItem('secondsList', item, index)" >
+            {{item}}
+            <img src="/images/mobile/@2x/getlabel_icon.png" v-show="index === TypeListActive.secondsListActive"/>
           </div>
-          <div class="content-info" v-if="TypeListShow.secondsListShow">
-            <div v-for="(item, index) in TypeList.secondsList" class="content-info-item" :class="{active: index === TypeListActive.secondsListActive}"  @click="chooseItem('secondsList', item, index)" >
-              {{item}}
-              <img src="/images/mobile/@2x/getlabel_icon.png" v-show="index === TypeListActive.secondsListActive"/>
-            </div>
+        </div>
+        <div class="content-info" v-if="TypeListShow.threetListShow">
+          <div v-for="(item, index) in TypeList.threetList" class="content-info-item" :class="{active: index === TypeListActive.threetListActive}"  @click="chooseItem('threetList', item, index)" >
+            {{item}}
+            <img src="/images/mobile/@2x/getlabel_icon.png" v-show="index === TypeListActive.threetListActive"/>
           </div>
-          <div class="content-info" v-if="TypeListShow.threetListShow">
-            <div v-for="(item, index) in TypeList.threetList" class="content-info-item" :class="{active: index === TypeListActive.threetListActive}"  @click="chooseItem('threetList', item, index)" >
-              {{item}}
-              <img src="/images/mobile/@2x/getlabel_icon.png" v-show="index === TypeListActive.threetListActive"/>
-            </div>
 
-          </div>
         </div>
       </div>
-      <!-- /end 选择行业弹窗 -->
-      <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
-      <!--<loading v-show="isSearchSearchingMore"></loading>-->
-      <div v-if="enterprise && false"></div>
     </div>
-    <!-- /end 账户管理 -->
+    <!-- /end 选择行业弹窗 -->
+    <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
+    <!--<loading v-show="isSearchSearchingMore"></loading>-->
+    <div v-if="enterprise && false"></div>
   </div>
 </template>
 
 <script>
+  import BScroll from 'better-scroll'
   import { RemindBox } from '~components/mobile/common'
   export default {
     layout: 'mobileNoHeader',
@@ -320,6 +325,7 @@
         this.storeState = 'update'
         this.Islook = true
         this.hidelook = true
+        this.BScroll.refresh()
       },
       storeInfosave(_tp) {
         if (_tp === 'cancel') {
@@ -382,6 +388,17 @@
           this.scopeLabel = this.enterpriseInfo.enBusinessScope ? this.enterpriseInfo.enBusinessScope.split(',') : []
         })
       })
+    },
+    mounted() {
+      this.$nextTick(() => {
+        if (this.BScroll) {
+          this.BScroll.refresh()
+        } else {
+          this.BScroll = new BScroll(this.$refs.userContent, {
+            click: true
+          })
+        }
+      })
     }
   }
 </script>
@@ -399,9 +416,16 @@
       background: #f1f3f6;
       .si-wrap {
         width: 7.1rem;
-        margin: .3rem auto;
+        margin: 0 auto;
         background: #fff;
       }
+    .user-center-content {
+      height: 100%;
+      overflow: hidden;
+    }
+    .scroll {
+      padding-bottom: 0.4rem;
+    }
     .topinfo {
       color: #333;
       font-size: 0.28rem;
@@ -421,7 +445,7 @@
     .infoul {
       color: #666;
       font-size: 0.28rem;
-      padding: 0 .24rem;
+      margin: .24rem 0;
       .upload {
         img {
           transform: rotate(180deg);
@@ -472,7 +496,7 @@
     }
     .control {
       width: 90%;
-      margin: 0.15rem auto 0.4rem;
+      margin: 0.4rem auto 0rem;
       height: .88rem;
       line-height: 0.88rem;
     }