Merge branch 'main' of https://gitlab.33.cn/HF_web/OKR

deploy.sh

-#!/usr/bin/env bash
 
-
-tar -czvf kor.tar kor
+tar -czf kor.tar kor
 scp kor.tar root@121.40.18.70:/usr/share/nginx/html/kor.tar
 rm -rf kor.tar
-ssh root@121.40.18.70 'cd /usr/share/nginx/html && rm -rf kor && tar -xzvf kor.tar && rm -rf kor.tar && /usr/sbin/nginx -s reload'
\ No newline at end of file
+ssh root@121.40.18.70 'cd /usr/share/nginx/html && rm -rf kor && tar -xzf kor.tar && rm -rf kor.tar'
+echo '👉 http://121.40.18.70:8886/'
\ No newline at end of file

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "deploy": "vue-cli-service build&&bash ./deploy.sh",
+    "deploy": "npm run build && bash deploy.sh",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
@@ -16,6 +16,7 @@
     "bitcoinjs-lib": "^5.2.0",
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
+    "dsbridge": "^3.1.4",
     "enc-utils": "^3.0.0",
     "mockjs": "^1.1.0",
     "register-service-worker": "^1.7.1",
@@ -50,7 +51,7 @@
     "node-sass": "^4.14.1",
     "postcss": "^7.0.36",
     "sass-loader": "^7.3.1",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4",
+    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.9",
     "typescript": "~4.1.5",
     "vue-template-compiler": "^2.6.11"
   }

src/main.ts

@@ -7,12 +7,14 @@ import "tailwindcss/tailwind.css"
 import './style.less'
 import utils from '@/util'
 import service from './service'
+import dsbridge from 'dsbridge'
 import { Dialog, Toast, Notify }from 'vant'
 Vue.config.productionTip = false
 
+
 Vue.use(Dialog).use(Toast).use(Notify)
 Vue.use(utils).use(service)
-
+Vue.prototype.$dsbridge = dsbridge
 new Vue({
   router,
   store,

src/shimes-app.d.ts

@@ -2,12 +2,13 @@ import Vue from 'vue'
 import {service} from './service'
 import { UTIL_INTERFACE } from '@/util/util.types'
 import VueRouter, { Route } from 'vue-router'
-
+import dsbridge from 'dsbridge'
 type Service = typeof service
-
+type DSBridge = typeof dsbridge
 declare module 'vue/types/vue' {
     interface Vue {
         $service: Service,
+        $dsbridge:DSBridge,
         $router: VueRouter,
         $util:UTIL_INTERFACE
     }

src/util/Bridge/index.ts

+// 签名方法：signAuth（同步方法）
+// 获取用户信息：getUserInfo（同步方法）
+// 扫描二维码：scanCode 
+// 打开企业联系人详情页面：openCompanyUserInfo 参数：联系人地址，企业id
+
+import dsbridge from 'dsbridge'
+
+enum BridgeMethods{
+    SIGN_AUTH="signAuth",
+    GET_USERINFO='getUserInfo',
+    SCAN_CODE="scanCode",
+    OPEN_COMPANY_USER_INFO = 'openCompanyUserInfo',
+    Back='back'
+}
+
+/**
+ * 获取用户的资料
+ * @returns 
+ */
+export function getUserInfo(){
+    let data = dsbridge.call(BridgeMethods.GET_USERINFO,{},(res)=>{
+        return res
+    })
+    return data
+}
+
+/**
+ * 获取签名
+ * @returns 
+ */
+ export function signAuth(){
+    let data = dsbridge.call(BridgeMethods.SIGN_AUTH,{},(res)=>{
+        return res
+    })
+    return data
+}
+
+
+/**
+ * 调用相机进行扫码
+ * @returns 
+ */
+export function scanCode(){
+    let data = dsbridge.call(BridgeMethods.SCAN_CODE,{},(res)=>{
+        return res
+    })
+    return data
+}
+
+
+
+/**
+ * 用于导航
+ * @returns 
+ */
+ export function goBack(){
+    let data = dsbridge.call(BridgeMethods.Back,{},(res)=>{
+        return res
+    })
+    return data
+}
+
+
+/**
+ * 企业联系人详情页面
+ * @returns 
+ */
+ export function openCompanyUserInfo(address: string){
+    let data = dsbridge.call(BridgeMethods.OPEN_COMPANY_USER_INFO,{
+        address
+    },(res)=>{
+        return res
+    })
+    return data
+}
+
+
+
+export default{
+    getUserInfo,
+    signAuth,
+    scanCode,
+    openCompanyUserInfo
+}
\ No newline at end of file

src/views/team/team-frame.vue

@@ -73,12 +73,10 @@ export default Vue.extend({
     this.showRadio = this.$route.query.showRadio === '1'
   },
   mounted(){
-    let res = this.$service.department.getSub({
-      entId:'166910771849072640',
-      parentId:'166910771849072641'
-    })
-    console.log(res);
-    
+    // let res = this.$service.department.getSub({
+    //   entId:'166910771849072640',
+    //   parentId:'166910771849072641'
+    // })
   },
   data() {
     return {