wl-design-mobile 0.3.3 → 0.3.5

package/README.md

@@ -1,6 +1,6 @@
-# wl-design-mobile
-
-## Setup
-```
-npm i wl-design-mobile
-```
+# wl-design-mobile
+
+## Setup
+```
+npm i wl-design-mobile
+```

package/card-item/lambo-card-row.vue

@@ -31,8 +31,7 @@ export default {
 
   },
   created() {
-    console.log("row name:", this.name)
-    console.log("row val:", this.val)
+
   }
 }
 </script>

package/doc/img/styles/css/index.css

@@ -1,3 +1,3 @@
-.img-upload-container {
-    padding: 0px 14px 12px 14px;
-}
+.img-upload-container {
+    padding: 0px 14px 12px 14px;
+}

package/edit/list/styles/css/index.css

@@ -1,39 +1,39 @@
-.coll-div {
-    margin-bottom: 8px;
-}
-
-.indicator-title {
-    display: flex;
-    align-items: center;
-    color: var(--scl-blue);
-    font-size: 14px;
-    font-family: 微软雅黑, serif Regular;
-}
-
-.indicator-title .color-line {
-    width: 3px;
-    height: 14px;
-    margin-right: 8px;
-}
-
-.coll-title-icon {
-    justify-content: center;
-    align-items: center;
-    align-content: center;
-}
-
-/* 覆盖折叠面板的标题的padding */
-/deep/ .van-cell {
-    padding: 12px 10px;
-}
-
-/* 覆盖去掉折叠面板的标题下面的线 */
-/deep/ .van-cell::after {
-    border: none;
-}
-
-/* 覆盖折叠面板的内容的padding */
-/deep/ .van-collapse-item__content {
-    padding: 0px 0px 0px 0px;
-}
-
+.coll-div {
+    margin-bottom: 8px;
+}
+
+.indicator-title {
+    display: flex;
+    align-items: center;
+    color: var(--scl-blue);
+    font-size: 14px;
+    font-family: 微软雅黑, serif Regular;
+}
+
+.indicator-title .color-line {
+    width: 3px;
+    height: 14px;
+    margin-right: 8px;
+}
+
+.coll-title-icon {
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+}
+
+/* 覆盖折叠面板的标题的padding */
+/deep/ .van-cell {
+    padding: 12px 10px;
+}
+
+/* 覆盖去掉折叠面板的标题下面的线 */
+/deep/ .van-cell::after {
+    border: none;
+}
+
+/* 覆盖折叠面板的内容的padding */
+/deep/ .van-collapse-item__content {
+    padding: 0px 0px 0px 0px;
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wl-design-mobile",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "",
   "main": "index.js",
   "author": "finch",

package/search/styles/css/index.css

@@ -1,136 +1,136 @@
-.search-top-pop {
-    min-height: 112px;
-    max-height: 33%;
-    background-color: var(--scl-white-1)
-}
-
-.search-body {
-    border-top: none;
-    overflow-y: auto;
-    flex: 1
-}
-
-.search-bottom-btn {
-    padding: 12px 14px 12px 14px;
-    box-shadow: 0 -2px 10px rgba(125, 126, 128, .16);
-    background-color: rgb(255, 255, 255, 1);
-}
-
-/*日期选择*/
-.search-row {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    flex-wrap: nowrap;
-    align-items: center;
-    align-content: center;
-    height: 50px;
-    padding: 10px 0;
-    margin: 0 14px;
-    border-bottom: 1px solid var(--scl-white-2);
-    border-top: none;
-}
-
-.search-input-title {
-    height: 16px;
-    font-size: 12px;
-    color: var(--scl-gray-2);
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin-left: 12px;
-    width: 76px;
-}
-
-.search-lambo-input {
-    border: none;
-    outline: none;
-    background: none;
-    height: 16px;
-    font-size: 12px;
-    color: var(--scl-gray-1);
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin-left: 8px;
-    flex: 1;
-}
-
-/*输入框*/
-.search-lambo-input .van-cell {
-    padding: 10px 0;
-}
-
-/*多选*/
-.search-top-div {
-    display: flex;
-    justify-content: space-between;
-    height: 44px;
-    line-height: 44px;
-    width: 100%;
-    position: fixed;
-    z-index: 2;
-    box-shadow: 0 2px 10px rgba(125, 126, 128, .16);
-    background-color: rgb(255, 255, 255, 1);
-}
-
-.search-cancel-btn {
-    border: none;
-    color: var(--scl-gray-3);
-}
-
-.search-confirm-btn {
-    border: none;
-    color: var(--scl-blue);
-}
-
-.search-select-title {
-    font-size: 16px;
-    font-weight: bold;
-}
-
-/*修改单选多选的滚动条样式*/
-/deep/ .van-radio-group {
-    position: relative;
-}
-
-/*修改单选多选的滚动条样式*/
-/deep/ .van-cell-group {
-    padding-top: 44px;
-}
-
-/*修改单选多选的滚动条样式*/
-/deep/ .van-cell:first-child {
-    padding-top: 10px;
-}
-
-/*滚动条样式*/
-/deep/ ::-webkit-scrollbar {
-    width: 6px;
-}
-
-/*滚动条样式*/
-/deep/ ::-webkit-scrollbar-thumb {
-    border-radius: var(--ind-border-radius-xl);
-    background: rgba(45, 140, 240, 0.6);
-}
-
-/*滚动条样式*/
-/deep/ ::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1);
-    border-radius: var(--ind-border-radius-xl);
-    background: rgba(231, 242, 250, 0.4);
-}
-
-.bottom-div {
-    display: flex;
-    flex-direction: column;
-}
-
-.cell-group-div {
-    flex: 1;
-    overflow-y: auto;
-    margin-top: 44px;
-}
-
-
+.search-top-pop {
+    min-height: 112px;
+    max-height: 33%;
+    background-color: var(--scl-white-1)
+}
+
+.search-body {
+    border-top: none;
+    overflow-y: auto;
+    flex: 1
+}
+
+.search-bottom-btn {
+    padding: 12px 14px 12px 14px;
+    box-shadow: 0 -2px 10px rgba(125, 126, 128, .16);
+    background-color: rgb(255, 255, 255, 1);
+}
+
+/*日期选择*/
+.search-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    flex-wrap: nowrap;
+    align-items: center;
+    align-content: center;
+    height: 50px;
+    padding: 10px 0;
+    margin: 0 14px;
+    border-bottom: 1px solid var(--scl-white-2);
+    border-top: none;
+}
+
+.search-input-title {
+    height: 16px;
+    font-size: 12px;
+    color: var(--scl-gray-2);
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-left: 12px;
+    width: 76px;
+}
+
+.search-lambo-input {
+    border: none;
+    outline: none;
+    background: none;
+    height: 16px;
+    font-size: 12px;
+    color: var(--scl-gray-1);
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-left: 8px;
+    flex: 1;
+}
+
+/*输入框*/
+.search-lambo-input .van-cell {
+    padding: 10px 0;
+}
+
+/*多选*/
+.search-top-div {
+    display: flex;
+    justify-content: space-between;
+    height: 44px;
+    line-height: 44px;
+    width: 100%;
+    position: fixed;
+    z-index: 2;
+    box-shadow: 0 2px 10px rgba(125, 126, 128, .16);
+    background-color: rgb(255, 255, 255, 1);
+}
+
+.search-cancel-btn {
+    border: none;
+    color: var(--scl-gray-3);
+}
+
+.search-confirm-btn {
+    border: none;
+    color: var(--scl-blue);
+}
+
+.search-select-title {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+/*修改单选多选的滚动条样式*/
+/deep/ .van-radio-group {
+    position: relative;
+}
+
+/*修改单选多选的滚动条样式*/
+/deep/ .van-cell-group {
+    padding-top: 44px;
+}
+
+/*修改单选多选的滚动条样式*/
+/deep/ .van-cell:first-child {
+    padding-top: 10px;
+}
+
+/*滚动条样式*/
+/deep/ ::-webkit-scrollbar {
+    width: 6px;
+}
+
+/*滚动条样式*/
+/deep/ ::-webkit-scrollbar-thumb {
+    border-radius: var(--ind-border-radius-xl);
+    background: rgba(45, 140, 240, 0.6);
+}
+
+/*滚动条样式*/
+/deep/ ::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1);
+    border-radius: var(--ind-border-radius-xl);
+    background: rgba(231, 242, 250, 0.4);
+}
+
+.bottom-div {
+    display: flex;
+    flex-direction: column;
+}
+
+.cell-group-div {
+    flex: 1;
+    overflow-y: auto;
+    margin-top: 44px;
+}
+
+

package/table/lambo-ag-table.vue

@@ -8,8 +8,11 @@
           :defaultColDef="defaultColDef"
           @grid-ready="onGridReady"
           @sortChanged="onSortChanged"
-          class="ag-theme-balham"
-          style="width: 100%; height: 100%;"
+          @cell-clicked="onCellClicked"
+          :row-selection="isMultiSelect === true ? 'multiple' : false"
+          :rowMultiSelectWithClick="isMultiSelect"
+          :suppressCellSelection="isMultiSelect"
+          class="ag-grid-tb"
       ></ag-grid-vue>
     </div>
     <van-pagination
@@ -34,8 +37,12 @@ import 'ag-grid-community/styles/ag-grid.css'
 import 'ag-grid-community/styles/ag-theme-balham.css'
 import {AgGridVue} from 'ag-grid-vue/lib/main.cjs.js'
 // import {AgGridVue} from 'ag-grid-vue'
-import {axios} from "../util/axios/index"
 import {Toast} from "vant"
+import {axios} from "../util/axios";
+
+// 合计行标志
+const TOTAL_ROW_FIELD_KEY = "total_row"
+const PAGE_DRILL_FLAG_KEY = "drill"
 
 export default {
   name: 'LamboAgTable',
@@ -43,7 +50,7 @@ export default {
   props: {
     tableHeight: {
       type: String,
-      default: '50%',
+      default: '381px', // 默认10行的高度
     },
     url: {
       type: String,
@@ -60,6 +67,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isMultiSelect: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -69,26 +80,35 @@ export default {
         lockPosition: true,
         editable: false,
         sortable: true,
-        resizable: false,
-        filter: false,
-        autoHeight: true
+        autoHeight: true,
+        resizable: true,
+        filter: true
       },
       currentPage: 1,
       offset: 0,
       limit: 10,
       total: 0,
+      gridApi: null
     }
   },
   methods: {
     onGridReady(params) {
-      params.api.sizeColumnsToFit();
+      this.gridApi = params.api
     },
-    columnsFilterSort() {
+    columnsFilter() {
       if (this.columns && this.columns.length > 0) {
         for (const item of this.columns) {
           if (item && item.hasOwnProperty("field")) {
             item['comparator'] = this.preventComparator
           }
+          if (item.hasOwnProperty(PAGE_DRILL_FLAG_KEY) && item[PAGE_DRILL_FLAG_KEY] === '1') {
+            item.cellStyle= (params) => {
+              console.log("lambo-ag-grid columnsFilter params:", params)
+              if (params.hasOwnProperty("data") && !(params.data.hasOwnProperty(TOTAL_ROW_FIELD_KEY) && params.data[TOTAL_ROW_FIELD_KEY] === '1')) {
+                return {color: '#0070D2'}
+              }
+            }
+          }
         }
       }
     },
@@ -96,7 +116,7 @@ export default {
       return 0;
     },
     onSortChanged(event) {
-      console.log("lambo-ag-table -- onSortChanged -- event:", event)
+      console.log("lambo-ag-table onSortChanged event:", event)
       if (event && event.hasOwnProperty("columns") && event.columns) {
         let sortColumns = event.columns
         if (sortColumns && sortColumns.length > 0) {
@@ -104,7 +124,7 @@ export default {
           if (sortCol && sortCol.hasOwnProperty("colId") && sortCol.hasOwnProperty("sort")) {
             let sortField = sortCol.colId
             let sortType = sortCol.sort
-            console.log("lambo-ag-table -- onSortChanged -- sortField:" + sortField + ",sortType:" + sortType)
+            console.log("lambo-ag-table onSortChanged sortField:" + sortField + ",sortType:" + sortType)
             if (sortField && (sortType === 'desc' || sortType === 'asc')) {
               this.searchParams.sort = sortField
               this.searchParams.order = sortType
@@ -125,9 +145,9 @@ export default {
       } else {
         params = {...this.searchParams}
       }
-      console.log("lambo-ag-table -- onLoad -- params:", params)
+      console.log("lambo-ag-table onLoad params:", params)
       axios.get(this.url, {params}).then(res => {
-        console.log("lambo-ag-table -- onLoad -- dataRefresh:", res)
+        console.log("lambo-ag-table onLoad dataRefresh res:", res)
         if (res && res.code === 1) {
           let dataObj = res.data
           this.rowData = dataObj.rows || []
@@ -137,20 +157,42 @@ export default {
             this.total = dataObj.total || 0
           }
         } else {
-          console.error("lambo-ag-table -- onLoad -- 查询[" + this.url + "]数据失败", res)
+          console.error("lambo-ag-table onLoad 查询[" + this.url + "]数据失败", res)
           Toast.fail("查询[" + this.url + "]数据失败:" + res.data || '')
         }
       }).catch(err => {
-        console.error("lambo-ag-table -- onLoad -- 查询[" + this.title + "]异常:", err)
+        console.error("lambo-ag-table onLoad 查询[" + this.title + "]异常:", err)
         Toast.fail("查询[" + this.url + "]数据异常")
       })
+    },
+    getSelectedRows() {
+      let selData = []
+      if (this.gridApi) {
+        const selectedNodes = this.gridApi.getSelectedNodes()
+        if (selectedNodes) {
+          selData = selectedNodes.map(node => node.data)
+        }
+        console.log('lambo-ag-grid getSelectedRows:', selData);
+      }
+      return selData
+    },
+    onCellClicked(event) {
+      console.log('lambo-ag-grid onCellClicked event:', event);
+      if (event && event.hasOwnProperty("colDef") && event.colDef.hasOwnProperty("field") && event.hasOwnProperty("data")) {
+        let detailField = event.colDef.field
+        let rowData = event.data
+        if (!(rowData.hasOwnProperty(TOTAL_ROW_FIELD_KEY) && rowData[TOTAL_ROW_FIELD_KEY] === '1')) {
+          this.$emit('on-cell-click', detailField, event.value, rowData);
+        }
+      } else {
+        console.error("lambo-ag-grid onCellClicked event异常无法点击")
+      }
     }
   },
   watch: {
     searchParams: {
       handler: function (val, oldVal) {
-        console.log("lambo-ag-table -- searchParams -- val,oldVal:", {val, oldVal})
-        console.log("lambo-ag-table -- searchParams -- val===oldVal:", val === oldVal)
+        console.log(`lambo-ag-table watch searchParams val,oldVal:`, {val, oldVal}, `val===oldVal:`, val === oldVal)
         this.rowData = []
         this.sumData = []
         this.dataRefresh()
@@ -159,11 +201,16 @@ export default {
     }
   },
   created() {
-    this.columnsFilterSort()
+    this.columnsFilter()
   }
 }
 </script>
 <style scoped>
+.ag-grid-tb {
+  height: 100%;
+  width: 100%;
+}
+
 /deep/ .vant-page-comp .van-pagination__item {
   color: #0070D2
 }

package/util/assist.js

@@ -1,43 +1,43 @@
-// 深拷贝
-export function deepCopy(data) {
-  let i;
-  const t = typeOf(data);
-  let o;
-
-  if (t === 'array') {
-    o = [];
-  } else if (t === 'object') {
-    o = {};
-  } else {
-    return data;
-  }
-
-  if (t === 'array') {
-    for (i = 0; i < data.length; i++) {
-      o.push(deepCopy(data[i]));
-    }
-  } else if (t === 'object') {
-    for (i in data) {
-      o[i] = deepCopy(data[i]);
-    }
-  }
-  return o;
-}
-
-// 判断对象类型
-export function typeOf(obj) {
-  const toString = Object.prototype.toString;
-  const map = {
-    '[object Boolean]': 'boolean',
-    '[object Number]': 'number',
-    '[object String]': 'string',
-    '[object Function]': 'function',
-    '[object Array]': 'array',
-    '[object Date]': 'date',
-    '[object RegExp]': 'regExp',
-    '[object Undefined]': 'undefined',
-    '[object Null]': 'null',
-    '[object Object]': 'object'
-  };
-  return map[toString.call(obj)];
-}
+// 深拷贝
+export function deepCopy(data) {
+  let i;
+  const t = typeOf(data);
+  let o;
+
+  if (t === 'array') {
+    o = [];
+  } else if (t === 'object') {
+    o = {};
+  } else {
+    return data;
+  }
+
+  if (t === 'array') {
+    for (i = 0; i < data.length; i++) {
+      o.push(deepCopy(data[i]));
+    }
+  } else if (t === 'object') {
+    for (i in data) {
+      o[i] = deepCopy(data[i]);
+    }
+  }
+  return o;
+}
+
+// 判断对象类型
+export function typeOf(obj) {
+  const toString = Object.prototype.toString;
+  const map = {
+    '[object Boolean]': 'boolean',
+    '[object Number]': 'number',
+    '[object String]': 'string',
+    '[object Function]': 'function',
+    '[object Array]': 'array',
+    '[object Date]': 'date',
+    '[object RegExp]': 'regExp',
+    '[object Undefined]': 'undefined',
+    '[object Null]': 'null',
+    '[object Object]': 'object'
+  };
+  return map[toString.call(obj)];
+}

package/util/bus.js

@@ -1,4 +1,4 @@
-import Vue from 'vue'
-
-const Bus = new Vue();
-export default Bus;
+import Vue from 'vue'
+
+const Bus = new Vue();
+export default Bus;

package/util/jssdk.js

@@ -1,247 +1,247 @@
-import wx from "weixin-js-sdk";
-import * as dd from 'dingtalk-jsapi';
-import config from '../config/config'
-import {axios} from '../util/axios'
-
-let appId,agentId,corpId,appKey
-
-function init({appId:a,agentId:b,corpId:c,appKey:d}){
-  appId = a
-  agentId = b
-  corpId = c
-  appKey = d
-}
-
-
-function getAppType() {
-  let ua = navigator.userAgent.toLowerCase();
-  let isWxWork = ua.match(/WxWork/i) == 'wxwork';
-  if (isWxWork) {
-    return '20'
-  }
-
-  let isWx = ua.match(/MicroMessenger/i) == 'micromessenger';
-  if (isWx) {
-    if(agentId){//如果有agentId认为是企业微信
-      return '20'
-    }
-    return '10'
-  }
-
-  if (dd.env.platform != 'notInDingTalk') {
-    return '30'
-  }
-
-  return ''
-}
-
-function getJsConfig(){
-  let url = window.location.href.split('#')[0]
-  return new Promise((resolve, reject)=>{
-    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
-      appType: getAppType(),
-      appId: appId,
-      agentId: agentId,
-      corpId: corpId,
-      appKey: appKey,
-      url: url
-    }).then((resp) => {
-      resolve(resp.data)
-    }).catch((error) => {
-      reject(error)
-    })
-  })
-}
-
-function configWx(){
-  return new Promise((resolve, reject) =>{
-    getJsConfig().then((resp)=>{
-      wx.config({
-        debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-        appId: appId, // 必填，公众号的唯一标识
-        timestamp: resp.timestamp, // 必填，生成签名的时间戳
-        nonceStr: resp.noncestr, // 必填，生成签名的随机串
-        signature: resp.signature, // 必填，签名
-        jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','invoke','onLocationChange','previewFile'] // 必填，需要使用的JS接口列表
-        //jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','startLocationUpdateBackground','startLocationUpdate','onLocationChange','offLocationChange']   // 必填，需要使用的JS接口列表
-      });
-
-      wx.ready(() => {
-        console.log('初始化js-sdk成功');
-        resolve()
-      });
-      wx.error(res => {
-        console.log('初始化js-sdk失败' + res.errMsg);
-        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
-        reject('初始化js-sdk失败' + res.errMsg)
-      });
-    }).catch((error)=>{
-      reject('请求服务端jssdk签名失败：'+error)
-    })
-  })
-}
-
-function configDd(){
-  return new Promise((resolve, reject)=>{
-    getJsConfig().then((resp)=>{
-      //钉钉js-api配置
-      console.log("当前页面："+location.href);
-      dd.config({
-        agentId:agentId,
-        corpId: corpId,      // 必填，公众号的唯一标识
-        timeStamp: resp.timestamp,  // 必填，生成签名的时间戳
-        nonceStr: resp.noncestr,   // 必填，生成签名的随机串
-        signature: resp.signature,  // 必填，签名
-        jsApiList: [
-          'getDeviceUUID',
-          'getLocation',
-
-        ] // 必填，需要使用的jsapi列表，注意：不要带dd。
-      });
-
-      dd.ready(() => {
-        console.log('初始化钉钉 js-sdk成功');
-        resolve()
-      });
-      dd.error(res => {
-        console.log('初始化钉钉 js-sdk失败' + JSON.stringify(res));
-        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
-        reject('初始化钉钉 js-sdk失败' + JSON.stringify(res))
-      });
-    }).catch((error)=>{
-      reject('请求服务端jssdk签名失败：'+error)
-    })
-  })
-}
-
-let JsSDK = (function () {
-  function scanQRCode(){
-    return new Promise((resolve, reject) =>{
-      if(getAppType() === '30'){
-        dd.scan({
-          type: 'all',
-          success: (res) => {
-            console.log('钉钉扫码结果',res)
-            resolve(res.text)
-          },
-          fail: (err) => {
-            console.log('钉钉扫码失败',err)
-            reject('钉钉扫码失败：'+err)
-          },
-          complete: () => {},
-        });
-      }else{
-        configWx().then(()=>{
-          wx.scanQRCode({
-            desc: 'scanQRCode desc',
-            needResult: 1,
-            scanType: ["qrCode", "barCode"],
-            success: function (resp) {
-              console.log("微信扫码结果：",resp)
-              let result = resp.resultStr
-              resolve(result)
-            },
-            fail: function (res) {
-              console.log("失败res=>",res)
-              if (res.errMsg.indexOf('function_not_exist') > 0) {
-                reject('版本过低请升级');
-              } else {
-                reject("微信扫码失败,请联系系统管理员!");
-              }
-            }
-          })
-        }).catch((error)=>{
-          reject('微信扫码失败：'+error)
-        })
-      }
-    })
-  }
-  function getLocation(){
-    return new Promise((resolve, reject)=>{
-      if(getAppType() === '30'){
-        configDd().then(()=>{
-          dd.getLocation({
-            targetAccuracy: '200',
-            cacheTimeout: 20,
-            coordinate: '1',
-            useCache: true,
-            withReGeocode: true,
-            type: 1,
-            success: (res) => {
-              console.log('钉钉获取当前位置结果：', res)
-              resolve(res)
-            },
-            fail: (error) => {
-              console.log('钉钉获取位置失败：', error)
-              reject('钉钉获取位置失败：'+error)
-            },
-            complete: () => {},
-          })
-        }).catch((error)=>{
-          reject('钉钉获取位置失败：'+error)
-        })
-      }else{
-        configWx().then(()=>{
-          wx.getLocation({
-            type: 'gcj02', //获取gcj02的坐标
-            success: (res) => {
-              //res.longitude 获取经度
-              //res.latitude 获取纬度
-              console.log(res);
-              resolve(res)
-            }, fail: (res) => {
-              console.log("微信获取位置失败。"+JSON.stringify(res));
-              reject("微信获取位置失败" + JSON.stringify(res))
-            }
-          });
-        }).catch((error)=>{
-          reject('微信获取位置失败：'+error)
-        })
-      }
-    })
-  }
-  function openLocation({longitude,latitude,name,address,scale= 15} = {}){
-    return new Promise((resolve, reject)=>{
-      if(getAppType() === '30'){
-        configDd().then(()=>{
-          dd.openLocation({
-            title: name,
-            address: address,
-            latitude: latitude,
-            longitude: longitude,
-            success: () => {},
-            fail: () => {},
-            complete: () => {},
-          });
-          resolve()
-        }).catch((error)=>{
-          reject('钉钉启动内置地图位置失败：'+error)
-        })
-      }else{
-        configWx().then(()=>{
-          wx.openLocation({
-            latitude: latitude,//目的地latitude
-            longitude: longitude,//目的地longitude
-            name: name,
-            address: address,
-            scale: scale//地图缩放大小，可根据情况具体调整
-          });
-          resolve()
-        }).catch((error)=>{
-          reject('微信启动内置地图失败：'+error)
-        })
-      }
-    })
-  }
-
-  // 公开API
-  return {
-    init:init,
-    scanQRCode: scanQRCode,
-    getLocation:getLocation,
-    openLocation:openLocation
-  };
-})();
-
-export default JsSDK
-
+import wx from "weixin-js-sdk";
+import * as dd from 'dingtalk-jsapi';
+import config from '../config/config'
+import {axios} from '../util/axios'
+
+let appId,agentId,corpId,appKey
+
+function init({appId:a,agentId:b,corpId:c,appKey:d}){
+  appId = a
+  agentId = b
+  corpId = c
+  appKey = d
+}
+
+
+function getAppType() {
+  let ua = navigator.userAgent.toLowerCase();
+  let isWxWork = ua.match(/WxWork/i) == 'wxwork';
+  if (isWxWork) {
+    return '20'
+  }
+
+  let isWx = ua.match(/MicroMessenger/i) == 'micromessenger';
+  if (isWx) {
+    if(agentId){//如果有agentId认为是企业微信
+      return '20'
+    }
+    return '10'
+  }
+
+  if (dd.env.platform != 'notInDingTalk') {
+    return '30'
+  }
+
+  return ''
+}
+
+function getJsConfig(){
+  let url = window.location.href.split('#')[0]
+  return new Promise((resolve, reject)=>{
+    axios.post(config.platformServerContext + '/api/weixin/getJsConfig', {
+      appType: getAppType(),
+      appId: appId,
+      agentId: agentId,
+      corpId: corpId,
+      appKey: appKey,
+      url: url
+    }).then((resp) => {
+      resolve(resp.data)
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
+
+function configWx(){
+  return new Promise((resolve, reject) =>{
+    getJsConfig().then((resp)=>{
+      wx.config({
+        debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+        appId: appId, // 必填，公众号的唯一标识
+        timestamp: resp.timestamp, // 必填，生成签名的时间戳
+        nonceStr: resp.noncestr, // 必填，生成签名的随机串
+        signature: resp.signature, // 必填，签名
+        jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','invoke','onLocationChange','previewFile'] // 必填，需要使用的JS接口列表
+        //jsApiList: ['chooseImage', 'uploadImage', 'downloadImage', 'getLocalImgData', 'openLocation', 'getLocation', 'scanQRCode', 'chooseWXPay', 'onHistoryBack','startLocationUpdateBackground','startLocationUpdate','onLocationChange','offLocationChange']   // 必填，需要使用的JS接口列表
+      });
+
+      wx.ready(() => {
+        console.log('初始化js-sdk成功');
+        resolve()
+      });
+      wx.error(res => {
+        console.log('初始化js-sdk失败' + res.errMsg);
+        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
+        reject('初始化js-sdk失败' + res.errMsg)
+      });
+    }).catch((error)=>{
+      reject('请求服务端jssdk签名失败：'+error)
+    })
+  })
+}
+
+function configDd(){
+  return new Promise((resolve, reject)=>{
+    getJsConfig().then((resp)=>{
+      //钉钉js-api配置
+      console.log("当前页面："+location.href);
+      dd.config({
+        agentId:agentId,
+        corpId: corpId,      // 必填，公众号的唯一标识
+        timeStamp: resp.timestamp,  // 必填，生成签名的时间戳
+        nonceStr: resp.noncestr,   // 必填，生成签名的随机串
+        signature: resp.signature,  // 必填，签名
+        jsApiList: [
+          'getDeviceUUID',
+          'getLocation',
+
+        ] // 必填，需要使用的jsapi列表，注意：不要带dd。
+      });
+
+      dd.ready(() => {
+        console.log('初始化钉钉 js-sdk成功');
+        resolve()
+      });
+      dd.error(res => {
+        console.log('初始化钉钉 js-sdk失败' + JSON.stringify(res));
+        console.log('友情提示：若想成功，则需通过params传参（而不是query）！！！');
+        reject('初始化钉钉 js-sdk失败' + JSON.stringify(res))
+      });
+    }).catch((error)=>{
+      reject('请求服务端jssdk签名失败：'+error)
+    })
+  })
+}
+
+let JsSDK = (function () {
+  function scanQRCode(){
+    return new Promise((resolve, reject) =>{
+      if(getAppType() === '30'){
+        dd.scan({
+          type: 'all',
+          success: (res) => {
+            console.log('钉钉扫码结果',res)
+            resolve(res.text)
+          },
+          fail: (err) => {
+            console.log('钉钉扫码失败',err)
+            reject('钉钉扫码失败：'+err)
+          },
+          complete: () => {},
+        });
+      }else{
+        configWx().then(()=>{
+          wx.scanQRCode({
+            desc: 'scanQRCode desc',
+            needResult: 1,
+            scanType: ["qrCode", "barCode"],
+            success: function (resp) {
+              console.log("微信扫码结果：",resp)
+              let result = resp.resultStr
+              resolve(result)
+            },
+            fail: function (res) {
+              console.log("失败res=>",res)
+              if (res.errMsg.indexOf('function_not_exist') > 0) {
+                reject('版本过低请升级');
+              } else {
+                reject("微信扫码失败,请联系系统管理员!");
+              }
+            }
+          })
+        }).catch((error)=>{
+          reject('微信扫码失败：'+error)
+        })
+      }
+    })
+  }
+  function getLocation(){
+    return new Promise((resolve, reject)=>{
+      if(getAppType() === '30'){
+        configDd().then(()=>{
+          dd.getLocation({
+            targetAccuracy: '200',
+            cacheTimeout: 20,
+            coordinate: '1',
+            useCache: true,
+            withReGeocode: true,
+            type: 1,
+            success: (res) => {
+              console.log('钉钉获取当前位置结果：', res)
+              resolve(res)
+            },
+            fail: (error) => {
+              console.log('钉钉获取位置失败：', error)
+              reject('钉钉获取位置失败：'+error)
+            },
+            complete: () => {},
+          })
+        }).catch((error)=>{
+          reject('钉钉获取位置失败：'+error)
+        })
+      }else{
+        configWx().then(()=>{
+          wx.getLocation({
+            type: 'gcj02', //获取gcj02的坐标
+            success: (res) => {
+              //res.longitude 获取经度
+              //res.latitude 获取纬度
+              console.log(res);
+              resolve(res)
+            }, fail: (res) => {
+              console.log("微信获取位置失败。"+JSON.stringify(res));
+              reject("微信获取位置失败" + JSON.stringify(res))
+            }
+          });
+        }).catch((error)=>{
+          reject('微信获取位置失败：'+error)
+        })
+      }
+    })
+  }
+  function openLocation({longitude,latitude,name,address,scale= 15} = {}){
+    return new Promise((resolve, reject)=>{
+      if(getAppType() === '30'){
+        configDd().then(()=>{
+          dd.openLocation({
+            title: name,
+            address: address,
+            latitude: latitude,
+            longitude: longitude,
+            success: () => {},
+            fail: () => {},
+            complete: () => {},
+          });
+          resolve()
+        }).catch((error)=>{
+          reject('钉钉启动内置地图位置失败：'+error)
+        })
+      }else{
+        configWx().then(()=>{
+          wx.openLocation({
+            latitude: latitude,//目的地latitude
+            longitude: longitude,//目的地longitude
+            name: name,
+            address: address,
+            scale: scale//地图缩放大小，可根据情况具体调整
+          });
+          resolve()
+        }).catch((error)=>{
+          reject('微信启动内置地图失败：'+error)
+        })
+      }
+    })
+  }
+
+  // 公开API
+  return {
+    init:init,
+    scanQRCode: scanQRCode,
+    getLocation:getLocation,
+    openLocation:openLocation
+  };
+})();
+
+export default JsSDK
+