347617796@qq.com 2 年之前
父節點
當前提交
c0625a0259

+ 4 - 0
.mini-ide/compileMode.json

@@ -53,6 +53,10 @@
     {
       "title": "领导也",
       "page": "pages/index/start/start"
+    },
+    {
+      "title": "过期",
+      "page": "pages/index/noJurisdiction/noJurisdiction"
     }
   ]
 }

+ 24 - 29
app.js

@@ -1,9 +1,9 @@
 import { showToast } from './utils/feedback'
 import { formatTime, arrRemoveObj, getTypeItem,setCache } from './utils/util'
-import * as socketApi from './utils/websocket'
+// import * as socketApi from './utils/websocket'
 
-// const baseUrl = "https://dp-test.g107.com/";//测试
-const baseUrl = "https://app109758.eapps.dingtalkcloud.com/";//测试
+const baseUrl = "https://dp-test.g107.com/";//测试
+// const baseUrl = "https://app109758.eapps.dingtalkcloud.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;
@@ -14,8 +14,8 @@ App({
   //自定义全局变量
   globalData: {
     baseUrl: baseUrl,
-    // webScoketUrl: "test-ding.g107.com",//webScoket测试
-    webScoketUrl: "app109758.eapps.dingtalkcloud.com",
+    webScoketUrl: "test-ding.g107.com",//webScoket测试
+    // webScoketUrl: "app109758.eapps.dingtalkcloud.com",
     showToast: showToast,//提示框
     arrRemoveObj: arrRemoveObj,//删除数组的某一项
     year: formatTime(new Date()).year,//当前年
@@ -34,7 +34,7 @@ App({
     isCreator: false,//是否是创始人
     corpMessage: '',//企业套餐信息
     usersList: [],//缓存的人员列表
-    socketApi: socketApi,//长连接
+    // socketApi: socketApi,//长连接
   },
   //获取积分类型
   getTypes(callBack) {
@@ -68,8 +68,11 @@ App({
               that.globalData.token = res.data.refresh_token
             }
             resolve(res);
-          } else if (res.data.code == 401) {
-            that.globalData.showToast("授权已过期");
+          } else if (res.data.code == 2001) {
+            that.globalData.showToast(res.data.msg);
+            dd.reLaunch({
+              url: `../../index/excessive/excessive`
+            })
             // reject(res);
           } else {
             that.globalData.showToast(res.data.msg)
@@ -111,8 +114,11 @@ App({
               that.globalData.token = res.data.refresh_token
             }
             resolve(res);
-          } else if (res.data.code == 401) {
-            that.globalData.showToast("授权已过期");
+          } else if (res.data.code == 2001) {
+            that.globalData.showToast(res.data.msg);
+            dd.reLaunch({
+              url: `../../index/excessive/excessive`
+            })
             // reject(res);
           } else {
             that.globalData.showToast(res.data.msg)
@@ -156,8 +162,11 @@ App({
               that.globalData.token = res.data.refresh_token
             }
             resolve(res);
-          } else if (res.data.code == 401) {
-            that.globalData.showToast("授权已过期");
+          } else if (res.data.code == 2001) {
+            that.globalData.showToast(res.data.msg);
+            dd.reLaunch({
+              url: `../../index/excessive/excessive`
+            })
             reject(res);
           } else if (res.data.code == 3000) {
             reject(res);
@@ -212,35 +221,22 @@ App({
           that.$post('api/ding/login', { authCode: res.authCode, corpId: corpId }).then(res => {
             if (res.data.code == 1) {
               let user = res.data.data;
-              // var isStart = false;
+              console.log(JSON.stringify(user));
               if (user.is_official == 1) {
-                // if (user.is_creator) {
-                //   that.globalData.isCreator = true;
-                //   isStart = true;
-                // }
                 that.globalData.token = user.token;
                 that.globalData.userData = user;
-                var getIsStart = dd.getStorageSync({ key: 'isStart' });//判断是否需要打开引导页
-                console.log(JSON.stringify(user));
-                // that.getUserList();//缓存人员列表
                 that.setRouters();
-                // if (isStart && !getIsStart.data && isShowStart) {//判断是否需要打开引导
-                //   dd.reLaunch({
-                //     url: '../start/start'
-                //   })
-                // } else {
-                  callBack(true);
-                // }
+                callBack(true);
               } else {
                 callBack(false);
               }
             } else if (res.data.code == 3000) {
               that.globalData.showToast("员工信息同步中,请稍后进入")
             } else {
+              console.log(res)
               that.globalData.showToast(res.msg)
             }
           }).catch(err => {
-             console.log(JSON.stringify(err))
             errBack(err.data);
             return
             if (err.data.code == 2001) {
@@ -261,7 +257,6 @@ App({
           })
         },
         fail: function (err) {
-          console.log(JSON.stringify(err))
           that.globalData.showToast("错误" + JSON.stringify(err))
         }
       });

+ 2 - 1
app.json

@@ -21,7 +21,8 @@
     "pages/serve/serve/serve",
     "pages/serve/webView/webView",
     "pages/serve/addMoney/addMoney",
-    "pages/index/noPage/noPage"
+    "pages/index/noPage/noPage",
+    "pages/index/excessive/excessive"
   ],
   "window": {
     "defaultTitle": "功道云绩效",

二進制
image/kf2.png


二進制
image/kf3.png


+ 1 - 1
pages/home/allJx/allJx.js

@@ -20,7 +20,7 @@ Page({
   },
   onLoad() {
     that = this;
-    dd.setNavigationBar({ title: "全部考核" });
+    dd.setNavigationBar({ title: "历史考核" });
   },
   onShow(){
     if(this.data.page==1){

+ 27 - 1
pages/home/home/home.acss

@@ -1,4 +1,30 @@
-
+.contentBox{
+  height: 400rpx;
+  text-align: center;
+  padding: 0 100rpx;
+  line-height: 60rpx;
+}
+.btnBox{
+  padding: 20rpx;
+}
+.btnBox button{
+  border-radius: 10rpx;
+  background-color: #089fff;
+  font-size: 0.32rem;
+}
+.ah{
+  padding: 0.14rem 0.24rem;
+  border-top: 1px solid #f1f1f1;
+  font-size: 0.24rem;
+}
+.kfImg image{
+  position: absolute;
+  width: 0.5rem;
+  height: 0.5rem;
+  top: 0.2rem;
+  right: 0.2rem;
+  
+}
 .logo{
   text-align: center;
   margin: 0.24rem 0;

+ 52 - 17
pages/home/home/home.axml

@@ -1,15 +1,16 @@
 <view>
   <view class="headerBox" style="position: relative;">
     <view class="flex-box ts flex-center-center" a:if="{{isSubject}}">
-    <image mode="scaleToFill" src="../../../image/tz.png"></image>
-    <view class="flex-1">你正在使用个人体验版,如需正式使用,请联系管理员</view>
-    <button type="primary" onTap="openGly">联系管理员</button>
-  </view>
-    <view class="top"><image class="top-img" mode="widthFix" src="../../../image/xcxbj.png" /></view>
+      <image mode="scaleToFill" src="../../../image/tz.png"></image>
+      <view class="flex-1">你正在使用个人体验版,如需正式使用,请联系管理员</view>
+      <button type="primary" onTap="openGly">联系管理员</button>
+    </view>
+    <view class="top">
+      <image class="top-img" mode="widthFix" src="../../../image/xcxbj.png" /></view>
     <view style="height: 0.8rem;background: #fff;"></view>
     <view class="header flex-box-ce" style="top:{{isSubject? '180rpx':'50rpx'}}">
       <view style="width:0.9rem;height:0.9rem;margin-right:20rpx;border-radius:100%">
-        <!-- <open-data
+        <!--<open-data
           openType="userName"
           openId="{{userInfo.user_id}}"
           defaultText="默认文本"
@@ -21,7 +22,8 @@
       <view class="flex-1">
         <view style="font-size:0.3rem">{{userInfo.name}}</view>
         <view class="flex-box-ce fontColorX font-flex-word" style="margin-top:10rpx">
-          <text a:for="{{userInfo.dept_list}}" a:for-item="e">{{e.name}}<text a:if="{{userInfo.dept_list.length - index > 1}}">,</text></text>
+          <text a:for="{{userInfo.dept_list}}" a:for-item="e">{{e.name}}
+            <text a:if="{{userInfo.dept_list.length - index > 1}}">,</text></text>
         </view>
       </view>
       <view class="sf">{{str}}</view>
@@ -35,11 +37,13 @@
         <view>{{item.name}}</view>
       </view>
     </view>
-    <view class="flex_one" catchTap="openWebView" a:if="{{isClose}}" >两分钟了解功道云绩效<text class="iconfont icon-dianji" style="padding-left:10rpx;font-size:28rpx"></text><text class="closes" catchTap="closes">×</text> </view>
+    <!--<view class="flex_one" catchTap="openWebView" a:if="{{isClose}}" >两分钟了解功道云绩效<text class="iconfont icon-dianji" style="padding-left:10rpx;font-size:28rpx"></text><text class="closes" catchTap="closes">×</text></view> -->
   </view>
   <view class="flex-box-ce que margin-bottom" style="font-size: 0.28rem;">
-    <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">待办事项 <text class="red" style="padding-left:10rpx">({{dbTolal}})</text></view>
-    <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">未读消息 <text class="red" style="padding-left:10rpx">({{xxTolal}})</text></view>
+    <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">待办事项
+      <text class="red" style="padding-left:10rpx">({{dbTolal}})</text></view>
+    <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">未读消息
+      <text class="red" style="padding-left:10rpx">({{xxTolal}})</text></view>
     <view class="flex-1"></view>
   </view>
   <view class="list" a:if="{{tabIndex==1}}">
@@ -54,30 +58,61 @@
         <text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text>
       </text>
     </view>
-     <no-data a:if="{{dbList.length==0}}"></no-data>
-    <view class="rankingLists" a:if="{{dbTolal>1}}" onTap="openAll" data-index="1">查看全部待办<text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
+    <no-data a:if="{{dbList.length==0}}"></no-data>
+    <view class="rankingLists" a:if="{{dbTolal>1}}" onTap="openAll" data-index="1">查看全部待办
+      <text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
   </view>
   <view class="list" a:else>
     <view class="item flex-box-ce" a:for="{{xxList}}" onTap="openDetail" data-item="{{item}}">
       <view class="font-flex-word flex-1">{{item.content}}</view>
     </view>
-    <view class="rankingLists" onTap="openAll" data-index="2">查看全部消息<text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
+    <view class="rankingLists" onTap="openAll" data-index="2">查看全部消息
+      <text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
   </view>
   <!-- 权限勾选 -->
   <view class="windows" a:if="{{isPoint}}">
     <view class="windows-box">
       <view class="windows-title">个人信息权限申请</view>
       <view class="windows-content">
-        <view class="logo"><image class="top-img" mode="widthFix" src="../../../image/logo.png" /></view>
+        <view class="logo">
+          <image class="top-img" mode="widthFix" src="../../../image/logo.png" /></view>
         <view style="padding:0 28rpx;">功道云绩效申请获取以下权限:</view>
         <view class="fontColorX qxText">获取你的公开信息(呢称,头像等)</view>
       </view>
       <view class="windows-btn flex-box flex-v-ce">
         <view class="flex-1" catchTap="closes2">拒绝</view>
-        <button type="default" class="flex-1"catchTap="closes2">允许</button>
+        <button type="default" class="flex-1" catchTap="closes2">允许</button>
+      </view>
+    </view>
+  </view>
+  <view class="windows" a:if="{{isshowTc}}" >
+    <view class="windows-box" style="position: relative;margin: 0 0.62rem;margin-top: 35%;">
+      <view class="kfImg" catchTap="closes3">
+        <image mode="widthFix" src="../../../image/close.png" /></view>
+      <view class="contentBox flex-box flex-center-center">
+        <view> 为了更好地体验软件,请联系客服顾问获取产品相关资料,一对一系统演示和讲解</view>
+      </view>
+      <view class="btnBox">
+        <button type="primary" catchTap="openKf">联系客服</button>
+      </view>
+      <view class="flex-box-ce flex-center-center  ah">
+        <label>
+          <checkbox onChange="ruleActiveAll" checked="{{isChecked}}" />
+          <text style="padding-left:10rpx">不再弹出</text>
+        </label>
+      </view>
+    </view>
+  </view>
+  <view class="windows" a:if="{{isshowTc2}}">
+    <view class="windows-box" style="position: relative;margin: 0 0.62rem;margin-top: 35%;">
+      <view class="contentBox flex-box flex-center-center" style=" height: 300rpx;">
+        <view>请先前往【钉钉电脑端】创建考核表并发起考核</view>
+      </view>
+      <view class="windows-btn flex-box flex-v-ce">
+        <view class="flex-1" catchTap="openDn" style="color: #26A2FF;">前往电脑端设置</view>
+        <button type="primary" class="flex-1" catchTap="openKf" style="background-color: #089fff;color: #fff;">联系客服协助</button>
       </view>
     </view>
   </view>
-
-
+  
 </view>

+ 67 - 22
pages/home/home/home.js

@@ -1,7 +1,8 @@
 var app = getApp();
 var that;
-import { _debounce, getCache,setCache } from '../../../utils/util'
+import { _debounce, getCache, setCache } from '../../../utils/util'
 import 'dingtalk-jsapi/entry/union';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
 import { contactAdminToUseApp } from 'dingtalk-design-libs';
 Page({
   data: {
@@ -10,7 +11,7 @@ Page({
       { name: '我的绩效', icon: 'icon-fenzu', url: '../myJx/myJx', code: 'creator admin', index: 1, color: 'blue' },
       { name: '我参与的', icon: 'icon-canyu', url: '../participation/participation', code: 'admin employee', index: 2, color: 'orange' },
       { name: '报表统计', icon: 'icon-tongji', url: '../statistics/statistics', code: 'creator admin', index: 3, color: 'green' },
-      { name: '全部考核', icon: 'icon-quanbu', url: '../allJx/allJx', code: 'creator admin', index: 4, color: 'blue' },
+      { name: '历史考核', icon: 'icon-quanbu', url: '../allJx/allJx', code: 'creator admin', index: 4, color: 'blue' },
     ],
     dbList: [],
     dbTolal: 0,
@@ -20,10 +21,14 @@ Page({
 
     isSubject: false,//判断是否是个人版进入
     mainCorpId: '',//如果是个人版,这个企业ID是登录者所在的企业ID,不是钉钉那边提供的隐藏企业ID
-    errorInfo:'',
+    errorInfo: '',
     openDataAvailable: dd.canIUse('open-data'),
-    isClose:true,
-    isPoint:true,
+    isClose: true,
+    isPoint: true,
+
+    isshowTc2: false,
+    isshowTc: false,
+    isChecked:true
   },
   onLoad() {
     that = this;
@@ -31,9 +36,18 @@ Page({
     that.setData({
       userInfo: app.globalData.userData,
       role: getCache('role'),
-      isPoint: getCache('isPoint')? false:true,
-      isClose:getCache('isClose')? false:true
+      isPoint: getCache('isPoint') ? false : true,
+      isSubject: app.globalData.userData.is_personal == 1 ? true : false,
+      mainCorpId: app.globalData.userData.main_corp_id,
+      isClose: getCache('isClose') ? false : true,
+
     })
+    if(app.globalData.userData.other_info.first){
+    // if(app.globalData.userData.is_creator&&!app.globalData.userData.other_info.first){
+      that.setData({
+        isshowTc:true,
+      })
+    }
     this.setR();
     this.returnS();
     this.getUserList();
@@ -41,22 +55,53 @@ Page({
   onShow() {
     this.getDb()
   },
+  ruleActiveAll(e){
+    this.setData({
+      isChecked:e.detail.value
+    })
+  },
   openWebView(e) {
     dd.navigateTo({
-      url: '../../serve/webView/webView?index='+5
+      url: '../../serve/webView/webView?index=' + 5
     })
   },
-  closes(){
-      that.setData({
-        isClose:false,
-      })
-      // setCache('isClose',true);
+  closes() {
+    that.setData({
+      isClose: false,
+    })
+    // setCache('isClose',true);
   },
-  closes2(){
-      that.setData({
-        isPoint:false,
-      })
-      setCache('isPoint',true);
+  closes2() {
+    that.setData({
+      isPoint: false,
+    })
+    setCache('isPoint', true);
+  },
+  closes3() {
+    that.setData({
+      isshowTc2: true,
+      isshowTc: false,
+    })
+  },
+  openDn() {
+    app.$post("api/per/user/send_notice", {}).then((res) => {
+        app.globalData.showToast("已发送");
+        this.setData({
+          isshowTc2: false,
+        })
+    })
+  },
+  openKf() {
+    if(this.data.isChecked){
+      app.$post("api/per/user/set_employee_cache", {first:1}).then((res) => {})
+    }
+    this.setData({
+      isshowTc2: false,
+      isshowTc: false,
+    })
+    openLink({
+      url: `https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881649645924368&corpId=${app.globalData.corpId}&token=b26816672b9a5f26022afcc5f1926d93`
+    })
   },
   openDataError(err) {
     this.setData({
@@ -64,7 +109,7 @@ Page({
     });
   },
   openGly() {
-    contactAdminToUseApp({ id: '107002', corpId: that.data.mainCorpId })
+    contactAdminToUseApp({ id: '109758', corpId: that.data.mainCorpId })
       .catch((err) => {
         // 入参不正确,或者遇到技术异常时才会进入这个链路
         console.error(err);
@@ -101,9 +146,9 @@ Page({
       let list = res.data.data.list
       let data = {}
       for (let i in list) {
-        if (list[i].is_scope === 0||list[i].is_official ===0) {
-					list[i].name = list[i].name + '(未启用)';
-				}
+        if (list[i].is_scope === 0 || list[i].is_official === 0) {
+          list[i].name = list[i].name + '(未启用)';
+        }
         data[list[i].id] = list[i];
       }
       app.globalData.usersList = data;

+ 1 - 1
pages/home/participation/participation.axml

@@ -48,7 +48,7 @@
           </block>
           <view class="flex-box flex-v-ce" style="margin-top:0.1rem">
             <block a:if="{{tabIndex==1}}">
-              <view a:if="{{!item.has_finish}}" class="blueBtn">填写管理记录</view>
+              <view a:if="{{!item.has_finish}}" class="blueBtn" data-item="{{item}}" catchTap="openVas">填写管理记录</view>
               <text a:else class="orange">已归档</text>
             </block>
             <view class="blueBtn" a:else>查看详情</view>

+ 33 - 10
pages/home/participation/participation.js

@@ -1,7 +1,7 @@
 var app = getApp();
 var that;
 var animation;
-import { returnStr,setCache,getCache,_debounce } from '../../../utils/util'
+import { returnStr, setCache, getCache, _debounce } from '../../../utils/util'
 Page({
   data: {
     tabIndex: 1,//条件选择
@@ -28,12 +28,35 @@ Page({
       duration: 200,
       timeFunction: "linear",
     });
-    if(this.data.page==1&&this.data.defaultRuleId){
-      this.data.tabIndex==1 ? this.getManagement():this.getScorerRecord()
+    if (this.data.page == 1 && this.data.defaultRuleId) {
+      this.data.tabIndex == 1 ? this.getManagement() : this.getScorerRecord()
     }
   },
+  employeeDet(id,fun) {
+    app.$get('api/per/package/employee/info',{id:id}).then(res => {
+        let data = res.data.data;
+        fun(data)
+    })
+  },
+  openVas(e) {
+    let id=e.target.dataset.item.record_id
+    this.employeeDet(id,(res)=>{
+      let data = {
+        know: 'admnin',
+        apList: JSON.stringify(res.dimension),
+        packId: res.id,
+        assessID: app.globalData.usersList[res.relevance_employee.id].id, // 考核人员信息,
+        planIndex: [],
+        recordMemberIds: res.record_member_ids || []
+      };
+      setCache('actionplanList', data);
+      dd.navigateTo({
+        url: `../actionplanList/actionplanList`
+      })
+    })
+  },
   openDetail(e) {
-    let item=e.target.dataset.item
+    let item = e.target.dataset.item
     dd.navigateTo({
       url: `../performanceDetails/performanceDetails?id=${item.record_id}&tel=${item.package_name}`
     })
@@ -83,7 +106,7 @@ Page({
       this.setData({ page: 1 })
     }
     if (!this.data.defaultRuleId) {
-     return false
+      return false
     }
     let range = this.data.minuteArray[this.data.minuteIndex].value;
     this.setData({ list: [] })
@@ -91,7 +114,7 @@ Page({
       let list = res.data.data.list;
       list.forEach(item => {
         item.returnStr = returnStr(item.action_update)
-        if (item.employee_id&&app.globalData.usersList[item.employee_id]) {
+        if (item.employee_id && app.globalData.usersList[item.employee_id]) {
           //当是导入导出时,显示登录者
           item.userInfo = app.globalData.usersList[item.employee_id];
           item.dept_list = app.globalData.usersList[item.employee_id].dept_list
@@ -117,7 +140,7 @@ Page({
       let list = res.data.data.list;
       list.forEach(item => {
         item.returnStr = returnStr(item.action_update)
-        if (item.employee_id&&app.globalData.usersList[item.employee_id]) {
+        if (item.employee_id && app.globalData.usersList[item.employee_id]) {
           //当是导入导出时,显示登录者
           item.userInfo = app.globalData.usersList[item.employee_id];
           item.dept_list = app.globalData.usersList[item.employee_id].dept_list
@@ -143,7 +166,7 @@ Page({
       this.getScorerRecord();
     }
   },
-  bindKeyInput:_debounce(function(e){
+  bindKeyInput: _debounce(function (e) {
     this.setData({
       isVal: e.detail.value ? true : false,
       keyword: e.detail.value ? e.detail.value : '',
@@ -184,8 +207,8 @@ Page({
         }
       });
       that.setData({
-        defaultRuleId:obj? obj[0].id:'',
-        jxName:obj? obj[0].name:'',
+        defaultRuleId: obj ? obj[0].id : '',
+        jxName: obj ? obj[0].name : '',
       })
       this.getManagement();
     })

+ 1 - 0
pages/home/performanceDetails/performanceDetails.js

@@ -1343,6 +1343,7 @@ Page({
   },
   // 管理记录||执行计划
   openTrackPath(e) {
+    console.log( this.data.planIndex)
     let add = e.target.dataset.str
     let data = {
       know: add,

+ 4 - 0
pages/index/excessive/excessive.acss

@@ -0,0 +1,4 @@
+.noJ{
+  text-align: center;
+  padding-top: 30%
+}

+ 6 - 0
pages/index/excessive/excessive.axml

@@ -0,0 +1,6 @@
+<view>
+  <view class="noJ">
+      <image mode="scaleToFill" src="../../../image/noData.png" style="width: 340rpx;height: 340rpx;margin-bottom:20rpx;"/>
+      <view>企业授权已过期</view>
+  </view>
+</view>

+ 11 - 0
pages/index/excessive/excessive.js

@@ -0,0 +1,11 @@
+var app = getApp()
+var that;
+Page({
+  data: {
+    isCreator: false,
+    creatorName:'',
+  },
+  onLoad() {
+      this.setData({isCreator: app.globalData.isCreator,creatorName:app.globalData.corpMessage.creators})
+  },
+});

+ 3 - 0
pages/index/excessive/excessive.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 1 - 1
pages/serve/addMoney/addMoney.js

@@ -10,7 +10,7 @@ Page({
   },
   openUrl() {
       openLink({
-        url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC969F1A50AEF2E5E320588012470F1AB045&token=d37751d45abad15178adf60f936d7c28&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7'
+        url: 'https://h5.dingtalk.com/org-center/index.html?showmenu=false&dd_share=false&goodsCode=DT_GOODS_881649645924368&fromQrCode=1&channelCode=&sig=4f70d7a880722a9e767d0e9cc38fe65d62fc5f43&funnelsource=goodsOfflineQrcode&leadsFrom=401'
       })
   },
 });

+ 1 - 1
pages/serve/serve/serve.axml

@@ -4,7 +4,7 @@
     <view class="header">
       <view class="name font-flex-word">{{userData.site.name}}</view>
       <view class="num">
-        <text>30人</text>套餐</view>
+        <text>{{userData.site.user_count_max}}人</text>套餐</view>
       <view class="flex-box-ce date">
         <view class="flex-1">有效期至:{{expireTime}}</view>
         <view catchTap="openUrl2">续费/升级</view>

+ 1 - 1
pages/serve/serve/serve.js

@@ -26,7 +26,7 @@ Page({
   },
   openKf() {
     openLink({
-      url: `https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881607043109331&corpId=${app.globalData.corpId}&token=5784a3e6b5e025ee891517ea814180f4`
+      url: `https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881649645924368&corpId=${app.globalData.corpId}&token=b26816672b9a5f26022afcc5f1926d93`
     })
   },
   openUrl(e) {

+ 5 - 5
pages/serve/webView/webView.js

@@ -9,17 +9,17 @@ Page({
     that = this;
     if(e.index){
       let index=e.index;
-      let url='https://www.yuque.com/books/share/9aed09b4-4387-4e5f-ae0e-afc748390a1e?#';
+      let url='https://www.yuque.com/books/share/9aed09b4-4387-4e5f-ae0e-afc748390a1e?#'
       if(index=='1'){
-          url='https://www.yuque.com/books/share/9aed09b4-4387-4e5f-ae0e-afc748390a1e?#'
+          url='https://www.yuque.com/docs/share/d3459ec7-5c62-4ae5-b0dc-a3ff2770d462?#'
       }else if(index=='2'){
-          url='https://www.yuque.com/books/share/e9c9f16b-eeb7-4598-b5da-263f2726942c?#'
+          url='https://www.yuque.com/docs/share/22b4bb49-2151-4b46-8465-89301957102a?#'
       }else if(index=='3'){
-          url='https://www.yuque.com/books/share/20a515ac-c557-4363-9a27-65aef164b4c3?#'
+          url='https://www.yuque.com/docs/share/a5d976bb-f1f3-4cb6-b5ef-899fcb5d2932?#'
       }else if(index=='4'){
           url='https://www.yuque.com/books/share/3febbd74-3455-4cfa-abc0-035931cfcc3b?#'
       }else{
-          url='https://www.yuque.com/docs/share/22b4bb49-2151-4b46-8465-89301957102a?#'
+          url='https://www.yuque.com/docs/share/9c209c54-685e-48a6-a773-a5078e430f35?#'
       }
       this.setData({
          url:url