Merge branch 'feature/v1.5.9' of http://192.168.3.207:8080/jianyu/page_bigmember_pc into feature/v1.5.9

src/api/modules/svip.js

@@ -15,7 +15,7 @@ export function getSVIPBuyInfo (data) {
   } else {
     return request({
       baseURL: '/subscribepay',
-      url: '/vipsubscribe/getSubBuyMsg',
+      url: '/vipsubscribe/getSubBuyMsg?t=' + Date.now(),
       method: 'POST'
     })
   }

src/components/common/informationSuccess.vue

@@ -6,11 +6,12 @@
       :show-close="false"
       :lock-scroll="false"
       custom-class="no-pass-alert"
+      :close-on-click-modal="false"
       center>
       <!-- <span>恭喜留资成功，您可拨打客服电话 400-108-6670 或在线<i @click="openCustomer">联系客服</i>开通，谢谢！</span> -->
       <span>恭喜留资成功，客户经理将在工作日24h内联系您，谢谢！</span>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="passVisible = false">我知道了</el-button>
+        <el-button type="primary" @click="know">我知道了</el-button>
       </span>
     </el-dialog>
   </template>
@@ -33,6 +34,10 @@
     methods: {
       openCustomer () {
         this.contactCustomer(this)
+      },
+      know(){
+        this.passVisible=false
+        this.$emit('know') //点击我知道了回调
       }
     }
   }

src/components/medical/FollowList.vue

@@ -204,11 +204,11 @@ export default {
       const num = parseFloat(key) // 单位万元
       if (!num) return
       if (num < 1e4) {
-        return num + '万'
+        return num.toFixed(2) + '万'
       } else if (num > 1e4) {
-        return num / 1e4 + '亿'
+        return (num / 1e4).toFixed(2) + '亿'
       } else if (num > 1e8) {
-        return num / 1e8 + '万亿'
+        return (num / 1e8).toFixed(2) + '万亿'
       }
     },
     // 关注

src/components/push-list/DistributorSearch.vue

@@ -27,7 +27,7 @@
               <span class="text--sm-name">项目总金额：</span>
               <span class="text--sm-value">{{ item.project_money == undefined ? '-' : item.project_money }}</span>
               <span class="text--sm-name">所在地：</span>
-              <span class="text--sm-value" v-if="item.area || item.city">{{item.area}}&nbsp;&nbsp;{{item.area !== item.city ? item.city : ''}}</span>
+              <span class="text--sm-value" v-if="item.area || item.city">{{item.area}}&nbsp;&nbsp;{{item.area && item.city && item.area.slice(0,2) !== item.city.slice(0,2) ? item.city : ''}}</span>
               <span class="text--sm-value" v-else>-</span>
             </div>
           </div>
@@ -313,26 +313,29 @@ export default {
   }
 
   .potential-list-card {
+    border-radius: 8px;
+    box-shadow: none!important;
     .header-box {
       padding: 0 40px;
       background: #FFFFFF;
       opacity: 1;
-    }
-    .header-hengxian {
-      height: 0px;
-      opacity: 1;
       border: 1px solid #ECECEC;
     }
+    // .header-hengxian {
+    //   height: 0px;
+    //   opacity: 1;
+    //   border: 1px solid #ECECEC;
+    // }
     .header-hengxian-hover {
       height: 2px;
       background: #2CB7CA;
       opacity: 1;
     }
     .card-title {
-      padding: 12px 0;
+      padding: 14px 0;
       color: #1d1d1d;
-      line-height: 28px;
-      border-bottom: 3px solid #2CB7CA;
+      line-height: 20px;
+      border-bottom: 2px solid #2CB7CA;
     }
 
     .pcor-right-group {
@@ -389,7 +392,7 @@ export default {
       box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
       cursor: pointer;
       &:hover {
-        background: #F5F6F7;
+        background: #F7F9FC;
         .text--title,
         .text--sm-value {
           color: #2CB7CA;

src/components/push-list/MedicalList.vue

@@ -279,8 +279,11 @@ export default {
   }
 
   .potential-list-card {
+    border-radius: 8px;
+    box-shadow: none!important;
     .header-box {
       padding: 14px 40px;
+      border: 1px solid #ECECEC;
     }
     .card-title {
       position: relative;
@@ -289,7 +292,7 @@ export default {
       &::after{
         position: absolute;
         left: 0;
-        bottom: -12px;
+        bottom: -14px;
         content: '';
         width: 100%;
         height: 2px;
@@ -359,7 +362,7 @@ export default {
       box-shadow: inset 0px -1px 0px rgba(0, 0, 0, 0.05);
       cursor: pointer;
       &:hover {
-        background: #F5F6F7;
+        background: #F7F9FC;
         .text--title,
         .text--sm-value {
           color: #2CB7CA;

src/components/push-list/PushList.vue

@@ -110,7 +110,7 @@
         <el-button size="mini" class="get-more" type="plain" icon="el-icon-arrow-right" @click="getMore">更多</el-button>
       </div>
     </div>
-    <div class="sub-collection tags-box">
+    <div class="sub-collection tags-box" style="display: none">
       <div class="tags-inputs">
         <div class="tag-input">
           <div class="tag-labels"></div>
@@ -924,7 +924,10 @@ export default {
 }
 
 .tags-box {
-  display: none;
+  display: flex;
+  flex-direction: column;
+  min-height: 340px;
+  max-height: 360px;
   position: absolute;
   top: 0;
   right: 0;
@@ -1027,7 +1030,7 @@ export default {
 .tags-box .tags-list {
   margin-top: 12px;
   overflow-y: auto;
-  height: 220px;
+  flex: 1;
 }
 
 .tags-box .tags-list::-webkit-scrollbar {

src/components/scope/components/Edit.vue

@@ -331,7 +331,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .edit-form{
-  margin-top: 20px;
+  margin-top: 24px;
   .classify-title{
     padding-bottom: 20px;
     .icon-edit,.icon-delete{

src/components/scope/components/List.vue

@@ -444,7 +444,7 @@ export default {
         justify-content: space-between;
         align-items: center;
         padding: 12px 16px;
-        margin-top: 12px;
+        margin-top: 24px;
         border: 1px solid #ececec;
         border-radius: 8px;
         box-sizing: border-box;

src/components/selector/PopSelector.vue

@@ -536,6 +536,7 @@ export default {
       text-overflow: ellipsis;
       white-space: nowrap;
       text-align: justify;
+      max-width: 14em;
       &.checked {
         color: #fff;
         background: #2cb7ca;

src/components/subscribe-manager/components/Edit.vue

@@ -389,6 +389,7 @@ export default {
     }
   }
   .input-box{
+    margin-top: 24px;
     padding: 20px 30px;
     background: #f6f7f9;
     border-radius: 8px;

src/components/subscribe-manager/components/List.vue

@@ -606,7 +606,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       padding: 12px 16px;
-      margin-top: 12px;
+      margin-top: 24px;
       border: 1px solid #ececec;
       border-radius: 8px;
       box-sizing: border-box;

src/views/medical-field/Credentials.vue

@@ -80,7 +80,7 @@
       </div>
 
     </div>
-    <informationSuccess ref="Isuccess"></informationSuccess>
+    <informationSuccess ref="Isuccess" @know="know_"></informationSuccess>
   </div>
 
 </template>
@@ -239,6 +239,10 @@ export default {
   },
   watch: {},
   methods: {
+    know_(){
+      window.location.reload()
+
+    },
     submitForm(formName) {//提交
       var _this = this
       this.$refs[formName].validate(function (valid) {

src/views/medical/DistributorSearch.vue

@@ -34,9 +34,9 @@
           </el-input>
         </div>
         <div class="productInputDiv" v-for="(v, i) in filters.productList" :key="'0' + i">
-          <p :class="{ 'label-invisible': i !== 0 }">产品名称：</p>
+          <p :class="{ 'label-invisible': i !== 0 }">产品型号：</p>
           <el-input
-            placeholder="请输入产品名称"
+            placeholder="请输入产品型号"
             v-model="v.value"
             clearable
             class="productInput">
@@ -145,7 +145,16 @@ export default {
         this.showDrawer = false
       })
       setTimeout(() => {
-        this.$refs.businessScopeSelector.setState(this.selectedScope)
+        const list = this.getScopeKeyList
+        const s = this.selectedScope
+        const arr = []
+        if (s && s.length > 0) {
+          s.forEach(v => {
+            arr.push(list.includes(v))
+          })
+        }
+        const flag = arr.some(v => v)
+        this.$refs.businessScopeSelector.setState(flag ? s : [])
       }, 30)
     },
     goDetail (item) {
@@ -193,16 +202,21 @@ export default {
     }),
     getAreaConfig () {
       let areaData = {}
-      const areaArr = []
       if (this.userInfo.memberStatus > 0) {
         // 大会员
         areaData = this.subscribe.member_jy.o_area || {}
         this.subArea = this.subscribe.member_jy.o_area || {}
+        this.formatAreaData(areaData)
       } else if (this.userInfo.vipStatus > 0) {
         // 超级订阅
         areaData = this.vipSubscribeInfo.area || {}
         this.subArea = this.vipSubscribeInfo.area || {}
+        this.formatAreaData(areaData)
       }
+    },
+    formatAreaData (areaData) {
+      console.log(areaData, '111')
+      const areaArr = []
       for (const key in areaData) {
         areaArr.push(key)
       }
@@ -271,6 +285,21 @@ export default {
       }
     }
   },
+  watch: {
+    subscribe: {
+      deep: true,
+      handler (val) {
+        console.log(val, '111')
+        this.getAreaConfig()
+      }
+    },
+    vipSubscribeInfo: {
+      deep: true,
+      handler () {
+        this.getAreaConfig()
+      }
+    }
+  },
   async mounted () {
     await this.getAreaConfig()
     this.changeBusiness([])
@@ -345,7 +374,8 @@ export default {
     }
     .border-box {
       border: 1px solid #ececec;
-      border-radius: 5px;
+      border-radius: 8px;
+      overflow: hidden;
       ::v-deep .selector-card .selector-card-content .j-button-item.button-level-0.active {
         color: #fff;
         background-color: #2cb7ca;

src/views/medical/FindMedical.vue

@@ -123,6 +123,21 @@ export default {
       }
     }
   },
+  watch: {
+    subscribe: {
+      deep: true,
+      handler (val) {
+        // console.log(val)
+        this.getAreaConfig()
+      }
+    },
+    vipSubscribeInfo: {
+      deep: true,
+      handler (val) {
+        this.getAreaConfig()
+      }
+    }
+  },
   async created () {
     if (this.userInfo.vipStatus > 0 && !this.isDeleteVipScope) {
       await this.getVipInfo()
@@ -130,7 +145,6 @@ export default {
     if (!this.isDeleteAllScope) {
       await this.$store.dispatch('user/getKeywordsList')
     }
-    // this.filters.scope = this.scope
     this.hospitalTypeData = this.hospitalType
     this.hospitalLevelData = this.hospitalLevel
     this.getMedicalFilterItem()
@@ -156,16 +170,20 @@ export default {
     },
     getAreaConfig () {
       let areaData = {}
-      const areaArr = []
       if (this.userInfo.memberStatus > 0) {
         // 大会员
         areaData = this.subscribe.member_jy.o_area || {}
         this.subArea = this.subscribe.member_jy.o_area || {}
+        this.formatAreaData(areaData)
       } else if (this.userInfo.vipStatus > 0) {
         // 超级订阅
         areaData = this.vipSubscribeInfo.area || {}
         this.subArea = this.vipSubscribeInfo.area || {}
+        this.formatAreaData(areaData)
       }
+    },
+    formatAreaData (areaData) {
+      const areaArr = []
       for (const key in areaData) {
         areaArr.push(key)
       }
@@ -303,7 +321,16 @@ export default {
         this.showDrawer = false
       })
       setTimeout(() => {
-        this.$refs.businessScopeSelector.setState(this.selectedScope)
+        const list = this.getScopeKeyList
+        const s = this.selectedScope
+        const arr = []
+        if (s && s.length > 0) {
+          s.forEach(v => {
+            arr.push(list.includes(v))
+          })
+        }
+        const flag = arr.some(v => v)
+        this.$refs.businessScopeSelector.setState(flag ? s : [])
       }, 30)
     },
     goDetail (item) {
@@ -322,6 +349,8 @@ export default {
   padding: 24px;
   .filter-container{
     background: #fff;
+    border-radius: 8px;
+    overflow: hidden;
     .tab-slot-right{
       display: flex;
       align-items: center;
@@ -413,6 +442,16 @@ export default {
     .select-group-container{
       margin: 0;
     }
+    .ex-line-2{
+      .j-button-item{
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        text-align: justify;
+        max-width: 14em;
+      }
+    }
   }
 }
 </style>