chengjie 7 jaren geleden
bovenliggende
commit
bdf1f81f15
4 gewijzigde bestanden met toevoegingen van 14 en 2 verwijderingen
  1. 1 1
      app.js
  2. 4 0
      pages/about/orderlist.js
  3. 8 0
      pages/main/index.js
  4. 1 1
      pages/main/index.wxml

+ 1 - 1
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.14",
14
+    Version: "1.1.15",
15
     IsProduction: true,
15
     IsProduction: true,
16
     ProgramID: 106,
16
     ProgramID: 106,
17
     AppID: "wx313a8f2c0741efe1",
17
     AppID: "wx313a8f2c0741efe1",

+ 4 - 0
pages/about/orderlist.js

@@ -44,6 +44,10 @@ Page({
44
   },
44
   },
45
   onLoad: function (options) {
45
   onLoad: function (options) {
46
     this.selectProgram();
46
     this.selectProgram();
47
+
48
+    wx.pageScrollTo({
49
+      scrollTop: 1000
50
+    });
47
   },
51
   },
48
   selectProgram: function (e) {
52
   selectProgram: function (e) {
49
     var id = 0;
53
     var id = 0;

+ 8 - 0
pages/main/index.js

@@ -310,6 +310,7 @@ Page({
310
     }
310
     }
311
   },
311
   },
312
   selectNav: function (e) {
312
   selectNav: function (e) {
313
+    var that=this;
313
     var id = e.currentTarget.dataset.id;
314
     var id = e.currentTarget.dataset.id;
314
     //console.log(id);
315
     //console.log(id);
315
     if (id == "1") {
316
     if (id == "1") {
@@ -328,6 +329,13 @@ Page({
328
       wx.pageScrollTo({
329
       wx.pageScrollTo({
329
         scrollTop: 0
330
         scrollTop: 0
330
       });
331
       });
332
+
333
+      var url = e.currentTarget.dataset.url;
334
+      if (url == "orderlist") {
335
+        setTimeout(function () {
336
+          that.gotoAllPay();
337
+        }, 1000);
338
+      }
331
     }
339
     }
332
   },
340
   },
333
   goto: function (e) {
341
   goto: function (e) {

+ 1 - 1
pages/main/index.wxml

@@ -148,7 +148,7 @@
148
       </image>
148
       </image>
149
       <view class="line" wx:if="{{IsMember==0}}"></view>
149
       <view class="line" wx:if="{{IsMember==0}}"></view>
150
       <view class="text" wx:if="{{IsMember==0}}">其它优惠</view>
150
       <view class="text" wx:if="{{IsMember==0}}">其它优惠</view>
151
-      <image  wx:if="{{IsMember==0}}" src='../../images/02029.png' class="img02029" bindtap='selectNav' data-id="2"></image>
151
+      <image  wx:if="{{IsMember==0}}" src='../../images/02029.png' class="img02029" bindtap='selectNav' data-id="2" data-url="orderlist"></image>
152
 
152
 
153
       <view class="index10 index9 FlexRow">
153
       <view class="index10 index9 FlexRow">
154
         <image src='../../images/02016.png' class="imgWave" />
154
         <image src='../../images/02016.png' class="imgWave" />