fstarter 2.10.41 → 2.10.45

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fstarter",
   "description": "A Vue.js project",
-  "version": "2.10.41",
+  "version": "2.10.45",
   "author": "han.zhang <zhanghan810810@163.com>",
   "license": "MIT",
   "private": false,

package/src/plugins/components/BSDatePicker.vue

@@ -26,7 +26,7 @@
         <van-datetime-picker
           type="date"
           show-toolbar
-          v-model="dateComponentVal"
+          v-model="model.defaultPickerVal"
           :title="model.placeholder"
           :min-date="minDate"
           :max-date="maxDate"
@@ -47,9 +47,6 @@
     export default {
         name: "bs-datePicker",
         mixins: [base2],
-        props: {
-
-        },
         data() {
           return {
             validateCtl:true,
@@ -57,20 +54,22 @@
           }
         },
         mounted() {
-
-
+          if (this.mod.defaultPickerVal) {
+            this.model.defaultPickerVal = new Date(this.mod.defaultPickerVal)
+          }
         },
         methods: {
           createDefaultModel() {
             return {
               value:'',
               text: '',
-              type:'BSDatePicker',
-              placeholder:'lang.ctl.BSDatePicker.placeholder',
-              minDate:'2011-08-01',
-              maxDate:'2019-01-01',
-              dateFormat:'yyyy-MM-dd',
-              needStar: true
+              type: 'BSDatePicker',
+              placeholder:' lang.ctl.BSDatePicker.placeholder',
+              minDate:' 2011-08-01',
+              maxDate: '2019-01-01',
+              dateFormat: 'yyyy-MM-dd',
+              needStar: true,
+              defaultPickerVal: ''
             };
           },
           popUp(){
@@ -127,7 +126,10 @@
                 
               }
             },
-            set() {}
+            set() {
+              if (this.mod.defaultVal) return this.mod.defaultVal
+                
+            }
             
           }
         },

package/src/plugins/components/BSUpload2.vue

@@ -17,14 +17,15 @@
       <van-image :src="model.bgImage"/>
     </van-uploader>
 
-    <van-popup
-      v-model="showCooper"
-      position="right"
+    <div
+      v-show="showCooper"
+      class="pop"
       closeable
       :overlay="false"
       :style="{ 
         width: '100%',
-        height: '100%' 
+        height: '100%',
+        zIndex: '999' 
       }"
       @click-close-icon="cancel"
     >
@@ -70,7 +71,7 @@
           </van-button>
         </div>
       </div>
-    </van-popup>
+    </div>
   </div>
 </template>
 
@@ -366,6 +367,15 @@
     width: 50%;
   }
 }
+.pop {
+  position: fixed;
+  top: 50%;
+  left:0;
+  transform: translate3d(0,-50%,0);
+  max-height: 100%;
+  overflow-y: auto;
+  background-color: #fff;
+}
 </style>
 <style scoped>
 /* .cropper-container >>> .van-button--info{

package/src/plugins/components/BSVerCode.vue

@@ -3,15 +3,14 @@
   <van-field
     :label="model.label"
     v-model="model.value"
-    :placeholder="sent?model.placeholder:''"
+    :placeholder="sent === 'leave' ?model.placeholder:''"
     slot="button"
     @blur="blur"
     :class="ctlClass"
-    :readonly="!sent"
     :clearable="model.clearable"
     :error-message="model.hiddenValidate ? '': model.validateResult.message"
   >
-    <van-button slot="button" @click="sendVerCode" :disabled="model.disabled">{{model.sendButtonLabel}}</van-button>
+    <van-button slot="button" @click="sendVerCode" :disabled="modelData.disabled">{{model.sendButtonLabel}}</van-button>
   </van-field>
 
 </template>
@@ -32,7 +31,7 @@
         data() {
           return {
             validateCtl:true,
-            sent:true
+            sent: 'leave'
           }
         },
         mounted() {
@@ -47,35 +46,39 @@
               placeholder:'lang.ctl.BSVerCode.placeholder',
               sendButtonLabel:'lang.ctl.BSVerCode.sendButtonLabel',
               expiredTime:60,
-              expiredLabel:'{0}s'
+              expiredLabel:'{0}s',
+              disabled: false
             };
           },
           sendVerCode(){
-
-            if(this.sent){
+            debugger
+            if(this.sent === 'sending'){
               return
             }
 
             let self = this
             this.$emit('send-verCode',function(){
-
-              self.sent = true
+              
+              debugger
+              self.sent = 'sending'
               self.model.expiredTime = self.modelData.expiredTime
               
               var source = Rx.Observable.timer(0, 1000)
 
-              source = source.pipe(take(self.modelData.expiredTime)).pipe(filter(num => self.sent));
+              source = source.pipe(take(self.modelData.expiredTime)).pipe(filter(num => self.sent === 'sending'));
 
               source.subscribe({
                   next: function(value) {
-                      
+                    // self.sent = true
                     self.model.expiredTime = self.model.expiredTime - 1
                     self.model.sendButtonLabel = self.modelData.expiredLabel.format(self.model.expiredTime)
+                    // self.sent = false
+                    
                   },
                   complete: function() {
                     
                     self.model.sendButtonLabel = self.modelData.sendButtonLabel
-                    self.sent = false
+                    self.sent = 'leave'
                     self.model.value = ''
                   },
                   error: function(error) {
@@ -88,7 +91,7 @@
           },
           reset(){
     
-            this.sent = false
+            this.sent = 'leave'
             this.model.label = this.modelData.label
             this.model.disabled = this.modelData.disabled
             this.model.value = this.modelData.value

package/src/plugins/components/base.js

@@ -51,7 +51,7 @@ export default {
 
       let self = this
       this.$service.callService('init').then(()=>{
-        self.$service.callService('getFaceResult',{},false)
+        self.$service.callService('getTxFaceResult',{},false)
       })
 
     }

package/src/plugins/services/callCamera.js

@@ -36,6 +36,7 @@ var service = {
         buzId: params.buzId,
         cancelCrop: params.cancelCrop
       }
+      if (Number(params.cropType) === 1) requestJson['cropType'] = 1
       let isMultiple = params.multiple ? 'CALL_CAMERA_OTHER' : 'CALL_CAMERA'
       isp_phone.callShell(isMultiple, requestJson, null, params.vnode)
       return Promise.resolve({})

package/src/plugins/services/faceTx.js

@@ -0,0 +1,61 @@
+import http from '../assets/http.js'
+import ak from '../assets/ak.js'
+import config from '../assets/config.js'
+import {ua} from "../assets/ua";
+
+var faceTx = {
+
+    getData(params){
+        let nonce = radomKey()
+        return {
+            'idcard_name': params.idcard_name,
+            'idcard_number': params.idcard_number,
+            'comparison_type': '1',
+            'nonce': nonce
+        }
+    },
+
+    invoke(params){
+
+      if(ua.isIspPhone){
+
+
+      }else if(ua.microMsg){
+        debugger
+        let apiUrl = config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/getTXFaceDomain'
+        // if(faceType == 'wy'){
+        //   apiUrl = config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/getTXFaceDomain'
+        // }else{
+        //   apiUrl = config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/getFaceTokenNew'
+        // }
+
+        return http.post(apiUrl,params,true,true).then((data)=>{
+            const objstr = JSON.stringify(Object.assign(params, data)) 
+            debugger
+            localStorage.setItem('faceAbout', objstr)
+            let cbUrl = ak.http.concatParams(params.cbUrl ? params.cbUrl : window.location.href,'facetoken=1')
+            const url = `https://${data.optimalDomain}/api/web/login?webankAppId=TIDA55eC&version=1.0.0&nonce=${params.nonce}&orderNo=${data.orderNo}&h5faceId=${data.h5faceId}&url=${encodeURIComponent(cbUrl)}&from=browser&userId=${data.userId}&sign=${data.sign}&redirectType=1&resultType=1`
+            window.location.href = url
+            return Promise.resolve(data)
+
+        })
+
+      }else{
+        Promise.reject()
+      }
+
+    }
+    
+}
+function radomKey(length = 32, needChars = true) {
+    let chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z']
+    let num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+    let final = needChars ? chars : num
+    let nums = ''
+    for (var i = 0; i < length; i++) {
+      const id = parseInt(Math.random() * 61)
+      nums += final[id]
+    }
+    return nums
+  }
+export default faceTx;

package/src/plugins/services/getTxFaceResult.js

@@ -0,0 +1,83 @@
+import http from '../assets/http.js'
+import ak from '../assets/ak.js'
+import config from '../assets/config.js'
+import {ua} from "../assets/ua";
+import service from "../service"
+
+var getTxFaceResult = {
+    
+    need(){
+        
+        let token = ak.http.getQueryString('facetoken')
+        if(ak.utils.isEmpty(token)){
+            localStorage.removeItem('faceAbout')
+            return false
+        } else {
+            return true
+        }
+
+    },
+    getData(){
+        
+        let obj = JSON.parse(localStorage.getItem('faceAbout'))
+
+        localStorage.removeItem('faceAbout')
+        return {
+            biz_no: obj.bizSeqNo,
+            userId: obj.userId,
+            orderNo: obj.orderNo,
+            nonce: obj.nonce,
+            expired: '-1000',
+            buz: 'POLICY_FILE',
+            domain: 'POLICY',
+            buzId: radomNum(16),
+            fileName:  radomNum(16)
+
+        }
+    },
+
+    invoke(params){
+    //   let faceType = params.faceType
+    //   delete params.faceType
+
+      if(ua.isIspPhone){
+
+
+      }else if(ua.microMsg){
+        let apiUrl = config.file.baseURL + '/file/v1/hasl/fileAdmin/fileAdmin/getTXFaceCompareResult'
+        return http.post(apiUrl,params,true,true).then((data)=>{
+          let res = data.result
+          let resData = {
+            confidence: res.similarity,
+            imageFile: res.faceFileId,
+            success: true
+          }
+          service.saveInitService('getTxFaceResult',resData)
+          let reUrl = ak.http.deleteParams(window.location.href,'facetoken')
+          window.location.href = reUrl
+          return Promise.resolve(resData)
+        }).catch(err => {
+          let reUrl = ak.http.deleteParams(window.location.href,'facetoken')
+          reUrl = ak.http.deleteParams(reUrl,'orderNo')
+          reUrl = ak.http.deleteParams(reUrl,'signature')
+          reUrl = ak.http.deleteParams(reUrl,'h5faceId')
+          reUrl = ak.http.deleteParams(reUrl,'code')
+          window.location.href = reUrl
+          return  Promise.reject(err)
+        })
+
+      }else{
+        Promise.reject()
+      }
+
+    }
+    
+}
+function radomNum(n) {
+  var rnd = ''
+  for (var i = 0; i < n; i++) {
+    rnd += Math.floor(Math.random() * 10)
+  }
+  return rnd
+}
+export default getTxFaceResult;

package/src/plugins/services/index.js

@@ -14,6 +14,8 @@ import jumpView from './jumpView'
 import statusBarHeight from './statusBarHeight'
 import goSetPage from './goSetPage'
 import faceInApp from './faceInApp'
+import faceTx from './faceTx'
+import getTxFaceResult from './getTxFaceResult'
 
 
 var services = services || {}
@@ -34,4 +36,6 @@ services['jumpView'] = jumpView
 services['goSetPage'] = goSetPage
 services['statusBarHeight'] = statusBarHeight
 services['faceInApp'] = faceInApp
+services['faceTx'] = faceTx
+services['getTxFaceResult'] = getTxFaceResult
 export default services;

package/src/views/auth.vue

@@ -81,13 +81,15 @@
           return {
             vname:'auth',
             needProcessEvent:true,
+            needLoadData: true,
             submodel:{
               data: {
                 required:true,                  // 必填
                 needStar: false,
                 text: '',
                 maxDate: '2030-02-03',
-                placeholder: '123123'
+                placeholder: '123123',
+                defaultPickerVal: '2020-02-03'
               },
               stepper:{
                 min: -2,
@@ -128,12 +130,12 @@
               bank:{required:true,readonly:false},
               cardno:{label:'扣款卡号',placeholder:'请输入扣款卡号',required:true,readonly:true},
               vercode:{
-                label:'验证码',                  // label
-                placeholder:'请输入验证码',      // placeholder
-                disabled:true,                  // 禁用
-                required:true,                  // 必填
+                label: '验证码',                  // label
+                placeholder: '请输入验证码',      // placeholder
+                disabled: false,                  // 禁用
+                required: true,                  // 必填
                 sendButtonLabel: '发送短信',     // 按钮文字
-                expiredTime: 60,                // 倒计时时长
+                expiredTime: 3,                // 倒计时时长
                 expiredLabel: '{0}s',            // 倒计时格式
                 validateType:'CUS'              // 校验类型。见文档校验
               },
@@ -186,10 +188,10 @@
         methods: {
           face() {
             const a = {
-              buzId: '13123',
-              vnode: this
+              idcard_number: '152531199103160179',
+              idcard_name: '胡玉泽'
             }
-            this.$service.callService('faceInApp', a)
+            this.$service.callService('faceTx', a)
           },
           gosetPage() {
             this.$service.callService('goSetPage')
@@ -234,7 +236,9 @@
               buzId: 'asdf123123',
               cancelCrop: true,
               // 相册是否多选
-              multiple: true
+              multiple: false,
+              cropType: '1' // 图片裁剪类型 ,0   横向裁剪   宽 ：高 = 8 ：5,    1   竖向裁剪   宽 ：高 = 5 ：7
+
             }
             this.$service.callService('camera', param)
           },
@@ -271,20 +275,22 @@
 
           },
           loadData(res){
-
+            if (res.serviceId === 'getTxFaceResult') {
+              console.log(res)
+            }
             if(res.serviceId == 'getAuthInfo'){
-              console.log('aaaaaaa')
-              console.log(this.selector('>page').ctls)
-              let data = res.data
-              this.selector('#auth').selector('')
-              this.selector('#name').selector('#name').setValue(data.name)
-              this.selector('#bank').setValue(data.bank)
-              this.selector('#sex').setValue('1')
-  //            this.selector('#sex').set('items',[{value:"dddd",key:"21"},{value:"ffff",key:"01"}])
-
-              this.selector('#cardno').setValue(data.cardno)
-
-              console.log(this.regedit)
+  //             console.log('aaaaaaa')
+  //             console.log(this.selector('>page').ctls)
+  //             let data = res.data
+  //             this.selector('#auth').selector('')
+  //             this.selector('#name').selector('#name').setValue(data.name)
+  //             this.selector('#bank').setValue(data.bank)
+  //             this.selector('#sex').setValue('1')
+  // //            this.selector('#sex').set('items',[{value:"dddd",key:"21"},{value:"ffff",key:"01"}])
+
+  //             this.selector('#cardno').setValue(data.cardno)
+
+  //             console.log(this.regedit)
             }
            
 
@@ -295,11 +301,15 @@
             };
           },
           sendVerCode(resolve){
-
-            this.$service.callService('sendVerCode').then((data)=>{
-                    resolve()
-                  }
-            )
+            debugger
+            setTimeout(function() {
+              resolve()
+            }, 1000)
+
+            // this.$service.callService('sendVerCode').then((data)=>{
+            //         resolve()
+            //       }
+            // )
                 
           },
           authWatchHandle(){

package/src/views/auth3.vue

@@ -8,21 +8,22 @@
     cname="upload"
     @done="done"
     @delete="deleteFn"
+    ref="a"
   >
   </bs-upload2>
-  <bs-upload2 
+  <!-- <bs-upload2 
     id="abv" 
     :mod="submodel.upload2" 
     cname="upload"
     @done="done"
     @delete="deleteFn"
   >
-  </bs-upload2>
+  </bs-upload2> -->
   <bs-upload 
     id="abv" 
     :mod="submodel.upload2" 
     cname="upload2"
-    @done="done"
+    @done="done1"
     @delete="deleteFn"
   >
   </bs-upload>
@@ -74,10 +75,10 @@
                 // actions: 'ocr_bc', // 银行卡
               },
               upload2:{
-                // uploadType: 'IdCard_Front' //身份证正面
+                uploadType: 'IdCard_Front', //身份证正面
                 // uploadType: 'IdCard_Back'  //身份证反面
-                uploadType: 'Bank_Card',      // 银行卡
-                buzId: '2321'                 // 前端自生成uuid
+                // uploadType: 'ocr_id0',      // 银行卡
+                buzId: '2321123123'                 // 前端自生成uuid
               },
               viewer:{
                 value:'https://testfile.ihasl.com/file/v1/hasl/fileAdmin/fileAdmin/get/4cba0c329a994356aa7f4e958c88373b.pdf'
@@ -113,12 +114,20 @@
           },
           done() {
             const a = this.selector('#upload').get('data')
+            console.log()
+            this.bb = `${a.fileId}.${a.ext}`
+            
+          },
+          done1() {
+            const a = this.selector('#upload2').get('data')
+            console.log(a)
             this.bb = `${a.fileId}.${a.ext}`
           },
           a(){
             // this.$service.callService('face',{fileUrl: this.bb}).then(()=>{
             //   localStorage.setItem('face.flag',true)
             // })
+            console.log(this.$refs.a.fileList = [])
           },
           loadData(data) {
             if(data.serviceId == 'getFaceResult'){