chengjie 7 年之前
父節點
當前提交
9cfd391805
共有 12 個文件被更改,包括 25 次插入11 次删除
  1. 2 2
      app.js
  2. 二進制
      images/02025.png
  3. 二進制
      images/02026.png
  4. 二進制
      images/02029.png
  5. 二進制
      images/02030.png
  6. 二進制
      images/02033.png
  7. 二進制
      images/02034.png
  8. 二進制
      images/03005.png
  9. 二進制
      images/06005.png
  10. 6 6
      pages/about/orderlist.js
  11. 4 3
      pages/main/index.wxml
  12. 13 0
      utils/main.js

+ 2 - 2
app.js

@@ -11,7 +11,7 @@ App({
11
     this.globalData.systemInfo = wx.getSystemInfoSync();
11
     this.globalData.systemInfo = wx.getSystemInfoSync();
12
   },
12
   },
13
   globalData: {
13
   globalData: {
14
-    Version: "1.1.5",
14
+    Version: "1.1.6",
15
     IsProduction: true,
15
     IsProduction: true,
16
     ProgramID: 106,
16
     ProgramID: 106,
17
     AppID: "wx313a8f2c0741efe1",
17
     AppID: "wx313a8f2c0741efe1",
@@ -30,7 +30,7 @@ App({
30
     userInfo: null,
30
     userInfo: null,
31
     SourceID: 0,//来源ID
31
     SourceID: 0,//来源ID
32
     DayNumber: 0,//使用天数
32
     DayNumber: 0,//使用天数
33
-    PayMoney: 9.8,//产品销售价
33
+    PayMoney: 19.8,//产品销售价
34
     BaiduToken:"",//百度开发平台token
34
     BaiduToken:"",//百度开发平台token
35
     IsShow: 0,
35
     IsShow: 0,
36
     NewUserNumberMax:6,//邀请新用户最大值
36
     NewUserNumberMax:6,//邀请新用户最大值

二進制
images/02025.png


二進制
images/02026.png


二進制
images/02029.png


二進制
images/02030.png


二進制
images/02033.png


二進制
images/02034.png


二進制
images/03005.png


二進制
images/06005.png


+ 6 - 6
pages/about/orderlist.js

@@ -26,16 +26,16 @@ Page({
26
       }, {
26
       }, {
27
         ID: 98,
27
         ID: 98,
28
         Name: "语文汉语拼音",
28
         Name: "语文汉语拼音",
29
-        Remark: "原价9.90元,有效期6个月",
30
-        Price: 990,
29
+        Remark: "原价19.80元,有效期6个月",
30
+        Price: 1980,
31
         Remark2: "",
31
         Remark2: "",
32
         Image: "06007",
32
         Image: "06007",
33
         IsSelect: true,
33
         IsSelect: true,
34
       }, {
34
       }, {
35
         ID: 106,
35
         ID: 106,
36
         Name: "语文识字",
36
         Name: "语文识字",
37
-        Remark: "原价9.80元,有效期6个月",
38
-        Price: 980,
37
+        Remark: "原价19.80元,有效期6个月",
38
+        Price: 1980,
39
         Remark2: "",
39
         Remark2: "",
40
         Image: "06008",
40
         Image: "06008",
41
         IsSelect: true,
41
         IsSelect: true,
@@ -65,10 +65,10 @@ Page({
65
 
65
 
66
     var discount = 1;
66
     var discount = 1;
67
     if (selectCount >= 3) {
67
     if (selectCount >= 3) {
68
-      discount = 0.6
68
+      discount = 0.7
69
     }
69
     }
70
     else if (selectCount == 2) {
70
     else if (selectCount == 2) {
71
-      discount = 0.7
71
+      discount = 0.8
72
     }
72
     }
73
 
73
 
74
     totalFinal = total * discount;
74
     totalFinal = total * discount;

+ 4 - 3
pages/main/index.wxml

@@ -159,7 +159,7 @@
159
 
159
 
160
   <block wx:if="{{NavClass1=='nav2'}}">
160
   <block wx:if="{{NavClass1=='nav2'}}">
161
     <view class="index6 FlexColumn">
161
     <view class="index6 FlexColumn">
162
-      <image src='../../images/{{item.ImageUrl}}' class="btn2" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
162
+      <image wx:if="{{item.ImageUrl}}" src='../../images/{{item.ImageUrl}}' class="btn2" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
163
     </view>
163
     </view>
164
     <view class="bottom FlexColumn" bindtap='gotoAllPay' wx:if="{{IsShow==1}}">
164
     <view class="bottom FlexColumn" bindtap='gotoAllPay' wx:if="{{IsShow==1}}">
165
       <view class="bottom1 FlexRow">
165
       <view class="bottom1 FlexRow">
@@ -187,9 +187,10 @@
187
     <view class="index5_3 FlexRow">
187
     <view class="index5_3 FlexRow">
188
       <image src='../../images/{{item.ImageUrl2}}' class="btn" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
188
       <image src='../../images/{{item.ImageUrl2}}' class="btn" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
189
     </view>
189
     </view>
190
-    <view style='height:360rpx;' wx:if="{{NavClass1=='nav2'}}"></view>
191
   </view>
190
   </view>
192
-
191
+  <view style='height:200rpx;' wx:if="{{NavClass1=='nav2'}}"></view>
192
+  <view style='height:50rpx;' wx:if="{{NavClass1==''}}"></view>
193
+  
193
 </view>
194
 </view>
194
 
195
 
195
 <view class="IsMemberForever container FlexColumn" style='height:{{Height}}rpx;' 
196
 <view class="IsMemberForever container FlexColumn" style='height:{{Height}}rpx;' 

+ 13 - 0
utils/main.js

@@ -129,6 +129,13 @@ function getProgramList(){
129
       left: 117,
129
       left: 117,
130
       top: 837,
130
       top: 837,
131
     },
131
     },
132
+    {
133
+      ID: 105,
134
+      ImageUrl: "03005.png",
135
+      ImageUrl2: "02033.png",
136
+      appId: 'wx1fef080f74481cbd',
137
+      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
138
+    },
132
     {
139
     {
133
       ID: 99,
140
       ID: 99,
134
       ImageUrl: "03002.png",
141
       ImageUrl: "03002.png",
@@ -156,6 +163,12 @@ function getProgramList(){
156
       left: 117,
163
       left: 117,
157
       top: 1525,
164
       top: 1525,
158
     },
165
     },
166
+    {
167
+      ID: 127,
168
+      ImageUrl2: "02034.png",
169
+      appId: 'wxaa1a8b48d9853872',
170
+      path: 'pages/index/game?SourceID=' + app.globalData.ProgramID,
171
+    },
159
   ];
172
   ];
160
 }
173
 }
161
 
174