صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
zhh
/
front-end
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

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

icssoa 6 سال پیش
والد
e11a163b18 025c53006f
کامیت
603f7950f9
97فایلهای تغییر یافته به همراه413 افزوده شده و 412 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 1 1
      admin-update/src/mock/userInfo.js
  2. 3 3
      admin-update/src/views/goods/goods-add.vue
  3. 1 1
      admin-update/src/views/goods/summary.vue
  4. 1 1
      admin-update/src/views/invite/reward-set.vue
  5. 1 1
      business/index.html
  6. 0 0
      business/static/js/admin-ad-add.da2ca58a.js
  7. 0 0
      business/static/js/admin-ad-add~admin-goodsManage-add~admin-goodsManage-category~admin-goodsManage-img-store.1f934a82.js
  8. 0 0
      business/static/js/admin-ad-list.021c31e5.js
  9. 0 0
      business/static/js/admin-ad-list.43850cd3.js
  10. 0 0
      business/static/js/admin-ad-list~admin-ad-sel-goods~admin-assets-list.44355cce.js
  11. 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
  12. 0 0
      business/static/js/admin-ad-sel-goods.fe829920.js
  13. 0 0
      business/static/js/admin-ad-sel-goods~admin-staff-sel-member.016eda39.js
  14. 0 0
      business/static/js/admin-ad-sel-goods~admin-staff-sel-member.3b73ee5d.js
  15. 0 0
      business/static/js/admin-assets-list.90969a76.js
  16. 0 0
      business/static/js/admin-coupon-list.b63ada10.js
  17. 0 0
      business/static/js/admin-goodsManage-add.3561d1a9.js
  18. 0 0
      business/static/js/admin-goodsManage-category.5ffe55db.js
  19. 0 0
      business/static/js/admin-goodsManage-category.6d978793.js
  20. 0 0
      business/static/js/admin-goodsManage-freight.7abda843.js
  21. 0 0
      business/static/js/admin-goodsManage-goods-name.5f7c4b0f.js
  22. 0 0
      business/static/js/admin-goodsManage-img-store.4d4aae52.js
  23. 0 0
      business/static/js/admin-goodsManage-img-store.65093438.js
  24. 0 0
      business/static/js/admin-goodsManage-list.364ba99e.js
  25. 0 0
      business/static/js/admin-goodsManage-list.bff03417.js
  26. 0 0
      business/static/js/admin-goodsManage-price-increase.339f2c17.js
  27. 0 0
      business/static/js/admin-home-member.aa39e400.js
  28. 0 0
      business/static/js/admin-home-member.ea2dc98d.js
  29. 0 0
      business/static/js/admin-home-order.7ceeb570.js
  30. 0 0
      business/static/js/admin-home-order.a2791b3f.js
  31. 0 0
      business/static/js/admin-home-workbench.31471580.js
  32. 0 0
      business/static/js/admin-interest-invite.eb7fadfb.js
  33. 0 0
      business/static/js/admin-interest-invite.ecc16cb2.js
  34. 0 0
      business/static/js/admin-interest-my-invite.95c82e01.js
  35. 0 0
      business/static/js/admin-interest-my-invite.9db13711.js
  36. 0 0
      business/static/js/admin-interest-setting.cb9c8e29.js
  37. 0 0
      business/static/js/admin-interest-setting.d378becd.js
  38. 0 0
      business/static/js/admin-member-add.34d34736.js
  39. 0 0
      business/static/js/admin-member-detail.27aeca0f.js
  40. 0 0
      business/static/js/admin-order-detail.c423ed1b.js
  41. 0 0
      business/static/js/admin-order-detail.c72c8efb.js
  42. 0 0
      business/static/js/admin-order-fill-form.67c57461.js
  43. 0 0
      business/static/js/admin-order-fill-form.a30a31a4.js
  44. 0 0
      business/static/js/admin-order-fill-form~admin-shop-add.8faafeb0.js
  45. 0 0
      business/static/js/admin-order-fill-form~admin-shop-add.ae171db0.js
  46. 0 0
      business/static/js/admin-order-ship.51d8c0f9.js
  47. 0 0
      business/static/js/admin-order-ship.e1b0668e.js
  48. 0 0
      business/static/js/admin-setting-coupon.82bee912.js
  49. 0 0
      business/static/js/admin-setting-level.f2741daf.js
  50. 0 0
      business/static/js/admin-setting-level.f523679a.js
  51. 0 0
      business/static/js/admin-setting-list.6ea8bb41.js
  52. 0 0
      business/static/js/admin-setting-password.32bf2e5b.js
  53. 0 0
      business/static/js/admin-setting-wx-menu.835e077f.js
  54. 0 0
      business/static/js/admin-shop-add.7477b8a8.js
  55. 0 0
      business/static/js/admin-shop-add.aa912ee7.js
  56. 0 0
      business/static/js/admin-shop-list.81305610.js
  57. 0 0
      business/static/js/admin-staff-add.3b48a980.js
  58. 0 0
      business/static/js/admin-staff-add.618bb73a.js
  59. 0 0
      business/static/js/admin-staff-list.3e370004.js
  60. 0 0
      business/static/js/admin-staff-list.ee5d9d99.js
  61. 0 0
      business/static/js/admin-staff-sel-member.e7a12c8e.js
  62. 0 0
      business/static/js/admin-statistics-index.55c96ca0.js
  63. 0 0
      business/static/js/admin-statistics-index.56bc5b4d.js
  64. 0 0
      business/static/js/chunk-vendors.efd09b84.js
  65. 0 0
      business/static/js/index.4e891a86.js
  66. 0 0
      business/static/js/index.83fc624e.js
  67. 0 0
      business/static/js/pages-chat-index.47be7f54.js
  68. 0 0
      business/static/js/pages-chat-index.8fd296b7.js
  69. 1 1
      mobile-code-back/src/admin/goodsManage/add.vue
  70. 1 1
      mobile-code-back/src/admin/goodsManage/freight.vue
  71. 1 1
      mobile-code-back/src/admin/interest/setting.vue
  72. 2 2
      mobile-code-back/src/components/app-coupon-sel.vue
  73. 8 8
      mobile-code-back/src/official/index.vue
  74. 5 5
      mobile-code-back/src/pages/home/user.vue
  75. 3 3
      mobile-code/src/App.vue
  76. 1 1
      mobile-code/src/admin/goodsManage/add.vue
  77. 1 1
      mobile-code/src/admin/goodsManage/freight.vue
  78. 1 1
      mobile-code/src/admin/interest/setting.vue
  79. 1 1
      mobile-code/src/admin/order/components/sel-ship-confirm.vue
  80. 3 3
      mobile-code/src/admin/order/fill-form.vue
  81. 0 2
      mobile-code/src/b-config.js
  82. 0 335
      mobile-code/src/b-pages.json
  83. 2 2
      mobile-code/src/components/app-coupon-sel.vue
  84. 2 1
      mobile-code/src/components/app-delivery.vue
  85. 1 1
      mobile-code/src/components/module/app-activily-coupon.vue
  86. 2 2
      mobile-code/src/config.js
  87. 2 2
      mobile-code/src/manifest.json
  88. 8 8
      mobile-code/src/official/index.vue
  89. 306 8
      mobile-code/src/pages.json
  90. 5 5
      mobile-code/src/pages/home/user - 副本.vue
  91. 5 5
      mobile-code/src/pages/home/user.vue
  92. 2 2
      mobile-code/src/pages/pay/index.vue
  93. 1 1
      mobile-code/src/uni.scss
  94. 2 0
      mobile-code/src/w-config.js
  95. 2 2
      mobile-code/src/w-manifest.json
  96. 37 0
      mobile-code/src/w-pages.json
  97. 1 1
      mobile-code/src/w-uni.scss

+ 1 - 1
admin-update/src/mock/userInfo.js
مشاهده فایل 

@@ -276,7 +276,7 @@ let menu = {
 
 		{
 
 			id: '406',
 
 			parentId: '4',
 
-			name: '节日自动涨价',
 
+			name: '自动涨价',
 
 			type: 1,
 
 			icon: 'icon-user',
 
 			orderNum: 4,

+ 3 - 3
admin-update/src/views/goods/goods-add.vue
مشاهده فایل 

@@ -109,7 +109,7 @@
 
 					<cl-editor-quill v-model="ruleForm.content" @load="editor"></cl-editor-quill>
 
 					<!-- <el-input type="textarea" v-model="ruleForm.desc"></el-input> -->
 
 				</el-form-item>
 
-				<el-form-item label="节日自动涨价 ">
 
+				<el-form-item label="自动涨价 ">
 
 					<el-checkbox-group v-model="ruleForm.autoRise">
 
 						<el-checkbox label="1" name="autoRise" true-label="1" false-label="0">
 
 							<span>需要</span>
 
@@ -120,7 +120,7 @@
 
 							trigger="hover"
 
 							v-model="autoPricePopover"
 
 						>
 
-							<p>特定节日商品会自动进行涨价 无需手动调价</p>
 
+							<p>节日当天和前一天，商品会自动根据设置统一涨价</p>
 
 							<div style="text-align: right; margin-top: 10px">
 
 								<el-button
 
 									size="mini"
 
@@ -156,7 +156,7 @@
 
 							trigger="hover"
 
 							v-model="chargePopover"
 
 						>
 
-							<p>5公里内免运费，超过5公里每增加1公里运费增加2元</p>
 
+							<p>5公里内免运费，超过每增加1公里运费增加2元</p>
 
 							<div style="text-align: right; margin-top: 10px">
 
 								<el-button size="mini" type="primary" @click="chargePopover = false"
 
 									>修改</el-button

+ 1 - 1
admin-update/src/views/goods/summary.vue
مشاهده فایل 

@@ -7,7 +7,7 @@
 
 			<el-form-item>
 
 				<div class="app-color-3">
 
 					<i class="el-icon-warning" style="margin-right: 4px"></i>
 
-					<span>说明：商品介绍的后半部分，将会显示上面的内容。</span>
 
+					<span>商品详情的后半部分内容，可以填写一些养护知识和友情提示等。</span>
 
 				</div>
 
 			</el-form-item>
 
 			<el-form-item>

+ 1 - 1
admin-update/src/views/invite/reward-set.vue
مشاهده فایل 

@@ -29,7 +29,7 @@
 
 			</el-form-item>
 
 			<el-form-item>
 
 				<div class="app-color-3">
 
-					提示：奖励额度可以比新人领券高一此，这样可以吸引老客户邀请新人，新人也更愿意到店消费。
 
+					新人奖励可以设置得高一些，这样可以吸引新客户到店消费。
 
 				</div>
 
 			</el-form-item>
 
 			<el-form-item>

+ 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() {
 
 				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.8904691a.js></script><script src=/static/js/index.83fc624e.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.efd09b84.js></script><script src=/static/js/index.4e891a86.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.021c31e5.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-ad-list.43850cd3.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.70ca4cc2.js → business/static/js/admin-ad-sel-goods.fe829920.js
مشاهده فایل


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-ad-sel-goods~admin-staff-sel-member.016eda39.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-ad-sel-goods~admin-staff-sel-member.3b73ee5d.js


+ 0 - 0
business/static/js/admin-assets-list.19ee601f.js → business/static/js/admin-assets-list.90969a76.js
مشاهده فایل


+ 0 - 0
business/static/js/admin-coupon-list.c69157d2.js → business/static/js/admin-coupon-list.b63ada10.js
مشاهده فایل


+ 0 - 0
business/static/js/admin-goodsManage-add.5fcb891b.js → business/static/js/admin-goodsManage-add.3561d1a9.js
مشاهده فایل


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-goodsManage-category.5ffe55db.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-goodsManage-category.6d978793.js


+ 0 - 0
business/static/js/admin-goodsManage-freight.fb6ed61e.js → business/static/js/admin-goodsManage-freight.7abda843.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.364ba99e.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-goodsManage-list.bff03417.js


+ 0 - 0
business/static/js/admin-goodsManage-price-increase.dd25784b.js → business/static/js/admin-goodsManage-price-increase.339f2c17.js
مشاهده فایل


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-home-member.aa39e400.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-home-member.ea2dc98d.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-home-order.7ceeb570.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-home-order.a2791b3f.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.eb7fadfb.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-interest-invite.ecc16cb2.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-interest-my-invite.95c82e01.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-interest-my-invite.9db13711.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-interest-setting.cb9c8e29.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-interest-setting.d378becd.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.c423ed1b.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-detail.c72c8efb.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-fill-form.67c57461.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-fill-form.a30a31a4.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-fill-form~admin-shop-add.8faafeb0.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-fill-form~admin-shop-add.ae171db0.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-ship.51d8c0f9.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-order-ship.e1b0668e.js


+ 0 - 0
business/static/js/admin-setting-coupon.0ee23357.js → business/static/js/admin-setting-coupon.82bee912.js
مشاهده فایل


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-setting-level.f2741daf.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-setting-level.f523679a.js


+ 0 - 0
business/static/js/admin-setting-list.07a07de7.js → business/static/js/admin-setting-list.6ea8bb41.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.7477b8a8.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-shop-add.aa912ee7.js


+ 0 - 0
business/static/js/admin-shop-list.7de6f5d1.js → business/static/js/admin-shop-list.81305610.js
مشاهده فایل


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-staff-add.3b48a980.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-staff-add.618bb73a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-staff-list.3e370004.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-staff-list.ee5d9d99.js


+ 0 - 0
business/static/js/admin-staff-sel-member.c747f0ca.js → business/static/js/admin-staff-sel-member.e7a12c8e.js
مشاهده فایل


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-statistics-index.55c96ca0.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/admin-statistics-index.56bc5b4d.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/chunk-vendors.efd09b84.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/index.4e891a86.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/index.83fc624e.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/pages-chat-index.47be7f54.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
business/static/js/pages-chat-index.8fd296b7.js


+ 1 - 1
mobile-code-back/src/admin/goodsManage/add.vue
مشاهده فایل 

@@ -34,7 +34,7 @@
 
 					<div v-else class="tui-placeholder">请选择</div>
 
 				</tui-list-cell>-->
 
 				<tui-list-cell class="line-cell" :hover="false">
 
-					<div class="tui-title">节假日自动涨价</div>
 
+					<div class="tui-title">自动涨价</div>
 
 					<label for="autoPrice" class="tui-input" @click="autoRiseChange(form.autoRise)">
 
 						<checkbox id="autoPrice" class="ljd-checkbox" :checked="form.autoRise == 1"></checkbox>
 
 						<span>需要</span>

+ 1 - 1
mobile-code-back/src/admin/goodsManage/freight.vue
مشاهده فایل 

@@ -4,7 +4,7 @@
 
 			<div class="module-det">
 
 				<div>
 
 					<input type="text" v-model="form.first" class="setting-inp" />
 
-					<span>公里内免运费，超过 5 公里每增加1公里，</span>
 
+					<span>公里内免运费，超过每增加1公里，</span>
 
 				</div>
 
 				<div>
 
 					<span>运费增加</span>

+ 1 - 1
mobile-code-back/src/admin/interest/setting.vue
مشاهده فایل 

@@ -27,7 +27,7 @@
 
                 </div>
 
 			</div>
 
 		</div>
 
-		<div class="prompt-text">提示：奖励额度可以比新人领券高一此, 这样可以吸引老客户邀请 新人，新人也更愿意到店消费。</div>
 
+		<div class="prompt-text">新人奖励可以设置得高一些，这样可以吸引新客户到店消费。</div>
 
 		<div class="admin-button-com blue big" @click="confirmFn">确认</div>
 
 	</div>
 
 </template>

+ 2 - 2
mobile-code-back/src/components/app-coupon-sel.vue
مشاهده فایل 

@@ -6,7 +6,7 @@
 
 				<div class="sel-list flex-center-between" v-if="discountArr.indexOf('member') > -1">
 
 					<div class="sel-tit">
 
 						<radio value="1" :checked="memberCheck" />
 
-						<span class="dis-pormpt">您是{{ shopUser.userAsset.member }}级会员，享{{ shopUser.userAsset.discount }}折优惠</span>
 
+						<span class="dis-pormpt">会员身份({{ shopUser.userAsset.member }}级 {{ shopUser.userAsset.discount }}折)</span>
 
 					</div>
 
 					<div class="app-price app-size-28">-￥{{ totalDiscountPrice }}</div>
 
 				</div>
 
@@ -14,7 +14,7 @@
 
 				<div class="sel-list" v-if="discountArr.indexOf('coupon') > -1">
 
 					<div class="sel-tit">
 
 						<radio value="2" />
 
-						<span class="dis-pormpt">您有优惠券可用，请选择</span>
 
+						<span class="dis-pormpt">使用优惠券</span>
 
 					</div>
 
 					<div class="coupon-wrap" v-show="selIndex == 2">
 
 						<div class="coupon-list" v-for="(item, index) in data.coupon" :key="index" @click="couponChange(item, index + 1)">

+ 8 - 8
mobile-code-back/src/official/index.vue
مشاهده فایل 

@@ -97,32 +97,32 @@ export default {
 
 				},
 
 				{
 
 					title: `<span class="app-color-1">流程化</span>管理订单`,
 
-					subTitle: `把控每个订单的生命周期，从下单、打单、制作到发货、配送、 送达自动通知客户，进度把控一清二楚，客户体验感大幅提升`,
 
+					subTitle: `有效把控订单的生命周期，从下单、打单、制作到发货、配送、 送达自动通知客户，大幅提升客户体验`,
 
 					img: `${this.$constant.imgUrl}/retail/official/content-2.png`
 
 				},
 
 				{
 
-					title: `提供多种的<span class="app-color-1">营销工具</span>`,
 
+					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: `线上、门店、微信、支付宝和美团等自动汇总后台，客户统一接待 回复，订单统一管理，不必再周旋于各个平台`,
 
+					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%`,
 
+					subTitle: `告别繁琐手续，一键操作，注册会员简单快捷，到店客户粉丝转化率提升80%`,
 
 					img: `${this.$constant.imgUrl}/retail/official/content-5.png`
 
 				},
 
 				{
 
-					title: `智能的<span class="app-color-1">会员体系</span>`,
 
-					subTitle: `客户充值消费自动累积成长值、自动升级会员，客户付款自动 打折，精准把握每个客户的个性和特征`,
 
+					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: `系统实时进行数据统计，花店每个时期的经营情况一目了然，知己 知彼，方能百战百胜`,
 
+					subTitle: `系统实时分析数据，花店每个时期的经营情况一目了然，知己知彼，百战百胜`,
 
 					img: `${this.$constant.imgUrl}/retail/official/content-7.png`
 
 				}
 
 			],

+ 5 - 5
mobile-code-back/src/pages/home/user.vue
مشاهده فایل 

@@ -78,7 +78,7 @@
 
 				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/invite')">
 
 					<div class="list-wrap">
 
 						<div class="list-label">我的邀请</div>
 
-						<div class="list-text">领金币奖励</div>
 
+						<div class="list-text">领取奖励</div>
 
 					</div>
 
 				</tui-list-cell>
 
 				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/coupon/list')">
 
@@ -86,14 +86,14 @@
 
 						<div class="list-label">我的优惠券</div>
 
 					</div>
 
 				</tui-list-cell>
 
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 
 					<div class="list-wrap">
 
-						<div class="list-label">支付密码设置</div>
 
+						<div class="list-label">会员权益</div>
 
 					</div>
 
 				</tui-list-cell>
 
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 
 					<div class="list-wrap">
 
-						<div class="list-label">会员权益</div>
 
+						<div class="list-label">支付密码设置</div>
 
 					</div>
 
 				</tui-list-cell>
 
 			</tui-list-view>

+ 3 - 3
mobile-code/src/App.vue
مشاهده فایل 

@@ -22,12 +22,12 @@ export default {
 
 		// #endif
 
 		// 开发
 
 		if (process.env.NODE_ENV == 'development') {
 
-			uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJhdWQiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJqdGkiOiIwXzEyNTQzNzQ1IiwiaWF0IjoxNTgyNDY5NDIzLCJuYmYiOjE1ODI0Njk0MjMsImV4cCI6MTU5MTEwOTQyMywidW5pcXVlSWQiOiIxMjU0Mzc0NSIsInNvdXJjZUlkIjowfQ.ebTPvzLj4aI8F4iLHy_UdsVlAI-KyzErGQbJhPL1YRY')
 
+			uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNyJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfNyIsImlhdCI6MTU4MjAyOTY2MywibmJmIjoxNTgyMDI5NjYzLCJleHAiOjE1OTA2Njk2NjMsInVuaXF1ZUlkIjoiNyIsInNvdXJjZUlkIjowfQ.v04WwuiNYArwrCzERY--uB3mWx4r2Za2R0chdjdTZF4')
 
 			uni.setStorageSync('account', '12362')
 
 		}
 
-		// mmm
 
-		// eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNyJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfNyIsImlhdCI6MTU4MjAyOTY2MywibmJmIjoxNTgyMDI5NjYzLCJleHAiOjE1OTA2Njk2NjMsInVuaXF1ZUlkIjoiNyIsInNvdXJjZUlkIjowfQ.v04WwuiNYArwrCzERY--uB3mWx4r2Za2R0chdjdTZF4
 
 		// bbb
 
+		// eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNyJ9.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfNyIsImlhdCI6MTU4MjAyOTY2MywibmJmIjoxNTgyMDI5NjYzLCJleHAiOjE1OTA2Njk2NjMsInVuaXF1ZUlkIjoiNyIsInNvdXJjZUlkIjowfQ.v04WwuiNYArwrCzERY--uB3mWx4r2Za2R0chdjdTZF4
 
+		// mmm
 
 		// eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJhdWQiOiJodHRwOlwvXC9hcGkubS5odWFtbC5jb20iLCJqdGkiOiIwXzEyNTQzNzQ1IiwiaWF0IjoxNTgyNDY5NDIzLCJuYmYiOjE1ODI0Njk0MjMsImV4cCI6MTU5MTEwOTQyMywidW5pcXVlSWQiOiIxMjU0Mzc0NSIsInNvdXJjZUlkIjowfQ.ebTPvzLj4aI8F4iLHy_UdsVlAI-KyzErGQbJhPL1YRY
 
 	},
 
 	onShow() {

+ 1 - 1
mobile-code/src/admin/goodsManage/add.vue
مشاهده فایل 

@@ -34,7 +34,7 @@
 
 					<div v-else class="tui-placeholder">请选择</div>
 
 				</tui-list-cell>-->
 
 				<tui-list-cell class="line-cell" :hover="false">
 
-					<div class="tui-title">节假日自动涨价</div>
 
+					<div class="tui-title">自动涨价</div>
 
 					<label for="autoPrice" class="tui-input" @click="autoRiseChange(form.autoRise)">
 
 						<checkbox id="autoPrice" class="ljd-checkbox" :checked="form.autoRise == 1"></checkbox>
 
 						<span>需要</span>

+ 1 - 1
mobile-code/src/admin/goodsManage/freight.vue
مشاهده فایل 

@@ -4,7 +4,7 @@
 
 			<div class="module-det">
 
 				<div>
 
 					<input type="text" v-model="form.first" class="setting-inp" />
 
-					<span>公里内免运费，超过 5 公里每增加1公里，</span>
 
+					<span>公里内免运费，超过每增加1公里，</span>
 
 				</div>
 
 				<div>
 
 					<span>运费增加</span>

+ 1 - 1
mobile-code/src/admin/interest/setting.vue
مشاهده فایل 

@@ -27,7 +27,7 @@
 
                 </div>
 
 			</div>
 
 		</div>
 
-		<div class="prompt-text">提示：奖励额度可以比新人领券高一此, 这样可以吸引老客户邀请 新人，新人也更愿意到店消费。</div>
 
+		<div class="prompt-text">新人奖励可以设置得高一些，这样可以吸引新客户到店消费。</div>
 
 		<div class="admin-button-com blue big" @click="confirmFn">确认</div>
 
 	</div>
 
 </template>

+ 1 - 1
mobile-code/src/admin/order/components/sel-ship-confirm.vue
مشاهده فایل 

@@ -60,7 +60,7 @@
 
 						<div class="axis-title">{{ orderComData[3].actionName}}</div>
 
 						<div class="axis-det">
 
 							<div class="app-bold">{{ orderComData[3].addTime | formatTime }}</div>
 
-							<card-name :info="orderComData[3].receive" />
 
+							<card-name v-if="!$util.isEmpty(orderComData[3].receive)" :info="orderComData[3].receive" />
 
 							<div class="btn-wrap-com">
 
 								<!-- <button class="admin-button-com default">明细</button> -->
 
 								<button class="admin-button-com default" @click="() => { alert('打印功能待开发！') }">打印</button>

+ 3 - 3
mobile-code/src/admin/order/fill-form.vue
مشاهده فایل 

@@ -20,7 +20,7 @@ import { mapGetters } from 'vuex'
 
 import AppDeliveryModule from '@/components/app-delivery'
 
 const form = require('@/utils/formValidation.js')
 
 // api
 
-import { getShopUser } from '@/utils/auth'
 
+// import { getShopUser } from '@/utils/auth'
 
 import { getOrderShop } from '@/utils/config'
 
 import { updateSheet } from '@/api/order'
 
 export default {
 
@@ -38,7 +38,7 @@ export default {
 
 	},
 
 	computed: {
 
 		...mapGetters({ orderShop: 'getOrderShop' }),
 
-		...mapGetters({ shopUser: 'getShopUser' })
 
+		// ...mapGetters({ shopUser: 'getShopUser' })
 
 	},
 
 	onLoad() {
 
 		// this.init()
 
@@ -46,7 +46,7 @@ export default {
 
 	methods: {
 
 		init() {
 
 			getOrderShop()
 
-			getShopUser()
 
+			// getShopUser()
 
 		},
 
 		confirmFn() {
 
 			let form = this.$refs.appDelivery.form ? this.$refs.appDelivery.form : {}

+ 0 - 2
mobile-code/src/b-config.js
مشاهده فایل 

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

+ 0 - 335
mobile-code/src/b-pages.json
مشاهده فایل 

@@ -1,335 +0,0 @@
 
-{
 
-	"pages": [
 
-		{
 
-			"path": "admin/home/workbench",
 
-			"style": {
 
-				"navigationBarTitleText": "工作台"
 
-			}
 
-		},
 
-		{
 
-			"path": "admin/home/order",
 
-			"style": {
 
-				"navigationBarTitleText": "订单"
 
-			}
 
-		},
 
-		{
 
-			"path": "admin/home/member",
 
-			"style": {
 
-				"navigationBarTitleText": "客户"
 
-			}
 
-		},
 
-		{
 
-			"path": "common/redirect",
 
-			"style": {
 
-				"navigationBarTitleText": "加载中..."
 
-			}
 
-		},
 
-		{
 
-			"path": "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/shop",
 
-			"pages": [
 
-				{
 
-					"path": "list",
 
-					"style": {
 
-						"navigationBarTitleText": "店铺管理"
 
-					}
 
-				},
 
-				{
 
-					"path": "add",
 
-					"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": "客户"
 
-			}
 
-		]
 
-	}
 
-}
 
-

+ 2 - 2
mobile-code/src/components/app-coupon-sel.vue
مشاهده فایل 

@@ -6,7 +6,7 @@
 
 				<div class="sel-list flex-center-between" v-if="discountArr.indexOf('member') > -1">
 
 					<div class="sel-tit">
 
 						<radio value="1" :checked="memberCheck">
 
-							<span class="dis-pormpt">您是{{ shopUser.userAsset.member }}级会员，享{{ shopUser.userAsset.discount }}折优惠</span>
 
+							<span class="dis-pormpt">会员身份({{ shopUser.userAsset.member }}级 {{ shopUser.userAsset.discount }}折)</span>
 
 						</radio>
 
 					</div>
 
 					<!-- <div class="app-price app-size-28">-￥{{ totalDiscountPrice }}</div> -->
 
@@ -16,7 +16,7 @@
 
 				<div class="sel-list" v-if="discountArr.indexOf('coupon') > -1">
 
 					<div class="sel-tit">
 
 						<radio value="2" >
 
-							<span class="dis-pormpt">您有优惠券可用，请选择</span>
 
+							<span class="dis-pormpt">使用优惠券</span>
 
 						</radio>
 
 					</div>
 
 					<div class="coupon-wrap" v-show="selIndex == 2">

+ 2 - 1
mobile-code/src/components/app-delivery.vue
مشاهده فایل 

@@ -22,7 +22,7 @@
 
 			</tui-list-cell>
 
 			<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
 
 				<div class="tui-title">详细地址</div>
 
-				<div class="tui-input" v-if="form.receiveFullAddress">{{ form.receiveFullAddress }}</div>
 
+				<div class="tui-input" v-if="form.receiveAddress">{{ form.receiveAddress }}</div>
 
 				<div class="tui-placeholder" v-else>请选择详细地址</div>
 
 				<!-- <input v-model="form.receiveFullAddress" placeholder-class="phcolor" class="tui-input" name="receiveFullAddress" placeholder="小区、大厦或街道名称，如金尚小区" /> -->
 
 			</tui-list-cell>
 
@@ -187,6 +187,7 @@
 
 			},
 
 			changeAreaFn(e) {
 
 				console.log('changeAreaFn', e)
 
+				this.form.receiveAddress = e.title
 
 				this.form.receiveFullAddress = e.address
 
 				this.region.latitude = e.location.lat
 
 				this.region.longitude = e.location.lng

+ 1 - 1
mobile-code/src/components/module/app-activily-coupon.vue
مشاهده فایل 

@@ -20,7 +20,7 @@
 
 					<div class="list-det-right">
 
 						<div class="coupon-message">
 
 							<div class="app-color-0">优惠券</div>
 
-							<div>适用：{{ info.prize }}</div>
 
+							<div>适用：全品类</div>
 
 							<div>有效至：{{ info.validTime }}</div>
 
 						</div>
 
 					</div>

+ 2 - 2
mobile-code/src/config.js
مشاهده فایل 

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

+ 2 - 2
mobile-code/src/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": {

+ 8 - 8
mobile-code/src/official/index.vue
مشاهده فایل 

@@ -100,32 +100,32 @@
 
 					},
 
 					{
 
 						title: `<span class="app-color-1">流程化</span>管理订单`,
 
-						subTitle: `把控每个订单的生命周期，从下单、打单、制作到发货、配送、 送达自动通知客户，进度把控一清二楚，客户体验感大幅提升`,
 
+						subTitle: `有效把控订单的生命周期，从下单、打单、制作到发货、配送、 送达自动通知客户，大幅提升客户体验`,
 
 						img: `${this.$constant.imgUrl}/retail/official/content-2.png`
 
 					},
 
 					{
 
-						title: `提供多种的<span class="app-color-1">营销工具</span>`,
 
+						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: `线上、门店、微信、支付宝和美团等自动汇总后台，客户统一接待 回复，订单统一管理，不必再周旋于各个平台`,
 
+						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%`,
 
+						subTitle: `告别繁琐手续，一键操作，注册会员简单快捷，到店客户粉丝转化率提升80%`,
 
 						img: `${this.$constant.imgUrl}/retail/official/content-5.png`
 
 					},
 
 					{
 
-						title: `智能的<span class="app-color-1">会员体系</span>`,
 
-						subTitle: `客户充值消费自动累积成长值、自动升级会员，客户付款自动 打折，精准把握每个客户的个性和特征`,
 
+						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: `系统实时进行数据统计，花店每个时期的经营情况一目了然，知己 知彼，方能百战百胜`,
 
+						subTitle: `系统实时分析数据，花店每个时期的经营情况一目了然，知己知彼，百战百胜`,
 
 						img: `${this.$constant.imgUrl}/retail/official/content-7.png`
 
 					}
 
 				],

+ 306 - 8
mobile-code/src/pages.json
مشاهده فایل 

@@ -1,28 +1,301 @@
 
 {
 
 	"pages": [
 
 		{
 
-			"path": "official/index",
 
+			"path": "admin/home/workbench",
 
 			"style": {
 
-				"navigationBarTitleText": "花卉宝"
 
+				"navigationBarTitleText": "工作台"
 
 			}
 
 		},
 
 		{
 
-			"path": "official/apply",
 
+			"path": "admin/home/order",
 
 			"style": {
 
-				"navigationBarTitleText": "填写资料"
 
+				"navigationBarTitleText": "订单"
 
 			}
 
 		},
 
 		{
 
-			"path": "official/pay",
 
+			"path": "admin/home/member",
 
 			"style": {
 
-				"navigationBarTitleText": "支付"
 
+				"navigationBarTitleText": "客户"
 
 			}
 
 		},
 
 		{
 
-			"path": "official/callback",
 
+			"path": "common/redirect",
 
 			"style": {
 
-				"navigationBarTitleText": "提交成功"
 
+				"navigationBarTitleText": "加载中..."
 
 			}
 
+		},
 
+		{
 
+			"path": "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/shop",
 
+			"pages": [
 
+				{
 
+					"path": "list",
 
+					"style": {
 
+						"navigationBarTitleText": "店铺管理"
 
+					}
 
+				},
 
+				{
 
+					"path": "add",
 
+					"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": {
 
@@ -32,6 +305,31 @@
 
 		"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": "客户"
 
+			}
 
+		]
 
 	}
 
 }

+ 5 - 5
mobile-code/src/pages/home/user - 副本.vue
مشاهده فایل 

@@ -78,7 +78,7 @@
 
 				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/invite')">
 
 					<div class="list-wrap">
 
 						<div class="list-label">我的邀请</div>
 
-						<div class="list-text">领金币奖励</div>
 
+						<div class="list-text">领取奖励</div>
 
 					</div>
 
 				</tui-list-cell>
 
 				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/coupon/list')">
 
@@ -86,14 +86,14 @@
 
 						<div class="list-label">我的优惠券</div>
 
 					</div>
 
 				</tui-list-cell>
 
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 
 					<div class="list-wrap">
 
-						<div class="list-label">支付密码设置</div>
 
+						<div class="list-label">会员权益</div>
 
 					</div>
 
 				</tui-list-cell>
 
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 
 					<div class="list-wrap">
 
-						<div class="list-label">会员权益</div>
 
+						<div class="list-label">支付密码设置</div>
 
 					</div>
 
 				</tui-list-cell>
 
 			</tui-list-view>

+ 5 - 5
mobile-code/src/pages/home/user.vue
مشاهده فایل 

@@ -75,7 +75,7 @@
 
 				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/invite')">
 
 					<div class="list-wrap">
 
 						<div class="list-label">我的邀请</div>
 
-						<div class="list-text">领金币奖励</div>
 
+						<div class="list-text">领取奖励</div>
 
 					</div>
 
 				</tui-list-cell>
 
 				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/coupon/list')">
 
@@ -83,14 +83,14 @@
 
 						<div class="list-label">我的优惠券</div>
 
 					</div>
 
 				</tui-list-cell>
 
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 
 					<div class="list-wrap">
 
-						<div class="list-label">支付密码设置</div>
 
+						<div class="list-label">会员权益</div>
 
 					</div>
 
 				</tui-list-cell>
 
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 
 					<div class="list-wrap">
 
-						<div class="list-label">会员权益</div>
 
+						<div class="list-label">支付密码设置</div>
 
 					</div>
 
 				</tui-list-cell>
 
 			</tui-list-view>

+ 2 - 2
mobile-code/src/pages/pay/index.vue
مشاهده فایل 

@@ -212,10 +212,10 @@
 
 							desc: '享随机优惠，最高20元', // 分享内容
 
 							imgUrl: `${this.$constant.imgUrl}/retail/pay.jpg`,
 
 							// #ifdef H5
 
-							pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=1`,
 
+							pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3`,
 
 							// #endif
 
 							// #ifndef H5
 
-							pagePath: `/pages/pay/index?account=${res.merchantId}&store=1`
 
+							pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3`
 
 							// #endif
 
 						}
 
 						this.jweixinFn(shareParams)

+ 1 - 1
mobile-code/src/uni.scss
مشاهده فایل 

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

+ 2 - 0
mobile-code/src/w-config.js
مشاهده فایل 

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

+ 2 - 2
mobile-code/src/b-manifest.json → mobile-code/src/w-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": {

+ 37 - 0
mobile-code/src/w-pages.json
مشاهده فایل 

@@ -0,0 +1,37 @@
 
+{
 
+	"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"
 
+	}
 
+}
 
+

+ 1 - 1
mobile-code/src/b-uni.scss → mobile-code/src/w-uni.scss
مشاهده فایل 

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

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است