Explorar el Código

DD对接修改

sunlupeng hace 1 año
padre
commit
de6c05eef9
Se han modificado 5 ficheros con 51 adiciones y 30 borrados
  1. 2 2
      main.js
  2. 47 24
      pages.json
  3. 2 2
      pages/index.vue
  4. 0 2
      permission.js
  5. BIN
      static/images/oa/tongyong.png

+ 2 - 2
main.js

@@ -4,8 +4,8 @@ import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
 import { parseTime,handleTree,getFileType } from "@/utils/ruoyi";
-import VConsole from "vconsole";
-const vConsole = new VConsole();
+// import VConsole from "vconsole";
+// const vConsole = new VConsole();
 Vue.use(plugins)
 
 Vue.config.productionTip = false

+ 47 - 24
pages.json

@@ -9,7 +9,8 @@
   }, {
     "path": "pages/login",
     "style": {
-      "navigationBarTitleText": "登录"
+      "navigationBarTitleText": "登录",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/work/index",
@@ -32,112 +33,134 @@
   }, {
     "path": "pages/mine/avatar/index",
     "style": {
-      "navigationBarTitleText": "修改头像"
+      "navigationBarTitleText": "修改头像",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/info/index",
     "style": {
-      "navigationBarTitleText": "个人信息"
+      "navigationBarTitleText": "个人信息",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/info/edit",
     "style": {
-      "navigationBarTitleText": "编辑资料"
+      "navigationBarTitleText": "编辑资料",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/pwd/index",
     "style": {
-      "navigationBarTitleText": "修改密码"
+      "navigationBarTitleText": "修改密码",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/setting/index",
     "style": {
-      "navigationBarTitleText": "应用设置"
+      "navigationBarTitleText": "应用设置",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/help/index",
     "style": {
-      "navigationBarTitleText": "常见问题"
+      "navigationBarTitleText": "常见问题",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/about/index",
     "style": {
-      "navigationBarTitleText": "关于我们"
+      "navigationBarTitleText": "关于我们",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/common/webview/index",
     "style": {
-      "navigationBarTitleText": "浏览网页"
+      "navigationBarTitleText": "浏览网页",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/common/textview/index",
     "style": {
-      "navigationBarTitleText": "浏览文本"
+      "navigationBarTitleText": "浏览文本",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/oa/universal/index",
     "style": {
-      "navigationBarTitleText": "通用审批"
+      "navigationBarTitleText": "通用审批",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/entry/index",
     "style": {
-      "navigationBarTitleText": "入职审批"
+      "navigationBarTitleText": "入职审批",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/conversion/index",
     "style": {
-      "navigationBarTitleText": "转正申请"
+      "navigationBarTitleText": "转正申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/renew/index",
     "style": {
-      "navigationBarTitleText": "续签申请"
+      "navigationBarTitleText": "续签申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/turnover/index",
     "style": {
-      "navigationBarTitleText": "离职申请"
+      "navigationBarTitleText": "离职申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/leave/index",
     "style": {
-      "navigationBarTitleText": "请假申请"
+      "navigationBarTitleText": "请假申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/business/index",
     "style": {
-      "navigationBarTitleText": "出差申请"
+      "navigationBarTitleText": "出差申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/out/index",
     "style": {
-      "navigationBarTitleText": "公务外出"
+      "navigationBarTitleText": "公务外出",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/receive/index",
     "style": {
-      "navigationBarTitleText": "领用申请"
+      "navigationBarTitleText": "领用申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/purchase/index",
     "style": {
-      "navigationBarTitleText": "采购申请"
+      "navigationBarTitleText": "采购申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/expense/index",
     "style": {
-      "navigationBarTitleText": "报销申请"
+      "navigationBarTitleText": "报销申请",
+      "navigationStyle": "custom"
     }
   },{
     "path": "pages/oa/stamp/index",
     "style": {
-      "navigationBarTitleText": "用印申请"
+      "navigationBarTitleText": "用印申请",
+      "navigationStyle": "custom"
     }
   },{
 			"path": "pages/popleSelect/choose",
 			"style": {
-				"navigationBarTitleText": "通讯录"
+				"navigationBarTitleText": "通讯录",
+      "navigationStyle": "custom"
 			}
 		}],
   "tabBar": {
@@ -170,7 +193,7 @@
   },
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "RuoYi",
+    "navigationBarTitleText": "uni-app",
     "navigationBarBackgroundColor": "#FFFFFF"
   }
 }

+ 2 - 2
pages/index.vue

@@ -70,9 +70,9 @@
         <uni-grid :column="4" :showBorder="false">
           <uni-grid-item v-for="(childItem, index) in item.children" :key="index">
             <view class="grid-item-box" @click="handleGrid(childItem)">
-              <svg-icon :id="childItem.icon" :name="childItem.icon" :width="30" :height="30"></svg-icon>
-			  <!-- <svg-icon id="yingtao" name="yingtao" :width="30" :height="30"></svg-icon> -->
+              <!-- <svg-icon :id="childItem.icon" :name="childItem.icon" :width="30" :height="30"></svg-icon> -->
               <!-- <uni-icons type="person-filled" size="30"></uni-icons> -->
+              <img :src="'./../static/images/oa/' + childItem.icon + '.png'" width="30">
               <text class="text">{{ childItem.name }}</text>
             </view>
           </uni-grid-item>

+ 0 - 2
permission.js

@@ -35,7 +35,6 @@ let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
 list.forEach(item => {
   uni.addInterceptor(item, {
     invoke(to) {
-      debugger
       let corpId = getQueryString();
       console.log(corpId);
       if (getAccessToken()) {
@@ -45,7 +44,6 @@ list.forEach(item => {
         return true
       } else {
         if (dd.env.platform !== "notInDingTalk") {
-          debugger
           return new Promise((resolve, reject) => {
             dd.ready(function () {
               // 唤起授权--统一授权套件SDK

BIN
static/images/oa/tongyong.png