zhaoxiaohai 2 лет назад
Родитель
Сommit
245c6f7c72
7 измененных файлов с 18 добавлено и 32 удалено
  1. 3 17
      app.js
  2. 2 6
      app.json
  3. 2 2
      pages/annunciate/details.js
  4. 1 1
      pages/login/modules/login.js
  5. 1 1
      pages/tabbar/message/details.js
  6. 7 3
      static/work-icon.wxss
  7. 2 2
      utils/Http.js

+ 3 - 17
app.js

@@ -6,8 +6,9 @@ App({
     onLaunch(options) {
         //小程序跳转进入
         if (options.query.userMsg) {
-            wx.setStorageSync('userMsg', JSON.parse(options.query.userMsg))
-            wx.setStorageSync('auth', JSON.parse(options.query.auth))
+            wx.setStorageSync('userMsg', JSON.parse(options.query.userMsg));
+            wx.setStorageSync('auth', JSON.parse(options.query.auth));
+            wx.setStorageSync('siteP', JSON.parse(options.query.site));
             //获取用户权限 
             this.globalData.http.basic({
                 "classname": "sysmanage.develop.userauth.userauth",
@@ -23,21 +24,6 @@ App({
                 })
                 wx.setStorageSync('userauth', res.data);
             });
-            // 查询站点数据
-            this.globalData.http.basic({
-                "classname": "webmanage.site.site",
-                "method": "querySite_Parameter",
-                "content": {}
-            }).then(res => {
-                console.log("跳转进入查询站点数据", res)
-                if (res.msg != '成功') return wx.showToast({
-                    title: res.msg,
-                    icon: "none"
-                });
-                wx.setStorageSync('siteP', res.data);
-            });
-            console.log('跳转进入', wx.getStorageSync('userMsg'))
-            console.log('跳转进入', wx.getStorageSync('auth'))
         }
     },
     initSocket() {

+ 2 - 6
app.json

@@ -5,12 +5,10 @@
         "pages/login/retrievePassword",
         "pages/tabbar/home/index",
         "pages/tabbar/mine/index",
-        "pages/tabbar/smartStore/index",
         "pages/tabbar/message/index",
         "pages/tabbar/mine/userMsg/index",
         "pages/tabbar/message/details",
         "pages/tabbar/mine/changePassword/index",
-        "pages/tabbar/smartStore/folder",
         "pages/annunciate/index",
         "pages/annunciate/details",
         "pages/promotional/index",
@@ -26,7 +24,8 @@
         "pages/group/index",
         "pages/group/select",
         "pages/tags/index",
-        "pages/tabbar/workbench/index"
+        "pages/tabbar/workbench/index",
+        "pages/mediaLibrary/index"
     ],
     "subpackages": [
         {
@@ -188,9 +187,6 @@
             {
                 "pagePath": "pages/tabbar/message/index"
             },
-            {
-                "pagePath": "pages/tabbar/smartStore/index"
-            },
             {
                 "pagePath": "pages/tabbar/mine/index"
             }

+ 2 - 2
pages/annunciate/details.js

@@ -54,9 +54,9 @@ Page({
                 detailsData: res.data,
                 videoList
             });
-            getCurrentPages().forEach(v => {
+            /* getCurrentPages().forEach(v => {
                 if (v.__route__ == 'pages/tabbar/home/index') v.queryNoticeList()
-            })
+            }) */
         });
     },
     /* 查询数据 */

+ 1 - 1
pages/login/modules/login.js

@@ -71,7 +71,7 @@ function toHome() {
     let prevPage = pages[pages.length - 2];
     if (prevPage && prevPage.__route__ == 'pages/tabbar/home/index') prevPage.refreshData();
     wx.switchTab({
-        url: '/pages/tabbar/workbench/index'
+        url: '/pages/tabbar/home/index'
     })
 }
 /* 站点数据查询 */

+ 1 - 1
pages/tabbar/message/details.js

@@ -71,7 +71,7 @@ Page({
                     document: '营销物料'
                 }
                 wx.navigateTo({
-                    url: '/pages/tabbar/smartStore/folder?item=' + JSON.stringify(item),
+                    url: '/pages/mediaLibrary/folder?item=' + JSON.stringify(item),
                 })
                 break;
             default:

+ 7 - 3
static/work-icon.wxss

@@ -1,8 +1,8 @@
 @font-face {
     font-family: "work"; /* Project id 3902307 */
-    src: url('//at.alicdn.com/t/c/font_3902307_h2gzokzadc9.woff2?t=1677073678140') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3902307_h2gzokzadc9.woff?t=1677073678140') format('woff'),
-         url('//at.alicdn.com/t/c/font_3902307_h2gzokzadc9.ttf?t=1677073678140') format('truetype');
+    src: url('//at.alicdn.com/t/c/font_3902307_837vogsih7.woff2?t=1677140175077') format('woff2'),
+         url('//at.alicdn.com/t/c/font_3902307_837vogsih7.woff?t=1677140175077') format('woff'),
+         url('//at.alicdn.com/t/c/font_3902307_837vogsih7.ttf?t=1677140175077') format('truetype');
   }
   
   .work {
@@ -13,6 +13,10 @@
     -moz-osx-font-smoothing: grayscale;
   }
   
+  .work-xiaoxigundong:before {
+    content: "\e674";
+  }
+  
   .work-shenqingdan:before {
     content: "\e686";
   }

+ 2 - 2
utils/Http.js

@@ -1,6 +1,6 @@
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
+// const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
 
 let count = null;
 class HTTP {