Merge remote-tracking branch 'origin/dev' into dev

src/assets/sass/variables.scss

@@ -19,15 +19,31 @@ $font-size-xl: 18px !default;
 $font-size-xll: 26px !default;
 
 // 宽度列表
-$width-list: 8 10 12 15 18 20 35 40 45 50 60 70 80 86 90 100 110 120 130 140 150 155 160 165 180 192 200 220 240 250 260 280 315 325 345 350 365 400 440 445 450
+$width-list: 8 10 12 15 18 20 35 40 45 50 60 70 80 86 90 100 110 120 130 140 150 155 160 165 180 192 200 220 240 250 260 280 315 325 345 350 365 400 440 445 450 550 700 1340;
-  550 700 1340;
 
 // 内外边距列表
-$distance-list: 0 1 2 5 6 7 8 9 10 12 15 20 25 30 35 40 45 50 60 70 80 86 90 100 150 165 185 210;
+$distance-list: 0 1 2 5 6 7 8 9 10 12 15 20 25 30 35 40 45 50 60 70 80 86 90 100 145 150 165 185 210;
-$distance-class-list: m, mv, mh, mt, ml, mr, mb, p, pv, ph, pt, pl, pr, pb, top, left, right, bottom;
+$distance-class-list: m,
+mv,
+mh,
+mt,
+ml,
+mr,
+mb,
+p,
+pv,
+ph,
+pt,
+pl,
+pr,
+pb,
+top,
+left,
+right,
+bottom;
 
 //圆角弧度
 $radius: 1 2 3 4 5 6 7 8 9 10 12 15 18 20 50 100;
 
 //透明度
-$opacity: 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9;
+$opacity: 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9;

src/views/ebiz/sale/InsuranceTip.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="insuranceInformation-container pb50">
-    <van-notice-bar
+    <van-notice-bar :scrollable="false" v-if="!Time" class="notice">{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
-      :scrollable="false"
-      v-if="!Time"
-      class="notice"
-    >{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
     <iframe :src="src + pdfUrl" class="iframe"></iframe>
 
     <van-radio-group v-model="radio" class="pb10 pt20 pl30 fs14">
@@ -16,22 +12,15 @@
     <div class="pt30 pl30 flex align-items-c">
       <span class="mr10">投保人签名 :</span>
       <div v-if="signVal == '0' || signVal == '2'">
-        <van-button
+        <van-button type="danger" size="small" :disabled="signVal == '1' ? true : isDisable" @click="sign('0')" v-no-more-click="1000">{{
-          type="danger"
+          appntSign.tipsSignStatus == '0' ? '签名' : '已签名'
-          size="small"
+        }}</van-button>
-          :disabled="signVal == '1' ? true : isDisable"
-          @click="sign('0')"
-          v-no-more-click="1000"
-        >{{ appntSign.tipsSignStatus == '0' ? '签名' : '已签名' }}</van-button>
       </div>
 
       <div v-if="signVal == '1'">
-        <van-button
+        <van-button type="danger" size="small" :disabled="signVal == '1' ? true : isDisable" @click="sign('0')">{{
-          type="danger"
+          appntSign.tipsSignStatus == '0' ? '未签名' : '已签名'
-          size="small"
+        }}</van-button>
-          :disabled="signVal == '1' ? true : isDisable"
-          @click="sign('0')"
-        >{{ appntSign.tipsSignStatus == '0' ? '未签名' : '已签名' }}</van-button>
       </div>
     </div>
     <!-- <div class="pt15 pl30 flex align-items-c" v-if="relationToAppnt != '1'">
@@ -56,13 +45,7 @@
         </div>
     </div>-->
     <div class="bg-white bottom-btn">
-      <van-button
+      <van-button type="danger" size="large" :disabled="isDisabledComplite" @click="goNext" v-no-more-click="1000">下一步</van-button>
-        type="danger"
-        size="large"
-        :disabled="isDisabledComplite"
-        @click="goNext"
-        v-no-more-click="1000"
-      >下一步</van-button>
     </div>
   </div>
 </template>
@@ -632,6 +615,14 @@ export default {
           } else {
             that.isDisable = true
           }
+
+          if (that.radio == '1' && val.appntSign.tipsSignStatus == '1') {
+            // console.log('进来了')
+            // console.log(that.isDisabledComplite, '进来了')
+            that.isDisabledComplite = false
+            // console.log(that.isDisabledComplite)
+            // console.log('111')
+          }
         } else {
           if (val.isOver == true && val.radio != '' && val.insuredSign.tipsSignStatus !== '1') {
             that.isDisableInsured = false
@@ -639,11 +630,13 @@ export default {
             that.isDisableInsured = true
           }
         }
-        if (val.appntSign.tipsSignStatus == '1' && val.insuredSign.tipsSignStatus == '1') {
+        // if (val.appntSign.tipsSignStatus == '1' && val.insuredSign.tipsSignStatus == '1') {
-          that.isDisabledComplite = false
+        //   // console.log('jinlaile')
-        } else {
+        //   that.isDisabledComplite = false
-          that.isDisabledComplite = true
+        // } else {
-        }
+        //   // console.log('444444444')
+        //   that.isDisabledComplite = true
+        // }
         if (val.appntSign.tipsSignStatus == '1') {
           that.isDisable = true
         }
@@ -657,6 +650,9 @@ export default {
           } else {
             that.isDisable = true
           }
+          if (that.radio == '1' && val.appntSign.tipsSignStatus == '1') {
+            that.isDisabledComplite = false
+          }
         } else {
           if (val.isOver == true && val.radio != '') {
             that.isDisableInsured = false

src/views/ebiz/sale/NotifyingMessage.vue

@@ -12,9 +12,10 @@
           <van-collapse v-model="activeNames">
             <van-collapse-item :name="indx + 1">
               <div slot="title" class="flex align-items-c justify-content-s">
-                <!--投保人 0 1  被保人 2 3 -->
+                <!--投保人 0 2  被保人 1 3 -->
                 {{ impartTypeNumber[im.impartType] }}
-                <span class="ml90">{{ im.impartType == 0 || im.impartType == 1 ? saleInsuredInfo.name : saleInsuredPersonInfo.name }}</span>
+                <span class="ml145">{{ im.impartType == 0 || im.impartType == 2 ? saleInsuredInfo.name : saleInsuredPersonInfo.name }}</span>
+
                 <img :src="$assetsUrl + 'images/avatar.png'" class="w20 ml15" />
               </div>
               <!-- <div class="h50">

src/views/ebiz/sale/SignatureOfElectronic.vue

@@ -11,21 +11,12 @@
       <div class="pt30 pl30 flex align-items-c">
         <span class="mr10">投保人签名 :</span>
         <div>
-          <van-button
+          <van-button type="danger" size="small" @click="sign('0')" v-no-more-click="1000">{{ isSign ? '签名' : '已签名' }}</van-button>
-            type="danger"
-            size="small"
-            @click="sign('0')"
-            v-no-more-click="1000"
-          >{{ isSign ? '签名' : '已签名' }}</van-button>
         </div>
       </div>
     </div>
     <div class="pb60" v-else>
-      <van-notice-bar
+      <van-notice-bar :scrollable="false" v-if="!Time" class="notice">{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
-        :scrollable="false"
-        v-if="!Time"
-        class="notice"
-      >{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
       <iframe :src="src + pdfUrl" class="iframe"></iframe>
       <!-- <img :src="'data:image/jpeg;base64,' + url" /> -->
 
@@ -38,64 +29,37 @@
       <div class="pt30 pl30 flex align-items-c">
         <span class="mr10">投保人签名 :</span>
         <div v-if="signVal == '0' || signVal == '2'">
-          <van-button
+          <van-button type="danger" size="small" :disabled="signVal == '1' ? true : isDisable" @click="sign('0')" v-no-more-click="1000">{{
-            type="danger"
+            appntSign.signStatus == '0' ? '签名' : '已签名'
-            size="small"
+          }}</van-button>
-            :disabled="signVal == '1' ? true : isDisable"
-            @click="sign('0')"
-            v-no-more-click="1000"
-          >{{ appntSign.signStatus == '0' ? '签名' : '已签名' }}</van-button>
         </div>
 
         <div v-if="signVal == '1'">
-          <van-button
+          <van-button type="danger" size="small" :disabled="signVal == '1' ? true : isDisable" @click="sign('0')">{{
-            type="danger"
+            appntSign.signStatus == '0' ? '未签名' : '已签名'
-            size="small"
+          }}</van-button>
-            :disabled="signVal == '1' ? true : isDisable"
-            @click="sign('0')"
-          >{{ appntSign.signStatus == '0' ? '未签名' : '已签名' }}</van-button>
         </div>
       </div>
       <div class="pt25 pl30 flex align-items-c" v-if="relationToAppnt != '1'">
         <span class="mr10">被保人/监护人签名：</span>
         <div v-if="signVal == '0' || signVal == '2'">
-          <van-button
+          <van-button type="danger" size="small" :disabled="signVal == '1' ? isDisableInsured : true" @click="sign('1')" v-no-more-click="1000">{{
-            type="danger"
+            insuredSign.signStatus == '0' ? '未签名' : '已签名'
-            size="small"
+          }}</van-button>
-            :disabled="signVal == '1' ? isDisableInsured : true"
-            @click="sign('1')"
-            v-no-more-click="1000"
-          >{{ insuredSign.signStatus == '0' ? '未签名' : '已签名' }}</van-button>
         </div>
         <div v-if="signVal == '1'" class="flex">
-          <van-button
+          <van-button type="danger" size="small" :disabled="signVal == '1' ? isDisableInsured : true" @click="sign('1')" v-no-more-click="1000">{{
-            type="danger"
+            insuredSign.signStatus == '0' ? '签名' : '已签名'
-            size="small"
+          }}</van-button>
-            :disabled="signVal == '1' ? isDisableInsured : true"
-            @click="sign('1')"
-            v-no-more-click="1000"
-          >{{ insuredSign.signStatus == '0' ? '签名' : '已签名' }}</van-button>
         </div>
       </div>
     </div>
 
     <div class="bottom-btn bg-white" v-if="detailJump == '1'">
-      <van-button
+      <van-button type="danger" size="large" @click="submit" :disabled="isSubmit" v-no-more-click="1000">提交</van-button>
-        type="danger"
-        size="large"
-        @click="submit"
-        :disabled="isSubmit"
-        v-no-more-click="1000"
-      >提交</van-button>
     </div>
     <div class="bottom-btn bg-white" v-else>
-      <van-button
+      <van-button type="danger" size="large" @click="next" :disabled="isDisabledComplite" v-no-more-click="1000">完成</van-button>
-        type="danger"
-        size="large"
-        @click="next"
-        :disabled="isDisabledComplite"
-        v-no-more-click="1000"
-      >完成</van-button>
     </div>
   </div>
 </template>
@@ -470,7 +434,7 @@ export default {
                 offset: this.caOffset,
                 pos: '3'
               }).then(data => {
-                console.log(`--签名返回：val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`,JSON.stringify(data))
+                console.log(`--签名返回：val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`, JSON.stringify(data))
                 this.$toast.clear()
                 if (JSON.parse(data).state == '1') {
                   this.base64 = decodeURI(JSON.parse(data).sign)
@@ -521,7 +485,7 @@ export default {
               offset: '-150',
               pos: '3'
             }).then(data => {
-              console.log(`--签名返回：val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`,JSON.stringify(data))
+              console.log(`--签名返回：val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`, JSON.stringify(data))
               this.$toast.clear()
               if (JSON.parse(data).state == '1') {
                 that.base64 = decodeURI(JSON.parse(data).sign)
@@ -549,7 +513,7 @@ export default {
             offset: '0',
             pos: '3'
           }).then(data => {
-            console.log(`--签名返回：val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`,JSON.stringify(data))
+            console.log(`--签名返回：val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`, JSON.stringify(data))
             this.$toast.clear()
             if (JSON.parse(data).state == '1') {
               that.base64 = decodeURI(JSON.parse(data).sign)
@@ -579,7 +543,6 @@ export default {
   async created() {
     let that = this
 
-
     that.detailJump = window.localStorage.getItem('detailJump')
     that.signVal = window.localStorage.getItem('sign-val')