Commit 2d0e7c7dc4c05689f4ffd7bf7c98ca220ba60e24

Authored by Yolanda
1 parent 33e7be5b

no message

Showing 66 changed files with 26 additions and 10 deletions
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 "pages/setting/s_grade", 42 "pages/setting/s_grade",
43 "pages/setting/s_rank", 43 "pages/setting/s_rank",
44 "pages/setting/s_store", 44 "pages/setting/s_store",
  45 + "pages/setting/range",
45 "pages/currency/c_store", 46 "pages/currency/c_store",
46 "pages/currency/c_setting", 47 "pages/currency/c_setting",
47 "pages/login/l_login", 48 "pages/login/l_login",
@@ -3,7 +3,7 @@ Component({ @@ -3,7 +3,7 @@ Component({
3 item:Object 3 item:Object
4 }, 4 },
5 attached(){ 5 attached(){
6 - console.log(this.data.item) 6 + console.log(this.data.item.price)
7 if(this.data.item.seller_tel){ 7 if(this.data.item.seller_tel){
8 let telist=this.data.item.seller_tel.indexOf(',')!=-1 ? this.data.item.seller_tel.split(',') : [this.data.item.seller_tel] 8 let telist=this.data.item.seller_tel.indexOf(',')!=-1 ? this.data.item.seller_tel.split(',') : [this.data.item.seller_tel]
9 this.setData({ 9 this.setData({
@@ -4,6 +4,7 @@ Page({ @@ -4,6 +4,7 @@ Page({
4 onLoad(opt){ 4 onLoad(opt){
5 if(util.cache('openid')){ 5 if(util.cache('openid')){
6 if(opt.id && opt.share){ 6 if(opt.id && opt.share){
  7 + util.cache('lookseller',opt.id);
7 wx.redirectTo({ 8 wx.redirectTo({
8 url:'../seller/menu?id='+opt.id 9 url:'../seller/menu?id='+opt.id
9 }) 10 })
@@ -11,7 +12,14 @@ Page({ @@ -11,7 +12,14 @@ Page({
11 this.setData({ 12 this.setData({
12 openid:util.cache('openid') 13 openid:util.cache('openid')
13 }) 14 })
14 - this.getsellerlist(); 15 + if(util.cache('lookseller')){
  16 + wx.redirectTo({
  17 + url:'../seller/menu?id='+util.cache('lookseller')
  18 + })
  19 + }else{
  20 + this.getsellerlist();
  21 + }
  22 +
15 } 23 }
16 24
17 }else{ 25 }else{
1 import App from '../../../utils/api.js' 1 import App from '../../../utils/api.js'
2 import util from '../../../utils/util.js' 2 import util from '../../../utils/util.js'
3 Page({ 3 Page({
  4 + data:{
  5 + orderlist:{},
  6 + },
4 onLoad(opt){ 7 onLoad(opt){
5 let systeminfo=util.cache('system.info'); 8 let systeminfo=util.cache('system.info');
6 let headerheight=util.cache('headerHeight'); 9 let headerheight=util.cache('headerHeight');
@@ -19,19 +22,20 @@ Page({ @@ -19,19 +22,20 @@ Page({
19 json.data.forEach((v,i)=>{ 22 json.data.forEach((v,i)=>{
20 v.showdate=util.unixtoTime(v.cdate,'YYYY-MM-DD HH:II:SS') 23 v.showdate=util.unixtoTime(v.cdate,'YYYY-MM-DD HH:II:SS')
21 }) 24 })
22 - let orderlist=this.data.orderlist ? this.data.orderlist.concat(json.data) : json.data; 25 + let orderlist='orderlist['+this.page+']';
  26 + console.log('yyyyy',orderlist)
23 if(json.data.length<10){ 27 if(json.data.length<10){
24 - console.log('yyyyy') 28 + console.log('yyyyy',)
25 this.hasmore=false; 29 this.hasmore=false;
26 } 30 }
27 this.setData({ 31 this.setData({
28 - orderlist:orderlist 32 + [orderlist]:json.data
29 }) 33 })
30 } 34 }
31 }) 35 })
32 }, 36 },
33 getnext(){ 37 getnext(){
34 - console.log('rrrrr'); 38 + console.log('rrrrr',this.hasmore);
35 if(this.hasmore){ 39 if(this.hasmore){
36 this.page+=1; 40 this.page+=1;
37 this.getlist(); 41 this.getlist();
@@ -4,7 +4,9 @@ @@ -4,7 +4,9 @@
4 <scroll-view scroll-y style="height:{{contentheight}}px;" bindscrolltolower="getnext"> 4 <scroll-view scroll-y style="height:{{contentheight}}px;" bindscrolltolower="getnext">
5 <view class="cut"></view> 5 <view class="cut"></view>
6 <block wx:for="{{orderlist}}"> 6 <block wx:for="{{orderlist}}">
7 - <card item="{{item}}"></card>  
8 - <view class="cut"></view> 7 + <block wx:for="{{item}}" wx:for-item="pageitem">
  8 + <card item="{{pageitem}}"></card>
  9 + <view class="cut"></view>
  10 + </block>
9 </block> 11 </block>
10 </scroll-view> 12 </scroll-view>
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 </navigator> 105 </navigator>
106 <view class="cut"></view> 106 <view class="cut"></view>
107 </block> 107 </block>
108 - <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"> 108 + <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">
109 <view class="store-instro-act black-font font30r">切换到顾客端</view> 109 <view class="store-instro-act black-font font30r">切换到顾客端</view>
110 <image src="../image/click.png" background-size="cover" class="icon12-22"></image> 110 <image src="../image/click.png" background-size="cover" class="icon12-22"></image>
111 </navigator> 111 </navigator>
  1 +/* pages/setting/range.wxss */
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 "minifyWXSS": true 37 "minifyWXSS": true
38 }, 38 },
39 "compileType": "miniprogram", 39 "compileType": "miniprogram",
40 - "libVersion": "2.0.9", 40 + "libVersion": "2.15.0",
41 "appid": "wx418f1d7cdeda26c1", 41 "appid": "wx418f1d7cdeda26c1",
42 "projectname": "%E8%87%AA%E8%90%A5%E5%A4%96%E5%8D%96", 42 "projectname": "%E8%87%AA%E8%90%A5%E5%A4%96%E5%8D%96",
43 "simulatorType": "wechat", 43 "simulatorType": "wechat",