update

mobile-code/src/admin/home/workbench.vue

@@ -69,200 +69,228 @@
 			</div>
 		</div>
 		<!-- <fab-module /> -->
+		<!-- 续费遮罩层 -->
+		<modal-module :show="renewMask" :custom="true" :maskClosable="false" padding="30rpx 30rpx">
+			<template>
+				<div class="renew-wrap">
+					<div class="renew-wrap-text">你的账号已到期</div>
+					<!-- <button class="admin-button-com middle" @click="pageTo('/admin/renew/index')">立即续费</button> -->
+					<button class="admin-button-com middle" @click="renewFn()">立即续费</button>
+				</div>
+			</template>
+		</modal-module>
 	</div>
 </template>
 
 <script>
-import FabModule from '@/components/plugin/fab'
-import AppAvatarModule from '@/components/module/app-avatar'
-// api
-import { consoleIndex } from '@/api/workbench'
-export default {
-	name: 'admin-workbench',
-	components: {
-		FabModule,
-		AppAvatarModule
-	},
-	data() {
-		return {
-			constant: this.$constant,
-			data: {
-				admin: {},
-				asset: {},
-				notice: {},
-				todayData: {}
-			},
-			// 订单总览
-			orderData: [
-				{
-					name: '待付款',
-					value: 0,
-					url: '/admin/home/order',
-					type: 4,
-					query: {
-						tabIndex: 1
-					}
+	import { mapGetters, mapState } from 'vuex'
+	import FabModule from '@/components/plugin/fab'
+	import AppAvatarModule from '@/components/module/app-avatar'
+	import ModalModule from '@/components/plugin/modal'
+	import { getDataTimestamp, getFirstHost } from '@/utils/common'
+	// api
+	import { getUser } from '@/utils/auth'
+	import { consoleIndex } from '@/api/workbench'
+	export default {
+		name: 'admin-workbench',
+		components: {
+			ModalModule,
+			FabModule,
+			AppAvatarModule
+		},
+		data() {
+			return {
+				constant: this.$constant,
+				// 遮罩层
+				renewMask: false,
+				data: {
+					admin: {},
+					asset: {},
+					notice: {},
+					todayData: {}
 				},
-				{
-					name: '待配送',
-					value: 0,
-					url: '/admin/home/order',
-					type: 4,
-					query: {
-						tabIndex: 2
+				// 订单总览
+				orderData: [
+					{
+						name: '待付款',
+						value: 0,
+						url: '/admin/home/order',
+						type: 4,
+						query: {
+							tabIndex: 1
+						}
+					},
+					{
+						name: '待配送',
+						value: 0,
+						url: '/admin/home/order',
+						type: 4,
+						query: {
+							tabIndex: 2
+						}
+					},
+					{
+						name: '配送中',
+						value: 0,
+						url: '/admin/home/order',
+						type: 4,
+						query: {
+							tabIndex: 3
+						}
+					},
+					{
+						name: '待通知',
+						value: 0
+					},
+					{
+						name: '已完结',
+						url: '/admin/home/order',
+						type: 4,
+						query: {
+							tabIndex: 4
+						},
+						value: 0
+					},
+					{
+						name: '全部',
+						url: '/admin/home/order',
+						type: 4,
+						query: {
+							tabIndex: 0
+						},
+						value: 0
 					}
-				},
-				{
-					name: '配送中',
-					value: 0,
-					url: '/admin/home/order',
-					type: 4,
-					query: {
-						tabIndex: 3
+				],
+				// tab按钮
+				tabsData: [
+					{
+						name: '商品管理',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
+						url: '/admin/goodsManage/list'
+					},
+					{
+						name: '邀请有礼',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-2.png`,
+						url: '/admin/interest/invite'
+					},
+					{
+						name: '图库管理',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
+						url: '/admin/goodsManage/img-store'
+					},
+					{
+						name: '优惠券',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-3.png`,
+						url: '/admin/coupon/list'
+					},
+					{
+						name: '广告管理',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-4.png`,
+						url: '/admin/ad/list'
+					},
+					{
+						name: '数据统计',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-5.png`,
+						url: '/admin/statistics/index'
+					},
+					{
+						name: '员工管理',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-6.png`,
+						url: '/admin/staff/list'
+					},
+					{
+						name: '我的代理',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-7.png`,
+						url: '/admin/interest/my-invite'
+					},
+					{
+						name: '设置',
+						img: `${this.$constant.imgUrl}/retail/admin/tab-icon-8.png`,
+						url: '/admin/setting/list'
 					}
-				},
-				{
-					name: '待通知',
-					value: 0
-				},
-				{
-					name: '已完结',
-					url: '/admin/home/order',
-					type: 4,
-					query: {
-						tabIndex: 4
+				],
+				// 总览
+				totalData: [
+					{
+						name: '客户数',
+						value: 0
 					},
-					value: 0
-				},
-				{
-					name: '全部',
-					url: '/admin/home/order',
-					type: 4,
-					query: {
-						tabIndex: 0
+					{
+						name: '粉丝数',
+						value: 0
 					},
-					value: 0
-				}
-			],
-			// tab按钮
-			tabsData: [
-				{
-					name: '商品管理',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
-					url: '/admin/goodsManage/list'
-				},
-				{
-					name: '邀请有礼',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-2.png`,
-					url: '/admin/interest/invite'
-				},
-				{
-					name: '图库管理',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
-					url: '/admin/goodsManage/img-store'
-				},
-				{
-					name: '优惠券',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-3.png`,
-					url: '/admin/coupon/list'
-				},
-				{
-					name: '广告管理',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-4.png`,
-					url: '/admin/ad/list'
-				},
-				{
-					name: '数据统计',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-5.png`,
-					url: '/admin/statistics/index'
-				},
-				{
-					name: '员工管理',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-6.png`,
-					url: '/admin/staff/list'
-				},
-				{
-					name: '我的代理',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-7.png`,
-					url: '/admin/interest/my-invite'
-				},
-				{
-					name: '设置',
-					img: `${this.$constant.imgUrl}/retail/admin/tab-icon-8.png`,
-					url: '/admin/setting/list'
-				}
-			],
-			// 总览
-			totalData: [
-				{
-					name: '客户数',
-					value: 0
-				},
-				{
-					name: '粉丝数',
-					value: 0
-				},
-				{
-					name: '会员数',
-					value: 0
-				},
-				{
-					name: '总收入（元）',
-					value: 0
-				},
-				{
-					name: '总访问量',
-					value: 0
-				},
-				{
-					name: '剩余短信',
-					value: 0
-				}
-			]
-		}
-	},
-	computed: {
-		avatarImg() {
-			return this.$util.isEmpty(this.userInfo) ? '' : this.userInfo.logoUrl
-		}
-	},
-	onLoad(option) {
-		// if (this.$util.getCheckLogin()) return
-		// this.init()
-	},
-	methods: {
-		init() {
-			consoleIndex().then(res => {
-				this.data = res.data
-				const { asset } = res.data
-				if (!this.$util.isEmpty(asset)) {
-					// 订单总览
-					this.orderData[0].value = asset.unPayOrder
-					this.orderData[1].value = asset.unSendOrder
-					this.orderData[2].value = asset.sendingOrder
-					this.orderData[3].value = asset.unNoticeOrder
-					this.orderData[4].value = asset.finishOrder
-					this.orderData[5].value = asset.totalOrder
-					// 总览数据
-					this.totalData[0].value = asset.totalMember
-					this.totalData[1].value = asset.totalFans
-					this.totalData[2].value = asset.totalUser
-					this.totalData[3].value = asset.totalIncome
-					this.totalData[4].value = asset.totalVisit
-					this.totalData[5].value = asset.remainSmsNum
-				}
-			})
+					{
+						name: '会员数',
+						value: 0
+					},
+					{
+						name: '总收入（元）',
+						value: 0
+					},
+					{
+						name: '总访问量',
+						value: 0
+					},
+					{
+						name: '剩余短信',
+						value: 0
+					}
+				]
+			}
 		},
-		// 跳转
-		pageToFn(item) {
-			// #ifdef H5
-			location.href = item.url
-			// #endif
-			// #ifndef H5
-			// #endif
+		computed: {
+			...mapGetters({ userInfo: 'getUser' }),
+			avatarImg() {
+				return this.$util.isEmpty(this.userInfo) ? '' : this.userInfo.logoUrl
+			}
+		},
+		onLoad(option) {
+			// if (this.$util.getCheckLogin()) return
+			// this.init()
+		},
+		methods: {
+			init() {
+				getUser().then(res => {
+					let nowTime = getDataTimestamp(new Date(), true)
+					if (nowTime > res.setDeadline) {
+						this.renewMask = true
+					}
+				})
+				consoleIndex().then(res => {
+					this.data = res.data
+					const { asset } = res.data
+					if (!this.$util.isEmpty(asset)) {
+						// 订单总览
+						this.orderData[0].value = asset.unPayOrder
+						this.orderData[1].value = asset.unSendOrder
+						this.orderData[2].value = asset.sendingOrder
+						this.orderData[3].value = asset.unNoticeOrder
+						this.orderData[4].value = asset.finishOrder
+						this.orderData[5].value = asset.totalOrder
+						// 总览数据
+						this.totalData[0].value = asset.totalMember
+						this.totalData[1].value = asset.totalFans
+						this.totalData[2].value = asset.totalUser
+						this.totalData[3].value = asset.totalIncome
+						this.totalData[4].value = asset.totalVisit
+						this.totalData[5].value = asset.remainSmsNum
+					}
+				})
+			},
+			// 跳转
+			pageToFn(item) {
+				// #ifdef H5
+				location.href = item.url
+				// #endif
+				// #ifndef H5
+				// #endif
+			},
+			// 续费
+			renewFn() {
+				location.href = `${window.location.protocol}//www.${getFirstHost()}.com/#/?payMerchantId=${this.userInfo.extend.merchantId}&pay=1`
+			}
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
@@ -302,7 +330,7 @@ export default {
 			@include disFlex(center, space-around);
 			// padding-bottom: 40px;
 			.info-list-name {
-				color: #BFD4FF;
+				color: #bfd4ff;
 			}
 			.info-list-value {
 				font-size: 36px;
@@ -344,7 +372,8 @@ export default {
 		}
 	}
 	// 总览
-	.total-wrap, .order-wrap {
+	.total-wrap,
+	.order-wrap {
 		.total-tit {
 			padding: 18px 0 18px 20px;
 			border-bottom: 1px solid $borderColor;
@@ -398,4 +427,13 @@ export default {
 			}
 		}
 	}
+	// 遮罩层
+	.renew-wrap {
+		text-align: center;
+		.renew-wrap-text {
+			margin-top: 30px;
+			margin-bottom: 60px;
+			font-size: 34px;
+		}
+	}
 </style>

mobile-code/src/admin/staff/add.vue

@@ -30,7 +30,7 @@
 					<div v-else class="tui-placeholder">请选择</div>
 				</tui-list-cell>
 			</div>
-			<div class="prompt-text">注: 请先关注公众号，绑定后可以在移动端自动登陆</div>
+			<div class="prompt-text">注: 请先关注公众号，绑定后可以在移动端自动登录</div>
 			<!-- 收款通知 -->
 			<div class="module-com input-line-wrap">
 				<tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
@@ -47,7 +47,7 @@
 					<input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入手机号" maxlength="50" type="number" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">登陆密码</div>
+					<div class="tui-title required">登录密码</div>
 					<input v-model="form.password" placeholder-class="phcolor" class="tui-input" name="password" placeholder="请输入" maxlength="50" type="password" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">

mobile-code/src/api/coupon/index.js

@@ -1,14 +1,14 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 登陆客户的优惠情况 m
+ * 登录客户的优惠情况 m
  */
 // export const discount = data => {
 // 	return https.get('/user/discount', data)
 // }
 
 /** *
- * 登陆客户的优惠券列表 m
+ * 登录客户的优惠券列表 m
  */
 // export const list = data => {
 // 	return https.get('/user/discount', data)

mobile-code/src/api/member/index.js

@@ -1,14 +1,14 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 只要登陆客户的优惠情况 m
+ * 只要登录客户的优惠情况 m
  */
 export const userDiscount = data => {
 	return https.get('/user/discount', data)
 }
 
 /** *
- * 只要登陆客户的资产情况 m
+ * 只要登录客户的资产情况 m
  */
 export const userAsset = data => {
 	return https.get('/user/asset', data)

mobile-code/src/api/official/index.js

@@ -42,7 +42,7 @@ export const sendSmsW = param => https.get('/inform-user/send-sms', param)
 export const regionTreeW = param => https.get('/region/tree', param)
 
 /** *
- * 登陆客户的帐号信息（到期时间） w
+ * 登录客户的帐号信息（到期时间） w
  */
 export const accountDet = data => {
 	return https.get('/merchant/login-account', data)

mobile-code/src/b-config.js

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

mobile-code/src/b-pages.json

@@ -1,318 +0,0 @@
-{
-	"pages": [
-		{
-			"path": "admin/home/workbench",
-			"style": {
-				"navigationBarTitleText": "工作台"
-			}
-		},
-		{
-			"path": "admin/home/order",
-			"style": {
-				"navigationBarTitleText": "订单"
-			}
-		},
-		{
-			"path": "admin/home/member",
-			"style": {
-				"navigationBarTitleText": "客户"
-			}
-		},
-		{
-			"path": "pages/common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "pages/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/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/components/plugin/alert.vue

@@ -75,7 +75,7 @@ export default {
 		opacity: 0;
 		border-radius: 20px;
 		overflow: hidden;
-		z-index: 998;
+		z-index: 9998;
 	}
 
 	.tui-alert-show {
@@ -90,7 +90,7 @@ export default {
 		right: 0;
 		bottom: 0;
 		background: rgba(0, 0, 0, 0.5);
-		z-index: 996;
+		z-index: 9996;
 		transition: all 0.3s ease-in-out;
 		opacity: 0;
 		visibility: hidden;

mobile-code/src/components/plugin/modal.vue

@@ -135,7 +135,7 @@ export default {
 		top: 50%;
 		margin: auto;
 		background: #fff;
-		z-index: 998;
+		z-index: 9998;
 		transition: all 0.3s ease-in-out;
 		opacity: 0;
 		box-sizing: border-box;
@@ -162,7 +162,7 @@ export default {
 		right: 0;
 		bottom: 0;
 		background: rgba(0, 0, 0, 0.6);
-		z-index: 996;
+		z-index: 9996;
 		transition: all 0.3s ease-in-out;
 		opacity: 0;
 		visibility: hidden;

mobile-code/src/config.js

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

mobile-code/src/constant/index.js

@@ -1,4 +1,5 @@
 import { ProjectName } from '@/config'
+import { getFirstHost } from '@/utils/common'
 
 // #ifdef MP-WEIXIN
 const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
@@ -56,13 +57,6 @@ if (ProjectName == 'mobile') {
 	// uni.setStorageSync('source', 'www')
 }
 
-function getFirstHost() {
-	let host = window.location.host
-	host = host.split('.')
-	host = host.length == 3 ? host[1] : host[0]
-	return process.env.NODE_ENV == 'development' ? 'huaml' : host
-}
-
 console.log(envVal)
 
 export default envVal

mobile-code/src/m-config.js

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

mobile-code/src/b-manifest.json → mobile-code/src/m-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/m-pages.json

@@ -0,0 +1,203 @@
+{
+	"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": "pages/common/redirect",
+			"style": {
+				"navigationBarTitleText": "加载中..."
+			}
+		},
+		{
+			"path": "pages/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/b-uni.scss → mobile-code/src/m-uni.scss

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

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.m.huaml.com",
+                    "target": "http://api.b.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/pages.json

@@ -1,27 +1,21 @@
 {
 	"pages": [
 		{
-			"path": "pages/home/index",
+			"path": "admin/home/workbench",
 			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "pages/home/category",
-			"style": {
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "工作台"
 			}
 		},
 		{
-			"path": "pages/home/shop",
+			"path": "admin/home/order",
 			"style": {
-				"navigationBarTitleText": "门店"
+				"navigationBarTitleText": "订单"
 			}
 		},
 		{
-			"path": "pages/home/user",
+			"path": "admin/home/member",
 			"style": {
-				"navigationBarTitleText": "我的"
+				"navigationBarTitleText": "客户"
 			}
 		},
 		{
@@ -40,109 +34,225 @@
 	],
 	"subPackages": [
 		{
-			"root": "pages/user",
+			"root": "admin/order",
 			"pages": [
 				{
-					"path": "register",
+					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "注册"
+						"navigationBarTitleText": "详情"
 					}
 				},
 				{
-					"path": "password",
+					"path": "ship",
 					"style": {
-						"navigationBarTitleText": "修改密码"
+						"navigationBarTitleText": "发货"
+					}
+				},
+				{
+					"path": "fill-form",
+					"style": {
+						"navigationBarTitleText": "填写收花人"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/goods",
+			"root": "admin/member",
 			"pages": [
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加客户"
+					}
+				},
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "详情"
+						"navigationBarTitleText": "客户详情"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/pay",
+			"root": "admin/interest",
 			"pages": [
 				{
-					"path": "index",
+					"path": "invite",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "邀请列表"
+					}
+				},
+				{
+					"path": "my-invite",
+					"style": {
+						"navigationBarTitleText": "我的邀请"
+					}
+				},
+				{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "奖励设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/coupon",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "优惠券"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/callback",
+			"root": "admin/ad",
 			"pages": [
 				{
-					"path": "index"
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "广告列表"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加广告"
+					}
+				},
+				{
+					"path": "sel-goods",
+					"style": {
+						"navigationBarTitleText": "商品选择"
+					}
 				}
 			]
 		},
 		{
-			"root": "pages/coupon",
+			"root": "admin/staff",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "员工管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "sel-member",
+					"style": {
+						"navigationBarTitleText": "客户列表"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/order",
+			"root": "admin/setting",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "设置"
 					}
 				},
 				{
-					"path": "detail",
+					"path": "wx-menu",
 					"style": {
-						"navigationBarTitleText": "订单列表"
+						"navigationBarTitleText": "微信菜单设置"
 					}
 				},
 				{
-					"path": "buy",
+					"path": "coupon",
 					"style": {
-						"navigationBarTitleText": "订单确认"
+						"navigationBarTitleText": "新人领券设置"
 					}
 				},
 				{
-					"path": "comment",
+					"path": "level",
+					"style": {
+						"navigationBarTitleText": "会员等级设置"
+					}
+				},
+				{
+					"path": "password",
 					"style": {
-						"navigationBarTitleText": "评价"
+						"navigationBarTitleText": "密码设置"
 					}
 				}
 			]
 		},
 		{
-			"root": "pages/interest",
+			"root": "admin/goodsManage",
 			"pages": [
 				{
-					"path": "invite",
+					"path": "list",
 					"style": {
-						"navigationBarTitleText": "邀请排行",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "商品管理"
 					}
 				},
 				{
-					"path": "level",
+					"path": "category",
 					"style": {
-						"navigationBarTitleText": "会员等级",
-						"enablePullDownRefresh": true
+						"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": "收入明细"
 					}
 				}
 			]
@@ -158,6 +268,17 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "admin/template",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "选择模板"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
@@ -170,32 +291,26 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
+		"selectedColor": "#3385FF",
 		"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": "admin/home/workbench",
+				"iconPath": "static/images/admin/workbench-no.png",
+				"selectedIconPath": "static/images/admin/workbench-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/order",
+				"iconPath": "static/images/admin/order-no.png",
+				"selectedIconPath": "static/images/admin/order-is.png",
+				"text": "订单"
 			},
 			{
-				"pagePath": "pages/home/user",
-				"iconPath": "static/images/common/user-no.png",
-				"selectedIconPath": "static/images/common/user-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/pages/home/components/go-login.vue

@@ -1,7 +1,7 @@
 <template>
-	<alert-module :show="showAlert" btnText="去登陆" btnColor="#FF2842" padding="66rpx 24rpx 66rpx 24rpx" @click="goLogin" @cancel="hideAlert">
+	<alert-module :show="showAlert" btnText="去登录" btnColor="#FF2842" padding="66rpx 24rpx 66rpx 24rpx" @click="goLogin" @cancel="hideAlert">
 		<div class="go-login-module">
-            <div>您还未登陆，请先登录体验更多功能！</div>
+            <div>您还未登录，请先登录体验更多功能！</div>
         </div>
 	</alert-module>
 </template>

mobile-code/src/plugins/luch-request_0.0.7/request.js

@@ -153,7 +153,7 @@ class Request {
 						if (response.data.code && response.data.code == -1) {
 							uni.removeStorageSync('token')
 							uni.showToast({
-								title: '登陆过期，正在重新登录...',
+								title: '登录过期，正在重新登录...',
 								icon: 'none',
 								mask: true
 							})

mobile-code/src/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/utils/auth.js

@@ -73,7 +73,7 @@ export async function getSelfInfo(update) {
 }
 
 /**
- * 微信小程序登陆
+ * 微信小程序登录
  * @parmas update为true时会重新触发请求，重置vuex的数据
  */
 export async function wxLoginFn(update) {

mobile-code/src/utils/common.js

@@ -150,12 +150,17 @@ Date.prototype.Format = function(fmt = 'yyyy-MM-dd hh:mm:ss') {
 /** *
  * 根据日期获取时间戳
  * @parmas yyyy-MM-dd hh:mm:ss
+ * @params second true的话获取的时间戳是到秒的
  */
 // 获取时间戳方法
-export function getDataTimestamp(time) {
-	let etime = time
-	etime = new Date(etime)
-	etime = etime.getTime()
+export function getDataTimestamp(time, second) {
+	let etime = time || new Date
+	if (second) {
+		etime = Date.parse(time) / 1000
+	} else {
+		etime = new Date(etime)
+		etime = etime.getTime()
+	}
 	return etime
 }
 
@@ -474,6 +479,17 @@ export function bubbleSort(array) {
 		return 'array is not an Array!'
 	}
 }
+
+/** *
+ * 获取host第一个值
+ */
+export function getFirstHost() {
+	let host = window.location.host
+	host = host.split('.')
+	host = host.length == 3 ? host[1] : host[0]
+	return process.env.NODE_ENV == 'development' ? 'huaml' : host
+}
+
 export default {
 	copyText,
 	deepCopy,
@@ -495,5 +511,6 @@ export default {
 	verifiPhone,
 	calcDistance,
 	upLoadImg,
-	bubbleSort
+	bubbleSort,
+	getFirstHost
 }