Merge branch '页面修改' into 测试

components/Yl_Tabbar/index.js

@@ -27,10 +27,16 @@ Component({
     },
     observers: {
         'list': function (numberA, numberB) {
+            numberA = numberA.map(v => {
+                v.classnames = (v.icon.split("-")[0] == 'color' ? 't-icon ' : 'iconfont ') + v.icon
+                console.log(v.classnames)
+                return v
+            })
             if (numberA.length >= 5) {
                 let showList = numberA.splice(0, 3);
                 showList.push({
-                    icon: "icon-gengduo",
+                    classnames: "t-icon color-gengduo",
+                    icon: "color-gengduo",
                     label: "更多"
                 })
                 this.setData({

components/Yl_Tabbar/index.wxml

@@ -1,7 +1,7 @@
 <view class="tabbar" style="padding-bottom: {{safeAreaBot}}rpx;">
     <navigator url="#" class="tabbar-item" wx:for="{{showList}}" wx:key="index" data-item="{{item}}" bindtap="callback">
         <view class="icon" wx:if="{{item.icon}}">
-            <text class="iconfont {{item.icon}}" />
+            <text class="{{item.classnames}}" />
         </view>
         <view wx:else class="num line-1">{{item.num}}</view>
         <view class="label line-1">{{language[item.label]||item.label}}</view>

packageA/orderForm/index.js

@@ -41,13 +41,19 @@ Page({
         }]
     },
     onLoad(options) {
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
         this.setData({
             userrole: wx.getStorageSync('userrole')
         })
-        this.getList()
+        if (options.stuta) {
+            this.setData({
+                active: options.stuta == '交期待确认' ? '待确认' : options.stuta
+            });
+        } else {
+            this.getList(true)
+        }
         this.getBrand()
         this.getDomain()
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     /* 处理筛选 */
     handleFilter({
@@ -101,7 +107,7 @@ Page({
     /* 切换tabs */
     tabsChange(e) {
         let status = "";
-        switch (e.detail.title) {
+        switch (e.detail.name) {
             case '全部':
                 status = "";
                 break;
@@ -109,11 +115,11 @@ Page({
                 status = "交期待确认";
                 break;
             default:
-                status = e.detail.title
+                status = e.detail.name
                 break;
         }
         this.setData({
-            active: e.detail.index,
+            active: e.detail.title,
             "content.where.status": status
         });
         this.getList(true);

packageA/orderForm/index.wxml

@@ -7,7 +7,7 @@
     <van-tab name="预提交" title="{{language['预提交']||'预提交'}}" />
     <van-tab name="提交" title="{{language['提交']||'提交'}}" />
     <van-tab name="待确认" title="{{language['待确认']||'待确认'}}" />
-    <van-tab name="交期确" title="{{language['交期确认']||'交期确认'}}" />
+    <van-tab name="交期确认" title="{{language['交期确认']||'交期确认'}}" />
     <van-tab name="审核" title="{{language['审核']||'审核'}}" />
     <van-tab name="关闭" title="{{language['关闭']||'关闭'}}" />
 </van-tabs>

pages/tabbar/message/index.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {
+        "van-tag": "@vant/weapp/tag/index"
     },
     "navigationBarTitleText": "信息"
 }

pages/tabbar/message/index.scss

@@ -1,5 +1,3 @@
-// @import '/static/unread.wxss';
-
 .tab-active-class {
     color: var(--assist) !important;
     font-size: 28rpx !important;
@@ -13,17 +11,17 @@
     min-height: 194rpx;
     width: 690rpx;
     box-sizing: border-box;
-    border-radius: 16rpx;
+    border-radius: 8rpx;
     overflow: hidden;
     background: #ffffff;
     margin: 0 auto 20rpx;
-    padding: 30rpx;
+    padding: 36rpx 40rpx 20rpx 40rpx;
 
     .title {
         height: 40rpx;
-        font-size: 28rpx;
+        font-size: 30rpx;
         font-family: PingFang SC-Medium, PingFang SC;
-        font-weight: 500;
+        font-weight: 700;
         color: #333333;
     }
 
@@ -37,14 +35,21 @@
     }
 
     .time {
-        height: 28rpx;
+        display: flex;
+        align-items: center;
         font-size: 20rpx;
         font-family: PingFang SC-Regular, PingFang SC;
-        color: #999999;
+        color: #BCBCBC;
         margin-top: 16rpx;
 
         .tag {
             margin-right: 10rpx;
+            font-size: 24rpx;
+            color: #1989FA;
+            border-radius: 4rpx;
+            background: rgba(56,116,246,0.1);
+            line-height: 40rpx;
+            padding: 0 20rpx;
         }
     }
 
@@ -54,7 +59,7 @@
         height: 16rpx;
         background: var(--error);
         border-radius: 50%;
-        top: 6rpx;
-        right: 6rpx;
+        top: 0;
+        right: 0;
     }
 }

pages/tabbar/message/index.wxml

@@ -8,7 +8,9 @@
         <view class="title line-1">{{item.title}}</view>
         <view class="content line-3">{{item.message}}</view>
         <view class="time">
-            <van-tag wx:if="{{item.name}}" class="tag" plain type="primary">{{language[item.name]||item.name}}</van-tag>{{item.createdate}}
+            <view class="tag" wx:if="{{item.name}}">{{language[item.name]||item.name}}</view>
+            <view style="flex: 1;"></view>
+            {{item.createdate}}
         </view>
         <view wx:if="{{item.isread=='0'}}" class="unread-item" />
     </navigator>

pages/tabbar/mine/index.js

@@ -9,6 +9,7 @@ Page({
 		userMsg: {},
 		pathList: [], //功能权限
 		teamAuth: '', //团队管理权限列表 JSON字符串 用于传递
+		orders: []
 	},
 	onLoad(options) {
 		this.queryUserMsg();
@@ -40,6 +41,10 @@ Page({
 				pathList
 			})
 		};
+
+		this.setData({
+			isWorderform: getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['E-订单'], ['销售管理'])[0].apps.some(v => v.name == "worderform")
+		})
 	},
 	/* 查询用户信息 */
 	queryUserMsg() {
@@ -62,6 +67,39 @@ Page({
 	},
 	onShow() {
 		this.getTabBar().init();
+		if (this.data.isWorderform) _Http.basic({
+			"id": 2025030613432602,
+			"content": {},
+			"languagecode": "ZH",
+		}).then(res => {
+			console.log("获取订单数量", res)
+			if (res.code != '1') return wx.showToast({
+				title: res.msg,
+				icon: "none"
+			})
+			let list = [{
+				key: "新建",
+				icon: "icon-xinjian"
+			}, {
+				key: "提交",
+				icon: "icon-tijiao1"
+			}, {
+				key: "交期待确认",
+				icon: "icon-jiaoqidaiqueren"
+			}, {
+				key: "交期确认",
+				icon: "icon-jiaoqiqueren"
+			}, {
+				key: "审核",
+				icon: "icon-shenhe1"
+			}]
+			this.setData({
+				orders: list.map(v => {
+					v.badge = res.data[v.key]
+					return v
+				})
+			})
+		})
 	},
 	/* 退出登录 */
 	outLogin() {

pages/tabbar/mine/index.json

@@ -1,5 +1,7 @@
 {
     "navigationBarTitleText": "我的",
     "usingComponents": {
+        "van-grid": "@vant/weapp/grid/index",
+        "van-grid-item": "@vant/weapp/grid-item/index"
     }
 }

pages/tabbar/mine/index.scss

@@ -46,15 +46,131 @@
             }
         }
     }
+
+    /* 行动力 */
+    .display-data {
+        display: flex;
+        height: 182rpx;
+        background: linear-gradient(90deg, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, .5) 100%);
+
+        &_l,
+        &_r {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            height: 100%;
+        }
+
+        &_l {
+            width: 320rpx;
+
+            .first-line {
+                height: 66rpx;
+                line-height: 66rpx;
+                font-size: 48rpx;
+                font-family: PingFang SC-Bold, PingFang SC;
+                font-weight: bold;
+            }
+
+            .tow-line {
+                height: 40rpx;
+                line-height: 40rpx;
+                font-size: 28rpx;
+                margin-top: 16rpx;
+            }
+        }
+
+        &_r {
+            flex: 1;
+            font-size: 28rpx;
+            line-height: 40rpx;
+
+            .tow-line {
+                margin-top: 25rpx;
+            }
+        }
+    }
+}
+
+.orderForm {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-left: 40rpx;
+    padding-right: 26rpx;
+    width: 100vw;
+    height: 90rpx;
+    box-sizing: border-box;
+    background-color: #fff;
+
+    .left {
+        .work {
+            color: #3874F6;
+            margin-right: 18rpx;
+        }
+
+        font-family: PingFang SC,
+        PingFang SC;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #262626;
+    }
+
+    .right {
+        font-family: PingFang SC, PingFang SC;
+        font-size: 28rpx;
+        color: #999999;
+    }
+}
+
+.orders {
+    display: flex;
+    width: 100vw;
+    background-color: #fff;
+
+    .stuta {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding-top: 20rpx;
+        padding-bottom: 18rpx;
+        box-sizing: border-box;
+
+        .iconfont {
+            position: relative;
+            font-size: 44rpx;
+            color: #666;
+
+            .badge {
+                position: absolute;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                top: -15rpx;
+                right: -20rpx;
+                min-width: 30rpx;
+                height: 30rpx;
+                background: #FF3B30;
+                border-radius: 24rpx;
+                font-size: 20rpx;
+                color: #FFFFFF;
+            }
+        }
+
+        .text {
+            font-size: 20rpx;
+            color: #333333;
+            margin-top: 8rpx;
+        }
+    }
 }
 
+
 .operating {
-    width: 690rpx;
-    margin: 0 auto;
     background-color: #fff;
-    margin-top: 40rpx;
-    border-radius: 16rpx;
-    overflow: hidden;
+    margin-top: 20rpx;
 
     .item {
         width: 100%;
@@ -130,12 +246,19 @@
     }
 }
 
-/* 退出登录 */
-.out-login {
-    width: 500rpx;
-    height: 90rpx;
-    border-radius: 90rpx !important;
-    font-size: 28rpx;
-    font-family: PingFang SC-Regular, PingFang SC;
-    color: #333333 !important;
+.but {
+    position: fixed;
+    bottom: 200rpx;
+    width: 100vw;
+    text-align: center;
+
+    /* 退出登录 */
+    .out-login {
+        width: 500rpx;
+        height: 90rpx;
+        border-radius: 90rpx !important;
+        font-size: 28rpx;
+        font-family: PingFang SC-Regular, PingFang SC;
+        color: #333333 !important;
+    }
 }

pages/tabbar/mine/index.wxml

@@ -1,5 +1,5 @@
 <view class="user-box">
-    <navigator url="#" class="user-con" bindtap="changeUserMsg">
+    <navigator url="#" class='user-con' hover bindtap="changeUserMsg">
         <van-image image-class="v-img" round width="128rpx" height="128rpx" src="{{userMsg.attinfos[0].url||'/static/image/user.png'}}" />
         <view class="user-msg">
             <view class="user-name line-1">
@@ -12,19 +12,27 @@
         <van-icon size='40rpx' name="arrow" />
     </navigator>
 </view>
-
-<view class="operating"><!-- wx:if="{{userMsg.enterprise.sys_enterpriseid}}" -->
-    <navigator class="item" url="/pages/tabbar/mine/address/index?id={{userMsg.enterprise.sys_enterpriseid}}">
-        <view class="con">
-            <view class="label">
-                <text class="iconfont icon-a-wodemendianxinxidizhi" style="color: #085CDF;" />
-                {{language['我的地址']||'我的地址'}}
-            </view>
-            <view class="item-right">
-                <van-icon size='30rpx' name="arrow" />
-            </view>
+<block wx:if="{{isWorderform}}">
+    <navigator class="orderForm" url="/packageA/orderForm/index">
+        <view class="left">
+            <text class="work work-dingdan"></text>
+            我的订单
+        </view>
+        <view class="right">全部
+            <van-icon size='30rpx' name="arrow" />
         </view>
     </navigator>
+
+    <view class="orders" wx:if="{{orders.length}}">
+        <navigator class="stuta" url="/packageA/orderForm/index?stuta={{item.key}}" wx:for="{{orders}}" wx:key="key" badge="{{item.badge}}">
+            <view class="iconfont {{item.icon}}">
+                <view class="badge" style="padding: {{item.badge>9?'0 4rpx':''}};" wx:if="{{item.badge}}">{{item.badge>99?'99+':item.badge}}</view>
+            </view>
+            <view class="text">{{language[item.key]||item.key}}</view>
+        </navigator>
+    </view>
+</block>
+<view class='operating' hover>
     <navigator class="item" url="{{item.name=='团队管理'?item.path+'?auth='+teamAuth:item.path}}" wx:for="{{pathList}}">
         <view class="con">
             <view class="label">
@@ -36,7 +44,6 @@
             </view>
         </view>
     </navigator>
-
     <navigator class="item" url="#" bindtap="bindingWechat">
         <view class="con">
             <view class="label">
@@ -53,19 +60,21 @@
             </view>
         </view>
     </navigator>
-    <!-- 	<navigator wx:if="{{userMsg.iswechatbinding}}" class="item" url="#" bindtap="bindingOfficialAccounts">
-		<view class="con">
-			<view class="label">
-				<text class="iconfont icon-a-wodebangdingweixin" style="color: var(--success);" />
-				消息通知设置
-			</view>
-			<view class="item-right">
-				<van-icon size='30rpx' name="arrow" />
-			</view>
-		</view>
-	</navigator> -->
+    <navigator wx:if="{{userMsg.iswechatbinding}}" class="item" url="#" bindtap="bindingOfficialAccounts">
+        <view class="con">
+            <view class="label">
+                <text class="iconfont icon-a-wodebangdingweixin" style="color: var(--success);" />
+                {{language['消息通知设置']||'消息通知设置'}}
+            </view>
+            <view class="item-right">
+                <van-icon size='30rpx' name="arrow" />
+            </view>
+        </view>
+    </navigator>
 </view>
-<view style="width: 100vw;text-align: center;margin-top: 200rpx;">
-    <van-button custom-class='out-login' color="#CCC" bindtap="outLogin" plain>{{language['退出登录']||'退出登录'}}</van-button>
+<view class="but">
+    <van-button custom-class='out-login' color="#CCC" bindtap="outLogin" plain>
+        {{language['退出登录']||'退出登录'}}
+    </van-button>
 </view>
 <view style="height: 140rpx;" />

project.private.config.json

@@ -7,16 +7,6 @@
   },
   "libVersion": "3.7.1",
   "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "逾期账款",
-          "pathName": "packageA/accountReceivable/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
+    "miniprogram": {}
   }
 }

static/font-icon.wxss

@@ -1,73 +1,221 @@
 @import "/utils/work/work-icon.wxss";
+@import "./iconfont-weapp-icon.wxss";
 @import "./stylesheet.wxss";
 
 .iconfont {
-	font-family: "iconfont" !important;
-	font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tijiao1:before {
+  content: "\e615";
+}
 
-.icon-gongzuohuibao:before {
-  content: "\e601";
+.icon-jiaoqiqueren:before {
+  content: "\e619";
 }
 
-.icon-a-wodemendianxinxidizhi:before {
-  content: "\e64b";
+.icon-xinjian:before {
+  content: "\e625";
 }
 
-.icon-a-biaoqianlanzhiku:before {
-  content: "\e608";
+.icon-shenhe1:before {
+  content: "\e661";
 }
 
-.icon-webqiyeshuiyintupian:before {
-  content: "\e671";
+.icon-jiaoqidaiqueren:before {
+  content: "\e70b";
 }
 
-.icon-gouwuche:before {
-  content: "\e680";
+.icon-yuyin:before {
+  content: "\e60c";
 }
 
-.icon-gongjuchaxun:before {
-  content: "\e681";
+.icon-huifu1:before {
+  content: "\e709";
 }
 
-.icon-a-shouyeshujugaikuangzhanshishuju:before {
-  content: "\e64e";
+.icon-zhongzhi:before {
+  content: "\e70a";
 }
 
-.icon-daoruxialajiantou:before {
-  content: "\e682";
+.icon-quxiaozanhuan:before {
+  content: "\e704";
 }
 
-.icon-niandu:before {
-  content: "\e693";
+.icon-zanhuan:before {
+  content: "\e708";
 }
 
-.icon-zanwushuju:before {
-  content: "\e652";
+.icon-shangchuan:before {
+  content: "\e707";
 }
 
-.icon-a-fanshenhetuihui:before {
-  content: "\e6c7";
+.icon-bianji2:before {
+  content: "\e705";
 }
 
-.icon-a-baobeibohuituihui:before {
-  content: "\e6c8";
+.icon-shanchu1:before {
+  content: "\e706";
 }
 
-.icon-tijiao:before {
-  content: "\e6c9";
+.icon-guojihua:before {
+  content: "\e703";
 }
 
-.icon-tijiaobaobei:before {
-  content: "\e6ca";
+.icon-zhuanhuashenhe:before {
+  content: "\e701";
 }
 
-.icon-shenhe:before {
-  content: "\e6cb";
+.icon-jiangxu3:before {
+  content: "\e700";
+}
+
+.icon-shengxu3:before {
+  content: "\e702";
+}
+
+.icon-zhongxuan:before {
+  content: "\e6ff";
+}
+
+.icon-wancheng:before {
+  content: "\e6fd";
+}
+
+.icon-qingkong:before {
+  content: "\e6fe";
+}
+
+.icon-paichuxiangmulishishuju:before {
+  content: "\e6fc";
+}
+
+.icon-yingxiaofeiyongmingxi:before {
+  content: "\e6fb";
+}
+
+.icon-shujutongji:before {
+  content: "\e6fa";
+}
+
+.icon-huifu:before {
+  content: "\e6f9";
+}
+
+.icon-baocunlianxiren:before {
+  content: "\e6f8";
+}
+
+.icon-xiangmubaobeikualingyuxianzhi:before {
+  content: "\e6f6";
+}
+
+.icon-bodadianhua1:before {
+  content: "\e6f7";
+}
+
+.icon-jiangxu2:before {
+  content: "\e6f4";
+}
+
+.icon-shengxu2:before {
+  content: "\e6f5";
+}
+
+.icon-fuhe:before {
+  content: "\e6f3";
+}
+
+.icon-fanfuhe:before {
+  content: "\e6f2";
+}
+
+.icon-tejiabaojiashenpi:before {
+  content: "\e6f1";
+}
+
+.icon-tongbuhezuoxieyi:before {
+  content: "\e6f0";
+}
+
+.icon-quxiaoquanping_o:before {
+  content: "\e6ef";
+}
+
+.icon-xiangmuzhibiaofenleibili:before {
+  content: "\e6ee";
+}
+
+.icon-shenheshouquan:before {
+  content: "\e6ea";
+}
+
+.icon-tijiaobaobei1:before {
+  content: "\e6eb";
+}
+
+.icon-baobeishenhe:before {
+  content: "\e6ec";
+}
+
+.icon-faqishouquan:before {
+  content: "\e6ed";
+}
+
+.icon-kehu1:before {
+  content: "\e6e7";
+}
+
+.icon-xiangmu:before {
+  content: "\e6e8";
+}
+
+.icon-yewuyuan:before {
+  content: "\e6e9";
+}
+
+.icon-xiangxiazhankai:before {
+  content: "\e8f2";
+}
+
+.icon-xiangshangshouqi:before {
+  content: "\e8f5";
+}
+
+.icon-gouwuche:before {
+  content: "\e6e6";
+}
+
+.icon-gongzuotai-xuanzhong:before {
+  content: "\e6e4";
+}
+
+.icon-gongzuotai-weixuanzhong:before {
+  content: "\e6e5";
+}
+
+.icon-zuijinshiyong:before {
+  content: "\e6df";
+}
+
+.icon-tongyong:before {
+  content: "\e6e0";
+}
+
+.icon-E-dingdan:before {
+  content: "\e6e1";
+}
+
+.icon-CRM:before {
+  content: "\e6e2";
+}
+
+.icon-E-fuwu:before {
+  content: "\e6e3";
 }
 
 .icon-tabdizhi:before {
@@ -146,92 +294,100 @@
   content: "\e6de";
 }
 
-.icon-a-wodemima:before {
-  content: "\e651";
+.icon-a-fanshenhetuihui:before {
+  content: "\e6c7";
 }
 
-.icon-a-wodetuanduiguanli:before {
-  content: "\e640";
+.icon-a-baobeibohuituihui:before {
+  content: "\e6c8";
 }
 
-.icon-a-wodeguanyuyingyong:before {
-  content: "\e646";
+.icon-tijiao:before {
+  content: "\e6c9";
 }
 
-.icon-a-wodebangdingweixin:before {
-  content: "\e650";
+.icon-tijiaobaobei:before {
+  content: "\e6ca";
 }
 
-.icon-shouhuo:before {
-  content: "\e677";
+.icon-shenhe:before {
+  content: "\e6cb";
 }
 
-.icon-dingdan:before {
-  content: "\e678";
+.icon-gonghaixiansuo:before {
+  content: "\e6c6";
 }
 
-.icon-zhanghu:before {
-  content: "\e679";
+.icon-jingzhengduishou:before {
+  content: "\e6c4";
 }
 
-.icon-kaipiao:before {
-  content: "\e67a";
+.icon-shichanghuodong:before {
+  content: "\e6c5";
 }
 
-.icon-tuifan:before {
-  content: "\e67b";
+.icon-chakanshijuan:before {
+  content: "\e6c2";
 }
 
-.icon-shangcheng:before {
-  content: "\e67c";
+.icon-kaoshi:before {
+  content: "\e6c3";
 }
 
-.icon-shujuchaxun:before {
-  content: "\e67d";
+.icon-xuexizuji:before {
+  content: "\e6c0";
 }
 
-.icon-cuxiaohuodong:before {
-  content: "\e67e";
+.icon-kaoshixuexi:before {
+  content: "\e6c1";
 }
 
-.icon-yejimubiao:before {
-  content: "\e67f";
+.icon-xiaoshouxiansuogenjinmoshi:before {
+  content: "\e6bf";
 }
 
-.icon-a-biaoqianlanshouyexuanzhong:before {
-  content: "\e606";
+.icon-kehu:before {
+  content: "\e6ba";
 }
 
-.icon-a-biaoqianlanxiaoxi:before {
-  content: "\e609";
+.icon-hetong:before {
+  content: "\e6bb";
 }
 
-.icon-a-biaoqianlanwode:before {
-  content: "\e62a";
+.icon-xiangmubaojia:before {
+  content: "\e6bc";
 }
 
-.icon-a-biaoqianlanwodexuanzhong:before {
-  content: "\e643";
+.icon-gonghaikehu:before {
+  content: "\e6bd";
 }
 
-.icon-a-biaoqianlanxiaoxixuanzhong:before {
-  content: "\e64a";
+.icon-xiangmushangji:before {
+  content: "\e6be";
 }
 
-.icon-E-dingdanxitong:before {
-  content: "\e675";
+.icon-biaoqian:before {
+  content: "\e6b9";
 }
 
-.icon-a-sousuolansousuo:before {
-  content: "\e621";
+.icon-tianjiakuaijie-mian:before {
+  content: "\e6b7";
 }
 
-.icon-dibu-bianji:before {
-  content: "\e69c";
+.icon-tianjiakuaijie-xian:before {
+  content: "\e6b8";
 }
 
-.icon-guanlian-shanchu:before {
-  content: "\e6ab";
+.icon-fuzeren:before {
+  content: "\e6b1";
+}
+
+.icon-sousuo-mian:before {
+  content: "\e6b2";
+}
+
+.icon-gengduo:before {
+  content: "\e6b3";
 }
 
 .icon-shaixuan:before {
@@ -244,4 +400,652 @@
 
 .icon-jiangxu1:before {
   content: "\e6b6";
-}
+}
+
+.icon-dibu-chehui:before {
+  content: "\e69e";
+}
+
+.icon-dibu-jieshu:before {
+  content: "\e69f";
+}
+
+.icon-dibu-fenxiang:before {
+  content: "\e6a0";
+}
+
+.icon-dibu-chengjiao:before {
+  content: "\e6a1";
+}
+
+.icon-dibu-tuihui:before {
+  content: "\e6a2";
+}
+
+.icon-dibu-diudan:before {
+  content: "\e6a3";
+}
+
+.icon-dibu-genjin:before {
+  content: "\e6a4";
+}
+
+.icon-dibu-genghuanjingxiaoshang:before {
+  content: "\e6a5";
+}
+
+.icon-guanlian-fuzhi:before {
+  content: "\e6a6";
+}
+
+.icon-guanlian-bodadianhua:before {
+  content: "\e6a7";
+}
+
+.icon-tabfujian:before {
+  content: "\e6a8";
+}
+
+.icon-tabxiangxixinxi:before {
+  content: "\e6a9";
+}
+
+.icon-dibu-zuofei:before {
+  content: "\e6aa";
+}
+
+.icon-guanlian-shanchu:before {
+  content: "\e6ab";
+}
+
+.icon-guanlian-bianji:before {
+  content: "\e6ac";
+}
+
+.icon-tabcaozuojilu:before {
+  content: "\e6ad";
+}
+
+.icon-dibu-zhuanhuan:before {
+  content: "\e6ae";
+}
+
+.icon-dibu-wuxiao:before {
+  content: "\e6af";
+}
+
+.icon-tabgenjindongtai:before {
+  content: "\e6b0";
+}
+
+.icon-dibu-bianji:before {
+  content: "\e69c";
+}
+
+.icon-dibu-biangengchengjiaozhuangtai:before {
+  content: "\e69d";
+}
+
+.icon-tousu:before {
+  content: "\e699";
+}
+
+.icon-tonggao:before {
+  content: "\e69a";
+}
+
+.icon-renwu:before {
+  content: "\e69b";
+}
+
+.icon-meitiku:before {
+  content: "\e694";
+}
+
+.icon-bangzhu:before {
+  content: "\e695";
+}
+
+.icon-xiaoxi:before {
+  content: "\e696";
+}
+
+.icon-tongxunlu:before {
+  content: "\e697";
+}
+
+.icon-tibao:before {
+  content: "\e698";
+}
+
+.icon-niandu:before {
+  content: "\e693";
+}
+
+.icon-biaoti:before {
+  content: "\e692";
+}
+
+.icon-xiaochengxu_qunzu:before {
+  content: "\e691";
+}
+
+.icon-xiaochengxutongxunlu:before {
+  content: "\e68c";
+}
+
+.icon-tianjiaqunzu:before {
+  content: "\e68f";
+}
+
+.icon-tianjialianxiren:before {
+  content: "\e690";
+}
+
+.icon-xiaochengxu_xiaoshoumubiao:before {
+  content: "\e68d";
+}
+
+.icon-xiaochengxu_xiaoshouyuce:before {
+  content: "\e68e";
+}
+
+.icon-zidingyiqunzu:before {
+  content: "\e68b";
+}
+
+.icon-xitongqunzu:before {
+  content: "\e68a";
+}
+
+.icon-qunzu:before {
+  content: "\e687";
+}
+
+.icon-shanchu:before {
+  content: "\e688";
+}
+
+.icon-shouji:before {
+  content: "\e689";
+}
+
+.icon-bianji1:before {
+  content: "\e685";
+}
+
+.icon-quxiao:before {
+  content: "\e686";
+}
+
+.icon-mobantubiao:before {
+  content: "\e684";
+}
+
+.icon-daoruxialajiantou:before {
+  content: "\e682";
+}
+
+.icon-daoru:before {
+  content: "\e683";
+}
+
+.icon-a-webmeitikuweixuanzhong:before {
+  content: "\e680";
+}
+
+.icon-a-webmeitikuxuanzhong:before {
+  content: "\e681";
+}
+
+.icon-xiaochengxu_yingxiaowuliaoxuanzhong:before {
+  content: "\e67a";
+}
+
+.icon-jiangxu:before {
+  content: "\e679";
+}
+
+.icon-shengxu1:before {
+  content: "\e67c";
+}
+
+.icon-bianji:before {
+  content: "\e67d";
+}
+
+.icon-genjin:before {
+  content: "\e67e";
+}
+
+.icon-zhuanyi:before {
+  content: "\e67f";
+}
+
+.icon-bodadianhua:before {
+  content: "\e67b";
+}
+
+.icon-xiaoshouxiansuo:before {
+  content: "\e678";
+}
+
+.icon-webshoucang:before {
+  content: "\e677";
+}
+
+.icon-webweishoucang:before {
+  content: "\e676";
+}
+
+.icon-a-yingxiaowuliaofuzhi:before {
+  content: "\e675";
+}
+
+.icon-webfuzhi:before {
+  content: "\e674";
+}
+
+.icon-webdaochu:before {
+  content: "\e673";
+}
+
+.icon-webshanchutupian:before {
+  content: "\e65b";
+}
+
+.icon-webmeitiku:before {
+  content: "\e656";
+}
+
+.icon-webshijianqujian:before {
+  content: "\e672";
+}
+
+.icon-webdenglufangshi:before {
+  content: "\e662";
+}
+
+.icon-webxialaxuanxiangjiantou:before {
+  content: "\e66f";
+}
+
+.icon-webmimaqiangzhiyaoqiu:before {
+  content: "\e670";
+}
+
+.icon-webqiyeshuiyintupian:before {
+  content: "\e671";
+}
+
+.icon-webjiangxu:before {
+  content: "\e66e";
+}
+
+.icon-webtousuguanli:before {
+  content: "\e664";
+}
+
+.icon-webshangxueyuan:before {
+  content: "\e665";
+}
+
+.icon-webtonggaoguanli:before {
+  content: "\e666";
+}
+
+.icon-webtibaoguanli:before {
+  content: "\e667";
+}
+
+.icon-webyingxiaowuliao:before {
+  content: "\e668";
+}
+
+.icon-webzhandianshezhi:before {
+  content: "\e669";
+}
+
+.icon-webzuzhijiagou:before {
+  content: "\e66a";
+}
+
+.icon-webyingxiaozuzhiguanli:before {
+  content: "\e66b";
+}
+
+.icon-webyonghuguanli:before {
+  content: "\e66c";
+}
+
+.icon-webtuiguangsucai:before {
+  content: "\e66d";
+}
+
+.icon-webfanhui:before {
+  content: "\e663";
+}
+
+.icon-a-webgengduo:before {
+  content: "\e654";
+}
+
+.icon-a-webbaobiaozhongxinxuanzhong:before {
+  content: "\e655";
+}
+
+.icon-a-webgongzuotaixuanzhong:before {
+  content: "\e657";
+}
+
+.icon-a-webbaobiaozhongxinweixuanzhong:before {
+  content: "\e658";
+}
+
+.icon-a-webxiaoxixuanzhong:before {
+  content: "\e659";
+}
+
+.icon-a-webtongxunluxuanzhong:before {
+  content: "\e65a";
+}
+
+.icon-a-webgongzuotaiweixuanzhong:before {
+  content: "\e65c";
+}
+
+.icon-a-webtongxunluweixuanzhong:before {
+  content: "\e65d";
+}
+
+.icon-a-webshujuzhongxinxuanzhong:before {
+  content: "\e65e";
+}
+
+.icon-a-webshujuzhongxinweixuanzhong:before {
+  content: "\e65f";
+}
+
+.icon-a-webxiaoxiweixuanzhong:before {
+  content: "\e660";
+}
+
+.icon-yasuobao:before {
+  content: "\e653";
+}
+
+.icon-zanwushuju:before {
+  content: "\e652";
+}
+
+.icon-a-wodemima:before {
+  content: "\e651";
+}
+
+.icon-PDF:before {
+  content: "\e62f";
+}
+
+.icon-a-wodebangdingweixin:before {
+  content: "\e650";
+}
+
+.icon-a-shouyeshujugaikuangzhanshishuju:before {
+  content: "\e64e";
+}
+
+.icon-shujubodadianhua1:before {
+  content: "\e64f";
+}
+
+.icon-a-shurukuangshanchu:before {
+  content: "\e64d";
+}
+
+.icon-a-wodemendianxinxidizhi:before {
+  content: "\e64b";
+}
+
+.icon-a-wodemendianxinxidianhua:before {
+  content: "\e64c";
+}
+
+.icon-a-biaoqianlanxiaoxixuanzhong:before {
+  content: "\e64a";
+}
+
+.icon-a-wodetuanduiguanli:before {
+  content: "\e640";
+}
+
+.icon-a-wodegerenxinxitiaozhuan:before {
+  content: "\e641";
+}
+
+.icon-a-wodedianhua:before {
+  content: "\e642";
+}
+
+.icon-a-biaoqianlanwodexuanzhong:before {
+  content: "\e643";
+}
+
+.icon-a-biaoqianlanshouye:before {
+  content: "\e644";
+}
+
+.icon-a-wodemendianxinxi:before {
+  content: "\e645";
+}
+
+.icon-a-wodeguanyuyingyong:before {
+  content: "\e646";
+}
+
+.icon-a-wodetiaozhuan:before {
+  content: "\e647";
+}
+
+.icon-a-wodeshezhi:before {
+  content: "\e648";
+}
+
+.icon-a-woderenwuzhongxin:before {
+  content: "\e649";
+}
+
+.icon-a-tibaoguanlitibao:before {
+  content: "\e63f";
+}
+
+.icon-hujiao:before {
+  content: "\e63e";
+}
+
+.icon-a-shangxueyuanxuexi:before {
+  content: "\e63d";
+}
+
+.icon-a-shangxueyuanfujian:before {
+  content: "\e63c";
+}
+
+.icon-a-tuiguangsucaishanchu:before {
+  content: "\e63a";
+}
+
+.icon-a-tuiguangsucaishangchuan1:before {
+  content: "\e63b";
+}
+
+.icon-pengyouquan:before {
+  content: "\e637";
+}
+
+.icon-weixinhaoyou:before {
+  content: "\e638";
+}
+
+.icon-weixinqunliao:before {
+  content: "\e639";
+}
+
+.icon-a-tuiguangsucailaxinliang:before {
+  content: "\e634";
+}
+
+.icon-a-tuiguangsucaifenxiangliang:before {
+  content: "\e635";
+}
+
+.icon-a-tuiguangsucaishangchuan:before {
+  content: "\e636";
+}
+
+.icon-a-biaoqianlanwode:before {
+  content: "\e62a";
+}
+
+.icon-word:before {
+  content: "\e62e";
+}
+
+.icon-shipin:before {
+  content: "\e630";
+}
+
+.icon-PPT:before {
+  content: "\e631";
+}
+
+.icon-tupian:before {
+  content: "\e632";
+}
+
+.icon-biaoge:before {
+  content: "\e633";
+}
+
+.icon-a-yingxiaowuliaoshoucangbiaoji:before {
+  content: "\e627";
+}
+
+.icon-a-yingxiaowuliaowenjianjia:before {
+  content: "\e62d";
+}
+
+.icon-paixushaixuanxuanzhong:before {
+  content: "\e62c";
+}
+
+.icon-a-yingxiaowuliaozhongmingming:before {
+  content: "\e62b";
+}
+
+.icon-a-sousuolansousuo:before {
+  content: "\e621";
+}
+
+.icon-a-shaixuanxiala:before {
+  content: "\e628";
+}
+
+.icon-a-yingxiaowuliaoxuanzhong:before {
+  content: "\e629";
+}
+
+.icon-a-tonggaoshujuliulanliang:before {
+  content: "\e624";
+}
+
+.icon-a-tonggaoshujuxiazailiang:before {
+  content: "\e626";
+}
+
+.icon-a-shipinbofang:before {
+  content: "\e620";
+}
+
+.icon-a-tonggaoxiangqingtonggaopingfenxingweixuan:before {
+  content: "\e622";
+}
+
+.icon-a-tonggaoxiangqingtonggaopingfenxingyixuan:before {
+  content: "\e623";
+}
+
+.icon-a-daohanglanfanhui:before {
+  content: "\e61f";
+}
+
+.icon-a-shouyezuixintonggaolantiaozhuan:before {
+  content: "\e61c";
+}
+
+.icon-a-tonggaofujian:before {
+  content: "\e61d";
+}
+
+.icon-a-tonggaoliulanliang:before {
+  content: "\e61e";
+}
+
+.icon-a-shouyezhanghuzhanshiquqianbi:before {
+  content: "\e61a";
+}
+
+.icon-a-shouyexiaoxigundongquxiaoxi:before {
+  content: "\e61b";
+}
+
+.icon-a-shouyejingangqushangxueyuan:before {
+  content: "\e60d";
+}
+
+.icon-a-shouyejingangquhehuoren:before {
+  content: "\e60e";
+}
+
+.icon-a-shouyejingangqutongxunlu:before {
+  content: "\e610";
+}
+
+.icon-a-shouyejingangqutonggao:before {
+  content: "\e613";
+}
+
+.icon-a-shouyejingangqutuiguangsucai:before {
+  content: "\e614";
+}
+
+.icon-a-shouyejingangquxiaoshouxiansuo:before {
+  content: "\e616";
+}
+
+.icon-a-shouyejingangqutibao:before {
+  content: "\e617";
+}
+
+.icon-a-shouyejingangquyingxiaowuliao:before {
+  content: "\e618";
+}
+
+.icon-a-shouyedaohanglanqiehuanxiala:before {
+  content: "\e60b";
+}
+
+.icon-a-biaoqianlanshouyexuanzhong:before {
+  content: "\e606";
+}
+
+.icon-a-biaoqianlangongzuo:before {
+  content: "\e607";
+}
+
+.icon-a-biaoqianlanzhiku:before {
+  content: "\e608";
+}
+
+.icon-a-biaoqianlanxiaoxi:before {
+  content: "\e609";
+}

utils/work/apps.js

@@ -4,11 +4,11 @@ function getapps() {
 	const paths = [{
 		name: "签到",
 		path: "/packageA/clockIn/index",
-		icon: "work-a-wodemendianxinxidizhi"
+		icon: "work-qiandao"
 	}, {
 		name: "任务",
 		path: "/packageA/work/index",
-		icon: "work-a-woderenwuzhongxin"
+		icon: "work-renwu"
 	}, {
 		name: "通讯录",
 		path: "/packageA/contacts/index",

utils/work/work-icon.wxss

@@ -8,6 +8,14 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
+.work-qiandao:before {
+    content: "\e615";
+}
+
+.work-renwu:before {
+    content: "\e612";
+}
+
 .work-yingshouzhangkuan:before {
     content: "\e6f1";
 }