1.1.14

app.js

@@ -11,7 +11,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.11",
+    Version: "1.1.14",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
@@ -35,5 +35,6 @@ App({
     IsShow: 0,
     NewUserNumberMax:6,//邀请新用户最大值
     IsSaveCustom:false,//是否保存了定制
+    goto:"",//用于服务直达的跳转
   }
 })

app.json

@@ -21,5 +21,15 @@
     "navigationBarTitleText":"语文识字",
     "navigationBarTextStyle": "black",
     "backgroundColor": "#F5E2BE"   
-  }
+  },
+  "navigateToMiniProgramAppIdList": [
+    "wx46a7b4c420e6d38f",
+    "wx1fef080f74481cbd",
+    "wx331e8dd070f01d0e",
+    "wx313a8f2c0741efe1",
+    "wxb54a6d5aff836ee3",
+    "wxa5e33c61fe37dd01",
+    "wxaa1a8b48d9853872",
+    "wx80059777521b897c"
+  ]
 }

pages/about/orderlist.js

@@ -50,37 +50,50 @@ Page({
     if (e) {
       id = e.currentTarget.dataset.id;
     }
+
     var total = 0, totalFinal = 0,
       selectCount = 0, discounts = 0;
-    for (var i = 0; i < this.data.ListProgram.length; i++) {
-      if (this.data.ListProgram[i].ID == id) {
-        this.data.ListProgram[i].IsSelect = !this.data.ListProgram[i].IsSelect;
+    var remark = "", isAll = false;
+    if (id == 999) {
+      totalFinal = "150.00";
+      total = 150;
+      remark = "4款产品永久有效期";
+      isAll = true;
+      for (var i = 0; i < this.data.ListProgram.length; i++) {
+        this.data.ListProgram[i].IsSelect = false;
       }
+    }
+    else {
+      for (var i = 0; i < this.data.ListProgram.length; i++) {
+        if (this.data.ListProgram[i].ID == id) {
+          this.data.ListProgram[i].IsSelect = !this.data.ListProgram[i].IsSelect;
+        }
 
-      if (this.data.ListProgram[i].IsSelect) {
-        total += this.data.ListProgram[i].Price;
-        selectCount++;
+        if (this.data.ListProgram[i].IsSelect) {
+          total += this.data.ListProgram[i].Price;
+          selectCount++;
+        }
       }
-    }
 
-    var discount = 1;
-    if (selectCount >= 3) {
-      discount = 0.7
-    }
-    else if (selectCount == 2) {
-      discount = 0.8
-    }
+      var discount = 1;
+      if (selectCount >= 3) {
+        discount = 0.7
+      }
+      else if (selectCount == 2) {
+        discount = 0.8
+      }
 
-    totalFinal = total * discount;
-    discounts = total - totalFinal;
+      totalFinal = total * discount;
+      discounts = total - totalFinal;
 
-    total = Math.round(total) / 100;
-    totalFinal = Math.round(totalFinal) / 100;
-    discounts = Math.round(discounts) / 100;
+      total = Math.round(total) / 100;
+      totalFinal = Math.round(totalFinal) / 100;
+      discounts = Math.round(discounts) / 100;
 
-    var remark = "一款原价，成套购买更划算";
-    if (discount < 1)
-      remark = "套装购买现享 " + (discount * 10) + " 折，已优惠 " + discounts + " 元"
+      remark = "一款原价，成套购买更划算";
+      if (discount < 1)
+        remark = "套装购买现享 " + (discount * 10) + " 折，已优惠 " + discounts + " 元"
+    }
 
     this.setData({
       ListProgram: this.data.ListProgram,
@@ -88,6 +101,7 @@ Page({
       Remark: remark,
       Total: total,
       Discount: discount,
+      IsAll: isAll,
     });
 
   },
@@ -98,7 +112,7 @@ Page({
     if (!isPaying) {
       isPaying = true;
       var that = this;
-      var money = this.data.TotalFinal;
+      var money = Number(this.data.TotalFinal);
       var detail = "";
       for (var i = 0; i < this.data.ListProgram.length; i++) {
         if (this.data.ListProgram[i].IsSelect) {
@@ -115,24 +129,47 @@ Page({
         });
       }
       else {
-        server.payMoney(4, money, detail, function (data) {
-          wx.setStorageSync("IsShowActivty", true);
-          var that = this;
-          wx.getSetting({
-            success(res) {
-              if (res.authSetting['scope.userInfo']) {
-                wx.navigateTo({
-                  url: '../about/payfinished?type=all',
-                });
+        if (money >= 150) {
+          detail = "89:3750,98:3750,99:3750,106:3750";
+          server.payMoney(6, money, detail, function (data) {
+            wx.setStorageSync("IsShowActivty", true);
+            var that = this;
+            wx.getSetting({
+              success(res) {
+                if (res.authSetting['scope.userInfo']) {
+                  wx.navigateTo({
+                    url: '../about/payfinished?type=all',
+                  });
+                }
+                else {
+                  wx.navigateTo({
+                    url: '../about/payfinished?type=accredit',
+                  });
+                }
               }
-              else {
-                wx.navigateTo({
-                  url: '../about/payfinished?type=accredit',
-                });
+            });
+          });
+        }
+        else {
+          server.payMoney(4, money, detail, function (data) {
+            wx.setStorageSync("IsShowActivty", true);
+            var that = this;
+            wx.getSetting({
+              success(res) {
+                if (res.authSetting['scope.userInfo']) {
+                  wx.navigateTo({
+                    url: '../about/payfinished?type=all',
+                  });
+                }
+                else {
+                  wx.navigateTo({
+                    url: '../about/payfinished?type=accredit',
+                  });
+                }
               }
-            }
+            });
           });
-        });
+        }
       }
       setTimeout(function () {
         isPaying = false;

pages/about/orderlist.wxml

@@ -1,9 +1,8 @@
 <view class="container FlexColumn">
-  <view class="panel1 FlexColumn">
-    <image src="../../images/06005.png" class="img06005" />
 
-  </view>
   <view class="panel2 FlexColumn">
+    <image src="../../images/ad1.png" class="ad1" />
+
     <view class="panelItem FlexRow" wx:for="{{ListProgram}}" wx:key="index" bindtap='selectProgram' data-id="{{item.ID}}">
       <image src="../../images/SelectYes.png" class="SelectImg" wx:if="{{item.IsSelect}}" />
       <image src="../../images/SelectNo.png" class="SelectImg" wx:if="{{!item.IsSelect}}" />
@@ -14,26 +13,44 @@
         <!-- <view class="text3" wx:if="{{item.Remark2}}">{{item.Remark2}}</view> -->
       </view>
     </view>
+
+    <image src="../../images/ad2.png" class="ad1" />
+
+    <view class="panelItem FlexRow" bindtap='selectProgram' data-id="{{999}}">
+      <image src="../../images/SelectYes.png" class="SelectImg" wx:if="{{IsAll}}" />
+      <image src="../../images/SelectNo.png" class="SelectImg" wx:if="{{!IsAll}}" />
+      <view class="img060090 FlexRow">
+        <image src="../../images/06009.png" class="img060091" />
+        <image src="../../images/06006.png" class="img060091" />
+        <image src="../../images/06007.png" class="img060091" />
+        <image src="../../images/06008.png" class="img060091" />
+      </view>
+      <view class="text FlexColumn">
+        <view class="text1">4款产品</view>
+        <view class="text2">永久有效期</view>
+      </view>
+    </view>
+
     <view class="text0 FlexRow" bindtap='gotoFeedback'>
       <view>如遇支付问题请</view>
       <view class="red">联系客服</view>
       <view>为您处理</view>
     </view>
-     <view style='width:100%;height:500rpx;' >
-    </view> 
+    <view style='width:100%;height:300rpx;'>
+    </view>
   </view>
 
   <view class="bottom FlexColumn">
-    
+
     <view class="bottom1 FlexColumn">
       <view class="top FlexRow" wx:if="{{Total>0}}">
         <view class="left">
           {{TotalFinal}}元
         </view>
         <view class="right FlexColumn">
-          <view class="text3 text2 FlexRow">原价
+          <view class="text3 text2 FlexRow" wx:if="{{Total<150}}">原价
             <view class="total">{{Total}}</view> 元</view>
-           <view class="text2">{{Remark}}</view> 
+          <view class="text2">{{Remark}}</view>
         </view>
       </view>
       <view class="top FlexRow" wx:if="{{Total==0}}">
@@ -45,7 +62,7 @@
           <view class="text2">请选择商品</view>
         </view>
       </view>
-      <view class="btn" bindtap="getPay" wx:if="{{Total>0}}" >
+      <view class="btn" bindtap="getPay" wx:if="{{Total>0}}">
         <view class="btn1">立即购买</view>
       </view>
       <view class="btn5 btn" wx:if="{{Total==0}}">

pages/about/orderlist.wxss

@@ -4,22 +4,17 @@
   color: #1e1e1e;
   font-weight:500;
 }
-
-.panel1{
+.panel2{
   width: 100%;
+  background-color: #f0f0f0;
   justify-content: flex-start;
-  
 }
-.panel1 .img06005{
+
+.ad1{
   width:100%;
-  height:81rpx;
+  height:146rpx;
 }
 
-.panel2{
-  width: 100%;
-  background-color: #f0f0f0;
-  justify-content: flex-start;
-}
 .panel2 .panelItem{
   width: 100%;
   min-height:160rpx;
@@ -34,13 +29,29 @@
   margin-left: 40rpx;
   margin-top: 60rpx;
 }
+
 .panel2 .img06009{
   width: 80rpx;
   height:80rpx;
   margin-left: 50rpx;
   margin-top: 40rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.panel2 .img060090{
+  width: 80rpx;
+  height:60rpx;
+  margin-left: 50rpx;
+  margin-top: 45rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
+.panel2 .img060091{
+  width: 30rpx;
+  height:30rpx;
+  margin: 0 10rpx 10rpx 0;
 }
-
 .panel2 .text{
   margin-left: 30rpx;
   align-items: flex-start;

pages/index/index.js

@@ -18,6 +18,10 @@ Page({
         console.log("UserID:" + options.UserID);
         app.globalData.introducer = options.UserID;
       }
+      if (options.goto) {
+        console.log("goto:" + options.goto);
+        app.globalData.goto = options.goto;
+      }
       if (options.SourceID) {
         console.log("SourceID:" + options.SourceID);
         app.globalData.SourceID = options.SourceID;

pages/main/index.js

@@ -75,13 +75,24 @@ Page({
         url: '../about/paylist',
       });
     }
-    else{
-      var IsRemindTest = wx.getStorageSync("IsRemindTest");
-      if (IsRemindTest == 1) {
-        wx.setStorageSync('IsRemindTest', 2);
+    else {
+      if (app.globalData.goto) {
+        var url = "../main/list?id=1";
+        if (app.globalData.goto == "test")
+          url = '../main/test';
         wx.navigateTo({
-          url: '../main/test',
+          url: url,
         });
+        app.globalData.goto = "";
+      }
+      else{
+        var IsRemindTest = wx.getStorageSync("IsRemindTest");
+        if (IsRemindTest == 1) {
+          wx.setStorageSync('IsRemindTest', 2);
+          wx.navigateTo({
+            url: '../main/test',
+          });
+        }
       }
     }
   },
@@ -263,10 +274,21 @@ Page({
         else
           app.globalData.DayNumber = data.DayNumber;
 
-        if (data.IsShow)
-          app.globalData.IsShow = data.IsShow;
-        else
-          app.globalData.IsShow = 0;
+        var isShow = data.IsShow;
+        if (isShow==-1){
+          isShow=0;
+        }
+        else{
+          var systemInfo = wx.getSystemInfoSync();
+          if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+            isShow = 1;
+          }
+        }
+        
+        app.globalData.IsShow = isShow;
+        that.setData({
+          IsShow: isShow,
+        });
 
         app.globalData.userInfo.IsMember = data.IsMember;
 

project.config.json

@@ -58,15 +58,15 @@
 				},
 				{
 					"id": -1,
-					"name": "复习",
-					"pathName": "pages/main/review",
+					"name": "定单列表",
+					"pathName": "pages/about/orderlist",
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "\b测试",
-					"pathName": "pages/main/test",
-					"query": ""
+					"id": 5,
+					"name": "服务直达",
+					"pathName": "pages/index/index",
+					"query": "goto=1"
 				}
 			]
 		}