lalala 6 лет назад
Родитель
Сommit
5f500facb8

+ 2 - 0
mobile-code/src/b-config.js

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

+ 2 - 2
mobile-code/src/w-manifest.json → mobile-code/src/b-manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3a163add860e0a86",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.w.huaml.com",
+                    "target": "http://api.b.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

+ 318 - 0
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": "客户"
+			}
+		]
+	}
+}
+

+ 1 - 1
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/';
 
 // 所有样式为公共样式,已在全局引用可直接使用
 // 主色

+ 2 - 2
mobile-code/src/config.js

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

+ 2 - 2
mobile-code/src/manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx3a163add860e0a86",
         "setting" : {
             "urlCheck" : false
         },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.b.huaml.com",
+                    "target": "http://api.w.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

+ 145 - 141
mobile-code/src/official/callback.vue

@@ -4,16 +4,16 @@
 		<div class="callback-wrap">
 			<div class="callback-blo" :class="{ 'paddingTop' : pageStatus == 7 }">
 				<block v-if="pageStatus == 7">
-                    <div class="module-wrap">
-                        <div class="module-tit">提示</div>
-                        <div class="module-det">
-                            <div class="module-list" v-for="(item, index) in promptData" :key="index">
-                                <span class="dot-wrap"></span>
-                                <span>{{ item }}</span>
-                            </div>
-                        </div>
-                    </div>
-                </block>
+					<div class="module-wrap">
+						<div class="module-tit">提示</div>
+						<div class="module-det">
+							<div class="module-list" v-for="(item, index) in promptData" :key="index">
+								<span class="dot-wrap"></span>
+								<span>{{ item }}</span>
+							</div>
+						</div>
+					</div>
+				</block>
 				<block v-else>
 					<!-- 使用icon -->
 					<!-- 成功 icon -->
@@ -47,13 +47,15 @@
 					</div>
 					<!-- qr-code -->
 					<!-- <div class="qr-code-wrap" v-if="option.focus == 0"> -->
-					<div class="qr-code-wrap">
-						<div class="qr-code-img">
-							<img :src="`${constant.imgUrl}/retail/common/qr-code.png`" alt="" />
+					<block v-if="pageStatus == 2">
+						<div class="qr-code-wrap">
+							<div class="qr-code-img">
+								<img :src="`${constant.imgUrl}/retail/common/qr-code.png`" alt />
+							</div>
+							<div>识别二维码关注花卉宝</div>
+							<div>审核结果将通过微信通知您</div>
 						</div>
-						<div>识别二维码关注花卉宝</div>
-						<div>审核结果将通过微信通知您</div>
-					</div>
+					</block>
 				</block>
 				<!-- button -->
 				<div class="button-wrap">
@@ -70,7 +72,7 @@
 </template>
 
 <script>
-/** *
+	/** *
 	 * 页面状态
 	 * @parmas pageStatus 进入页面的状态
 	 * @parmas 1 续订成功
@@ -81,115 +83,117 @@
 	 * @parmas 6 授权成功 - 扫码支付 -- successPayCode
 	 * @parmas 7 授权提示 - 扫码支付 -- successPayCode
 	 */
-import { accountDet, applyStatus, getAuthUrl } from '@/api/official'
-// import { getShopUser } from '@/utils/auth'
-export default {
-	name: 'callback',
-	data() {
-		return {
-			constant: this.$constant,
-			data: {},
-			// pageStatus: '2',
-			pageStatus: '2',
-			promptData: [
-				'确认你已经有公众号(服务号),并且已认证和申请微 信支付',
-				'满足以上条件,可以点下方按钮开始授权。',
-				'点击之后会跳到新页面,页面有个二维码,识别后按确 认授权即可。'
-			]
-		}
-	},
-	computed: {
-		btnText() {
-			let text = ''
-			switch (this.pageStatus) {
-				case '1':
-					text = '返回管理中心'
-					break
-				case '2':
-					text = '返回首页'
-					break
-				case '3':
-					text = '返回首页'
-					break
-				case '4':
-					text = '返回首页'
-					break
-				case '5':
-					text = '开始授权'
-					break
-				case '6':
-					text = '管理中心'
-					break
-				case '7':
-					text = '开始授权'
-					break
-				default:
-					text = '返回管理中心'
-					break
+	import { getFirstHost } from '@/utils/common'
+	// api
+	import { accountDet, applyStatus, getAuthUrl } from '@/api/official'
+	// import { getShopUser } from '@/utils/auth'
+	export default {
+		name: 'callback',
+		data() {
+			return {
+				constant: this.$constant,
+				data: {},
+				// pageStatus: '2',
+				pageStatus: '2',
+				promptData: ['确认你已经有公众号(服务号),并且已认证和申请微 信支付', '满足以上条件,可以点下方按钮开始授权。', '点击之后会跳到新页面,页面有个二维码,识别后按确 认授权即可。']
 			}
-			return text
-		}
-	},
-	onLoad() {
-		// if (!this.$util.isLogin()) {
-		// 	getShopUser()
-		// 	return false
-		// }
-	},
-	mounted() {
-		// this.pageStatus = this.option.pageStatus
-		// this.init()
-	},
-	methods: {
-		init() {
-			this.$util.getCheckLogin().then(res => {
-				if (res) {
-					this._getStatus()
-					if (this.pageStatus == 1 || this.pageStatus == 5) {
-						this._accountDet()
-					}
-				}
-			})
 		},
-		// 获取状态
-		_getStatus() {
-			applyStatus().then(res => {
-				let status = res.data.status
-				if (status == 1) {
-					this.pageStatus = 2
+		computed: {
+			btnText() {
+				let text = ''
+				switch (this.pageStatus) {
+					case '1':
+						text = '返回管理中心'
+						break
+					case '2':
+						text = '返回首页'
+						break
+					case '3':
+						text = '返回首页'
+						break
+					case '4':
+						text = '返回首页'
+						break
+					case '5':
+						text = '开始授权'
+						break
+					case '6':
+						text = '管理中心'
+						break
+					case '7':
+						text = '开始授权'
+						break
+					default:
+						text = '返回管理中心'
+						break
 				}
-			})
+				return text
+			}
 		},
-		// 获取用户信息
-		_accountDet() {
-			accountDet().then(res => {
-				this.data = res.data
-			})
+		onLoad() {
+			// if (!this.$util.isLogin()) {
+			// 	getShopUser()
+			// 	return false
+			// }
 		},
-		jumpPage() {
-			if (this.btnText == '返回首页') {
-				this.$util.pageTo({
-					url: '/official/index',
-					query: {
-						id: this.option.id
+		mounted() {
+			// this.pageStatus = this.option.pageStatus
+			// this.init()
+		},
+		methods: {
+			init() {
+				if (this.option.pagestatus == 1) {
+					this.pageStatus = 1
+				}
+				this.$util.getCheckLogin().then(res => {
+					if (res) {
+						// this._getStatus()
+						if (this.pageStatus == 1 || this.pageStatus == 5) {
+							this._accountDet()
+						}
 					}
 				})
-			} else if (this.btnText == '返回管理中心') {
-				this.$util.pageTo({
-					url: '/official/index',
-					query: {
-						id: this.option.id
+			},
+			// 获取状态
+			_getStatus() {
+				applyStatus().then(res => {
+					let status = res.data.status
+					if (status == 1) {
+						this.pageStatus = 2
 					}
 				})
-			} else if (this.btnText == '开始授权') {
-				getAuthUrl().then(res => {
-					location.href = res.data.url
+			},
+			// 获取用户信息
+			_accountDet() {
+				accountDet().then(res => {
+					this.data = res.data
 				})
-				// this.$msg('功能待对接!')
+			},
+			jumpPage() {
+				if (this.btnText == '返回首页') {
+					this.$util.pageTo({
+						url: '/official/index',
+						query: {
+							id: this.option.id
+						}
+					})
+				} else if (this.btnText == '返回管理中心') {
+					// this.$util.pageTo({
+					// 	url: '/official/index',
+					// 	query: {
+					// 		id: this.option.id
+					// 	}
+					// })
+					location.href = `${window.location.protocol}//b.${getFirstHost()}.com/#/`
+				} else if (this.btnText == '开始授权') {
+					getAuthUrl().then(res => {
+						location.href = res.data.url
+					})
+					// this.$msg('功能待对接!')
+				}
 			}
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
@@ -202,10 +206,10 @@ export default {
 			background-color: #fff;
 			box-shadow: 2px 2px 16px 0px rgba(181, 181, 181, 0.29);
 			border-radius: 10px;
-            text-align: center;
-            &.paddingTop {
-                padding-top: 40px;
-            }
+			text-align: center;
+			&.paddingTop {
+				padding-top: 40px;
+			}
 			// 使用icon
 			.icon {
 				.iconfont {
@@ -220,30 +224,30 @@ export default {
 				width: 294px;
 				margin: 0 auto;
 			}
-        }
-        // module
-        .module-wrap {
-            padding: 0 32px;
-            text-align: left;
-            .module-tit {
-                font-size: 38px;
-                // margin-bottom: 20px;
-            }
-            .module-det {
-                .module-list {
-                    @include disFlex(flex-start, flex-start);
-                    margin-top: 30px;
-                    .dot-wrap {
-                        width: 10px;
-                        height: 10px;
-                        border-radius: 50%;
-                        background-color: $mainColor;
-                        margin-top: 12px;
-                        margin-right: 24px;
-                    }
-                }
-            }
-        }
+		}
+		// module
+		.module-wrap {
+			padding: 0 32px;
+			text-align: left;
+			.module-tit {
+				font-size: 38px;
+				// margin-bottom: 20px;
+			}
+			.module-det {
+				.module-list {
+					@include disFlex(flex-start, flex-start);
+					margin-top: 30px;
+					.dot-wrap {
+						width: 10px;
+						height: 10px;
+						border-radius: 50%;
+						background-color: $mainColor;
+						margin-top: 12px;
+						margin-right: 24px;
+					}
+				}
+			}
+		}
 		// prompt
 		.prompt-wrap {
 			margin-top: 60px;

+ 24 - 18
mobile-code/src/official/index.vue

@@ -2,10 +2,10 @@
 	<div class="app-content">
 		<div class="tab-wrap">
 			<div class="logo-img">
-				<img :src="`${constant.imgUrl}/retail/official/logo.png`" alt />
+				<img :src="`${constant.imgUrl}/retail/official/logo.png`" alt="" />
 			</div>
 			<div class="phone-img" @click="contactFn">
-				<img :src="`${constant.imgUrl}/retail/official/phone.png`" alt />
+				<img :src="`${constant.imgUrl}/retail/official/phone.png`" alt="" />
 			</div>
 		</div>
 		<app-swiper :height="{type: 'number',val: 750}" :list="swiper" />
@@ -26,23 +26,27 @@
 			</div>
 			<div class="ad-list-wrap">
 				<div class="ad-list" v-for="(item, index) in adData" :key="index">
-					<app-img :src="`${constant.imgUrl}/retail/official/list-${index + 1}.png`" alt />
+					<app-img :src="`${constant.imgUrl}/retail/official/list-${index + 1}.png`" alt="" />
 				</div>
 			</div>
 			<div class="official-wrap">
 				<div class="off-title">花卉宝,花店经营的标配工具</div>
 				<div class="off-sub-tit" @click="contactFn">
-					<app-img :src="`${constant.imgUrl}/retail/official/phone-small.png`" alt />
+					<app-img :src="`${constant.imgUrl}/retail/official/phone-small.png`" alt="" />
 					<span>咨询热线:0592 - 3272000</span>
 				</div>
 			</div>
 		</div>
 		<!-- trademark -->
 		<div class="bottom-trademark">
-			<img :src="`${constant.imgUrl}/retail/common/trademark.png`" alt />
+			<img :src="`${constant.imgUrl}/retail/common/trademark.png`" alt="" />
 		</div>
 		<!-- buttom -->
-		<div class="app-footer" @click="pageTo({
+		<div v-if="status == 3" class="app-footer" @click="pageTo({
+			url: '/official/pay',
+			status: 1
+		})">立即续费</div>
+		<div v-else class="app-footer" @click="pageTo({
 			url: '/official/pay'
 		})">申请试用</div>
 		<!-- <div v-if="status == -1" class="app-footer" @click="pageTo({
@@ -51,15 +55,11 @@
 		})">申请试用</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="pageTo({
-			url: '/official/pay',
-			status: 1
-		})">立即续费</div>
-		<div v-if="status == 4" class="app-footer" @click="pageTo({
+		<div v-if="status == 2" class="app-footer under-review">审核未通过</div> -->
+		<!-- <div v-if="status == 4" class="app-footer" @click="pageTo({
 			url: '/official/apply',
 			status: 2
-		})">立即订购</div>-->
+		})">立即订购</div> -->
 	</div>
 </template>
 
@@ -137,12 +137,18 @@
 		},
 		methods: {
 			init() {
-				let token = uni.getStorageSync('token')
-				if (token) {
-					this._getDet()
-				} else {
-					this.status = -1
+				if (this.option.pay == 1) {
+					// #ifdef H5
+					this.status = 3
+					sessionStorage.setItem('renewOption', JSON.stringify(this.option))
+					// #endif
 				}
+				// let token = uni.getStorageSync('token')
+				// if (token) {
+				// 	this._getDet()
+				// } else {
+				// 	this.status = -1
+				// }
 			},
 			_getDet() {
 				applyStatus().then(res => {

+ 14 - 5
mobile-code/src/official/pay.vue

@@ -34,10 +34,10 @@
 					<span class="app-size-40">{{ detail.price }}</span>
 				</span>
 			</div>
-			<button class="admin-button-com middle blue" @click="pageTo({
+			<button v-if="$util.isEmpty(renewOption)" class="admin-button-com middle blue" @click="pageTo({
 			url: '/official/apply'
 		})">免费试用</button>
-			<!-- <button class="admin-button-com middle blue" @click="wxPay">支付</button> -->
+			<button v-else class="admin-button-com middle blue" @click="wxPay">支付</button>
 		</div>
 	</div>
 </template>
@@ -52,7 +52,8 @@
 			return {
 				constant: this.$constant,
 				detail: {},
-				funcitonData: []
+				funcitonData: [],
+				renewOption: null
 			}
 		},
 		onLoad() {
@@ -64,6 +65,14 @@
 		},
 		methods: {
 			init() {
+				// 续费
+				// #ifdef H5
+				let renewOption = sessionStorage.getItem('renewOption')
+				if (renewOption) {
+					this.renewOption = JSON.parse(renewOption)
+				}
+				// #endif
+
 				this.$util.getCheckLogin().then(res => {
 					if (res) {
 						this._getMealDet()
@@ -78,7 +87,7 @@
 				})
 			},
 			wxPay() {
-				renewWxPay({ id: this.detail.id }).then(res => {
+				renewWxPay({ id: this.detail.id, merchantId: this.renewOption.payMerchantId }).then(res => {
 					wexinPay(res.data, this.paySuccess, this.payFail)
 				})
 			},
@@ -89,7 +98,7 @@
 					url: '/official/callback',
 					type: 2,
 					query: {
-						pagestatus: 2
+						pagestatus: 1
 						// orderSn: this.option.orderSn,
 						// payDiscountPrice: res.data.discountAmount
 					}

+ 8 - 289
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": "客户"
-			}
-		]
 	}
 }
 

+ 1 - 1
mobile-code/src/uni.scss

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

+ 0 - 2
mobile-code/src/w-config.js

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

+ 0 - 37
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"
-	}
-}
-