xt / xcx-book · Commits

Go to a project

Commit 0c473b874ac8f74dc3bdeaab63f5ba2d81da96b6

Authored by wangfan
1 parent 2a1c2aee
build: skipped

C端调整

Inline Side-by-side
Showing 7 changed files with 336 additions and 127 deletions
1 { 1 {
2 - "pages": [  
3 - "pages/customer/index",  
4 - "pages/customer/detail_owner",  
5 - "pages/customer/detail_owner_part",  
6 - "pages/customer/detail_customer",  
7 - "pages/customer/detail_invitation",  
8 - "pages/customer/detail_owner_invitation",  
9 - "pages/customer/invite",  
10 - "pages/customer/list",  
11 - "pages/customer/remind",  
12 - "pages/reserve/index",  
13 - "pages/me/index",  
14 - "pages/me/setting",  
15 - "pages/me/list",  
16 - "pages/reserve/search",  
17 - "pages/reserve/detail",  
18 - "pages/me/follow",  
19 - "pages/manager-invitation/index",  
20 - "pages/manager-invitation/review",  
21 - "pages/manager-invitation/editor",  
22 - "pages/manager-invitation/display",  
23 - "pages/manager-invitation/setting/index",  
24 - "pages/manager-invitation/setting/sellers",  
25 - "pages/manager-invitation/setting/seller-editor",  
26 - "pages/manager-invitation/crm/index",  
27 - "pages/manager-invitation/setting/history",  
28 - "pages/reserve/activity"  
29 - ],  
30 - "subpackages": [  
31 - {  
32 - "root": "pack-cookbook",  
33 - "name": "提前点餐包",  
34 - "pages": [  
35 - "pages/index",  
36 - "pages/cart",  
37 - "pages/success",  
38 - "pages/remark"  
39 - ]  
40 - },  
41 - {  
42 - "root": "pack-book",  
43 - "name": "商家端",  
44 - "pages": [  
45 - "pages/book/b_index",  
46 - "pages/book/b_detail",  
47 - "pages/book/b_invitation",  
48 - "pages/book/b_desk",  
49 - "pages/book/b_addnew",  
50 - "pages/book/b_sms",  
51 - "pages/book/b_setting",  
52 - "pages/book/setting/index",  
53 - "pages/book/setting/sms",  
54 - "pages/book/setting/sms_buy",  
55 - "pages/book/crm/index",  
56 - "pages/book/remark/index",  
57 - "pages/book/smsbatch/index",  
58 - "pages/book/smsbatch/update",  
59 - "pages/book/smsbatch/detail",  
60 - "pages/book/smsbatch/list",  
61 - "pages/book/smsbatch/result"  
62 - ]  
63 - }  
64 - ],  
65 - "preloadRule": {  
66 - "pages/customer/detail_owner": {  
67 - "network": "all",  
68 - "packages": [  
69 - "pack-cookbook"  
70 - ]  
71 - } 2 + "pages": [
  3 + "pages/customer/index",
  4 + "pages/customer/detail_owner",
  5 + "pages/customer/detail_owner_part",
  6 + "pages/customer/detail_customer",
  7 + "pages/customer/detail_invitation",
  8 + "pages/customer/detail_owner_invitation",
  9 + "pages/customer/invite",
  10 + "pages/customer/list",
  11 + "pages/customer/remind",
  12 + "pages/reserve/index",
  13 + "pages/me/index",
  14 + "pages/me/setting",
  15 + "pages/me/list",
  16 + "pages/reserve/search",
  17 + "pages/reserve/detail",
  18 + "pages/me/follow",
  19 + "pages/manager-invitation/index",
  20 + "pages/manager-invitation/review",
  21 + "pages/manager-invitation/editor",
  22 + "pages/manager-invitation/display",
  23 + "pages/manager-invitation/setting/index",
  24 + "pages/manager-invitation/setting/sellers",
  25 + "pages/manager-invitation/setting/seller-editor",
  26 + "pages/manager-invitation/crm/index",
  27 + "pages/manager-invitation/setting/history",
  28 + "pages/reserve/activity",
  29 + "pages/reserve/discount"
  30 + ],
  31 + "subpackages": [
  32 + {
  33 + "root": "pack-cookbook",
  34 + "name": "提前点餐包",
  35 + "pages": [
  36 + "pages/index",
  37 + "pages/cart",
  38 + "pages/success",
  39 + "pages/remark"
  40 + ]
72 }, 41 },
73 - "window": {  
74 - "navigationStyle": "custom",  
75 - "backgroundTextStyle": "light",  
76 - "navigationBarBackgroundColor": "#199095",  
77 - "navigationBarTitleText": "点餐商户端",  
78 - "navigationBarTextStyle": "white"  
79 - },  
80 - "networkTimeout": {  
81 - "request": 5000,  
82 - "downloadFile": 10000  
83 - },  
84 - "tabBar": {  
85 - "color": "#999999",  
86 - "selectedColor": "#C0A369",  
87 - "backgroundColor": "#262628",  
88 - "borderStyle": "black",  
89 - "list": [  
90 - {  
91 - "pagePath": "pages/reserve/index",  
92 - "text": "订座",  
93 - "iconPath": "pages/image/tabicon1.png",  
94 - "selectedIconPath": "pages/image/tabicon1.active.png"  
95 - },  
96 - {  
97 - "pagePath": "pages/me/follow",  
98 - "text": "关注",  
99 - "iconPath": "pages/image/follow.png",  
100 - "selectedIconPath": "pages/image/follow.active.png"  
101 - },  
102 - {  
103 - "pagePath": "pages/customer/list",  
104 - "text": "日程",  
105 - "iconPath": "pages/image/tabicon3.png",  
106 - "selectedIconPath": "pages/image/tabicon3.active.png"  
107 - },  
108 - {  
109 - "pagePath": "pages/me/index",  
110 - "text": "我的",  
111 - "iconPath": "pages/image/tabicon4.png",  
112 - "selectedIconPath": "pages/image/tabicon4.active.png"  
113 - }  
114 - ]  
115 - },  
116 - "plugins": {  
117 - "bmCalendar": {  
118 - "version": "1.2.1",  
119 - "provider": "wx23a9cef3522e4f7c"  
120 - }  
121 - },  
122 - "permission": {  
123 - "scope.userLocation": {  
124 - "desc": "你的位置信息用于获得离你最近的餐厅"  
125 - }  
126 - },  
127 - "debug": true,  
128 - "sitemapLocation": "sitemap.json" 42 + {
  43 + "root": "pack-book",
  44 + "name": "商家端",
  45 + "pages": [
  46 + "pages/book/b_index",
  47 + "pages/book/b_detail",
  48 + "pages/book/b_invitation",
  49 + "pages/book/b_desk",
  50 + "pages/book/b_addnew",
  51 + "pages/book/b_sms",
  52 + "pages/book/b_setting",
  53 + "pages/book/setting/index",
  54 + "pages/book/setting/sms",
  55 + "pages/book/setting/sms_buy",
  56 + "pages/book/crm/index",
  57 + "pages/book/remark/index",
  58 + "pages/book/smsbatch/index",
  59 + "pages/book/smsbatch/update",
  60 + "pages/book/smsbatch/detail",
  61 + "pages/book/smsbatch/list",
  62 + "pages/book/smsbatch/result"
  63 + ]
  64 + }
  65 + ],
  66 + "preloadRule": {
  67 + "pages/customer/detail_owner": {
  68 + "network": "all",
  69 + "packages": [
  70 + "pack-cookbook"
  71 + ]
  72 + }
  73 + },
  74 + "window": {
  75 + "navigationStyle": "custom",
  76 + "backgroundTextStyle": "light",
  77 + "navigationBarBackgroundColor": "#199095",
  78 + "navigationBarTitleText": "点餐商户端",
  79 + "navigationBarTextStyle": "white"
  80 + },
  81 + "networkTimeout": {
  82 + "request": 5000,
  83 + "downloadFile": 10000
  84 + },
  85 + "tabBar": {
  86 + "color": "#999999",
  87 + "selectedColor": "#C0A369",
  88 + "backgroundColor": "#262628",
  89 + "borderStyle": "black",
  90 + "list": [
  91 + {
  92 + "pagePath": "pages/reserve/index",
  93 + "text": "订座",
  94 + "iconPath": "pages/image/tabicon1.png",
  95 + "selectedIconPath": "pages/image/tabicon1.active.png"
  96 + },
  97 + {
  98 + "pagePath": "pages/me/follow",
  99 + "text": "关注",
  100 + "iconPath": "pages/image/follow.png",
  101 + "selectedIconPath": "pages/image/follow.active.png"
  102 + },
  103 + {
  104 + "pagePath": "pages/customer/list",
  105 + "text": "日程",
  106 + "iconPath": "pages/image/tabicon3.png",
  107 + "selectedIconPath": "pages/image/tabicon3.active.png"
  108 + },
  109 + {
  110 + "pagePath": "pages/me/index",
  111 + "text": "我的",
  112 + "iconPath": "pages/image/tabicon4.png",
  113 + "selectedIconPath": "pages/image/tabicon4.active.png"
  114 + }
  115 + ]
  116 + },
  117 + "plugins": {
  118 + "bmCalendar": {
  119 + "version": "1.2.1",
  120 + "provider": "wx23a9cef3522e4f7c"
  121 + }
  122 + },
  123 + "permission": {
  124 + "scope.userLocation": {
  125 + "desc": "你的位置信息用于获得离你最近的餐厅"
  126 + }
  127 + },
  128 + "debug": true,
  129 + "sitemapLocation": "sitemap.json"
129 } 130 }
@@ -45,5 +45,10 @@ Component({ @@ -45,5 +45,10 @@ Component({
45 hidden:true, 45 hidden:true,
46 }) 46 })
47 }, 47 },
  48 + gotoDiscount(){
  49 + wx.navigateTo({
  50 + url:'./discount',
  51 + })
  52 + },
48 } 53 }
49 }) 54 })
  1 +// pages/me/follow.js
  2 +import util from '../../utils/util';
  3 +import App from '../../utils/api';
  4 +const {regeneratorRuntime} = global
  5 +import PubSub from '../../utils/PubSub'
  6 +import reddot from '../../utils/reddot';
  7 +Page({
  8 +
  9 + /**
  10 + * 页面的初始数据
  11 + */
  12 + data: {
  13 + sellers:[],
  14 + hasMore:true,
  15 + },
  16 + sellers:[],
  17 + /**
  18 + * 生命周期函数--监听页面加载
  19 + */
  20 + onLoad: function (options) {
  21 + PubSub.on(
  22 + 'follow',
  23 + data=>{
  24 + console.log('follow.msg',data)
  25 + this.formatSellers(data);
  26 + }
  27 + )
  28 + reddot.init()
  29 + },
  30 + formatSellers(data){
  31 + let sellers=[];
  32 + let hasChange=false
  33 + this.sellers.forEach(seller=>{
  34 + if(seller.id==data.sid){
  35 + hasChange=true
  36 + seller.hasFollow=data.hasFollow
  37 + }
  38 + if(seller.hasFollow){
  39 + sellers.push(seller)
  40 + }
  41 + })
  42 + if(!hasChange){
  43 + sellers=[]
  44 + }
  45 + this.setData({
  46 + sellers:sellers
  47 + })
  48 + },
  49 + /**
  50 + * 生命周期函数--监听页面初次渲染完成
  51 + */
  52 + onReady: function () {
  53 +
  54 + },
  55 +
  56 + /**
  57 + * 生命周期函数--监听页面显示
  58 + */
  59 + onShow: function () {
  60 + if(this.hasMore || this.data.sellers.length==0){
  61 + this.sellers=[]
  62 + this.offset=1
  63 + this.setData({
  64 + sellers:[]
  65 + })
  66 + this.selectComponent('#getpos').getPos();
  67 + }
  68 + },
  69 +
  70 + /**
  71 + * 生命周期函数--监听页面隐藏
  72 + */
  73 + onHide: function () {
  74 +
  75 + },
  76 +
  77 + /**
  78 + * 生命周期函数--监听页面卸载
  79 + */
  80 + onUnload: function () {
  81 + PubSub.off('follow')
  82 + },
  83 +
  84 + /**
  85 + * 页面相关事件处理函数--监听用户下拉动作
  86 + */
  87 + onPullDownRefresh: function () {
  88 +
  89 + },
  90 +
  91 + /**
  92 + * 页面上拉触底事件的处理函数
  93 + */
  94 + onReachBottom: function (e) {
  95 + console.log(e)
  96 + if(this.hasMore){
  97 + this.GetCollectionSellerList();
  98 + }
  99 + },
  100 + offset:1,
  101 + size:10,
  102 + hasMore:true,
  103 + GetCollectionSellerList(){
  104 + App.Customer.GetCollectionSellerList({
  105 + openid:getApp().openid,
  106 + lat:this.location.latitude,
  107 + lng:this.location.longitude,
  108 + offset:this.offset,
  109 + size:this.size,
  110 + }).then(res=>{
  111 + let sellers=res.data;
  112 + let sellersLength=sellers.length;
  113 + this.hasMore=sellersLength>=this.size
  114 + if(this.hasMore){
  115 + this.offset+=1
  116 + }
  117 + sellers.forEach((seller,si) => {
  118 + seller.distance = parseInt(seller.distance);
  119 + if (seller.distance > 1000) {
  120 + seller.distance = (seller.distance / 1000).toFixed(2) + '公里'
  121 + } else {
  122 + seller.distance += '米';
  123 + }
  124 + if(seller.seller_tel){
  125 + seller.seller_tel=seller.seller_tel.split(',');
  126 + }else{
  127 + seller.seller_tel=[]
  128 + }
  129 + seller.hasFollow=true
  130 + })
  131 + sellers=[...this.data.sellers,...sellers]
  132 + this.setData({
  133 + sellers:sellers,
  134 + hasMore:this.hasMore,
  135 + })
  136 + this.sellers=sellers
  137 + })
  138 + },
  139 + gotoDetail(e){
  140 + wx.navigateTo({
  141 + url:'/pages/reserve/detail?id='+util.attr(e,'sid')
  142 + })
  143 + },
  144 + onpos(e){
  145 + console.log(e);
  146 + this.location=e.detail
  147 + this.GetCollectionSellerList();
  148 + },
  149 +})
  1 +{
  2 + "navigationBarBackgroundColor": "#ffffff",
  3 + "navigationBarTextStyle": "black",
  4 + "navigationBarTitleText":"一键订",
  5 + "usingComponents": {
  6 + "formids":"/components/formids/formids",
  7 + "nav":"/components/nav/nav",
  8 + "getpos":"/components/userinfo/getpos",
  9 + "sb-tr":"/components/reserve/seller-box-transverse/seller-box"
  10 + }
  11 +}
  1 +<!--pages/reserve/discount.wxml-->
  2 +<nav>特惠榜</nav>
  3 +<image class="banner"
  4 + src="http://qn.colorcun.com/reserve/images/%E4%B8%80%E9%94%AE%E8%AE%A2%E7%89%B9%E6%83%A0%E6%A6%9C.jpg"></image>
  5 +<view class="pages">
  6 + <view class="follow">
  7 + <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
  8 + bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
  9 + <sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}"></sb-tr>
  10 + </view>
  11 + <view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view>
  12 + </view>
  13 +</view>
  14 +<getpos bindpos="onpos" id="getpos"></getpos>
  1 +/* pages/reserve/discount.wxss */
  2 +page{
  3 + background: linear-gradient(to bottom, #B6161A, #BC1F1D);
  4 +}
  5 +.banner{
  6 + width: 750rpx;
  7 + height: 360rpx;
  8 + margin: 0 auto;
  9 +}
  10 +.pages{
  11 + width: 90%;
  12 + margin: 0 auto;
  13 + color:#fff;
  14 + font-size: 28rpx;
  15 +}
  16 +.follow {
  17 + padding-bottom: 50rpx;
  18 +}
  19 +.follow .seller{
  20 + margin-bottom:20rpx;
  21 + background-color: #ffffff;
  22 +}
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 "list": [] 43 "list": []
44 }, 44 },
45 "miniprogram": { 45 "miniprogram": {
46 - "current": 39, 46 + "current": 51,
47 "list": [ 47 "list": [
48 { 48 {
49 "id": 0, 49 "id": 0,
@@ -425,6 +425,13 @@ @@ -425,6 +425,13 @@
425 "pathName": "pages/reserve/activity", 425 "pathName": "pages/reserve/activity",
426 "query": "id=1", 426 "query": "id=1",
427 "scene": null 427 "scene": null
  428 + },
  429 + {
  430 + "id": -1,
  431 + "name": "pages/reserve/discount 在线订座 ",
  432 + "pathName": "pages/reserve/discount",
  433 + "query": "id=1",
  434 + "scene": null
428 } 435 }
429 ] 436 ]
430 } 437 }