'拉取dev'

src/pages/distributorSign/contract-list.vue

@@ -26,7 +26,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.code }}</p>
         </div>
-        <div class="details">
+        <div class="details" @click="goDetails(index)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.name }}</p>
@@ -34,7 +34,7 @@
           <div class="option">
             <p class="name">合同租金</p>
             <p class="normal money">{{ item.money }}</p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" @click="goDetails(index)">
+            <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>
           <div class="option">
             <p class="name">申请时间</p>

src/pages/userBind/np/naturePerson.vue

@@ -2,8 +2,8 @@
  * @Description: In User Settings Edit
  * @Author: liuxin
  * @Date: 2019-09-19 09:18:14
- * @LastEditTime: 2019-09-19 09:18:14
- * @LastEditors: your name
+ * @LastEditTime: 2019-09-26 11:30:03
+ * @LastEditors: Please set LastEditors
  -->
 <template>
   <h-view id="base-info1" class="public-style" title="基本信息">

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-09-25 19:31:11
+ * @LastEditTime: 2019-09-26 13:31:54
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -13,7 +13,7 @@
         <span>用户绑定</span>
       </div>
     </h-header>
-    <Tab @getTabNum="getTabNum" />
+    <Tab :tabNum="tabNum" @getTabNum="getTabNum" />
     <h-content class="content">
       <div v-show="tabNum==0">
         <list-item :item-height="44">
@@ -307,7 +307,7 @@ export default {
       bank_lists: {
         bank_account_num: '',
         bank_account_name: '',
-        bank_card_type: '储蓄卡',
+        bank_card_type: '0',
         bank_full_name: '',
         bank_branch_name: '',
       },
@@ -328,6 +328,7 @@ export default {
         vm.type = '请输入业务经办员工代码'
         vm.typeName = '业务经办'
         vm.bp_type_flag = true
+        vm.baseInfo.agent_username = 'BP003020'
       } else if (
         vm.baseInfo.bp_type === 'AGENT' ||
         vm.baseInfo.bp_type === 'OFFICE' ||
@@ -344,6 +345,16 @@ export default {
         this.text = '授权信息'
       }
     },
+    'tabNum': function (newVal, oldVal) {
+      // if ((newVal === 1 && !window.sessionStorage.user_id) || (newVal === 2 && !window.sessionStorage.user_id)) {
+      //   this.hlsPopup.showError('清先保存基本信息')
+      //   this.tabNum = oldVal
+      // }
+      if (newVal === 1 && !this.bp_id) {
+        this.hlsPopup.showError('请先保存基本信息')
+        this.tabNum = oldVal
+      }
+    },
   },
   created () {
     this.getBpType()
@@ -362,8 +373,12 @@ export default {
           'company_id': '2145',
         },
       }
+      let vm = this
       this.hlsHttp.post(url, param).then(function (res) {
         console.log('企业信息提交', res)
+        if (res.result === 'S') {
+          vm.hlsPopup.showSuccess('提交成功')
+        }
       })
     },
     addBankInfo () {
@@ -377,10 +392,10 @@ export default {
         }
       }
       // 银行卡验证this.hlsUtil.isBankAccount(this.bank.bank_account_num)
-      // if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
-      //   this.bank_card_flag = false
-      //   this.hlsPopup.showLongCenter('请输入正确银行卡号！')
-      // }
+      if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
+        this.bank_card_flag = false
+        this.hlsPopup.showLongCenter('请输入正确银行卡号！')
+      }
       // 验证账户名称与承租人名称一致
       if (this.bank_lists.bank_account_name !== this.saveInfo.bp_name) {
         this.bank_card_flag = false
@@ -401,6 +416,8 @@ export default {
           console.log(res)
           if (res.result === 'S') {
             vm.hlsPopup.hideLoading()
+            vm.showModalValue = false
+            vm.hlsPopup.showSuccess('添加成功')
             let url = $config.basePath + 'bp_bank_query'
             let param = {
               'bp_id': vm.bp_id,
@@ -445,14 +462,14 @@ export default {
         }
       }
       if (!vm.bp_type_flag) {
-        vm.baseInfo.agent_username = ''
+        // vm.baseInfo.agent_username = ''
         // vm.saveInfo.agent_username = ''
       }
       // 校验电话号
-      let re = this.hlsUtil.phoneNumber(this.invoiceInfo.invoice_bp_address_phone_num)
-      if (!re) {
+      let re = this.hlsUtil.phoneNumber(this.saveInfo.cell_phone)
+      if (!re && this.baseInfo.auth_flag === 'N') {
         vm.msg_flag = false
-        vm.hlsPopup.showLongCenter('请输入正确电话号')
+        vm.hlsPopup.showLongCenter('请输入正确手机号')
       }
       // 校验身份证号vm.hlsUtil.isCardID(vm.baseInfo.id_card_no)
       if (vm.flag) {
@@ -477,6 +494,7 @@ export default {
           console.log(res)
           if (res.result === 'S') {
             vm.hlsPopup.hideLoading()
+            vm.hlsPopup.showSuccess('保存成功')
             vm.bp_id = res.bp_id
           }
         })
@@ -748,8 +766,8 @@ export default {
         align-items: center;
       }
       .card-upload {
-        width: 88px;
-        height: 88px;
+        width: 80px;
+        height: 80px;
         border: 1px dashed #dcdcdd;
         display: flex;
         justify-content: center;

www/index.html

+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><title>车租易</title><link href=./static/css/app.2f1f09fd745b67b7bd067792138ae9b3.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.38dcac034293fd44b73e.js></script><script type=text/javascript src=./static/js/app.5d048df2717d76230d0f.js></script></body></html>
\ No newline at end of file

www/static/js/manifest.3ad1d5771e9b13dbdad2.js

+!function(n){function r(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,r),o.l=!0,o.exports}var t=window.webpackJsonp;window.webpackJsonp=function(e,u,c){for(var f,i,p,a=0,l=[];a<e.length;a++)i=e[a],o[i]&&l.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(n[f]=u[f]);for(t&&t(e,u,c);l.length;)l.shift()();if(c)for(a=0;a<c.length;a++)p=r(r.s=c[a]);return p};var e={},o={2:0};r.m=n,r.c=e,r.d=function(n,t,e){r.o(n,t)||Object.defineProperty(n,t,{configurable:!1,enumerable:!0,get:e})},r.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return r.d(t,"a",t),t},r.o=function(n,r){return Object.prototype.hasOwnProperty.call(n,r)},r.p="./",r.oe=function(n){throw n}}([]);
+//# sourceMappingURL=manifest.3ad1d5771e9b13dbdad2.js.map
\ No newline at end of file

www/static/js/manifest.3ad1d5771e9b13dbdad2.js.map

+{"version":3,"sources":["webpack:///static/js/manifest.3ad1d5771e9b13dbdad2.js","webpack:///webpack/bootstrap 41a0a04d511da3176acf"],"names":["modules","__webpack_require__","moduleId","installedModules","exports","module","i","l","call","parentJsonpFunction","window","chunkIds","moreModules","executeModules","chunkId","result","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","shift","s","2","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err"],"mappings":"CAAS,SAAUA,GCuCjB,QAASC,GAAoBC,GAG5B,GAAGC,EAAiBD,GACnB,MAAOC,GAAiBD,GAAUE,OAGnC,IAAIC,GAASF,EAAiBD,IAC7BI,EAAGJ,EACHK,GAAG,EACHH,WAUD,OANAJ,GAAQE,GAAUM,KAAKH,EAAOD,QAASC,EAAQA,EAAOD,QAASH,GAG/DI,EAAOE,GAAI,EAGJF,EAAOD,QA1Df,GAAIK,GAAsBC,OAAqB,YAC/CA,QAAqB,aAAI,SAA8BC,EAAUC,EAAaC,GAI7E,IADA,GAAIX,GAAUY,EAA+BC,EAAtBT,EAAI,EAAGU,KACzBV,EAAIK,EAASM,OAAQX,IACzBQ,EAAUH,EAASL,GAChBY,EAAgBJ,IAClBE,EAASG,KAAKD,EAAgBJ,GAAS,IAExCI,EAAgBJ,GAAW,CAE5B,KAAIZ,IAAYU,GACZQ,OAAOC,UAAUC,eAAed,KAAKI,EAAaV,KACpDF,EAAQE,GAAYU,EAAYV,GAIlC,KADGO,GAAqBA,EAAoBE,EAAUC,EAAaC,GAC7DG,EAASC,QACdD,EAASO,SAEV,IAAGV,EACF,IAAIP,EAAE,EAAGA,EAAIO,EAAeI,OAAQX,IACnCS,EAASd,EAAoBA,EAAoBuB,EAAIX,EAAeP,GAGtE,OAAOS,GAIR,IAAIZ,MAGAe,GACHO,EAAG,EA6BJxB,GAAoByB,EAAI1B,EAGxBC,EAAoB0B,EAAIxB,EAGxBF,EAAoB2B,EAAI,SAASxB,EAASyB,EAAMC,GAC3C7B,EAAoB8B,EAAE3B,EAASyB,IAClCT,OAAOY,eAAe5B,EAASyB,GAC9BI,cAAc,EACdC,YAAY,EACZC,IAAKL,KAMR7B,EAAoBmC,EAAI,SAAS/B,GAChC,GAAIyB,GAASzB,GAAUA,EAAOgC,WAC7B,WAAwB,MAAOhC,GAAgB,SAC/C,WAA8B,MAAOA,GAEtC,OADAJ,GAAoB2B,EAAEE,EAAQ,IAAKA,GAC5BA,GAIR7B,EAAoB8B,EAAI,SAASO,EAAQC,GAAY,MAAOnB,QAAOC,UAAUC,eAAed,KAAK8B,EAAQC,IAGzGtC,EAAoBuC,EAAI,KAGxBvC,EAAoBwC,GAAK,SAASC,GAA2B,KAAMA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":["/******/ (function(modules) { // webpackBootstrap\n/******/ \t// install a JSONP callback for chunk loading\n/******/ \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n/******/ \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n/******/ \t\t// add \"moreModules\" to the modules object,\n/******/ \t\t// then flag all \"chunkIds\" as loaded and fire callback\n/******/ \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n/******/ \t\tfor(;i < chunkIds.length; i++) {\n/******/ \t\t\tchunkId = chunkIds[i];\n/******/ \t\t\tif(installedChunks[chunkId]) {\n/******/ \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n/******/ \t\t\t}\n/******/ \t\t\tinstalledChunks[chunkId] = 0;\n/******/ \t\t}\n/******/ \t\tfor(moduleId in moreModules) {\n/******/ \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n/******/ \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n/******/ \t\t\t}\n/******/ \t\t}\n/******/ \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n/******/ \t\twhile(resolves.length) {\n/******/ \t\t\tresolves.shift()();\n/******/ \t\t}\n/******/ \t\tif(executeModules) {\n/******/ \t\t\tfor(i=0; i < executeModules.length; i++) {\n/******/ \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n/******/ \t\t\t}\n/******/ \t\t}\n/******/ \t\treturn result;\n/******/ \t};\n/******/\n/******/ \t// The module cache\n/******/ \tvar installedModules = {};\n/******/\n/******/ \t// objects to store loaded and loading chunks\n/******/ \tvar installedChunks = {\n/******/ \t\t2: 0\n/******/ \t};\n/******/\n/******/ \t// The require function\n/******/ \tfunction __webpack_require__(moduleId) {\n/******/\n/******/ \t\t// Check if module is in cache\n/******/ \t\tif(installedModules[moduleId]) {\n/******/ \t\t\treturn installedModules[moduleId].exports;\n/******/ \t\t}\n/******/ \t\t// Create a new module (and put it into the cache)\n/******/ \t\tvar module = installedModules[moduleId] = {\n/******/ \t\t\ti: moduleId,\n/******/ \t\t\tl: false,\n/******/ \t\t\texports: {}\n/******/ \t\t};\n/******/\n/******/ \t\t// Execute the module function\n/******/ \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n/******/\n/******/ \t\t// Flag the module as loaded\n/******/ \t\tmodule.l = true;\n/******/\n/******/ \t\t// Return the exports of the module\n/******/ \t\treturn module.exports;\n/******/ \t}\n/******/\n/******/\n/******/ \t// expose the modules object (__webpack_modules__)\n/******/ \t__webpack_require__.m = modules;\n/******/\n/******/ \t// expose the module cache\n/******/ \t__webpack_require__.c = installedModules;\n/******/\n/******/ \t// define getter function for harmony exports\n/******/ \t__webpack_require__.d = function(exports, name, getter) {\n/******/ \t\tif(!__webpack_require__.o(exports, name)) {\n/******/ \t\t\tObject.defineProperty(exports, name, {\n/******/ \t\t\t\tconfigurable: false,\n/******/ \t\t\t\tenumerable: true,\n/******/ \t\t\t\tget: getter\n/******/ \t\t\t});\n/******/ \t\t}\n/******/ \t};\n/******/\n/******/ \t// getDefaultExport function for compatibility with non-harmony modules\n/******/ \t__webpack_require__.n = function(module) {\n/******/ \t\tvar getter = module && module.__esModule ?\n/******/ \t\t\tfunction getDefault() { return module['default']; } :\n/******/ \t\t\tfunction getModuleExports() { return module; };\n/******/ \t\t__webpack_require__.d(getter, 'a', getter);\n/******/ \t\treturn getter;\n/******/ \t};\n/******/\n/******/ \t// Object.prototype.hasOwnProperty.call\n/******/ \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n/******/\n/******/ \t// __webpack_public_path__\n/******/ \t__webpack_require__.p = \"./\";\n/******/\n/******/ \t// on error function for async loading\n/******/ \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n/******/ })\n/************************************************************************/\n/******/ ([]);\n\n\n// WEBPACK FOOTER //\n// static/js/manifest.3ad1d5771e9b13dbdad2.js"," \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 41a0a04d511da3176acf"],"sourceRoot":""}
\ No newline at end of file

www/static/prototype.js

+/**
+ *
+ * @param fmt
+ * @returns {*}
+ * @constructor
+ */
+Date.prototype.format = function (fmt) { // eslint-disable-line
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'h+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds(), // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) { if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) }
+  return fmt
+}
+/**
+ * 移除数组的某个元素
+ * @param dx 下标
+ * @returns {boolean}
+ */
+Array.prototype.remove = function (dx) { // eslint-disable-line
+  if (isNaN(dx) || dx > this.length) {
+    return false
+  }
+  for (var i = 0, n = 0; i < this.length; i++) {
+    if (this[i] !== this[dx]) {
+      this[n++] = this[i]
+    }
+  }
+  this.length -= 1
+}