8.24

.mini-ide/compileMode.json

@@ -61,6 +61,14 @@
     {
       "title": "首页",
       "page": "pages/home/home/home"
+    },
+    {
+      "title": "预约",
+      "page": "pages/home/yuY/yuY"
+    },
+    {
+      "title": "更多服务",
+      "page": "pages/serve/serveMore/serveMore"
     }
   ]
 }

app.js

@@ -221,7 +221,7 @@ App({
           that.$post('api/ding/login', { authCode: res.authCode, corpId: corpId }).then(res => {
             if (res.data.code == 1) {
               let user = res.data.data;
-              // console.log(JSON.stringify(user));
+              console.log(JSON.stringify(user));
               if (user.is_official == 1&&user.is_scope == 1) {
                 that.globalData.token = user.token;
                 that.globalData.userData = user;

app.json

@@ -22,7 +22,9 @@
     "pages/serve/webView/webView",
     "pages/serve/addMoney/addMoney",
     "pages/index/noPage/noPage",
-    "pages/index/excessive/excessive"
+    "pages/index/excessive/excessive",
+    "pages/home/yuY/yuY",
+    "pages/serve/serveMore/serveMore"
   ],
   "window": {
     "defaultTitle": "功道云绩效",

pages/home/actionplanDetails/actionplanDetails.js

@@ -304,6 +304,7 @@ Page({
         file: { spaceId: spaceId, max: 5 },
         types: ["photo", "file", "space"],//PC端仅支持["photo","file","space"]
         success: (res) => {
+          console.log(res);
           append.push(...res.data);
           that.setData({
             append: append

pages/home/home/home.acss

@@ -1,9 +1,163 @@
+.textBox{
+  position: absolute;
+  width:160px;
+  height: 60px;
+  padding: 0.24rem;
+  background-color: #fff;
+  bottom: 1rem;
+  border-radius: 10px;
+  right: 0.32rem;
+  font-size: 0.3rem;
+}
+.dsj{
+   position: absolute;
+   width: 60rpx;
+   height: 60rpx;
+   bottom: 60rpx;
+   right: 1.6rem;
+}
+.nextBtn{
+  position: absolute;
+  width: 1.2rem;
+  height: 0.6rem;
+  /* background-color: #e6a23c; */
+  z-index: 999;
+  text-align: center;
+}
+.upBtn{
+  position: absolute;
+  width: 1.2rem;
+  height: 0.6rem;
+  /* background-color: #F56C6C; */
+  z-index: 999;
+  text-align: center;
+}
+.yd2{
+  top: 3.76rem;
+  right: 0.32rem;
+}
+.yd3{
+  top: 4.34rem;
+  right: 2.8rem;
+}
+.uyd3{
+  top: 4.34rem;
+  left: 0.32rem;
+}
+
+.yd4{
+    top: 8.8rem;
+    right: 0.32rem;
+}
+.uyd4{
+    top: 8.8rem;
+    left: 2.9rem;
+}
+
+
+
+.yd5{
+    top: 8.46rem;
+    right: 0.6rem;
+}
+.uyd5{
+    top: 8.44rem;
+    left: 2.6rem;
+}
+
+.yd6{
+    top: 8.8rem;
+    right: 0.32rem;
+}
+.uyd6{
+    top: 8.8rem;
+    left: 2.8rem;
+}
+
+.yd7{
+    top: 8.8rem;
+    right: 0.32rem;
+}
+.uyd7{
+    top: 8.8rem;
+    left: 2.8rem;
+}
+
+.yd8{
+    top: 9rem;
+    right: 1.2rem;
+}
+.uyd8{
+    top: 9rem;
+    left: 2rem;
+}
+
+.yd9{
+    top: 4.26rem;
+    right: 2.86rem;
+}
+.uyd9{
+ top: 4.26rem;
+    left: 0.36rem;
+}
+
+.yd10{
+    top: 5.44rem;
+    right: 1.7rem;
+}
+.uyd10{
+    top: 5.44rem;
+    left: 1.5rem;
+}
+
+
+.yd11{
+    top: 5.6rem;
+    right: 1.83rem;
+}
+.uyd11{
+    top: 5.6rem;
+    left: 1.5rem;
+}
+
+
+
+
+
+
+
+
+
 .contentBox{
   height: 400rpx;
   text-align: center;
   padding: 0 100rpx;
   line-height: 60rpx;
 }
+.title{
+  text-align: center;
+  font-size: 40rpx;
+  font-weight: 700;
+  color: #222;
+}
+.closeImg{
+  width: 40rpx;
+  height: 40rpx;
+}
+.imgs image{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 0.2rem;
+}
+.imgs .flex-box-ce{
+    margin-bottom: 0.2rem;
+}
+.imgs2{
+  width: 300rpx;
+  height: 300rpx;
+  position: relative;
+  top: 90rpx;
+}
 .btnBox{
   padding-top: 20rpx;
   text-align: center;
@@ -18,6 +172,20 @@
 .kfBj{
   width: 100%;
 }
+.btns view{
+  text-align: center;
+  border-radius: 50rpx;
+  background-color: #26a2ff;
+  color: #fff;
+  padding: 0.08rem 0;
+  border: 2px solid #26a2ff;
+}
+.btns .yuBtn{
+  margin-right: 0.24rem;
+  color: #26a2ff;
+  background-color: #fff;
+  border: 2px solid #26a2ff;
+}
 .btnBox button{
   border-radius: 10rpx;
   background-color: #089fff;
@@ -38,7 +206,10 @@
   height: 0.3rem;
   top: 0.2rem;
   right: 0.2rem;
-  
+}
+.ydImg{
+  width: 100%;
+  vertical-align: bottom;
 }
 .logo{
   text-align: center;
@@ -93,6 +264,7 @@
   background: #fff;
   font-weight: 500;
   box-sizing: border-box;
+  overflow-y: scroll;
 }
 .ts image{
   width: 48rpx;

pages/home/home/home.axml

@@ -8,15 +8,8 @@
     <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 class="header flex-box-ce" style="top:{{isSubject? '180rpx':'0.5rem'}}">
       <view style="width:0.9rem;height:0.9rem;margin-right:20rpx;border-radius:100%">
-        <!--<open-data
-          openType="userName"
-          openId="{{userInfo.user_id}}"
-          defaultText="默认文本"
-          onError="openDataError"
-          class="open-data-test"
-       /> -->
         <img-box name="{{userInfo.name}}" imgUrl="{{userInfo.img_url}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
       </view>
       <view class="flex-1">
@@ -37,7 +30,7 @@
         <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"  >两分钟了解功道云绩效<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">待办事项
@@ -85,36 +78,49 @@
       </view>
     </view>
   </view>
-  <view class="windows" a:if="{{isshowTc}}" >
-    <view class="windows-box" style="position: relative;margin: 0 0.9rem;margin-top: 35%;">
-      <view class="kfImg" catchTap="closes3">
-        <!-- <icon type="clear"/> -->
-        <image mode="widthFix" src="../../../image/close2.png" />
-      </view>
-      <image class="kfBj"  mode="widthFix" src="../../../image/tc.png" />
-      <view class="textNr">
-        <view style="color:#fff;padding:0 0.5rem;line-height:50rpx;margin-bottom:3.26rem"> 为了更好地体验软件，请联系客服顾问获取产品相关资料，一对一系统演示和讲解</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}}" style="overflow-y: scroll;">
+    <image mode="widthFix" src="{{'../../../image/yd'+ydImg+'.jpg'}}" class="ydImg"></image>
+    <view class="yd{{ydImg}} nextBtn" catchTap="nextImg"></view>
+    <view a:if="{{ydImg!=2}}" class="uyd{{ydImg}} upBtn" catchTap="nextImg2"></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 class="windows" a:if="{{isshowTc}}">
+    <view class="windows-box" style="position: relative;margin: 0 1rem;margin-top: 32%;">
+      <view class="flex-box-end" catchTap="closes3" style="padding:0.2rem;">
+        <image mode="widthFix" class="closeImg" src="../../../image/close.png" />
       </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 class="title">快速体验功道云绩效</view>
+      <view class="contentBox flex-box flex-h-zhu" style="margin: 0.3rem 0rem;padding:0 0.2rem;padding-left:0.4rem">
+        <view class="imgs">
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/01.png" />
+            <text>定目标</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/02.png" />
+            <text>追过程</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/03.png" />
+            <text>拿结果</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/04.png" />
+            <text>评分</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/05.png" />
+            <text>报表分析</text></view>
+        </view>
+        <image class="imgs2" src="../../../image/users.png" />
+      </view>
+      <view class="flex-box-ce btns" style="padding:0 0.24rem;padding-bottom:0.4rem">
+        <view class="flex-1 yuBtn" catchTap="openDn" a:if="{{isgetRole&&userData.is_only_try_order}}">预约演示</view>
+        <view class="flex-1" catchTap="openKf">开始体验</view>
       </view>
     </view>
   </view>
   
+  <view class="windows" a:if="{{isShowText}}" catchTap="colse4">
+      <view class="textBox" catchTap="colse4">在服务台 “新手引导” 中可再次打开</view>
+      <image class="dsj" mode="widthFix" src="../../../image/dsj.png" />
+  </view>
 </view>

pages/home/home/home.js

@@ -1,6 +1,6 @@
 var app = getApp();
 var that;
-import { _debounce, getCache, setCache } from '../../../utils/util'
+import { _debounce, getCache, setCache,getRole } from '../../../utils/util'
 import 'dingtalk-jsapi/entry/union';
 import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
 import { contactAdminToUseApp } from 'dingtalk-design-libs';
@@ -24,11 +24,14 @@ Page({
     errorInfo: '',
     openDataAvailable: dd.canIUse('open-data'),
     isClose: true,
-    isPoint: true,
+    isPoint: false,
+    ydImg:2,
 
     isshowTc2: false,
     isshowTc: false,
-    isChecked:true
+
+    isShowText:false,
+    isgetRole:getRole(1),
   },
   onLoad() {
     that = this;
@@ -36,14 +39,13 @@ Page({
     that.setData({
       userInfo: app.globalData.userData,
       role: getCache('role'),
-      isPoint: getCache('isPoint') ? 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){
+    let initShow=getCache('initShow');
+    if(this.data.isgetRole&&!initShow){
       that.setData({
         isshowTc:true,
       })
@@ -55,10 +57,26 @@ Page({
   onShow() {
     this.getDb()
   },
-  ruleActiveAll(e){
+  nextImg(){
+    console.log(this.data.ydImg)
+    if(this.data.ydImg==11){
+      setCache('initShow',true);
+      that.setData({
+        isshowTc:false,
+        isshowTc2:false,
+        isShowText: true,
+      })
+      return false
+    }
     this.setData({
-      isChecked:e.detail.value
-    })
+      ydImg:Number(this.data.ydImg)+1
+    }) 
+  },
+  
+  nextImg2(){
+    this.setData({
+      ydImg:Number(this.data.ydImg)-1
+    }) 
   },
   openWebView(e) {
     dd.navigateTo({
@@ -69,7 +87,11 @@ Page({
     that.setData({
       isClose: false,
     })
-    // setCache('isClose',true);
+  },
+  colse4() {
+    that.setData({
+      isShowText: false,
+    })
   },
   closes2() {
     that.setData({
@@ -78,30 +100,23 @@ Page({
     setCache('isPoint', true);
   },
   closes3() {
+    setCache('initShow', true);
     that.setData({
-      isshowTc2: true,
+      isshowTc2: false,
       isshowTc: false,
+      isShowText: true,
     })
   },
   openDn() {
-    app.$post("api/per/user/send_notice", {}).then((res) => {
-        app.globalData.showToast("已发送");
-        this.setData({
-          isshowTc2: false,
-        })
+    dd.navigateTo({
+      url: '../yuY/yuY'
     })
   },
   openKf() {
-    if(this.data.isChecked){
-      app.$post("api/per/user/set_employee_cache", {first:1}).then((res) => {})
-    }
     this.setData({
-      isshowTc2: false,
+      isshowTc2: true,
       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({

pages/home/performanceDetails/performanceDetails.axml

@@ -56,7 +56,10 @@
         <block >
           <view class="flex-box" style="padding:0.1rem 0;font-size:0.28rem" a:for="{{item.details}}" a:for-item="list" a:if="{{list.prop && list.prop != '0'}}">
             <text class="fontColorX" style="width:1rem">{{ list.lab }}:</text>
-            <text class="flex-1 {{list.lab=='备注'? 'backCol':''}}" style="padding-left:0.2rem;" >{{list.prop}}</text>
+            <view class="flex-1 blue" a:if="{{list.lab=='结果值附件'}}" style="padding-left:0.2rem;">
+                <view a:for="{{list.prop}}" a:for-item="e" data-item="{{e}}" style="padding-bottom:10rpx;" catchTap="showImg">{{e.fileName}}</view>
+            </view>
+            <text a:else class="flex-1 {{list.lab=='备注'? 'backCol':''}}" style="padding-left:0.2rem;" >{{list.prop}}</text>
           </view>
         </block>
         <!-- 评分结果 -->
@@ -348,9 +351,9 @@
 
   <!-- 评分展示 -->
   <view class="windows" a:if="{{isPoint}}">
-    <view class="windows-box">
+    <view class="windows-box" style="margin-top:20%">
       <view class="windows-title">请确认您的评分</view>
-      <view class="windows-content">
+      <view class="windows-content" style="max-height:300px;overflow-y: scroll;">
         <view class="flex-box-ce" style="background:#ECF5FF;border-bottom: 1px solid #e4e4e4;">
           <view class="flex-4" style="border-right: 1px solid #e4e4e4;padding: 10px 5px;">
             指标（<text style="color:#ff9600;">每项指标评分</text>）

pages/home/performanceDetails/performanceDetails.js

@@ -661,19 +661,6 @@ Page({
       })
     }, 100)
   },
-  showImg(e) {
-    let item = e.target.dataset.item
-    app.$get('api/drive/grant', { file_id: item.fileId }).then(res => {
-      dd.previewFileInDingTalk({
-        corpId: app.globalData.corpId,
-        spaceId: item.spaceId,
-        fileId: item.fileId,
-        fileName: item.fileName,
-        fileSize: item.fileSize,
-        fileType: item.fileType,
-      })
-    })
-  },
   openVas(e) {
     let index = e.target.dataset.index
     let item = e.target.dataset.item
@@ -978,6 +965,10 @@ Page({
                 prop: this.initData(arr.weight) ? '指标权重：' + this.initData(arr.weight) + '%' : null
               }
             ];
+            let isFile=true;
+              if(arr.result_file.append.length==0&&arr.result_file.images.length==0){
+                isFile=false;
+            }
             arr.details = [
               // {
               //   lab: '指标类型',
@@ -985,7 +976,9 @@ Page({
               // },
               { lab: '目标值', prop: arr.target ? arr.target +''+ arr.unit:''  },
               { lab: '结果值', prop: tar },
+              { lab: '结果值附件', prop:isFile ? arr.result_file.append:''},
               { lab: '加扣分上限', prop: this.initData(arr.point_limit) },
+
               // { lab: '考核标准', prop: this.initData(arr.per_remark) },
               // {
               //   lab: '指标权重（%）',
@@ -1204,6 +1197,19 @@ Page({
       }
     })
   },
+  showImg(e) {
+    let item = e.target.dataset.item
+    app.$get('api/drive/grant', { file_id: item.fileId }).then(res => {
+      dd.previewFileInDingTalk({
+        corpId: app.globalData.corpId,
+        spaceId: item.spaceId,
+        fileId: item.fileId,
+        fileName: item.fileName,
+        fileSize: item.fileSize,
+        fileType: item.fileType,
+      })
+    })
+  },
   pdLc() {
     let flow = JSON.parse(JSON.stringify(this.data.perfstepFlow)).reverse(); //反转流程，找第一个评分节点
     //流程结束，但是最后一个“评分”节点里有自己显示撤销

pages/home/resultValueEntry/resultValueEntry.acss

@@ -15,6 +15,12 @@
   padding: 0.2rem 0 0.2rem 0.2rem;
   font-size: .28rem;
 }
+.page-section-demo{
+  /* padding: 0.24rem 0.32rem; */
+  font-size: 0.32rem;
+   background-color: #fff;
+  border-bottom: 0.02rem solid #ebedf0;
+}
 .item{
   padding: 0.24rem 0.32rem;
   border-top: 0.02rem solid #f0f0f0;

pages/home/resultValueEntry/resultValueEntry.axml

@@ -21,12 +21,24 @@
           <text style="color:#929292;font-size:.27rem;">{{ arr.lab }}：</text>
           <text style="font-size:.28rem;">{{ arr.prop }}</text>
         </view>
-        <view a:if="{{tabIndex == 1}}" class="flex-box">
-          <input class="flex-1 input" onInput="bindTextAreaBlur" data-index="{{index}}" data-item="{{item}}" value="{{item.result}}" placeholder="请输入结果值" />
+        <view a:if="{{tabIndex == 1}}">
+          <input class="flex-1 input" onInput="bindTextAreaBlur" data-index="{{index}}" data-item="{{item}}" value="{{item.result}}"  placeholder="请输入结果值" />
+          <view class="page-section-demo">
+            <button size="mini" type="primary" catchTap="openImg" style="margin-bottom:20rpx" data-index="{{index}}" data-item="{{item}}">+附件</button>
+            <view class="images flex-box-ce" a:for="{{item.result_file.append}}" a:for-item="e" a:for-index="index2" a:key="{{e.fileId}}">
+              <view class="blue font-flex-word" catchTap="showImg" data-item="{{e}}">{{e.fileName}}</view>
+              <view catchTap="deleteImg" data-index="{{index}}" data-indexT="{{index2}}" data-item="{{item.result_file.append}}" style="padding:14rpx 20rpx">
+                <icon type="clear" size="16" />
+              </view>
+            </view>
+          </view>
         </view>
         <view a:else>
           <text style="color:#929292;font-size:.27rem;">结果值：</text>
           <text style="font-size:.28rem;">{{ item.result }} {{ item.unit }}</text>
+          <view class="images flex-box-ce" a:for="{{item.result_file.append}}" a:for-item="e" a:for-index="index2" a:key="{{e.fileId}}">
+              <view class="blue font-flex-word" catchTap="showImg" data-item="{{e}}">{{e.fileName}}</view>
+          </view>
         </view>
       </view>
       <view class="noDatas">没有更多咯</view>
@@ -40,7 +52,7 @@
         <view>暂存</view>
       </view>
       <view class="footBut flex-box-ce">
-        <!-- <view class="footcolButno" catchTap="scorerveno">取消</view> -->
+        <!--<view class="footcolButno" catchTap="scorerveno">取消</view> -->
         <view class="footcolButok" data-index='0' catchTap="save">提交</view>
       </view>
     </view>

pages/home/resultValueEntry/resultValueEntry.js

@@ -27,9 +27,63 @@ Page({
   },
   bindTextAreaBlur(e) {
     this.setData({
-      [`noStatusList[${e.target.dataset.index}].result`]: e.detail.value,
+      [`rvenotList[${e.target.dataset.index}].result`]: e.detail.value,
     });
   },
+  deleteImg(e) {
+    let item = e.target.dataset.item
+    let index = e.target.dataset.index
+    let indexT = e.target.dataset.indexT
+    if (item.length == 1) {
+      this.setData({
+        [`rvenotList[${index}].result_file.append`]: [],
+      })
+      return false
+    }
+    item.splice(indexT, 1)
+    
+    this.setData({
+      [`rvenotList[${index}].result_file.append`]: item,
+    })
+    console.log(item,index,indexT,this.data.rvenotList[index])
+  },
+  showImg(e) {
+    let item = e.target.dataset.item
+    app.$get('api/drive/grant', { file_id: item.fileId }).then(res => {
+      dd.previewFileInDingTalk({
+        corpId: app.globalData.corpId,
+        spaceId: item.spaceId,
+        fileId: item.fileId,
+        fileName: item.fileName,
+        fileSize: item.fileSize,
+        fileType: item.fileType,
+      })
+    })
+  },
+  //图片选择
+  openImg(e) {
+    let index = e.target.dataset.index
+    let append = this.data.rvenotList[index].result_file.append;
+    app.$get('api/drive/info').then(res => {
+      let spaceId = res.data.data.space_id.toString()
+      dd.uploadAttachmentToDingTalk({
+        image: { multiple: true, compress: false, max: 5, spaceId: spaceId },
+        space: { spaceId: spaceId, isCopy: 1, max: 5 },
+        file: { spaceId: spaceId, max: 5 },
+        types: ["photo", "file", "space"],//PC端仅支持["photo","file","space"]
+        success: (res) => {
+          console.log(res);
+          append.push(...res.data);
+          that.setData({
+            [`rvenotList[${e.target.dataset.index}].result_file.append`]: append,
+          });
+        },
+        fail: (err) => {
+          console.log(err)
+        }
+      })
+    })
+  },
   // 提交
   save(e) {
     let num = e.target.dataset.index
@@ -40,15 +94,29 @@ Page({
       result_info: '' // 结果值信息
     };
     let result_info = [];
-    this.data.noStatusList.some(item => {
-      if (item.result) {
-        result_info.push({
-          result: item.result, // 单项目结果值
-          dimension_key: item.message.dimension_key, // 维度索引
-          index_key: item.message.index_key, // 指标索引
-          index_id: item.id // 指标ID
-        });
-        isLr = true;
+    this.data.rvenotList.some(item => {
+      if(item.type==1){
+        if (item.result) {
+          result_info.push({
+            result: item.result, // 单项目结果值
+            dimension_key: item.message.dimension_key, // 维度索引
+            index_key: item.message.index_key, // 指标索引
+            index_id: item.id, // 指标ID
+            result_file: item.result_file
+          });
+          isLr = true;
+        }
+      }else{
+        // if (item.result_file.append.length > 0) {
+          result_info.push({
+            result: item.result, // 单项目结果值
+            dimension_key: item.message.dimension_key, // 维度索引
+            index_key: item.message.index_key, // 指标索引
+            index_id: item.id, // 指标ID
+            result_file: item.result_file
+          });
+          isLr = true;
+        // }
       }
     });
     if (!isLr) {
@@ -121,6 +189,7 @@ Page({
           if (item.result_cache) {
             // 是否有暂存的数据有就显示出来
             dimension[item.dimension_key].index[item.index_key].result = item.result_cache;
+            dimension[item.dimension_key].index[item.index_key].result_file = item.result_file;
           }
           noStatusList.push(dimension[item.dimension_key].index[item.index_key]);
         }

pages/home/yuY/yuY.acss

@@ -0,0 +1,39 @@
+.header{
+  background-color: #26A2FF;
+  color: #fff;
+  text-align: center;
+  padding: 40rpx 0;
+}
+.item{
+    padding: 0.24rem 0.32rem;
+    font-size: 32rpx;
+    background-color: #fff;
+    border-bottom: 1px solid #f1f1f1;
+    position: relative;
+}
+.label{
+  width: 160rpx;
+  /* text-align: right; */
+}
+.page-section-btns{
+  position: relative;
+  padding: 0 0.32rem;
+  margin-top: 2rem;
+}
+.nameBox{
+  position: absolute;
+  left: 210rpx;
+  top: 0.3rem;
+  right: 0.32rem;
+}
+.fa{
+  background-color: #f0a020;
+  color: #fff;
+  right: 0;
+  padding: 0.1rem 0.2rem;
+  border-bottom-left-radius: 50rpx;
+  border-top-left-radius:50rpx;
+  position: absolute;
+  font-size: 28rpx;
+  top: -180rpx;
+}

pages/home/yuY/yuY.axml

@@ -0,0 +1,29 @@
+<view>
+  <view class="header">
+    <view style="margin-bottom:5rpx">预约演示功道云绩效</view>
+    <view>绩效专家一对一服务</view>
+  </view>
+  <view class="main">
+    <form>
+      <view class="formBox">
+        <view class="flex-box-ce item">
+          <view class="label">公司名称</view>
+          <input class="flex-1" name="input" disabled />
+          <view class="nameBox font-flex-word">{{userData.site.name}}</view>
+        </view>
+        <view class="flex-box-ce item">
+          <view class="label">姓名</view>
+          <input class="flex-1" name="input"  placeholder="请输入姓名" onInput="bindKeyInput" />
+        </view>
+        <view class="flex-box-ce item">
+          <view class="label">手机号码</view>
+          <input class="flex-1" name="input" type="number"  placeholder="请输入手机号" onInput="bindKeyInput2" />
+        </view>
+      </view>
+      <view class="page-section-btns">
+        <view class="fa">预约赠送绩效考核方案</view>
+        <button type="primary"  catchTap="submit">立即申请</button>
+      </view>
+    </form>
+  </view>
+</view>

pages/home/yuY/yuY.js

@@ -0,0 +1,57 @@
+var app = getApp();
+var that;
+import moment from 'moment' // 时间库
+Page({
+  data: {
+    userData: {},
+    name: '',
+    mobile: '',
+  },
+  onLoad() {
+    that = this;
+    dd.setNavigationBar({ title: "预约演示" });
+    that.setData({
+      userData: app.globalData.userData,
+    })
+  },
+  bindKeyInput(e) {
+    this.setData({
+      name: e.detail.value,
+    });
+  },
+  bindKeyInput2(e) {
+    this.setData({
+      mobile: e.detail.value,
+    });
+  },
+  submit() {
+    if (!this.data.name) {
+      app.globalData.showToast('请输入姓名');
+      return false;
+    }
+    if (!this.data.mobile) {
+      app.globalData.showToast('请输手机号码');
+      return false;
+    }
+    let str = /^1[345789]\d{9}$/
+    if (!str.test(this.data.mobile)) {
+      app.globalData.showToast('手机号码格式不正确')
+      return false
+    }
+    let data={
+      name:this.data.name,
+      mobile:this.data.mobile,
+    }
+    app.$post('api/employee/appointment', data).then(res => {
+      if (res.data.code == 1) {
+        app.globalData.showToast('提交成功，我们的绩效老师将在24小时内与您联系');
+        setTimeout(()=>{
+          dd.navigateBack({
+            delta: 1
+          })
+        },1000)
+      }
+    });
+  },
+
+});

pages/home/yuY/yuY.json

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

pages/serve/serve/serve.acss

@@ -1,3 +1,64 @@
+.windows-box{
+  background: #fff;
+  margin: 0 32rpx;
+  margin-top: 40%;
+  border-radius: 20rpx; 
+}
+.btns view{
+  text-align: center;
+  border-radius: 50rpx;
+  background-color: #26a2ff;
+  color: #fff;
+  padding: 0.08rem 0;
+  border: 2px solid #26a2ff;
+}
+.btns .yuBtn{
+  margin-right: 0.24rem;
+  color: #26a2ff;
+  background-color: #fff;
+  border: 2px solid #26a2ff;
+}
+.contentBox{
+  height: 400rpx;
+  text-align: center;
+  padding: 0 100rpx;
+  line-height: 60rpx;
+}
+.title{
+  text-align: center;
+  font-size: 40rpx;
+  font-weight: 700;
+  color: #222;
+}
+.closeImg{
+  width: 40rpx;
+  height: 40rpx;
+}
+.imgs image{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 0.2rem;
+}
+.imgs .flex-box-ce{
+    margin-bottom: 0.2rem;
+}
+.imgs2{
+  width: 300rpx;
+  height: 300rpx;
+  position: relative;
+  top: 90rpx;
+}
+.btnBox{
+  padding-top: 20rpx;
+  text-align: center;
+}
+.textNr{
+  position: absolute;
+  z-index: 9999;
+  top: 60rpx;
+  left: 0.24rem;
+  right: 0.24rem;
+}
 .header{
     border-radius: 0.15rem;
     position: relative;
@@ -42,7 +103,11 @@
   padding:10rpx 0;
   border-radius:50rpx;
 }
-.item1 .flex-1:nth-child(1){
+.item1 .flex-box-ce{
+    width: 41%;
+    margin-bottom: 0.2rem;
+}
+.item1 .flex-box-ce:nth-child(1){
   background-color: #F8F4F5;
   padding: 0.24rem;
   font-size: 0.28rem;
@@ -50,14 +115,14 @@
   height: 1.1rem;
   margin-right: 0.2rem;
 }
-.item1 .flex-1:nth-child(2){
+.item1 .flex-box-ce:nth-child(2){
   background-color: #F4F7FC;
   padding: 0.24rem;
   font-size: 0.28rem;
   border-radius: 20rpx;
   height: 1.1rem;
 }
-.item2 .flex-1:nth-child(1){
+.item1 .flex-box-ce:nth-child(3){
   background-color:#EAF4FE;
   padding: 0.24rem;
   font-size: 0.28rem;
@@ -65,15 +130,19 @@
   height: 1.1rem;
   margin-right: 0.2rem;
 }
-.item2 .flex-1:nth-child(2){
+.item1 .flex-box-ce:nth-child(4){
   background-color:#F2FAFC;
   padding: 0.24rem;
   font-size: 0.28rem;
   border-radius: 20rpx;
   height: 1.1rem;
 }
+.ydImg{
+  width: 100%;
+  vertical-align: bottom;
+}
 .item1{
-  margin-bottom: 0.2rem;
+  /* margin-bottom: 0.2rem; */
 }
 .iconfont{
   font-size: 0.5rem;
@@ -116,4 +185,111 @@
   border-radius: 50rpx;
   color: #fff;
   padding: 0.2rem 0;
+}
+.nextBtn{
+  position: absolute;
+  width: 1.2rem;
+  height: 0.6rem;
+  /* background-color: #e6a23c; */
+  z-index: 999;
+  text-align: center;
+}
+.upBtn{
+  position: absolute;
+  width: 1.2rem;
+  height: 0.6rem;
+  /* background-color: #F56C6C; */
+  z-index: 999;
+  text-align: center;
+}
+.yd2{
+  top: 3.76rem;
+  right: 0.32rem;
+}
+.yd3{
+  top: 4.34rem;
+  right: 2.8rem;
+}
+.uyd3{
+  top: 4.34rem;
+  left: 0.32rem;
+}
+
+.yd4{
+    top: 8.8rem;
+    right: 0.32rem;
+}
+.uyd4{
+    top: 8.8rem;
+    left: 2.9rem;
+}
+
+
+
+.yd5{
+    top: 8.46rem;
+    right: 0.6rem;
+}
+.uyd5{
+    top: 8.44rem;
+    left: 2.6rem;
+}
+
+.yd6{
+    top: 8.8rem;
+    right: 0.32rem;
+}
+.uyd6{
+    top: 8.8rem;
+    left: 2.8rem;
+}
+
+.yd7{
+    top: 8.8rem;
+    right: 0.32rem;
+}
+.uyd7{
+    top: 8.8rem;
+    left: 2.8rem;
+}
+.yd8{
+    top: 9rem;
+    right: 1.2rem;
+}
+.uyd8{
+    top: 9rem;
+    left: 2rem;
+}
+.yd9{
+    top: 4.26rem;
+    right: 2.86rem;
+}
+.uyd9{
+ top: 4.26rem;
+    left: 0.36rem;
+}
+
+.yd10{
+    top: 5.44rem;
+    right: 1.7rem;
+}
+.uyd10{
+    top: 5.44rem;
+    left: 1.5rem;
+}
+
+.yd11{
+    top: 5.6rem;
+    right: 1.83rem;
+}
+.uyd11{
+    top: 5.6rem;
+    left: 1.5rem;
+}
+
+.yy{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 10rpx;
+  text-align: center;
 }

pages/serve/serve/serve.axml

@@ -11,45 +11,94 @@
       </view>
     </view>
   </view>
-  <view style="font-size:0.32rem;padding: 0.24rem 0.32rem;padding-top:0">使用帮助</view>
+  <view style="font-size:0.32rem;padding: 0.24rem 0.32rem;padding-top:0" class="flex-box-ce">
+      <view class="flex-1">使用帮助</view>
+      <view class="flex-box-ce flex-center-center" catchTap="openDn" a:if="{{isgetRole&&userData.is_only_try_order}}">
+        <image mode="scaleToFill" class="yy" src="../../../image/ys.png" />
+        <text class="blue">预约演示</text>
+      </view>
+  </view>
   <view class="main">
-    <view class="flex-box-ce item1">
-      <view class="flex-1 flex-box-ce" catchTap="openUrl" data-index="1">
+    <view class="flex-box-ce item1 flex-d-wrap">
+      <view class="flex-box-ce" catchTap="openUrl" data-index="4" a:if="{{isgetRole}}">
+        <view class="imgBox">
+          <text class="iconfont icon-jiqiao"></text>
+        </view>
+        <text>新手引导</text>
+      </view>
+      <view class="flex-box-ce" catchTap="openUrl" data-index="1">
         <view class="imgBox">
           <text class="iconfont icon-xinshou"></text>
         </view>
         <text>快速入门</text>
       </view>
-      <view class="flex-1 flex-box-ce" catchTap="openUrl" data-index="2">
+      <view class="flex-box-ce" catchTap="openUrl" data-index="2">
         <view class="imgBox">
           <text class="iconfont icon-wendang"></text>
         </view>
         <text>各角色操作教程</text>
       </view>
-    </view>
-    <view class="flex-box-ce item2">
-      <view class="flex-1 flex-box-ce" catchTap="openUrl" data-index="3">
+      <view class="flex-box-ce" catchTap="openUrl" data-index="3">
         <view class="imgBox">
           <text class="iconfont icon-wendang"></text>
         </view>
         <text>应用场景与技巧</text>
       </view>
-      <view class="flex-1 flex-box-ce" catchTap="openUrl" data-index="4">
-        <view class="imgBox">
-          <text class="iconfont icon-jiankangfangan"></text>
-        </view>
-        <text>考核方案示例</text>
-      </view>
+    </view>
+    <view a:if="{{isgetRole}}" style="text-align:center;padding:0.1rem 0.24rem;border-radius: 10rpx;font-size: 0.28rem;" catchTap="opengd">
+      更多服务 <text class="iconfont icon-jiantouyou" style="font-size:22rpx;position: relative;top:-3rpx;margin-left:6rpx"></text>
     </view>
   </view>
   <view class="footer" a:if="{{isgetRole}}">
       <view class="flex-box-ce">
         <image mode="scaleToFill" src="../../../image/kfdh.png" />
         <view class="texts">
-          <view> 你好！我是功道云专属客服</view>
+           <view>你好！我是功道云专属客服</view>
            <view>你可以随时联系我查询相关问题或帮助</view>
         </view> 
       </view>
       <view class="btn" catchTap="openKf">联系人工客服</view>
   </view>
+
+
+  <view class="windows" a:if="{{isshowTc2}}" style="overflow-y: scroll;">
+      <image mode="widthFix" src="{{'../../../image/yd'+ydImg+'.jpg'}}" class="ydImg"></image>
+      <view class="yd{{ydImg}} nextBtn" catchTap="nextImg"></view>
+      <view a:if="{{ydImg!=2}}" class="uyd{{ydImg}} upBtn" catchTap="nextImg2"></view>
+  </view>
+
+  <view class="windows" a:if="{{isshowTc}}">
+    <view class="windows-box" style="position: relative;margin: 0 1rem;margin-top: 32%;">
+      <view class="flex-box-end" catchTap="closes3" style="padding:0.2rem;">
+        <image mode="widthFix" class="closeImg" src="../../../image/close.png" />
+      </view>
+      <view class="title">快速体验功道云绩效</view>
+      <view class="contentBox flex-box flex-h-zhu" style="margin: 0.3rem 0rem;padding:0 0.2rem;padding-left:0.4rem">
+        <view class="imgs">
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/01.png" />
+            <text>定目标</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/02.png" />
+            <text>追过程</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/03.png" />
+            <text>拿结果</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/04.png" />
+            <text>评分</text></view>
+          <view class="flex-box-ce">
+            <image mode="widthFix" src="../../../image/05.png" />
+            <text>报表分析</text></view>
+        </view>
+        <image class="imgs2" src="../../../image/users.png" />
+      </view>
+      <view class="flex-box-ce btns" style="padding:0 0.24rem;padding-bottom:0.4rem">
+        <view class="flex-1 yuBtn" catchTap="openDn" a:if="{{isgetRole&&userData.is_only_try_order}}">预约演示</view>
+        <view class="flex-1" catchTap="openKf2">开始体验</view>
+      </view>
+    </view>
+  </view>
+
+
 </view>

pages/serve/serve/serve.js

@@ -8,31 +8,79 @@ Page({
   data: {
     knowFrom: 'action',
     userData: {},
-    isgetRole:getRole(1),
-    expireTime:'',
+    isgetRole: getRole(1),
+    expireTime: '',
+    isshowTc: false,
+    ydImg: 2,
   },
   onLoad() {
     that = this
     that.setData({
       userData: app.globalData.userData,
-      expireTime:moment(Number(app.globalData.userData.site.expire_time+'000')).format('YYYY-MM-DD')
+      expireTime: moment(Number(app.globalData.userData.site.expire_time + '000')).format('YYYY-MM-DD')
     })
     dd.setNavigationBar({ title: "服务台" });
   },
+  closes3() {
+    that.setData({
+      isshowTc2: false,
+      isshowTc: false,
+    })
+  },
   openUrl2() {
     dd.navigateTo({
       url: '../addMoney/addMoney'
     })
   },
+  openKf2() {
+    this.setData({
+      isshowTc2: true,
+      isshowTc: false,
+    })
+  },
+  nextImg() {
+
+    if (this.data.ydImg == 11) {
+      that.setData({
+        isshowTc2: false,
+      })
+      return false
+    }
+    this.setData({
+      ydImg: Number(this.data.ydImg) + 1
+    })
+  },
+  nextImg2() {
+    this.setData({
+      ydImg: Number(this.data.ydImg) - 1
+    })
+  },
   openKf() {
     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`
     })
   },
+  opengd() {
+    dd.navigateTo({
+      url: '../serveMore/serveMore'
+    })
+  },
   openUrl(e) {
     var index = e.target.dataset.index;
+    if (index == 4) {
+      that.setData({
+        isshowTc: true,
+        ydImg: 2,
+      })
+      return false
+    }
+    dd.navigateTo({
+      url: '../webView/webView?index=' + index + '&page=1'
+    })
+  },
+  openDn() {
     dd.navigateTo({
-      url: '../webView/webView?index=' + index
+      url: '../../home/yuY/yuY'
     })
   },
 });

pages/serve/serveMore/serveMore.acss

@@ -0,0 +1,53 @@
+.item{
+  padding: 0.24rem 0.32rem;
+  background-color: #fff;
+  border-bottom: 1px solid #f1f1f1;
+}
+.item image{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 10rpx;
+}
+.main{
+  background-color: #fff;
+  padding: 0.24rem;
+}
+.items{
+  padding: 0.24rem;
+  box-shadow: 0 0 3px #ccc;
+  margin-top: 0.24rem;
+  border-radius: 16rpx;
+}
+.items image{
+  width: 120rpx;
+  height: 120rpx;
+  margin-right: 20rpx;
+}
+.title{
+  color: #888;
+  font-size: 0.28rem;
+}
+.btn{
+  padding: 8rpx 20rpx;
+  background-color:#FE5F0F;
+  color: #fff;
+  font-size: 0.24rem;
+  border-radius: 50rpx;
+}
+.name{
+  font-size: 0.34rem;
+  font-weight: 600;
+  color: #222;
+}
+.content{
+  font-size: 0.24rem;
+  color: #888;
+  margin: 10rpx 0;
+}
+.ids text{
+   border: 1px solid #f0a020;
+   padding: 4rpx;
+   color: #f0a020;
+   font-size: 0.2rem;
+   margin-right: 10rpx;
+}

pages/serve/serveMore/serveMore.axml

@@ -0,0 +1,25 @@
+<view>
+  <view style="padding:30rpx 0">
+    <view class="flex-box-ce item" a:for="{{urls}}" catchTap="openUrl" data-index='{{item.id}}'>
+      <image mode="scaleToFill"  src="{{item.img}}" />
+      <text class="flex-1">{{item.name}}</text>
+      <text class="iconfont icon-jiantouyou" style="font-size:20rpx;"></text>
+    </view>
+  </view>
+  <view  class="main">
+    <view class="title">功道云产品</view>
+    <view>
+        <view a:for="{{items}}" class="flex-box-ce items" catchTap="openUrl2" data-index='{{item.id}}'>
+            <image mode="scaleToFill"  src="{{item.img}}" />
+            <view class="flex-1">
+              <view class="name">{{item.name}}</view>
+              <view class="content">{{item.content}}</view>
+              <view class="ids">
+                <text a:for="{{item.ids}}" a:for-item="e">{{e}}</text>
+              </view>
+            </view>
+            <view class="btn">免费试用</view>
+        </view>
+    </view>
+  </view>
+</view>

pages/serve/serveMore/serveMore.js

@@ -0,0 +1,40 @@
+var app = getApp();
+var that;
+import 'dingtalk-jsapi/entry/mobile';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
+Page({
+  data: {
+    urls:[
+      {name:'方案定制',id:1,img:'../../../image/fw1.png'},
+      {name:'上门落地',id:2,img:'../../../image/fw3.png'},
+      {name:'课程学习',id:3,img:'../../../image/fw2.png'},
+      {name:'书籍资料',id:4,img:'../../../image/fw4.png'},
+    ],
+    items:[
+      {name:'功道云积分制',content:'数字化积分管理  员工激励利器',ids:['积分考核','员工激励','企业文化'],id:1,img:'../../../image/logo2.png'},
+      {name:'功道云绩效',content:'数字化绩效专家  让管理少走弯路',ids:['绩效评价','KPI绩效','自动算分'],id:2,img:'../../../image/logo.png'},
+    ]
+  },
+  onLoad() {
+    that = this;
+    dd.setNavigationBar({ title: "更多服务" });
+  },
+  openUrl(e) {
+    var index = e.target.dataset.index;
+    dd.navigateTo({
+      url: '../webView/webView?index='+ index+ '&page=2'
+    })
+  },
+  openUrl2(e) {
+      var index = e.target.dataset.index;
+      if(index==1){
+        openLink({
+          url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC9649BF22BF44CFA3D039FDE4A69694381C&token=523cb2f0e79525ea9b1719c0c5765a6b&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7#/'
+        })
+      }else{
+        openLink({
+          url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6FFCEB2BDEB2843187AD1B5AEDE67E69071118DA99D930127EBA311197B397B15&token=9bd3efbe751f453b82eb2548ba2c1b24&shareUid=3CD14812691CE211608BAD1C2A09D307#/'
+        })
+      }
+  },
+});

pages/serve/serveMore/serveMore.json

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

pages/serve/webView/webView.js

@@ -7,7 +7,8 @@ Page({
   },
   onLoad(e) {
     that = this;
-    if(e.index){
+    console.log(e)
+    if(e.index&&e.page==1){
       let index=e.index;
       let url='https://www.yuque.com/books/share/9aed09b4-4387-4e5f-ae0e-afc748390a1e?#'
       if(index=='1'){
@@ -25,6 +26,22 @@ Page({
          url:url
       })
     }
+    if(e.index&&e.page==2){
+      let index=e.index;
+      let url='https://www.yuque.com/docs/share/a5803b46-cffd-4ad3-aca8-f9908a743618?#'
+      if(index=='1'){
+          url='https://www.yuque.com/docs/share/a5803b46-cffd-4ad3-aca8-f9908a743618?#'
+      }else if(index=='2'){
+          url='https://www.yuque.com/docs/share/c64392c1-8c8d-40d4-9481-a5f1ad169c10?#'
+      }else if(index=='3'){
+          url='https://www.yuque.com/docs/share/282894d5-9309-432b-ab19-f05c06726c7e?#'
+      }else if(index=='4'){
+          url='https://www.yuque.com/docs/share/4ccb2328-08aa-4587-a6f5-5b5335692bd1?#'
+      }
+      this.setData({
+         url:url
+      })
+    }
   },
   test(){