Главная Обзор Помощь
Регистрация Вход
zhh
/
front-end
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge branch 'master' of http://git.huaml.com/zhh/front-end

icssoa 6 лет назад
Родитель
d20ad34c65 e5c49c9399
Сommit
054fc4bf80
60 измененных файлов с 752 добавлено и 164 удалено
Единый вид Показать статистику Diff
  1. 1 1
      business/index.html
  2. 0 0
      business/static/js/admin-ad-add.da2ca58a.js
  3. 0 0
      business/static/js/admin-ad-add~admin-goodsManage-add~admin-goodsManage-category~admin-goodsManage-img-store.1f934a82.js
  4. 0 0
      business/static/js/admin-ad-list.52c553ad.js
  5. 0 0
      business/static/js/admin-ad-list~admin-ad-sel-goods~admin-assets-list.44355cce.js
  6. 0 0
      business/static/js/admin-ad-list~admin-coupon-list~admin-goodsManage-list~admin-home-member~admin-home-order~admin-inte~766345aa.b3671fba.js
  7. 0 0
      business/static/js/admin-ad-sel-goods.3e706ed2.js
  8. 0 0
      business/static/js/admin-ad-sel-goods~admin-staff-sel-member.3b73ee5d.js
  9. 0 0
      business/static/js/admin-assets-list.d069c38e.js
  10. 0 0
      business/static/js/admin-coupon-list.34d65546.js
  11. 0 0
      business/static/js/admin-goodsManage-add.7ca462ef.js
  12. 0 0
      business/static/js/admin-goodsManage-category.8e4ced3c.js
  13. 0 0
      business/static/js/admin-goodsManage-freight.7d45d661.js
  14. 0 0
      business/static/js/admin-goodsManage-goods-name.5f7c4b0f.js
  15. 0 0
      business/static/js/admin-goodsManage-img-store.4d4aae52.js
  16. 0 0
      business/static/js/admin-goodsManage-img-store.65093438.js
  17. 0 0
      business/static/js/admin-goodsManage-list.364ba99e.js
  18. 0 0
      business/static/js/admin-goodsManage-price-increase.dd25784b.js
  19. 0 0
      business/static/js/admin-goodsManage-price-increase.f64d0e87.js
  20. 0 0
      business/static/js/admin-home-member.1284f9d2.js
  21. 0 0
      business/static/js/admin-home-member.ee4f927d.js
  22. 0 0
      business/static/js/admin-home-order.019122f4.js
  23. 0 0
      business/static/js/admin-home-workbench.31471580.js
  24. 0 0
      business/static/js/admin-interest-invite.ecc16cb2.js
  25. 0 0
      business/static/js/admin-interest-my-invite.95c82e01.js
  26. 0 0
      business/static/js/admin-interest-setting.ae4beac6.js
  27. 0 0
      business/static/js/admin-member-add.34d34736.js
  28. 0 0
      business/static/js/admin-member-detail.27aeca0f.js
  29. 0 0
      business/static/js/admin-order-detail.d60b6d60.js
  30. 0 0
      business/static/js/admin-order-fill-form.3a9e9bfa.js
  31. 0 0
      business/static/js/admin-order-fill-form.7231654d.js
  32. 0 0
      business/static/js/admin-order-fill-form~admin-shop-add.8faafeb0.js
  33. 0 0
      business/static/js/admin-order-ship.30ea72dd.js
  34. 0 0
      business/static/js/admin-order-ship.e1b0668e.js
  35. 0 0
      business/static/js/admin-setting-coupon.0ee23357.js
  36. 0 0
      business/static/js/admin-setting-coupon.8c6ceeee.js
  37. 0 0
      business/static/js/admin-setting-level.f2741daf.js
  38. 0 0
      business/static/js/admin-setting-list.07a07de7.js
  39. 0 0
      business/static/js/admin-setting-list.4761bfcc.js
  40. 0 0
      business/static/js/admin-setting-password.32bf2e5b.js
  41. 0 0
      business/static/js/admin-setting-wx-menu.835e077f.js
  42. 0 0
      business/static/js/admin-shop-add.7477b8a8.js
  43. 0 0
      business/static/js/admin-shop-list.4ffdabf9.js
  44. 0 0
      business/static/js/admin-staff-add.3b48a980.js
  45. 0 0
      business/static/js/admin-staff-list.93d6b282.js
  46. 0 0
      business/static/js/admin-staff-list.d2b30256.js
  47. 0 0
      business/static/js/admin-staff-sel-member.2b30bcc4.js
  48. 0 0
      business/static/js/admin-statistics-index.3b1b5481.js
  49. 0 0
      business/static/js/admin-statistics-index.56bc5b4d.js
  50. 0 0
      business/static/js/chunk-vendors.77936413.js
  51. 0 0
      business/static/js/index.d4006bc8.js
  52. 0 0
      business/static/js/pages-chat-index.47be7f54.js
  53. 100 98
      mobile-code/src/admin/goodsManage/price-increase.vue
  54. 2 2
      mobile-code/src/config.js
  55. 2 0
      mobile-code/src/m-config.js
  56. 144 0
      mobile-code/src/m-manifest.json
  57. 203 0
      mobile-code/src/m-pages.json
  58. 105 0
      mobile-code/src/m-uni.scss
  59. 2 2
      mobile-code/src/manifest.json
  60. 193 61
      mobile-code/src/pages.json

+ 1 - 1
business/index.html
Просмотреть файл 

@@ -1,3 +1,3 @@
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>花卉宝</title><script>document.addEventListener('DOMContentLoaded', function() {
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>花卉宝</title><script>document.addEventListener('DOMContentLoaded', function() {
 
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 
-			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.b55178e3.js></script><script src=/static/js/index.066bf68c.js></script></body></html>
 
+			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.77936413.js></script><script src=/static/js/index.d4006bc8.js></script></body></html>

+ 0 - 0
business/static/js/admin-ad-add.bef60bd4.js → business/static/js/admin-ad-add.da2ca58a.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-ad-add~admin-goodsManage-add~admin-goodsManage-category~admin-goodsManage-img-store.37ac9696.js → business/static/js/admin-ad-add~admin-goodsManage-add~admin-goodsManage-category~admin-goodsManage-img-store.1f934a82.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-ad-list.134bc019.js → business/static/js/admin-ad-list.52c553ad.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-ad-list~admin-ad-sel-goods~admin-assets-list.a109e76e.js → business/static/js/admin-ad-list~admin-ad-sel-goods~admin-assets-list.44355cce.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-ad-list~admin-coupon-list~admin-goodsManage-list~admin-home-member~admin-home-order~admin-inte~766345aa.606540c4.js → business/static/js/admin-ad-list~admin-coupon-list~admin-goodsManage-list~admin-home-member~admin-home-order~admin-inte~766345aa.b3671fba.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-ad-sel-goods.3b040461.js → business/static/js/admin-ad-sel-goods.3e706ed2.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-ad-sel-goods~admin-staff-sel-member.6b20c451.js → business/static/js/admin-ad-sel-goods~admin-staff-sel-member.3b73ee5d.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-assets-list.3c35f38f.js → business/static/js/admin-assets-list.d069c38e.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-coupon-list.443300fb.js → business/static/js/admin-coupon-list.34d65546.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-goodsManage-add.0404915d.js → business/static/js/admin-goodsManage-add.7ca462ef.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-goodsManage-category.3bef9e31.js → business/static/js/admin-goodsManage-category.8e4ced3c.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-goodsManage-freight.0aba21dd.js → business/static/js/admin-goodsManage-freight.7d45d661.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-goodsManage-goods-name.fbcfeaec.js → business/static/js/admin-goodsManage-goods-name.5f7c4b0f.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-goodsManage-img-store.4d4aae52.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-goodsManage-img-store.65093438.js


+ 0 - 0
business/static/js/admin-goodsManage-list.4a9d6c56.js → business/static/js/admin-goodsManage-list.364ba99e.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-goodsManage-price-increase.dd25784b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-goodsManage-price-increase.f64d0e87.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-home-member.1284f9d2.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-home-member.ee4f927d.js


+ 0 - 0
business/static/js/admin-home-order.5cfe000e.js → business/static/js/admin-home-order.019122f4.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-home-workbench.1ac644e7.js → business/static/js/admin-home-workbench.31471580.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-interest-invite.05176237.js → business/static/js/admin-interest-invite.ecc16cb2.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-interest-my-invite.0e6b2fe0.js → business/static/js/admin-interest-my-invite.95c82e01.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-interest-setting.3a5c234a.js → business/static/js/admin-interest-setting.ae4beac6.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-member-add.eeb2132d.js → business/static/js/admin-member-add.34d34736.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-member-detail.2bbb7b89.js → business/static/js/admin-member-detail.27aeca0f.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-order-detail.c0345178.js → business/static/js/admin-order-detail.d60b6d60.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-order-fill-form.3a9e9bfa.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-order-fill-form.7231654d.js


+ 0 - 0
business/static/js/admin-order-fill-form~admin-shop-add.7b4610d6.js → business/static/js/admin-order-fill-form~admin-shop-add.8faafeb0.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-order-ship.30ea72dd.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-order-ship.e1b0668e.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-setting-coupon.0ee23357.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-setting-coupon.8c6ceeee.js


+ 0 - 0
business/static/js/admin-setting-level.073011d2.js → business/static/js/admin-setting-level.f2741daf.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-setting-list.07a07de7.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-setting-list.4761bfcc.js


+ 0 - 0
business/static/js/admin-setting-password.cc2cf578.js → business/static/js/admin-setting-password.32bf2e5b.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-setting-wx-menu.3c7eb481.js → business/static/js/admin-setting-wx-menu.835e077f.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-shop-add.ba53953a.js → business/static/js/admin-shop-add.7477b8a8.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-shop-list.176450e1.js → business/static/js/admin-shop-list.4ffdabf9.js
Просмотреть файл


+ 0 - 0
business/static/js/admin-staff-add.c6ed2977.js → business/static/js/admin-staff-add.3b48a980.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-staff-list.93d6b282.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-staff-list.d2b30256.js


+ 0 - 0
business/static/js/admin-staff-sel-member.e66d6f43.js → business/static/js/admin-staff-sel-member.2b30bcc4.js
Просмотреть файл


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-statistics-index.3b1b5481.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/admin-statistics-index.56bc5b4d.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/chunk-vendors.77936413.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
business/static/js/index.d4006bc8.js


+ 0 - 0
business/static/js/pages-chat-index.57532fa3.js → business/static/js/pages-chat-index.47be7f54.js
Просмотреть файл


+ 100 - 98
mobile-code/src/admin/goodsManage/price-increase.vue
Просмотреть файл 

@@ -6,120 +6,122 @@
 
 				<switch :checked="form.riseSwitch == '0' ? false : true" @change="switchChangeFn" />
 
 				<switch :checked="form.riseSwitch == '0' ? false : true" @change="switchChangeFn" />
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
-		<!-- 选项设置 -->
 
-		<div class="input-line-wrap new-wrap">
 
-			<tui-list-cell class="line-cell" :hover="false">
 
-				<div class="tui-title">要涨价节日</div>
 
-				<div class="tui-input button-wrap">
 
-					<block v-for="(item, index) in festData" :key="index">
 
-						<button class="admin-button-com" :class="[form.festIdList.includes(item.id) ? '' : 'default']" @click="selFestFn(item)">{{ item.name || '暂无' }}</button>
 
-					</block>
 
-				</div>
 
-			</tui-list-cell>
 
-			<tui-list-cell class="line-cell" :hover="false">
 
-				<div class="tui-title">涨价方式</div>
 
-				<radio-group class="tui-input flex-center-between" @change="radioChange">
 
-					<label class="list" for="customLink">
 
-						<radio id="customLink" value="0" :checked="form.riseType == 0"/>
 
-						<span class="checkbox-text">按百分比</span>
 
-					</label>
 
-					<label class="list" for="goodsLink">
 
-						<radio id="goodsLink" value="1" :checked="form.riseType == 1"/>
 
-						<span class="checkbox-text">按金额</span>
 
-					</label>
 
-				</radio-group>
 
-			</tui-list-cell>
 
-			<block v-if="form.riseType == 0">
 
+		<block v-if="form.riseSwitch != 0">
 
+			<!-- 选项设置 -->
 
+			<div class="input-line-wrap new-wrap">
 
 				<tui-list-cell class="line-cell" :hover="false">
 
 				<tui-list-cell class="line-cell" :hover="false">
 
-					<div class="tui-title">比例</div>
 
-					<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价10%，请输入10" maxlength="50" type="number" />
 
+					<div class="tui-title">要涨价节日</div>
 
+					<div class="tui-input button-wrap">
 
+						<block v-for="(item, index) in festData" :key="index">
 
+							<button class="admin-button-com" :class="[form.festIdList.includes(item.id) ? '' : 'default']" @click="selFestFn(item)">{{ item.name || '暂无' }}</button>
 
+						</block>
 
+					</div>
 
 				</tui-list-cell>
 
 				</tui-list-cell>
 
-			</block>
 
-			<block v-else>
 
 				<tui-list-cell class="line-cell" :hover="false">
 
 				<tui-list-cell class="line-cell" :hover="false">
 
-					<div class="tui-title">金额</div>
 
-					<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价80元请输入80" maxlength="50" type="number" />
 
+					<div class="tui-title">涨价方式</div>
 
+					<radio-group class="tui-input flex-center-between" @change="radioChange">
 
+						<label class="list" for="customLink">
 
+							<radio id="customLink" value="0" :checked="form.riseType == 0" />
 
+							<span class="checkbox-text">按百分比</span>
 
+						</label>
 
+						<label class="list" for="goodsLink">
 
+							<radio id="goodsLink" value="1" :checked="form.riseType == 1" />
 
+							<span class="checkbox-text">按金额</span>
 
+						</label>
 
+					</radio-group>
 
 				</tui-list-cell>
 
 				</tui-list-cell>
 
-			</block>
 
-		</div>
 
-		<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 
+				<block v-if="form.riseType == 0">
 
+					<tui-list-cell class="line-cell" :hover="false">
 
+						<div class="tui-title">比例</div>
 
+						<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价10%，请输入10" maxlength="50" type="number" />
 
+					</tui-list-cell>
 
+				</block>
 
+				<block v-else>
 
+					<tui-list-cell class="line-cell" :hover="false">
 
+						<div class="tui-title">金额</div>
 
+						<input v-model="form.riseAmount" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="涨价80元请输入80" maxlength="50" type="number" />
 
+					</tui-list-cell>
 
+				</block>
 
+			</div>
 
+			<div class="prompt-text">节日当天和前一天，勾选自动涨价的商品将统一按上面规则涨价。</div>
 
+		</block>
 
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 
 		<button class="admin-button-com blue big confirm-btn" @click="setPrice">确定</button>
 
 	</div>
 
 	</div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
-import { mapGetters } from 'vuex'
 
-import TuiListCell from '@/components/plugin/list-cell'
 
-// api
 
-import { getFest } from '@/utils/config'
 
-import { getRise, updateRise } from '@/api/goods'
 
-export default {
 
-	name: 'setting-price-increase',
 
-	components: {
 
-		TuiListCell
 
-	},
 
-	data() {
 
-		return {
 
-			// radioVal: '0',
 
-			form: {
 
-				riseSwitch: '0',
 
-				riseType: '0',
 
-				festIdList: [],
 
-				riseAmount: ''
 
-			}
 
-		}
 
-	},
 
-	computed: {
 
-		...mapGetters({ festData: 'getFest' })
 
-	},
 
-	onLoad() {
 
-		// this.init()
 
-	},
 
-	methods: {
 
-		init() {
 
-			getFest().then(() => {
 
-				this._getDet()
 
-			})
 
-		},
 
-		_getDet() {
 
-			return getRise().then(res => {
 
-				if (this.$util.isEmpty(res.data)) return
 
-				res.data.festIdList = res.data.festIdList.map(e => e + '')
 
-				Object.keys(this.form).forEach((i, index) => {
 
-					this.form[i] = res.data[i]
 
-				})
 
-			})
 
+	import { mapGetters } from 'vuex'
 
+	import TuiListCell from '@/components/plugin/list-cell'
 
+	// api
 
+	import { getFest } from '@/utils/config'
 
+	import { getRise, updateRise } from '@/api/goods'
 
+	export default {
 
+		name: 'setting-price-increase',
 
+		components: {
 
+			TuiListCell
 
 		},
 
 		},
 
-		setPrice() {
 
-			if (this.form.festIdList.length == 0) {
 
-				this.$msg('请先选择节日!')
 
-				return false
 
+		data() {
 
+			return {
 
+				// radioVal: '0',
 
+				form: {
 
+					riseSwitch: '0',
 
+					riseType: '0',
 
+					festIdList: [],
 
+					riseAmount: ''
 
+				}
 
 			}
 
 			}
 
-			if (!this.form.riseAmount) {
 
-				this.$msg('请先输入比例或者金额!')
 
-				return false
 
-			}
 
-			updateRise(this.form).then(res => {
 
-				this.$msg('更新成功!')
 
-			})
 
 		},
 
 		},
 
-		selFestFn(item) {
 
-			let index = this.form.festIdList.findIndex(e => e == item.id)
 
-			if (index == -1) {
 
-				this.form.festIdList.push(item.id)
 
-			} else {
 
-				this.form.festIdList.splice(index, 1)
 
-			}
 
+		computed: {
 
+			...mapGetters({ festData: 'getFest' })
 
 		},
 
 		},
 
-		switchChangeFn(e) {
 
-			this.form.riseSwitch = e.detail.value ? '1' : '0'
 
+		onLoad() {
 
+			// this.init()
 
 		},
 
 		},
 
-		radioChange(e) {
 
-			this.form.riseAmount = ''
 
-			this.form.riseType = e.detail.value
 
+		methods: {
 
+			init() {
 
+				getFest().then(() => {
 
+					this._getDet()
 
+				})
 
+			},
 
+			_getDet() {
 
+				return getRise().then(res => {
 
+					if (this.$util.isEmpty(res.data)) return
 
+					res.data.festIdList = res.data.festIdList.map(e => e + '')
 
+					Object.keys(this.form).forEach((i, index) => {
 
+						this.form[i] = res.data[i]
 
+					})
 
+				})
 
+			},
 
+			setPrice() {
 
+				if (this.form.festIdList.length == 0) {
 
+					this.$msg('请先选择节日!')
 
+					return false
 
+				}
 
+				if (!this.form.riseAmount) {
 
+					this.$msg('请先输入比例或者金额!')
 
+					return false
 
+				}
 
+				updateRise(this.form).then(res => {
 
+					this.$msg('更新成功!')
 
+				})
 
+			},
 
+			selFestFn(item) {
 
+				let index = this.form.festIdList.findIndex(e => e == item.id)
 
+				if (index == -1) {
 
+					this.form.festIdList.push(item.id)
 
+				} else {
 
+					this.form.festIdList.splice(index, 1)
 
+				}
 
+			},
 
+			switchChangeFn(e) {
 
+				this.form.riseSwitch = e.detail.value ? '1' : '0'
 
+			},
 
+			radioChange(e) {
 
+				this.form.riseAmount = ''
 
+				this.form.riseType = e.detail.value
 
+			}
 
 		}
 
 		}
 
 	}
 
 	}
 
-}
 
 </script>
 
 </script>
 
 
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>

+ 2 - 2
mobile-code/src/config.js
Просмотреть файл 

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

+ 2 - 0
mobile-code/src/m-config.js
Просмотреть файл 

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

+ 144 - 0
mobile-code/src/m-manifest.json
Просмотреть файл 

@@ -0,0 +1,144 @@
 
+{
 
+    "name" : "花卉宝",
 
+    "appid" : "",
 
+    "description" : "应用描述",
 
+    "versionName" : "1.0.0",
 
+    "versionCode" : "100",
 
+    "transformPx" : true,
 
+    /* 5+App特有相关 */
 
+    "app-plus" : {
 
+        "usingComponents" : true,
 
+        "nvueCompiler" : "uni-app",
 
+        "compilerVersion" : 3,
 
+        "nvueLaunchMode" : "fast",
 
+        "splashscreen" : {
 
+            "alwaysShowBeforeRender" : true,
 
+            "waiting" : true,
 
+            "autoclose" : true,
 
+            "delay" : 0
 
+        },
 
+        "modules" : {
 
+            "OAuth" : {},
 
+            "Payment" : {},
 
+            "Push" : {},
 
+            "Share" : {},
 
+            "Speech" : {},
 
+            "VideoPlayer" : {}
 
+        },
 
+        /* 应用发布信息 */
 
+        "distribute" : {
 
+            /* android打包配置 */
 
+            "android" : {
 
+                "permissions" : [
 
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
 
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
 
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
 
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
 
+                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
 
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
 
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
 
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
 
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
 
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
 
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
 
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
 
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
 
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
 
+                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
 
+                ]
 
+            },
 
+            /* ios打包配置 */
 
+            "ios" : {
 
+                "UIBackgroundModes" : [ "audio" ],
 
+                "urlschemewhitelist" : [ "baidumap", "iosamap" ]
 
+            },
 
+            /* SDK配置 */
 
+            "sdkConfigs" : {
 
+                "speech" : {
 
+                    "ifly" : {}
 
+                }
 
+            },
 
+            "orientation" : [ "portrait-primary" ]
 
+        }
 
+    },
 
+    /* 快应用特有相关 */
 
+    "quickapp" : {},
 
+    /* 小程序特有相关 */
 
+    "mp-weixin" : {
 
+        "appid" : "wxe4675bab299a52f7",
 
+        "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" : "/"
 
+        },
 
+        "async": {
 
+            "timeout": 200000
 
+        },
 
+        "optimization": {
 
+            "treeShaking": {
 
+                "enable": true
 
+            }
 
+        },
 
+        "devServer": {
 
+            "port": 81,
 
+            "proxy": {
 
+                "/api": {
 
+                    "target": "http://api.m.huaml.com",
 
+                    "secure": false,
 
+                    "changeOrigin": true,
 
+                    "pathRewrite": {
 
+                        "^/api": ""
 
+                    }
 
+                }
 
+            }
 
+        },
 
+        "sdkConfigs" : {
 
+            "maps" : {
 
+                "qqmap" : {
 
+                    "key" : ""
 
+                }
 
+            }
 
+        },
 
+        "async" : {
 
+            "timeout" : 20000
 
+        }
 
+    }
 
+}

+ 203 - 0
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": "common/redirect",
 
+			"style": {
 
+				"navigationBarTitleText": "加载中..."
 
+			}
 
+		},
 
+		{
 
+			"path": "common/webview",
 
+			"style": {
 
+				"navigationBarBackgroundColor": "#ffffff",
 
+				"navigationBarTextStyle": "black"
 
+			}
 
+		}
 
+	],
 
+	"subPackages": [
 
+		{
 
+			"root": "pages/user",
 
+			"pages": [
 
+				{
 
+					"path": "register",
 
+					"style": {
 
+						"navigationBarTitleText": "注册"
 
+					}
 
+				},
 
+				{
 
+					"path": "password",
 
+					"style": {
 
+						"navigationBarTitleText": "修改密码"
 
+					}
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/goods",
 
+			"pages": [
 
+				{
 
+					"path": "detail",
 
+					"style": {
 
+						"navigationBarTitleText": "详情"
 
+					}
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/pay",
 
+			"pages": [
 
+				{
 
+					"path": "index",
 
+					"style": {
 
+						"navigationBarTitleText": ""
 
+					}
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/callback",
 
+			"pages": [
 
+				{
 
+					"path": "index"
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/coupon",
 
+			"pages": [
 
+				{
 
+					"path": "list",
 
+					"style": {
 
+						"navigationBarTitleText": "优惠券",
 
+						"enablePullDownRefresh": true
 
+					}
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/order",
 
+			"pages": [
 
+				{
 
+					"path": "list",
 
+					"style": {
 
+						"navigationBarTitleText": "订单列表",
 
+						"enablePullDownRefresh": true
 
+					}
 
+				},
 
+				{
 
+					"path": "detail",
 
+					"style": {
 
+						"navigationBarTitleText": "订单列表"
 
+					}
 
+				},
 
+				{
 
+					"path": "buy",
 
+					"style": {
 
+						"navigationBarTitleText": "订单确认"
 
+					}
 
+				},
 
+				{
 
+					"path": "comment",
 
+					"style": {
 
+						"navigationBarTitleText": "评价"
 
+					}
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/interest",
 
+			"pages": [
 
+				{
 
+					"path": "invite",
 
+					"style": {
 
+						"navigationBarTitleText": "邀请排行",
 
+						"enablePullDownRefresh": true
 
+					}
 
+				},
 
+				{
 
+					"path": "level",
 
+					"style": {
 
+						"navigationBarTitleText": "会员等级",
 
+						"enablePullDownRefresh": true
 
+					}
 
+				}
 
+			]
 
+		},
 
+		{
 
+			"root": "pages/chat",
 
+			"pages": [
 
+				{
 
+					"path": "index",
 
+					"style": {
 
+						"navigationBarTitleText": "客服",
 
+						"enablePullDownRefresh": true
 
+					}
 
+				}
 
+			]
 
+		}
 
+	],
 
+	"globalStyle": {
 
+		// #ifdef H5
 
+		"navigationStyle": "custom",
 
+		// #endif
 
+		"navigationBarBackgroundColor": "#fff",
 
+		"navigationBarTitleText": "花卉宝",
 
+		"navigationBarTextStyle": "black"
 
+	},
 
+	"tabBar": {
 
+		"color": "#C0C4CC",
 
+		"selectedColor": "#fa436a",
 
+		"borderStyle": "black",
 
+		"backgroundColor": "#ffffff",
 
+		"list": [{
 
+				"pagePath": "pages/home/index",
 
+				"iconPath": "static/images/common/home-no.png",
 
+				"selectedIconPath": "static/images/common/home-is.png",
 
+				"text": "首页"
 
+			},
 
+			{
 
+				"pagePath": "pages/home/category",
 
+				"iconPath": "static/images/common/category-no.png",
 
+				"selectedIconPath": "static/images/common/category-is.png",
 
+				"text": "分类"
 
+			},
 
+			{
 
+				"pagePath": "pages/home/shop",
 
+				"iconPath": "static/images/common/shop-no.png",
 
+				"selectedIconPath": "static/images/common/shop-is.png",
 
+				"text": "门店"
 
+			},
 
+			{
 
+				"pagePath": "pages/home/user",
 
+				"iconPath": "static/images/common/user-no.png",
 
+				"selectedIconPath": "static/images/common/user-is.png",
 
+				"text": "我的"
 
+			}
 
+		]
 
+	}
 
+}
 
+

+ 105 - 0
mobile-code/src/m-uni.scss
Просмотреть файл 

@@ -0,0 +1,105 @@
 
+/***
 
+全局scss 变量和方法 存放处
 
+ */
 
+//  uniapp upx换算函数
 
+//  uni.upx2px(val) + 'px'
 
+/* 引入minxin */
 
+@import '~@/static/css/minxin.scss';
 
+
 
+/* 颜色变量 */
 
+/*图片地址*/
 
+$imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
+
 
+// 所有样式为公共样式，已在全局引用可直接使用
 
+// 主色
 
+$mainColor: #FF2842;
 
+$mainColor1: #049E2C;
 
+$auxiliaryColor2: #ff6900;
 
+
 
+$blueColor: #2965fe;
 
+$greenColor: #049E2C;
 
+$redColor: #ff3841;
 
+// 字体色
 
+$fontColorMain: #333333;
 
+$fontColor2: #666666;
 
+$fontColor3: #999999;
 
+$fontColor4: #bbbbbb;
 
+$fontColor5: #cccccc;
 
+// 边框
 
+$borderColor: #eee;
 
+$borderColor1: #46963E;
 
+// 背景色
 
+$backColor: #f5f5f5;
 
+
 
+// minxin
 
+@mixin disFlexCen(){
 
+    display:flex;
 
+    display: -webkit-flex;
 
+    display: -moz-flex;
 
+    display: -ms-flex;
 
+    align-items: center;
 
+}
 
+
 
+// =============================================== 下方为uniapp原生样式变量 ======================================
 
+
 
+/* 行为相关颜色 */
 
+$uni-color-primary: #007aff;
 
+$uni-color-success: #4cd964;
 
+$uni-color-warning: #f0ad4e;
 
+$uni-color-error: #dd524d;
 
+
 
+/* 文字基本颜色 */
 
+$uni-text-color:#333;//基本色
 
+$uni-text-color-inverse:#fff;//反色
 
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
 
+$uni-text-color-placeholder: #808080;
 
+$uni-text-color-disable:#c0c0c0;
 
+
 
+/* 背景颜色 */
 
+$uni-bg-color:#ffffff;
 
+$uni-bg-color-grey:#f8f8f8;
 
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
 
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
 
+
 
+/* 边框颜色 */
 
+$uni-border-color:#c8c7cc;
 
+
 
+/* 尺寸变量 */
 
+
 
+/* 文字尺寸 */
 
+$uni-font-size-sm:24upx;
 
+$uni-font-size-base:28upx;
 
+$uni-font-size-lg:32upx;
 
+
 
+/* 图片尺寸 */
 
+$uni-img-size-sm:40upx;
 
+$uni-img-size-base:52upx;
 
+$uni-img-size-lg:80upx;
 
+
 
+/* Border Radius */
 
+$uni-border-radius-sm: 4upx;
 
+$uni-border-radius-base: 6upx;
 
+$uni-border-radius-lg: 12upx;
 
+$uni-border-radius-circle: 50%;
 
+
 
+/* 水平间距 */
 
+$uni-spacing-row-sm: 10px;
 
+$uni-spacing-row-base: 20upx;
 
+$uni-spacing-row-lg: 30upx;
 
+
 
+/* 垂直间距 */
 
+$uni-spacing-col-sm: 8upx;
 
+$uni-spacing-col-base: 16upx;
 
+$uni-spacing-col-lg: 24upx;
 
+
 
+/* 透明度 */
 
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
+
 
+/* 文章场景相关 */
 
+$uni-color-title: #2C405A; // 文章标题颜色
 
+$uni-font-size-title:40upx;
 
+$uni-color-subtitle: #555555; // 二级标题颜色
 
+$uni-font-size-subtitle:36upx;
 
+$uni-color-paragraph: #3F536E; // 文章段落颜色
 
+$uni-font-size-paragraph:30upx;
 
+

+ 2 - 2
mobile-code/src/manifest.json
Просмотреть файл 

@@ -90,7 +90,7 @@
 
         "usingComponents" : true,
 
         "usingComponents" : true,
 
         "permission" : {
 
         "permission" : {
 
             "scope.userLocation" : {
 
             "scope.userLocation" : {
 
-                "desc" : "获取位置信息后为您提供个性化推荐"
 
+                "desc" : "请点击确定"
 
             }
 
             }
 
         }
 
         }
 
     },
 
     },
 
@@ -121,7 +121,7 @@
 
             "port": 81,
 
             "port": 81,
 
             "proxy": {
 
             "proxy": {
 
                 "/api": {
 
                 "/api": {
 
-                    "target": "http://api.m.huaml.com",
 
+                    "target": "http://api.b.huaml.com",
 
                     "secure": false,
 
                     "secure": false,
 
                     "changeOrigin": true,
 
                     "changeOrigin": true,
 
                     "pathRewrite": {
 
                     "pathRewrite": {

+ 193 - 61
mobile-code/src/pages.json
Просмотреть файл 

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

Некоторые файлы не были показаны из-за большого количества измененных файлов