citypicker expert/org

src/components/CityPicker/index.vue

@@ -27,19 +27,6 @@
          </el-option>
        </el-select>
      </el-col>
      <!-- <el-col :span="8">
        <el-select
          v-model="qu"
          @change="choseBlock"
          placeholder="区(县)">
          <el-option
            v-for="item in areaArr"
            :key="item.id"
            :label="item.value"
            :value="item.id">
          </el-option>
        </el-select>
      </el-col> -->
    </el-row>
  </div>
</template>
@@ -53,11 +40,7 @@ export default {
      provinceArr: [],
      cityArr: [],
      sheng: '',
      shi: '',
      // qu: '',
      // areaArr: [],
      city: '',
      block: ''
      shi: ''
    }
  },
  watch: {
@@ -85,15 +68,18 @@ export default {
              that.provinceArr[item.code] = { id: item.code, value: item.caption, children: {} }
            } else if (item.code.match(/00$/)) {
              var p = that.provinceArr[item.code.slice(0, 2) + '0000']
              p.children[item.code] = { id: item.code, value: item.caption, children: {} }
              if (!p.defaultChild) {
                p.defaultChild = p.children[item.code]
              }
            } else {
              var pp = that.provinceArr[item.code.slice(0, 2) + '0000'].children[item.code.slice(0, 4) + '00']
              pp.children[item.code] = { id: item.code, value: item.caption }
              if (!pp.defaultChild) {
                pp.defaultChild = pp.children[item.code]
              if (p) {
                p.children[item.code] = { id: item.code, value: item.caption }
                if (!p.defaultChild) {
                  p.defaultChild = p.children[item.code]
                }
              } else {
                that.provinceArr[item.code.slice(0, 2) + '0000'] = { id: item.code.slice(0, 2) + '0000', value: item.caption, children: {}}
                var pr = that.provinceArr[item.code.slice(0, 2) + '0000']
                pr.children[item.code] = { id: item.code, value: item.caption }
                if (!pr.defaultChild) {
                  pr.defaultChild = pr.children[item.code]
                }
              }
            }
          })
@@ -106,8 +92,6 @@ export default {
      var p = this.provinceArr[e]
      this.cityArr = p.children
      this.shi = p.defaultChild.value
      // this.areaArr = p.defaultChild.children
      // this.qu = p.defaultChild.defaultChild.value
      this.E = p.defaultChild.id
      this.sheng = p.value
      this.$emit('paren', this.E)
@@ -116,31 +100,23 @@ export default {
    choseCity: function(e) {
      var p = this.provinceArr[e.slice(0, 2) + '0000'].children[e]
      this.shi = p.value
      // this.areaArr = p.children
      // this.qu = p.defaultChild.value
      this.E = p.id
      this.$emit('paren', this.E)
      this.$emit('parenStr', this.shi)
    },
    // choseBlock: function(e) {
    //   this.qu = this.provinceArr[e.slice(0, 2) + '0000'].children[e.slice(0, 4) + '00'].children[e].value
    //   this.E = e
    //   this.$emit('paren', this.E)
    // },
    initpsq: function() {
      if (!this.addrCode) {
        this.sheng = ''
        this.shi = ''
        // this.qu = ''
        return
      }
      const s = this.addrCode.substring(0, 2) + '0000'
      const si = this.addrCode.substring(0, 4) + '00'
      // const x = this.addrCode
      var p = this.provinceArr[s]
      this.sheng = p.value
      this.shi = p.children[si].value
      // this.qu = p.children[si].children[x].value
      if (this.provinceArr) {
        var p = this.provinceArr[s]
        this.sheng = p.value
        this.shi = p.children[si].value
      }
    }
  }
}

src/components/uploadFile/index.vue

@@ -82,7 +82,7 @@
        if (!isLt2M) {
          this.$message.error('图片大小不能超过2MB，请重新上传')
        }
        return isJPG && isLt2M
        return (isJPG || isPNG) && isLt2M
      }
    }
  }

src/pages/center/views/myBusiness/publishProduct.vue

@@ -14,7 +14,7 @@
        </el-col>
        <el-col :span="24">
            <el-form-item label="关键词">
            <dynamicTags :dyStr="formObj.keyword" :tagInfo="tagKeyword" v-on:turnTags="turnKeywordTags"></dynamicTags>
            <dynamicTags :dyStr="keywordObj" :tagInfo="tagKeyword" @turnTags="turnKeywordTags"></dynamicTags>
            </el-form-item>
        </el-col>
        <el-col :span="24">
@@ -75,6 +75,7 @@
          limitCount: 10,
          tagsNum: 5
        },
        keywordObj: [],
        formLoading: true,
        formObj: {
          name: '',
@@ -178,6 +179,7 @@
                objKey.push(item.keyword)
              })
            }
            that.keywordObj = objKey
            that.formObj.keyword = objKey
          }
        })

src/pages/index/views/Dashboard/index.vue

@@ -14,7 +14,7 @@
          想要招聘人才？
        </h3>
        <p class="info-tip">
          将您的需求发布到科袖网，<br>
          直接发布您的需求，<br>
          我们为您对接专家和各类专业机构。
        </p>
        <el-button type="primary" @click="publishDemand" style="margin-top:30px">发布需求</el-button>
@@ -64,7 +64,7 @@
      </div>
      <div class="wrapper-right content-wrapper about-us">
        <div class="content-title">
          <span>关于我们</span>
          <span>关于平台</span>
          <router-link class="content-more" to="about">更多</router-link>
        </div>
        <div class="content">{{aboutUs}}</div>

src/pages/index/views/ViewExpertPool/expItem.vue

@@ -1,6 +1,15 @@
<template>
  <div class="block-container" v-if="userData && userData.length">
    <eItem v-for="item in userData" :key="item.index" :itemSinger="item"></eItem>
  <div class="block-container" v-if="platSixExps && platSixExps.length">
    <template v-if="num">
      <eItem v-for="item in platSixExps" :key="item.index" :itemSinger="item"></eItem>
    </template>
    <template v-else>
      <template v-show="!ifDefault" v-if="pageUserData.length">
        <eItem v-for="item in pageUserData" :key="item.index" :itemSinger="item"></eItem>
        <Loading v-show="loadingModalShow" :loadingComplete="loadingComplete" :isLoading="isLoading" v-on:upup="searchLower"></Loading>
      </template>
      <defaultPage v-show="ifDefault"></defaultPage>
    </template>
  </div>
</template>
@@ -16,14 +25,38 @@
    },
    data() {
      return {
        userData: []
        userData: [],
        loadingModalShow: true,
        loadingComplete: false,
        isFormSearch: false,
        isLoading: false,
        ifDefault: false,
        pageSize: 30,
        pageNo: 1
      };
    },
    computed: {
      platSixExps() {
        var pt = this.userData
        var str = []
        if (this.num && pt.length > this.num) {
          for (let i = 0; i < this.num; ++i) {
            str[i] = pt[i]
          }
        } else {
          str = pt
        }
        return str
      },
      pageUserData() {
        return this.userData.slice(0, this.pageNo * this.pageSize)
      }
    },
    components: {
      eItem
    },
    created() {
       this.buttedProfessors();
      this.buttedProfessors();
    },
    methods: {
      buttedProfessors() {
@@ -34,7 +67,7 @@
            var arr = []
            var hdata = { num: 1, data: $data }
            if ($data.length > 0) {
              for (let i in $data) {
              for (let i = 0; i < $data.length; ++i) {
                hdata.num++
                arr[i] = $data[i].id;
                hdata.num--
@@ -57,18 +90,57 @@
                      }
                      setTimeout(() => {
                        that.$parent.loadingState = false
                        for (let j = 0; j < obj.length; ++j) {
                          for (let n = 0; n < $data.length; ++n) {
                            if (obj[j].id === $data[n].id) {
                              if ($data[n].level) {
                                obj[j].level = $data[n].level
                              } else {
                                obj[j].level = 99999
                              }
                            }
                          }
                        }
                        obj.sort(function(a, b) {
                          return a.level > b.level ? 1 : (a.level === b.level ? 0 : -1)
                        })
                        if (obj.length <= that.pageSize) {
                          that.loadingModalShow = false
                          that.loadingComplete = true
                          that.isFormSearch = true
                          that.isLoading = false
                          that.ifDefault = false
                        }
                        that.userData = obj
                      }, 1000);
                      }, 1000)
                    }
                  }
                })
              }
            } else {
              that.ifDefault = true
              that.$parent.loadingState = false
            }
          }
        })
      },
      searchLower() {
        if (this.loadingModalShow && !this.isLoading) {
          this.pageNo++
        }
        if (this.pageUserData.length <= this.pageNo * this.pageSize) {
          this.loadingModalShow = false
          this.loadingComplete = true
          this.isFormSearch = true
          this.isLoading = false
          this.ifDefault = false
        }
      }
    }
  };
</script>
<style scoped>
  .loadSty{
    width: 100%;
  }
</style>

src/pages/index/views/ViewOrganization/orgItem.vue

@@ -1,6 +1,15 @@
<template>
  <div class="block-container" v-if="orgData && orgData.length">
    <oItem v-for="item in orgData" :key="item.index" :itemSinger="item"></oItem>
  <div class="block-container" v-if="platThreeOrgs && platThreeOrgs.length">
    <template v-if="num">
      <oItem v-for="item in platThreeOrgs" :key="item.index" :itemSinger="item"></oItem>
    </template>
    <template v-else>
      <template v-show="!ifDefault" v-if="pageOrgData.length">
        <oItem v-for="item in pageOrgData" :key="item.index" :itemSinger="item"></oItem>
        <Loading v-show="loadingModalShow" :loadingComplete="loadingComplete" :isLoading="isLoading" v-on:upup="searchLower"></Loading>
      </template>
      <defaultPage v-show="ifDefault"></defaultPage>
    </template>
  </div>
</template>
@@ -16,9 +25,33 @@
    },
    data() {
      return {
        orgData: []
        orgData: [],
        loadingModalShow: true,
        loadingComplete: false,
        isFormSearch: false,
        isLoading: false,
        ifDefault: false,
        pageSize: 30,
        pageNo: 1
      };
    },
    computed: {
      platThreeOrgs() {
        var pt = this.orgData
        var str = []
        if (this.num && pt.length > this.num) {
          for (let i = 0; i < this.num; ++i) {
            str[i] = pt[i]
          }
        } else {
          str = pt
        }
        return str
      },
      pageOrgData() {
        return this.orgData.slice(0, this.pageNo * this.pageSize)
      }
    },
    components: {
      oItem
    },
@@ -58,6 +91,27 @@
                      }
                      setTimeout(() => {
                        that.$parent.loadingState = false
                        for (let j = 0; j < obj.length; ++j) {
                          for (let n = 0; n < $data.length; ++n) {
                            if (obj[j].id === $data[n].id) {
                              if ($data[n].level) {
                                obj[j].level = $data[n].level
                              } else {
                                obj[j].level = 99999
                              }
                            }
                          }
                        }
                        obj.sort(function(a, b) {
                          return a.level > b.level ? 1 : (a.level === b.level ? 0 : -1)
                        })
                        if (obj.length <= that.pageSize) {
                          that.loadingModalShow = false
                          that.loadingComplete = true
                          that.isFormSearch = true
                          that.isLoading = false
                          that.ifDefault = false
                        }
                        that.orgData = obj
                      }, 1000);
                    }
@@ -65,11 +119,29 @@
                })
              }
            } else {
              that.ifDefault = true
              that.$parent.loadingState = false
            }
          }
        })
      },
      searchLower() {
        if (this.loadingModalShow && !this.isLoading) {
          this.pageNo++
        }
        if (this.pageOrgData.length <= this.pageNo * this.pageSize) {
          this.loadingModalShow = false
          this.loadingComplete = true
          this.isFormSearch = true
          this.isLoading = false
          this.ifDefault = false
        }
      }
    }
  }
</script>
<style scoped>
  .loadSty{
    width: 100%;
  }
</style>

src/pages/serve/show.vue

@@ -139,21 +139,25 @@
            if ($info.keywords) {
              $info.keywords = strToArr($info.keywords);
            }
            var arr = []
            if ($info.images) {
              var arr = strToArr($info.images)
              arr = strToArr($info.images)
              for (let i = 0; i < arr.length; ++i) {
                arr[i] = ImageUrl('ware' + arr[i])
              }
              $info.img = arr
            } else {
              arr[0] = defaultSet.img.service
              $info.img = arr
            }
            if ($info.category) {
              this.ownerB = {
                id: $info.owner,
                type: $info.category
              };
              }
              this.getHotserves($info.category, $info.owner)
            }
            this.serveInfo = $info;
            this.serveInfo = $info
          };
        });
      },
@@ -175,7 +179,7 @@
                } else {
                  $data[i].img = defaultSet.img.service
                }
                if (that.resourceId !== $data[i].resourceId) {
                if (that.serveId !== $data[i].id) {
                  hotRes.push($data[i])
                }
              }
@@ -243,5 +247,5 @@
        })
      }
    }
  };
  }
</script>

src/styles/browse.scss

@@ -20,6 +20,7 @@
        .rel-detail{
          font-size:15px;
          line-height:26px;
          width:100%;
          .rel-item{
            margin-bottom:15px;
            &:last-child{

src/styles/listitem.scss

@@ -23,6 +23,7 @@
    .show-info{
      flex:1 0 80px;
      padding-left:15px;
      width: 118px;
      .info-tit{
        font-size:18px;
        line-height:28px;