完成【我】模块

app.html

@@ -6,7 +6,7 @@
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" />
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/element-ui/1.3.7/theme-default/index.css" />
   <!--<link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_0d1jjt5tukcblnmi.css"/>-->
-  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_452262_hu54d0vh60drhpvi.css">
+  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_452262_oi789zl3ptp7rpb9.css">
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/Swiper/3.4.2/css/swiper.css" />
   {{ HEAD }}
   <script>

assets/scss/mobileCommon.scss

@@ -408,3 +408,11 @@ html {
     }
   }
 }
+
+.mobile-fix-content {
+  position: fixed;
+  top: .88rem;
+  bottom: .98rem;
+  width: 100%;
+  overflow-y: auto;
+}

components/mobile/MobileFooter.vue

@@ -29,7 +29,7 @@
       </a>
     </span>
     <span :class="activeType=='user'?'active':''">
-      <a @click="goWithLogin('/mobile/user?type=buyer')">
+      <a @click="goWithLogin('/mobile/user')">
         <i :class="activeType=='user'?'iconfont icon-icon':'iconfont icon-wo'"></i><p>我</p>
       </a>
     </span>

components/mobile/MobileHeader.vue

@@ -57,7 +57,7 @@
     <div class="mobile-header" v-if="showHeader && !showMainSearch">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>{{title}}
-        <span @click="goMainSearch"><i class="icon-sousuo iconfont"></i>搜索</span>
+        <span @click="goMainSearch" v-if="showSearchIcon"><i class="icon-sousuo iconfont"></i>搜索</span>
       </p>
     </div>
     <main-search v-if="showMainSearch" @cancelSearchAction="onCancelSearch"></main-search>
@@ -79,7 +79,8 @@
 //        clipboard: {},
         showMainSearch: false,
         title: '优软商城',
-        showHeader: false
+        showHeader: false,
+        showSearchIcon: true
 //        showSearch: false
       }
     },
@@ -137,6 +138,7 @@
 //          this.showHeader = false
 //          this.showSearch = false
 //        }
+        this.showSearchIcon = false
         this.showHeader = val && val !== '/' && val !== '/mobile/applyPurchase/list' && !this.startWith(val, '/mobile/supplier')
 //        this.showSearch = val !== '/' && !this.startWith(val, '/mobile/search')
         let title = '优软商城'
@@ -177,18 +179,14 @@
         } else if (this.startWith(val, '/mobile/search')) {
           title = '搜索结果'
 //          this.rightIcon = 'share'
-        } else if (this.startWith(val, '/mobile/applyPurchase/sayPrice')) {
-          title = '编辑报价'
-        } else if (this.startWith(val, '/mobile/applyPurchase/list')) {
-          if (query.status === '1') {
-            title = '已采纳'
-          } else {
-            title = '已报价'
-          }
-        } else if (val === '' || val === '/' || !val) {
-          title = '优软商城'
-//          this.rightIcon = 'phone'
+        } else if (this.startWith(val, '/mobile/user/info/personal')) {
+          this.showSearchIcon = false
+          title = '个人信息'
+        } else if (this.startWith(val, '/mobile/user/info/admin')) {
+          this.showSearchIcon = false
+          title = '管理员信息'
         } else {
+          this.showSearchIcon = true
           title = '优软商城'
 //          this.rightIcon = 'phone'
         }

components/mobile/common/HeaderWithoutIcon.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="com-mobile-header">
+    <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
+    <p>
+      {{title}}
+    </p>
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      title: {
+        default: '优软商城',
+        type: String
+      }
+    }
+  }
+</script>

components/mobile/index.js

@@ -1,5 +1,6 @@
 import MobileHeader from './MobileHeader.vue'
 import MobileFooter from './MobileFooter.vue'
 import Home from './Home.vue'
+import Info from './user/Info.vue'
 
-export { MobileFooter, MobileHeader, Home }
+export { MobileFooter, MobileHeader, Home, Info }

components/mobile/user/Info.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="mobile-fix-content">
+    <div class="info">
+      <div class="line">
+        <span>用户名：</span>
+        {{info.userName}}
+      </div>
+      <div class="line">
+        <span>手机：</span>
+        {{info.userTel}}
+      </div>
+      <div class="line">
+        <span>邮箱：</span>
+        {{info.userEmail}}
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      info: {
+        default: {},
+        type: Object
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .mobile-fix-content {
+    background: #f1f3f6;
+  }
+  .info {
+    width: 7.1rem;
+    background: #fff;
+    margin: 0 auto;
+    height: 3.5rem;
+    padding: 0 .24rem;
+    font-size: .28rem;
+    color: #999;
+    border-radius: .05rem;
+    margin-top: .3rem;
+    .line {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      height: 1.16rem;
+      line-height: 1.16rem;
+      border-bottom: 1px solid #d3d3d3;
+      &:last-child {
+        border-bottom: none;
+      }
+      span {
+        margin-left: .56rem;
+        display: inline-block;
+        width: .92rem;
+        text-align: right;
+      }
+    }
+  }
+</style>

pages/mobile/user/enterpriseinfo.vue

@@ -1,139 +1,140 @@
 <template>
-  <div class="user-content">
-    <!-- 账户管理 -->
-    <div class="topinfo clearfix" v-if="enterpriseInfo.enName">
-      <div class="pull-left">
-        企业信息
-      </div>
-      <div class="pull-right" @click="updateInfo()" v-show="storeState === 'look'">
-        <img src="/images/vendor/updateinfo.png"/>
-        编辑
-      </div>
+  <div>
+    <div class="com-mobile-header">
+      <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
+      <p>企业信息
+        <span @click="updateInfo()" v-show="storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
+      </p>
     </div>
-    <ul class="infoul infoul2" 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 class="user-content mobile-fix-content">
+      <!-- 账户管理 -->
+      <div class="si-wrap">
+        <ul class="infoul infoul2" 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: 4.5rem">
-            {{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'" >
+          <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 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">
+            </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 class="control clearfix" v-if="storeState !== 'look'">
-      <div class="cancel" @click="storeInfosave('cancel')">取消</div>
-      <div class="save" @click="storeInfosave()">保存</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>
+                <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 class="control clearfix" v-if="storeState !== 'look'">
+          <div class="cancel" @click="storeInfosave('cancel')">取消</div>
+          <div class="save" @click="storeInfosave()">保存</div>
         </div>
-        <div class="content-title-label clearfix" >
-          <div v-for="(item, index) in ContentTitleArray" @click="chooseTitle(index)" v-if="item !== ''">
-            <a :class="{active: index === titleActive}">{{item}}</a>
+      </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>
-        </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 class="content-title-label clearfix" >
+            <div v-for="(item, index) in ContentTitleArray" @click="chooseTitle(index)" v-if="item !== ''">
+              <a :class="{active: index === titleActive}">{{item}}</a>
+            </div>
           </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 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>
-        <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 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>
         </div>
       </div>
+      <!-- /end 选择行业弹窗 -->
+      <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
+      <!--<loading v-show="isSearchSearchingMore"></loading>-->
+      <div v-if="enterprise && false"></div>
+      <div v-if="storeI && false"></div>
     </div>
-    <!-- /end 选择行业弹窗 -->
-    <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
-    <!--<loading v-show="isSearchSearchingMore"></loading>-->
-    <div v-if="enterprise && false"></div>
-    <div v-if="storeI && false"></div>
+    <!-- /end 账户管理 -->
   </div>
-  <!-- /end 账户管理 -->
 </template>
 
 <script>
   import { RemindBox } from '~components/mobile/common'
   export default {
-    layout: 'mobile',
+    layout: 'mobileNoHeader',
     middleware: 'authenticated',
     fetch({store}) {
       return Promise.all([
@@ -395,9 +396,21 @@
 </script>
 
 <style scoped lang="scss">
+  .com-mobile-header {
+    i {
+      font-size: .36rem;
+      position: relative;
+      top: .04rem;
+      right: .02rem;
+    }
+  }
   .user-content{
-    margin-top: 1.4rem;
-    padding-bottom: 0.98rem;
+      background: #f1f3f6;
+      .si-wrap {
+        width: 7.1rem;
+        margin: .3rem auto;
+        background: #fff;
+      }
     .topinfo {
       color: #333;
       font-size: 0.28rem;
@@ -415,6 +428,9 @@
       }
     }
     .infoul {
+      color: #666;
+      font-size: 0.28rem;
+      padding: 0 .24rem;
       .upload {
         img {
           transform: rotate(180deg);
@@ -423,8 +439,10 @@
       color: #666;
       font-size: 0.28rem;
       li {
-        padding: 0.15rem 0.05rem;
-        line-height: 1.3;
+        border-bottom: 1px solid #d3d3d3;
+        min-height: 1.16rem;
+        line-height: normal;
+        padding: .4rem .28rem;
         &.border {
           border-bottom: 0.01rem solid #d9d9d9;
         }
@@ -436,20 +454,21 @@
       .name {
         width: 1.6rem;
         text-align: right;
+        color: #226ce7;
       }
       .text {
-        width: 5.4rem;
+        width: 4.4rem;
       }
       .update {
         padding: 0.06rem 0 0.06rem 0rem;
       }
       input {
-        width: 5.4rem;
+        width: 4.4rem;
         border: 0px solid #b4b4b4;
         padding: 0.06rem 0 0.06rem 0.12rem;
       }
       textarea{
-        width: 5.4rem;
+        width: 4.4rem;
         padding: 0.06rem 0 0.06rem 0.12rem;
         min-height: 5rem;
         resize: none;
@@ -487,10 +506,10 @@
         width: 1.7rem;
       }
       .text {
-        width: 5.3rem;
+        width: 4.3rem;
       }
       input {
-        width: 5.3rem;
+        width: 4.3rem;
       }
       .nolabel {
         position: relative;

pages/mobile/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mobile-user">
+  <div class="mobile-user mobile-fix-content">
     <div class="com-mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>个人中心
@@ -35,22 +35,22 @@
       <i class="iconfont icon-xiangyou"></i>
       <div class="border-line"></div>
     </nuxt-link>
-    <div class="line block-line">
+    <nuxt-link to="/mobile/user/info/personal" tag="div" class="line block-line">
       <div class="img-wrap">
         <img src="/images/mobile/user/icon_04.png" alt="">
       </div>
       <span>个人信息</span>
       <i class="iconfont icon-xiangyou"></i>
       <div class="border-line"></div>
-    </div>
-    <div class="line block-line">
+    </nuxt-link>
+    <nuxt-link to="/mobile/user/info/admin" tag="div" class="line block-line">
       <div class="img-wrap">
         <img src="/images/mobile/user/icon_05.png" alt="">
       </div>
       <span>管理员信息</span>
       <i class="iconfont icon-xiangyou"></i>
       <div class="border-line"></div>
-    </div>
+    </nuxt-link>
     <div class="deleteKuang" v-if="showLogout">
       <div class="kuangContent">
         <div class="title">系统提示</div>
@@ -88,12 +88,6 @@
 <script>
   export default {
     layout: 'mobileNoHeader',
-    fetch ({ store, route }) {
-      return Promise.all([
-        store.dispatch('loadStoreStatus', { op: 'check' })
-      ])
-      // let user = store.state.option.user.data
-    },
     data () {
       return {
         showLogout: false,
@@ -126,10 +120,6 @@
 <style lang="scss" scoped>
   .mobile-user {
     background: #f1f3f6;
-    position: fixed;
-    width: 100%;
-    top: .88rem;
-    bottom: .98rem;
     .line {
       height: 1.17rem;
       background: #fff;

pages/mobile/user/info/admin.vue

@@ -0,0 +1,22 @@
+<template>
+  <info :info="admin"></info>
+</template>
+<script>
+  import {Info} from '~components/mobile'
+  export default {
+    layout: 'mobile',
+    components: {
+      Info
+    },
+    fetch ({store}) {
+      return Promise.all([
+        store.dispatch('loadUserWithAdmin', {uu: store.state.option.user.data.enterprise.enAdminuu})
+      ])
+    },
+    computed: {
+      admin () {
+        return this.$store.state.option.infoWithAdmin.data
+      }
+    }
+  }
+</script>

pages/mobile/user/info/personal.vue

@@ -0,0 +1,12 @@
+<template>
+  <info :info="user.data"></info>
+</template>
+<script>
+  import {Info} from '~components/mobile'
+  export default {
+    layout: 'mobile',
+    components: {
+      Info
+    }
+  }
+</script>

pages/mobile/user/storeinfo.vue

@@ -1,120 +1,119 @@
 <template>
-  <!-- 店铺管理 -->
-  <div class="user-content">
-    <template v-if="storeInfo.storeName">
-      <div class="topinfo clearfix">
-        <div class="pull-left">
-          店铺信息
-        </div>
-        <div class="pull-right" @click="updateInfo()" v-show="storeState === 'look'">
-          <img src="/images/vendor/updateinfo.png"/>
-          编辑
-        </div>
-      </div>
-      <ul class="infoul">
-        <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'">
-            {{storeInfo.storeName || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.storeName" 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 clearfix" v-if="storeState === 'look'">
-            {{Islook ? dealWithText(storeInfo.description) : dealWithText()}}
-            <a class="pull-right" @click="dealWithText2('open')" v-show="Islook">
-              全部<img src="/images/store/default/openblack.png"/>
-            </a>
-            <a class="pull-right upload" @click="dealWithText2('hide')" v-show="!hidelook">
-              收起<img src="/images/store/default/openblack.png"/>
-            </a>
-          </div>
-          <div class="text pull-left" v-else>
+  <div>
+    <div class="com-mobile-header">
+      <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
+      <p>店铺信息
+        <span @click="updateInfo()" v-show="storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
+      </p>
+    </div>
+    <!-- 店铺管理 -->
+    <div class="user-content mobile-fix-content">
+      <div class="si-wrap" v-if="storeInfo.storeName">
+        <ul class="infoul">
+          <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'">
+              {{storeInfo.storeName || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.storeName" 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 clearfix" v-if="storeState === 'look'">
+              {{Islook ? dealWithText(storeInfo.description) : dealWithText()}}
+              <a class="pull-right" @click="dealWithText2('open')" v-show="Islook">
+                全部<img src="/images/store/default/openblack.png"/>
+              </a>
+              <a class="pull-right upload" @click="dealWithText2('hide')" v-show="!hidelook">
+                收起<img src="/images/store/default/openblack.png"/>
+              </a>
+            </div>
+            <div class="text pull-left" v-else>
               <textarea v-model="storeInfo.description">
 
               </textarea>
-          </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'">
-            {{storeInfo.enterprise.address || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.enterprise.address" 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'">
-            {{storeInfo.enterprise.enTel || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.enterprise.enTel" 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'">
-            {{storeInfo.enterprise.enFax || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.enterprise.enFax" 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'">
-            {{storeInfo.enterprise.enPhone || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.enterprise.enPhone" 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'">
-            {{storeInfo.enterprise.enWeixin || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.enterprise.enWeixin" type="text"/>
-          </div>
-        </li>
-        <li class="clearfix" :class="{border:  storeState !== 'look'}">
-          <div class="name pull-left" :class="{update: storeState !== 'look'}">QQ：</div>
-          <div class="text pull-left" v-if="storeState === 'look'">
-            {{storeInfo.enterprise.enQQ || '暂无信息'}}
-          </div>
-          <div v-else class="text pull-left">
-            <input v-model="storeInfo.enterprise.enQQ" type="text"/>
-          </div>
-        </li>
-      </ul>
-      <div class="control clearfix" v-if="storeState !== 'look'">
-        <div class="cancel" @click="storeInfosave('cancel')" >取消</div>
-        <div class="save" @click="storeInfosave()">保存</div>
-      </div>
-    </template>
-    <template v-else>
-      <div class="none-state">
-        <img src="/images/mobile/@2x/empty-collect.png">
-        <p v-text="getRemindText"></p>
-        <nuxt-link to="/">返回首页</nuxt-link>
+            </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'">
+              {{storeInfo.enterprise.address || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.enterprise.address" 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'">
+              {{storeInfo.enterprise.enTel || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.enterprise.enTel" 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'">
+              {{storeInfo.enterprise.enFax || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.enterprise.enFax" 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'">
+              {{storeInfo.enterprise.enPhone || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.enterprise.enPhone" 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'">
+              {{storeInfo.enterprise.enWeixin || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.enterprise.enWeixin" type="text"/>
+            </div>
+          </li>
+          <li class="clearfix" :class="{border:  storeState !== 'look'}">
+            <div class="name pull-left" :class="{update: storeState !== 'look'}">QQ：</div>
+            <div class="text pull-left" v-if="storeState === 'look'">
+              {{storeInfo.enterprise.enQQ || '暂无信息'}}
+            </div>
+            <div v-else class="text pull-left">
+              <input v-model="storeInfo.enterprise.enQQ" type="text"/>
+            </div>
+          </li>
+        </ul>
+        <div class="control clearfix" v-if="storeState !== 'look'">
+          <div class="cancel" @click="storeInfosave('cancel')" >取消</div>
+          <div class="save" @click="storeInfosave()">保存</div>
+        </div>
       </div>
-    </template>
+      <template v-else>
+        <div class="none-state">
+          <img src="/images/mobile/@2x/empty-collect.png">
+          <p v-text="getRemindText"></p>
+          <nuxt-link to="/">返回首页</nuxt-link>
+        </div>
+      </template>
+    </div>
+    <!-- /end 店铺管理 -->
     <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
     <div v-if="storeI && false"></div>
   </div>
-  <!-- /end 店铺管理 -->
 </template>
 
 <script>
   import { RemindBox } from '~components/mobile/common'
   export default {
-    layout: 'mobile',
+    layout: 'mobileNoHeader',
     middleware: 'authenticated',
     fetch ({ store, route }) {
       return Promise.all([
@@ -247,8 +246,20 @@
 
 <style lang="scss" scoped>
   .user-content {
-    margin-top: 1.4rem;
-    padding-bottom: 0.98rem;
+    background: #f1f3f6;
+    .si-wrap {
+      width: 7.1rem;
+      margin: .3rem auto;
+      background: #fff;
+    }
+  }
+  .com-mobile-header {
+    i {
+      font-size: .36rem;
+      position: relative;
+      top: .04rem;
+      right: .02rem;
+    }
   }
   .topinfo {
     padding: 0 0.24rem;
@@ -267,16 +278,19 @@
     }
   }
   .infoul {
+    color: #666;
+    font-size: 0.28rem;
+    padding: 0 .24rem;
     .upload {
       img {
         transform: rotate(180deg);
       }
     }
-    color: #666;
-    font-size: 0.28rem;
     li {
-      padding: 0.15rem 0.05rem;
-      line-height: 1.3;
+      border-bottom: 1px solid #d3d3d3;
+      min-height: 1.16rem;
+      line-height: normal;
+      padding: .4rem .28rem;
       &.border {
         border-bottom: 0.01rem solid #d9d9d9;
       }
@@ -288,24 +302,25 @@
     .name {
       width: 1.6rem;
       text-align: right;
+      color: #226ce7;
     }
     .text {
-      width: 5.4rem;
+      width: 4.4rem;
     }
     .update {
-      padding: 0.06rem 0 0.06rem 0rem;
+      padding: 0.06rem 0 0.06rem 0;
     }
     input {
-      width: 5.4rem;
+      width: 4.4rem;
       border: 0px solid #b4b4b4;
       padding: 0.06rem 0 0.06rem 0.12rem;
     }
     textarea{
-      width: 5.4rem;
+      width: 4.4rem;
       padding: 0.06rem 0 0.06rem 0.12rem;
       min-height: 5rem;
       resize: none;
-      border: 0px solid #b4b4b4;
+      border: 0 solid #b4b4b4;
     }
   }
   .control {

pages/user/index.vue

@@ -1,12 +0,0 @@
-<template>
-  <div class="container" style="height: 300px;line-height: 300px;text-align: center;font-size: 24px;">
-    暂未开放买家中心SSR版
-  </div>
-</template>
-<script>
-
-export default {
-  layout: 'main',
-  middleware: 'authenticated'
-}
-</script>

pages/vendor/index.vue

@@ -1,12 +0,0 @@
-<template>
-  <div class="container" style="height: 300px;line-height: 300px;text-align: center;font-size: 24px;">
-    暂未开放卖家中心SSR版
-  </div>
-</template>
-<script>
-export default {}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

store/index.js

@@ -83,6 +83,15 @@ export const actions = {
         commit('option/REQUEST_USER_INFO_FAILURE', err)
       })
   },
+  loadUserWithAdmin ({commit}, params = {}) {
+    commit('option/REQUEST_ADMIN_INFO')
+    return axios.get('/basic/user/getUserByUU', {params: params})
+      .then(response => {
+        commit('option/REQUEST_ADMIN_INFO_SUCCESS', response.data)
+      }, err => {
+        commit('option/REQUEST_ADMIN_INFO_FAILURE', err)
+      })
+  },
   // 用户退出
   logout({ commit }) {
     return axios.get('/logout')

store/option.js

@@ -26,6 +26,10 @@ export const state = () => ({
   storeStatus: {
     fetching: false,
     data: {}
+  },
+  infoWithAdmin: {
+    fetching: false,
+    data: {}
   }
 })
 
@@ -60,6 +64,17 @@ export const mutations = {
     state.user.fetching = false
     state.user.data = {}
   },
+  REQUEST_ADMIN_INFO (state) {
+    state.infoWithAdmin.fetching = true
+  },
+  REQUEST_ADMIN_INFO_SUCCESS (state, result) {
+    state.infoWithAdmin.fetching = false
+    state.infoWithAdmin.data = result || {}
+  },
+  REQUEST_ADMIN_INFO_FAILURE (state) {
+    state.user.fetching = false
+    state.infoWithAdmin.data = {}
+  },
   REQUEST_LOGOUT_SUCCESS (state) {
     state.user.data = {}
     state.user.logged = false