Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/messageCenter/reject-detail.vue

@@ -37,7 +37,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.notice_detail = res.info.notice_detail
+          vm.notice_detail = res.info.notice_body
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -73,6 +73,8 @@ export default {
         line-height: 20px;
         p{
             text-indent: 35px;
+            color: #666666;
+            font-size: 14px;
         }
     }
 }

src/pages/myInfo/my-info.vue

@@ -137,7 +137,8 @@
             <div slot="name">退出登录</div>
           </item>
         </list-item>
-        <button @click="approveBtn ? unBind() : changePageHead()">{{ description }}</button>
+        <button v-if="!popSetect" @click="approveBtn ? unBind() : changePageHead()">{{ description }}</button>
+        <button v-if="popSetect" @click="popSetectBox=true">{{ description }}</button>
       </div>
     </h-content>
     <role-switch
@@ -147,6 +148,13 @@
       @roleConfirm="roleConfirm"
       @roleCancle="roleCancle"
     />
+    <role-switch
+      v-show="popSetectBox"
+      ref="roleSwitch"
+      :roleList="type"
+      @roleConfirm="typeConfirm"
+      @roleCancle="typeCancle"
+    />
   </h-view>
 </template>
 <script>
@@ -162,6 +170,8 @@ export default {
       upLoadObj: defaultImg, // 上传的图片
       flag: true,
       isAGENT: false,
+      popSetect: false, // true:待提交或者审核未通过
+      popSetectBox: false, // 弹出选择框
       elecStatusDesceibe: '',
       user_bp_status: '',
       user_bp_class: '',
@@ -190,6 +200,16 @@ export default {
           bp_type_desc: '担保人',
         },
       ],
+      type: [
+        {
+          bp_type: '0',
+          bp_type_desc: '修改信息',
+        },
+        {
+          bp_type: '1',
+          bp_type_desc: '重新选择用户类型',
+        },
+      ],
     }
   },
   watch: {
@@ -301,30 +321,46 @@ export default {
       this.roleSwitchFlag = false
       console.log('选择后的角色为：' + role)
     },
+    typeConfirm (e) { // 选择操作方式后
+      this.popSetectBox = false
+      if (e.bp_type === '0') {
+        this.changePageHead()
+      } else if (e.bp_type === '1') {
+        this.unBindSelext()
+      }
+    },
     // 选择角色后取消
     roleCancle () {
       this.roleSwitchFlag = false
     },
+    typeCancle () {
+      this.popSetectBox = false
+    },
     // 监听用户状态
     watchBpStatus () {
       if (!this.bp_id && this.user_bp_status === 'NEW') {
         this.description = '用户绑定'
         this.approveBtn = false
+        this.popSetect = false
       } else if (this.bp_id && this.user_bp_status === 'NEW') {
         this.description = '待提交'
         this.approveBtn = false
+        this.popSetect = true// 是否弹出选择框
       } else if (this.bp_id && this.user_bp_status === 'APPROVED') {
         this.description = '解除绑定'
         this.approveBtn = true
+        this.popSetect = false
       } else if (
         (this.bp_id && this.user_bp_status === 'RETURN') ||
         (this.bp_id && this.user_bp_status === 'REJECT')
       ) {
         this.description = '审核未通过'
         this.approveBtn = false
+        this.popSetect = true// 是否弹出选择框
       } else {
         this.description = '审批中'
         this.approveBtn = false
+        this.popSetect = false
       }
     },
     // 我的发票
@@ -489,6 +525,46 @@ export default {
         },
       })
     },
+    unBindSelext () {
+      let vm = this
+      vm.popSetectBox = true
+      hlsPopup.showConfirm({
+        title: '提示',
+        content: '确定解除绑定？',
+        onConfirm: function (index) {
+          if (index === 1) {
+            let myPhone = window.localStorage.getItem('user_phone')
+            let myPassword = window.localStorage.getItem('password')
+            let url = process.env.basePath + 'bp_unbind'
+            let param = {
+              master: {
+                phone: myPhone,
+                password: myPassword,
+              },
+            }
+            vm.hlsPopup.showLoading('请稍候')
+            vm.hlsHttp
+              .post(url, param)
+              .then(function (res) {
+                vm.hlsPopup.hideLoading()
+                if (res.result === 'S') {
+                  vm.hlsPopup.showLongCenter('解绑成功')
+                  vm.userQuery()
+                  vm.approveBtn = false
+                  this.$router.push({
+                    name: 'UserBind',
+                  })
+                } else {
+                  vm.hlsPopup.showLongCenter(res.message)
+                }
+              })
+              .catch(() => {
+                vm.hlsPopup.showLongCenter('传入参数异常')
+              })
+          }
+        },
+      })
+    },
     unBind () {
       let vm = this
       hlsPopup.showConfirm({

src/pages/myInfo/role-switch-component.vue

@@ -11,10 +11,12 @@
           <img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
         </div>
         <div class="content-wrap">
-          <div v-for="(item,index) in roleList" :key="index" :class="{'item-active':index === switchIndex}" class="role-item" @click="chooseRole(index)">
+          <div
+            v-for="(item,index) in roleList" :key="index" :class="{'item-active':index === switchIndex}" class="role-item"
+            @click="chooseRole(index)">
             <span>{{ item.bp_type_desc }}</span>
           </div>
-          <div :class="{'content-btn-active':switchIndex !== ''}" class="content-btn"><span @click="roleConfirm">确定</span></div>
+          <div :class="{'content-btn-active':switchIndex !== ''}" class="content-btn" @click="roleConfirm"><span>确定</span></div>
         </div>
       </div>
     </div>
@@ -37,15 +39,15 @@ export default {
   updated: function () {
   },
   methods: {
-    chooseRole(index){
+    chooseRole (index) {
       this.switchIndex = index
     },
     roleConfirm () {
-      if(this.switchIndex === ''){
+      if (this.switchIndex === '') {
 
-      }else {
+      } else {
         this.showFlag = false
-        this.$emit('roleConfirm',this.roleList[this.switchIndex])
+        this.$emit('roleConfirm', this.roleList[this.switchIndex])
       }
     },
     show () {