wendy 2 anni fa
parent
commit
b0ae4361e7

+ 4 - 2
pages/OfflinePayment/OfflinePayment.js

@@ -11,8 +11,8 @@ Page({
11 11
     agree: true,
12 12
     img:'',
13 13
     fileid: '',
14
-    bidding_agreement_path:'https://www.eqbidding.com/web-cp-all/img_pm/file/1518499383111454720',
15
-    bidding_rules_path:'https://www.eqbidding.com/web-cp-all/img_pm/file/1518499383111454720',
14
+    bidding_agreement_path:'',
15
+    bidding_rules_path:'',
16 16
   },
17 17
   formSubmit: function(e) {
18 18
     
@@ -191,6 +191,8 @@ openFile(event) { // item为当前点击的事物对象
191 191
     this.setData({
192 192
       kid: options.kid,
193 193
       deposit: options.deposit,
194
+      bidding_agreement_path:options.bidding_agreement_path,
195
+      bidding_rules_path:options.bidding_rules_path,
194 196
     })
195 197
 
196 198
   },

+ 36 - 6
pages/details/details.js

@@ -267,6 +267,7 @@ Page({
267 267
           })
268 268
         }
269 269
         //根据状态计算时间
270
+        clearInterval(_this.data.setInval);
270 271
         _this.setGoodsTime(data.data.data[0].bid_opening, data.data.data[0].time_opening, data.data.data[0].time_end);
271 272
         //设置进入页面时默标签显示商品详情
272 273
         _this.setData({
@@ -313,8 +314,9 @@ Page({
313 314
    * 生命周期函数--监听页面隐藏
314 315
    */
315 316
   onHide: function() {
316
-    clearInterval(this.data.setInval);
317
-    clearInterval(this.data.setMtimeVal);
317
+    clearInterval(_this.data.setInval);
318
+    clearInterval(_this.data.setMtimeVal);
319
+    clearInterval(_this.data.serverTimeVal);
318 320
   },
319 321
 
320 322
   /**
@@ -367,7 +369,7 @@ Page({
367 369
         console.log("id",_this.data.goodsInfo.kid)
368 370
         console.log("price",_this.data.goodsInfo.price_bidder)
369 371
         console.log("ydw-token",wx.getStorageSync('key').ydw_token)
370
-        console.log("页面状态",data)
372
+        console.log("页面状态",data.data)
371 373
         _this.setData({
372 374
           online_sum: data.data.online_sum
373 375
         })
@@ -391,12 +393,13 @@ Page({
391 393
 
392 394
         }
393 395
         if (data.data.offer_status) {
396
+   
394 397
           _this.setPageData(_this.data.goodsInfo.kid);
395 398
           if (data.data.offer_price_persion !== wx.getStorageSync('persion').persion.kid) {
396 399
             wx.showToast({
397 400
               title: '有新的报价!',
398 401
               icon: 'none',
399
-              duration: 3000
402
+              duration: 1000
400 403
             });
401 404
           };
402 405
         };
@@ -443,7 +446,10 @@ Page({
443 446
       dataType: 'json',
444 447
       responseType: 'text',
445 448
       success: function(data) {
446
-        console.log("更新数据",data)
449
+        console.log("结束时间",data.data.data[0].time_end)
450
+        console.log("结束时间", _this.getMyDate(parseInt(_this.data.nowTime)))
451
+        console.log("结束时间", _this.getMyDate(parseInt(data.data.data[0].time_end)))
452
+       
447 453
         var pmItem = data.data.data[0];
448 454
         if (data.data.data[0].price_bidder == 0) {
449 455
           _this.setData({
@@ -472,6 +478,26 @@ Page({
472 478
       complete: function(res) {},
473 479
     })
474 480
   },
481
+   getMyDate: function(str) {
482
+    let _this = this;
483
+    var oDate = new Date(str),
484
+    oYear = oDate.getFullYear(),
485
+    oMonth = oDate.getMonth()+1,
486
+    oDay = oDate.getDate(),
487
+    oHour = oDate.getHours(),
488
+    oMin = oDate.getMinutes(),
489
+    oSen = oDate.getSeconds(),
490
+    oTime = oYear +'-'+ _this.addZero(oMonth) +'-'+ _this.addZero(oDay) +' '+ _this.addZero(oHour) +':'+
491
+    _this.addZero(oMin) +':'+_this.addZero(oSen);
492
+    return oTime;
493
+},
494
+//补零操作
495
+ addZero:function(num){
496
+  if(parseInt(num) < 10){
497
+      num = '0'+num;
498
+  }
499
+  return num;
500
+},
475 501
   //设置服务器时间
476 502
   setServerTime: function() {
477 503
     let _this = this;
@@ -713,7 +739,7 @@ _this.setData({
713 739
     if (_this.data.onlineFlag) {
714 740
         onlineUrl = '../payDeposit/payDeposit?kid=' + _this.data.goodsInfo.kid + '&deposit=' + _this.data.goodsInfo.price_guarantee + '&auction_way=' + _this.data.goodsInfo.auction_way + "&time=" + _this.data.goodsInfo.time_opening
715 741
     } else {
716
-      onlineUrl = '../OfflinePayment/OfflinePayment?kid=' + _this.data.goodsInfo.kid + '&deposit=' + _this.data.goodsInfo.price_guarantee
742
+      onlineUrl = '../OfflinePayment/OfflinePayment?kid=' + _this.data.goodsInfo.kid + '&deposit=' + _this.data.goodsInfo.price_guarantee + '&bidding_agreement_path=' + _this.data.goodsInfo.bidding_agreement_path + '&bidding_rules_path=' + _this.data.goodsInfo.bidding_rules_path
717 743
     }
718 744
     wx.navigateTo({
719 745
       url: onlineUrl,
@@ -727,6 +753,10 @@ _this.setData({
727 753
   //跳转出价记录
728 754
   getRecordlist:function(e){
729 755
     let _this = this;
756
+    clearInterval(_this.data.setInval);
757
+    clearInterval(_this.data.setMtimeVal);
758
+    clearInterval(_this.data.serverTimeVal);
759
+    
730 760
     wx.navigateTo({
731 761
       url: '/pages/recordlist/recordlist?kid='+ _this.data.goodsInfo.kid 
732 762
     })

+ 2 - 2
pages/details/details.wxml

@@ -2,7 +2,7 @@
2 2
   <!-- 拍卖客服 -->
3 3
   <LiveCustomer wx:if="{{showLiveCustomer}}" pullUrl="{{live_room_id}}" kid="{{kid}}" online_sum="{{online_sum}}"></LiveCustomer>
4 4
   <view class="banner-box">
5
-    <swiper indicator-dots="{{indicatorDots}}" indicator-color="rgba(255,255,255,0.5)" indicator-active-color="#ffffff" autoplay="{{true}}" interval="{{3000}}" duration="{{500}}" circular="{{true}}">
5
+    <swiper indicator-dots="{{indicatorDots}}" indicator-color="rgba(255,255,255,0.5)" indicator-active-color="#ffffff" autoplay="{{false}}" interval="{{3000}}" duration="{{500}}" circular="{{true}}">
6 6
       <block wx:for="{{bannerImg}}" wx:key="{{index}}">
7 7
         <swiper-item>
8 8
           <block wx:if="{{index == 0 && video_file_id.length > 0}}">
@@ -211,7 +211,7 @@
211 211
       <text>竞买已结束</text>
212 212
     </view>
213 213
     <view wx:elif="{{is_sign&&!is_pay}}" class="end">
214
-      <text>已报名,请尽快进行线下支付</text>
214
+      <text>已报名,请线下支付并等待审核</text>
215 215
     </view>
216 216
     <navigator bindtap='navPayPage' url=""  hover-stay-time="10" wx:elif="{{!item_submit && goodsInfo.bid_opening !== '已结束'}}">
217 217
       <text>交保证金报名</text>

+ 1 - 1
pages/details/template/template.wxml

@@ -18,7 +18,7 @@
18 18
   </view>
19 19
   <view class="goods-detail-content">
20 20
     <text class="goods-caution-title">商品详情</text>
21
-    <image src="{{prodUrl}}web-cp-all/img_pm/img/{{item.img}}" wx:for="{{pageData}}" wx:key="{{index}}"  mode="aspectFill" lazy-load="{{true}}"></image>
21
+    <!-- <image src="{{prodUrl}}web-cp-all/img_pm/img/{{item.img}}" wx:for="{{pageData}}" wx:key="{{index}}"  mode="aspectFill" lazy-load="{{true}}"></image> -->
22 22
     <view class="text_detail">{{bid_content}}</view>
23 23
   </view>
24 24
 </template>

+ 1 - 0
pages/live/live.js

@@ -180,6 +180,7 @@ Page({
180 180
       dataType: 'json',
181 181
       responseType: 'text',
182 182
       success: function(data) {
183
+        console.log(data)
183 184
         if(data.data.live_room.live_status === "已开始") {
184 185
           _this.setData({
185 186
             auction : false

+ 1 - 0
pages/livehome/livehome.js

@@ -23,6 +23,7 @@ Page({
23 23
       dataType: 'json',
24 24
       responseType: 'text',
25 25
       success: function(data) {
26
+        console.log(wx.getStorageSync('key').ydw_token)
26 27
         console.log(data.data)
27 28
         _this.setData({
28 29
             playData: data.data.data,

+ 6 - 1
pages/mine/mine.js

@@ -272,7 +272,12 @@ Page({
272 272
             dataType: 'json',
273 273
             responseType: 'text',
274 274
             success: function (data) {
275
-              wx.setStorageSync('persion', { 'persion': data.data.persion });   
275
+              wx.setStorageSync('persion', { 'persion': data.data.persion });  
276
+              if (!wx.getStorageSync('persion').persion.mobile) {
277
+                wx.navigateTo({
278
+                  url: 'wxml/Connect/Connect'
279
+                })
280
+              }
276 281
             },
277 282
             fail: function (res) { }
278 283
           })

+ 6 - 1
pages/mine/wxml/playpusher/playpusher.js

@@ -125,7 +125,9 @@ Page({
125 125
       dataType: 'json',
126 126
       responseType: 'text',
127 127
       success: function (data) {
128
-        //console.log(data);
128
+        console.log(wx.getStorageSync('key').ydw_token);
129
+        console.log(live_room_kid);
130
+        console.log(data);
129 131
         if ( !data.data.msg ) {
130 132
           wx.showModal({
131 133
             title: '提示',
@@ -268,6 +270,8 @@ Page({
268 270
   },
269 271
   //每秒刷新页面状态
270 272
   checkState: function (goodsKid, price) {
273
+    console.log("id"+goodsKid)   
274
+     console.log("price"+price)
271 275
     let _this = this;
272 276
     wx.request({
273 277
       url: app.globalData.prodUrl + 'web-pm/wx/pm/check_item_status',
@@ -282,6 +286,7 @@ Page({
282 286
       dataType: 'json',
283 287
       responseType: 'text',
284 288
       success: function(data) {
289
+        console.log("data"+data)
285 290
         // if (data.data.list.length !== 0) {
286 291
         //   let chatlist = _this.data.chatList;
287 292
         //   _this.setData({

+ 1 - 1
pages/mine/wxml/release/release.js

@@ -386,7 +386,7 @@ Page({
386 386
         var priceincrease=e.detail.value.priceincrease;
387 387
       } else if (e.detail.value.payType == 1) {
388 388
         var price_start = 0;
389
-        var update_interval = 10;
389
+        var update_interval = 180;
390 390
         var priceincrease =0;
391 391
       }
392 392
       if (e.detail.value.checked == true) {

+ 2 - 2
pages/mine/wxml/release/release.wxml

@@ -171,14 +171,14 @@
171 171
   </view>
172 172
   <view class="choosefile">
173 173
     <view>
174
- 竞买协议:
174
+ 竞买协议(上传pdf文件):
175 175
     </view>
176 176
     <text>{{filename1}}</text>
177 177
     <button  bindtap="upLoadAction1"  plain="true" size="mini">选择</button>
178 178
   </view>
179 179
   <view class="choosefile">
180 180
     <view>
181
- 竞买规则:
181
+ 竞买规则(上传pdf文件):
182 182
     </view>
183 183
     <text>{{filename2}}</text>
184 184
     <button  bindtap="upLoadAction2"  plain="true" size="mini">选择</button>

+ 9 - 21
project.config.json

@@ -1,7 +1,8 @@
1 1
 {
2
-  "description": "项目配置文件",
2
+  "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
3 3
   "packOptions": {
4
-    "ignore": []
4
+    "ignore": [],
5
+    "include": []
5 6
   },
6 7
   "setting": {
7 8
     "urlCheck": true,
@@ -39,31 +40,18 @@
39 40
     "minifyWXML": true,
40 41
     "showES6CompileOption": false,
41 42
     "useCompilerPlugins": false,
42
-    "ignoreUploadUnusedFiles": true
43
+    "ignoreUploadUnusedFiles": true,
44
+    "useStaticServer": true
43 45
   },
44 46
   "compileType": "miniprogram",
45 47
   "libVersion": "2.23.2",
46 48
   "appid": "wx40daa5b3428e16ef",
47 49
   "projectname": "ypgapp2",
48
-  "debugOptions": {
49
-    "hidedInDevtools": []
50
-  },
51
-  "isGameTourist": false,
52 50
   "simulatorType": "wechat",
53 51
   "simulatorPluginLibVersion": {},
54
-  "condition": {
55
-    "search": {
56
-      "list": []
57
-    },
58
-    "conversation": {
59
-      "list": []
60
-    },
61
-    "game": {
62
-      "currentL": -1,
63
-      "list": []
64
-    },
65
-    "miniprogram": {
66
-      "list": []
67
-    }
52
+  "condition": {},
53
+  "editorSetting": {
54
+    "tabIndent": "insertSpaces",
55
+    "tabSize": 2
68 56
   }
69 57
 }