From 60aa3a6928c798a5c0cbe85eb74cd21f9064563b Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 8 May 2023 14:51:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E5=8F=AF?=
=?UTF-8?q?=E8=A7=86=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 985 +++++++++++-----------
pages/tabBar/category/category.vue | 86 +-
pages/tabBar/home/home.vue | 10 +
physical-merchants/classify/cart/cart.vue | 2 +-
4 files changed, 573 insertions(+), 510 deletions(-)
diff --git a/pages.json b/pages.json
index 0cabc64..b78b56e 100644
--- a/pages.json
+++ b/pages.json
@@ -632,567 +632,566 @@
],
"subpackages": [{
- "root": "subPages",
- "pages": [{
- "path": "coupon-comfirmation-success/coupon-comfirmation-success",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "支付成功",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ "root": "subPages",
+ "pages": [{
+ "path": "coupon-comfirmation-success/coupon-comfirmation-success",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "支付成功",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "brand-classification/brand-classification",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "品牌分类",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "brand-classification/brand-classification",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "品牌分类",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "preferred-goods/preferred-goods",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "商品分类",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "preferred-goods/preferred-goods",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "商品分类",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "lottery/lottery",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "抽奖活动",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#e62601",
- "backgroundColorTop": "#e62601",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "lottery/lottery",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "抽奖活动",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#e62601",
+ "backgroundColorTop": "#e62601",
+ "navigationBarTextStyle": "white"
+ }
- },
- {
- "path": "recharge/recharge",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "话费充值",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ },
+ {
+ "path": "recharge/recharge",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "话费充值",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- },
- {
- "path": "recharge-centre/recharge-centre",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "话费充值",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ },
+ {
+ "path": "recharge-centre/recharge-centre",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "话费充值",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "unionComfirmation/unionComfirmation",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "确认订单",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "unionPay-orderList/unionPay-orderList",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "话费订单",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "unionPay/unionPay",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "入口选择",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "unionWeb/unionWeb",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
+ }, {
+ "path": "unionComfirmation/unionComfirmation",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "确认订单",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "unionPay-orderList/unionPay-orderList",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "话费订单",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "unionPay/unionPay",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "入口选择",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "unionWeb/unionWeb",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
- }, {
- "path": "Phone-recharge-details/Phone-recharge-details",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "交易详情",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "sotre-details-list/sotre-details-list",
- "style": {
- "navigationBarTitleText": "门店列表",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "Phone-recharge-details/Phone-recharge-details",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "交易详情",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "sotre-details-list/sotre-details-list",
+ "style": {
+ "navigationBarTitleText": "门店列表",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "coupon-package/coupon-package",
- "style": {
- "navigationBarTitleText": "",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "coupon-packge-details/coupon-packge-details",
- "style": {
- "navigationBarTitleText": "优惠券包详情",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "coupon-comfirmation/coupon-comfirmation",
- "style": {
- "navigationBarTitleText": "确认订单",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "coupon-package/coupon-package",
+ "style": {
+ "navigationBarTitleText": "",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "coupon-packge-details/coupon-packge-details",
+ "style": {
+ "navigationBarTitleText": "优惠券包详情",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "coupon-comfirmation/coupon-comfirmation",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "trade-union-recharge/trade-union-recharge",
- "style": {
- "navigationBarTitleText": "工会卡充值",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "trade-union-recharge/trade-union-recharge",
+ "style": {
+ "navigationBarTitleText": "工会卡充值",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "union-card-success/union-card-success",
- "style": {
- "navigationBarTitleText": "充值成功",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "union-card-success/union-card-success",
+ "style": {
+ "navigationBarTitleText": "充值成功",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "cardsList/cardsList",
+ }, {
+ "path": "cardsList/cardsList",
+ "style": {
+ "navigationBarTitleText": "卡包",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "cardsDetails/cardsDetails",
+ "style": {
+ "navigationBarTitleText": "卡详情",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "rechargeDetails/rechargeDetails",
+ "style": {
+ "navigationBarTitleText": "详情",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "recharge-pay/recharge-pay",
+ "style": {
+ "navigationBarTitleText": "支付",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "agenthome/agenthome",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "代理商",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "agentmanage/agentmanage",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "代理商管理",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "addAgent/addAgent",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "添加代理商",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "agentDistribution/agentDistribution",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "分销代理商",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "agentCardList/agentCardList",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "分发卡券列表",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "agentcardsDetails/agentcardsDetails",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "分发记录",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "scancodeCoupons/scancodeCoupons",
+ "style": {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "扫码领券",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "onReachBottomDistance": 50
+ }
+
+ }, {
+ "path": "selectEntry/selectEntry",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": false //禁用原生导航栏
+ }
+ }
+
+ }, {
+ "path": "shareCounpon/shareCounpon",
+ "style": {
+ "navigationBarTitleText": "分享领取优惠券",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": false //禁用原生导航栏
+ }
+ }
+
+ }, {
+ "path": "shareImgage/shareImgage",
+ "style": {
+ "navigationBarTitleText": "分享领取优惠券",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": false //禁用原生导航栏
+ }
+ }
+
+ }
+ ]
+ }, {
+ "root": "qianzhu-KFC",
+ "pages": [{
+ "path": "home/home",
"style": {
- "navigationBarTitleText": "卡包",
"enablePullDownRefresh": false,
+ "navigationBarTitleText": "肯德基",
"backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
}
}, {
- "path": "cardsDetails/cardsDetails",
+ "path": "address/address",
"style": {
- "navigationBarTitleText": "卡详情",
"enablePullDownRefresh": false,
+ "navigationBarTitleText": "肯德基在线点餐",
"backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
}
}, {
- "path": "rechargeDetails/rechargeDetails",
+ "path": "update-address/update-address",
"style": {
- "navigationBarTitleText": "详情",
"enablePullDownRefresh": false,
"backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
}
+
}, {
- "path": "recharge-pay/recharge-pay",
+ "path": "buffet-order/buffet-order",
"style": {
- "navigationBarTitleText": "支付",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarTitleText": "选择餐厅",
+ "enablePullDownRefresh": false
}
}, {
- "path": "agenthome/agenthome",
+ "path": "menu-list/menu-list",
"style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "代理商",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarTitleText": "菜单",
+ "enablePullDownRefresh": false
}
}, {
- "path": "agentmanage/agentmanage",
+ "path": "confirmOrder/confirmOrder",
"style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "代理商管理",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarTitleText": "在线点餐",
+ "enablePullDownRefresh": false
}
}, {
- "path": "addAgent/addAgent",
+ "path": "order-details/order-details",
"style": {
+ "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false,
- "navigationBarTitleText": "添加代理商",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
"navigationBarTextStyle": "white"
}
}, {
- "path": "agentDistribution/agentDistribution",
+ "path": "kfc-menu-list/kfc-menu-list",
"style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "分销代理商",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarTitleText": "菜单",
+ "enablePullDownRefresh": false
}
}, {
- "path": "agentCardList/agentCardList",
+ "path": "payment-method/payment-method",
"style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "分发卡券列表",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarTitleText": "继续支付",
+ "enablePullDownRefresh": false
}
- }, {
- "path": "agentcardsDetails/agentcardsDetails",
+
+ }]
+ }, {
+ "root": "qianzhu-Starbucks",
+ "pages": [{
+ "path": "home/home",
"style": {
"enablePullDownRefresh": false,
- "navigationBarTitleText": "分发记录",
+ "navigationBarTitleText": "星巴克",
"backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white"
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
}
}, {
- "path": "scancodeCoupons/scancodeCoupons",
+ "path": "changeRegin/changeRegin",
"style": {
- "navigationBarTextStyle": "white",
- "navigationBarTitleText": "扫码领券",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "onReachBottomDistance": 50
+ "navigationBarTitleText": "城市选择",
+ "enablePullDownRefresh": false
}
-
- }, {
- "path": "selectEntry/selectEntry",
+ }]
+ }, {
+ "root": "member-Recharge",
+ "pages": [{
+ "path": "home/home",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
- "app-plus": {
- "titleNView": false //禁用原生导航栏
- }
+ "navigationBarTitleText": "会员充值",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
}
}, {
- "path": "shareCounpon/shareCounpon",
+ "path": "rec-confirmation/rec-confirmation",
"style": {
- "navigationBarTitleText": "分享领取优惠券",
- "enablePullDownRefresh": false,
- "app-plus": {
- "titleNView": false //禁用原生导航栏
- }
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
}
}, {
- "path": "shareImgage/shareImgage",
+ "path": "choicepage/choicepage",
"style": {
- "navigationBarTitleText": "分享领取优惠券",
- "enablePullDownRefresh": false,
- "app-plus": {
- "titleNView": false //禁用原生导航栏
- }
+ "navigationBarTitleText": "充值类型",
+ "enablePullDownRefresh": false
}
- }
- ]
- }, {
- "root": "qianzhu-KFC",
- "pages": [{
- "path": "home/home",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "肯德基",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#ffffff",
- "navigationBarTextStyle": "black"
- }
-
- }, {
- "path": "address/address",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "肯德基在线点餐",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#ffffff",
- "navigationBarTextStyle": "black"
- }
-
- }, {
- "path": "update-address/update-address",
- "style": {
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#ffffff",
- "navigationBarTextStyle": "black"
- }
-
- }, {
- "path": "buffet-order/buffet-order",
- "style": {
- "navigationBarTitleText": "选择餐厅",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "menu-list/menu-list",
- "style": {
- "navigationBarTitleText": "菜单",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "confirmOrder/confirmOrder",
- "style": {
- "navigationBarTitleText": "在线点餐",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "order-details/order-details",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#3da7e7",
- "backgroundColorTop": "#3da7e7",
- "navigationBarTextStyle": "white"
- }
-
- }, {
- "path": "kfc-menu-list/kfc-menu-list",
- "style": {
- "navigationBarTitleText": "菜单",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "payment-method/payment-method",
- "style": {
- "navigationBarTitleText": "继续支付",
- "enablePullDownRefresh": false
- }
-
- }]
- }, {
- "root": "qianzhu-Starbucks",
- "pages": [{
- "path": "home/home",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "星巴克",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#ffffff",
- "navigationBarTextStyle": "black"
- }
-
+ }]
}, {
- "path": "changeRegin/changeRegin",
- "style": {
- "navigationBarTitleText": "城市选择",
- "enablePullDownRefresh": false
- }
- }]
- }, {
- "root": "member-Recharge",
- "pages": [{
- "path": "home/home",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "会员充值",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#ffffff",
- "navigationBarTextStyle": "black"
- }
-
- }, {
- "path": "rec-confirmation/rec-confirmation",
- "style": {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "choicepage/choicepage",
- "style": {
- "navigationBarTitleText": "充值类型",
- "enablePullDownRefresh": false
- }
+ "root": "physical-merchants",
+ "pages": [{
+ "path": "classify/goodsDetail/goodsDetail",
+ "style": {
+ "navigationBarTitleText": "商品详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/goods-search/goods-search",
+ "style": {
+ "navigationBarTitleText": "搜索",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "classify/cart/cart",
+ "style": {
+ "navigationBarTitleText": "购物车",
+ "enablePullDownRefresh": false,
+ "disableScroll": true
- }]
- },{
- "root":"physical-merchants",
- "pages":[
- {
- "path": "classify/goodsDetail/goodsDetail",
- "style": {
- "navigationBarTitleText": "商品详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "classify/goods-search/goods-search",
- "style": {
- "navigationBarTitleText": "搜索",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#3da7e7",
- "backgroundColorTop": "#3da7e7",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "classify/cart/cart",
- "style": {
- "navigationBarTitleText": "购物车",
- "enablePullDownRefresh": false,
- "disableScroll": true
-
- }
- },
- {
- "path": "classify/goods-comment/goods-comment",
- "style": {
- "navigationBarTitleText": "查看评论",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "address/address",
- "style": {
- "navigationBarTitleText": "我的地址",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "address/addNewAddress/addNewAddress",
- "style": {
- "navigationBarTitleText": "新增地址",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "settleAccounts/settleAccounts",
- "style": {
- "navigationBarTitleText": "订单确认",
- "enablePullDownRefresh": false
+ }
},
- "app-plus": {
- // "softinputNavBar": "none",
- "softinputMode": "adjustResize"
- }
- },
- {
- "path": "classify/order/order",
- "style": {
- "navigationBarTitleText": "订单列表",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "classify/order/orderDetail",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#3da7e7",
- "backgroundColorTop": "#3da7e7",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "classify/order/editOrder",
- "style": {
- "navigationBarTitleText": "修改订单",
- "enablePullDownRefresh": false
- }
- },
- // {
- // "path": "wuliu/wuliu",
- // "style": {
- // "navigationBarTitleText": "物流信息",
- // "enablePullDownRefresh": false
- // }
- // },
- {
- "path": "classify/order/pay",
- "style": {
- "navigationBarTitleText": "收银台页",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "classify/order/paymentResult",
-
- "style": {
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#3da7e7",
- "backgroundColorTop": "#3da7e7",
- "navigationBarTitleText": "支付结果",
- "enablePullDownRefresh": false
+ {
+ "path": "classify/goods-comment/goods-comment",
+ "style": {
+ "navigationBarTitleText": "查看评论",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "address/address",
+ "style": {
+ "navigationBarTitleText": "我的地址",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "address/addNewAddress/addNewAddress",
+ "style": {
+ "navigationBarTitleText": "新增地址",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "settleAccounts/settleAccounts",
+ "style": {
+ "navigationBarTitleText": "订单确认",
+ "enablePullDownRefresh": false
+ },
+ "app-plus": {
+ // "softinputNavBar": "none",
+ "softinputMode": "adjustResize"
+ }
+ },
+ {
+ "path": "classify/order/order",
+ "style": {
+ "navigationBarTitleText": "订单列表",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/order/orderDetail",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "classify/order/editOrder",
+ "style": {
+ "navigationBarTitleText": "修改订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ // {
+ // "path": "wuliu/wuliu",
+ // "style": {
+ // "navigationBarTitleText": "物流信息",
+ // "enablePullDownRefresh": false
+ // }
+ // },
+ {
+ "path": "classify/order/pay",
+ "style": {
+ "navigationBarTitleText": "收银台页",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "classify/order/paymentResult",
+
+ "style": {
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
+ "navigationBarTitleText": "支付结果",
+ "enablePullDownRefresh": false
+ }
}
- }
- ]
- }
-
+ ]
+ }
+
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1213,12 +1212,12 @@
"selectedIconPath": "static/img/tabBar/home-on.png",
"text": "首页"
},
- {
- "pagePath": "pages/tabBar/classify/classify",
- "iconPath": "static/img/tabBar/cart.png",
- "selectedIconPath": "static/img/tabBar/cart-on.png",
- "text": "商品"
- },
+ // {
+ // "pagePath": "pages/tabBar/classify/classify",
+ // "iconPath": "static/img/tabBar/cart.png",
+ // "selectedIconPath": "static/img/tabBar/cart-on.png",
+ // "text": "商品"
+ // },
{
"pagePath": "pages/tabBar/category/category",
"iconPath": "static/img/tabBar/category.png",
@@ -1234,7 +1233,7 @@
}
]
},
- "condition" : { //模式配置,仅开发期间生效
+ "condition": { //模式配置,仅开发期间生效
// "current": 0, //当前激活的模式(list 的索引项)
// "list": [
// {
@@ -1244,4 +1243,4 @@
// }
// ]
}
-}
+}
\ No newline at end of file
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index bfd4b6b..f885f6d 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -229,14 +229,40 @@
imgadres3: 'noorder.png',
imgadres4: 'dh.png',
marker: '', //商户
- typeid: 0, //选择分类
+ typeid: 99999999, //选择分类
isSelected: 1, //是否选择下拉
- selectFirst: '', //筛选是否有值
- selectFirstName: '', //筛选值名字
+ selectFirst: '99999999', //筛选是否有值
+ selectFirstName: '全部', //筛选值名字
selectChiler: 2, // 一级子菜单筛选
selectChilerdistance: 2, // 二级子菜单筛选
- goodsFirstClassList: '', //商品一级分类
- goodsSendotClassList: '', //商品一级分类
+ goodsFirstClassList: [{
+ "childIndustry": null,
+ "createTime": 1640252815000,
+ "name": "全部",
+ "id": 99999999,
+ "wechatCompanyCode": "716",
+ "wechatName": "全部",
+ "ext3": null,
+ "parentId": 1,
+ "wechatSelfEmployedCode": "719",
+ "ext2": null,
+ "status": 1,
+ "ext1": "650"
+ }], //商品一级分类
+ goodsSendotClassList: [{
+ "childIndustry": null,
+ "createTime": 1640252998000,
+ "name": "全部",
+ "id": 99999999,
+ "wechatCompanyCode": "716",
+ "wechatName": "全部",
+ "ext3": null,
+ "parentId": 13,
+ "wechatSelfEmployedCode": "719",
+ "ext2": null,
+ "status": 1,
+ "ext1": "642"
+ }], //商品一级分类
distanceList: [{
id: 1,
title: '1km'
@@ -292,17 +318,19 @@
getIndustry() {
getIndustry().then(res => {
if (res.return_code == '000000') {
- this.goodsFirstClassList = res.return_data;
- this.typeid = res.return_data[0].id;
- this.goodsSendotClassList = res.return_data[0].childIndustry;
- this.selectFirst = res.return_data[0].childIndustry[0].id;
- this.selectFirstName = res.return_data[0].childIndustry[0].name;
+ for (var i = 0; i < res.return_data.length; i++) {
+ this.goodsFirstClassList.push(res.return_data[i]);
+ }
+ // this.typeid = res.return_data[0].id;
+ // this.goodsSendotClassList = res.return_data[0].childIndustry;
+ // this.selectFirst = res.return_data[0].childIndustry[0].id;
+ // this.selectFirstName = res.return_data[0].childIndustry[0].name;
let platform = uni.getSystemInfoSync().platform;
if (platform == 'android') {
this.typeplat = 2;
this.getMapStore();
}
- if (platform == 'ios') {
+ if (platform == 'ios' || platform == 'devtools') {
this.typeplat = 1;
this.getMapStore();
}
@@ -311,11 +339,17 @@
},
//查询商户
getMapStore() {
+ let childId = '';
+ if (this.selectFirst == 99999999) {
+ childId = '';
+ } else {
+ childId = this.selectFirst
+ }
let datas = {
distance: this.distance,
name: this.searchName,
type: this.typeplat,
- childId: this.selectFirst,
+ childId: childId,
longitude: this.longitude,
latitude: this.latitude
}
@@ -482,7 +516,7 @@
type: 'wgs84',
success: (res) => {
uni.hideLoading();
- console.log(res, '获取当前位置')
+ // console.log(res, '获取当前位置')
this.longitude = res.longitude;
this.latitude = res.latitude;
this.getIndustry();
@@ -498,9 +532,29 @@
//选择类型
changeType(item) {
this.typeid = item.id;
- this.goodsSendotClassList = item.childIndustry;
- this.selectFirst = item.childIndustry[0].id;
- this.selectFirstName = item.childIndustry[0].name;
+ if (item.id == 99999999) {
+ this.goodsSendotClassList = [{
+ "childIndustry": null,
+ "createTime": 1640252998000,
+ "name": "全部",
+ "id": 99999999,
+ "wechatCompanyCode": "716",
+ "wechatName": "全部",
+ "ext3": null,
+ "parentId": 13,
+ "wechatSelfEmployedCode": "719",
+ "ext2": null,
+ "status": 1,
+ "ext1": "642"
+ }];
+ this.selectFirst = '99999999';
+ this.selectFirstName = '全部';
+ }else{
+ this.goodsSendotClassList = item.childIndustry;
+ this.selectFirst = item.childIndustry[0].id;
+ this.selectFirstName = item.childIndustry[0].name;
+ }
+
this.getMapStore();
},
//子菜单显示
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 94d8609..5e5b7e8 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -137,6 +137,16 @@
¥{{goods.price}}
+
+
+
+ {{item.name}}
+
+
+
+
diff --git a/physical-merchants/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue
index 1f46517..7ad9896 100644
--- a/physical-merchants/classify/cart/cart.vue
+++ b/physical-merchants/classify/cart/cart.vue
@@ -498,7 +498,7 @@
},
goClassify(){
- uni.switchTab({
+ uni.reLaunch({
url:'/pages/tabBar/classify/classify'
})
},