Administrator / xcx-take · Commits

Go to a project

Commit 2d0e7c7dc4c05689f4ffd7bf7c98ca220ba60e24

Authored by Yolanda
1 parent 33e7be5b
build: skipped

no message

Inline Side-by-side
Showing 66 changed files with 26 additions and 10 deletions
... ... @@ -42,6 +42,7 @@
"pages/setting/s_grade",
"pages/setting/s_rank",
"pages/setting/s_store",
"pages/setting/range",
"pages/currency/c_store",
"pages/currency/c_setting",
"pages/login/l_login",
... ...
... ... @@ -3,7 +3,7 @@ Component({
item:Object
},
attached(){
console.log(this.data.item)
console.log(this.data.item.price)
if(this.data.item.seller_tel){
let telist=this.data.item.seller_tel.indexOf(',')!=-1 ? this.data.item.seller_tel.split(',') : [this.data.item.seller_tel]
this.setData({
... ...
... ... @@ -4,6 +4,7 @@ Page({
onLoad(opt){
if(util.cache('openid')){
if(opt.id && opt.share){
util.cache('lookseller',opt.id);
wx.redirectTo({
url:'../seller/menu?id='+opt.id
})
... ... @@ -11,7 +12,14 @@ Page({
this.setData({
openid:util.cache('openid')
})
this.getsellerlist();
if(util.cache('lookseller')){
wx.redirectTo({
url:'../seller/menu?id='+util.cache('lookseller')
})
}else{
this.getsellerlist();
}
}
}else{
... ...
import App from '../../../utils/api.js'
import util from '../../../utils/util.js'
Page({
data:{
orderlist:{},
},
onLoad(opt){
let systeminfo=util.cache('system.info');
let headerheight=util.cache('headerHeight');
... ... @@ -19,19 +22,20 @@ Page({
json.data.forEach((v,i)=>{
v.showdate=util.unixtoTime(v.cdate,'YYYY-MM-DD HH:II:SS')
})
let orderlist=this.data.orderlist ? this.data.orderlist.concat(json.data) : json.data;
let orderlist='orderlist['+this.page+']';
console.log('yyyyy',orderlist)
if(json.data.length<10){
console.log('yyyyy')
console.log('yyyyy',)
this.hasmore=false;
}
this.setData({
orderlist:orderlist
[orderlist]:json.data
})
}
})
},
getnext(){
console.log('rrrrr');
console.log('rrrrr',this.hasmore);
if(this.hasmore){
this.page+=1;
this.getlist();
... ...
... ... @@ -4,7 +4,9 @@
<scroll-view scroll-y style="height:{{contentheight}}px;" bindscrolltolower="getnext">
<view class="cut"></view>
<block wx:for="{{orderlist}}">
<card item="{{item}}"></card>
<view class="cut"></view>
<block wx:for="{{item}}" wx:for-item="pageitem">
<card item="{{pageitem}}"></card>
<view class="cut"></view>
</block>
</block>
</scroll-view>
\ No newline at end of file
... ...
... ... @@ -105,7 +105,7 @@
</navigator>
<view class="cut"></view>
</block>
<navigator class="store-instro-list height115r border-top-bottom flex-lr white-bg padding-left40r padding-right40r" hover-class="none" url="{{seller && seller.id ? '../custom/seller/menu?id='+seller.id : '../custom/seller/menu?id=1'}}" open-type="reLaunch">
<navigator class="store-instro-list height115r border-top-bottom flex-lr white-bg padding-left40r padding-right40r" hover-class="none" url="{{seller && seller.id ? '../custom/seller/menu?id='+seller.id : '../custom/seller/menu?id=3'}}" open-type="reLaunch">
<view class="store-instro-act black-font font30r">切换到顾客端</view>
<image src="../image/click.png" background-size="cover" class="icon12-22"></image>
</navigator>
... ...
/* pages/setting/range.wxss */
\ No newline at end of file
... ...
... ... @@ -37,7 +37,7 @@
"minifyWXSS": true
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
"libVersion": "2.15.0",
"appid": "wx418f1d7cdeda26c1",
"projectname": "%E8%87%AA%E8%90%A5%E5%A4%96%E5%8D%96",
"simulatorType": "wechat",
... ...