diff --git a/components/shopListPopup.vue b/components/shopListPopup.vue
index eb4f0fc..72f042c 100644
--- a/components/shopListPopup.vue
+++ b/components/shopListPopup.vue
@@ -1,137 +1,142 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/pageQuota/goodDetail/index.vue b/pageQuota/goodDetail/index.vue
new file mode 100644
index 0000000..13c35e8
--- /dev/null
+++ b/pageQuota/goodDetail/index.vue
@@ -0,0 +1,11 @@
+
+
+ 商品详情
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageQuota/quotation/index.vue b/pageQuota/quotation/index.vue
new file mode 100644
index 0000000..9938daa
--- /dev/null
+++ b/pageQuota/quotation/index.vue
@@ -0,0 +1,18 @@
+
+
+
+
+ 报价单
+
+
+
+ dgfsdhjg
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 69412e3..5dbe60e 100644
--- a/pages.json
+++ b/pages.json
@@ -1,119 +1,138 @@
{
- "easycom": {
- "autoscan": true,
- // 注意一定要放在custom里,否则无效,https://ask.dcloud.net.cn/question/131175
- "custom": {
- "^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
- "^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
- "^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
- }
- },
- "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/login/login",
- "style": {
- "navigationBarTitleText": "登录",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "购物",
- "disableScroll": true,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/cart/cart",
- "style": {
- "navigationBarTitleText": "购物车",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/my",
- "style": {
- "navigationBarTitleText": "个人中心",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- }
+ "easycom": {
+ "autoscan": true,
+ // 注意一定要放在custom里,否则无效,https://ask.dcloud.net.cn/question/131175
+ "custom": {
+ "^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
+ "^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
+ "^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
+ }
+ },
+ "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "购物",
+ "disableScroll": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/cart/cart",
+ "style": {
+ "navigationBarTitleText": "购物车",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my/my",
+ "style": {
+ "navigationBarTitleText": "个人中心",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ }
- ],
- "subPackages": [{
- "root": "pagesOrder",
- "pages": [{
- "path": "order/order",
- "style": {
- "navigationBarTitleText": "我的订单",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "detail/detail",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "addressList/addressList",
- "style": {
- "navigationBarTitleText": "地址管理",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "addressEdit/addressEdit",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "settle/settle",
- "style": {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- }
- ]
- }],
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#fff",
- "backgroundColor": "#fff"
- },
- // "tabBar": {
- // "color": "#999999",
- // "selectedColor": "#20b128",
- // "borderStyle": "white",
- // "backgroundColor": "#FFFFFF",
- // "list": [{
- // "pagePath": "pages/index/index",
- // "text": "首页",
- // "iconPath": "static/tab/a.png",
- // "selectedIconPath": "static/tab/aa.png"
- // },
- // {
- // "pagePath": "pages/cart/cart",
- // "text": "购物车",
- // "iconPath": "static/tab/b.png",
- // "selectedIconPath": "static/tab/ba.png"
- // },
+ ],
+ "subPackages": [{
+ "root": "pagesOrder",
+ "pages": [{
+ "path": "order/order",
+ "style": {
+ "navigationBarTitleText": "我的订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "detail/detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "addressList/addressList",
+ "style": {
+ "navigationBarTitleText": "地址管理",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "addressEdit/addressEdit",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "settle/settle",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
+ }, {
+ "root": "pageQuota",
+ "pages": [{
+ "path": "quotation/index",
+ "style": {
+ "navigationBarTitleText": "报价单",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "goodDetail/index",
+ "style": {
+ "navigationBarTitleText": "商品详情",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
+ }],
- // {
- // "pagePath": "pages/my/my",
- // "text": "我的",
- // "iconPath": "static/tab/c.png",
- // "selectedIconPath": "static/tab/ca.png"
- // }
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#fff",
+ "backgroundColor": "#fff"
+ },
+ // "tabBar": {
+ // "color": "#999999",
+ // "selectedColor": "#20b128",
+ // "borderStyle": "white",
+ // "backgroundColor": "#FFFFFF",
+ // "list": [{
+ // "pagePath": "pages/index/index",
+ // "text": "首页",
+ // "iconPath": "static/tab/a.png",
+ // "selectedIconPath": "static/tab/aa.png"
+ // },
+ // {
+ // "pagePath": "pages/cart/cart",
+ // "text": "购物车",
+ // "iconPath": "static/tab/b.png",
+ // "selectedIconPath": "static/tab/ba.png"
+ // },
- // ]
- // },
- "uniIdRouter": {}
+ // {
+ // "pagePath": "pages/my/my",
+ // "text": "我的",
+ // "iconPath": "static/tab/c.png",
+ // "selectedIconPath": "static/tab/ca.png"
+ // }
+
+ // ]
+ // },
+ "uniIdRouter": {}
}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f05f5c..50e19ee 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,746 +1,786 @@
-
-
-
- 惠农批发
-
-
-
-
-
-
-
-
- 购物车
-
-
-
- 个人中心
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- 全
- 部
-
-
-
-
-
- 全部分类
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
- 综合
- 价格
- 销量
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
- {{item.brand_name}}|
- {{item.class_name}}|
- {{item.unit_name}}
-
-
-
- ¥{{item.sell}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 合计
- ¥{{cartInfo.total_price}}
-
-
-
-
- 结算
-
-
-
- {{cartInfo.count}}
-
-
+
+
+ 结算
+
+
+
+ {{cartInfo.count}}
+
+
-
-
+
+
\ No newline at end of file