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
{
"pages": [
"pages/customer/index",
"pages/customer/detail_owner",
"pages/customer/detail_owner_part",
"pages/customer/detail_customer",
"pages/customer/detail_invitation",
"pages/customer/detail_owner_invitation",
"pages/customer/invite",
"pages/customer/list",
"pages/customer/remind",
"pages/reserve/index",
"pages/me/index",
"pages/me/setting",
"pages/me/list",
"pages/reserve/search",
"pages/reserve/detail",
"pages/me/follow",
"pages/manager-invitation/index",
"pages/manager-invitation/review",
"pages/manager-invitation/editor",
"pages/manager-invitation/display",
"pages/manager-invitation/setting/index",
"pages/manager-invitation/setting/sellers",
"pages/manager-invitation/setting/seller-editor",
"pages/manager-invitation/crm/index",
"pages/manager-invitation/setting/history",
"pages/reserve/activity"
],
"subpackages": [
{
"root": "pack-cookbook",
"name": "提前点餐包",
"pages": [
"pages/index",
"pages/cart",
"pages/success",
"pages/remark"
]
},
{
"root": "pack-book",
"name": "商家端",
"pages": [
"pages/book/b_index",
"pages/book/b_detail",
"pages/book/b_invitation",
"pages/book/b_desk",
"pages/book/b_addnew",
"pages/book/b_sms",
"pages/book/b_setting",
"pages/book/setting/index",
"pages/book/setting/sms",
"pages/book/setting/sms_buy",
"pages/book/crm/index",
"pages/book/remark/index",
"pages/book/smsbatch/index",
"pages/book/smsbatch/update",
"pages/book/smsbatch/detail",
"pages/book/smsbatch/list",
"pages/book/smsbatch/result"
]
}
],
"preloadRule": {
"pages/customer/detail_owner": {
"network": "all",
"packages": [
"pack-cookbook"
]
}
"pages": [
"pages/customer/index",
"pages/customer/detail_owner",
"pages/customer/detail_owner_part",
"pages/customer/detail_customer",
"pages/customer/detail_invitation",
"pages/customer/detail_owner_invitation",
"pages/customer/invite",
"pages/customer/list",
"pages/customer/remind",
"pages/reserve/index",
"pages/me/index",
"pages/me/setting",
"pages/me/list",
"pages/reserve/search",
"pages/reserve/detail",
"pages/me/follow",
"pages/manager-invitation/index",
"pages/manager-invitation/review",
"pages/manager-invitation/editor",
"pages/manager-invitation/display",
"pages/manager-invitation/setting/index",
"pages/manager-invitation/setting/sellers",
"pages/manager-invitation/setting/seller-editor",
"pages/manager-invitation/crm/index",
"pages/manager-invitation/setting/history",
"pages/reserve/activity",
"pages/reserve/discount"
],
"subpackages": [
{
"root": "pack-cookbook",
"name": "提前点餐包",
"pages": [
"pages/index",
"pages/cart",
"pages/success",
"pages/remark"
]
},
"window": {
"navigationStyle": "custom",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#199095",
"navigationBarTitleText": "点餐商户端",
"navigationBarTextStyle": "white"
},
"networkTimeout": {
"request": 5000,
"downloadFile": 10000
},
"tabBar": {
"color": "#999999",
"selectedColor": "#C0A369",
"backgroundColor": "#262628",
"borderStyle": "black",
"list": [
{
"pagePath": "pages/reserve/index",
"text": "订座",
"iconPath": "pages/image/tabicon1.png",
"selectedIconPath": "pages/image/tabicon1.active.png"
},
{
"pagePath": "pages/me/follow",
"text": "关注",
"iconPath": "pages/image/follow.png",
"selectedIconPath": "pages/image/follow.active.png"
},
{
"pagePath": "pages/customer/list",
"text": "日程",
"iconPath": "pages/image/tabicon3.png",
"selectedIconPath": "pages/image/tabicon3.active.png"
},
{
"pagePath": "pages/me/index",
"text": "我的",
"iconPath": "pages/image/tabicon4.png",
"selectedIconPath": "pages/image/tabicon4.active.png"
}
]
},
"plugins": {
"bmCalendar": {
"version": "1.2.1",
"provider": "wx23a9cef3522e4f7c"
}
},
"permission": {
"scope.userLocation": {
"desc": "你的位置信息用于获得离你最近的餐厅"
}
},
"debug": true,
"sitemapLocation": "sitemap.json"
{
"root": "pack-book",
"name": "商家端",
"pages": [
"pages/book/b_index",
"pages/book/b_detail",
"pages/book/b_invitation",
"pages/book/b_desk",
"pages/book/b_addnew",
"pages/book/b_sms",
"pages/book/b_setting",
"pages/book/setting/index",
"pages/book/setting/sms",
"pages/book/setting/sms_buy",
"pages/book/crm/index",
"pages/book/remark/index",
"pages/book/smsbatch/index",
"pages/book/smsbatch/update",
"pages/book/smsbatch/detail",
"pages/book/smsbatch/list",
"pages/book/smsbatch/result"
]
}
],
"preloadRule": {
"pages/customer/detail_owner": {
"network": "all",
"packages": [
"pack-cookbook"
]
}
},
"window": {
"navigationStyle": "custom",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#199095",
"navigationBarTitleText": "点餐商户端",
"navigationBarTextStyle": "white"
},
"networkTimeout": {
"request": 5000,
"downloadFile": 10000
},
"tabBar": {
"color": "#999999",
"selectedColor": "#C0A369",
"backgroundColor": "#262628",
"borderStyle": "black",
"list": [
{
"pagePath": "pages/reserve/index",
"text": "订座",
"iconPath": "pages/image/tabicon1.png",
"selectedIconPath": "pages/image/tabicon1.active.png"
},
{
"pagePath": "pages/me/follow",
"text": "关注",
"iconPath": "pages/image/follow.png",
"selectedIconPath": "pages/image/follow.active.png"
},
{
"pagePath": "pages/customer/list",
"text": "日程",
"iconPath": "pages/image/tabicon3.png",
"selectedIconPath": "pages/image/tabicon3.active.png"
},
{
"pagePath": "pages/me/index",
"text": "我的",
"iconPath": "pages/image/tabicon4.png",
"selectedIconPath": "pages/image/tabicon4.active.png"
}
]
},
"plugins": {
"bmCalendar": {
"version": "1.2.1",
"provider": "wx23a9cef3522e4f7c"
}
},
"permission": {
"scope.userLocation": {
"desc": "你的位置信息用于获得离你最近的餐厅"
}
},
"debug": true,
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
... ...
... ... @@ -45,5 +45,10 @@ Component({
hidden:true,
})
},
gotoDiscount(){
wx.navigateTo({
url:'./discount',
})
},
}
})
\ No newline at end of file
... ...
// pages/me/follow.js
import util from '../../utils/util';
import App from '../../utils/api';
const {regeneratorRuntime} = global
import PubSub from '../../utils/PubSub'
import reddot from '../../utils/reddot';
Page({
/**
* 页面的初始数据
*/
data: {
sellers:[],
hasMore:true,
},
sellers:[],
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
PubSub.on(
'follow',
data=>{
console.log('follow.msg',data)
this.formatSellers(data);
}
)
reddot.init()
},
formatSellers(data){
let sellers=[];
let hasChange=false
this.sellers.forEach(seller=>{
if(seller.id==data.sid){
hasChange=true
seller.hasFollow=data.hasFollow
}
if(seller.hasFollow){
sellers.push(seller)
}
})
if(!hasChange){
sellers=[]
}
this.setData({
sellers:sellers
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
if(this.hasMore || this.data.sellers.length==0){
this.sellers=[]
this.offset=1
this.setData({
sellers:[]
})
this.selectComponent('#getpos').getPos();
}
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
PubSub.off('follow')
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function (e) {
console.log(e)
if(this.hasMore){
this.GetCollectionSellerList();
}
},
offset:1,
size:10,
hasMore:true,
GetCollectionSellerList(){
App.Customer.GetCollectionSellerList({
openid:getApp().openid,
lat:this.location.latitude,
lng:this.location.longitude,
offset:this.offset,
size:this.size,
}).then(res=>{
let sellers=res.data;
let sellersLength=sellers.length;
this.hasMore=sellersLength>=this.size
if(this.hasMore){
this.offset+=1
}
sellers.forEach((seller,si) => {
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distance = (seller.distance / 1000).toFixed(2) + '公里'
} else {
seller.distance += '米';
}
if(seller.seller_tel){
seller.seller_tel=seller.seller_tel.split(',');
}else{
seller.seller_tel=[]
}
seller.hasFollow=true
})
sellers=[...this.data.sellers,...sellers]
this.setData({
sellers:sellers,
hasMore:this.hasMore,
})
this.sellers=sellers
})
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
})
},
onpos(e){
console.log(e);
this.location=e.detail
this.GetCollectionSellerList();
},
})
\ No newline at end of file
... ...
{
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black",
"navigationBarTitleText":"一键订",
"usingComponents": {
"formids":"/components/formids/formids",
"nav":"/components/nav/nav",
"getpos":"/components/userinfo/getpos",
"sb-tr":"/components/reserve/seller-box-transverse/seller-box"
}
}
\ No newline at end of file
... ...
<!--pages/reserve/discount.wxml-->
<nav>特惠榜</nav>
<image class="banner"
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>
<view class="pages">
<view class="follow">
<view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
<sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}"></sb-tr>
</view>
<view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view>
</view>
</view>
<getpos bindpos="onpos" id="getpos"></getpos>
\ No newline at end of file
... ...
/* pages/reserve/discount.wxss */
page{
background: linear-gradient(to bottom, #B6161A, #BC1F1D);
}
.banner{
width: 750rpx;
height: 360rpx;
margin: 0 auto;
}
.pages{
width: 90%;
margin: 0 auto;
color:#fff;
font-size: 28rpx;
}
.follow {
padding-bottom: 50rpx;
}
.follow .seller{
margin-bottom:20rpx;
background-color: #ffffff;
}
\ No newline at end of file
... ...
... ... @@ -43,7 +43,7 @@
"list": []
},
"miniprogram": {
"current": 39,
"current": 51,
"list": [
{
"id": 0,
... ... @@ -425,6 +425,13 @@
"pathName": "pages/reserve/activity",
"query": "id=1",
"scene": null
},
{
"id": -1,
"name": "pages/reserve/discount 在线订座 ",
"pathName": "pages/reserve/discount",
"query": "id=1",
"scene": null
}
]
}
... ...