| @@ -1,9 +1,9 @@ | |||||
| var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | ||||
| var appId = extConfig.appId; | var appId = extConfig.appId; | ||||
| var config = { | var config = { | ||||
| // url: "https://ciformall.youlane.cn/C/api", | |||||
| url: "https://ciformall.youlane.cn/C/api", | |||||
| // url:"https://c.malls.iformall.com/C/api", | // url:"https://c.malls.iformall.com/C/api", | ||||
| url:'https://ctest.malls.iformall.com/C/api', | |||||
| // url:'https://ctest.malls.iformall.com/C/api', | |||||
| // url:'http://10.100.33.68:7000/C/api', | // url:'http://10.100.33.68:7000/C/api', | ||||
| // url: 'http://202.165.179.86:4000/C/api', | // url: 'http://202.165.179.86:4000/C/api', | ||||
| api: { | api: { | ||||
| @@ -219,7 +219,7 @@ var config = { | |||||
| }, | }, | ||||
| weapp: { | weapp: { | ||||
| AppId: "wx649b3be73c1afe47" | |||||
| AppId: "wxea71200db93d756b" | |||||
| }, | }, | ||||
| ErrorCode: { | ErrorCode: { | ||||
| @@ -114,11 +114,27 @@ Page({ | |||||
| lists: [], | lists: [], | ||||
| }) | }) | ||||
| } | } | ||||
| var tmpArr = that.data.lists; | |||||
| tmpArr.push.apply(tmpArr, res.data.list); | |||||
| that.setData({ | |||||
| lists: tmpArr | |||||
| }) | |||||
| if (flag == 'bargaingoods'){ | |||||
| var tmpArr = that.data.lists; | |||||
| tmpArr.push.apply(tmpArr, res.data.list); | |||||
| that.setData({ | |||||
| lists: tmpArr | |||||
| }) | |||||
| } else if (flag == 'mybargain'){ | |||||
| console.log(res.data.list) | |||||
| var tmpArr = that.data.lists; | |||||
| tmpArr.push.apply(tmpArr, res.data.list); | |||||
| console.log(tmpArr) | |||||
| let lists = []; | |||||
| tmpArr.map(file => { | |||||
| if (file.orderStatus != 0) { | |||||
| lists.push(file); | |||||
| } | |||||
| }) | |||||
| that.setData({ | |||||
| lists: lists | |||||
| }) | |||||
| } | |||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| wx.showToast({ | wx.showToast({ | ||||
| @@ -241,4 +257,30 @@ Page({ | |||||
| }); | }); | ||||
| that.getList(that.data.page, that.data.flag); | that.getList(that.data.page, that.data.flag); | ||||
| }, | }, | ||||
| /** | |||||
| * 刷新 | |||||
| */ | |||||
| onPullDownRefresh: function (e) { | |||||
| let that = this; | |||||
| if (that.data.flag == 'bargaingoods'){ | |||||
| that.getBannerlist(); | |||||
| var todayDate = new Date().getTime(); | |||||
| that.setData({ | |||||
| todayDate: todayDate | |||||
| }) | |||||
| that.getList(1, "bargaingoods"); | |||||
| that.setData({ | |||||
| flag: "bargaingoods", | |||||
| bargaingoods: true, | |||||
| mybargain: false | |||||
| }) | |||||
| } else if (that.data.flag == 'mybargain'){ | |||||
| that.getList(1, "mybargain"); | |||||
| that.setData({ | |||||
| flag: "mybargain", | |||||
| bargaingoods: false, | |||||
| mybargain: true | |||||
| }) | |||||
| } | |||||
| }, | |||||
| }) | }) | ||||
| @@ -1,5 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "砍价专场", | "navigationBarTitleText": "砍价专场", | ||||
| "enablePullDownRefresh": true, | |||||
| "usingComponents": { | "usingComponents": { | ||||
| "c-banner": "../../components/banner/index", | "c-banner": "../../components/banner/index", | ||||
| "i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
| @@ -54,8 +54,7 @@ | |||||
| </view> | </view> | ||||
| <view class='dingdan' wx:if="{{lists.length==0}}"> | <view class='dingdan' wx:if="{{lists.length==0}}"> | ||||
| <image src="{{actUrl}}" mode="widthFix"></image> | <image src="{{actUrl}}" mode="widthFix"></image> | ||||
| <text>请您敬请期待</text> | |||||
| <text>我们正在筹备一大波优惠活动</text> | |||||
| <text>暂无数据</text> | |||||
| </view> | </view> | ||||
| <view class="clearfix buttonfix" hover-class="none" hover-stop-propagation="false"> | <view class="clearfix buttonfix" hover-class="none" hover-stop-propagation="false"> | ||||
| <view class="{{bargaingoods?'active1':''}}" hover-class="none" hover-stop-propagation="false" bindtap="bargaingoods">砍价商品</view> | <view class="{{bargaingoods?'active1':''}}" hover-class="none" hover-stop-propagation="false" bindtap="bargaingoods">砍价商品</view> | ||||
| @@ -110,7 +110,7 @@ page{ | |||||
| position: absolute; | position: absolute; | ||||
| right: 0; | right: 0; | ||||
| text-align: center; | text-align: center; | ||||
| bottom: 31rpx; | |||||
| bottom: 8rpx; | |||||
| border-radius:24rpx; | border-radius:24rpx; | ||||
| font-size:26rpx; | font-size:26rpx; | ||||
| line-height:48rpx; | line-height:48rpx; | ||||
| @@ -13,7 +13,6 @@ Page({ | |||||
| pageNum:1, | pageNum:1, | ||||
| list:[], | list:[], | ||||
| showcontent:false, | showcontent:false, | ||||
| loading:"", | |||||
| loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
| allow_load: true | allow_load: true | ||||
| }, | }, | ||||
| @@ -39,7 +38,6 @@ Page({ | |||||
| }, | }, | ||||
| record(pageNum) { | record(pageNum) { | ||||
| var that = this; | var that = this; | ||||
| console | |||||
| if (that.data.allow_load) { | if (that.data.allow_load) { | ||||
| Http.get({ | Http.get({ | ||||
| url: config.api.scoreHistory, | url: config.api.scoreHistory, | ||||
| @@ -56,7 +54,7 @@ Page({ | |||||
| }); | }); | ||||
| if (pageNum >= res.data.pages) { | if (pageNum >= res.data.pages) { | ||||
| that.setData({ | that.setData({ | ||||
| allow_load: false | |||||
| allow_load: false, | |||||
| }); | }); | ||||
| } | } | ||||
| that.data.list = that.data.list.concat(res.data.list); | that.data.list = that.data.list.concat(res.data.list); | ||||
| @@ -90,10 +88,6 @@ Page({ | |||||
| }, | }, | ||||
| onReachBottom: function () { | onReachBottom: function () { | ||||
| var that = this; | var that = this; | ||||
| wx.showLoading({ | |||||
| title: '', | |||||
| mask:true | |||||
| }) | |||||
| that.data.pageNum++; | that.data.pageNum++; | ||||
| that.setData({ | that.setData({ | ||||
| pageNum: that.data.pageNum | pageNum: that.data.pageNum | ||||
| @@ -25,7 +25,4 @@ | |||||
| <text wx:if="{{0>=item.scoreAmount}}">{{item.scoreAmount}}分</text> | <text wx:if="{{0>=item.scoreAmount}}">{{item.scoreAmount}}分</text> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | |||||
| <view class="loading" wx:if="{{loading}}"> | |||||
| <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | |||||
| </view> | </view> | ||||
| @@ -103,10 +103,17 @@ | |||||
| .fr text{ | .fr text{ | ||||
| color: #FF3535; | color: #FF3535; | ||||
| } | } | ||||
| .loading{ | |||||
| .loading { | |||||
| text-align: center; | text-align: center; | ||||
| height: 80rpx; | height: 80rpx; | ||||
| line-height: 80rpx; | line-height: 80rpx; | ||||
| color: #999; | |||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| color: #999; | |||||
| } | |||||
| .loading image { | |||||
| width: 60rpx; | |||||
| height: 60rpx; | |||||
| vertical-align: middle; | |||||
| margin-right: 10rpx; | |||||
| } | } | ||||
| @@ -301,6 +301,7 @@ Page({ | |||||
| that.initUsrCarList(); | that.initUsrCarList(); | ||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| console.log(err) | |||||
| wx.showToast({ | wx.showToast({ | ||||
| title: err.message, | title: err.message, | ||||
| icon: 'none', | icon: 'none', | ||||
| @@ -482,8 +483,14 @@ Page({ | |||||
| url: config.api.getParkStatus, | url: config.api.getParkStatus, | ||||
| }) | }) | ||||
| .then(res => { | .then(res => { | ||||
| console.log(res) | |||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| console.log(err) | |||||
| wx.showToast({ | |||||
| title: err.message, | |||||
| icon:"none" | |||||
| }) | |||||
| }) | }) | ||||
| }, | }, | ||||
| @@ -10,20 +10,6 @@ Page({ | |||||
| myspeacialUrl: imgurl.myspeacial.url, | myspeacialUrl: imgurl.myspeacial.url, | ||||
| teliconUrl: imgurl.telicon.url, | teliconUrl: imgurl.telicon.url, | ||||
| }, | }, | ||||
| /** | |||||
| * 生命周期函数--监听页面加载 | |||||
| */ | |||||
| onLoad: function (options) { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面初次渲染完成 | |||||
| */ | |||||
| onReady: function () { | |||||
| }, | |||||
| phone: function (e) { | phone: function (e) { | ||||
| console.log(e) | console.log(e) | ||||
| let that = this; | let that = this; | ||||
| @@ -41,10 +27,19 @@ Page({ | |||||
| data: {} | data: {} | ||||
| }) | }) | ||||
| .then(res=>{ | .then(res=>{ | ||||
| console.log(res) | |||||
| that.setData({ | that.setData({ | ||||
| discountMerchantList: res.data.levelMerchantList, | |||||
| level: res.data.level ? res.data.level:'' | |||||
| level: res.data.level ? res.data.level : '' | |||||
| }) | |||||
| console.log(res.data.levelMerchantList) | |||||
| let discountMerchantList = []; | |||||
| res.data.levelMerchantList.map(file=>{ | |||||
| if (file.discount != 100){ | |||||
| discountMerchantList.push(file); | |||||
| } | |||||
| }) | |||||
| console.log(discountMerchantList) | |||||
| that.setData({ | |||||
| discountMerchantList: discountMerchantList, | |||||
| }) | }) | ||||
| }) | }) | ||||
| }, | }, | ||||
| @@ -5,7 +5,7 @@ | |||||
| <view class="title">以下为商城<text class='level'>{{level}}</text>对应门店的优惠折扣</view> | <view class="title">以下为商城<text class='level'>{{level}}</text>对应门店的优惠折扣</view> | ||||
| </view> | </view> | ||||
| <view class='cards clearfix'> | <view class='cards clearfix'> | ||||
| <view class='card' wx:for="{{discountMerchantList}}" wx:key="{{index}}" wx:if="{{item.discount/10!=10&&discountMerchantList.length>0}}"> | |||||
| <view class='card' wx:for="{{discountMerchantList}}" wx:key="{{index}}" wx:if="{{discountMerchantList.length>0}}"> | |||||
| <view class='txt01'> | <view class='txt01'> | ||||
| <view class="triangle"> | <view class="triangle"> | ||||
| <text><i>></i></text> | <text><i>></i></text> | ||||
| @@ -5,7 +5,7 @@ Page{ | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| text-align: center; | text-align: center; | ||||
| margin-top: 30rpx; | margin-top: 30rpx; | ||||
| color: #fff; | |||||
| color: #000; | |||||
| float:none!important; | float:none!important; | ||||
| } | } | ||||
| .headerbg image{ | .headerbg image{ | ||||
| @@ -76,7 +76,7 @@ | |||||
| <view class="margin"></view> | <view class="margin"></view> | ||||
| <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
| <view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
| <view wx:if="{{flag=='show'}}">版本号:3.3.1</view> | |||||
| <view wx:if="{{flag=='show'}}">版本号:3.3.2</view> | |||||
| <view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -13,7 +13,7 @@ | |||||
| }, | }, | ||||
| "compileType": "miniprogram", | "compileType": "miniprogram", | ||||
| "libVersion": "2.0.9", | "libVersion": "2.0.9", | ||||
| "appid": "wx649b3be73c1afe47", | |||||
| "appid": "wxea71200db93d756b", | |||||
| "projectname": "C", | "projectname": "C", | ||||
| "isGameTourist": false, | "isGameTourist": false, | ||||
| "condition": { | "condition": { | ||||