fstarter 2.10.47 → 2.10.50

package/package.json

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

package/src/plugins/assets/callNative.js

@@ -473,7 +473,9 @@ function callShell(fnModel, param, cbparam, vnode = null) {
     }
     const requestJson = JSON.stringify(jsonObj)
     console.log('壳调用json：' + requestJson, ua)
-    window.shellCaller = vnode
+    if (vnode != null) {
+      window.shellCaller = vnode
+    }
     if (ua.iPad || ua.iPhone) {
       if (window.navigator.userAgent.indexOf('app_ios_wk') != -1) {
         window.webkit.messageHandlers.JSonString.postMessage(requestJson)

package/src/plugins/components/BSUpload2.vue

@@ -18,14 +18,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"
     >
@@ -71,7 +72,7 @@
           </van-button>
         </div>
       </div>
-    </van-popup>
+    </div>
   </div>
 </template>
 
@@ -372,6 +373,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

@@ -7,125 +7,122 @@
     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="modelData.disabled">{{model.sendButtonLabel}}</van-button>
+    <van-button slot="button" @click="sendVerCode" :disabled="modelData.disabled">{{ model.sendButtonLabel }}
+    </van-button>
   </van-field>
 
 </template>
 
 <script>
 
-    import  Rx from 'rxjs';
-    import {take} from 'rxjs/operators';
-    import { filter } from 'rxjs/operators';
-    import base2 from './base2.js'
-
-    export default {
-        name: "bs-vercode",
-        mixins: [base2],
-        props: {
-
-        },
-        data() {
-          return {
-            validateCtl:true,
-            sent: true
-          }
-        },
-        mounted() {
-
-
-        },
-        methods: {
-          createDefaultModel() {
-            return {
-              type:'BSVerCode',
-              value:'',
-              placeholder:'lang.ctl.BSVerCode.placeholder',
-              sendButtonLabel:'lang.ctl.BSVerCode.sendButtonLabel',
-              expiredTime:60,
-              expiredLabel:'{0}s',
-              disabled: false
-            };
-          },
-          sendVerCode(){
-            if(!this.sent){
-              return
-            }
-
-            let self = this
-            this.$emit('send-verCode',function(){
-              self.sent = true
-              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.subscribe({
-                  next: function(value) {
-                      
-                    self.model.expiredTime = self.model.expiredTime - 1
-                    self.model.sendButtonLabel = self.modelData.expiredLabel.format(self.model.expiredTime)
-                  },
-                  complete: function() {
-                    
-                    self.model.sendButtonLabel = self.modelData.sendButtonLabel
-                    self.sent = false
-                    self.model.value = ''
-                  },
-                  error: function(error) {
-                    console.log('Throw Error: ' + error)
-                  }
-              });
-
-            },this.fullName)
+import Rx from 'rxjs';
+import {filter, take} from 'rxjs/operators';
+import base2 from './base2.js'
+
+export default {
+  name: "bs-vercode",
+  mixins: [base2],
+  props: {},
+  data() {
+    return {
+      validateCtl: true,
+      sent: false
+    }
+  },
+  mounted() {
+
+
+  },
+  methods: {
+    createDefaultModel() {
+      return {
+        type: 'BSVerCode',
+        value: '',
+        placeholder: 'lang.ctl.BSVerCode.placeholder',
+        sendButtonLabel: 'lang.ctl.BSVerCode.sendButtonLabel',
+        expiredTime: 60,
+        expiredLabel: '{0}s'
+      };
+    },
+    sendVerCode() {
+      if (this.sent) {
+        return
+      }
+      let self = this
+      this.$emit('send-verCode', function () {
+        self.sent = true
+        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.subscribe({
+          next: function (value) {
+
+            self.model.expiredTime = self.model.expiredTime - 1
+            self.model.sendButtonLabel = self.modelData.expiredLabel.format(self.model.expiredTime)
           },
-          reset(){
-    
-            this.sent = false
-            this.model.label = this.modelData.label
-            this.model.disabled = this.modelData.disabled
-            this.model.value = this.modelData.value
-            this.model.placeholder = this.modelData.placeholder
-            this.model.sendButtonLabel= this.modelData.sendButtonLabel
-            this.model.expiredTime = this.modelData.expiredTime
-            this.model.expiredLabel = this.modelData.expiredLabel
-            
+          complete: function () {
+
+            self.model.sendButtonLabel = self.modelData.sendButtonLabel
+            self.sent = false
+            // self.model.value = ''
           },
-          blur(){
+          error: function (error) {
+            console.log('Throw Error: ' + error)
+            self.sent = false
+          }
+        });
 
-            if(!this.model.readonly)
-              this.model.validateToken++
+      }, this.fullName)
 
-            this.$emit('blur',function(){
 
-            },this.fullName)
+    },
+    reset() {
 
-          }
-        },
-      watch:{
-        'model.value':{
-          handler(val,oldval){
+      this.sent = false
+      this.model.label = this.modelData.label
+      this.model.disabled = this.modelData.disabled
+      this.model.value = this.modelData.value
+      this.model.placeholder = this.modelData.placeholder
+      this.model.sendButtonLabel = this.modelData.sendButtonLabel
+      this.model.expiredTime = this.modelData.expiredTime
+      this.model.expiredLabel = this.modelData.expiredLabel
 
-            this.setEventString(this.fullName,this.sname,'value',val,oldval)
-          },
-          deep: false
-        }
-      }
+    },
+    blur() {
+
+      if (!this.model.readonly)
+        this.model.validateToken++
+
+      this.$emit('blur', function () {
+
+      }, this.fullName)
 
     }
+  },
+  watch: {
+    'model.value': {
+      handler(val, oldval) {
+
+        this.setEventString(this.fullName, this.sname, 'value', val, oldval)
+      },
+      deep: false
+    }
+  }
+
+}
 
 </script>
 
 <style scoped>
 
-  .BSVerCode_disabled{
-    color:#999999;
-  }
+.BSVerCode_disabled {
+  color: #999999;
+}
 
 </style>

package/src/plugins/platform/isp_phone.js

@@ -28,7 +28,11 @@ platform = {
 
       const requestJson = JSON.stringify(jsonObj)
       console.log('requestJson', requestJson)
-      window.shellCaller = vnode
+      //如果vnode没有赋值，则默认为null，说明业务层不需要vnode来处理回调事件
+      //所以避免冲掉正在进行的需要vnode回调事件的业务逻辑，增加一个为null的判断
+      if (vnode != null) {
+        window.shellCaller = vnode
+      }
       // window.webkit.messageHandlers.JSonString.postMessage(requestJson)
       // return
       if (ua.iPad || ua.iPhone) {

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

@@ -84,6 +84,7 @@
           return {
             vname:'auth',
             needProcessEvent:true,
+            needLoadData: true,
             submodel:{
               data: {
                 required:true,                  // 必填
@@ -190,10 +191,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')
@@ -280,20 +281,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)
             }
            
 
@@ -304,11 +307,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'){

package/src/views/page.vue

@@ -62,10 +62,13 @@
              menu:[]
           }
         },
+        created() {
+          //把基础参数的获取从mounted提前到created中，避免业务代码大量的请求基础参数导致的一些问题
+          this.$service.callServices(['hideToolBar','getToken','getSystemData'])
+        },
         mounted() {
 
           weixin.hideWxMenu()
-          this.$service.callServices(['hideToolBar','getToken','getSystemData'])
 
         },
         computed: {

package/README.md

@@ -1,18 +0,0 @@
-# fstarter
-
-> A Vue.js project
-
-## Build Setup
-
-``` bash
-# install dependencies
-npm install
-
-# serve with hot reload at localhost:8080
-npm run dev
-
-# build for production with minification
-npm run build
-```
-
-For detailed explanation on how things work, consult the [docs for vue-loader](http://vuejs.github.io/vue-loader).

package/fstarter.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>