Parcourir la source

commit 通知服务消息

zhengjinyi il y a 3 ans
Parent
commit
3313033ea6

+ 6 - 0
common/css/iconfont.scss

@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-qingli:before {
+  content: "\e73a";
+}
+
 .icon-shanchu4:before {
   content: "\e738";
 }
@@ -576,3 +580,5 @@
 .icon-wodebeifenx:before {
   content: "\e611";
 }
+
+

+ 6 - 2
components/thorui/tui-swipe-action/tui-swipe-action.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tui-swipeout-wrap">
+	<view class="tui-swipeout-wrap" :style="{backgroundColor:backgroundColor}">
 		<view class="tui-swipeout-item" :class="[isShowBtn ? 'swipe-action-show' : '']" @touchstart="handlerTouchstart"
 		 @touchmove="handlerTouchmove" @touchend="handlerTouchend" :style="{ transform: 'translate(' + position.pageX + 'px,0)' }">
 			<view class="tui-swipeout-content">
@@ -67,6 +67,11 @@
 			open: {
 				type: Boolean,
 				default: false
+			},
+			//背景色
+			backgroundColor:{
+				type:String,
+				default:'#fff'
 			}
 		},
 		watch: {
@@ -219,7 +224,6 @@
 
 <style scoped>
 	.tui-swipeout-wrap {
-		background-color: #fff;
 		position: relative;
 		overflow: hidden;
 	}

+ 1139 - 1089
pages.json

@@ -1,1096 +1,1146 @@
 {
-    "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-        {
-            "path": "pages/tabBar/home/index",
-            "style": {
-                "navigationBarTitleText": "采美采购商城",
-                "enablePullDownRefresh": true,
-                "backgroundColor": "#F28F31",
-                "backgroundTextStyle": "light",
-                "navigationStyle": "custom"
-            }
-        }, {
-            "path": "pages/authorization/authorization",
-            "style": {
-                "navigationBarTitleText": "微信授权",
-                "navigationStyle": "custom"
-            }
-        }, {
-            "path": "pages/tabBar/category/index",
-            "style": {
-                "navigationBarTitleText": "分类",
-                "navigationStyle": "custom"
-            }
-        }, {
-            "path": "pages/tabBar/cart/index",
-            "style": {
-                "navigationBarTitleText": "购物车",
-                "enablePullDownRefresh": true
-            }
-        }, {
-            "path": "pages/tabBar/user/user",
-            "style": {
-                "navigationBarTitleText": "我的",
-                "enablePullDownRefresh": true,
-                "navigationStyle": "custom"
-            }
-        }
-    ],
-    "subPackages": [{
-            "root": "pages/service/", //信息服务模块
-            "pages": [{
-                    "path": "aftersale",
-                    "style": {
-                        "navigationBarTitleText": "售后无忧"
-                    }
-                },
-                {
-                    "path": "service",
-                    "style": {
-                        "navigationBarTitleText": "采美365网"
-                    }
-                },
-                {
-                    "path": "shoppingnotice",
-                    "style": {
-                        "navigationBarTitleText": "购物须知"
-                    }
-                },
-                {
-                    "path": "sellconten",
-                    "style": {
-                        "navigationBarTitleText": "条款内容"
-                    }
-                },
-                {
-                    "path": "news-list",
-                    "style": {
-                        "navigationBarTitleText": "公告",
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/tabBar/home/index",
+			"style": {
+				"navigationBarTitleText": "采美采购商城",
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#F28F31",
+				"backgroundTextStyle": "light",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/tabBar/notice/index",
+			"style": {
+				"navigationBarTitleText": "消息通知",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/tabBar/category/index",
+			"style": {
+				"navigationBarTitleText": "分类",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/tabBar/cart/index",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/tabBar/user/user",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			}
+		}
+	],
+	"subPackages": [{
+			"root": "pages/service/", //信息服务模块
+			"pages": [{
+					"path": "aftersale",
+					"style": {
+						"navigationBarTitleText": "售后无忧"
+					}
+				},
+				{
+					"path": "service",
+					"style": {
+						"navigationBarTitleText": "采美365网"
+					}
+				},
+				{
+					"path": "shoppingnotice",
+					"style": {
+						"navigationBarTitleText": "购物须知"
+					}
+				},
+				{
+					"path": "sellconten",
+					"style": {
+						"navigationBarTitleText": "条款内容"
+					}
+				},
+				{
+					"path": "news-list",
+					"style": {
+						"navigationBarTitleText": "公告",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "news-detailes",
+					"style": {
+						"navigationBarTitleText": "公告内容"
+					}
+				},
+				{
+					"path": "certificate",
+					"style": {
+						"navigationBarTitleText": "资质证书"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods/", //商品模块
+			"pages": [
+				/*美体节临时页面*/
+				{
+					"path": "good-floor-temp",
+					"style": {
+						"navigationBarTitleText": "美体节",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "goods-instrument",
+					"style": {
+						"navigationBarTitleText": "项目仪器",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "goods-classify",
+					"style": {
+						"navigationBarTitleText": "商品列表",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "good-floorMore",
+					"style": {
+						"navigationBarTitleText": "更多楼层",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "good-floor",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "goods-active",
+					"style": {
+						"navigationBarTitleText": "凑单商品",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "product",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "instrument-details",
+					"style": {
+						"navigationBarTitleText": "项目仪器详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "cart",
+					"style": {
+						"navigationBarTitleText": "购物车",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "goods-doc-list",
+					"style": {
+						"navigationBarTitleText": "美业资料",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "goods-doc-detail",
+					"style": {
+						"navigationBarTitleText": "美业资料详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "goods-supporting",
+					"style": {
+						"navigationBarTitleText": "配套商品",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "good-hot",
+					"style": {
+						"navigationBarTitleText": "新品橱窗",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/login/", //注册登录模块
+			"pages": [{
+					"path": "register",
+					"style": {
+						"navigationBarTitleText": "机构注册",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "register-supplier",
+					"style": {
+						"navigationBarTitleText": "供应商注册",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "register-select",
+					"style": {
+						"navigationBarTitleText": "选择身份"
+					}
+				},
+				{
+					"path": "apply",
+					"style": {
+						"navigationBarTitleText": "升级资质机构",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "apply-supplier",
+					"style": {
+						"navigationBarTitleText": "修改申请资料",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "logincode",
+					"style": {
+						"navigationBarTitleText": "邀请码登录"
+					}
+				},
+				{
+					"path": "login",
+					"style": {
+						"navigationBarTitleText": "登录"
+					}
+				},
+				{
+					"path": "binding",
+					"style": {
+						"navigationBarTitleText": "注册信息"
+					}
+				},
+				{
+					"path": "bindwechat",
+					"style": {
+						"navigationBarTitleText": "绑定微信"
+					}
+				},
+				{
+					"path": "bindOperator",
+					"style": {
+						"navigationBarTitleText": "绑定运营人员"
+					}
+				},
+				{
+					"path": "information",
+					"style": {
+						"navigationBarTitleText": "修改资料",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/user/", //机构个人中心模块
+			"pages": [{
+					"path": "account/account",
+					"style": {
+						"navigationBarTitleText": "账户余额明细",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "account/account-bean",
+					"style": {
+						"navigationBarTitleText": "采美豆明细",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "address/addressManage",
+					"style": {
+						"navigationBarTitleText": "添加新地址"
+					}
+				},
+				{
+					"path": "address/address",
+					"style": {
+						"navigationBarTitleText": "地址列表"
+					}
+				},
+				{
+					"path": "about/about",
+					"style": {
+						"navigationBarTitleText": "关于我们"
+					}
+				},
+				{
+					"path": "regularPurchase/regularPurchase",
+					"style": {
+						"navigationBarTitleText": "再次购买"
+					}
+				},
+				{
+					"path": "order/create-order",
+					"style": {
+						"navigationBarTitleText": "确认订单"
+					}
+				},
+				{
+					"path": "order/success",
+					"style": {
+						"navigationBarTitleText": "支付结果",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-success",
+					"style": {
+						"navigationBarTitleText": "支付结果",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-success-tips",
+					"style": {
+						"navigationBarTitleText": "支付结果",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-payment",
+					"style": {
+						"navigationBarTitleText": "选择支付方式",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-payunder",
+					"style": {
+						"navigationBarTitleText": "线下转账"
+					}
+				},
+				{
+					"path": "order/order-pay-list",
+					"style": {
+						"navigationBarTitleText": "支付订单"
+					}
+				},
+				{
+					"path": "order/order-pay",
+					"style": {
+						"navigationBarTitleText": "收银台",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-payhlb",
+					"style": {
+						"navigationBarTitleText": "收银台",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/orderShareLogin",
+					"style": {
+						"navigationBarTitleText": "输入分享码"
+					}
+				},
+				{
+					"path": "order/order-sharelogin",
+					"style": {
+						"navigationBarTitleText": "查看订单"
+					}
+				},
+				{
+					"path": "order/order-list",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-sharedetails",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "order/order-logistics",
+					"style": {
+						"navigationBarTitleText": "物流信息"
+					}
+				},
+				{
+					"path": "operator/list",
+					"style": {
+						"navigationBarTitleText": "运营人员管理"
+					}
+				},
+				{
+					"path": "operator/addoperator",
+					"style": {
+						"navigationBarTitleText": "添加运营人员"
+					}
+				},
+				{
+					"path": "setting/setting",
+					"style": {
+						"navigationBarTitleText": "账户设置"
+					}
+				},
+				{
+					"path": "setting/phone",
+					"style": {
+						"navigationBarTitleText": "更换手机号"
+					}
+				},
+				{
+					"path": "coupon/coupon",
+					"style": {
+						"navigationBarTitleText": "优惠券",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "coupon/coupon-collection",
+					"style": {
+						"navigationBarTitleText": "领券中心",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "coupon/coupon-exchange",
+					"style": {
+						"navigationBarTitleText": "兑换优惠券"
+					}
+				},
+				{
+					"path": "coupon/coupon-product",
+					"style": {
+						"navigationBarTitleText": "活动商品",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "coupon/coupon-activity",
+					"style": {
+						"navigationBarTitleText": "采美云上美博会",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "collection/collection",
+					"style": {
+						"navigationBarTitleText": "收藏商品",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "member/member",
+					"style": {
+						"navigationBarTitleText": "采美超级会员",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "member/member-renew",
+					"style": {
+						"navigationBarTitleText": "购买超级会员"
+					}
+				},
+				{
+					"path": "member/member-record",
+					"style": {
+						"navigationBarTitleText": "购买记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "member/member-pay",
+					"style": {
+						"navigationBarTitleText": "支付超级会员"
+					}
+				},
+				{
+					"path": "member/member-product",
+					"style": {
+						"navigationBarTitleText": "优惠商品",
+						"enablePullDownRefresh": true
+					}
+				}
+				
+			]
+		},
+		{
+			"root": "pages/notice/", //搜索分包模块
+			"pages": [
+				{
+					"path": "club/notice-order",
+					"style": {
+						"navigationBarTitleText": "交易物流"
+					}
+				},
+				{
+					"path": "club/notice-users",
+					"style": {
+						"navigationBarTitleText": "账户通知"
+					}
+				},
+				{
+					"path": "club/notice-serve",
+					"style": {
+						"navigationBarTitleText": "服务通知"
+					}
+				},
+				{
+					"path": "club/notice-coupon",
+					"style": {
+						"navigationBarTitleText": "优惠促销"
+					}
+				},
+				{
+					"path": "shop/notice-users",
+					"style": {
+						"navigationBarTitleText": "账户通知"
+					}
+				},
+				{
+					"path": "shop/notice-serve",
+					"style": {
+						"navigationBarTitleText": "服务通知"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/seller/",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "采美采购商城",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "login/login",
+					"style": {
+						"navigationBarTitleText": "登录",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "cart/cart",
+					"style": {
+						"navigationBarTitleText": "购物车"
+					}
+				},
+				{
+					"path": "cart/buyagain",
+					"style": {
+						"navigationBarTitleText": "再次购买"
+					}
+				},
+				{
+					"path": "cart/immediately",
+					"style": {
+						"navigationBarTitleText": "立即下单"
+					}
+				},
+				{
+					"path": "cart/second",
+					"style": {
+						"navigationBarTitleText": "二手下单"
+					}
+				},
+				{
+					"path": "cart/coupon",
+					"style": {
+						"navigationBarTitleText": "优惠券列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "cart/coupon-share",
+					"style": {
+						"navigationBarTitleText": "购买优惠券"
+					}
+				},
+				{
+					"path": "order/create-order",
+					"style": {
+						"navigationBarTitleText": "确认订单"
+					}
+				},
+				{
+					"path": "order/create-recharge-order",
+					"style": {
+						"navigationBarTitleText": "确认订单"
+					}
+				},
+				{
+					"path": "order/order-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-list",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "club/list",
+					"style": {
+						"navigationBarTitleText": "机构列表"
+					}
+				},
+				{
+					"path": "club/stayClub-list",
+					"style": {
+						"navigationBarTitleText": "待注册机构"
+					}
+				},
+				{
+					"path": "club/club-list",
+					"style": {
+						"navigationBarTitleText": "我的机构"
+					}
+				},
+				{
+					"path": "club/allClub-list",
+					"style": {
+						"navigationBarTitleText": "所有机构"
+					}
+				},
+				{
+					"path": "club/addoperator",
+					"style": {
+						"navigationBarTitleText": "邀请运营人员"
+					}
+				},
+				{
+					"path": "login/register",
+					"style": {
+						"navigationBarTitleText": "拉机构上线",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "login/register-select",
+					"style": {
+						"navigationBarTitleText": "拉机构上线"
+					}
+				},
+				{
+					"path": "login/register-general",
+					"style": {
+						"navigationBarTitleText": "个人机构"
+					}
+				},
+				{
+					"path": "login/register-member",
+					"style": {
+						"navigationBarTitleText": "资质机构"
+					}
+				},
+				{
+					"path": "login/information",
+					"style": {
+						"navigationBarTitleText": "修改资料",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "login/apply",
+					"style": {
+						"navigationBarTitleText": "修改申请信息",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-historylist",
+					"style": {
+						"navigationBarTitleText": "订单列表"
+					}
+				}, {
+					"path": "search/search-order",
+					"style": {
+						"navigationBarTitleText": "订单搜索"
+					}
+				},
+				{
+					"path": "address/address",
+					"style": {
+						"navigationBarTitleText": "选择地址"
+					}
+				},
+				{
+					"path": "address/addressManage",
+					"style": {
+						"navigationBarTitleText": "添加地址"
+					}
+				},
+				{
+					"path": "remarks/list",
+					"style": {
+						"navigationBarTitleText": "注册客户咨询记录"
+					}
+				},
+				{
+					"path": "remarks/add",
+					"style": {
+						"navigationBarTitleText": "添加记录"
+					}
+				},
+				{
+					"path": "remarks/details",
+					"style": {
+						"navigationBarTitleText": "记录详情"
+					}
+				},
+				{
+					"path": "remarks/customer-list",
+					"style": {
+						"navigationBarTitleText": "选择咨询人"
+					}
+				},
+				{
+					"path": "remarks/record-list",
+					"style": {
+						"navigationBarTitleText": "未注册客户咨询记录"
+					}
+				},
+				{
+					"path": "remarks/add-record",
+					"style": {
+						"navigationBarTitleText": "添加记录"
+					}
+				},
+				{
+					"path": "remarks/record-details",
+					"style": {
+						"navigationBarTitleText": "记录详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/h5/", //活动分包模块
+			"pages": [{
+					"path": "activity/activity",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "activity/activity_mid",
+					"style": {
+						"navigationBarTitleText": "年中大促",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "activity/couponExp",
+					"style": {
+						"navigationBarTitleText": "优惠券介绍",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "activity/activity-topic",
+					"style": {
+						"navigationBarTitleText": "活动专题",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "activity/activity-detail",
+					"style": {
+						"navigationBarTitleText": "活动专题",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "activity/activity-floorMore",
+					"style": {
+						"navigationBarTitleText": "更多",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "article/page",
+					"style": {
+						"navigationBarTitleText": "采美采购平台",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "article/path",
+					"style": {
+						"navigationBarTitleText": "采美采购平台",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "article/page-image",
+					"style": {
+						"navigationBarTitleText": "采美采购平台"
+					}
+				},
+				{
+					"path": "article/path-live",
+					"style": {
+						"navigationBarTitleText": "采美采购平台",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "activity/activity-list",
+					"style": {
+						"navigationBarTitleText": "商品专题",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "other/repair",
+					"style": {
+						"navigationBarTitleText": "维修"
+					}
+				},
+				{
+					"path": "other/brand",
+					"style": {
+						"navigationBarTitleText": "品牌招商"
+					}
+				},
+				{
+					"path": "other/brands",
+					"style": {
+						"navigationBarTitleText": "品牌招商"
+					}
+				},
+				{
+					"path": "other/attestation",
+					"style": {
+						"navigationBarTitleText": "采美认证通"
+					}
+				}
+			]
+		}, {
+			"root": "pages/search/", //搜索分包模块
+			"pages": [{
+				"path": "search",
+				"style": {
+					"navigationBarTitleText": "搜索"
+				}
+			}, {
+				"path": "search-supplier",
+				"style": {
+					"navigationBarTitleText": "搜索供应商"
+				}
+			}, {
+				"path": "search-instrument",
+				"style": {
+					"navigationBarTitleText": "搜索仪器"
+				}
+			}, {
+				"path": "search-order",
+				"style": {
+					"navigationBarTitleText": "订单搜索"
+				}
+			}, {
+				"path": "search-second",
+				"style": {
+					"navigationBarTitleText": "二手搜索"
+				}
+			}]
+		}, {
+			"root": "pages/second/",
+			"pages": [{
+					"path": "form/introduce",
+					"style": {
+						"navigationBarTitleText": "二手市场介绍",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "form/form",
+					"style": {
+						"navigationBarTitleText": "发布二手估价商品"
+					}
+				},
+				{
+					"path": "form/form-seller",
+					"style": {
+						"navigationBarTitleText": "发布二手预成交商品"
+					}
+				},
+				{
+					"path": "form/form-presale",
+					"style": {
+						"navigationBarTitleText": "发布二手估价商品"
+					}
+				},
+				{
+					"path": "form/form-select",
+					"style": {
+						"navigationBarTitleText": "选择发布类型"
+					}
+				},
+				{
+					"path": "product/product-list",
+					"style": {
+						"navigationBarTitleText": "二手商品",
 						"enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "news-detailes",
-                    "style": {
-                        "navigationBarTitleText": "公告内容"
-                    }
-                },
-                {
-                    "path": "certificate",
-                    "style": {
-                        "navigationBarTitleText": "资质证书"
-                    }
-                }
-            ]
-        },
-        {
-            "root": "pages/goods/", //商品模块
-            "pages": [
-                /*美体节临时页面*/
-                {
-                    "path": "good-floor-temp",
-                    "style": {
-                        "navigationBarTitleText": "美体节",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "goods-instrument",
-                    "style": {
-                        "navigationBarTitleText": "项目仪器",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "goods-classify",
-                    "style": {
-                        "navigationBarTitleText": "商品列表",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "good-floorMore",
-                    "style": {
-                        "navigationBarTitleText": "更多楼层",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "good-floor",
-                    "style": {
-                        "navigationBarTitleText": "",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "goods-active",
-                    "style": {
-                        "navigationBarTitleText": "凑单商品",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "product",
-                    "style": {
-                        "navigationBarTitleText": "商品详情",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "instrument-details",
-                    "style": {
-                        "navigationBarTitleText": "项目仪器详情",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "cart",
-                    "style": {
-                        "navigationBarTitleText": "购物车",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "goods-doc-list",
-                    "style": {
-                        "navigationBarTitleText": "美业资料",
-                        "enablePullDownRefresh": false
-                    }
-                },
-                {
-                    "path": "goods-doc-detail",
-                    "style": {
-                        "navigationBarTitleText": "美业资料详情",
-                        "enablePullDownRefresh": false
-                    }
-                },
-                {
-                    "path": "goods-supporting",
-                    "style": {
-                        "navigationBarTitleText": "配套商品",
-                        "enablePullDownRefresh": false
-                    }
-                },
-                {
-                    "path": "good-hot",
-                    "style": {
-                        "navigationBarTitleText": "新品橱窗",
-                        "enablePullDownRefresh": false,
+					}
+				},
+				{
+					"path": "product/product-details",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": true,
 						"navigationStyle": "custom"
-                    }
-                }
-            ]
-        },
-        {
-            "root": "pages/login/", //注册登录模块
-            "pages": [{
-                    "path": "register",
-                    "style": {
-                        "navigationBarTitleText": "机构注册",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "register-supplier",
-                    "style": {
-                        "navigationBarTitleText": "供应商注册",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "register-select",
-                    "style": {
-                        "navigationBarTitleText": "选择身份"
-                    }
-                },
-                {
-                    "path": "apply",
-                    "style": {
-                        "navigationBarTitleText": "升级资质机构",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "apply-supplier",
-                    "style": {
-                        "navigationBarTitleText": "修改申请资料",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "logincode",
-                    "style": {
-                        "navigationBarTitleText": "邀请码登录"
-                    }
-                },
-                {
-                    "path": "login",
-                    "style": {
-                        "navigationBarTitleText": "登录"
-                    }
-                },
-                {
-                    "path": "binding",
-                    "style": {
-                        "navigationBarTitleText": "注册信息"
-                    }
-                },
-                {
-                    "path": "bindwechat",
-                    "style": {
-                        "navigationBarTitleText": "绑定微信"
-                    }
-                },
-                {
-                    "path": "bindOperator",
-                    "style": {
-                        "navigationBarTitleText": "绑定运营人员"
-                    }
-                },
-                {
-                    "path": "information",
-                    "style": {
-                        "navigationBarTitleText": "修改资料",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "password",
-                    "style": {
-                        "navigationBarTitleText": "修改密码"
-                    }
-                }
-            ]
-        },
-        {
-            "root": "pages/user/", //机构个人中心模块
-            "pages": [{
-                    "path": "account/account",
-                    "style": {
-                        "navigationBarTitleText": "账户余额明细",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "account/account-bean",
-                    "style": {
-                        "navigationBarTitleText": "采美豆明细",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "address/addressManage",
-                    "style": {
-                        "navigationBarTitleText": "添加新地址"
-                    }
-                },
-                {
-                    "path": "address/address",
-                    "style": {
-                        "navigationBarTitleText": "地址列表"
-                    }
-                },
-                {
-                    "path": "about/about",
-                    "style": {
-                        "navigationBarTitleText": "关于我们"
-                    }
-                },
-                {
-                    "path": "regularPurchase/regularPurchase",
-                    "style": {
-                        "navigationBarTitleText": "再次购买"
-                    }
-                },
-                {
-                    "path": "order/create-order",
-                    "style": {
-                        "navigationBarTitleText": "确认订单"
-                    }
-                },
-                {
-                    "path": "order/success",
-                    "style": {
-                        "navigationBarTitleText": "支付结果",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-success",
-                    "style": {
-                        "navigationBarTitleText": "支付结果",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-success-tips",
-                    "style": {
-                        "navigationBarTitleText": "支付结果",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-payment",
-                    "style": {
-                        "navigationBarTitleText": "选择支付方式",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-payunder",
-                    "style": {
-                        "navigationBarTitleText": "线下转账"
-                    }
-                },
-                {
-                    "path": "order/order-pay-list",
-                    "style": {
-                        "navigationBarTitleText": "支付订单"
-                    }
-                },
-                {
-                    "path": "order/order-pay",
-                    "style": {
-                        "navigationBarTitleText": "收银台",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-payhlb",
-                    "style": {
-                        "navigationBarTitleText": "收银台",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/orderShareLogin",
-                    "style": {
-                        "navigationBarTitleText": "输入分享码"
-                    }
-                },
-                {
-                    "path": "order/order-sharelogin",
-                    "style": {
-                        "navigationBarTitleText": "查看订单"
-                    }
-                },
-                {
-                    "path": "order/order-list",
-                    "style": {
-                        "navigationBarTitleText": "我的订单",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-details",
-                    "style": {
-                        "navigationBarTitleText": "订单详情",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-sharedetails",
-                    "style": {
-                        "navigationBarTitleText": "订单详情"
-                    }
-                },
-                {
-                    "path": "order/order-logistics",
-                    "style": {
-                        "navigationBarTitleText": "物流信息"
-                    }
-                },
-                {
-                    "path": "operator/list",
-                    "style": {
-                        "navigationBarTitleText": "运营人员管理"
-                    }
-                },
-                {
-                    "path": "operator/addoperator",
-                    "style": {
-                        "navigationBarTitleText": "添加运营人员"
-                    }
-                },
-                {
-                    "path": "setting/setting",
-                    "style": {
-                        "navigationBarTitleText": "账户设置"
-                    }
-                },
-                {
-                    "path": "setting/phone",
-                    "style": {
-                        "navigationBarTitleText": "更换手机号"
-                    }
-                },
-                {
-                    "path": "coupon/coupon",
-                    "style": {
-                        "navigationBarTitleText": "优惠券",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "coupon/coupon-collection",
-                    "style": {
-                        "navigationBarTitleText": "领券中心",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "coupon/coupon-exchange",
-                    "style": {
-                        "navigationBarTitleText": "兑换优惠券"
-                    }
-                },
-                {
-                    "path": "coupon/coupon-product",
-                    "style": {
-                        "navigationBarTitleText": "活动商品",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "coupon/coupon-activity",
-                    "style": {
-                        "navigationBarTitleText": "采美云上美博会",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "collection/collection",
-                    "style": {
-                        "navigationBarTitleText": "收藏商品",
-                        "enablePullDownRefresh": true
-                    }
-                },
-				{
-				    "path": "member/member",
-				    "style": {
-				        "navigationBarTitleText": "采美超级会员",
-				        "enablePullDownRefresh": true
-				    }
-				},
-				{
-				    "path": "member/member-renew",
-				    "style": {
-				        "navigationBarTitleText": "购买超级会员"
-				    }
-				},
-				{
-				    "path": "member/member-record",
-				    "style": {
-				        "navigationBarTitleText": "购买记录",
-				        "enablePullDownRefresh": true
-				    }
-				},
-				{
-				    "path": "member/member-pay",
-				    "style": {
-				        "navigationBarTitleText": "支付超级会员"
-				    }
-				},
-				{
-				    "path": "member/member-product",
-				    "style": {
-				        "navigationBarTitleText": "优惠商品",
-				        "enablePullDownRefresh": true
-				    }
+					}
 				}
-            ]
-        },
-        {
-            "root": "pages/seller/",
-            "pages": [{
-                    "path": "index/index",
-                    "style": {
-                        "navigationBarTitleText": "采美采购商城",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "login/login",
-                    "style": {
-                        "navigationBarTitleText": "登录",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "cart/cart",
-                    "style": {
-                        "navigationBarTitleText": "购物车"
-                    }
-                },
-                {
-                    "path": "cart/buyagain",
-                    "style": {
-                        "navigationBarTitleText": "再次购买"
-                    }
-                },
-                {
-                    "path": "cart/immediately",
-                    "style": {
-                        "navigationBarTitleText": "立即下单"
-                    }
-                },
-				{
-                    "path": "cart/second",
-                    "style": {
-                        "navigationBarTitleText": "二手下单"
-                    }
-                },
-				{
-                    "path": "cart/coupon",
-                    "style": {
-                        "navigationBarTitleText": "优惠券列表",
+			]
+		},
+		{
+			"root": "pages/supplier/",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "采美采购商城",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				}, {
+					"path": "login/bind-operator",
+					"style": {
+						"navigationBarTitleText": "绑定微信"
+					}
+				},
+				{
+					"path": "user/my-product",
+					"style": {
+						"navigationBarTitleText": "我的商品",
 						"enablePullDownRefresh": true
-                    }
-                },
-				{
-                    "path": "cart/coupon-share",
-                    "style": {
-                        "navigationBarTitleText": "购买优惠券"
-                    }
-                },
-                {
-                    "path": "order/create-order",
-                    "style": {
-                        "navigationBarTitleText": "确认订单"
-                    }
-                },
-                {
-                    "path": "order/create-recharge-order",
-                    "style": {
-                        "navigationBarTitleText": "确认订单"
-                    }
-                },
-                {
-                    "path": "order/order-details",
-                    "style": {
-                        "navigationBarTitleText": "订单详情",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-list",
-                    "style": {
-                        "navigationBarTitleText": "订单列表",
-                        "navigationStyle": "custom" 
-                    }
-                },
-                {
-                    "path": "club/list",
-                    "style": {
-                        "navigationBarTitleText": "机构列表"
-                    }
-                },
-                {
-                    "path": "club/stayClub-list",
-                    "style": {
-                        "navigationBarTitleText": "待注册机构"
-                    }
-                },
-                {
-                    "path": "club/club-list",
-                    "style": {
-                        "navigationBarTitleText": "我的机构"
-                    }
-                },
-                {
-                    "path": "club/allClub-list",
-                    "style": {
-                        "navigationBarTitleText": "所有机构"
-                    }
-                },
-                {
-                    "path": "club/addoperator",
-                    "style": {
-                        "navigationBarTitleText": "邀请运营人员"
-                    }
-                },
-                {
-                    "path": "login/register",
-                    "style": {
-                        "navigationBarTitleText": "拉机构上线",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "login/register-select",
-                    "style": {
-                        "navigationBarTitleText": "拉机构上线"
-                    }
-                },
-                {
-                    "path": "login/register-general",
-                    "style": {
-                        "navigationBarTitleText": "个人机构"
-                    }
-                },
-                {
-                    "path": "login/register-member",
-                    "style": {
-                        "navigationBarTitleText": "资质机构"
-                    }
-                },
-                {
-                    "path": "login/information",
-                    "style": {
-                        "navigationBarTitleText": "修改资料",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "login/apply",
-                    "style": {
-                        "navigationBarTitleText": "修改申请信息",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-historylist",
-                    "style": {
-                        "navigationBarTitleText": "订单列表"
-                    }
-                }, {
-                    "path": "search/search-order",
-                    "style": {
-                        "navigationBarTitleText": "订单搜索"
-                    }
-                },
-                {
-                    "path": "address/address",
-                    "style": {
-                        "navigationBarTitleText": "选择地址"
-                    }
-                },
-                {
-                    "path": "address/addressManage",
-                    "style": {
-                        "navigationBarTitleText": "添加地址"
-                    }
-                },
-                {
-                    "path": "remarks/list",
-                    "style": {
-                        "navigationBarTitleText": "注册客户咨询记录"
-                    }
-                },
-                {
-                    "path": "remarks/add",
-                    "style": {
-                        "navigationBarTitleText": "添加记录"
-                    }
-                },
-                {
-                    "path": "remarks/details",
-                    "style": {
-                        "navigationBarTitleText": "记录详情"
-                    }
-                },
-                {
-                    "path": "remarks/customer-list",
-                    "style": {
-                        "navigationBarTitleText": "选择咨询人"
-                    }
-                },
-                {
-                    "path": "remarks/record-list",
-                    "style": {
-                        "navigationBarTitleText": "未注册客户咨询记录"
-                    }
-                },
-                {
-                    "path": "remarks/add-record",
-                    "style": {
-                        "navigationBarTitleText": "添加记录"
-                    }
-                },
-                {
-                    "path": "remarks/record-details",
-                    "style": {
-                        "navigationBarTitleText": "记录详情"
-                    }
-                }
-            ]
-        },
-        {
-            "root": "pages/h5/", //活动分包模块
-            "pages": [{
-                    "path": "activity/activity",
-                    "style": {
-                        "navigationBarTitleText": ""
-                    }
-                },
-                {
-                    "path": "activity/activity_mid",
-                    "style": {
-                        "navigationBarTitleText": "年中大促",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "activity/couponExp",
-                    "style": {
-                        "navigationBarTitleText": "优惠券介绍",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "activity/activity-topic",
-                    "style": {
-                        "navigationBarTitleText": "活动专题",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "activity/activity-detail",
-                    "style": {
-                        "navigationBarTitleText": "活动专题",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "activity/activity-floorMore",
-                    "style": {
-                        "navigationBarTitleText": "更多",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "article/page",
-                    "style": {
-                        "navigationBarTitleText": "采美采购平台",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "article/path",
-                    "style": {
-                        "navigationBarTitleText": "采美采购平台",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "article/page-image",
-                    "style": {
-                        "navigationBarTitleText": "采美采购平台"
-                    }
-                },
-                {
-                    "path": "article/path-live",
-                    "style": {
-                        "navigationBarTitleText": "采美采购平台",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "activity/activity-list",
-                    "style": {
-                        "navigationBarTitleText": "商品专题",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "other/repair",
-                    "style": {
-                        "navigationBarTitleText": "维修"
-                    }
-                },
-                {
-                    "path": "other/brand",
-                    "style": {
-                        "navigationBarTitleText": "品牌招商"
-                    }
-                },
-                {
-                    "path": "other/brands",
-                    "style": {
-                        "navigationBarTitleText": "品牌招商"
-                    }
-                },
-                {
-                    "path": "other/attestation",
-                    "style": {
-                        "navigationBarTitleText": "采美认证通"
-                    }
-                }
-            ]
-        }, {
-            "root": "pages/search/", //搜索分包模块
-            "pages": [{
-                "path": "search",
-                "style": {
-                    "navigationBarTitleText": "搜索"
-                }
-            }, {
-                "path": "search-supplier",
-                "style": {
-                    "navigationBarTitleText": "搜索供应商"
-                }
-            }, {
-                "path": "search-instrument",
-                "style": {
-                    "navigationBarTitleText": "搜索仪器"
-                }
-            }, {
-                "path": "search-order",
-                "style": {
-                    "navigationBarTitleText": "订单搜索"
-                }
-            }, {
-                "path": "search-second",
-                "style": {
-                    "navigationBarTitleText": "二手搜索"
-                }
-            }]
-        }, {
-            "root": "pages/second/",
-            "pages": [{
-                    "path": "form/introduce",
-                    "style": {
-                        "navigationBarTitleText": "二手市场介绍",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "form/form",
-                    "style": {
-                        "navigationBarTitleText": "发布二手估价商品"
-                    }
-                },
-                {
-                    "path": "form/form-seller",
-                    "style": {
-                        "navigationBarTitleText": "发布二手预成交商品"
-                    }
-                },
-                {
-                    "path": "form/form-presale",
-                    "style": {
-                        "navigationBarTitleText": "发布二手估价商品"
-                    }
-                },
-                {
-                    "path": "form/form-select",
-                    "style": {
-                        "navigationBarTitleText": "选择发布类型"
-                    }
-                },
-                {
-                    "path": "product/product-list",
-                    "style": {
-                        "navigationBarTitleText": "二手商品",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "product/product-details",
-                    "style": {
-                        "navigationBarTitleText": "商品详情",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                }
-            ]
-        },
-        {
-            "root": "pages/supplier/",
-            "pages": [{
-                    "path": "index/index",
-                    "style": {
-                        "navigationBarTitleText": "采美采购商城",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                }, {
-                    "path": "login/bind-operator",
-                    "style": {
-                        "navigationBarTitleText": "绑定微信"
-                    }
-                }, {
-                    "path": "user/my-product",
-                    "style": {
-                        "navigationBarTitleText": "我的商品",
-                        "enablePullDownRefresh": true
-                    }
-                }, {
-                    "path": "user/my-shop",
-                    "style": {
-                        "navigationBarTitleText": "店铺主页",
+					}
+				},
+				{
+					"path": "user/my-shop",
+					"style": {
+						"navigationBarTitleText": "店铺主页",
+						"navigationStyle": "custom"
+					}
+				}, {
+					"path": "login/share-login",
+					"style": {
+						"navigationBarTitleText": "查看订单"
+					}
+				}, {
+					"path": "login/share-info",
+					"style": {
+						"navigationBarTitleText": "订单详情",
 						"navigationStyle": "custom"
-                    }
-                }, {
-                    "path": "login/share-login",
-                    "style": {
-                        "navigationBarTitleText": "查看订单"
-                    }
-                }, {
-                    "path": "login/share-info",
-                    "style": {
-                        "navigationBarTitleText": "订单详情",
-                        "navigationStyle": "custom"
-                    }
-                }, {
-                    "path": "order/order-details",
-                    "style": {
-                        "navigationBarTitleText": "订单详情",
-                        "enablePullDownRefresh": true
-                    }
-                }, {
-                    "path": "user/supplier",
-                    "style": {
-                        "navigationBarTitleText": "供应商信息"
-                    }
-                }, {
-                    "path": "order/order-list",
-                    "style": {
-                        "navigationBarTitleText": "我的订单",
-                        "enablePullDownRefresh": true
-                    }
-                }, {
-                    "path": "order/order-service-details",
-                    "style": {
-                        "navigationBarTitleText": "订单详情",
-                        "navigationStyle": "custom",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "deliver/add-logistics",
-                    "style": {
-                        "navigationBarTitleText": "录入物流信息"
-                    }
-                },
-                {
-                    "path": "deliver/qualifications-add",
-                    "style": {
-                        "navigationBarTitleText": "上传商品资质"
-                    }
-                },
-                {
-                    "path": "deliver/qualifications-details",
-                    "style": {
-                        "navigationBarTitleText": "商品资质"
-                    }
-                },
-                {
-                    "path": "deliver/deliver-goods",
-                    "style": {
-                        "navigationBarTitleText": "发货",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "deliver/deliver-record",
-                    "style": {
-                        "navigationBarTitleText": "发货记录",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "deliver/logistics-list",
-                    "style": {
-                        "navigationBarTitleText": "物流公司"
-                    }
-                },
-                {
-                    "path": "user/setting/password",
-                    "style": {
-                        "navigationBarTitleText": "修改密码"
-                    }
-                },
-                {
-                    "path": "user/setting/phone",
-                    "style": {
-                        "navigationBarTitleText": "更换手机号"
-                    }
-                },
-                {
-                    "path": "user/setting/setting",
-                    "style": {
-                        "navigationBarTitleText": "账户设置"
-                    }
-                },
-                {
-                    "path": "user/operator/list",
-                    "style": {
-                        "navigationBarTitleText": "运营人员管理"
-                    }
-                },
-                {
-                    "path": "user/operator/addoperator",
-                    "style": {
-                        "navigationBarTitleText": "添加运营人员"
-                    }
-                },
-                {
-                    "path": "user/information",
-                    "style": {
-                        "navigationBarTitleText": "资料信息"
-                    }
-                }
-            ]
-        }
-    ],
-    "tabBar": {
-        "height": "80",
-        "color": "#999999",
-        "selectedColor": "#E15616",
-        "borderStyle": "black",
-        "backgroundColor": "#ffffff",
-        "list": [{
-                "pagePath": "pages/tabBar/home/index",
-                "iconPath": "static/icon-home@3x.png",
-                "selectedIconPath": "static/icon-home-active@3x.png",
-                "text": "商城"
-            }, {
-                "pagePath": "pages/tabBar/category/index",
-                "iconPath": "static/icon-sort@3x.png",
-                "selectedIconPath": "static/icon-sort-active@3x.png",
-                "text": "分类"
-            },
-            {
-                "pagePath": "pages/tabBar/cart/index",
-                "iconPath": "static/icon-cart@3x.png",
-                "selectedIconPath": "static/icon-cart-active@3x.png",
-                "text": "购物车"
-            },
-            {
-                "pagePath": "pages/tabBar/user/user",
-                "iconPath": "static/icon-user@3x.png",
-                "selectedIconPath": "static/icon-user-active@3x.png",
-                "text": "我的"
-            }
-        ]
-    },
-    "easycom": {
-        "autoscan": true,
-        "custom": {
-            "tui-(.*)": "@/components/thorui/tui-$1/tui-$1.vue"
-        }
-    },
-    "globalStyle": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "采美采购商城",
-        "navigationBarBackgroundColor": "#FFFFFF",
-        "backgroundColor": "#FFFFFF"
-    },
-    "condition": { //模式配置,仅开发期间生效
-        "current": 0, //当前激活的模式(list 的索引项)
-        "list": [{
-            "name": "", //模式名称
-            "path": "", //启动页面,必选
-            "query": "" //启动参数,在页面的onLoad函数里面得到
-        }]
-    }
+					}
+				}, {
+					"path": "order/order-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "user/supplier",
+					"style": {
+						"navigationBarTitleText": "供应商信息"
+					}
+				}, {
+					"path": "order/order-list",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "order/order-service-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "deliver/add-logistics",
+					"style": {
+						"navigationBarTitleText": "录入物流信息"
+					}
+				},
+				{
+					"path": "deliver/qualifications-add",
+					"style": {
+						"navigationBarTitleText": "上传商品资质"
+					}
+				},
+				{
+					"path": "deliver/qualifications-details",
+					"style": {
+						"navigationBarTitleText": "商品资质"
+					}
+				},
+				{
+					"path": "deliver/deliver-goods",
+					"style": {
+						"navigationBarTitleText": "发货",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "deliver/deliver-record",
+					"style": {
+						"navigationBarTitleText": "发货记录",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "deliver/logistics-list",
+					"style": {
+						"navigationBarTitleText": "物流公司"
+					}
+				},
+				{
+					"path": "user/setting/password",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				},
+				{
+					"path": "user/setting/phone",
+					"style": {
+						"navigationBarTitleText": "更换手机号"
+					}
+				},
+				{
+					"path": "user/setting/setting",
+					"style": {
+						"navigationBarTitleText": "账户设置"
+					}
+				},
+				{
+					"path": "user/operator/list",
+					"style": {
+						"navigationBarTitleText": "运营人员管理"
+					}
+				},
+				{
+					"path": "user/operator/addoperator",
+					"style": {
+						"navigationBarTitleText": "添加运营人员"
+					}
+				},
+				{
+					"path": "user/information",
+					"style": {
+						"navigationBarTitleText": "资料信息"
+					}
+				}
+			]
+		}
+	],
+	"tabBar": {
+		"height": "80",
+		"color": "#999999",
+		"selectedColor": "#E15616",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/tabBar/home/index",
+				"iconPath": "static/icon-home@3x.png",
+				"selectedIconPath": "static/icon-home-active@3x.png",
+				"text": "商城"
+			}, {
+				"pagePath": "pages/tabBar/category/index",
+				"iconPath": "static/icon-sort@3x.png",
+				"selectedIconPath": "static/icon-sort-active@3x.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/tabBar/notice/index",
+				"iconPath": "static/icon-news@3x.png",
+				"selectedIconPath": "static/icon-news-active@3x.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/tabBar/cart/index",
+				"iconPath": "static/icon-cart@3x.png",
+				"selectedIconPath": "static/icon-cart-active@3x.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/tabBar/user/user",
+				"iconPath": "static/icon-user@3x.png",
+				"selectedIconPath": "static/icon-user-active@3x.png",
+				"text": "我的"
+			}
+		]
+	},
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"tui-(.*)": "@/components/thorui/tui-$1/tui-$1.vue"
+		}
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "采美采购商城",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#FFFFFF"
+	},
+	"condition": { //模式配置,仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面,必选
+			"query": "" //启动参数,在页面的onLoad函数里面得到
+		}]
+	}
 }

+ 193 - 0
pages/notice/club/notice-coupon.vue

@@ -0,0 +1,193 @@
+<template>
+	<view class="container cart clearfix">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="container-main" v-else>
+			<view class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-notice-empty@2x.png'"></image>
+					<text class="error-text">暂无任何消息~</text>
+				</view>
+				<!-- 列表 -->
+				<view class="tui-notice clearfix" v-for="(cell, index) in list" :key="index">
+					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
+						<template v-slot:content>
+							<view class="tui-notice-cell clearfix">
+								<view class="tui-cell-top">
+									<view class="cell-title"> {{ cell.text }} </view>
+									<view class="cell-time"> {{ cell.time }} </view>
+								</view>
+								<view class="tui-cell-content"> 
+									<text>{{ cell.content }}</text>
+								</view> 
+							</view>
+						</template>
+						<template v-slot:button>
+							<view class="tui-custom-btn_box">
+								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+									<text class="iconfont icon-shanchu3"></text>
+								</view>
+							</view>
+						</template>
+					</tui-swipe-action>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+	data() {
+		return {
+			skeletonShow: true,
+			listQuery: {
+				userId: 0,
+				pageNum: 1,
+				pageSize: 10
+			},
+			list: [
+				{
+					text: '优惠券待领取通知',
+					time: '2022-07-05 16:51:20',
+					image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+					orderId: 1234,
+					content:'采美平台送您10000元优惠券,众多大牌正品等着您,赶快去领取下单吧 >>'
+				},
+				{
+					text: '优惠券过期通知',
+					time: '2022-07-05 16:51:20',
+					image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+					orderId: 1234,
+					content:'您有100元优惠券今日即将过期,赶快去查看使用吧 >>'
+				}
+			],
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			nomoreText: '上拉显示更多'
+		}
+	},
+	onLoad() {
+		this.initData()
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		async initData() {
+			const userInfo = await this.$api.getStorage()
+			this.skeletonShow = false //预加载圆圈
+			this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
+			this.initGetCartGoodsList()
+		},
+		initGetCartGoodsList() {
+			console.log('获取消息通知数据')
+		},
+		initLogin() {
+			this.$api.redirectTo('/pages/login/login')
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		uni.stopPullDownRefresh()
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+}
+.container-main {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 24rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+}
+.tui-swipeout-content{
+	white-space:normal !important;
+}
+.tui-notice{
+	margin-bottom: 24rpx;
+}
+.tui-notice-cell {
+	width: 100%;
+	height: auto;
+	background-color: #ffffff;
+	border-radius: 16rpx;
+	box-sizing: border-box;
+	padding:16rpx 24rpx;
+	float: left;
+	.tui-cell-top{
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		float: left;
+		.cell-title{
+			font-size: 32rpx;
+			color: #333333;
+			float: left;
+		}
+		.cell-time{
+			font-size: 24rpx;
+			color: #999999;
+			float: right;
+		}
+	}
+	.tui-cell-content{
+		width: 100%;
+		height: auto;
+		float: left;
+		box-sizing: border-box;
+		line-height: 44rpx;
+		padding: 24rpx;
+		background-color: #F7F7F7;
+		font-size: 28rpx;
+		color: #666666;
+		text-align: justify;
+	}
+}
+.tui-custom-btn_box {
+	width: 80px;
+	height: 100%;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #f7f7f7;
+}
+
+.tui-custom-btn {
+	width: 56rpx;
+	height: 56rpx;
+	border-radius: 50%;
+	background-color: #f94b4b;
+	color: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	.icon-shanchu3 {
+		font-size: 32rpx;
+	}
+}
+</style>

+ 236 - 0
pages/notice/club/notice-order.vue

@@ -0,0 +1,236 @@
+<template>
+	<view class="container cart clearfix">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="container-main" v-else>
+			<view class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-notice-empty@2x.png'"></image>
+					<text class="error-text">暂无任何消息~</text>
+				</view>
+				<!-- 列表 -->
+				<view class="tui-notice" v-for="(cell, index) in list" :key="index">
+					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
+						<template v-slot:content>
+							<view class="tui-notice-cell">
+								<view class="tui-cell-top">
+									<view class="cell-title"> {{ cell.text }} </view>
+									<view class="cell-time"> {{ cell.time }} </view>
+								</view>
+								<view class="tui-cell-content"> 
+									<view class="cell-image">
+										<img :src="cell.image" alt="">
+									</view>
+									<view class="cell-content">
+										{{ cell.content }}
+									</view>
+								</view> 
+								<view class="tui-cell-bot"> 
+									<view class="tui-cell-btn">立即支付</view>
+									<view class="tui-cell-btn">查看订单</view>
+								</view>
+							</view>
+						</template>
+						<template v-slot:button>
+							<view class="tui-custom-btn_box">
+								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+									<text class="iconfont icon-shanchu3"></text>
+								</view>
+							</view>
+						</template>
+					</tui-swipe-action>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+	data() {
+		return {
+			skeletonShow: true,
+			StaticUrl: this.$Static,
+			listQuery: {
+				userId: 0,
+				pageNum: 1,
+				pageSize: 10
+			},
+			list: [
+				{
+					text: '下单成功通知',
+					time: '2022-07-05 16:51:20',
+					image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+					orderId: 1234,
+					content:'您已成功下单!'
+				},
+				{
+					text: '订单支付完成',
+					time: '2022-07-05 16:51:20',
+					image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+					orderId: 1234,
+					content:'您的订单已支付完成,将立即安排发货。'
+				}
+			],
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			nomoreText: '上拉显示更多'
+		}
+	},
+	onLoad() {
+		this.initData()
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		async initData() {
+			const userInfo = await this.$api.getStorage()
+			this.skeletonShow = false //预加载圆圈
+			this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
+			this.initGetCartGoodsList()
+		},
+		initGetCartGoodsList() {
+			console.log('获取消息通知数据')
+		},
+		initLogin() {
+			this.$api.redirectTo('/pages/login/login')
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		uni.stopPullDownRefresh()
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+}
+.container-main {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 24rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+}
+.tui-notice{
+	margin-bottom: 24rpx;
+}
+.tui-notice-cell {
+	width: 100%;
+	height: 360rpx;
+	background-color: #ffffff;
+	border-radius: 16rpx;
+	box-sizing: border-box;
+	padding:16rpx 24rpx;
+	float: left;
+	.tui-cell-top{
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		.cell-title{
+			font-size: 32rpx;
+			color: #333333;
+			float: left;
+		}
+		.cell-time{
+			font-size: 24rpx;
+			color: #999999;
+			float: right;
+		}
+	}
+	.tui-cell-content{
+		width: 100%;
+		height: 160rpx;
+		box-sizing: border-box;
+		padding: 16rpx;
+		background-color: #F7F7F7;
+		.cell-image{
+			width: 128rpx;
+			height: 128rpx;
+			border-radius: 8rpx;
+			float: left;
+			image{
+				width: 128rpx;
+				height: 128rpx;
+				display: block;
+				border-radius: 8rpx;
+			}
+		}
+		.cell-content{
+			width: 490rpx;
+			height: 100%;
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			line-height: 40rpx;
+			font-size: 28rpx;
+			color: #666666;
+			text-align: justify;
+			float: left;
+		}
+	}
+	.tui-cell-bot{
+		width: 100%;
+		height: 80rpx;
+		box-sizing: border-box;
+		padding: 16rpx 0 0 0;
+		.tui-cell-btn{
+			width: 160rpx;
+			height: 64rpx;
+			border-radius: 35rpx;
+			box-sizing: border-box;
+			border: 1px solid #999999;
+			text-align: center;
+			line-height: 64rpx;
+			font-size: 26rpx;
+			color: #333333;
+			float: right;
+			margin-left: 24rpx;
+		}
+	}
+}
+.tui-custom-btn_box {
+	width: 80px;
+	height: 100%;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #f7f7f7;
+}
+
+.tui-custom-btn {
+	width: 56rpx;
+	height: 56rpx;
+	border-radius: 50%;
+	background-color: #f94b4b;
+	color: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	.icon-shanchu3 {
+		font-size: 32rpx;
+	}
+}
+</style>

+ 179 - 0
pages/notice/club/notice-serve.vue

@@ -0,0 +1,179 @@
+<template>
+	<view class="container cart clearfix">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="container-main" v-else>
+			<view class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-notice-empty@2x.png'"></image>
+					<text class="error-text">暂无任何消息~</text>
+				</view>
+				<!-- 列表 -->
+				<view class="tui-notice clearfix" v-for="(cell, index) in list" :key="index">
+					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
+						<template v-slot:content>
+							<view class="tui-notice-cell clearfix">
+								<view class="tui-cell-top">
+									<view class="cell-title"> {{ cell.text }} </view>
+									<view class="cell-time"> {{ cell.time }} </view>
+								</view>
+								<view class="tui-cell-content"> 
+									<text>{{ cell.content }}</text>
+								</view> 
+							</view>
+						</template>
+						<template v-slot:button>
+							<view class="tui-custom-btn_box">
+								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+									<text class="iconfont icon-shanchu3"></text>
+								</view>
+							</view>
+						</template>
+					</tui-swipe-action>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			skeletonShow: true,
+			listQuery: {
+				userId: 0,
+				pageNum: 1,
+				pageSize: 10
+			},
+			list: [],
+			isEmpty: true,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			nomoreText: '上拉显示更多'
+		}
+	},
+	onLoad() {
+		this.initData()
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		async initData() {
+			const userInfo = await this.$api.getStorage()
+			this.skeletonShow = false //预加载圆圈
+			this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
+			this.initGetCartGoodsList()
+		},
+		initGetCartGoodsList() {
+			console.log('获取消息通知数据')
+		},
+		initLogin() {
+			this.$api.redirectTo('/pages/login/login')
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		uni.stopPullDownRefresh()
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+}
+.container-main {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 24rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+}
+.tui-swipeout-content{
+	white-space:normal !important;
+}
+.tui-notice{
+	margin-bottom: 24rpx;
+}
+.tui-notice-cell {
+	width: 100%;
+	height: auto;
+	background-color: #ffffff;
+	border-radius: 16rpx;
+	box-sizing: border-box;
+	padding:16rpx 24rpx;
+	float: left;
+	.tui-cell-top{
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		float: left;
+		.cell-title{
+			font-size: 32rpx;
+			color: #333333;
+			float: left;
+		}
+		.cell-time{
+			font-size: 24rpx;
+			color: #999999;
+			float: right;
+		}
+	}
+	.tui-cell-content{
+		width: 100%;
+		height: auto;
+		float: left;
+		box-sizing: border-box;
+		line-height: 44rpx;
+		padding: 24rpx;
+		background-color: #F7F7F7;
+		font-size: 28rpx;
+		color: #666666;
+		text-align: justify;
+	}
+}
+.tui-custom-btn_box {
+	width: 80px;
+	height: 100%;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #f7f7f7;
+}
+
+.tui-custom-btn {
+	width: 56rpx;
+	height: 56rpx;
+	border-radius: 50%;
+	background-color: #f94b4b;
+	color: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	.icon-shanchu3 {
+		font-size: 32rpx;
+	}
+}
+</style>

+ 195 - 0
pages/notice/club/notice-users.vue

@@ -0,0 +1,195 @@
+<template>
+	<view class="container cart clearfix">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view class="container-main" v-else>
+			<view class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image class="empty-container-image" :src="StaticUrl + '/icon/icon-notice-empty@2x.png'"></image>
+					<text class="error-text">暂无任何消息~</text>
+				</view>
+				<!-- 列表 -->
+				<view class="tui-notice clearfix" v-for="(cell, index) in list" :key="index">
+					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
+						<template v-slot:content>
+							<view class="tui-notice-cell clearfix">
+								<view class="tui-cell-top">
+									<view class="cell-title"> {{ cell.text }} </view>
+									<view class="cell-time"> {{ cell.time }} </view>
+								</view>
+								<view class="tui-cell-content"> 
+									<text>{{ cell.content }}</text>
+								</view> 
+							</view>
+						</template>
+						<template v-slot:button>
+							<view class="tui-custom-btn_box">
+								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+									<text class="iconfont icon-shanchu3"></text>
+								</view>
+							</view>
+						</template>
+					</tui-swipe-action>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+	data() {
+		return {
+			skeletonShow: true,
+			StaticUrl: this.$Static,
+			listQuery: {
+				userId: 0,
+				pageNum: 1,
+				pageSize: 10
+			},
+			list: [
+				{
+					text: '注册成功通知',
+					time: '2022-07-05 16:51:20',
+					image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+					orderId: 1234,
+					content:'欢迎成为采美机构用户,祝您开启愉快的采购之旅。'
+				},
+				{
+					text: '购买超级会员成功',
+					time: '2022-07-05 16:51:20',
+					image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+					orderId: 1234,
+					content:'您已成功购买3个月采美平台超级会员服务,在服务期内每月可领多张大额优惠券,还有更多超级会员专属权益等您体验,快去看看吧 >>'
+				}
+			],
+			isEmpty: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			nomoreText: '上拉显示更多'
+		}
+	},
+	onLoad() {
+		this.initData()
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		async initData() {
+			const userInfo = await this.$api.getStorage()
+			this.skeletonShow = false //预加载圆圈
+			this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
+			this.initGetCartGoodsList()
+		},
+		
+		initGetCartGoodsList() {
+			console.log('获取消息通知数据')
+		},
+		initLogin() {
+			this.$api.redirectTo('/pages/login/login')
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		uni.stopPullDownRefresh()
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+}
+.container-main {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 24rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+}
+.tui-swipeout-content{
+	white-space:normal !important;
+}
+.tui-notice{
+	margin-bottom: 24rpx;
+}
+.tui-notice-cell {
+	width: 100%;
+	height: auto;
+	background-color: #ffffff;
+	border-radius: 16rpx;
+	box-sizing: border-box;
+	padding:16rpx 24rpx;
+	float: left;
+	.tui-cell-top{
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		float: left;
+		.cell-title{
+			font-size: 32rpx;
+			color: #333333;
+			float: left;
+		}
+		.cell-time{
+			font-size: 24rpx;
+			color: #999999;
+			float: right;
+		}
+	}
+	.tui-cell-content{
+		width: 100%;
+		height: auto;
+		float: left;
+		box-sizing: border-box;
+		line-height: 44rpx;
+		padding: 24rpx;
+		background-color: #F7F7F7;
+		font-size: 28rpx;
+		color: #666666;
+		text-align: justify;
+	}
+}
+.tui-custom-btn_box {
+	width: 80px;
+	height: 100%;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #f7f7f7;
+}
+
+.tui-custom-btn {
+	width: 56rpx;
+	height: 56rpx;
+	border-radius: 50%;
+	background-color: #f94b4b;
+	color: #ffffff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	.icon-shanchu3 {
+		font-size: 32rpx;
+	}
+}
+</style>

+ 8 - 0
pages/notice/shop/notice-serve.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 8 - 0
pages/notice/shop/notice-users.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 1 - 0
pages/tabBar/home/index.vue

@@ -232,6 +232,7 @@ export default {
 			// 获取购物车数量
 			this.OrderService.ShoppingCartCount({ userId: this.userID }).then(res => {
 				this.$store.commit('updateAllNum', res.data)
+				this.$store.commit('updateNotice', 120)
 			})
 		},
 		handleClick(data) {

+ 214 - 0
pages/tabBar/notice/index.vue

@@ -0,0 +1,214 @@
+<template>
+	<view class="notice clearfix" :style="{ paddingTop: CustomBar + 'px' }">
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<view v-else>
+			<view class="navbar-wrap" :style="{ height: CustomBar + 'px', paddingTop: StatusBar + 'px' }">
+				<view
+					class="navbar-text"
+					:style="{ lineHeight: CustomBar - StatusBar + 'px;', fontSize: fontSizeSetting + 'px;' }"
+				>
+					消息 <text @click="clearNews" class="iconfont icon-qingli"></text>
+				</view>
+			</view>
+			<view class="container-notice">
+				<view class="notice-cell"  @click="navigator('/pages/notice/club/notice-order')">
+					<view class="notice-cell-icon">
+						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-order@2x.png'" mode=""></image>
+					</view>
+					<view class="notice-cell-text"> 交易物流 <text class="cell-text">官方</text> </view>
+					<view class="notice-cell-badge">
+						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"> 99+ </text>
+					</view>
+				</view>
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-users')">
+					<view class="notice-cell-icon">
+						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-users@2x.png'" mode=""></image>
+					</view>
+					<view class="notice-cell-text"> 账户通知 <text class="cell-text">官方</text> </view>
+					<view class="notice-cell-badge">
+						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"> 99+ </text>
+					</view>
+				</view>
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-serve')">
+					<view class="notice-cell-icon">
+						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-serve@2x.png'" mode=""></image>
+					</view>
+					<view class="notice-cell-text"> 服务通知 <text class="cell-text">官方</text> </view>
+					<view class="notice-cell-badge">
+						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"> 5 </text>
+					</view>
+				</view>
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-coupon')">
+					<view class="notice-cell-icon">
+						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-coupon@2x.png'" mode=""></image>
+					</view>
+					<view class="notice-cell-text"> 优惠促销 <text class="cell-text">官方</text> </view>
+					<view class="notice-cell-badge">
+						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"> 10 </text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+	data() {
+		return {
+			CustomBar: this.CustomBar,
+			StatusBar: this.StatusBar,
+			StaticUrl: this.$Static,
+			skeletonShow:true
+		}
+	},
+	onLoad() {},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		async initData() {
+			const userInfo = await this.$api.getStorage()
+			this.skeletonShow = true //预加载圆圈
+			this.userId = userInfo.userId ? userInfo.userId : 0
+			this.initGetCartGoodsList()
+		},
+		clearNews() {
+			this.$util.msg('已将所有消息标记为已读', 2000)
+		},
+		initGetCartGoodsList() {
+			console.log('获取消息通知数据')
+			this.skeletonShow = false
+		},
+		initLogin() {
+			this.$api.redirectTo('/pages/login/login')
+		},
+		navigator(url) {
+			this.$api.navigateTo(url)
+		},
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		uni.stopPullDownRefresh()
+	},
+	onShow() {
+		if (this.hasLogin) {
+			this.initData()
+		} else {
+			this.initLogin()
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.navbar-wrap {
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 100000;
+	box-sizing: border-box;
+	background: #ffffff;
+	.navbar-text {
+		font-size: 30rpx;
+		color: #000000;
+		font-weight: 500;
+		text-align: center;
+		.iconfont {
+			display: inline-block;
+			width: 48rpx;
+			height: 48rpx;
+			border-radius: 50%;
+			background-color: #f5f5f5;
+			text-align: center;
+			line-height: 48rpx;
+			color: #666666;
+			font-size: 30rpx;
+			margin-left: 20rpx;
+		}
+	}
+}
+.container-notice {
+	width: 100%;
+	height: auto;
+	box-sizing: border-box;
+	padding: 0 24rpx;
+	padding-top: 20rpx;
+	.notice-cell {
+		width: 100%;
+		height: 130rpx;
+		box-sizing: border-box;
+		padding: 19rpx 0;
+		border-bottom: 1px solid #e1e1e1;
+		.notice-cell-icon {
+			width: 92rpx;
+			height: 92rpx;
+			float: left;
+			.icon-image {
+				width: 92rpx;
+				height: 92rpx;
+				display: block;
+			}
+		}
+		.notice-cell-text {
+			width: 400rpx;
+			height: 100%;
+			line-height: 92rpx;
+			font-size: 34rpx;
+			text-align: left;
+			margin-left: 24rpx;
+			float: left;
+			.cell-text {
+				display: inline-block;
+				height: 32rpx;
+				padding: 0 11rpx;
+				line-height: 32rpx;
+				border-radius: 20rpx;
+				text-align: center;
+				border: 1px solid #e15616;
+				font-size: 24rpx;
+				color: #e15616;
+				margin-left: 10rpx;
+			}
+		}
+		.notice-cell-badge {
+			width: 92rpx;
+			height: 92rpx;
+			float: right;
+			box-sizing: border-box;
+			padding: 25rpx 15rpx;
+			text-align: right;
+		}
+	}
+}
+.uni-badge--small {
+	-webkit-transform: scale(0.8);
+	-ms-transform: scale(0.8);
+	transform: scale(0.8);
+	-webkit-transform-origin: center center;
+	-ms-transform-origin: center center;
+	transform-origin: center center;
+}
+.uni-badge {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-size: 12px;
+	line-height: 1;
+	display: inline-block;
+	padding: 3px 6px;
+	color: #333;
+	border-radius: 100px;
+	background-color: #f1f1f1;
+}
+.uni-badge-error {
+	color: #fff;
+	background-color: #ff2a2a;
+}
+</style>

BIN
static/icon-news-active@3x.png


BIN
static/icon-news@3x.png


+ 20 - 3
store/index.js

@@ -67,20 +67,37 @@ const store = new Vuex.Store({
                 data: provider
             })
         },
+        updateNotice(state, num) {
+		    if (num >= 100) {
+		        uni.setTabBarBadge({
+		            index: 2,
+		            text: '99+'
+		        })
+		    } else if (num > 0) {
+		        uni.setTabBarBadge({
+		            index: 2,
+		            text: String(num)
+		        })
+		    } else {
+		        uni.removeTabBarBadge({
+		            index: 2,
+		        })
+		    }
+        },
         updateAllNum(state, num) {
             if (num >= 100) {
                 uni.setTabBarBadge({
-                    index: 2,
+                    index: 3,
                     text: '99+'
                 })
             } else if (num > 0) {
                 uni.setTabBarBadge({
-                    index: 2,
+                    index: 3,
                     text: String(num)
                 })
             } else {
                 uni.removeTabBarBadge({
-                    index: 2,
+                    index: 3,
                 })
             }
         },