12.9

app.js

@@ -21,7 +21,7 @@ App({
     userData: '',
     token:'',
     // token:' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvZGluZy5pbnN5cy5nMTA3LmNvbVwvYXBpXC9kaW5nXC9sb2dpbiIsImlhdCI6MTYwMDMxNDM0NywiZXhwIjoxNjAwOTE0MzQ3LCJuYmYiOjE2MDAzMTQzNDcsImp0aSI6IjgwMFJUS0J4RllIbnU5M3EiLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.E1RiQ6uMRICoL-2qDTeh5j5y-QLaUsGGs6PYLm-_1m8',
-    ALIOSS_URL: 'https://integralsys.oss-cn-shenzhen.aliyuncs.com',
+    ALIOSS_URL:'https://integralsys.oss-cn-shenzhen.aliyuncs.com',
     imgHttpUrl:'https://intesys.cms.g107.com/integral.php/Api/get_signature',
     corpId:'',
     yearArr:yearArr,

package-lock.json

@@ -86,6 +86,14 @@
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "dingtalk-jsapi": {
+      "version": "2.13.9",
+      "resolved": "https://registry.npm.taobao.org/dingtalk-jsapi/download/dingtalk-jsapi-2.13.9.tgz?cache=0&sync_timestamp=1605844810094&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdingtalk-jsapi%2Fdownload%2Fdingtalk-jsapi-2.13.9.tgz",
+      "integrity": "sha1-5u+MXKAm0zbo1qbC6WAZb+IFAUM=",
+      "requires": {
+        "promise-polyfill": "^7.1.0"
+      }
+    },
     "fecha": {
       "version": "2.3.3",
       "resolved": "https://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
@@ -96,6 +104,11 @@
       "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
+    "promise-polyfill": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz",
+      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs="
+    },
     "regenerator-runtime": {
       "version": "0.13.5",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052481783&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",

pages/deploy/addMoney/addMoney.js

@@ -1,14 +1,23 @@
 var app = getApp();
 var that;
+import 'dingtalk-jsapi/entry/mobile';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
 Page({
   data: {},
   onLoad(query) {
     that = this;
     dd.setNavigationBar({ title: "续费升级" });
   },
-  openUrl(){
-     dd.navigateTo({
-          url: '../sku/sku?src'
+  openUrl() {
+    app.$get("api/order/goods/sku", { callback: "page/deploy/sku/sku", goods_code: 'DT_GOODS_881607043109331' }).then((res) => {
+      openLink({
+        url: res.data.data.url
+      })
+      // this.setData({
+      //   src: res.data.data.url
+      // })
+    }, (err) => {
+
     })
   },
   //跳转

pages/deploy/sku/sku.js

@@ -1,17 +1,21 @@
 var app = getApp();
 var that;
+import 'dingtalk-jsapi/entry/mobile';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
+
 Page({
   data: {
     src: '',
   },
   onLoad(e) {
     app.$get("api/order/goods/sku", { callback: "page/deploy/sku/sku", goods_code: 'DD_GOODS-610003' }).then((res) => {
-    //        dd.navigateTo({
-    //       url: '../sku/sku?src'
-    // })
-      this.setData({
-        src: res.data.data.url
+
+      openLink({
+        url:res.data.data.url
       })
+      // this.setData({
+      //   src: res.data.data.url
+      // })
     }, (err) => {
 
     })

pages/statistics/sectionRanking/sectionRanking.axml

@@ -6,9 +6,9 @@
     <view class="flex-1" catchTap="selectTissue">
       <text class="{{showTissue? 'activeView blue':''}}">{{TissueVal}}</text>
     </view>
-    <!-- <view class="flex-1" catchTap="selectRule">
+    <view class="flex-1" catchTap="selectRule">
       <text class="{{showRuleTwo? 'activeView blue':''}}">{{ruleVal}}</text>
-    </view> -->
+    </view>
     <view class="flex-1" catchTap="selectSx">
       <text class="{{showSx? 'activeView blue':''}}">{{sxVal}}</text>
     </view>