update

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

@@ -0,0 +1,36 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+/** *
+ * 查看套餐详情 w
+ */
+export const getMealDet = data => {
+	return https.get('/set-meal/get-detail', data)
+}
+
+/** *
+ * 购买套餐 w
+ */
+export const renewWxPay = data => {
+	return https.get('/renew/wx-pay', data)
+}
+
+/** *
+ * 当前审核申请状态 w
+ */
+export const applyStatus = data => {
+	return https.get('/apply/apply-status', data)
+}
+
+/** *
+ * 商家信息 介绍人 w
+ */
+export const merchantDet = data => {
+	return https.get('/merchant/detail', data)
+}
+
+/** *
+ * 申请试用 w
+ */
+export const applyRegister = data => {
+	return https.get('/apply/register', data)
+}

mobile-code/src/b-config.js

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

mobile-code/src/b-manifest.json

@@ -0,0 +1,64 @@
+{
+    "name" : "花卉宝商家后台",
+    "appid" : "",
+    "description" : "应用描述",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : true,
+    "debug": false,
+    "networkTimeout": {
+        "request":200000
+    },
+    "mp-weixin" : {
+        "appid" : "wx3a163add860e0a86",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "请点击确定"
+            }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "mp-qq" : {
+        "usingComponents" : true
+	},
+    "h5" : {
+        "template" : "template.h5.html",
+        "router" : {
+            // "mode" : "history",
+            "base" : "/",
+            "publicPath" : "/"
+        },
+        "devServer": {
+            "port": 81,
+            "proxy": {
+                "/api": {
+                    "target": "http://api.b.huaml.com",
+                    "secure": false,
+                    "changeOrigin": true,
+                    "pathRewrite": {
+                        "^/api": ""
+                    }
+                }
+            }
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
+                }
+            }
+        }
+    }
+}

mobile-code/src/b-pages.json

@@ -0,0 +1,318 @@
+{
+	"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/w-uni.scss → mobile-code/src/b-uni.scss

@@ -8,7 +8,7 @@
 
 /* 颜色变量 */
 /*图片地址*/
-$imgUrl: 'https://img.huaml.com';
+$imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色

mobile-code/src/config.js

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

mobile-code/src/manifest.json

@@ -1,50 +1,47 @@
 {
-    "name" : "花卉宝商家后台",
-    "appid" : "",
-    "description" : "应用描述",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : true,
+    "name": "花卉宝",
+    "appid": "",
+    "description": "应用描述",
+    "versionName": "1.0.0",
+    "versionCode": "100",
+    "transformPx": true,
     "debug": false,
     "networkTimeout": {
-        "request":200000
+        "request": 200000
     },
-    "mp-weixin" : {
-        "appid" : "wx3a163add860e0a86",
-        "setting" : {
-            "urlCheck" : false
+    "mp-weixin": {
+        "appid": "wx3a163add860e0a86",
+        "setting": {
+            "urlCheck": false
         },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "请点击确定"
+        "usingComponents": true,
+        "permission": {
+            "scope.userLocation": {
+                "desc": "请点击确定"
             }
         }
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    "mp-alipay": {
+        "usingComponents": true
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "mp-baidu": {
+        "usingComponents": true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "mp-toutiao": {
+        "usingComponents": true
     },
-    "mp-qq" : {
-        "usingComponents" : true
-	},
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
+    "h5": {
+        "template": "template.h5.html",
+        "router": {
             // "mode" : "history",
-            "base" : "/",
-            "publicPath" : "/"
+            "base": "/",
+            "publicPath": "/"
         },
         "devServer": {
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.b.huaml.com",
+                    "target": "http://api.w.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {
@@ -53,12 +50,17 @@
                 }
             }
         },
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : ""
+        "sdkConfigs": {
+            "maps": {
+                "qqmap": {
+                    "key": ""
                 }
             }
+        },
+        "optimization": {
+            "treeShaking": {
+                "enable": true
+            }
         }
     }
-}
+}

mobile-code/src/official/apply.vue

@@ -35,13 +35,13 @@
 				</tui-list-cell>
 			</div>
 			<!-- 推荐人 -->
-			<div class="module-com recommend-wrap">
-				<div class="recommend-tag">手机号</div>
+			<div class="module-com recommend-wrap" v-if="!$util.isEmpty(merchantData)">
+				<div class="recommend-tag">推荐人</div>
 				<div class="recommend-det">
-					<app-avatar-module src :width="78" alt="推荐人头像" />
+					<app-avatar-module :src="merchantData.smallLogoUrl" :width="78" alt="推荐人头像" />
 					<div class="recommend-info">
-						<div class="app-size-32">雨非轩</div>
-						<div class="app-color-2">福建省厦门市思明区后埭溪路5号</div>
+						<div class="app-size-32">{{ merchantData.merchantName }}</div>
+						<div class="app-color-2">{{ merchantData.address }}</div>
 					</div>
 				</div>
 			</div>
@@ -66,6 +66,8 @@ import AppAvatarModule from '@/components/module/app-avatar'
 const form = require('@/utils/formValidation.js')
 // api
 import { sendSms } from '@/api/common'
+import { merchantDet, applyRegister } from '@/api/official'
+import { getShopUser } from '@/utils/auth'
 export default {
 	name: 'apply-data',
 	components: {
@@ -76,17 +78,19 @@ export default {
 	},
 	data() {
 		return {
+			merchantData: {},
 			form: {
 				name: '',
+				mobile: '',
 				province: '',
 				city: '',
 				dist: '',
 				address: '',
 				floor: '',
 				longitude: '',
-				latitude: '',
+				latitude: ''
 				// 推荐商家id
-				oldId: ''
+				// oldId: ''
 			},
 			// 省市联动
 			cityPickerValueDefault: [0, 0],
@@ -96,16 +100,48 @@ export default {
 			timer: null
 		}
 	},
+	onLoad() {
+		let token = uni.getStorageSync('token')
+		if (!token) {
+			getShopUser()
+			return false
+		}
+		this.init()
+	},
 	computed: {
 		...mapGetters({ orderShop: 'getOrderShop' })
 	},
 	methods: {
+		init() {
+			let id = this.option.merchantId
+			if (id) {
+				this._getMerchantDet()
+			}
+		},
+		_getMerchantDet() {
+			merchantDet({ id: this.option.merchantId }).then(res => {
+				this.merchantData = res.data
+			})
+		},
 		// ==============
 		confirmFn() {
-			this.$util.pageTo('/official/pay')
+			applyRegister({
+				oldId: this.option.merchantId || 0,
+				...this.form
+			}).then(res => {
+				this.$util.pageTo({
+					url: '/official/pay',
+					type: 2,
+					query: {
+						pagestatus: 2,
+						...res.data
+					}
+				})
+			})
 		},
 		// 验证码
 		getCode() {
+			alert(this.form.mobile)
 			if (!this.form.mobile || !this.$util.checkMobile(this.form.mobile)) {
 				this.$msg('请输入正确的手机号！')
 				return false

mobile-code/src/official/callback.vue

@@ -40,9 +40,9 @@
 						</block>
 					</div>
 					<!-- qr-code -->
-					<div class="qr-code-wrap">
+					<div class="qr-code-wrap" v-if="option.focus == 0">
 						<div class="qr-code-img">
-							<img :src="`${constant.imgUrl}/retail/extension.png`" alt />
+							<img :src="option.qrCode" alt />
 						</div>
 						<div>识别二维码关注花卉宝</div>
 						<div>审核结果将通过微信通知您</div>

mobile-code/src/official/index.vue

@@ -42,14 +42,29 @@
 			<img :src="`${constant.imgUrl}/retail/common/trademark.png`" alt="">
 		</div>
 		<!-- buttom -->
-		<div class="app-footer" @click="$util.pageTo('/official/pay')">免费试用</div>
+		<div v-if="status == -1" class="app-footer" @click="$util.pageTo({
+			url: '/official/apply',
+			status: 2
+		})">申请试用</div>
+		<div v-if="status == 0" class="app-footer under-review">审核中</div>
+		<div v-if="status == 1" class="app-footer under-review">试用中</div>
+		<div v-if="status == 2" class="app-footer under-review">审核未通过</div>
+		<div v-if="status == 3" class="app-footer" @click="$util.pageTo({
+			url: '/official/pay',
+			status: 1
+		})">立即续费</div>
+		<div v-if="status == 4" class="app-footer" @click="$util.pageTo({
+			url: '/official/pay',
+			status: 2
+		})">立即订购</div>
 	</div>
 </template>
 
 <script>
 import AppSwiper from '@/components/app-swiper'
 import AppImg from '@/components/app-img'
-
+// api
+import { applyStatus } from '@/api/official'
 export default {
 	name: 'index',
 	components: {
@@ -59,6 +74,7 @@ export default {
 	data() {
 		return {
 			constant: this.$constant,
+			status: -2,
 			swiper: [
 				{
 					img: `${this.$constant.imgUrl}/retail/official/banner-1.png`
@@ -113,7 +129,21 @@ export default {
 			adData: [1, 2, 3, 4, 5, 6, 7, 8]
 		}
 	},
+	onLoad() {
+		this.init()
+	},
 	methods: {
+		init() {
+			let token = uni.getStorageSync('token')
+			if (token) {
+				this._getDet()
+			}
+		},
+		_getDet() {
+			applyStatus().then(res => {
+				this.status = res.data.status
+			})
+		},
 		contactFn() {
 			uni.makePhoneCall({
 				phoneNumber: '05923272000'
@@ -222,5 +252,9 @@ export default {
 		font-size: 36px;
 		font-weight: 600;
 		background: linear-gradient(90deg, #3ab7ff, #3385ff);
+		&.under-review {
+			background: #fff !important;
+			color: #333 !important;
+		}
 	}
 </style>

mobile-code/src/official/pay.vue

@@ -3,70 +3,93 @@
 		<div class="banner-wrap">
 			<div class="banner-img">
 				<img :src="`${constant.imgUrl}/retail/official/pay-banner.png`" alt />
+				<div class="meal-det">
+					<div class="meal-title">{{ detail.name }}</div>
+					<div class="meal-introduce">{{ detail.introduce }}</div>
+				</div>
 			</div>
 			<div class="flex-center-between app-size-28">
 				<div>软件周期</div>
 				<div>1年</div>
 			</div>
 		</div>
-        <!-- list -->
-        <div class="module-wrap">
-            <div class="module-tit">主要功能</div>
-            <div class="module-det">
-                <div class="list-wrap">
-                    <div class="list" v-for="(item, index) in funcitonData" :key="index">
-                        <span :class="{ 'app-color-3' : !item.status}">{{ item.name }}</span>
-                        <i class="iconfont" :class="[item.status ? 'icondagou' : 'iconguanbi']"></i>
-                    </div>
-                </div>
-            </div>
-        </div>
+		<!-- list -->
+		<div class="module-wrap">
+			<div class="module-tit">主要功能</div>
+			<div class="module-det">
+				<div class="list-wrap">
+					<div class="list" v-for="(item, index) in funcitonData" :key="index">
+						<span :class="{ 'app-color-3' : !item.has}">{{ item.name }}</span>
+						<i class="iconfont" :class="[item.has ? 'icondagou' : 'iconguanbi']"></i>
+					</div>
+				</div>
+			</div>
+		</div>
 		<!-- buttom -->
 		<div class="page-btn app-footer">
 			<div class="flex-center">
 				<span>合计</span>
 				<span class="app-price">
 					<span>￥</span>
-					<span class="app-size-40">3600</span>
-                    <span>.00</span>
+					<span class="app-size-40">{{ detail.price }}</span>
 				</span>
 			</div>
-			<button class="admin-button-com middle blue">支付</button>
+			<button class="admin-button-com middle blue" @click="wxPay">支付</button>
 		</div>
 	</div>
 </template>
 
 <script>
+import { getShopUser } from '@/utils/auth'
+import wexinPay from '@/utils/pay/wxPay'
+import { getMealDet, renewWxPay } from '@/api/official'
 export default {
 	name: 'pay-page',
 	data() {
 		return {
-			funcitonData: [
-				{
-					name: '微信商城',
-					status: true
-				},
-				{
-					name: '节日自动涨价',
-					status: true
-				},
-				{
-					name: '小程序商城',
-					status: true
-				},
-				{
-					name: '订单管理',
-					status: false
-				},
-				{
-					name: '商品管理',
-					status: false
-				},
-				{
-					name: '客户管理',
-					status: false
+			detail: {},
+			funcitonData: []
+		}
+	},
+	onLoad() {
+		let token = uni.getStorageSync('token')
+		if (!token) {
+			getShopUser()
+			return false
+		}
+		this.init()
+	},
+	methods: {
+		init() {
+			this._getMealDet()
+		},
+		_getMealDet() {
+			getMealDet({ id: 1 }).then(res => {
+				if (this.$util.isEmpty(res.data)) return false
+				this.detail = res.data.detail
+				this.funcitonData = res.data.function
+			})
+		},
+		wxPay() {
+			renewWxPay({ id: this.detail.id }).then(res => {
+				wexinPay(res.data, this.paySuccess, this.payFail)
+			})
+		},
+		// 支付成功
+		paySuccess() {
+			alert('支付成功!')
+			this.$util.pageTo({
+				url: '/official/callback',
+				type: 2,
+				query: {
+					pagestatus: 2
+					// orderSn: this.option.orderSn,
+					// payDiscountPrice: res.data.discountAmount
 				}
-			]
+			})
+		},
+		payFail() {
+			this.$msg('支付失败，请重新支付！')
 		}
 	}
 }
@@ -83,42 +106,60 @@ export default {
 		.banner-img {
 			width: 100%;
 			margin-bottom: 6px;
+			position: relative;
+			.meal-det {
+				position: absolute;
+				top: 40px;
+				left: 30px;
+				width: 60%;
+				color: #fff;
+				.meal-title {
+					font-size: 42px;
+					font-weight: 600;
+					margin-bottom: 28px;
+					letter-spacing: 8px;
+				}
+				.meal-introduce {
+					line-height: 40px;
+					letter-spacing: 2px;
+				}
+			}
 		}
 	}
-    // list
-    .module-wrap {
-        padding: 40px 30px 0;
-        .module-tit {
-            font-size: 28px;
-            font-weight: 600;
-            margin-bottom: 24px;
-        }
-        .module-det {
-            .list-wrap {
-                border: 2px solid #f9f9f9;
-                border-top: none;
-                .list {
-                    @include disFlex(center, space-between);
-                    padding: 20px 26px;
-                    border-top: 2px solid #f9f9f9;
-                    &:nth-child(odd) {
-                        background-color: #eee;
-                    }
-                    .iconfont {
-                        font-size: 30px;
-                    }
-                    .icondagou {
-                        color: $mainColor;
-                    }
-                    .iconguanbi {
-                        font-size: 24px;
-                        color: $fontColor3;
-                    }
-                }
-            }
-        }
-    }
-    // button
+	// list
+	.module-wrap {
+		padding: 40px 30px 0;
+		.module-tit {
+			font-size: 28px;
+			font-weight: 600;
+			margin-bottom: 24px;
+		}
+		.module-det {
+			.list-wrap {
+				border: 2px solid #f9f9f9;
+				border-top: none;
+				.list {
+					@include disFlex(center, space-between);
+					padding: 20px 26px;
+					border-top: 2px solid #f9f9f9;
+					&:nth-child(odd) {
+						background-color: #eee;
+					}
+					.iconfont {
+						font-size: 30px;
+					}
+					.icondagou {
+						color: $mainColor;
+					}
+					.iconguanbi {
+						font-size: 24px;
+						color: $fontColor3;
+					}
+				}
+			}
+		}
+	}
+	// button
 	.page-btn {
 		width: calc(100% - 60px);
 		@include disFlex(center, space-between);
@@ -130,9 +171,9 @@ export default {
 		.red {
 			width: 270px;
 		}
-        .admin-button-com {
-            width: 200px;
-            font-size: 32px;
-        }
+		.admin-button-com {
+			width: 200px;
+			font-size: 32px;
+		}
 	}
 </style>

mobile-code/src/pages.json

@@ -1,284 +1,28 @@
 {
 	"pages": [
 		{
-			"path": "admin/home/workbench",
+			"path": "official/index",
 			"style": {
-				"navigationBarTitleText": "工作台"
+				"navigationBarTitleText": "花卉宝"
 			}
 		},
 		{
-			"path": "admin/home/order",
+			"path": "official/apply",
 			"style": {
-				"navigationBarTitleText": "订单"
+				"navigationBarTitleText": "填写资料"
 			}
 		},
 		{
-			"path": "admin/home/member",
+			"path": "official/pay",
 			"style": {
-				"navigationBarTitleText": "客户"
+				"navigationBarTitleText": "支付"
 			}
 		},
 		{
-			"path": "pages/common/redirect",
+			"path": "official/callback",
 			"style": {
-				"navigationBarTitleText": "加载中..."
+				"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": {
@@ -288,31 +32,6 @@
 		"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/pages/pay/index.vue

@@ -54,7 +54,6 @@ import { getCheckLogin } from '@/utils/auth'
 import wexinPay from '@/utils/pay/wxPay'
 // api
 import { fastPay } from '@/api/pay'
-import { oauth } from '@/api/login'
 import { getShopUser } from '@/utils/auth'
 export default {
 	name: 'pay',

mobile-code/src/uni.scss

@@ -8,7 +8,7 @@
 
 /* 颜色变量 */
 /*图片地址*/
-$imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
+$imgUrl: 'https://img.huaml.com';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色

mobile-code/src/w-config.js

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

mobile-code/src/w-manifest.json

@@ -1,66 +0,0 @@
-{
-    "name": "花卉宝",
-    "appid": "",
-    "description": "应用描述",
-    "versionName": "1.0.0",
-    "versionCode": "100",
-    "transformPx": true,
-    "debug": false,
-    "networkTimeout": {
-        "request": 200000
-    },
-    "mp-weixin": {
-        "appid": "wx3a163add860e0a86",
-        "setting": {
-            "urlCheck": false
-        },
-        "usingComponents": true,
-        "permission": {
-            "scope.userLocation": {
-                "desc": "请点击确定"
-            }
-        }
-    },
-    "mp-alipay": {
-        "usingComponents": true
-    },
-    "mp-baidu": {
-        "usingComponents": true
-    },
-    "mp-toutiao": {
-        "usingComponents": true
-    },
-    "h5": {
-        "template": "template.h5.html",
-        "router": {
-            // "mode" : "history",
-            "base": "/",
-            "publicPath": "/"
-        },
-        "devServer": {
-            "port": 81,
-            "proxy": {
-                "/api": {
-                    "target": "http://api.w.huaml.com",
-                    "secure": false,
-                    "changeOrigin": true,
-                    "pathRewrite": {
-                        "^/api": ""
-                    }
-                }
-            }
-        },
-        "sdkConfigs": {
-            "maps": {
-                "qqmap": {
-                    "key": ""
-                }
-            }
-        },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
-            }
-        }
-    }
-}

mobile-code/src/w-pages.json

@@ -1,37 +0,0 @@
-{
-	"pages": [
-		{
-			"path": "official/index",
-			"style": {
-				"navigationBarTitleText": "花卉宝"
-			}
-		},
-		{
-			"path": "official/apply",
-			"style": {
-				"navigationBarTitleText": "填写资料"
-			}
-		},
-		{
-			"path": "official/pay",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		},
-		{
-			"path": "official/callback",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		}
-	],
-	"globalStyle": {
-		// #ifdef H5
-		"navigationStyle": "custom",
-		// #endif
-		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花卉宝",
-		"navigationBarTextStyle": "black"
-	}
-}
-