询价搜索提示

components/applyPurchase/ApplyInfo.vue

@@ -4,7 +4,7 @@
       <p>最新求购信息</p>
       <span>海量求购，一网打尽</span>
       <div>
-        <input type="text" class="form-control" v-model="keyWord" @keyup.13="searchList" :placeholder="user.logged ? '型号/品牌/公司' : '型号/品牌'" />
+        <input type="text" class="form-control" v-model="keyWord" @keyup.13="searchList" :placeholder="user.logged ? '型号/品牌/类目/规格/公司' : '型号/品牌/类目/规格'" />
         <span @click="searchList">查询</span>
       </div>
     </div>

components/applyPurchase/BatchPublish.vue

@@ -777,7 +777,7 @@
           }, err => {
             console.log(err)
             this.$message.error('系统错误')
-            this.reloadData()
+//            this.reloadData()
           })
       },
       cancelShowSpotGoods: function () {

components/mobile/user/Info.vue

@@ -46,7 +46,7 @@
       white-space: nowrap;
       height: 1.16rem;
       line-height: 1.16rem;
-      border-bottom: 1px solid #d3d3d3;
+      border-bottom: 1px solid #d9d9d9;
       &:last-child {
         border-bottom: none;
       }

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://192.168.253.121:9090/platform-b2c')
-const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
+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 materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 
 module.exports = {

pages/mobile/applyPurchase/list/businessOpportunity.vue

@@ -3,7 +3,7 @@
     <div class="mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <div class="search-content">
-        <input type="text" v-model="seekKeyword" placeholder="请输入您要查找的型号或品牌" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
+        <input type="text" v-model="seekKeyword" placeholder="型号/品牌/类目/规格/公司" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
         <span @click="searchSeek">
         <i class="iconfont icon-sousuo"></i>
         </span>

pages/mobile/applyPurchase/list/index.vue

@@ -3,7 +3,7 @@
     <div class="mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <div class="search-content">
-        <input type="text" v-model="seekKeyword" placeholder="请输入您要查找的型号或品牌" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
+        <input type="text" v-model="seekKeyword" :placeholder="user.logged ? '型号/品牌/类目/规格/公司' : '型号/品牌/类目/规格'" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
         <span @click="searchSeek">
         <i class="iconfont icon-sousuo"></i>
         </span>

pages/mobile/center/index.vue

@@ -35,7 +35,7 @@
         </ul>
       </div>
       <div class="search-content">
-        <input type="text" placeholder="请输入您要查找的型号或品牌" v-model="seekKeyword" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
+        <input type="text" :placeholder="userType == 'saler' ? '型号/品牌/类目/规格/公司' : '型号/品牌'" v-model="seekKeyword" @keyup.13="searchSeek" ref="searchSeekInput" @focus="inputGetFocus()" @blur="blur()">
         <span @click="searchSeek" >
         <i class="iconfont icon-sousuo"></i>
         </span>

pages/mobile/user/enterpriseinfo.vue

@@ -3,13 +3,13 @@
     <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>
+        <span @click="updateInfo()" v-show="isAdmin && storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
       </p>
     </div>
     <div class="user-content mobile-fix-content">
       <!-- 账户管理 -->
       <div class="si-wrap">
-        <ul class="infoul infoul2" v-if="enterpriseInfo.enName">
+        <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'}">
@@ -84,10 +84,10 @@
             </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>
+      <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">
@@ -125,7 +125,6 @@
       <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 账户管理 -->
   </div>
@@ -136,11 +135,6 @@
   export default {
     layout: 'mobileNoHeader',
     middleware: 'authenticated',
-    fetch({store}) {
-      return Promise.all([
-        store.dispatch('loadStoreStatus', { op: 'check' })
-      ])
-    },
     data() {
       return {
         timeoutCount: 0,
@@ -169,7 +163,6 @@
         enterpriseInfo: {},
         titleActive: '',
         TypeObj: {},
-        storeInfo: {},
         AddBtnShow: true
       }
     },
@@ -349,7 +342,7 @@
           this.timeoutCount++
           return false
         }
-        this.$http.post(`/basic/enterprise/${this.storeInfo.enUU}/updateInfo`, this.enterpriseInfo).then(res => {
+        this.$http.post(`/basic/enterprise/${this.user.data.enterprise.uu}/updateInfo`, this.enterpriseInfo).then(res => {
           this.collectResult = '保存成功'
           this.timeoutCount++
           this.storeState = 'look'
@@ -368,18 +361,16 @@
       }
     },
     computed: {
-      storeI() {
-        let str = JSON.stringify(this.$store.state.option.storeStatus.data)
-        this.storeInfo = JSON.parse(str)
-        return ''
-      },
       enterprise() {
         let str = JSON.stringify(this.$store.state.supplier.material.enUser.data)
         this.enterpriseInfo = JSON.parse(str)
         return ''
+      },
+      isAdmin () {
+        return this.user.data.userUU === this.user.data.enterprise.enAdminuu
       }
     },
-    mounted() {
+    created () {
       this.$nextTick(() => {
         this.$http.get('/data/profession.json').then(response => {
           this.TypeObj = response.data
@@ -387,7 +378,7 @@
             this.TypeList.firstList.push(i)
           }
         })
-        this.$store.dispatch('supplier/loadEnUser', {enUU: this.$store.state.option.storeStatus.data.enUU, filter: 'enUU'}).then(res => {
+        this.$store.dispatch('supplier/loadEnUser', {enUU: this.user.data.enterprise.uu, filter: 'enUU'}).then(res => {
           this.scopeLabel = this.enterpriseInfo.enBusinessScope ? this.enterpriseInfo.enBusinessScope.split(',') : []
         })
       })
@@ -436,10 +427,8 @@
           transform: rotate(180deg);
         }
       }
-      color: #666;
-      font-size: 0.28rem;
       li {
-        border-bottom: 1px solid #d3d3d3;
+        border-bottom: 1px solid #d9d9d9;
         min-height: 1.16rem;
         line-height: normal;
         padding: .4rem .28rem;
@@ -456,6 +445,12 @@
         text-align: right;
         color: #226ce7;
       }
+      &.no-edit {
+        color: #999;
+        .name {
+          color: #999;
+        }
+      }
       .text {
         width: 4.4rem;
       }
@@ -578,7 +573,7 @@
 
       }
       .inputText {
-        width: 4.4rem;
+        width: 3.4rem;
         border-top-left-radius: 3px;
         border-bottom-left-radius: 3px;
         border: 1px solid #b4b4b4;

pages/mobile/user/index.vue

@@ -20,21 +20,21 @@
       <i class="iconfont icon-xiangyou"></i>
       <span class="l-right">{{user.data.enterprise.enName}}</span>
     </div>
-    <nuxt-link class="line" tag="div" to="/mobile/user/storeinfo">
+    <div class="line" @click="go('/mobile/user/storeinfo')">
       <div class="img-wrap">
         <img src="/images/mobile/user/icon_02.png" alt="">
       </div>
       <span>店铺信息</span>
       <i class="iconfont icon-xiangyou"></i>
-    </nuxt-link>
-    <nuxt-link class="line block-line" tag="div" to="/mobile/user/enterpriseinfo">
+    </div>
+    <div class="line block-line" @click="go('/mobile/user/enterpriseinfo')">
       <div class="img-wrap">
         <img src="/images/mobile/user/icon_03.png" alt="">
       </div>
       <span>企业信息</span>
       <i class="iconfont icon-xiangyou"></i>
       <div class="border-line"></div>
-    </nuxt-link>
+    </div>
     <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="">
@@ -43,14 +43,14 @@
       <i class="iconfont icon-xiangyou"></i>
       <div class="border-line"></div>
     </nuxt-link>
-    <nuxt-link to="/mobile/user/info/admin" tag="div" class="line block-line">
+    <div @click="go('/mobile/user/info/admin')" 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>
-    </nuxt-link>
+    </div>
     <div class="deleteKuang" v-if="showLogout">
       <div class="kuangContent">
         <div class="title">系统提示</div>
@@ -83,17 +83,24 @@
         </ul>
       </div>
     </div>
+    <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
   </div>
 </template>
 <script>
+  import { RemindBox } from '~components/mobile/common'
   export default {
     layout: 'mobileNoHeader',
     data () {
       return {
         showLogout: false,
-        showLogin: false
+        showLogin: false,
+        timeoutCount: 0,
+        collectResult: ''
       }
     },
+    components: {
+      RemindBox
+    },
     methods: {
       switchEnterprise(en) {
         this.$http.get(`/user/authentication/${en.uu || 0}`).then(() => {
@@ -113,6 +120,28 @@
         if (e) {
           e.stopPropagation()
         }
+      },
+      go: function (url) {
+        if (url === '/mobile/user/storeinfo') {
+          this.$http.get('/store-service/stores', {params: {op: 'check'}}).then(res => {
+            if (res.data.uuid) {
+              this.$router.push(url)
+            } else {
+              this.setRemindText('请先前往pc端申请开店')
+            }
+          }, err => {
+            console.log(err)
+            this.setRemindText('请先前往pc端申请开店')
+          })
+        } else if (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313) {
+          this.setRemindText('请先前往pc端完善企业信息')
+        } else {
+          this.$router.push(url)
+        }
+      },
+      setRemindText: function (str) {
+        this.collectResult = str
+        this.timeoutCount++
       }
     }
   }

pages/mobile/user/storeinfo.vue

@@ -3,107 +3,109 @@
     <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>
+        <span @click="updateInfo()" v-show="isAdmin && 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>
+    <template v-if="storeInfo.storeName" >
+      <div class="user-content mobile-fix-content">
+        <div class="si-wrap">
+          <ul class="infoul" :class="{'no-edit': !isAdmin}">
+            <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>
+            </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>
         <div class="control clearfix" v-if="storeState !== 'look'">
           <div class="cancel" @click="storeInfosave('cancel')" >取消</div>
           <div class="save" @click="storeInfosave()">保存</div>
         </div>
       </div>
-      <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>
+    </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>
     <!-- /end 店铺管理 -->
     <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
     <div v-if="storeI && false"></div>
@@ -236,6 +238,9 @@
         let str = JSON.stringify(this.$store.state.option.storeStatus.data)
         this.storeInfo = JSON.parse(str)
         return ''
+      },
+      isAdmin () {
+        return this.user.data.userUU === this.user.data.enterprise.enAdminuu
       }
     },
     components: {
@@ -287,12 +292,12 @@
       }
     }
     li {
-      border-bottom: 1px solid #d3d3d3;
+      border-bottom: .01rem solid #d9d9d9;
       min-height: 1.16rem;
       line-height: normal;
       padding: .4rem .28rem;
       &.border {
-        border-bottom: 0.01rem solid #d9d9d9;
+        border-bottom: .01rem solid #d9d9d9;
       }
       &.noupdate {
         background: #fafafa;
@@ -304,6 +309,12 @@
       text-align: right;
       color: #226ce7;
     }
+    &.no-edit {
+      color: #999;
+      .name {
+        color: #999;
+      }
+    }
     .text {
       width: 4.4rem;
     }