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/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/callback/index.vue

@@ -38,6 +38,17 @@
 				<block v-else-if="pagestatus == 4">
 					<div class="app-color-2">谢谢您，我还会继续努力么么哒~</div>
 				</block>
+				<!-- 提交成功 -->
+				<block v-else-if="pagestatus == 6">
+					<div class="call-back-wrap">
+						<div class="qr-code-img">
+							<img :src="shopUser.smallWxQrCodeUrl" alt="二维码" mode="widthFix" />
+						</div>
+						<div class="app-color-2">最后一步</div>
+						<div class="app-color-2">识别二维码并关注公众号</div>
+					</div>
+				</block>
+				<!-- ======================= 按钮块 ======================== -->
 				<!-- 一个主按钮 -->
 				<!-- 待支付 -->
 				<block v-if="pagestatus == 1 || pagestatus == 2">
@@ -98,6 +109,7 @@
 	 * @parmas 3 支付成功 -- successPay
 	 * @parmas 4 评价成功 -- successEval
 	 * @parmas 5 支付成功 - 扫码支付 -- successPayCode
+	 * @parmas 6 申请成功 - 申请会员 -- registerMember
 	 */
 import { mapGetters } from 'vuex'
 import ModalModule from '@/components/plugin/modal'
@@ -134,9 +146,9 @@ export default {
 		}
 	},
 	onLoad() {
-		if (this.pagestatus) {
-			this.init()
-		}
+		// if (this.pagestatus) {
+		// 	this.init()
+		// }
 	},
 	methods: {
 		init() {
@@ -231,6 +243,10 @@ export default {
 					this.pageTit = '支付成功'
 					this.contentClass = 'successPayCode'
 					break
+				case '6':
+					this.pageTit = '提交成功'
+					this.contentClass = 'registerMember'
+					break
 				default:
 					this.pageTit = '支付成功'
 					this.contentClass = 'awaitPayYe'
@@ -332,6 +348,7 @@ export default {
 		}
 	}
 	// 待支付 - 余额
+	.registerMember,
 	.successPay,
 	.successPayCode,
 	.successEval {
@@ -341,4 +358,21 @@ export default {
 			margin-bottom: 52px;
 		}
 	}
+	// 提交成功
+	.registerMember {
+		.call-back-wrap {
+			.qr-code-img {
+				width: 300px;
+				height: 300px;
+				margin: 20px auto;
+				img {
+					height: 100%;
+				}
+			}
+			.app-color-2 {
+				font-size: 30px;
+				margin-bottom: 20px;
+			}
+		}
+	}
 </style>

mobile-code/src/pages/home/components/login-popup.vue

@@ -23,7 +23,7 @@
 					<button class="button-com red big mini-btn" open-type="getUserInfo" @getuserinfo="getWxAvatar">点击创建头像</button>
 				</div>
 				<!-- <div class="creat-account-btn" v-else>
-					<button class="button-com red big mini-btn" open-type="getPhoneNumber" @getphonenumber="getWxMobile" :plain="true">点击生成手机号</button> -->
+				<button class="button-com red big mini-btn" open-type="getPhoneNumber" @getphonenumber="getWxMobile" :plain="true">点击生成手机号</button>-->
 				<!-- </div> -->
 				<!-- #endif -->
 			</template>
@@ -49,7 +49,14 @@
 						<official-account @binderror="officialErr"></official-account>
 					</block>
 					<block v-else>
-						<button class="button-com red big" @click="hidePopup">完成</button>
+						<div class="wx-public-content">
+							<div class="wx-text-wrap">
+								<div class="app-color-2">请搜索公众号</div>
+								<div class="app-color-1">am</div>
+								<div class="app-color-2">关注即升级为会员</div>
+							</div>
+							<button class="button-com red big" @click="copyFn">复制</button>
+						</div>
 					</block>
 					<!-- <div class="app-color-3">国兰华尚关联的公众号</div>
 					<div class="flex-center-between">
@@ -63,7 +70,7 @@
 							</div>
 						</div>
 						<button class="button-com wx-public-btn">查看</button>
-					</div> -->
+					</div>-->
 				</div>
 				<!-- #endif -->
 			</template>
@@ -72,107 +79,120 @@
 </template>
 
 <script>
-import AppStep from '@/components/app-step'
-import BottomPopup from '@/components/plugin/bottom-popup'
-import AppClose from '@/components/module/app-close'
-// api
-import { getUser, wxLoginFn } from '@/utils/auth'
-import { getWxInfo, getWxPhone } from '@/api/mini'
-export default {
-	name: 'login-popup-module',
-	components: {
-		AppStep,
-		BottomPopup,
-		AppClose
-	},
-	props: {
-		// stepIndex: {
-		// 	type: Number,
-		// 	default: 0
-		// },
-		show: {
-			type: Boolean,
-			default: false
-		},
-		info: {
-			type: Object,
-			default: () => {}
+	import AppStep from '@/components/app-step'
+	import BottomPopup from '@/components/plugin/bottom-popup'
+	import AppClose from '@/components/module/app-close'
+	// api
+	import { getUser, wxLoginFn } from '@/utils/auth'
+	import { getWxInfo, getWxPhone } from '@/api/mini'
+	export default {
+		name: 'login-popup-module',
+		components: {
+			AppStep,
+			BottomPopup,
+			AppClose
 		},
-		isPublic: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			constant: this.$constant,
-			stepIndex: 0,
-			wxPhoneInfo: '',
-			wxInfo: {}
-		}
-	},
-	methods: {
-		hidePopup() {
-			this.$emit('hide')
-			this.stepIndex = 0
+		props: {
+			// stepIndex: {
+			// 	type: Number,
+			// 	default: 0
+			// },
+			show: {
+				type: Boolean,
+				default: false
+			},
+			info: {
+				type: Object,
+				default: () => {}
+			},
+			isPublic: {
+				type: Boolean,
+				default: false
+			}
 		},
-		registerFn() {
-			this.$util.getCheckLogin()
+		data() {
+			return {
+				constant: this.$constant,
+				stepIndex: 2,
+				wxPhoneInfo: '',
+				wxInfo: {}
+			}
 		},
-		// 获取微信信息
-		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)
+		methods: {
+			hidePopup() {
+				this.$emit('hide')
+				this.stepIndex = 0
+			},
+			registerFn() {
+				this.$util.getCheckLogin()
+			},
+			// 获取微信信息
+			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)
+							uni.showToast({
+								icon: 'success'
+							})
+							this.wxInfo = subRes.data
+							// this.$msg('创建用户信息成功！')
+							// this.popupShow = true
+							setTimeout(() => {
+								this.stepIndex = 1
+							}, 1000)
+						})
+					},
+					fail: () => {
+						// this.loading = false
+					}
+				})
+			},
+			// 获取微信手机号
+			getWxMobile(e) {
+				console.log(e)
+				if (e.detail.errMsg === 'getPhoneNumber:ok') {
+					getWxPhone({ iv: e.detail.iv, encryptedData: e.detail.encryptedData }).then(res => {
+						console.log('用户信息', res)
 						uni.showToast({
 							icon: 'success'
 						})
-						this.wxInfo = subRes.data
-						// this.$msg('创建用户信息成功！')
-						// this.popupShow = true
+						this.wxPhoneInfo = res.data.mobile
+						wxLoginFn(true)
+
 						setTimeout(() => {
-							this.stepIndex = 1
+							this.stepIndex = 2
 						}, 1000)
 					})
-				},
-				fail: () => {
-					// this.loading = false
+				} else {
+					this.$msg('获取信息失败！')
 				}
-			})
-		},
-		// 获取微信手机号
-		getWxMobile(e) {
-			console.log(e)
-			if (e.detail.errMsg === 'getPhoneNumber:ok') {
-				getWxPhone({ iv: e.detail.iv, encryptedData: e.detail.encryptedData }).then(res => {
-					console.log('用户信息', res)
-					uni.showToast({
-						icon: 'success'
-					})
-					this.wxPhoneInfo = res.data.mobile
-					wxLoginFn(true)
-					
-					setTimeout(() => {
-						this.stepIndex = 2
-					}, 1000)
+			},
+			// 关注公众号
+			attentionPublish() {
+				this.stepIndex = 2
+			},
+			officialErr(e) {
+				console.log('关注公众号组件', e)
+			},
+			// 复制
+			copyFn() {
+				uni.setClipboardData({
+					data: 'am',
+					success: () => {
+						this.$msg('复制成功，请前往关注公众号！')
+						this.hidePopup()
+					},
+					fail: () => {
+						this.$msg('复制失败，请重试！')
+					}
 				})
-			} else {
-				this.$msg('获取信息失败！')
 			}
-		},
-		// 关注公众号
-		attentionPublish() {
-			this.stepIndex = 2
-		},
-		officialErr(e) {
-			console.log('关注公众号组件', e)
 		}
 	}
-}
 </script>
 
 <style lang='scss' scoped>
@@ -234,9 +254,13 @@ export default {
 			.wx-public-wrap {
 				width: 90%;
 				padding: 10px 16px 28px;
-				box-shadow: 2px 2px 10px #eee;
-				margin: 130px auto 194px;
+				// box-shadow: 2px 2px 10px #eee;
+				// margin: 130px auto 194px;
+				margin: 0 auto;
+				height: 480px;
 				border-radius: 10px;
+				display: flex;
+				align-items: center;
 				.flex-center-between {
 					margin-top: 22px;
 					.wx-public-left {
@@ -262,6 +286,17 @@ export default {
 					}
 				}
 
+				.wx-public-content {
+					width: 100%;
+					.wx-text-wrap {
+						div {
+							font-size: 26px;
+							text-align: center;
+							margin-bottom: 20px;
+						}
+					}
+				}
+
 				.button-com {
 					width: 90%;
 					margin: 20px 5% 0;

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

@@ -142,7 +142,7 @@ export default {
 	data() {
 		return {
 			constant: this.$constant,
-			popupShow: false,
+			popupShow: true,
 			isPublic: false,
 			stepIndex: 0,
 			wxInfo: {},