xiebaomin 1 год назад
Родитель
Сommit
a94defdafc

+ 7 - 3
common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/c/font_1519039_dfhum6nnq6r.woff2?t=1680766548825') format('woff2'),
-       url('//at.alicdn.com/t/c/font_1519039_dfhum6nnq6r.woff?t=1680766548825') format('woff'),
-       url('//at.alicdn.com/t/c/font_1519039_dfhum6nnq6r.ttf?t=1680766548825') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.woff2?t=1701152770177') format('woff2'),
+       url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.woff?t=1701152770177') format('woff'),
+       url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.ttf?t=1701152770177') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-youjiantou:before {
+  content: "\e603";
+}
+
 .icon-yixuanze3:before {
   content: "\e6d1";
 }

+ 7 - 2
components/cm-module/homeIndex/pageSpecial.vue

@@ -178,7 +178,10 @@ export default {
 		swiperChange(e) {//轮播图切换
 			this.current = e.detail.current
 		},
-		NavToDetailPage(item) {
+		NavToDetailPage(item) {
+            console.log(item)
+            // 采美供应商广告图点击量统计
+            this.cmsMoudleHits(5, item.id)
 			//跳转
 			this.$api.FlooryNavigateTo(item)
 		},
@@ -246,7 +249,9 @@ export default {
 				uni.navigateTo({
 					url: url
 				})
-			}
+			}
+            // 采美活动点击量统计
+            this.cmsMoudleHits(3, pros.id)
 		},
 		LiveGoPath() {
 			//查看直播

+ 3 - 1
components/cm-module/homeIndex/quickOperation.vue

@@ -72,7 +72,9 @@ export default {
     mounted() {},
     methods: {
         // 链接跳转
-        NavToDetailPage(pros) {
+        NavToDetailPage(pros) {
+            // 采美快捷运营点击量统计
+            this.cmsMoudleHits(4, pros.id)
 			this.$api.FlooryNavigateTo(pros)
         },
         swiperChange(e) {

+ 2 - 1
manifest.json

@@ -44,7 +44,8 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "autoSdkPermissions" : true
             },
             /* ios打包配置 */
             "ios" : {},

+ 19 - 1
mixins/cmsMixins.js

@@ -23,7 +23,25 @@ const cmsMixins = {
                 .catch(error => {
                     console.log(`<-------统计${sYsText}数据异常------>`)
                 })
-        },
+        },
+        // 模块点击量统计
+        async cmsMoudleHits(type, authorId) {
+            try {
+                await this.ProductService.cmsMoudleHits({type, authorId})
+                console.log('<-------统计数据成功------>')
+            } catch(e) {
+                console.log('<-------统计数据异常------>')
+            }
+        },
+        // 搜索词统计
+        async cmsKeywordHits(keyword) {
+            try {
+                await this.ProductService.cmsKeywordHits(keyword)
+                console.log('<-------统计数据成功------>')
+            } catch(e) {
+                console.log('<-------统计数据异常------>')
+            }
+        }
     }
 }
 

+ 1375 - 1375
pages.json

@@ -1,1375 +1,1375 @@
-{
-	"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"
-					}
-				},
-                {
-                	"path": "goods-file-preview",
-                	"style": {
-                		"navigationBarTitleText": "文件预览",
-                		"enablePullDownRefresh": false
-                	}
-                }
-			]
-		},
-		{
-			"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": "修改密码"
-					}
-				},
-                {
-                    "path": "supplier_login",
-                    "style": {
-                        "navigationBarTitleText": "美业参谋"
-                    }
-                }, {
-                    "path": "supplier_information",
-                    "style": {
-                        "navigationBarTitleText": "美业参谋"
-                    }
-                }, {
-                    "path": "supplier_more",
-                    "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-payunder",
-					"style": {
-						"navigationBarTitleText": "线下转账"
-					}
-				},
-				{
-					"path": "order/order-pay-list",
-					"style": {
-						"navigationBarTitleText": "支付订单"
-					}
-				},
-				{
-					"path": "order/order-pay",
-					"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/search-order",
-					"style": {
-						"navigationBarTitleText": "订单搜索"
-					}
-				},
-				{
-					"path": "order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/order-sharedetails",
-					"style": {
-						"navigationBarTitleText": "订单详情"
-					}
-				},
-				{
-					"path": "order/order-addpay",
-					"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-copy",
-					"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
-					}
-				},
-				{
-					"path": "pay/card-list",
-					"style": {
-						"navigationBarTitleText": "银行卡"
-					}
-				},
-				{
-					"path": "pay/card-sus-list",
-					"style": {
-						"navigationBarTitleText": "支持银行"
-					}
-				},
-				{
-					"path": "pay/card-add",
-					"style": {
-						"navigationBarTitleText": "添加银行卡"
-					}
-				},
-				{
-					"path": "pay/card-comfirm",
-					"style": {
-						"navigationBarTitleText": "确认信息"
-					}
-				},
-				{
-					"path": "pay/card-comfirm-sub",
-					"style": {
-						"navigationBarTitleText": "输入短信验证码"
-					}
-				},
-				{
-					"path": "pay/card-order",
-					"style": {
-						"navigationBarTitleText": "收银台",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "pay/card-under",
-					"style": {
-						"navigationBarTitleText": "线下转账"
-					}
-				}
-				
-			]
-		},
-		{
-			"root": "pages/notice/", //搜索分包模块
-			"pages": [
-				{
-					"path": "club/notice-order",
-					"style": {
-						"navigationBarTitleText": "交易物流",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "club/notice-users",
-					"style": {
-						"navigationBarTitleText": "账户通知",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "club/notice-serve",
-					"style": {
-						"navigationBarTitleText": "服务通知",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "club/notice-coupon",
-					"style": {
-						"navigationBarTitleText": "优惠促销",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "shop/notice-users",
-					"style": {
-						"navigationBarTitleText": "账户通知",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "shop/notice-serve",
-					"style": {
-						"navigationBarTitleText": "服务通知",
-						"enablePullDownRefresh": true
-					}
-				},				
-                {
-					"path": "club/notice-article",
-					"style": {
-						"navigationBarTitleText": "最新文章",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "club/notice-activity",
-					"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": "优惠券列表",
-						"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-club-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/order-list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "club/list",
-					"style": {
-						"navigationBarTitleText": "机构列表",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "club/stayClub-list",
-					"style": {
-						"navigationBarTitleText": "待注册机构"
-					}
-				},
-				{
-					"path": "club/club-list",
-					"style": {
-						"navigationBarTitleText": "我的机构"
-					}
-				},
-				{
-					"path": "club/club-portrait",
-					"style": {
-						"navigationBarTitleText": "机构画像"
-					}
-				},
-				{
-					"path": "club/club-visit",
-					"style": {
-						"navigationBarTitleText": "访问记录",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "club/club-inactive-list",
-					"style": {
-						"navigationBarTitleText": "不活跃机构"
-					}
-				},
-				{
-					"path": "club/club-visit-detail",
-					"style": { 
-						"navigationBarTitleText": "访问详情"
-					}
-				},
-				{
-					"path": "club/club-visit-details",
-					"style": { 
-						"navigationBarTitleText": "重点访问详情"
-					}
-				},
-				{
-					"path": "club/allClub-list",
-					"style": {
-						"navigationBarTitleText": "所有机构"
-					}
-				},
-				{
-					"path": "club/addoperator",
-					"style": {
-						"navigationBarTitleText": "邀请运营人员"
-					}
-				},
-				{
-					"path": "club/club-detail",
-					"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": "order/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": "记录详情"
-					}
-				},
-				{
-					"path": "remarks/report-add",
-					"style": {
-						"navigationBarTitleText": "新建报备"
-					}
-				},
-				{
-					"path": "remarks/report-details",
-					"style": {
-						"navigationBarTitleText": "报备详情"
-					}
-				},
-				{
-					"path": "remarks/report-list",
-					"style": {
-						"navigationBarTitleText": "注册客户报备记录"
-					}
-				},
-				{
-					"path": "remarks/report-visitor-list",
-					"style": {
-						"navigationBarTitleText": "报备记录"
-					}
-				},
-				{
-					"path": "remarks/relation-consult-list",
-					"style": {
-						"navigationBarTitleText": "关联咨询记录"
-					}
-				},
-				{
-					"path": "remarks/relation-visitor-list",
-					"style": {
-						"navigationBarTitleText": "关联咨询记录"
-					}
-				},
-                {
-                	"path": "remarks/business-card",
-                	"style": {
-                		"navigationBarTitleText": "我的名片"
-                	}
-                },
-                {
-                	"path": "remarks/mine-qrcode",
-                	"style": {
-                		"navigationBarTitleText": "二维码"
-                	}
-                },
-                {
-                	"path": "remarks/mine-card",
-                	"style": {
-                		"navigationBarTitleText": "我的名片"
-                	}
-                },
-                {
-                	"path": "remarks/institutional-activity-analysis",
-                	"style": {
-                		"navigationBarTitleText": "机构活跃分析",
-                        "enablePullDownRefresh": true,
-                        "navigationStyle": "custom"
-                	}
-                },
-                {
-                    "path" : "notice/service/service",
-                    "style" : {
-                        "navigationBarTitleText": "服务通知",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path" : "notice/service/Institutional_visits",
-                    "style" : {
-                        "navigationBarTitleText": "机构访问通知",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path" : "notice/service/visits_details",
-                    "style" : {
-                        "navigationBarTitleText": "访问详情",
-                        "enablePullDownRefresh": true
-                    }
-                }
-            ]
-		},
-		{
-			"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/quick-operation",
-                	"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-second",
-				"style": {
-					"navigationBarTitleText": "二手搜索"
-				}
-			}, {
-				"path": "search-library",
-				"style": {
-					"navigationBarTitleText": "搜索",
-                    "enablePullDownRefresh": false
-				}
-			}]
-		}, {
-			"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": "店铺主页",
-						"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": "#FF5B00",
-		"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函数里面得到
-		}]
-	}
-}
-
+{
+	"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"
+					}
+				},
+                {
+                	"path": "goods-file-preview",
+                	"style": {
+                		"navigationBarTitleText": "文件预览",
+                		"enablePullDownRefresh": false
+                	}
+                }
+			]
+		},
+		{
+			"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": "修改密码"
+					}
+				},
+                {
+                    "path": "supplier_login",
+                    "style": {
+                        "navigationBarTitleText": "美业参谋"
+                    }
+                }, {
+                    "path": "supplier_information",
+                    "style": {
+                        "navigationBarTitleText": "美业参谋"
+                    }
+                }, {
+                    "path": "supplier_more",
+                    "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-payunder",
+					"style": {
+						"navigationBarTitleText": "线下转账"
+					}
+				},
+				{
+					"path": "order/order-pay-list",
+					"style": {
+						"navigationBarTitleText": "支付订单"
+					}
+				},
+				{
+					"path": "order/order-pay",
+					"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/search-order",
+					"style": {
+						"navigationBarTitleText": "订单搜索"
+					}
+				},
+				{
+					"path": "order/order-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-sharedetails",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "order/order-addpay",
+					"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-copy",
+					"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
+					}
+				},
+				{
+					"path": "pay/card-list",
+					"style": {
+						"navigationBarTitleText": "银行卡"
+					}
+				},
+				{
+					"path": "pay/card-sus-list",
+					"style": {
+						"navigationBarTitleText": "支持银行"
+					}
+				},
+				{
+					"path": "pay/card-add",
+					"style": {
+						"navigationBarTitleText": "添加银行卡"
+					}
+				},
+				{
+					"path": "pay/card-comfirm",
+					"style": {
+						"navigationBarTitleText": "确认信息"
+					}
+				},
+				{
+					"path": "pay/card-comfirm-sub",
+					"style": {
+						"navigationBarTitleText": "输入短信验证码"
+					}
+				},
+				{
+					"path": "pay/card-order",
+					"style": {
+						"navigationBarTitleText": "收银台",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pay/card-under",
+					"style": {
+						"navigationBarTitleText": "线下转账"
+					}
+				}
+				
+			]
+		},
+		{
+			"root": "pages/notice/", //搜索分包模块
+			"pages": [
+				{
+					"path": "club/notice-order",
+					"style": {
+						"navigationBarTitleText": "交易物流",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "club/notice-users",
+					"style": {
+						"navigationBarTitleText": "账户通知",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "club/notice-serve",
+					"style": {
+						"navigationBarTitleText": "服务通知",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "club/notice-coupon",
+					"style": {
+						"navigationBarTitleText": "优惠促销",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "shop/notice-users",
+					"style": {
+						"navigationBarTitleText": "账户通知",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "shop/notice-serve",
+					"style": {
+						"navigationBarTitleText": "服务通知",
+						"enablePullDownRefresh": true
+					}
+				},				
+        {
+					"path": "club/notice-article",
+					"style": {
+						"navigationBarTitleText": "最新文章",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "club/notice-activity",
+					"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": "优惠券列表",
+						"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-club-details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "order/order-list",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "club/list",
+					"style": {
+						"navigationBarTitleText": "机构列表",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "club/stayClub-list",
+					"style": {
+						"navigationBarTitleText": "待注册机构"
+					}
+				},
+				{
+					"path": "club/club-list",
+					"style": {
+						"navigationBarTitleText": "我的机构"
+					}
+				},
+				{
+					"path": "club/club-portrait",
+					"style": {
+						"navigationBarTitleText": "机构画像"
+					}
+				},
+				{
+					"path": "club/club-visit",
+					"style": {
+						"navigationBarTitleText": "访问记录",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "club/club-inactive-list",
+					"style": {
+						"navigationBarTitleText": "不活跃机构"
+					}
+				},
+				{
+					"path": "club/club-visit-detail",
+					"style": { 
+						"navigationBarTitleText": "访问详情"
+					}
+				},
+				{
+					"path": "club/club-visit-details",
+					"style": { 
+						"navigationBarTitleText": "重点访问详情"
+					}
+				},
+				{
+					"path": "club/allClub-list",
+					"style": {
+						"navigationBarTitleText": "所有机构"
+					}
+				},
+				{
+					"path": "club/addoperator",
+					"style": {
+						"navigationBarTitleText": "邀请运营人员"
+					}
+				},
+				{
+					"path": "club/club-detail",
+					"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": "order/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": "记录详情"
+					}
+				},
+				{
+					"path": "remarks/report-add",
+					"style": {
+						"navigationBarTitleText": "新建报备"
+					}
+				},
+				{
+					"path": "remarks/report-details",
+					"style": {
+						"navigationBarTitleText": "报备详情"
+					}
+				},
+				{
+					"path": "remarks/report-list",
+					"style": {
+						"navigationBarTitleText": "注册客户报备记录"
+					}
+				},
+				{
+					"path": "remarks/report-visitor-list",
+					"style": {
+						"navigationBarTitleText": "报备记录"
+					}
+				},
+				{
+					"path": "remarks/relation-consult-list",
+					"style": {
+						"navigationBarTitleText": "关联咨询记录"
+					}
+				},
+				{
+					"path": "remarks/relation-visitor-list",
+					"style": {
+						"navigationBarTitleText": "关联咨询记录"
+					}
+				},
+                {
+                	"path": "remarks/business-card",
+                	"style": {
+                		"navigationBarTitleText": "我的名片"
+                	}
+                },
+                {
+                	"path": "remarks/mine-qrcode",
+                	"style": {
+                		"navigationBarTitleText": "二维码"
+                	}
+                },
+                {
+                	"path": "remarks/mine-card",
+                	"style": {
+                		"navigationBarTitleText": "我的名片"
+                	}
+                },
+                {
+                	"path": "remarks/institutional-activity-analysis",
+                	"style": {
+                		"navigationBarTitleText": "机构活跃分析",
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
+                	}
+                },
+                {
+                    "path" : "notice/service/service",
+                    "style" : {
+                        "navigationBarTitleText": "服务通知",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path" : "notice/service/Institutional_visits",
+                    "style" : {
+                        "navigationBarTitleText": "机构访问通知",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path" : "notice/service/visits_details",
+                    "style" : {
+                        "navigationBarTitleText": "访问详情",
+                        "enablePullDownRefresh": true
+                    }
+                }
+            ]
+		},
+		{
+			"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/quick-operation",
+                	"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-second",
+				"style": {
+					"navigationBarTitleText": "二手搜索"
+				}
+			}, {
+				"path": "search-library",
+				"style": {
+					"navigationBarTitleText": "搜索",
+                    "enablePullDownRefresh": false
+				}
+			}]
+		}, {
+			"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": "店铺主页",
+						"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": "#FF5B00",
+		"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函数里面得到
+		}]
+	}
+}
+

+ 3 - 1
pages/h5/activity/activity-list.vue

@@ -101,7 +101,9 @@
 			NavigateToActivity(item){//跳转活动详情
 				if(item.status!=3 ){
 					if(item.crmLink){
-						this.cmsSysStatistics(6)
+						this.cmsSysStatistics(6)
+                        // 采美活动点击量统计
+                        this.cmsMoudleHits(3, item.id)
 						this.$api.navigateTo(`/pages/h5/activity/activity?link=${item.crmLink}&linkId=${item.linkParam.id}`)
 					}
 				}else{

+ 873 - 0
pages/login/register-invite-club.vue

@@ -0,0 +1,873 @@
+<template>
+    <view class="container register">
+        <view class="register-main clearfix">
+            <view class="register-logo">
+                <image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">联系人:</view>
+                    <input
+                        class="row-input"
+                        type="text"
+                        name="input"
+                        v-model="params.userName"
+                        placeholder="请输入机构联系人姓名"
+                        maxlength="6"
+                    />
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">手机号:</view>
+                    <input
+                        class="row-input"
+                        type="number"
+                        name="input"
+                        v-model="params.bindMobile"
+                        placeholder="请输入联系人常用手机号"
+                        maxlength="11"
+                    />
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">短信验证码:</view>
+                    <input
+                        class="row-input code"
+                        type="text"
+                        v-model="params.smsCode"
+                        placeholder="请输入短信验证码"
+                        maxlength="6"
+                    />
+                    <view class="row-btn" :class="[isMobileDisabled ? 'disabled' : '']">
+                        <button
+                            class="row-input"
+                            type="button"
+                            @click.stop="getMobileCodeFn"
+                            :disabled="isMobileDisabled"
+                        >
+                            {{ mobileCodeText }}
+                        </button>
+                    </view>
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">登录密码:</view>
+                    <input
+                        class="row-input"
+                        type="password"
+                        name="input"
+                        v-model="params.password"
+                        placeholder="密码必须为8-16位字母数字组合"
+                        maxlength="16"
+                    />
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">确认密码:</view>
+                    <input
+                        class="row-input"
+                        type="password"
+                        name="input"
+                        v-model="params.passWordConfirm"
+                        placeholder="请确认密码"
+                        maxlength="16"
+                    />
+                </view>
+            </view>
+            <view class="register-main clearfix">
+                <view class="register-agree">
+                    <view class="agree-text" @tap.stop="agreeCheck()">
+                        <button
+                            class="checkbox iconfont"
+                            :class="[isCheck ? 'icon-gouxuan' : 'icon-weigouxuan']"
+                        ></button>
+                        我已阅读并同意
+                        <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">
+                            《机构协议》
+                        </text>
+                        <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">
+                            《用户协议》
+                        </text>
+                        及
+                        <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">
+                            《隐私权政策》
+                        </text>
+                    </view>
+                </view>
+                <view class="register-row ">
+                    <view class="register-btn sub" @click.stop="registerStepsfirst">注册</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import authorize from '@/common/config/authorize.js'
+import wxLogin from '@/common/config/wxLogin.js'
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+import { beautyList, mentuzCampNullList, medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+import { uploadFileImage } from '@/services/public.js'
+export default {
+    components: {
+        mpvueCityPicker
+    },
+    data() {
+        return {
+            checkRadio: [
+                // 是否需要分配客户经理
+                {
+                    id: 1,
+                    label: '需要'
+                },
+                {
+                    id: 0,
+                    label: '不需要'
+                }
+            ],
+            CustomBar: this.CustomBar, // 顶部导航栏高度
+            isMobileDisabled: false, //手机验证码按钮控制
+            mobilCount: '', //倒计时
+            mobileCodeText: '获取验证码',
+            mobilTime: null,
+            params: {
+                userName: '',
+                bindMobile: '',
+                isAgreed: 0,
+                password: '',
+                passWordConfirm: '',
+                smsCode: '',
+                avatarUrl: '',
+                nickName: '',
+                source: 1,
+                unionId: '',
+                isSp: 1,
+				insideFLag:1, //内外部协销标记 0内部协销,1外部协销
+                spId: '', // 协销分享的id
+            },
+            imageCode: '', //图形验证码
+            imageCodeUrl: '', //图形验证码图片
+            imageCodetoken: '', //图形验证校验
+            isCheck: false, //是否勾选协议
+            userID: '', //机构userID
+            clubID: '' //机构ID
+        }
+    },
+    onLoad(option) {
+		if(option.spId){
+			this.params.spId = option.spId
+			uni.setStorageSync('spId',option.spId)
+			uni.setStorageSync('insideFLag',1)
+		}
+	},
+    computed: {},
+    methods: {
+        ...mapMutations(['login', 'wxLogin']),
+        registerStepsfirst() {
+            if (this.params.userName == '') {
+                this.$util.msg('请输入联系人名称', 2000)
+                return
+            }
+            if (this.params.bindMobile == '') {
+                this.$util.msg('请输入手机号', 2000)
+                return
+            }
+            if (!this.$reg.isMobile(this.params.bindMobile)) {
+                this.$util.msg('手机格式不正确', 2000)
+                return
+            }
+            if (this.params.smsCode == '') {
+                this.$util.msg('请输入手机验证码', 2000)
+                return
+            }
+            if (!this.$reg.isMobileCode(this.params.smsCode)) {
+                this.$util.msg('验证码格式不正确', 2000)
+                return
+            }
+            if (this.params.password == '') {
+                this.$util.msg('请输入密码', 2000)
+                return
+            }
+            if (!this.$reg.checkPwd(this.params.password)) {
+                this.$util.msg('密码必须为8-16位字母数字的组合', 2000)
+                return
+            }
+            if (this.params.passWordConfirm == '') {
+                this.$util.msg('请再次确认密码', 2000)
+                return
+            }
+            if (this.params.passWordConfirm !== this.params.password) {
+                this.$util.msg('两次输入的密码不一致', 2000)
+                return
+            }
+            if (this.params.isAgreed == 0) {
+                this.$util.msg('请勾选同意协议', 2000)
+                return
+            }
+            this.params.unionId = uni.getStorageSync('unionId')
+            this.GetUserProfile()
+        },
+        GetUserProfile() {
+            //获取用户微信个人信息
+            const self = this
+            wx.getUserProfile({
+                desc: '采美采购商城小程序获取您的信息', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
+                success(res) {
+                    console.log('微信获取用户信息新API', res)
+                    self.wxLogin(res.userInfo)
+                    self.params.nickName = res.userInfo.nickName
+                    self.params.avatarUrl = res.userInfo.avatarUrl
+					console.log('spId', uni.getStorageSync('spId'))
+                    if (uni.getStorageSync('spId') * 1 > 0) {
+                        self.params.spId = uni.getStorageSync('spId') * 1
+                    }
+					console.log('params', self.params)
+                    self.UserRegisterClub(self.params)
+                    // 友盟自定义事件
+                    if (process.env.NODE_ENV != 'development') {
+                        self.$uma.trackEvent('Um_Event_ConfirmRegister', {
+                            Um_Key_PageName: '注册机构',
+                            Um_Key_PageCategory: '注册机构页面'
+                        })
+                    }
+                },
+                fail() {
+                    self.$util.msg('授权失败', 2000)
+                }
+            })
+        },
+        UserRegisterClub(params) {
+            this.UserService.UserRegisterClub(params)
+                .then(response => {
+                    wxLogin.wxLoginAuthorize()
+                    setTimeout(() => {
+						uni.removeStorageSync('spId')
+                        this.$api.switchTabTo('/pages/tabBar/user/user')
+                    }, 2000)
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
+        },
+        storeUpdataeStatus(data) {
+            uni.setStorageSync('token', data.token)
+            this.$store.commit('updateStatus', data)
+            this.login(data)
+        },
+        getMobileCodeFn() {
+            if (this.params.bindMobile == '') {
+                this.$util.msg('请输入手机号', 2000)
+                return
+            }
+            if (!this.$reg.isMobile(this.params.bindMobile)) {
+                this.$util.msg('请输入正确的手机号', 2000)
+                return
+            }
+            let params = {
+                mobile: this.params.bindMobile,
+                isCheckCaptcha: 1,
+                activateCodeType: 2,
+                platformType: 2
+            }
+            this.isMobileDisabled = true
+            this.PublicService.GetRegisterMobileCode(params)
+                .then(response => {
+                    this.$util.msg('验证短信已发送', 2000)
+                    const TIME_COUNT = 60
+                    if (!this.mobilTime) {
+                        this.mobilCount = TIME_COUNT
+                        this.isMobileDisabled = true
+                        this.mobilTime = setInterval(() => {
+                            if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
+                                this.mobilCount--
+                                this.mobileCodeText = this.mobilCount + 's重新发送'
+                            } else {
+                                this.isMobileDisabled = false
+                                clearInterval(this.mobilTime)
+                                this.mobilTime = null
+                                this.mobileCodeText = '获取验证码'
+                            }
+                        }, 1000)
+                    }
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                    this.isMobileDisabled = false
+                })
+        },
+        agreeCheck() {
+            this.isCheck = !this.isCheck
+            if (this.isCheck) {
+                this.params.isAgreed = 1
+            } else {
+                this.params.isAgreed = 0
+            }
+        },
+        async InitAuthorize() {
+            //是否已授权 0:为取消授权 1:为已授权 2:为未操作
+            wxLogin.wxLoginQuick()
+        }
+    },
+    onShow() {
+        this.InitAuthorize()
+    }
+}
+</script>
+
+<style lang="scss">
+.register {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    background-size: contain;
+    .register-main {
+        width: 100%;
+        height: auto;
+        position: relative;
+        .register-consult {
+            width: 110rpx;
+            height: 68rpx;
+            background: linear-gradient(223deg, rgba(225, 86, 21, 0.6) 0%, rgba(225, 86, 10, 0.3) 100%);
+            border-radius: 34rpx 0 0 34rpx;
+            position: absolute;
+            right: 0;
+            bottom: 120rpx;
+            text-align: left;
+            line-height: 68rpx;
+            padding-left: 20rpx;
+            .icon-kefunv {
+                font-size: 48rpx;
+                color: #31313b;
+                float: left;
+            }
+            .text {
+                font-size: $font-size-24;
+                display: block;
+                float: left;
+                width: 60rpx;
+                line-height: 30rpx;
+                color: #ffffff;
+                margin-top: 6rpx;
+            }
+        }
+        .register-agree {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin: 100rpx 0 20rpx 0;
+            .agree-text {
+                .checkbox {
+                    float: left;
+                    margin: 4rpx 6rpx 0 0;
+                    color: #999999;
+                    font-size: $font-size-34;
+                    &.icon-gouxuan {
+                        color: $color-system;
+                    }
+                }
+                font-size: $font-size-22;
+                line-height: 44rpx;
+                color: #999999;
+                text {
+                    color: #1890f9;
+                }
+            }
+        }
+        .register-logo {
+            width: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            height: 284rpx;
+            padding: 60rpx 0 40rpx 0;
+            .logo {
+                width: 611rpx;
+                height: 284rpx;
+                display: block;
+            }
+        }
+        &.detailed {
+            padding-bottom: 330rpx;
+        }
+        .register-row {
+            width: 100%;
+            height: auto;
+            padding: 0 75rpx;
+            margin-bottom: 30rpx;
+            box-sizing: border-box;
+            .tab-label {
+                color: #666666;
+                font-size: 28rpx;
+            }
+            .tips {
+                color: #ff5b00;
+                font-size: 20rpx;
+            }
+            .check{
+                display: flex;
+                align-item: center;
+                margin-top: 24rpx;
+                .radio {
+                    color: #666666;
+                    font-size: 28rpx;
+                    padding-left: 60rpx;
+                    position: relative;
+                    margin-right: 56rpx;
+                    &::before {
+                        content: '';
+                        width: 32rpx;
+                        height: 32rpx;
+                        border: 1px solid #B2B2B2;
+                        border-radius: 50%;
+                        position: absolute;
+                        left: 0;
+                    }
+                }
+                .isActive {
+                    &::before {
+                        border: 1px solid #FF5B00;
+                        content: '';
+                        width: 32rpx;
+                        height: 32rpx;
+                        border-radius: 50%;
+                        position: absolute;
+                        left: 0;
+                    }
+                    &::after {
+                        content: '';
+                        width: 16rpx;
+                        height: 16rpx;
+                        border-radius: 50%;
+                        position: absolute;
+                        left: 0;
+                        background-color: #FF5B00;
+                        transform: translate(60%, 60%);
+                    }
+                }
+            }
+            &.none {
+                margin-bottom: 0;
+            }
+            &.login {
+                display: flex;
+            }
+            .register-text {
+                line-height: 44rpx;
+                margin-top: 100rpx;
+                font-size: $font-size-24;
+                color: #999999;
+                text-align: justify;
+                .txt {
+                    margin-right: 15rpx;
+                }
+            }
+            .register-title {
+                line-height: 44rpx;
+                font-size: $font-size-24;
+                color: $text-color;
+                text-align: left;
+                &.first {
+                    margin-top: 20rpx;
+                }
+            }
+            .register-tip {
+                line-height: 64rpx;
+                font-size: $font-size-24;
+                color: #cecece;
+                text-align: left;
+            }
+            .register-from {
+                width: 100%;
+                height: 80rpx;
+                background: #ffffff;
+                position: relative;
+                border-bottom: 1px solid #e1e1e1;
+                .label {
+                    text-align: left;
+                    font-size: $font-size-28;
+                    color: #666666;
+                    line-height: 88rpx;
+                    float: left;
+                }
+                .row-input {
+                    width: 440rpx;
+                    padding-left: 10rpx;
+                    font-size: $font-size-28;
+                    color: $text-color;
+                    line-height: 80rpx;
+                    float: left;
+                    height: 80rpx;
+                    &.none {
+                        color: #999999;
+                    }
+                    &.picker {
+                        text-align: left;
+                        color: #333333;
+                    }
+                    &.keshi {
+                        width: 550rpx;
+                    }
+                    &.code {
+                        width: 264rpx;
+                    }
+                }
+                &.img-btn {
+                    width: 220rpx;
+                    height: 80rpx;
+                    padding: 0;
+                    float: left;
+                    background: #ffffff;
+                    display: block;
+                    .vscodeimg {
+                        width: 150rpx;
+                        height: 80rpx;
+                        float: left;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        border-radius: 14rpx;
+                        image {
+                            width: 150rpx;
+                            height: 80rpx;
+                            border-radius: 14rpx;
+                        }
+                    }
+                    .vscod-refresh {
+                        width: 70rpx;
+                        float: right;
+                        text-align: right;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        line-height: 44rpx;
+                        .icon-shuaxin {
+                            font-size: 48rpx;
+                            color: #333333;
+                        }
+                        .ref-text {
+                            font-size: 24rpx;
+                            color: #333333;
+                        }
+                    }
+                }
+                &.imgcode {
+                    width: 410rpx;
+                    float: left;
+                    margin-right: 20rpx;
+                    .row-input {
+                        width: 230rpx;
+                    }
+                }
+                .row-btn {
+                    width: 180rpx;
+                    height: 64rpx;
+                    float: left;
+                    background: $btn-confirm;
+                    padding: 0;
+                    border-radius: 32rpx;
+                    .row-input {
+                        width: 180rpx;
+                        height: 64rpx;
+                        line-height: 64rpx;
+                        padding: 0;
+                        color: #ffffff;
+                        background: $btn-confirm;
+                        text-align: center;
+                        border-radius: 32rpx;
+                        &.other {
+                            width: 180rpx;
+                            background: #f7f7f7;
+                            margin-right: 20rpx;
+                        }
+                        &.none {
+                            background: #f7f7f7;
+                        }
+                    }
+                    &.disabled {
+                        background: #f7f7f7;
+                        .row-input {
+                            background: #f7f7f7;
+                            color: #999999;
+                            font-size: 24rpx;
+                        }
+                    }
+                }
+                &.picker {
+                    padding: 0 24rpx;
+                    width: 654rpx;
+                    height: 88rpx;
+                    line-height: 88rpx;
+                    .label {
+                        line-height: 88rpx;
+                    }
+                    .row-input {
+                        width: 470rpx;
+                        height: 88rpx;
+                        line-height: 88rpx;
+                        padding-left: 30rpx;
+                    }
+                }
+                &.radio {
+                    padding: 0 24rpx;
+                    width: 654rpx;
+                    height: 288rpx;
+                    .row-input {
+                        width: 100%;
+                        height: 88rpx;
+                        line-height: 88rpx;
+                        padding-left: 0;
+                    }
+                    .row-radio {
+                        float: left;
+                        transform: scale(0.8);
+                    }
+                    .row-text {
+                        width: 100rpx;
+                        text-align: center;
+                        float: left;
+                    }
+                }
+                &.group {
+                    padding: 0 24rpx;
+                    width: 654rpx;
+                    height: auto;
+                    background: #ffffff;
+                    margin-top: 30rpx;
+                    .label {
+                        line-height: 76rpx;
+                    }
+                    .row-input {
+                        width: 100%;
+                        height: 88rpx;
+                        line-height: 88rpx;
+                        padding-left: 0;
+                    }
+                    .row-radio {
+                        float: left;
+                    }
+                    .row-text {
+                        width: 100rpx;
+                        text-align: center;
+                        float: left;
+                    }
+                }
+                &.btn {
+                    margin-top: 0;
+                }
+                .content-class {
+                    margin: 20rpx auto;
+                    display: flex;
+                    flex-flow: row wrap;
+                    justify-content: space-between;
+                    align-items: center;
+                    &.btn {
+                        margin: 0 auto;
+                        margin-left: 116rpx;
+                    }
+                    .row-input {
+                        display: flex;
+                        width: 220rpx;
+                        height: 40rpx;
+                        padding: 24rpx;
+                        text-align: left;
+                        border-radius: 10rpx;
+                        font-size: $font-size-28;
+                        color: $text-color;
+                    }
+                    .confirm-btn {
+                        width: 200rpx;
+                        height: 88rpx;
+                        border-radius: 10rpx;
+                        line-height: 88rpx;
+                        text-align: center;
+                        &.other {
+                            width: 213rpx;
+                        }
+                        &.none {
+                            color: #ffffff;
+                            background: $btn-confirm;
+                        }
+                        &.disabled {
+                            color: #999999;
+                        }
+                    }
+                    .item {
+                        width: 155rpx;
+                        height: 60rpx;
+                        font-size: $font-size-28;
+                        line-height: 60rpx;
+                        border-radius: 10rpx;
+                        margin: 10rpx;
+                        text-align: center;
+                        box-sizing: border-box;
+                        border: 1rpx solid #efefef;
+                        float: left;
+                        checkbox {
+                            display: none;
+                        }
+                    }
+                    .on {
+                        border-color: $color-system;
+                        color: $color-system;
+                    }
+                }
+            }
+            .row-login {
+                flex: 1;
+                font-size: $font-size-28;
+                color: $text-color;
+                text-align: left;
+            }
+            .row-logincode {
+                flex: 1;
+                font-size: $font-size-28;
+                color: $text-color;
+                text-align: right;
+            }
+            .icon-xiayibu {
+                width: 88rpx;
+                height: 88rpx;
+                position: absolute;
+                right: 0;
+                top: 0;
+                line-height: 88rpx;
+                text-align: center;
+            }
+            &.text-textarea {
+                background: #ffffff;
+                .textarea {
+                    width: 654rpx;
+                    height: 180rpx;
+                    background: #f7f7f7;
+                    padding: 24rpx;
+                    font-size: $font-size-28;
+                    color: $text-color;
+                    z-index: 1;
+                    border-radius: 14rpx;
+                }
+                .textarea.hide {
+                    opacity: 0;
+                }
+                .textarea.show {
+                    color: #999999;
+                }
+            }
+        }
+        .register-picture {
+            height: 102rpx;
+            margin: 30rpx 0;
+            width: 42%;
+            float: left;
+            &.zz {
+                width: 100%;
+            }
+            .label {
+                float: left;
+                font-size: $font-size-28;
+                color: $text-color;
+                line-height: 102rpx;
+                width: 150rpx;
+                text-align: right;
+                &.zz {
+                    width: 230rpx;
+                }
+            }
+            .upload-picture {
+                float: left;
+                height: 100rpx;
+                .upload-none {
+                    width: 100rpx;
+                    height: 100rpx;
+                    text-align: center;
+                    line-height: 100rpx;
+                    color: #999999;
+                    border: 1px solid #999999;
+                    border-radius: 10rpx;
+                    margin: 0 20rpx;
+                    .iconfont {
+                        font-size: $font-size-28;
+                    }
+                }
+                .upload-image {
+                    width: 100rpx;
+                    height: 100rpx;
+                    border-radius: 10rpx;
+                    margin: 0 20rpx;
+                    position: relative;
+                    image {
+                        width: 100rpx;
+                        height: 100rpx;
+                        border-radius: 10rpx;
+                    }
+                    .upload-del {
+                        width: 40rpx;
+                        height: 40rpx;
+                        position: absolute;
+                        top: -20rpx;
+                        right: -20rpx;
+                        line-height: 40rpx;
+                        text-align: center;
+                        .iconfont {
+                            font-size: $font-size-32;
+                            color: #999999;
+                        }
+                    }
+                }
+            }
+        }
+        .register-input {
+            width: 654rpx;
+            height: 40rpx;
+            padding: 24rpx;
+            margin: 0 auto;
+            margin-bottom: 60rpx;
+            background: #f7f7f7;
+            border-radius: 14rpx;
+            .input {
+                width: 100%;
+                height: 100%;
+                background: #f7f7f7;
+                font-size: $font-size-28;
+                line-height: 40rpx;
+                color: #333333;
+                border-radius: 14rpx;
+            }
+        }
+        .register-fiexd {
+            width: 100%;
+            height: auto;
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            z-index: 999;
+            background: #ffffff;
+        }
+        .register-btn {
+            width: 100%;
+            height: 88rpx;
+            border-radius: 44rpx;
+            font-size: $font-size-28;
+            line-height: 88rpx;
+            color: #ffffff;
+            margin: 0 auto;
+            text-align: center;
+            background: $btn-confirm;
+            margin-top: 96rpx;
+            &.none {
+                border: 1px solid $color-system;
+                background: #ffffff;
+                color: $color-system;
+                margin-top: 0;
+            }
+            &.sub {
+                margin-top: 0;
+            }
+        }
+    }
+}
+</style>

+ 3 - 1
pages/login/register.vue

@@ -171,6 +171,7 @@ export default {
                 source: 1,
                 unionId: '',
                 isSp: 1,
+				insideFLag:0, //内外部协销标记 0内部协销,1外部协销
                 spId: '', // 协销分享的id
             },
             imageCode: '', //图形验证码
@@ -194,7 +195,6 @@ export default {
                 })
             })
         },
-
         registerStepsfirst() {
             if (this.params.userName == '') {
                 this.$util.msg('请输入联系人名称', 2000)
@@ -250,8 +250,10 @@ export default {
                     self.params.nickName = res.userInfo.nickName
                     self.params.avatarUrl = res.userInfo.avatarUrl
 					console.log('spId', uni.getStorageSync('spId'))
+					console.log('insideFLag', uni.getStorageSync('insideFLag'))
                     if (uni.getStorageSync('spId') * 1 > 0) {
                         self.params.spId = uni.getStorageSync('spId') * 1
+                        self.params.insideFLag = uni.getStorageSync('insideFLag') * 1
                     }
 					console.log('params', self.params)
                     self.UserRegisterClub(self.params)

+ 1 - 2
pages/notice/club/notice-activity.vue

@@ -83,9 +83,8 @@ export default {
 			this.getUserAuthClubMessageList()
 		},
 		handleOrderClick(cell) {
-            const link = `${process.env.NODE_ENV === 'development' ? 'http://120.79.25.27:8009/' : 'https://www.caimei365.com/'}page-${cell.thisId}.html`
             uni.navigateTo({
-                url: `/pages/h5/article/path?link=${link}`
+                url: `/pages/h5/article/path?link=${cell.appLink}`
             })
 		},
 	},

+ 2 - 2
pages/notice/club/notice-article.vue

@@ -89,7 +89,6 @@ export default {
     },
     methods: {
         async initData(option) {
-            console.log(123324234)
             const userInfo = await this.$api.getStorage()
             this.listQuery.messageType = option.messageType
             this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
@@ -97,8 +96,9 @@ export default {
         },
         handleOrderClick(cell) {
             const link = `${
-                process.env.NODE_ENV === 'development' ? 'http://120.79.25.27:8009/' : 'https://www.caimei365.com/'
+                process.env.NODE_ENV === 'development' ? 'http://120.79.25.27:8009' : 'https://www.caimei365.com'
             }/info/detail-${cell.thisId}-1.html`
+            console.log(link)
             uni.navigateTo({
                 url: `/pages/h5/article/path?link=${link}`
             })

+ 5 - 3
pages/search/search.vue

@@ -495,7 +495,8 @@ import cmRossPopup from '@/components/cm-module/cm-ross/cm-ross-popup'
 import wxLogin from '@/common/config/wxLogin.js'
 import { debounce } from '@/common/config/common.js'
 import cmSrsMixins from '@/utils/cmSrsMixins.js'
-import searchMixins from './mixins/searchMixins.js'
+import searchMixins from './mixins/searchMixins.js'
+import cmsMixins from '@/mixins/cmsMixins.js'
 const myDebounce = fn => debounce(fn, 500, false)
 
 export default {
@@ -504,7 +505,7 @@ export default {
 		uniGrader,
 		cmRossPopup
 	},
-	mixins: [cmSrsMixins,searchMixins],
+	mixins: [cmSrsMixins,searchMixins,cmsMixins],
 	data() {
 		return {
 			CustomBar: this.CustomBar, // 顶部导航栏高度
@@ -699,7 +700,8 @@ export default {
 			//搜索
 			if (this.listQuery.keyword == '') {
 				this.$util.msg('请输入搜索关键词', 2000)
-			} else {
+			} else {
+                this.cmsKeywordHits(this.listQuery.keyword)
 				switch (this.searchKeyType) {
 					case 1:
 						this.listData = []

+ 859 - 0
pages/seller/login/register-invite.vue

@@ -0,0 +1,859 @@
+<template>
+	<view class="container login">
+		<view class="login-main">
+			<text class="logo-titl">本页面不用填写!</text>
+			<text class="logo-text">点击右上方<text class="sp">···</text>,选择“发送给朋友”,</text>
+			<text class="logo-text">将本页面发送给客户进行机构注册,注册成功后将自动成为你名下的机构客户。</text>
+		</view>
+		<view class="register-main clearfix">
+		    <view class="register-logo">
+		        <image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
+		    </view>
+		    <view class="register-row clearfix">
+		        <view class="register-from">
+		            <view class="label">联系人:</view>
+		            <input
+		                class="row-input"
+		                type="text"
+		                name="input"
+		                v-model="params.userName"
+						disabled="true"
+		                placeholder="请输入机构联系人姓名"
+		                maxlength="6"
+		            />
+		        </view>
+		    </view>
+		    <view class="register-row clearfix">
+		        <view class="register-from">
+		            <view class="label">手机号:</view>
+		            <input
+		                class="row-input"
+		                type="number"
+		                name="input"
+		                v-model="params.bindMobile"
+						disabled="true"
+		                placeholder="请输入联系人常用手机号"
+		                maxlength="11"
+		            />
+		        </view>
+		    </view>
+		    <view class="register-row clearfix">
+		        <view class="register-from">
+		            <view class="label">短信验证码:</view>
+		            <input
+		                class="row-input code"
+		                type="text"
+		                v-model="params.smsCode"
+						disabled="true"
+		                placeholder="请输入短信验证码"
+		                maxlength="6"
+		            />
+		            <view class="row-btn" :class="[isMobileDisabled ? 'disabled' : '']">
+		                <button
+		                    class="row-input"
+		                    type="button"
+		                    @click.stop="getMobileCodeFn"
+		                    disabled="true"
+		                >
+		                    {{ mobileCodeText }}
+		                </button>
+		            </view>
+		        </view>
+		    </view>
+		    <view class="register-main clearfix">
+		        <view class="register-agree">
+		            <view class="agree-text" @tap.stop="agreeCheck()">
+		                <button
+		                    class="checkbox iconfont"
+							disabled="true"
+		                    :class="[isCheck ? 'icon-gouxuan' : 'icon-weigouxuan']"
+		                ></button>
+		                我已阅读并同意
+		                <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">
+		                    《机构协议》
+		                </text>
+		                <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">
+		                    《用户协议》
+		                </text>
+		                及
+		                <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">
+		                    《隐私权政策》
+		                </text>
+		            </view>
+		        </view>
+		        <view class="register-row ">
+		            <view class="register-btn sub">注册</view>
+		        </view>
+		    </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import authorize from '@/common/config/authorize.js' 
+	export default{
+		data() {
+			return{
+				spId:0,
+				userName:'',
+				userId:0,
+				mobileCodeText:'获取验证码'
+			}
+		},
+		onLoad(option) {
+			this.initGetStotage()
+		},
+		methods:{
+			async initGetStotage() {
+				// 初始化
+				const userInfo = await this.$api.getStorage()
+				this.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+				this.userName = userInfo.userName ? userInfo.userName : ''
+			}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') { // 来自页面内转发按钮
+		    }
+			return {
+			  title: `${this.userName}邀请你注册采美机构用户啦~`,
+			  path: `pages/login/register-invite-club?spId=${this.spId}`,
+			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
+			}
+		},
+		onShow() {
+			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.userId = resolve.userId
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.login{
+		width: 100%;
+		height: auto;
+		border-top: 1px solid #F7F7F7;
+		.model-warp.none{
+			display: none;			
+		}
+		.model-warp.show{
+			display: block;
+		}
+		.login-main{
+			width: 682rpx;		
+			background: rgba(0, 0, 0, 0.6);
+			display: flex;
+			flex-direction: column;
+			height: 164rpx;
+			margin: 18rpx auto 0;
+			box-sizing: border-box;
+			padding: 20rpx;
+			border-radius: 16rpx;
+			position: relative;
+			&:before {
+				content: '';
+				width: 0;
+				height: 0;
+				border: 15rpx solid transparent;
+				border-bottom: 15rpx solid rgba(0, 0, 0, 0.6);
+				position: absolute;
+				top: -29rpx;
+				right: 88rpx;
+			}
+			.logo-titl{
+				font-size: 28rpx;
+				line-height: 34rpx;
+				color:#FFFFFF;
+			}
+			.logo-text{
+				font-size: 24rpx;
+				line-height: 34rpx;
+				color:#FFFFFF;
+				.sp{
+					color:#FFFFFF;
+					font-weight: bold;
+				}
+			}
+		}
+		.login-form{
+			width: 702rpx;
+			height: auto;
+			padding: 0 24rpx;
+			.login-input{
+				width: 654rpx;
+				height: 40rpx;
+				padding: 24rpx;
+				margin-bottom: 20rpx;
+				background: #F7F7F7;
+				border-radius: 14rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				&.code{
+					width: 370rpx;
+					float: left;
+					margin-right: 20rpx;
+				}
+				&.btn{
+					width: 258rpx;
+					height: 88rpx;
+					padding: 0;
+					float: left;
+					background: $btn-confirm;
+					.input{
+						width: 258rpx;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding: 0;
+						border-radius: 14rpx;
+						color: #FFFFFF;
+						background: $btn-confirm;
+					}
+					&.disabled{
+						background: #F7F7F7;
+						.input{
+							background: #F7F7F7;
+							color: #999999;
+						}
+					}
+				}
+				&.img-btn{
+					width: 250rpx;
+					height: 88rpx;
+					padding: 0;
+					float: left;
+					background: #FFFFFF;
+					display: block;
+					.vscodeimg{
+						width: 180rpx;
+						height: 88rpx;
+						float: left;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						border-radius: 14rpx;
+						image{
+							width: 180rpx;
+							height: 88rpx;
+							border-radius: 14rpx;
+						}
+					}
+					.vscod-refresh{
+						width: 70rpx;
+						float: right;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						.icon-shuaxin{
+							font-size: 48rpx;
+							color: #333333;
+						}
+						.ref-text{
+							font-size: 24rpx;
+							color: #333333;
+						}
+					}
+				}
+				.input{
+					width: 100%;
+					height: 100%;
+					background: #F7F7F7;
+					font-size: $font-size-28;
+					line-height: 40rpx;
+					color: #333333;
+					border-radius: 14rpx;
+				}
+			}
+		}
+		.login-btn{
+			width: 702rpx;
+			height: 88rpx;
+			border-radius: 44rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: #FFFFFF;
+			margin: 0 auto;
+			text-align: center;
+			background: $btn-confirm;
+			margin-top: 100rpx;
+		}
+		.model-authorization{
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 999;
+			.authorization{
+				width: 518rpx;
+				height: 320rpx;
+				position: absolute;
+				background: rgba(255,255,255,.7);
+				left: 0;
+				right: 0;
+				bottom: 0;
+				top: 0;
+				margin: auto;
+				.to-btn{
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					margin: auto;
+					width: 70%;
+					height: 88rpx;
+					font-size: $font-size-28;
+					line-height: 88rpx;
+					color: #FFFFFF;
+					text-align: center;
+					border-radius: 44rpx;
+				}
+			}
+		}
+		.register-main {
+		    width: 100%;
+		    height: auto;
+		    position: relative;
+		    .register-consult {
+		        width: 110rpx;
+		        height: 68rpx;
+		        background: linear-gradient(223deg, rgba(225, 86, 21, 0.6) 0%, rgba(225, 86, 10, 0.3) 100%);
+		        border-radius: 34rpx 0 0 34rpx;
+		        position: absolute;
+		        right: 0;
+		        bottom: 120rpx;
+		        text-align: left;
+		        line-height: 68rpx;
+		        padding-left: 20rpx;
+		        .icon-kefunv {
+		            font-size: 48rpx;
+		            color: #31313b;
+		            float: left;
+		        }
+		        .text {
+		            font-size: $font-size-24;
+		            display: block;
+		            float: left;
+		            width: 60rpx;
+		            line-height: 30rpx;
+		            color: #ffffff;
+		            margin-top: 6rpx;
+		        }
+		    }
+		    .register-agree {
+		        display: flex;
+		        flex-direction: column;
+		        align-items: center;
+		        margin: 100rpx 0 20rpx 0;
+		        .agree-text {
+		            .checkbox {
+		                float: left;
+		                margin: 4rpx 6rpx 0 0;
+		                color: #999999;
+		                font-size: $font-size-34;
+		                &.icon-gouxuan {
+		                    color: $color-system;
+		                }
+		            }
+		            font-size: $font-size-22;
+		            line-height: 44rpx;
+		            color: #999999;
+		            text {
+		                color: #1890f9;
+		            }
+		        }
+		    }
+		    .register-logo {
+		        width: 100%;
+		        display: flex;
+		        flex-direction: column;
+		        align-items: center;
+		        height: 284rpx;
+		        .logo {
+		            width: 611rpx;
+		            height: 284rpx;
+		            display: block;
+		        }
+		    }
+		    &.detailed {
+		        padding-bottom: 330rpx;
+		    }
+		    .register-row {
+		        width: 100%;
+		        height: auto;
+		        padding: 0 75rpx;
+		        margin-bottom: 30rpx;
+		        box-sizing: border-box;
+		        .tab-label {
+		            color: #666666;
+		            font-size: 28rpx;
+		        }
+		        .tips {
+		            color: #ff5b00;
+		            font-size: 20rpx;
+		        }
+		        .check{
+		            display: flex;
+		            align-item: center;
+		            margin-top: 24rpx;
+		            .radio {
+		                color: #666666;
+		                font-size: 28rpx;
+		                padding-left: 60rpx;
+		                position: relative;
+		                margin-right: 56rpx;
+		                &::before {
+		                    content: '';
+		                    width: 32rpx;
+		                    height: 32rpx;
+		                    border: 1px solid #B2B2B2;
+		                    border-radius: 50%;
+		                    position: absolute;
+		                    left: 0;
+		                }
+		            }
+		            .isActive {
+		                &::before {
+		                    border: 1px solid #FF5B00;
+		                    content: '';
+		                    width: 32rpx;
+		                    height: 32rpx;
+		                    border-radius: 50%;
+		                    position: absolute;
+		                    left: 0;
+		                }
+		                &::after {
+		                    content: '';
+		                    width: 16rpx;
+		                    height: 16rpx;
+		                    border-radius: 50%;
+		                    position: absolute;
+		                    left: 0;
+		                    background-color: #FF5B00;
+		                    transform: translate(60%, 60%);
+		                }
+		            }
+		        }
+		        &.none {
+		            margin-bottom: 0;
+		        }
+		        &.login {
+		            display: flex;
+		        }
+		        .register-text {
+		            line-height: 44rpx;
+		            margin-top: 100rpx;
+		            font-size: $font-size-24;
+		            color: #999999;
+		            text-align: justify;
+		            .txt {
+		                margin-right: 15rpx;
+		            }
+		        }
+		        .register-title {
+		            line-height: 44rpx;
+		            font-size: $font-size-24;
+		            color: $text-color;
+		            text-align: left;
+		            &.first {
+		                margin-top: 20rpx;
+		            }
+		        }
+		        .register-tip {
+		            line-height: 64rpx;
+		            font-size: $font-size-24;
+		            color: #cecece;
+		            text-align: left;
+		        }
+		        .register-from {
+		            width: 100%;
+		            height: 80rpx;
+		            background: #ffffff;
+		            position: relative;
+		            border-bottom: 1px solid #e1e1e1;
+		            .label {
+		                text-align: left;
+		                font-size: $font-size-28;
+		                color: #666666;
+		                line-height: 88rpx;
+		                float: left;
+		            }
+		            .row-input {
+		                width: 440rpx;
+		                padding-left: 10rpx;
+		                font-size: $font-size-28;
+		                color: $text-color;
+		                line-height: 80rpx;
+		                float: left;
+		                height: 80rpx;
+		                &.none {
+		                    color: #999999;
+		                }
+		                &.picker {
+		                    text-align: left;
+		                    color: #333333;
+		                }
+		                &.keshi {
+		                    width: 550rpx;
+		                }
+		                &.code {
+		                    width: 264rpx;
+		                }
+		            }
+		            &.img-btn {
+		                width: 220rpx;
+		                height: 80rpx;
+		                padding: 0;
+		                float: left;
+		                background: #ffffff;
+		                display: block;
+		                .vscodeimg {
+		                    width: 150rpx;
+		                    height: 80rpx;
+		                    float: left;
+		                    display: flex;
+		                    flex-direction: column;
+		                    align-items: center;
+		                    border-radius: 14rpx;
+		                    image {
+		                        width: 150rpx;
+		                        height: 80rpx;
+		                        border-radius: 14rpx;
+		                    }
+		                }
+		                .vscod-refresh {
+		                    width: 70rpx;
+		                    float: right;
+		                    text-align: right;
+		                    display: flex;
+		                    flex-direction: column;
+		                    align-items: center;
+		                    line-height: 44rpx;
+		                    .icon-shuaxin {
+		                        font-size: 48rpx;
+		                        color: #333333;
+		                    }
+		                    .ref-text {
+		                        font-size: 24rpx;
+		                        color: #333333;
+		                    }
+		                }
+		            }
+		            &.imgcode {
+		                width: 410rpx;
+		                float: left;
+		                margin-right: 20rpx;
+		                .row-input {
+		                    width: 230rpx;
+		                }
+		            }
+		            .row-btn {
+		                width: 180rpx;
+		                height: 64rpx;
+		                float: left;
+		                background: $btn-confirm;
+		                padding: 0;
+		                border-radius: 32rpx;
+		                .row-input {
+		                    width: 180rpx;
+		                    height: 64rpx;
+		                    line-height: 64rpx;
+		                    padding: 0;
+		                    color: #ffffff;
+		                    background: $btn-confirm;
+		                    text-align: center;
+		                    border-radius: 32rpx;
+		                    &.other {
+		                        width: 180rpx;
+		                        background: #f7f7f7;
+		                        margin-right: 20rpx;
+		                    }
+		                    &.none {
+		                        background: #f7f7f7;
+		                    }
+		                }
+		                &.disabled {
+		                    background: #f7f7f7;
+		                    .row-input {
+		                        background: #f7f7f7;
+		                        color: #999999;
+		                        font-size: 24rpx;
+		                    }
+		                }
+		            }
+		            &.picker {
+		                padding: 0 24rpx;
+		                width: 654rpx;
+		                height: 88rpx;
+		                line-height: 88rpx;
+		                .label {
+		                    line-height: 88rpx;
+		                }
+		                .row-input {
+		                    width: 470rpx;
+		                    height: 88rpx;
+		                    line-height: 88rpx;
+		                    padding-left: 30rpx;
+		                }
+		            }
+		            &.radio {
+		                padding: 0 24rpx;
+		                width: 654rpx;
+		                height: 288rpx;
+		                .row-input {
+		                    width: 100%;
+		                    height: 88rpx;
+		                    line-height: 88rpx;
+		                    padding-left: 0;
+		                }
+		                .row-radio {
+		                    float: left;
+		                    transform: scale(0.8);
+		                }
+		                .row-text {
+		                    width: 100rpx;
+		                    text-align: center;
+		                    float: left;
+		                }
+		            }
+		            &.group {
+		                padding: 0 24rpx;
+		                width: 654rpx;
+		                height: auto;
+		                background: #ffffff;
+		                margin-top: 30rpx;
+		                .label {
+		                    line-height: 76rpx;
+		                }
+		                .row-input {
+		                    width: 100%;
+		                    height: 88rpx;
+		                    line-height: 88rpx;
+		                    padding-left: 0;
+		                }
+		                .row-radio {
+		                    float: left;
+		                }
+		                .row-text {
+		                    width: 100rpx;
+		                    text-align: center;
+		                    float: left;
+		                }
+		            }
+		            &.btn {
+		                margin-top: 0;
+		            }
+		            .content-class {
+		                margin: 20rpx auto;
+		                display: flex;
+		                flex-flow: row wrap;
+		                justify-content: space-between;
+		                align-items: center;
+		                &.btn {
+		                    margin: 0 auto;
+		                    margin-left: 116rpx;
+		                }
+		                .row-input {
+		                    display: flex;
+		                    width: 220rpx;
+		                    height: 40rpx;
+		                    padding: 24rpx;
+		                    text-align: left;
+		                    border-radius: 10rpx;
+		                    font-size: $font-size-28;
+		                    color: $text-color;
+		                }
+		                .confirm-btn {
+		                    width: 200rpx;
+		                    height: 88rpx;
+		                    border-radius: 10rpx;
+		                    line-height: 88rpx;
+		                    text-align: center;
+		                    &.other {
+		                        width: 213rpx;
+		                    }
+		                    &.none {
+		                        color: #ffffff;
+		                        background: $btn-confirm;
+		                    }
+		                    &.disabled {
+		                        color: #999999;
+		                    }
+		                }
+		                .item {
+		                    width: 155rpx;
+		                    height: 60rpx;
+		                    font-size: $font-size-28;
+		                    line-height: 60rpx;
+		                    border-radius: 10rpx;
+		                    margin: 10rpx;
+		                    text-align: center;
+		                    box-sizing: border-box;
+		                    border: 1rpx solid #efefef;
+		                    float: left;
+		                    checkbox {
+		                        display: none;
+		                    }
+		                }
+		                .on {
+		                    border-color: $color-system;
+		                    color: $color-system;
+		                }
+		            }
+		        }
+		        .row-login {
+		            flex: 1;
+		            font-size: $font-size-28;
+		            color: $text-color;
+		            text-align: left;
+		        }
+		        .row-logincode {
+		            flex: 1;
+		            font-size: $font-size-28;
+		            color: $text-color;
+		            text-align: right;
+		        }
+		        .icon-xiayibu {
+		            width: 88rpx;
+		            height: 88rpx;
+		            position: absolute;
+		            right: 0;
+		            top: 0;
+		            line-height: 88rpx;
+		            text-align: center;
+		        }
+		        &.text-textarea {
+		            background: #ffffff;
+		            .textarea {
+		                width: 654rpx;
+		                height: 180rpx;
+		                background: #f7f7f7;
+		                padding: 24rpx;
+		                font-size: $font-size-28;
+		                color: $text-color;
+		                z-index: 1;
+		                border-radius: 14rpx;
+		            }
+		            .textarea.hide {
+		                opacity: 0;
+		            }
+		            .textarea.show {
+		                color: #999999;
+		            }
+		        }
+		    }
+		    .register-picture {
+		        height: 102rpx;
+		        margin: 30rpx 0;
+		        width: 42%;
+		        float: left;
+		        &.zz {
+		            width: 100%;
+		        }
+		        .label {
+		            float: left;
+		            font-size: $font-size-28;
+		            color: $text-color;
+		            line-height: 102rpx;
+		            width: 150rpx;
+		            text-align: right;
+		            &.zz {
+		                width: 230rpx;
+		            }
+		        }
+		        .upload-picture {
+		            float: left;
+		            height: 100rpx;
+		            .upload-none {
+		                width: 100rpx;
+		                height: 100rpx;
+		                text-align: center;
+		                line-height: 100rpx;
+		                color: #999999;
+		                border: 1px solid #999999;
+		                border-radius: 10rpx;
+		                margin: 0 20rpx;
+		                .iconfont {
+		                    font-size: $font-size-28;
+		                }
+		            }
+		            .upload-image {
+		                width: 100rpx;
+		                height: 100rpx;
+		                border-radius: 10rpx;
+		                margin: 0 20rpx;
+		                position: relative;
+		                image {
+		                    width: 100rpx;
+		                    height: 100rpx;
+		                    border-radius: 10rpx;
+		                }
+		                .upload-del {
+		                    width: 40rpx;
+		                    height: 40rpx;
+		                    position: absolute;
+		                    top: -20rpx;
+		                    right: -20rpx;
+		                    line-height: 40rpx;
+		                    text-align: center;
+		                    .iconfont {
+		                        font-size: $font-size-32;
+		                        color: #999999;
+		                    }
+		                }
+		            }
+		        }
+		    }
+		    .register-input {
+		        width: 654rpx;
+		        height: 40rpx;
+		        padding: 24rpx;
+		        margin: 0 auto;
+		        margin-bottom: 60rpx;
+		        background: #f7f7f7;
+		        border-radius: 14rpx;
+		        .input {
+		            width: 100%;
+		            height: 100%;
+		            background: #f7f7f7;
+		            font-size: $font-size-28;
+		            line-height: 40rpx;
+		            color: #333333;
+		            border-radius: 14rpx;
+		        }
+		    }
+		    .register-fiexd {
+		        width: 100%;
+		        height: auto;
+		        position: fixed;
+		        bottom: 0;
+		        left: 0;
+		        z-index: 999;
+		        background: #ffffff;
+		    }
+		    .register-btn {
+		        width: 100%;
+		        height: 88rpx;
+		        border-radius: 44rpx;
+		        font-size: $font-size-28;
+		        line-height: 88rpx;
+		        color: #ffffff;
+		        margin: 0 auto;
+		        text-align: center;
+		        background: $btn-confirm;
+		        margin-top: 96rpx;
+		        &.none {
+		            border: 1px solid $color-system;
+		            background: #ffffff;
+		            color: $color-system;
+		            margin-top: 0;
+		        }
+		        &.sub {
+		            margin-top: 0;
+		        }
+		    }
+		}
+	}
+</style>

+ 19 - 6
pages/seller/login/register-select.vue

@@ -15,7 +15,10 @@
 					<view class="text">资质机构</view> <view class="text none">(原会员机构)</view>
 				</view>
 			</view>
-			<view class="main-item-text"> 提示:请尽量搜集客户完整信息,优先注册资质机构 </view>
+			<view class="main-item-text" v-if="insideFLag === 1" @click.stop="this.$api.navigateTo('/pages/seller/login/register-invite')"> 
+				邀请机构注册 
+				<text class="iconfont icon-youjiantou"></text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -23,11 +26,21 @@
 <script>
 export default {
 	data() {
-		return {}
+		return {
+			insideFLag:0
+		}
+	},
+	onLoad() {
+		this.initGetStotage()
 	},
-	onLoad(option) {},
 	computed: {},
-	methods: {}
+	methods: {
+		async initGetStotage() {
+			// 初始化
+			const userInfo = await this.$api.getStorage()
+			this.insideFLag = userInfo.insideFLag ? userInfo.insideFLag : 0
+		}
+	}
 }
 </script>
 
@@ -48,9 +61,9 @@ export default {
 			box-sizing: border-box;
 			margin-top: 150rpx;
 			text-align: center;
-			font-size: 24rpx;
+			font-size: 28rpx;
 			line-height: 100rpx;
-			color: #fea785;
+			color: #FF5B00;
 		}
 		.main-item {
 			width: 100%;

+ 1 - 1
services/config.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002'    //陈凯联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com'
     URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'

+ 582 - 559
services/product.service.js

@@ -1,559 +1,582 @@
-/**
- * 这是与购物有关的业务逻辑的服务
- */
-export default class ProductService {
-    constructor(AjaxService) {
-        Object.assign(this, { AjaxService })
-        this.name = 'ProductService'
-    }
-    /**
-	 * @商城首页-常用商品列表
-	 * @param:userId 用户ID(未登录传0或者''),
-	 * @param:preferredFlag 新品上线(001) 优惠商品(010) 常用商品(100),,
-	 * @param:pageNum 页码
-	 * @param:pageSize 每页条数
-	 */
-    queryProductPreferred (data = {}) {
-        return this.AjaxService.get({ url:'/product/preferred', data, isLoading: false })
-    }
-    /**
-	 * @分类-商品列表
-	 * @param:userId 用户ID(未登录传0或者''),
-	 * @param:bigTypeID 
-	 * @param:smallTypeID, 
-	 * @param:tinyTypeID 
-	 * @param:sortType 
-	 * @param:pageNum 页码
-	 * @param:pageSize 每页条数
-	 */
-    GetProductListByTypeID(data = {}) {
-        return this.AjaxService.get({ url:'/product/listByTypeID', data, isLoading: false })
-    }
-    /**
-	 * @商品列表-查询商品价格
-	 * @param:userId 用户ID(未登录传0或者'')
-	 * @param:productID 商品ID','符号拼接
-	 */
-    querySearchProductPrice (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/price/list',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-	
-    /**
-	 * @查询凑单商品页初始化
-	 * @param:promotionsId 促销ID
-	 */
-    queryProductPromotionInfo (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/promotions/info',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @查询凑单商品列表
-	 * @param:promotionsId 促销ID
-	 * @param:pageSize 查询条数
-	 * @param:pageNum 查询页数
-	 */
-    queryProductPromotionList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/promotions/product',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-	
-    /**
-	 * @商品详情-查询商品详情
-	 * @param:userId 用户ID(未登录传0或者'')
-	 * @param:productIds 商品ID
-	 */
-    QueryProductDetils (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/product/details',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @商品详情-查看相关优惠券
-	 * @param:userId 用户ID(未登录传0或者'')
-	 * @param:productId 商品ID
-	 * @param:source 来源 1 WWW  2小程序
-	 * @param:status 优惠券领取状态 1 未领取  2 已领取
-	 */
-    QueryProductDetilsCoupons (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/details/coupons',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @商品详情-相关推荐
-	 * @param:productIds 商品ID
-	 */
-    queryProductDetilsRelevant (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/detail/recommend', 
-            data, 
-            isLoading: false ,
-        })
-    }
-	
-    /**
-	 * @加入购物车
-	 * @param:userId 用户ID(必填)
-	 * @param:productID 用户ID(必填)
-	 * @param:productCount 商品数量(必填)
-	 */
-    shoppingAddCart (data = {}) {
-        return this.AjaxService.post({
-            url:'/order/club/cart/add',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @批量加入购物车
-	 * @param:userId 用户ID(必填)
-	 * @param:productInfo 商品及数量信息:[// 商品Id 数量]
-	 */
-    ShoppingAddCarts (data = {}) {
-        return this.AjaxService.post({
-            url:'/order/club/cart/add/bulk',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @机构添加购物车替换Sku
-	 * @param:userId 用户ID(必填)
-	 */
-    ShoppingCheckSku (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/order/club/check/sku', 
-	        data, 
-	        isLoading: false ,
-	          
-	    })
-    }
-    /**
-	 * @查询购物车数量
-	 * @param:userId 用户ID(必填)
-	 */
-    ProductCartNumber (data = {}) {
-        return this.AjaxService.get({
-            url:'/order/club/cart/count',
-            data,
-            isLoading: false ,
-        })
-    }
-	
-    /**
-	 * @购物车列表
-	 * @param:userId 用户ID(必填)
-	 */
-    QueryShoppingCartList (data = {}) {
-        return this.AjaxService.get({
-            url:'/order/club/cart/list',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-	
-    /**
-	 * @更新购物车加减数量
-	 * @param:userId 用户ID(必填)
-	 */
-    ShoppingCartUpdate (data = {}) {
-        return this.AjaxService.post({
-            url:'/order/club/cart/update',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-	
-    /**
-	 * @购物车领券弹窗优惠券列表
-	 * @param:userId 用户ID(必填)
-	 * @param:shopId 供应商ID(必填)
-	 * @param:source 来源 1 WWW 2小程序
-	 * @param:status 状态 1 未领取 2已领取
-	 */
-    ShoppingCartGetCoupon(data = {}) {
-        return this.AjaxService.get({
-            url:'/order/club/coupon',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @删除购物车商品
-	 * @param:userId 用户ID(必填)
-	 * @param:productIDs 商品ID(用','号拼接)
-	 */
-    ShoppingCartDelete (data = {}) {
-        return this.AjaxService.post({
-            url:'/order/club/cart/delete',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /* 二级列表 */
-    GetPageTopic (data = {}) {
-        return this.AjaxService.get({ url:'/commodity/page/floor', data, isLoading: false })
-    }
-    /* 二级列表banner */
-    GetPageTopicBanner (data = {}) {
-        return this.AjaxService.get({ url:'/commodity/page/floor', data, isLoading: false })
-    }
-    /* 活动专题列表 */
-    GetPromotionsrList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/promotions/list', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /* 搜索项目仪器列表 */
-    GetSearchEquipmentList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/equipment', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /* 项目仪器详情 */
-    GetEquipmentDetails (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/equipment/details', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /* 查询搜索历史记录 */
-    GetProductSearchHistory (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/history', 
-            data, 
-            isLoading: false ,
-        })
-    }
-    /* 添加搜索历史记录 */
-    GetAddProductSearchHistory (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/history/add', 
-            data, 
-            isLoading: true ,
-        })
-    }
-    /* 清除搜索历史记录 */
-    GetDeleteProductSearchHistory (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/history/delete', 
-            data, 
-            isLoading: false ,
-        })
-    }
-    /* 搜索商品列表 */
-    GetProductSearchList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/product', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /* 搜索分类商品列表 */
-    GetSearchProductTypeData (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/search/query/product/type', 
-            data, 
-            isLoading: true,
-              
-        })
-    }
-    /* 搜索分类商品列表 */
-    GetSearchCombinationProduct (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/seller/product/combination', 
-            data, 
-            isLoading: true,
-              
-        })
-    }
-    /* 获取商品评价 */
-    GetProductEvaluate (data = {}) {
-        return this.AjaxService.get({ url:'/product/evaluate', data, isLoading: false })
-    }
-    /* 获取再次购买商品列表 */
-    GetRepeatBuyAgainProductList (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/product/repeat', 
-            data, 
-            isLoading: true ,
-              
-        })
-    }
-    /* 新商品搜索查询商品阶梯价格 */
-    GetSearchProductLadderPrice (data = {}) {
-        return this.AjaxService.get({ 
-            url:'/commodity/price/ladder', 
-            data, 
-            isLoading: false,
-              
-        })
-    }
-    /* 获取分类导航 */
-    GetProductClassify (data = {}) {
-        return this.AjaxService.get({ url:'/product/classify', data, isLoading: true })
-    }
-    /* 获取小程序三个模块商品列表 */
-    GetProductPreferred (data = {}) {
-        return this.AjaxService.get({ url:'/product/preferred', data, isLoading: true })
-    }
-    /* 发票信息回显 */
-    GetPersonalCenterFindInvoice (data = {}) {
-        return this.AjaxService.get({ url:'/personalCenter/findInvoice', data, isLoading: false })
-    }
-    /* 发票信息保存 */
-    GetPersonalCenterInvoice (data = {}) {
-        return this.AjaxService.post({ url:'/personalCenter/invoice', data, isLoading: true })
-    }
-    /**
-	 * @优惠券-是定商品活动页列表
-	 * @param:userId 用户userId(未登录传0)
-	 * @param:pageNum 页码
-	 * @param:pageSize 每页条数
-	 * @param:couponId 优惠券ID
-	 */
-    QueryCouponActivityList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/activity/page',
-            data,
-            isLoading: true,
-              
-        })
-    }
-    /**
-	 * @优惠券-个人中心优惠券列表
-	 * @param:userId 用户userId(必传)
-	 * @param:pageNum 页码
-	 * @param:pageSize 每页条数
-	 * @param:status 使用状态 1未使用 2已使用 3已失效
-	 */
-    QueryCouponCenter (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/center',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @优惠券-领取中心优惠券列表
-	 * @param:userId 用户userId(未登录传0)
-	 * @param:pageNum 每页页码
-	 * @param:pageSize 条数
-	 */
-    QueryCouponCollarList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/collar/list',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @优惠券-美博会优惠券列表
-	 * @param:userId 用户userId(未登录传0)
-	 * @param:pageNum 每页页码
-	 * @param:pageSize 条数
-	 */
-    QueryCouponCenterList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/center/list',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @优惠券-协销价值优惠券列表
-	 * @param:pageNum 每页页码
-	 * @param:pageSize 条数
-	 */
-    QueryMoneyCouponList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/money/coupon/list',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @优惠券-根据优惠券查询优惠券详细信息
-	 * @param:couponId 优惠券Id
-	 */
-    QueryCouponDetail (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/coupon/detail',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @优惠券-领取优惠券
-	 * @param:userId 用户userId
-	 * @param:couponId 优惠券Id
-	 * @param:source 来源: 1WWW 2小程序
-	 */
-    ReceiveCoupon (data = {}) {
-        return this.AjaxService.post({
-            url:'/commodity/coupon/collar',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @优惠券-兑换优惠券
-	 * @param:userId 用户userId
-	 * @param:redemptionCode 优惠券兑换码
-	 * @param:source 来源: 1WWW 2小程序
-	 */
-    ExchangeCoupon (data = {}) {
-        return this.AjaxService.post({
-            url:'/commodity/coupon/redeem',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @优惠券-我的优惠券数量统计
-	 * @param:userId 用户userId(必传)
-	 */
-    QueryCouponsCount (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/coupon/coupons/count',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @商品收藏-操作
-	 * @param:userId 用户userId(必传)
-	 * @param:productId 商品Id
-	 */
-    getProductUserLike (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/userLike/likeOne',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @商品收藏-列表
-	 * @param:userId 用户userId(必传)
-	 * @param:pageNum 页码
-	 * @param:pageSize 条数
-	 */
-    getProductUserLikeList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/userLike/likeList',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @商品收藏-取消收藏
-	 * @param:userId 用户userId(必传)
-	 * @param:productIDs 商品Id字符串逗号隔开
-	 */
-    getDeleteUserLike (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/userLike/deleteList',
-            data,
-            isLoading: false ,
-              
-        })
-    }
-    /**
-	 * @会员优惠商品
-	 * @param:userId 用户userId(必传)
-	 * @param:productIDs 商品Id字符串逗号隔开
-	 */
-    getSvipProductPage (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/svip/product/page',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @商品详情组合商品列表
-	 * @param:userId 用户userId(必传)
-	 * @param:productId 商品Id字符串逗号隔开
-	 * @param:source 来源 1 网站 2 小程序
-	 */
-    getCommodityCombinationList (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/seller/combination/list',
-            data,
-            isLoading: true ,
-              
-        })
-    }
-    /**
-	 * @搜索筛选项查询商品品牌
-	 * @param:keyword 关键词
-	 * @param:id 分类id
-	 * @param:idtype 1 一级分类 2 二级分类 3 三级分类
-	 * @param:identity 
-	 */
-    getCommoditySearchQUeryBrand (data = {}) {
-        return this.AjaxService.get({
-            url:'/commodity/search/query/brand',
-            data,
-            isloading: true ,
-              
-        })
-    }
-    /**
-	 * @数据统计
-	 * @param:TypeId 1:首页banner;2:直播模块;3:最新活动;4:热门文章;5:新品橱窗;6:活动列表
-	 */
-    sYsStatisticsTypesSatisticsNumber (data = {}) {
-	    return this.AjaxService.get({
-	        url:'/commodity/StatisticsType/statisticsNumber',
-	        data,
-	        isLoading: false ,
-	          
-	    })
-    }
-}
+/**
+ * 这是与购物有关的业务逻辑的服务
+ */
+export default class ProductService {
+    constructor(AjaxService) {
+        Object.assign(this, { AjaxService })
+        this.name = 'ProductService'
+    }
+    /**
+	 * @商城首页-常用商品列表
+	 * @param:userId 用户ID(未登录传0或者''),
+	 * @param:preferredFlag 新品上线(001) 优惠商品(010) 常用商品(100),,
+	 * @param:pageNum 页码
+	 * @param:pageSize 每页条数
+	 */
+    queryProductPreferred (data = {}) {
+        return this.AjaxService.get({ url:'/product/preferred', data, isLoading: false })
+    }
+    /**
+	 * @分类-商品列表
+	 * @param:userId 用户ID(未登录传0或者''),
+	 * @param:bigTypeID 
+	 * @param:smallTypeID, 
+	 * @param:tinyTypeID 
+	 * @param:sortType 
+	 * @param:pageNum 页码
+	 * @param:pageSize 每页条数
+	 */
+    GetProductListByTypeID(data = {}) {
+        return this.AjaxService.get({ url:'/product/listByTypeID', data, isLoading: false })
+    }
+    /**
+	 * @商品列表-查询商品价格
+	 * @param:userId 用户ID(未登录传0或者'')
+	 * @param:productID 商品ID','符号拼接
+	 */
+    querySearchProductPrice (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/price/list',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+	
+    /**
+	 * @查询凑单商品页初始化
+	 * @param:promotionsId 促销ID
+	 */
+    queryProductPromotionInfo (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/promotions/info',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @查询凑单商品列表
+	 * @param:promotionsId 促销ID
+	 * @param:pageSize 查询条数
+	 * @param:pageNum 查询页数
+	 */
+    queryProductPromotionList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/promotions/product',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+	
+    /**
+	 * @商品详情-查询商品详情
+	 * @param:userId 用户ID(未登录传0或者'')
+	 * @param:productIds 商品ID
+	 */
+    QueryProductDetils (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/product/details',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @商品详情-查看相关优惠券
+	 * @param:userId 用户ID(未登录传0或者'')
+	 * @param:productId 商品ID
+	 * @param:source 来源 1 WWW  2小程序
+	 * @param:status 优惠券领取状态 1 未领取  2 已领取
+	 */
+    QueryProductDetilsCoupons (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/details/coupons',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @商品详情-相关推荐
+	 * @param:productIds 商品ID
+	 */
+    queryProductDetilsRelevant (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/detail/recommend', 
+            data, 
+            isLoading: false ,
+        })
+    }
+	
+    /**
+	 * @加入购物车
+	 * @param:userId 用户ID(必填)
+	 * @param:productID 用户ID(必填)
+	 * @param:productCount 商品数量(必填)
+	 */
+    shoppingAddCart (data = {}) {
+        return this.AjaxService.post({
+            url:'/order/club/cart/add',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @批量加入购物车
+	 * @param:userId 用户ID(必填)
+	 * @param:productInfo 商品及数量信息:[// 商品Id 数量]
+	 */
+    ShoppingAddCarts (data = {}) {
+        return this.AjaxService.post({
+            url:'/order/club/cart/add/bulk',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @机构添加购物车替换Sku
+	 * @param:userId 用户ID(必填)
+	 */
+    ShoppingCheckSku (data = {}) {
+	    return this.AjaxService.get({ 
+	        url:'/order/club/check/sku', 
+	        data, 
+	        isLoading: false ,
+	          
+	    })
+    }
+    /**
+	 * @查询购物车数量
+	 * @param:userId 用户ID(必填)
+	 */
+    ProductCartNumber (data = {}) {
+        return this.AjaxService.get({
+            url:'/order/club/cart/count',
+            data,
+            isLoading: false ,
+        })
+    }
+	
+    /**
+	 * @购物车列表
+	 * @param:userId 用户ID(必填)
+	 */
+    QueryShoppingCartList (data = {}) {
+        return this.AjaxService.get({
+            url:'/order/club/cart/list',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+	
+    /**
+	 * @更新购物车加减数量
+	 * @param:userId 用户ID(必填)
+	 */
+    ShoppingCartUpdate (data = {}) {
+        return this.AjaxService.post({
+            url:'/order/club/cart/update',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+	
+    /**
+	 * @购物车领券弹窗优惠券列表
+	 * @param:userId 用户ID(必填)
+	 * @param:shopId 供应商ID(必填)
+	 * @param:source 来源 1 WWW 2小程序
+	 * @param:status 状态 1 未领取 2已领取
+	 */
+    ShoppingCartGetCoupon(data = {}) {
+        return this.AjaxService.get({
+            url:'/order/club/coupon',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @删除购物车商品
+	 * @param:userId 用户ID(必填)
+	 * @param:productIDs 商品ID(用','号拼接)
+	 */
+    ShoppingCartDelete (data = {}) {
+        return this.AjaxService.post({
+            url:'/order/club/cart/delete',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /* 二级列表 */
+    GetPageTopic (data = {}) {
+        return this.AjaxService.get({ url:'/commodity/page/floor', data, isLoading: false })
+    }
+    /* 二级列表banner */
+    GetPageTopicBanner (data = {}) {
+        return this.AjaxService.get({ url:'/commodity/page/floor', data, isLoading: false })
+    }
+    /* 活动专题列表 */
+    GetPromotionsrList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/promotions/list', 
+            data, 
+            isLoading: true ,
+              
+        })
+    }
+    /* 搜索项目仪器列表 */
+    GetSearchEquipmentList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/search/query/equipment', 
+            data, 
+            isLoading: true ,
+              
+        })
+    }
+    /* 项目仪器详情 */
+    GetEquipmentDetails (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/equipment/details', 
+            data, 
+            isLoading: true ,
+              
+        })
+    }
+    /* 查询搜索历史记录 */
+    GetProductSearchHistory (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/search/query/history', 
+            data, 
+            isLoading: false ,
+        })
+    }
+    /* 添加搜索历史记录 */
+    GetAddProductSearchHistory (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/search/query/history/add', 
+            data, 
+            isLoading: true ,
+        })
+    }
+    /* 清除搜索历史记录 */
+    GetDeleteProductSearchHistory (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/search/query/history/delete', 
+            data, 
+            isLoading: false ,
+        })
+    }
+    /* 搜索商品列表 */
+    GetProductSearchList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/search/query/product', 
+            data, 
+            isLoading: true ,
+              
+        })
+    }
+    /* 搜索分类商品列表 */
+    GetSearchProductTypeData (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/search/query/product/type', 
+            data, 
+            isLoading: true,
+              
+        })
+    }
+    /* 搜索分类商品列表 */
+    GetSearchCombinationProduct (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/seller/product/combination', 
+            data, 
+            isLoading: true,
+              
+        })
+    }
+    /* 获取商品评价 */
+    GetProductEvaluate (data = {}) {
+        return this.AjaxService.get({ url:'/product/evaluate', data, isLoading: false })
+    }
+    /* 获取再次购买商品列表 */
+    GetRepeatBuyAgainProductList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/product/repeat', 
+            data, 
+            isLoading: true ,
+              
+        })
+    }
+    /* 新商品搜索查询商品阶梯价格 */
+    GetSearchProductLadderPrice (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/commodity/price/ladder', 
+            data, 
+            isLoading: false,
+              
+        })
+    }
+    /* 获取分类导航 */
+    GetProductClassify (data = {}) {
+        return this.AjaxService.get({ url:'/product/classify', data, isLoading: true })
+    }
+    /* 获取小程序三个模块商品列表 */
+    GetProductPreferred (data = {}) {
+        return this.AjaxService.get({ url:'/product/preferred', data, isLoading: true })
+    }
+    /* 发票信息回显 */
+    GetPersonalCenterFindInvoice (data = {}) {
+        return this.AjaxService.get({ url:'/personalCenter/findInvoice', data, isLoading: false })
+    }
+    /* 发票信息保存 */
+    GetPersonalCenterInvoice (data = {}) {
+        return this.AjaxService.post({ url:'/personalCenter/invoice', data, isLoading: true })
+    }
+    /**
+	 * @优惠券-是定商品活动页列表
+	 * @param:userId 用户userId(未登录传0)
+	 * @param:pageNum 页码
+	 * @param:pageSize 每页条数
+	 * @param:couponId 优惠券ID
+	 */
+    QueryCouponActivityList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/activity/page',
+            data,
+            isLoading: true,
+              
+        })
+    }
+    /**
+	 * @优惠券-个人中心优惠券列表
+	 * @param:userId 用户userId(必传)
+	 * @param:pageNum 页码
+	 * @param:pageSize 每页条数
+	 * @param:status 使用状态 1未使用 2已使用 3已失效
+	 */
+    QueryCouponCenter (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/center',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @优惠券-领取中心优惠券列表
+	 * @param:userId 用户userId(未登录传0)
+	 * @param:pageNum 每页页码
+	 * @param:pageSize 条数
+	 */
+    QueryCouponCollarList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/collar/list',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @优惠券-美博会优惠券列表
+	 * @param:userId 用户userId(未登录传0)
+	 * @param:pageNum 每页页码
+	 * @param:pageSize 条数
+	 */
+    QueryCouponCenterList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/center/list',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @优惠券-协销价值优惠券列表
+	 * @param:pageNum 每页页码
+	 * @param:pageSize 条数
+	 */
+    QueryMoneyCouponList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/money/coupon/list',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @优惠券-根据优惠券查询优惠券详细信息
+	 * @param:couponId 优惠券Id
+	 */
+    QueryCouponDetail (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/coupon/detail',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @优惠券-领取优惠券
+	 * @param:userId 用户userId
+	 * @param:couponId 优惠券Id
+	 * @param:source 来源: 1WWW 2小程序
+	 */
+    ReceiveCoupon (data = {}) {
+        return this.AjaxService.post({
+            url:'/commodity/coupon/collar',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @优惠券-兑换优惠券
+	 * @param:userId 用户userId
+	 * @param:redemptionCode 优惠券兑换码
+	 * @param:source 来源: 1WWW 2小程序
+	 */
+    ExchangeCoupon (data = {}) {
+        return this.AjaxService.post({
+            url:'/commodity/coupon/redeem',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @优惠券-我的优惠券数量统计
+	 * @param:userId 用户userId(必传)
+	 */
+    QueryCouponsCount (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/coupon/coupons/count',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @商品收藏-操作
+	 * @param:userId 用户userId(必传)
+	 * @param:productId 商品Id
+	 */
+    getProductUserLike (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/userLike/likeOne',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @商品收藏-列表
+	 * @param:userId 用户userId(必传)
+	 * @param:pageNum 页码
+	 * @param:pageSize 条数
+	 */
+    getProductUserLikeList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/userLike/likeList',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @商品收藏-取消收藏
+	 * @param:userId 用户userId(必传)
+	 * @param:productIDs 商品Id字符串逗号隔开
+	 */
+    getDeleteUserLike (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/userLike/deleteList',
+            data,
+            isLoading: false ,
+              
+        })
+    }
+    /**
+	 * @会员优惠商品
+	 * @param:userId 用户userId(必传)
+	 * @param:productIDs 商品Id字符串逗号隔开
+	 */
+    getSvipProductPage (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/svip/product/page',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @商品详情组合商品列表
+	 * @param:userId 用户userId(必传)
+	 * @param:productId 商品Id字符串逗号隔开
+	 * @param:source 来源 1 网站 2 小程序
+	 */
+    getCommodityCombinationList (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/seller/combination/list',
+            data,
+            isLoading: true ,
+              
+        })
+    }
+    /**
+	 * @搜索筛选项查询商品品牌
+	 * @param:keyword 关键词
+	 * @param:id 分类id
+	 * @param:idtype 1 一级分类 2 二级分类 3 三级分类
+	 * @param:identity 
+	 */
+    getCommoditySearchQUeryBrand (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/search/query/brand',
+            data,
+            isloading: true ,
+              
+        })
+    }
+    /**
+	 * @数据统计
+	 * @param:TypeId 1:首页banner;2:直播模块;3:最新活动;4:热门文章;5:新品橱窗;6:活动列表
+	 */
+    sYsStatisticsTypesSatisticsNumber (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/commodity/StatisticsType/statisticsNumber',
+	        data,
+	        isLoading: false ,
+	          
+	    })
+    }
+    /**
+     * @模块点击量统计
+     * @param:type  3 活动专区首页, 4 快捷运营菜单, 5 供应商广告图,6 关键词列表,
+     * @param:authorId id
+     */
+    cmsMoudleHits (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/statistics/addPv',
+            data,
+            isLoading: false,
+        })
+    }
+    /**
+     * @搜索词统计
+     * @param:keyword
+     */
+    cmsKeywordHits (data = {}) {
+        return this.AjaxService.get({
+            url:'/commodity/search/query/con/keyword',
+            data,
+            isLoading: false,
+        })
+    }
+}