update

mobile-code/src/App.vue

@@ -17,7 +17,7 @@ export default {
 		// #endif
 		// 开发
 		if (process.env.NODE_ENV == 'development') {
-		// 	uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfMTI1NDM3NDUiLCJpYXQiOjE1ODA3MTA1NjEsIm5iZiI6MTU4MDcxMDU2MSwiZXhwIjoxNTg5MzUwNTYxLCJ1bmlxdWVJZCI6IjEyNTQzNzQ1Iiwic291cmNlSWQiOjB9.kHrIKm0MUOnX8fCDjOXwd7wQ4jOSEV8gvwR4H4hn_hQ')
+			uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfMTI1NDM3NDUiLCJpYXQiOjE1ODA3MTA1NjEsIm5iZiI6MTU4MDcxMDU2MSwiZXhwIjoxNTg5MzUwNTYxLCJ1bmlxdWVJZCI6IjEyNTQzNzQ1Iiwic291cmNlSWQiOjB9.kHrIKm0MUOnX8fCDjOXwd7wQ4jOSEV8gvwR4H4hn_hQ')
 			uni.setStorageSync('account', '12362')
 		}
 	},

mobile-code/src/config.js

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

mobile-code/src/w-config.js → mobile-code/src/m-config.js

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

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

@@ -83,14 +83,14 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3a163add860e0a86",
+        "appid" : "wxe4675bab299a52f7",
         "setting" : {
             "urlCheck" : false
         },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "请点击确定"
+                "desc" : "获取位置信息后为您提供个性化推荐"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.w.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/w-uni.scss → mobile-code/src/m-uni.scss

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

mobile-code/src/manifest.json

@@ -83,14 +83,14 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx3a163add860e0a86",
         "setting" : {
             "urlCheck" : false
         },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "获取位置信息后为您提供个性化推荐"
+                "desc" : "请点击确定"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.m.huaml.com",
+                    "target": "http://api.w.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/official/apply.vue

@@ -50,7 +50,7 @@
 				<button class="admin-button-com blue big" formType="submit">确认</button>
 			</div>
 			<!-- 选择地区 -->
-			<!-- <app-area-sel :show="showRegion" @hide="hideAreaSel" @change="changeAreaFn" /> -->
+			<app-area-sel :show.sync="showRegion" @change="changeAreaFn" />
 			<!-- 省市联动 -->
 			<simple-address ref="simpleAddress" :region="regionData" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm"></simple-address>
 		</form>
@@ -58,167 +58,182 @@
 </template>
 
 <script>
-import TuiListCell from '@/components/plugin/list-cell'
-// import AppAreaSel from '@/components/app-area-sel'
-import SimpleAddress from '@/components/plugin/simple-address'
-import AppAvatarModule from '@/components/module/app-avatar'
-const form = require('@/utils/formValidation.js')
-// api
-import { merchantDet, applyRegister, sendSms, regionTreeW } from '@/api/official'
-// import { getShopUser } from '@/utils/auth'
-export default {
-	name: 'apply-data',
-	components: {
-		TuiListCell,
-		// AppAreaSel,
-		SimpleAddress,
-		AppAvatarModule
-	},
-	data() {
-		return {
-			merchantData: {},
-			form: {
-				name: '',
-				mobile: '',
-				province: '',
-				city: '',
-				dist: '',
-				address: '',
-				floor: '',
-				longitude: '',
-				latitude: ''
-				// 推荐商家id
-				// oldId: ''
-			},
-			// 省市联动
-			regionData: [],
-			cityPickerValueDefault: [0, 0],
-			// 验证码
-			isSend: 0,
-			countDown: 59,
-			timer: null
-		}
-	},
-	onLoad() {
-		// if (!this.$util.isLogin()) {
-		// 	// getShopUser()
-		// 	return false
-		// }
-		// this.init()
-	},
-	methods: {
-		init() {
-			this.$util.getCheckLogin().then(res => {
-				if (res) {
-					let id = this.option.merchantId
-					if (id) {
-						this._getMerchantDet()
-					}
-					this._regionTree()
-				}
-			})
+	import TuiListCell from '@/components/plugin/list-cell'
+	import AppAreaSel from '@/components/app-area-sel'
+	import SimpleAddress from '@/components/plugin/simple-address'
+	import AppAvatarModule from '@/components/module/app-avatar'
+	const form = require('@/utils/formValidation.js')
+	// api
+	import { merchantDet, applyRegister, sendSms, regionTreeW } from '@/api/official'
+	// import { getShopUser } from '@/utils/auth'
+	export default {
+		name: 'apply-data',
+		components: {
+			TuiListCell,
+			AppAreaSel,
+			SimpleAddress,
+			AppAvatarModule
 		},
-		_regionTree() {
-			regionTreeW().then(res => {
-				this.regionData = res.data.tree
-			})
+		data() {
+			return {
+				merchantData: {},
+				form: {
+					name: '',
+					mobile: '',
+					province: '',
+					city: '',
+					dist: '',
+					address: '',
+					floor: '',
+					longitude: '',
+					latitude: ''
+					// 推荐商家id
+					// oldId: ''
+				},
+				showRegion: false,
+				// 省市联动
+				regionData: [],
+				cityPickerValueDefault: [0, 0],
+				// 验证码
+				isSend: 0,
+				countDown: 59,
+				timer: null
+			}
 		},
-		_getMerchantDet() {
-			merchantDet({ id: this.option.merchantId }).then(res => {
-				this.merchantData = res.data
-			})
+		onLoad() {
+			// if (!this.$util.isLogin()) {
+			// 	// getShopUser()
+			// 	return false
+			// }
+			// this.init()
 		},
-		// ==============
-		confirmFn() {
-			applyRegister({
-				oldId: this.option.merchantId || 0,
-				...this.form
-			}).then(res => {
-				this.$util.pageTo({
-					url: '/official/pay',
-					type: 2,
-					query: {
-						pagestatus: 7,
-						...res.data
+		methods: {
+			init() {
+				this.$util.getCheckLogin().then(res => {
+					if (res) {
+						let id = this.option.merchantId
+						if (id) {
+							this._getMerchantDet()
+						}
+						this._regionTree()
 					}
 				})
-			})
-		},
-		// 验证码
-		getCode() {
-			if (!this.form.mobile || !this.$util.checkMobile(this.form.mobile)) {
-				this.$msg('请输入正确的手机号！')
-				return false
-			}
-			this.isSend = 1
-			sendSms({
-				type: 1,
-				mobile: this.form.mobile
-			})
-				.then(res => {
-					this.beginCountDown()
-					this.$msg('发送成功！')
+			},
+			_regionTree() {
+				regionTreeW().then(res => {
+					this.regionData = res.data.tree
 				})
-				.catch(() => {
-					this.isSend = 0
-					this.$msg('发送失败！')
+			},
+			_getMerchantDet() {
+				merchantDet({ id: this.option.merchantId }).then(res => {
+					this.merchantData = res.data
 				})
-		},
-		// 倒计时
-		beginCountDown() {
-			this.countDown = 59
-			this.timer = setInterval(() => {
-				if (this.countDown === 0) {
-					clearInterval(this.timer)
-					this.isSend = 0
-					return
-				}
-				this.countDown -= 1
-			}, 1000)
-		},
-		// 选择地址
-		selRegionFn() {
-			let that = this
-			uni.chooseLocation({
-				success: (res) => {
-					this.form.address = res.address
-					this.form.latitude = res.latitude
-					this.form.longitude = res.longitude
-					console.log('位置名称：' + res.name)
-					console.log('详细地址：' + res.address)
-					console.log('纬度：' + res.latitude)
-					console.log('经度：' + res.longitude)
+			},
+			// ==============
+			confirmFn() {
+				applyRegister({
+					oldId: this.option.merchantId || 0,
+					...this.form
+				}).then(res => {
+					this.$util.pageTo({
+						// url: '/official/pay',
+						url: '/official/callback',
+						type: 2,
+						query: {
+							pagestatus: 3
+							// orderSn: this.option.orderSn,
+							// payDiscountPrice: res.data.discountAmount
+						}
+					})
+				})
+			},
+			// 验证码
+			getCode() {
+				if (!this.form.mobile || !this.$util.checkMobile(this.form.mobile)) {
+					this.$msg('请输入正确的手机号！')
+					return false
 				}
-			})
-		},
-		// 省市联动
-		openAddres() {
-			this.$refs.simpleAddress.open()
-		},
-		onCityConfirm(e) {
-			// this.form.receiveAddress = e.label
-			this.form.province = e.provinceName
-			this.form.city = e.cityName
-			// this.pickerText = JSON.stringify(e)
-		},
-		// 表单验证
-		formSubmit(e) {
-			// 表单规则
-			let rules = []
-			// 进行表单检查
-			let formData = e.detail.value
-			let checkRes = form.validation(formData, rules)
-			// 验证通过!
-			if (!checkRes) {
-				setTimeout(() => {
-					this.confirmFn()
+				this.isSend = 1
+				sendSms({
+					type: 1,
+					mobile: this.form.mobile
 				})
-			} else {
-				this.$msg(checkRes)
+					.then(res => {
+						this.beginCountDown()
+						this.$msg('发送成功！')
+					})
+					.catch(() => {
+						this.isSend = 0
+						this.$msg('发送失败！')
+					})
+			},
+			// 倒计时
+			beginCountDown() {
+				this.countDown = 59
+				this.timer = setInterval(() => {
+					if (this.countDown === 0) {
+						clearInterval(this.timer)
+						this.isSend = 0
+						return
+					}
+					this.countDown -= 1
+				}, 1000)
+			},
+			// 选择地址
+			selRegionFn() {
+				if (!this.form.city) {
+					this.$msg('请先选择地址！')
+					return false
+				}
+				this.showRegion = true
+				// let that = this
+				// uni.chooseLocation({
+				// 	success: (res) => {
+				// 		this.form.address = res.address
+				// 		this.form.latitude = res.latitude
+				// 		this.form.longitude = res.longitude
+				// 		console.log('位置名称：' + res.name)
+				// 		console.log('详细地址：' + res.address)
+				// 		console.log('纬度：' + res.latitude)
+				// 		console.log('经度：' + res.longitude)
+				// 	}
+				// })
+			},
+			changeAreaFn(e) {
+				console.log('changeAreaFn', e)
+				this.form.address = e.address
+				this.form.latitude = e.location.lat
+				this.form.longitude = e.location.lng
+			},
+			// -----
+			// 省市联动
+			openAddres() {
+				this.$refs.simpleAddress.open()
+			},
+			onCityConfirm(e) {
+				// this.form.receiveAddress = e.label
+				this.form.province = e.provinceName
+				this.form.city = e.cityName
+				// this.pickerText = JSON.stringify(e)
+			},
+			// 表单验证
+			formSubmit(e) {
+				// 表单规则
+				let rules = []
+				// 进行表单检查
+				let formData = e.detail.value
+				let checkRes = form.validation(formData, rules)
+				// 验证通过!
+				if (!checkRes) {
+					setTimeout(() => {
+						this.confirmFn()
+					})
+				} else {
+					this.$msg(checkRes)
+				}
 			}
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>

mobile-code/src/official/callback.vue

@@ -46,9 +46,10 @@
 						</block>
 					</div>
 					<!-- qr-code -->
-					<div class="qr-code-wrap" v-if="option.focus == 0">
+					<!-- <div class="qr-code-wrap" v-if="option.focus == 0"> -->
+					<div class="qr-code-wrap">
 						<div class="qr-code-img">
-							<img :src="option.qrCode" alt />
+							<img :src="`${constant.imgUrl}/retail/common/qr-code.png`" alt="" />
 						</div>
 						<div>识别二维码关注花卉宝</div>
 						<div>审核结果将通过微信通知您</div>
@@ -89,7 +90,7 @@ export default {
 			constant: this.$constant,
 			data: {},
 			// pageStatus: '2',
-			pageStatus: '7',
+			pageStatus: '2',
 			promptData: [
 				'确认你已经有公众号（服务号），并且已认证和申请微 信支付',
 				'满足以上条件，可以点下方按钮开始授权。',

mobile-code/src/official/index.vue

@@ -26,24 +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 v-if="status == -1" class="app-footer" @click="pageTo({
-			url: '/official/apply',
+		<div class="app-footer" @click="pageTo({
+			url: '/official/pay'
+		})">申请试用</div>
+		<!-- <div v-if="status == -1" class="app-footer" @click="pageTo({
+			url: '/official/pay',
 			status: 2
 		})">申请试用</div>
 		<div v-if="status == 0" class="app-footer under-review">审核中</div>
@@ -56,103 +59,103 @@
 		<div v-if="status == 4" class="app-footer" @click="pageTo({
 			url: '/official/apply',
 			status: 2
-		})">立即订购</div>
+		})">立即订购</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: {
-		AppSwiper,
-		AppImg
-	},
-	data() {
-		return {
-			constant: this.$constant,
-			status: -2,
-			swiper: [
-				{
-					img: `${this.$constant.imgUrl}/retail/official/banner-1.png`
-				},
-				{
-					img: `${this.$constant.imgUrl}/retail/official/banner-2.png`
-				},
-				{
-					img: `${this.$constant.imgUrl}/retail/official/banner-3.png`
-				},
-				{
-					img: `${this.$constant.imgUrl}/retail/official/banner-4.png`
-				}
-			],
-			contentData: [
-				{
-					title: `<span class="app-color-1">一键搭建</span>移动商城和小程序商城`,
-					subTitle: `各大节日商城自动涨价，客户下单自动按距离计算运费`,
-					img: `${this.$constant.imgUrl}/retail/official/content-1.png`
-				},
-				{
-					title: `<span class="app-color-1">流程化</span>管理订单`,
-					subTitle: `把控每个订单的生命周期，从下单、打单、制作到发货、配送、 送达自动通知客户，进度把控一清二楚，客户体验感大幅提升`,
-					img: `${this.$constant.imgUrl}/retail/official/content-2.png`
-				},
-				{
-					title: `提供多种的<span class="app-color-1">营销工具</span>`,
-					subTitle: `契合花店日常经营的营销工具，拉新、转化、复购、裂变， 面面俱到`,
-					img: `${this.$constant.imgUrl}/retail/official/content-3.png`
-				},
-				{
-					title: `连通各渠道来源的<span class="app-color-1">客户和订单</span>`,
-					subTitle: `线上、门店、微信、支付宝和美团等自动汇总后台，客户统一接待 回复，订单统一管理，不必再周旋于各个平台`,
-					img: `${this.$constant.imgUrl}/retail/official/content-4.png`
-				},
-				{
-					title: `<span class="app-color-1">一键吸粉 </span>注册会员`,
-					subTitle: `告别繁琐手续，一键操作，注册会员简单快捷，到店客户的粉丝 转化率提高60%`,
-					img: `${this.$constant.imgUrl}/retail/official/content-5.png`
-				},
-				{
-					title: `智能的<span class="app-color-1">会员体系</span>`,
-					subTitle: `客户充值消费自动累积成长值、自动升级会员，客户付款自动 打折，精准把握每个客户的个性和特征（二张图片）`,
-					img: `${this.$constant.imgUrl}/retail/official/content-6.png`
-				},
-				{
-					title: `经营<span class="app-color-1">数据分析</span>`,
-					subTitle: `系统实时进行数据统计，花店每个时期的经营情况一目了然，知己 知彼，方能百战百胜`,
-					img: `${this.$constant.imgUrl}/retail/official/content-7.png`
-				}
-			],
-			adData: [1, 2, 3, 4, 5, 6, 7, 8]
-		}
-	},
-	onLoad() {
-		// this.init()
-	},
-	methods: {
-		init() {
-			let token = uni.getStorageSync('token')
-			if (token) {
-				this._getDet()
-			} else {
-				this.status = -1
+	import AppSwiper from '@/components/app-swiper'
+	import AppImg from '@/components/app-img'
+	// api
+	import { applyStatus } from '@/api/official'
+	export default {
+		name: 'index',
+		components: {
+			AppSwiper,
+			AppImg
+		},
+		data() {
+			return {
+				constant: this.$constant,
+				status: -2,
+				swiper: [
+					{
+						img: `${this.$constant.imgUrl}/retail/official/banner-1.png`
+					},
+					{
+						img: `${this.$constant.imgUrl}/retail/official/banner-2.png`
+					},
+					{
+						img: `${this.$constant.imgUrl}/retail/official/banner-3.png`
+					},
+					{
+						img: `${this.$constant.imgUrl}/retail/official/banner-4.png`
+					}
+				],
+				contentData: [
+					{
+						title: `<span class="app-color-1">一键搭建</span>移动商城和小程序商城`,
+						subTitle: `各大节日商城自动涨价，客户下单自动按距离计算运费`,
+						img: `${this.$constant.imgUrl}/retail/official/content-1.png`
+					},
+					{
+						title: `<span class="app-color-1">流程化</span>管理订单`,
+						subTitle: `把控每个订单的生命周期，从下单、打单、制作到发货、配送、 送达自动通知客户，进度把控一清二楚，客户体验感大幅提升`,
+						img: `${this.$constant.imgUrl}/retail/official/content-2.png`
+					},
+					{
+						title: `提供多种的<span class="app-color-1">营销工具</span>`,
+						subTitle: `契合花店日常经营的营销工具，拉新、转化、复购、裂变， 面面俱到`,
+						img: `${this.$constant.imgUrl}/retail/official/content-3.png`
+					},
+					{
+						title: `连通各渠道来源的<span class="app-color-1">客户和订单</span>`,
+						subTitle: `线上、门店、微信、支付宝和美团等自动汇总后台，客户统一接待 回复，订单统一管理，不必再周旋于各个平台`,
+						img: `${this.$constant.imgUrl}/retail/official/content-4.png`
+					},
+					{
+						title: `<span class="app-color-1">一键吸粉 </span>注册会员`,
+						subTitle: `告别繁琐手续，一键操作，注册会员简单快捷，到店客户的粉丝 转化率提高60%`,
+						img: `${this.$constant.imgUrl}/retail/official/content-5.png`
+					},
+					{
+						title: `智能的<span class="app-color-1">会员体系</span>`,
+						subTitle: `客户充值消费自动累积成长值、自动升级会员，客户付款自动 打折，精准把握每个客户的个性和特征（二张图片）`,
+						img: `${this.$constant.imgUrl}/retail/official/content-6.png`
+					},
+					{
+						title: `经营<span class="app-color-1">数据分析</span>`,
+						subTitle: `系统实时进行数据统计，花店每个时期的经营情况一目了然，知己 知彼，方能百战百胜`,
+						img: `${this.$constant.imgUrl}/retail/official/content-7.png`
+					}
+				],
+				adData: [1, 2, 3, 4, 5, 6, 7, 8]
 			}
 		},
-		_getDet() {
-			applyStatus().then(res => {
-				this.status = res.data.status
-			})
+		onLoad() {
+			// this.init()
 		},
-		contactFn() {
-			uni.makePhoneCall({
-				phoneNumber: '05923272000'
-			})
+		methods: {
+			init() {
+				let token = uni.getStorageSync('token')
+				if (token) {
+					this._getDet()
+				} else {
+					this.status = -1
+				}
+			},
+			_getDet() {
+				applyStatus().then(res => {
+					this.status = res.data.status
+				})
+			},
+			contactFn() {
+				uni.makePhoneCall({
+					phoneNumber: '05923272000'
+				})
+			}
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>

mobile-code/src/official/pay.vue

@@ -34,69 +34,72 @@
 					<span class="app-size-40">{{ detail.price }}</span>
 				</span>
 			</div>
-			<button class="admin-button-com middle blue" @click="wxPay">支付</button>
+			<button class="admin-button-com middle blue" @click="pageTo({
+			url: '/official/apply'
+		})">免费试用</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 {
-			constant: this.$constant,
-			detail: {},
-			funcitonData: []
-		}
-	},
-	onLoad() {
-		// if (!this.$util.isLogin()) {
-		// 	getShopUser()
-		// 	return false
-		// }
-		// this.init()
-	},
-	methods: {
-		init() {
-			this.$util.getCheckLogin().then(res => {
-				if (res) {
-					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
-			})
+	// import { getShopUser } from '@/utils/auth'
+	import wexinPay from '@/utils/pay/wxPay'
+	import { getMealDet, renewWxPay } from '@/api/official'
+	export default {
+		name: 'pay-page',
+		data() {
+			return {
+				constant: this.$constant,
+				detail: {},
+				funcitonData: []
+			}
 		},
-		wxPay() {
-			renewWxPay({ id: this.detail.id }).then(res => {
-				wexinPay(res.data, this.paySuccess, this.payFail)
-			})
+		onLoad() {
+			// if (!this.$util.isLogin()) {
+			// 	getShopUser()
+			// 	return false
+			// }
+			// this.init()
 		},
-		// 支付成功
-		paySuccess() {
-			// alert('支付成功!')
-			this.$util.pageTo({
-				url: '/official/callback',
-				type: 2,
-				query: {
-					pagestatus: 2
-					// orderSn: this.option.orderSn,
-					// payDiscountPrice: res.data.discountAmount
-				}
-			})
-		},
-		payFail() {
-			this.$msg('支付失败，请重新支付！')
+		methods: {
+			init() {
+				this.$util.getCheckLogin().then(res => {
+					if (res) {
+						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('支付失败，请重新支付！')
+			}
 		}
 	}
-}
 </script>
 
 <style lang='scss' scoped>

mobile-code/src/pages.json

@@ -1,163 +1,28 @@
 {
 	"pages": [
 		{
-			"path": "pages/home/index",
+			"path": "official/index",
 			"style": {
-				"navigationBarTitleText": "加载中..."
+				"navigationBarTitleText": "花卉宝"
 			}
 		},
 		{
-			"path": "pages/home/category",
+			"path": "official/apply",
 			"style": {
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "填写资料"
 			}
 		},
 		{
-			"path": "pages/home/shop",
+			"path": "official/pay",
 			"style": {
-				"navigationBarTitleText": "门店"
+				"navigationBarTitleText": "支付"
 			}
 		},
 		{
-			"path": "pages/home/user",
+			"path": "official/callback",
 			"style": {
-				"navigationBarTitleText": "我的"
+				"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": {
@@ -167,37 +32,6 @@
 		"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/uni.scss

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

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"
-	}
-}
-