提交最新代码

.mini-ide/project-ide.json

@@ -2,5 +2,8 @@
   "enableBackgroundBuild": true,
   "enableCloudBuild": false,
   "disableRemoteDebugSourcePanel": true,
-  "enableLegacyRemoteDebug": false
+  "enableLegacyRemoteDebug": false,
+  "ignoreHttpDomainCheck": false,
+  "ignoreWebViewDomainCheck": false,
+  "ignoreCertificateDomainCheck": false
 }

app.js

@@ -2,8 +2,8 @@ import { showToast } from './utils/feedback'
 import { formatTime, arrRemoveObj, getTypeItem,setCache } from './utils/util'
 // 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/pc",
+    // webScoketUrl: "test-ding.g107.com",//webScoket测试
+    webScoketUrl: "app109758.eapps.dingtalkcloud.com/pc",
     showToast: showToast,//提示框
     arrRemoveObj: arrRemoveObj,//删除数组的某一项
     year: formatTime(new Date()).year,//当前年
@@ -359,6 +359,7 @@ App({
     })
   },
   onLaunch(options) {
+    console.log("options", options)
     dd.globalData = this.globalData;
     that = this;
     that.updateApp();

package-lock.json

@@ -111,9 +111,9 @@
       }
     },
     "dingtalk-jsapi": {
-      "version": "2.13.91",
-      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-2.13.91.tgz",
-      "integrity": "sha512-2r1ky4h/UIjAB+uO+litvtddjLUNbpIbtq2GyBlbRnD7acIl2V26pPp2S1hetw6+Getd3/zhva/V2N6dl07GRw==",
+      "version": "3.0.42",
+      "resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.42.tgz",
+      "integrity": "sha512-cIJ+3HUnSRVAanCip5yT1rEoLPrj97BxjYKpB33sgwUDStmfPgyEzG8Hux/Sq2zYJNH6riEA9PflsDnevr1f/g==",
       "requires": {
         "promise-polyfill": "^7.1.0"
       }

pages/serve/serveMore/serveMore.axml

@@ -9,17 +9,17 @@
   <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 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 class="btn">免费试用</view>
-        </view>
+          </view>
+          <view class="btn">免费试用</view>
+      </view>
     </view>
   </view>
 </view>

pages/serve/serveMore/serveMore.js

@@ -22,7 +22,7 @@ Page({
   openUrl(e) {
     var index = e.target.dataset.index;
     dd.navigateTo({
-      url: '../webView/webView?index='+ index+ '&page=2'
+      url: '../webView/webView?index='+ index + '&page=2'
     })
   },
   openUrl2(e) {

pages/serve/webView/webView.js

@@ -8,38 +8,46 @@ Page({
   onLoad(e) {
     that = this;
     console.log(e)
-    if(e.index&&e.page==1){
+    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'){
-          url='https://www.yuque.com/docs/share/d3459ec7-5c62-4ae5-b0dc-a3ff2770d462?#'
+        url='https://www.yuque.com/docs/share/d3459ec7-5c62-4ae5-b0dc-a3ff2770d462?#'
+      // 各角色操作教程
       }else if(index=='2'){
-          url='https://www.yuque.com/docs/share/22b4bb49-2151-4b46-8465-89301957102a?#'
+        url='https://www.yuque.com/xbddba/kreggp?#'
+      // 应用场景与技巧
       }else if(index=='3'){
-          url='https://www.yuque.com/docs/share/a5d976bb-f1f3-4cb6-b5ef-899fcb5d2932?#'
+        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?#'
+        url='https://www.yuque.com/books/share/3febbd74-3455-4cfa-abc0-035931cfcc3b?#'
       }else{
-          url='https://www.yuque.com/docs/share/9c209c54-685e-48a6-a773-a5078e430f35?#'
+        url='https://www.yuque.com/docs/share/9c209c54-685e-48a6-a773-a5078e430f35?#'
       }
       this.setData({
-         url:url
+        url:url
       })
     }
-    if(e.index&&e.page==2){
+    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?#'
+        url='https://www.yuque.com/xbddba/kreggp/qfwxsg?singleDoc#' 
+      // 上门落地
       }else if(index=='2'){
-          url='https://www.yuque.com/docs/share/c64392c1-8c8d-40d4-9481-a5f1ad169c10?#'
+        url='https://www.yuque.com/xbddba/kreggp/gnl9gw?singleDoc#'
+      // 课程学习
       }else if(index=='3'){
-          url='https://www.yuque.com/docs/share/282894d5-9309-432b-ab19-f05c06726c7e?#'
+        url='https://www.yuque.com/xbddba/kreggp/gyw5l0?singleDoc#'
+      // 书籍资料
       }else if(index=='4'){
-          url='https://www.yuque.com/docs/share/4ccb2328-08aa-4587-a6f5-5b5335692bd1?#'
+        url='https://www.yuque.com/xbddba/kreggp/zb825z?singleDoc#'
       }
       this.setData({
-         url:url
+        url:url
       })
     }
   },