Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !170

src/views/insurance-Detection-detail-demo/index.vue

@@ -241,10 +241,10 @@ export default {
   data() {
     return {
       showImg: false,
-      images: ['https://files.yunqueyi.com/image/png/common/20230506100734440.png'],
-      resultImages: ['https://files.yunqueyi.com/image/png/common/20230506100734440.png'],
+      images: ['https://files.yunqueyi.com/image/png/common/20230506114106786.png'],
+      resultImages: ['https://files.yunqueyi.com/image/png/common/20230506114106786.png'],
         sampleImages: [
-        'https://files.yunqueyi.com/image/png/common/20230506100734440.png'],
+        'https://files.yunqueyi.com/image/png/common/20230506114106786.png'],
       index: 1,
       result:null,
       picaWechat:window._picaWechat,

src/views/sz-home/index.vue

@@ -31,7 +31,7 @@
       closeable
       round
       position="bottom"
-      :style="{ height: '270px' }"
+      :style="{ height: '500px' }"
     >
       <div class="popup-title">
         选择被保险人
@@ -51,11 +51,11 @@
                 <div class="info">
                   <div class="phoneNum">
                     <span>手机号码：</span>
-                    <span>{{ item.phoneNum }}</span>
+                    <span>{{ item.mobile }}</span>
                   </div>
                   <div class="idCard">
                     <span>身份证号：</span>
-                    <span>{{ item.idCard }}</span>
+                    <span>{{ item.id_number }}</span>
                   </div>
                 </div>
               </div>
@@ -66,46 +66,45 @@
           </van-cell-group>
         </van-radio-group>
       </div>
-      <van-button
-        class="popup-btn"
-        :disabled="!person"
-        @click="show=false
-        "
-      >
-        领取权益
-      </van-button>
+      <div class="popup-btn-box">
+        <van-button
+          class="popup-btn"
+          :disabled="!person"
+          @click="show=false
+          "
+        >
+          领取权益
+        </van-button>
+      </div>
     </van-popup>
   </div>
 </template>
 
 <script>
-
+import axios from 'axios';
 export default {
   data() {
     return {
       show: false,
       person: null,
       userinfo: [
-        {
-          id:1,
-          name: '陈琳',
-          phoneNum: '15966877677',
-          idCard:'110101197109017455'
-        },
-        {
-          id:2,
-          name: '刘鑫琳',
-          phoneNum: '15966877677',
-          idCard:'110101197109014051'
-        },
+
       ]
     };
   },
   mounted() {
-
+    this.getlist();
   },
   methods: {
-
+    getlist() {
+    const that = this;
+      axios.get('https://project.picahealth.com/batch_get_person_info?num=10').then(function ({data}) {
+        console.log(data);
+        if (data.code === '000000') {
+          that.userinfo = data.data;
+        }
+      });
+    },
     toPage() {
       const externalOrderNo = Math.floor(new Date().getTime() / 1000);
       const projectEquityNo = 'SZ202305031000597601';
@@ -190,7 +189,13 @@ export default {
     }
   }
 }
+.van-popup--bottom{
+  width: 100%;
+}
 .popup-title{
+  width: 100%;
+  position: absolute;
+  top: 0;
   height: 25px;
   font-size: 18px;
   font-family: PingFangSC-Medium, PingFang SC;
@@ -204,6 +209,15 @@ export default {
   padding-top:0 ;
   padding-bottom: 0;
 }
+.popup-list{
+  position: absolute;
+  width: 100%;
+  top: 25px;
+  height: calc(100% - 105px);
+  overflow: auto;
+  padding-top: 25px;
+  padding-bottom: 80px;
+}
 .popup-list-item{
   display: flex;
   align-items: center;
@@ -237,7 +251,17 @@ export default {
     }
   }
 }
+.popup-btn-box{
+  position: fixed;
+  z-index: 2;
+  width: 100%;
+  bottom: 0;
+  padding: 20px 0;
+  background: #FFFFFF;
+  border: 1px solid #ebedf0;
+}
 .popup-btn{
+  margin: 0 auto;
   width: 351px;
   height: 40px;
   background: #00BDA5;
@@ -247,8 +271,8 @@ export default {
   font-weight: 600;
   color: #FFFFFF;
   line-height: 40px;
-  margin: 0 auto;
   display: block;
+
 }
 /deep/ .van-radio__icon--checked .van-icon{
   background: #00bda5;