Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_xcx into dev

app.json

@@ -57,7 +57,8 @@
     "pages/statistics/logDetail/logDetail",
     "pages/demo/demo",
     "pages/statistics/my_sp/my_sp",
-    "pages/statistics/allTask/allTask"
+    "pages/statistics/allTask/allTask",
+    "pages/deploy/buy/buy"
   ],
   "window": {
     "defaultTitle": "功道云",

pages/deploy/addMoney/addMoney.js

@@ -9,17 +9,12 @@ Page({
     dd.setNavigationBar({ title: "续费升级" });
   },
   openUrl() {
-    // app.$get("api/order/goods/sku", { callback: "page/deploy/sku/sku", goods_code: 'DT_GOODS_881634105565156' }).then((res) => {
+    app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: 'DT_GOODS_881634105565156' }).then((res) => {
+      console.log(res.data.data.url)
       openLink({
-    //       url: res.data.data.url
-        url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC969F1A50AEF2E5E320588012470F1AB045&token=d37751d45abad15178adf60f936d7c28&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7'
+          url: res.data.data.url
+        // url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC969F1A50AEF2E5E320588012470F1AB045&token=d37751d45abad15178adf60f936d7c28&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7'
       })
-    // })
-  },
-  //跳转
-  openView() {
-    dd.navigateTo({
-      url: '../sku/sku'
     })
   },
 });

pages/deploy/buy/buy.axml

@@ -0,0 +1,3 @@
+<view>
+  内购页面
+</view>

pages/deploy/buy/buy.js

@@ -0,0 +1,21 @@
+var app = getApp();
+var that;
+import 'dingtalk-jsapi/entry/mobile';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
+Page({
+  data: {
+
+  },
+  onLoad() {
+    that = this;
+    dd.setNavigationBar({ title: "我的" });
+  },
+  //跳转
+  openView(e) {
+    app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: 'DT_GOODS_881634105565156' }).then((res) => {
+      openLink({
+          url: res.data.data.url
+      })
+    })
+  },
+});

pages/deploy/buy/buy.json

@@ -0,0 +1 @@
+{}

pages/deploy/index/index.axml

@@ -51,14 +51,21 @@
           <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
         </view>
       </view>
-      <view class="flex-box flex-v-ce li nodeBer" data-index="6" onTap="openView">
+
+      <view class="flex-box flex-v-ce li " data-index="6" onTap="openView">
         <image class="img-left" mode="scaleToFill" src="../../../image/kf.png"></image>
         <view class="flex-box flex-v-ce flex-1 li-right">
           <view class="title flex-1">官方服务群</view>
           <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
         </view>
       </view>
-
+      <view class="flex-box flex-v-ce li nodeBer" data-index="7" onTap="openView">
+        <image class="img-left" mode="scaleToFill" src="../../../image/kf.png"></image>
+        <view class="flex-box flex-v-ce flex-1 li-right">
+          <view class="title flex-1">产品扩展</view>
+          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
+        </view>
+      </view>
 
     </view>
   </view>

pages/deploy/index/index.js

@@ -27,6 +27,8 @@ Page({
       { url: '../integralRule/integralRule', query: '' },
       { url: '../setCheck/setCheck', query: '' },
       { url: '../upgrade/upgrade', query: '' },
+      { url: '../buy/buy', query: '' },
+      { url: '../buy/buy', query: '' },
     ];
     dd.navigateTo({
       url: urls[index].url+'?'+urls[index].query

pages/deploy/sku/sku.axml

@@ -1,3 +1,5 @@
 <view>
-  <web-view id="web-view-1" src="https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC969F1A50AEF2E5E320588012470F1AB045&token=d37751d45abad15178adf60f936d7c28&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7" onMessage="test"></web-view>
+  <view>
+    购买成功
+  </view>
 </view>

pages/deploy/sku/sku.js

@@ -1,23 +1,10 @@
 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) => {
-
-    //   openLink({
-    //     url:res.data.data.url
-    //   })
-      // this.setData({
-      //   src: res.data.data.url
-      // })
-    // }, (err) => {
 
-    // })
   },
 });