update

mobile-code/src/b-config.js

@@ -0,0 +1,2 @@
+// 项目配置--由bat脚本变更
+export const ProjectName = 'business'

mobile-code/src/m-manifest.json → mobile-code/src/b-manifest.json

@@ -90,7 +90,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "获取位置信息后为您提供个性化推荐"
+                "desc" : "请点击确定"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.m.huaml.com",
+                    "target": "http://api.b.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/b-pages.json

@@ -0,0 +1,335 @@
+{
+	"pages": [
+		{
+			"path": "admin/home/workbench",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		},
+		{
+			"path": "admin/home/order",
+			"style": {
+				"navigationBarTitleText": "订单"
+			}
+		},
+		{
+			"path": "admin/home/member",
+			"style": {
+				"navigationBarTitleText": "客户"
+			}
+		},
+		{
+			"path": "common/redirect",
+			"style": {
+				"navigationBarTitleText": "加载中..."
+			}
+		},
+		{
+			"path": "common/webview",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "admin/order",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				},
+				{
+					"path": "ship",
+					"style": {
+						"navigationBarTitleText": "发货"
+					}
+				},
+				{
+					"path": "fill-form",
+					"style": {
+						"navigationBarTitleText": "填写收花人"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/member",
+			"pages": [
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加客户"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "客户详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/interest",
+			"pages": [
+				{
+					"path": "invite",
+					"style": {
+						"navigationBarTitleText": "邀请列表"
+					}
+				},
+				{
+					"path": "my-invite",
+					"style": {
+						"navigationBarTitleText": "我的邀请"
+					}
+				},
+				{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "奖励设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/coupon",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/ad",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "广告列表"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加广告"
+					}
+				},
+				{
+					"path": "sel-goods",
+					"style": {
+						"navigationBarTitleText": "商品选择"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/staff",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "员工管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "sel-member",
+					"style": {
+						"navigationBarTitleText": "客户列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/shop",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "店铺管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/setting",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "设置"
+					}
+				},
+				{
+					"path": "wx-menu",
+					"style": {
+						"navigationBarTitleText": "微信菜单设置"
+					}
+				},
+				{
+					"path": "coupon",
+					"style": {
+						"navigationBarTitleText": "新人领券设置"
+					}
+				},
+				{
+					"path": "level",
+					"style": {
+						"navigationBarTitleText": "会员等级设置"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "密码设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/goodsManage",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "商品管理"
+					}
+				},
+				{
+					"path": "category",
+					"style": {
+						"navigationBarTitleText": "分类管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加商品"
+					}
+				},
+				{
+					"path": "img-store",
+					"style": {
+						"navigationBarTitleText": "图库管理"
+					}
+				},
+				{
+					"path": "goods-name",
+					"style": {
+						"navigationBarTitleText": "填写商品信息"
+					}
+				},
+				{
+					"path": "freight",
+					"style": {
+						"navigationBarTitleText": "运费设置"
+					}
+				},
+				{
+					"path": "price-increase",
+					"style": {
+						"navigationBarTitleText": "节假日自动涨价"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/statistics",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "数据统计"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/assets",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "收入明细"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/chat",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "客服",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/template",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "选择模板"
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		// #ifdef H5
+		"navigationStyle": "custom",
+		// #endif
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "花卉宝",
+		"navigationBarTextStyle": "black"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#3385FF",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "admin/home/workbench",
+				"iconPath": "static/images/admin/workbench-no.png",
+				"selectedIconPath": "static/images/admin/workbench-is.png",
+				"text": "工作台"
+			},
+			{
+				"pagePath": "admin/home/order",
+				"iconPath": "static/images/admin/order-no.png",
+				"selectedIconPath": "static/images/admin/order-is.png",
+				"text": "订单"
+			},
+			{
+				"pagePath": "admin/home/member",
+				"iconPath": "static/images/admin/member-no.png",
+				"selectedIconPath": "static/images/admin/member-is.png",
+				"text": "客户"
+			}
+		]
+	}
+}
+

mobile-code/src/m-uni.scss → mobile-code/src/b-uni.scss

@@ -12,7 +12,7 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #FF2842;
+$mainColor: #3385FF;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;
 

mobile-code/src/config.js

@@ -1,2 +1,2 @@
-// 项目配置--由bat脚本变更
-export const ProjectName = 'business'
+// 项目配置--由bat脚本自动变更
+export const ProjectName = 'mobile'

mobile-code/src/m-config.js

@@ -1,2 +0,0 @@
-// 项目配置--由bat脚本自动变更
-export const ProjectName = 'mobile'

mobile-code/src/m-pages.json

@@ -1,203 +0,0 @@
-{
-	"pages": [
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/home/category",
-			"style": {
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/home/shop",
-			"style": {
-				"navigationBarTitleText": "门店"
-			}
-		},
-		{
-			"path": "pages/home/user",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "common/webview",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pages/user",
-			"pages": [
-				{
-					"path": "register",
-					"style": {
-						"navigationBarTitleText": "注册"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/goods",
-			"pages": [
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/pay",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/callback",
-			"pages": [
-				{
-					"path": "index"
-				}
-			]
-		},
-		{
-			"root": "pages/coupon",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/order",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},
-				{
-					"path": "buy",
-					"style": {
-						"navigationBarTitleText": "订单确认"
-					}
-				},
-				{
-					"path": "comment",
-					"style": {
-						"navigationBarTitleText": "评价"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/interest",
-			"pages": [
-				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请排行",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "level",
-					"style": {
-						"navigationBarTitleText": "会员等级",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/chat",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "客服",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		// #ifdef H5
-		"navigationStyle": "custom",
-		// #endif
-		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花卉宝",
-		"navigationBarTextStyle": "black"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/home/index",
-				"iconPath": "static/images/common/home-no.png",
-				"selectedIconPath": "static/images/common/home-is.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/home/category",
-				"iconPath": "static/images/common/category-no.png",
-				"selectedIconPath": "static/images/common/category-is.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/home/shop",
-				"iconPath": "static/images/common/shop-no.png",
-				"selectedIconPath": "static/images/common/shop-is.png",
-				"text": "门店"
-			},
-			{
-				"pagePath": "pages/home/user",
-				"iconPath": "static/images/common/user-no.png",
-				"selectedIconPath": "static/images/common/user-is.png",
-				"text": "我的"
-			}
-		]
-	}
-}
-

mobile-code/src/manifest.json

@@ -90,7 +90,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "请点击确定"
+                "desc" : "获取位置信息后为您提供个性化推荐"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.b.huaml.com",
+                    "target": "http://api.m.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/pages.json

@@ -1,21 +1,27 @@
 {
 	"pages": [
 		{
-			"path": "admin/home/workbench",
+			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "工作台"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "admin/home/order",
+			"path": "pages/home/category",
 			"style": {
-				"navigationBarTitleText": "订单"
+				"navigationBarTitleText": "分类"
 			}
 		},
 		{
-			"path": "admin/home/member",
+			"path": "pages/home/shop",
 			"style": {
-				"navigationBarTitleText": "客户"
+				"navigationBarTitleText": "门店"
+			}
+		},
+		{
+			"path": "pages/home/user",
+			"style": {
+				"navigationBarTitleText": "我的"
 			}
 		},
 		{
@@ -34,242 +40,109 @@
 	],
 	"subPackages": [
 		{
-			"root": "admin/order",
+			"root": "pages/user",
 			"pages": [
 				{
-					"path": "detail",
+					"path": "register",
 					"style": {
-						"navigationBarTitleText": "详情"
+						"navigationBarTitleText": "注册"
 					}
 				},
 				{
-					"path": "ship",
-					"style": {
-						"navigationBarTitleText": "发货"
-					}
-				},
-				{
-					"path": "fill-form",
+					"path": "password",
 					"style": {
-						"navigationBarTitleText": "填写收花人"
+						"navigationBarTitleText": "修改密码"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/member",
+			"root": "pages/goods",
 			"pages": [
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加客户"
-					}
-				},
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "客户详情"
+						"navigationBarTitleText": "详情"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/interest",
+			"root": "pages/pay",
 			"pages": [
 				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请列表"
-					}
-				},
-				{
-					"path": "my-invite",
-					"style": {
-						"navigationBarTitleText": "我的邀请"
-					}
-				},
-				{
-					"path": "setting",
+					"path": "index",
 					"style": {
-						"navigationBarTitleText": "奖励设置"
+						"navigationBarTitleText": ""
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/coupon",
+			"root": "pages/callback",
 			"pages": [
 				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "优惠券"
-					}
+					"path": "index"
 				}
 			]
 		},
 		{
-			"root": "admin/ad",
+			"root": "pages/coupon",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "广告列表"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加广告"
-					}
-				},
-				{
-					"path": "sel-goods",
-					"style": {
-						"navigationBarTitleText": "商品选择"
+						"navigationBarTitleText": "优惠券",
+						"enablePullDownRefresh": true
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/staff",
+			"root": "pages/order",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "员工管理"
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "add",
+					"path": "detail",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "订单列表"
 					}
 				},
 				{
-					"path": "sel-member",
+					"path": "buy",
 					"style": {
-						"navigationBarTitleText": "客户列表"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/shop",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "店铺管理"
+						"navigationBarTitleText": "订单确认"
 					}
 				},
 				{
-					"path": "add",
+					"path": "comment",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "评价"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/setting",
+			"root": "pages/interest",
 			"pages": [
 				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "设置"
-					}
-				},
-				{
-					"path": "wx-menu",
-					"style": {
-						"navigationBarTitleText": "微信菜单设置"
-					}
-				},
-				{
-					"path": "coupon",
+					"path": "invite",
 					"style": {
-						"navigationBarTitleText": "新人领券设置"
+						"navigationBarTitleText": "邀请排行",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "level",
 					"style": {
-						"navigationBarTitleText": "会员等级设置"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "密码设置"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/goodsManage",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "商品管理"
-					}
-				},
-				{
-					"path": "category",
-					"style": {
-						"navigationBarTitleText": "分类管理"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加商品"
-					}
-				},
-				{
-					"path": "img-store",
-					"style": {
-						"navigationBarTitleText": "图库管理"
-					}
-				},
-				{
-					"path": "goods-name",
-					"style": {
-						"navigationBarTitleText": "填写商品信息"
-					}
-				},
-				{
-					"path": "freight",
-					"style": {
-						"navigationBarTitleText": "运费设置"
-					}
-				},
-				{
-					"path": "price-increase",
-					"style": {
-						"navigationBarTitleText": "节假日自动涨价"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/statistics",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "数据统计"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/assets",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "收入明细"
+						"navigationBarTitleText": "会员等级",
+						"enablePullDownRefresh": true
 					}
 				}
 			]
@@ -285,17 +158,6 @@
 					}
 				}
 			]
-		},
-		{
-			"root": "admin/template",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "选择模板"
-					}
-				}
-			]
 		}
 	],
 	"globalStyle": {
@@ -308,26 +170,32 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#3385FF",
+		"selectedColor": "#fa436a",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "admin/home/workbench",
-				"iconPath": "static/images/admin/workbench-no.png",
-				"selectedIconPath": "static/images/admin/workbench-is.png",
-				"text": "工作台"
+				"pagePath": "pages/home/index",
+				"iconPath": "static/images/common/home-no.png",
+				"selectedIconPath": "static/images/common/home-is.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/home/category",
+				"iconPath": "static/images/common/category-no.png",
+				"selectedIconPath": "static/images/common/category-is.png",
+				"text": "分类"
 			},
 			{
-				"pagePath": "admin/home/order",
-				"iconPath": "static/images/admin/order-no.png",
-				"selectedIconPath": "static/images/admin/order-is.png",
-				"text": "订单"
+				"pagePath": "pages/home/shop",
+				"iconPath": "static/images/common/shop-no.png",
+				"selectedIconPath": "static/images/common/shop-is.png",
+				"text": "门店"
 			},
 			{
-				"pagePath": "admin/home/member",
-				"iconPath": "static/images/admin/member-no.png",
-				"selectedIconPath": "static/images/admin/member-is.png",
-				"text": "客户"
+				"pagePath": "pages/home/user",
+				"iconPath": "static/images/common/user-no.png",
+				"selectedIconPath": "static/images/common/user-is.png",
+				"text": "我的"
 			}
 		]
 	}

mobile-code/src/pages/home/user.vue

@@ -20,7 +20,16 @@
 				<div class="is-login-attr">
 					<div class="user-wrap-top">
 						<div class="user-blo-left">
-							<div class="user-name">{{ shopUser.userName }}</div>
+							<div class="user-name-warp">
+								<div class="user-name">{{ shopUser.userName }}</div>
+								<div class="user-level-img">
+									<block v-if="!$util.isEmpty(shopUser)">
+										<!-- <appVipModule v-if="shopUser.member" class="level-img" :text="`VIP${shopUser.member}`" /> -->
+										<!-- <div v-else>普通客户</div> -->
+										<div class="nomal-text">普通客户</div>
+									</block>
+								</div>
+							</div>
 							<div class="user-level">
 								<!-- <div class="user-level-icon">
 									<img src="" alt />
@@ -118,127 +127,129 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-// import AppFooter from '@/components/app-footer'
-import TuiListView from '@/components/plugin/list-view'
-import TuiListCell from '@/components/plugin/list-cell'
-import LoginPopup from '@/pages/home/components/login-popup'
-import AppTrademark from '@/components/module/app-trademark'
-import GoLogin from '@/pages/home/components/go-login.vue'
-import { getMiniAppUrl, isWxBrowser } from '@/utils/common'
-// api
-import { getMerchantInfo } from '@/api/common'
-import { getShopUser } from '@/utils/auth'
-// import { getWxInfo, getWxPhone } from '@/api/mini'
-export default {
-	name: 'user',
-	components: {
-		// AppFooter
-		TuiListView,
-		TuiListCell,
-		LoginPopup,
-		AppTrademark,
-		GoLogin
-	},
-	data() {
-		return {
-			constant: this.$constant,
-			popupShow: false,
-			isPublic: false,
-			stepIndex: 0,
-			wxInfo: {},
-			loginShow: false,
-			merchantInfo: {}
-		}
-	},
-	computed: {
-		...mapGetters({ shopUser: 'getShopUser' }),
-		// #ifdef MP-WEIXIN
-		...mapGetters({ loginInfo: 'getLoginInfo' }),
-		// #endif
-		smallAvatarUrl() {
-			return this.shopUser.smallAvatarUrl || ''
-		},
-		percentNum() {
-			if (this.$util.isEmpty(this.shopUser)) return 0
-			return Math.round((this.shopUser.userAsset.growth / this.shopUser.userAsset.nextLevelGrowth) * 100)
-		}
-	},
-	onLoad(option) {
-		// this.init()
-	},
-	methods: {
-		init() {
-			getShopUser().then(res => {
-				if (this.option.scan == 1 && res.isFull != 1) {
-					this.isPublic = true
-					this.popupShow = true
-				}
-			})
-			getMerchantInfo().then(res => {
-				this.merchantInfo = res.data
-			})
+	import { mapGetters } from 'vuex'
+	// import AppFooter from '@/components/app-footer'
+	import TuiListView from '@/components/plugin/list-view'
+	import TuiListCell from '@/components/plugin/list-cell'
+	import LoginPopup from '@/pages/home/components/login-popup'
+	import AppTrademark from '@/components/module/app-trademark'
+	import GoLogin from '@/pages/home/components/go-login.vue'
+	import AppVipModule from '@/components/module/app-vip'
+	import { getMiniAppUrl, isWxBrowser } from '@/utils/common'
+	// api
+	import { getMerchantInfo } from '@/api/common'
+	import { getShopUser } from '@/utils/auth'
+	// import { getWxInfo, getWxPhone } from '@/api/mini'
+	export default {
+		name: 'user',
+		components: {
+			// AppFooter
+			TuiListView,
+			TuiListCell,
+			LoginPopup,
+			AppTrademark,
+			GoLogin,
+			AppVipModule
 		},
-		// pageTo
-		pageToFn(item) {
-			if (this.$util.isLogin()) {
-				this.$util.pageTo(item)
-			} else {
-				this.loginShow = true
+		data() {
+			return {
+				constant: this.$constant,
+				popupShow: false,
+				isPublic: false,
+				stepIndex: 0,
+				wxInfo: {},
+				loginShow: false,
+				merchantInfo: {}
 			}
 		},
-		showPopup() {
-			// this.popupShow = true
-			// #ifdef H5
-			this.pageTo('/pages/user/register')
-			// if (isWxBrowser()) {
-			// 	location.href = `${this.$constant.hostUrl}/auth/prepare?url=${encodeURIComponent(getMiniAppUrl(this.option, true))}`
-			// }
-			// this.$util.getCheckLogin()
-			// #endif
+		computed: {
+			...mapGetters({ shopUser: 'getShopUser' }),
 			// #ifdef MP-WEIXIN
-			this.popupShow = true
+			...mapGetters({ loginInfo: 'getLoginInfo' }),
 			// #endif
+			smallAvatarUrl() {
+				return this.shopUser.smallAvatarUrl || ''
+			},
+			percentNum() {
+				if (this.$util.isEmpty(this.shopUser)) return 0
+				return Math.round((this.shopUser.userAsset.growth / this.shopUser.userAsset.nextLevelGrowth) * 100)
+			}
 		},
-		hidePopup() {
-			this.popupShow = false
+		onLoad(option) {
+			// this.init()
 		},
-		logoutFn() {
-			uni.clearStorageSync()
-			// #ifdef H5
-			// location.reload()
-			this.$util.pageTo({
-				url: '/pages/home/index',
-				type: 4
-			})
-			// #endif
-			// #ifndef H5
-			this.$util.pageTo({
-				url: '/pages/home/index',
-				type: 4
-			})
-			// #endif
-		},
-		// 获取微信信息
-		// getWxAvatar() {
-		// 	uni.getUserInfo({
-		// 		provider: 'weixin',
-		// 		success: res => {
-		// 			console.log('res', res)
-		// 			// this.popupShow = true
-		// 			getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(subRes => {
-		// 				console.log('用户信息', subRes)
-		// 				this.wxInfo = subRes.data
-		// 				this.popupShow = true
-		// 			})
-		// 		},
-		// 		fail: () => {
-		// 			// this.loading = false
-		// 		}
-		// 	})
-		// }
+		methods: {
+			init() {
+				getShopUser().then(res => {
+					if (this.option.scan == 1 && res.isFull != 1) {
+						this.isPublic = true
+						this.popupShow = true
+					}
+				})
+				getMerchantInfo().then(res => {
+					this.merchantInfo = res.data
+				})
+			},
+			// pageTo
+			pageToFn(item) {
+				if (this.$util.isLogin()) {
+					this.$util.pageTo(item)
+				} else {
+					this.loginShow = true
+				}
+			},
+			showPopup() {
+				// this.popupShow = true
+				// #ifdef H5
+				this.pageTo('/pages/user/register')
+				// if (isWxBrowser()) {
+				// 	location.href = `${this.$constant.hostUrl}/auth/prepare?url=${encodeURIComponent(getMiniAppUrl(this.option, true))}`
+				// }
+				// this.$util.getCheckLogin()
+				// #endif
+				// #ifdef MP-WEIXIN
+				this.popupShow = true
+				// #endif
+			},
+			hidePopup() {
+				this.popupShow = false
+			},
+			logoutFn() {
+				uni.clearStorageSync()
+				// #ifdef H5
+				// location.reload()
+				this.$util.pageTo({
+					url: '/pages/home/index',
+					type: 4
+				})
+				// #endif
+				// #ifndef H5
+				this.$util.pageTo({
+					url: '/pages/home/index',
+					type: 4
+				})
+				// #endif
+			}
+			// 获取微信信息
+			// getWxAvatar() {
+			// 	uni.getUserInfo({
+			// 		provider: 'weixin',
+			// 		success: res => {
+			// 			console.log('res', res)
+			// 			// this.popupShow = true
+			// 			getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(subRes => {
+			// 				console.log('用户信息', subRes)
+			// 				this.wxInfo = subRes.data
+			// 				this.popupShow = true
+			// 			})
+			// 		},
+			// 		fail: () => {
+			// 			// this.loading = false
+			// 		}
+			// 	})
+			// }
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
@@ -265,14 +276,33 @@ export default {
 			padding: 0 20px 0 48px;
 			.user-wrap-top {
 				@include disFlex(center, space-between);
-				.user-name {
-					font-size: 36px;
-					font-weight: 500;
+				.user-name-warp {
+					@include disFlex(center, flex-start);
 					margin-bottom: 16px;
-					color: #fff;
+					.user-name {
+						font-size: 36px;
+						font-weight: 600;
+						color: #fff;
+						margin-right: 20px;
+					}
+					.level-img {
+						/deep/.vip-text {
+							top: 4px;
+							left: 42px;
+							transform: scale(0.8);
+						}
+					}
+					.nomal-text {
+						font-size: 24px;
+						padding: 2px 10px;
+						color: #f7f7f7;
+						border: 1px solid #f7f7f7;
+						display: inline-block;
+						border-radius: 50px;
+					}
 				}
 				.user-level {
-					@include disFlex(center, center);
+					@include disFlex(center, flex-start);
 				}
 				.user-blo-right {
 					margin-right: 30px;

mobile-code/src/uni.scss

@@ -12,7 +12,7 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #3385FF;
+$mainColor: #FF2842;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;