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

app.js

@@ -332,5 +332,10 @@ App({
     that.getTypes(function () { });
     that.getCorp(options.query.corpId);
     that.globalData.corpId = options.query.corpId;
+    
+    // dd.setTabBarBadge({
+    //   index: 0,
+    //   text: '新'
+    // })
   },
 });

pages/deploy/addMoney/addMoney.axml

@@ -1,5 +1,5 @@
 <view>
-  <image mode="scaleToFill" src="../../../image/money.jpg" style="width:100%;height:1360rpx"/>
+  <image  src="../../../image/money.jpg" mode='widthFix' style="width:100%;"/>
   <view style="height:100rpx">
     
   </view>

pages/deploy/buy/buy.acss

@@ -0,0 +1,33 @@
+.vip{
+  width: 100%;
+  vertical-align:bottom
+}
+.footer{
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #232d48;
+  padding: 10rpx;
+  /* border-top: 1px solid #f1f1f1; */
+  box-sizing: border-box;
+}
+.footer view{
+  border-radius: 50rpx;
+  background-image: linear-gradient(to bottom, #ffeab2 0%, #e1bf66 100%);
+  color: #232d48;
+  height: 88rpx;
+  text-align: center;
+  line-height: 88rpx;
+}
+.icon{
+  width: 24rpx;
+  height: 24rpx;
+  margin-right: 28rpx;
+}
+.msg{
+  background: #FFF5CE;
+  color: #FFB441;
+  padding:4rpx 0;
+  font-size: 30rpx;
+}

pages/deploy/buy/buy.axml

@@ -1,3 +1,11 @@
-<view>
-  内购页面
+<view style="line-height: 0rpx;">
+  <view class="flex-box-ce flex-center-center msg" a:if="{{vipData.status==2}}">
+    <image mode="scaleToFill" class="icon" src="../../../image/xf.png"/>
+    <text>{{vipData.msg}}</text>     
+  </view>
+  <image mode="scaleToFill" src="{{item}}" class="vip" mode='widthFix' a:for="{{vipData.banner}}"/>
+  <view style="height:100rpx"></view>
+  <view class="footer" onTap="openUrl">
+    <view>成为尊享会员</view>
+  </view>
 </view>

pages/deploy/buy/buy.js

@@ -4,15 +4,29 @@ import 'dingtalk-jsapi/entry/mobile';
 import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
 Page({
   data: {
-
+    vipData:{}
   },
-  onLoad() {
+  onLoad(e) {
     that = this;
-    dd.setNavigationBar({ title: "我的" });
+    dd.setNavigationBar({ title: "vip" });
+    dd.setStorage({
+      key: 'isShowNew',
+      data: true,
+    });
+    if(e.code){
+        this.getDetail(e.code)
+     }
+  },
+  getDetail(code){
+    app.$get("api/order/goods/info", {goods_code:code}).then((res) => {
+        this.setData({
+          vipData:res.data.data,
+        })
+    })
   },
   //跳转
-  openView(e) {
-    app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: 'DT_GOODS_881634105565156' }).then((res) => {
+  openUrl() {
+    app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: this.data.vipData.goods_code }).then((res) => {
       openLink({
           url: res.data.data.url
       })

pages/deploy/index/index.acss

@@ -4,25 +4,52 @@
   background-color: #26A2FF;
   margin-bottom: 94rpx;
 }
-.xusj{
-  /* opacity: 0 */
+.vip{
+  padding:0 20rpx;
+  line-height: 0rpx;
+  position: relative;
+}
+.vip image{
+  width: 100%;
+  height: 140rpx;
+}
+.btn{
+    background-image: linear-gradient(to bottom, #ffeab2 0%, #e1bf66 100%);
+    text-align: center;
+    color: #232d48;
+    border-radius: 50rpx;
+    line-height: 70rpx;
+    height: 70rpx;
+    padding: 0 20rpx;
+    position: absolute;
+    right: 40rpx;
+    width: 160rpx;
+    top: 50%;
+    margin-top: -35rpx;
+    text-align: center;
+    font-size: 32rpx;
+}
+.new{
+  background: red;
+  color: #fff;
+  border-radius: 50rpx;
+  margin-left: 20rpx;
+  font-size: 24rpx;
+  padding: 4rpx 6rpx;
 }
 .head{
-  position: absolute;
-  top: 0;
-  left: 32rpx;
-  right: 32rpx;
-  border-radius: 20rpx;
   background-color: #fff;
   box-shadow: 0 0.04rem 0.12rem 0 rgba(0,0,0,.05);
   height: 140rpx;
+  border-bottom: 1px solid #f1f1f1;
 }
-.head .flex-box{
+.head .flex-box-ce{
   padding:0 28rpx;
   height: 100%;
 }
 .name{
   font-size: 36rpx;
+  margin-left: 20rpx;
 }
 .li{
   background-color: #fff;

pages/deploy/index/index.axml

@@ -1,27 +1,31 @@
 <view>
   <view class="head">
-    <view class="flex-box flex-center-center">
-      <view class="name flex-1 font-flex-word">
+    <view class="flex-box-ce">
+      <img-box name="{{userData.name}}" imgUrl="{{userData.img_url}}" height="100rpx" width="100rpx"></img-box>
+      <view class="name font-flex-word">
         <view>{{userData.name}}</view>
         <view class="fontColorF font-flex-word" style="font-size:28rpx;margin-top:10rpx;width:80%">{{userData.post}}</view>
       </view>
-      <img-box name="{{userData.name}}" imgUrl="{{userData.img_url}}" height="100rpx" width="100rpx"></img-box>
     </view>
   </view>
   <view class="margin-bottom">
-    <view class="top"></view>
+    <!-- <view class="top"></view> -->
     <view class="header">
       <view class="flex-box flex-v-ce li margin-bottom">
         <image class="img-left" mode="scaleToFill" src="../../../image/xf.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
+        <view class="flex-box flex-v-ce flex-1" style="padding: 20rpx 0;">
           <view class="title flex-1">
             <view>当前为{{corpMessage.package_name}}</view>
-            <view class="date">有效期至
-              <text style="color:#FF9600">{{corpMessage.expire_time}}</text></view>
+            <view class="date">有效期至<text style="color:#FF9600">{{corpMessage.expire_time}}</text></view>
           </view>
           <view class="xusj" data-index="1" onTap="openView">续费升级</view>
         </view>
       </view>
+      <view class="vip margin-bottom" a:if="{{vipData}}">
+        <image mode="scaleToFill" src="../../../image/vip.png"></image>
+        <view class="btn"  onTap="openView2">{{vipText}}</view>
+      </view>
+
       <!-- <view class="flex-box flex-v-ce li " data-index="2" onTap="openView">
         <image class="img-left" mode="scaleToFill" src="../../../image/bmyg.png"></image>
         <view class="flex-box flex-v-ce flex-1 li-right">
@@ -43,7 +47,14 @@
           <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
         </view>
       </view> -->
-      
+      <!-- <view class="flex-box flex-v-ce li" data-index="7" onTap="openView">
+        <image class="img-left" mode="scaleToFill" src="../../../image/bmyg.png"></image>
+        <view class="flex-box flex-v-ce flex-1 li-right">
+          <view class="title flex-1">上面落地服务 <text class="new" a:if="{{isShowNew}}">new</text></view>
+          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
+        </view>
+      </view> -->
+
       <view class="flex-box flex-v-ce li" data-index="5" onTap="openView">
         <image class="img-left" mode="scaleToFill" src="../../../image/sj.png"></image>
         <view class="flex-box flex-v-ce flex-1 li-right">
@@ -52,20 +63,13 @@
         </view>
       </view>
 
-      <view class="flex-box flex-v-ce li " data-index="6" onTap="openView">
+      <view class="flex-box flex-v-ce li nodeBer" 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

@@ -5,12 +5,39 @@ import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
 Page({
   data: {
     userData:[],
-    corpMessage:{}
+    corpMessage:{},
+    vipText:'立即开通',
+    isShowNew:true,
+    vipData:'',
   },
   onLoad(query) {
     that = this;
     dd.setNavigationBar({ title: "我的" });
     this.setData({userData:app.globalData.userData,corpMessage:app.globalData.corpMessage});
+    this.getVip();
+  },
+  getVip(){
+    app.$get("api/order/goods/special").then((res) => {
+        this.setData({
+          vipData:res.data.data,
+          vipText:res.data.data.status==2?'已开通':'立即开通'
+        })
+    })
+  },
+  openView2(){
+    dd.navigateTo({
+      url: '../buy/buy?code=' + this.data.vipData.goods_code
+    })
+  },
+  onShow(){
+    dd.getStorage({
+      key: 'isShowNew',
+      success: function (res) {
+        if(res.data){
+          that.setData({isShowNew:false});
+        }
+      }
+    });
   },
   //跳转
   openView(e) {
@@ -30,6 +57,7 @@ Page({
       { url: '../buy/buy', query: '' },
       { url: '../buy/buy', query: '' },
     ];
+    
     dd.navigateTo({
       url: urls[index].url+'?'+urls[index].query
     })

pages/deploy/sku/sku.axml

@@ -2,4 +2,5 @@
   <view>
     购买成功
   </view>
+  <button type="primary" onTap="">回到首页</button>
 </view>

pages/workbench/index/index.js

@@ -435,7 +435,6 @@ Page({
   },
   //获取积分事件
   getIncidentLsit() {
-
     app.$get("api/integral/statistics/integral", { month: app.globalData.month, page: 1, page_size: 5, employee_ids: app.globalData.userData.id }).then((res) => {
       var data = res.data.data.list;
       data.map((item) => {