From f4e810f98aac1335359f9377b9a14d5f594d396b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=92=B0=20=E5=BE=90?= Date: Wed, 31 Oct 2018 16:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=8A=A0=E8=BD=BD+=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=88=86=E5=B8=83=E5=88=B0icon=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .project | 9 + src/App.vue | 230 ++++++------ src/app.json | 3 +- src/commands/MySalesEChartCommand.js | 22 ++ src/components/CartControl.vue | 4 +- src/components/Consignee.vue | 2 +- src/components/FooterNav.vue | 20 +- src/components/MerchandiseList.vue | 2 +- src/components/Payment.vue | 8 +- src/components/TabDelivery.vue | 4 +- src/components/WxCharts.vue | 2 +- src/components/cart.vue | 8 +- src/components/foodsList.vue | 2 +- src/configs/routes.json | 1 - src/models/MySalesEChart.js | 30 ++ src/pages/activity/PopupLocation.vue | 6 +- src/pages/coupon/index.vue | 2 +- src/pages/index/index.vue | 327 ++++++++++-------- src/pages/my/feedback/success/index.vue | 4 +- src/pages/my/index.vue | 22 +- .../my/mystore/distributeOrder/Order.vue | 6 +- .../my/mystore/distributeOrder/index.vue | 4 +- src/pages/my/mystore/index.vue | 24 +- src/pages/my/mystore/order/Order.vue | 4 +- src/pages/my/mystore/pickedUpOrder/Order.vue | 10 +- src/pages/my/mystore/pickedUpOrder/index.vue | 6 +- src/pages/my/mystore/status/Purchase.vue | 38 +- src/pages/my/mystore/status/Sales.vue | 25 +- src/pages/my/mystore/status/StoreToast.vue | 14 +- src/pages/my/mystore/status/Toast.vue | 19 +- src/pages/my/mystore/status/index.vue | 15 +- src/pages/my/mystore/status/main.js | 99 +++--- src/pages/nearbyStores/index.vue | 4 +- src/pages/order/MyOrder.vue | 262 -------------- src/pages/order/index.vue | 116 ------- src/pages/order/main.js | 18 - src/pages/reserveShop/Menus.vue | 4 +- src/pages/reserveShop/PopupDelivery.vue | 6 +- src/pages/reserveShop/index.vue | 253 +++++++------- src/pages/search/index.vue | 2 +- src/pages/todayOrder/Location.vue | 2 +- src/pages/todayOrder/Menus.vue | 4 +- src/services/mp/EChartsService.js | 88 +++++ static/images/{ => icon}/arrow-right-icon.png | Bin static/images/icon/booking.png | Bin 0 -> 19414 bytes static/images/{ => icon}/cart-black-bg.png | Bin static/images/{ => icon}/cart.png | Bin static/images/{ => icon}/charge-icon.png | Bin static/images/{ => icon}/del-icon.png | Bin static/images/{ => icon}/edit-icon.png | Bin static/images/{ => icon}/ewm.png | Bin static/images/{ => icon}/flag.png | Bin static/images/{ => icon}/free-icon.png | Bin static/images/{ => icon}/gary-next.png | Bin static/images/{ => icon}/index.png | Bin static/images/{ => icon}/index_now.png | Bin static/images/{ => icon}/location-icon.png | Bin static/images/{ => icon}/location.png | Bin static/images/icon/logo.png | Bin 0 -> 7827 bytes static/images/{ => icon}/my.png | Bin static/images/{ => icon}/my_control_bar.png | Bin .../images/{ => icon}/my_feedback_success.png | Bin static/images/{ => icon}/my_ico_line.png | Bin static/images/{ => icon}/my_ico_menu1.png | Bin static/images/{ => icon}/my_ico_menu2.png | Bin static/images/{ => icon}/my_ico_menu3.png | Bin static/images/{ => icon}/my_ico_menu4.png | Bin static/images/{ => icon}/my_ico_menu_more.png | Bin static/images/{ => icon}/my_ico_more.png | Bin static/images/{ => icon}/my_now.png | Bin static/images/{ => icon}/my_print.png | Bin .../{ => icon}/my_product_num_change.png | Bin static/images/{ => icon}/my_select_none.png | Bin static/images/{ => icon}/my_select_ok.png | Bin static/images/{ => icon}/my_store_m1.png | Bin static/images/{ => icon}/my_store_m2.png | Bin static/images/{ => icon}/my_store_m3.png | Bin static/images/{ => icon}/my_store_m4.png | Bin static/images/{ => icon}/my_store_m5.png | Bin static/images/{ => icon}/my_store_m6.png | Bin .../images/{ => icon}/my_store_today_buy.png | Bin .../{ => icon}/my_store_today_total.png | Bin .../images/{ => icon}/my_store_week_buy.png | Bin .../images/{ => icon}/my_store_week_sell.png | Bin static/images/{ => icon}/my_toast_arrow.png | Bin static/images/{ => icon}/my_toast_close.png | Bin static/images/{ => icon}/myordermore.png | Bin static/images/{ => icon}/new-product-icon.png | Bin static/images/{ => icon}/next-icon.png | Bin static/images/{ => icon}/nowposition.png | Bin static/images/{ => icon}/order.png | Bin static/images/{ => icon}/order_now.png | Bin static/images/{ => icon}/overdue.png | Bin static/images/{ => icon}/plus-icon.png | Bin static/images/{ => icon}/prearrangedmall.png | Bin static/images/{ => icon}/reduce-icon.png | Bin static/images/{ => icon}/reserve-shop.png | Bin static/images/{ => icon}/scanning.png | Bin static/images/{ => icon}/scanning_now.png | Bin static/images/{ => icon}/search-icon.png | Bin static/images/{ => icon}/search.png | Bin static/images/{ => icon}/select_arrow.png | Bin static/images/{ => icon}/selected.png | Bin static/images/{ => icon}/today-order.png | Bin static/images/{ => icon}/todaysorder.png | Bin static/images/{ => icon}/unselected.png | Bin static/images/{ => icon}/warn-icon.png | Bin static/images/{ => icon}/white-cancel.png | Bin static/images/{ => icon}/yellow-cancel.png | Bin .../images/{ => icon}/yellow-right-arrow.png | Bin static/images/logo.png | Bin 9641 -> 0 bytes 111 files changed, 787 insertions(+), 944 deletions(-) create mode 100644 src/commands/MySalesEChartCommand.js create mode 100644 src/models/MySalesEChart.js delete mode 100644 src/pages/order/MyOrder.vue delete mode 100644 src/pages/order/index.vue delete mode 100644 src/pages/order/main.js create mode 100644 src/services/mp/EChartsService.js rename static/images/{ => icon}/arrow-right-icon.png (100%) create mode 100644 static/images/icon/booking.png rename static/images/{ => icon}/cart-black-bg.png (100%) rename static/images/{ => icon}/cart.png (100%) rename static/images/{ => icon}/charge-icon.png (100%) rename static/images/{ => icon}/del-icon.png (100%) rename static/images/{ => icon}/edit-icon.png (100%) rename static/images/{ => icon}/ewm.png (100%) rename static/images/{ => icon}/flag.png (100%) rename static/images/{ => icon}/free-icon.png (100%) rename static/images/{ => icon}/gary-next.png (100%) rename static/images/{ => icon}/index.png (100%) rename static/images/{ => icon}/index_now.png (100%) rename static/images/{ => icon}/location-icon.png (100%) rename static/images/{ => icon}/location.png (100%) create mode 100644 static/images/icon/logo.png rename static/images/{ => icon}/my.png (100%) rename static/images/{ => icon}/my_control_bar.png (100%) rename static/images/{ => icon}/my_feedback_success.png (100%) rename static/images/{ => icon}/my_ico_line.png (100%) rename static/images/{ => icon}/my_ico_menu1.png (100%) rename static/images/{ => icon}/my_ico_menu2.png (100%) rename static/images/{ => icon}/my_ico_menu3.png (100%) rename static/images/{ => icon}/my_ico_menu4.png (100%) rename static/images/{ => icon}/my_ico_menu_more.png (100%) rename static/images/{ => icon}/my_ico_more.png (100%) rename static/images/{ => icon}/my_now.png (100%) rename static/images/{ => icon}/my_print.png (100%) rename static/images/{ => icon}/my_product_num_change.png (100%) rename static/images/{ => icon}/my_select_none.png (100%) rename static/images/{ => icon}/my_select_ok.png (100%) rename static/images/{ => icon}/my_store_m1.png (100%) rename static/images/{ => icon}/my_store_m2.png (100%) rename static/images/{ => icon}/my_store_m3.png (100%) rename static/images/{ => icon}/my_store_m4.png (100%) rename static/images/{ => icon}/my_store_m5.png (100%) rename static/images/{ => icon}/my_store_m6.png (100%) rename static/images/{ => icon}/my_store_today_buy.png (100%) rename static/images/{ => icon}/my_store_today_total.png (100%) rename static/images/{ => icon}/my_store_week_buy.png (100%) rename static/images/{ => icon}/my_store_week_sell.png (100%) rename static/images/{ => icon}/my_toast_arrow.png (100%) rename static/images/{ => icon}/my_toast_close.png (100%) rename static/images/{ => icon}/myordermore.png (100%) rename static/images/{ => icon}/new-product-icon.png (100%) rename static/images/{ => icon}/next-icon.png (100%) rename static/images/{ => icon}/nowposition.png (100%) rename static/images/{ => icon}/order.png (100%) rename static/images/{ => icon}/order_now.png (100%) rename static/images/{ => icon}/overdue.png (100%) rename static/images/{ => icon}/plus-icon.png (100%) rename static/images/{ => icon}/prearrangedmall.png (100%) rename static/images/{ => icon}/reduce-icon.png (100%) rename static/images/{ => icon}/reserve-shop.png (100%) rename static/images/{ => icon}/scanning.png (100%) rename static/images/{ => icon}/scanning_now.png (100%) rename static/images/{ => icon}/search-icon.png (100%) rename static/images/{ => icon}/search.png (100%) rename static/images/{ => icon}/select_arrow.png (100%) rename static/images/{ => icon}/selected.png (100%) rename static/images/{ => icon}/today-order.png (100%) rename static/images/{ => icon}/todaysorder.png (100%) rename static/images/{ => icon}/unselected.png (100%) rename static/images/{ => icon}/warn-icon.png (100%) rename static/images/{ => icon}/white-cancel.png (100%) rename static/images/{ => icon}/yellow-cancel.png (100%) rename static/images/{ => icon}/yellow-right-arrow.png (100%) delete mode 100644 static/images/logo.png diff --git a/.project b/.project index ada08bfe..6aeb4c48 100644 --- a/.project +++ b/.project @@ -24,5 +24,14 @@ 1.0-name-matches-false-false-node_modules + + 1540972108778 + + 26 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-node_modules + + diff --git a/src/App.vue b/src/App.vue index e6ba970b..a4410bc2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,106 +1,126 @@ - - - diff --git a/src/app.json b/src/app.json index 7f760bcc..a2d317f4 100644 --- a/src/app.json +++ b/src/app.json @@ -9,7 +9,6 @@ "pages/reserveShop/orderSelf/main", "pages/activity/main", "pages/activity/submitOrder/main", - "pages/order/main", "pages/search/main", "pages/coupon/main" ], @@ -33,7 +32,7 @@ ], "window": { "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#fece00", + "navigationBarBackgroundColor": "#ffd000", "navigationBarTitleText": "", "navigationBarTextStyle": "black" } diff --git a/src/commands/MySalesEChartCommand.js b/src/commands/MySalesEChartCommand.js new file mode 100644 index 00000000..8562b32c --- /dev/null +++ b/src/commands/MySalesEChartCommand.js @@ -0,0 +1,22 @@ +import Command from './Command'; +export default class MySalesEchartCommand extends Command { + constructor(app) { + super(app); + } + async handle(xDate) { + let yData = null; + let [salesInfo, sellTop, merchandiseTop, statics] = await this.service('http.myStoreStatusSales').salesInfo( + xDate); + yData = statics; + console.log('XU-ZHENG', xDate, yData, this.service('mp.eCharts')); + let result = await this.service('mp.eCharts').createChart(xDate, yData, true); + console.log('MySalesEchartCommand-------MySalesEchartCommand', result); + this.store().dispatch({ + type: 'model.my.sales.echart/chartDatas', + chartDatas: result + }); + } + static commandName() { + return 'MYSALESECHARTS'; + } +} diff --git a/src/components/CartControl.vue b/src/components/CartControl.vue index dcd4069f..2f5e4ead 100644 --- a/src/components/CartControl.vue +++ b/src/components/CartControl.vue @@ -55,7 +55,7 @@ .cart-decrease{ width:48rpx; height:48rpx; - background:url(../../static/images/reduce-icon.png) no-repeat center; + background:url(../../static/images/icon/reduce-icon.png) no-repeat center; background-size: contain; position: absolute; top: 0rpx; @@ -69,7 +69,7 @@ .cart-add{ width:48rpx; height:48rpx; - background:url(../../static/images/plus-icon.png) no-repeat; + background:url(../../static/images/icon/plus-icon.png) no-repeat; background-size: contain; position: absolute; bottom: -1rpx; diff --git a/src/components/Consignee.vue b/src/components/Consignee.vue index 3ad02e62..0ed92603 100644 --- a/src/components/Consignee.vue +++ b/src/components/Consignee.vue @@ -50,7 +50,7 @@ .edit-icon{ width:23rpx; height:30rpx; - background:url(../../static/images/edit-icon.png) no-repeat; + background:url(../../static/images/icon/edit-icon.png) no-repeat; background-size: contain; position: absolute; top:72rpx; diff --git a/src/components/FooterNav.vue b/src/components/FooterNav.vue index 29133c8f..12c59d5d 100644 --- a/src/components/FooterNav.vue +++ b/src/components/FooterNav.vue @@ -10,7 +10,7 @@ 扫码 -
  • +
  • 订单
    • @@ -29,29 +29,29 @@ data() { return { navName: "", - index: "/static/images/index.png", - scanning: "/static/images/scanning.png", - order: "/static/images/order.png", - my: "/static/images/my.png" + index: "/static/images/icon/index.png", + scanning: "/static/images/icon/scanning.png", + order: "/static/images/icon/order.png", + my: "/static/images/icon/my.png" }; }, methods: { nowNav(name) { switch(name) { case "index": - this.index = "/static/images/index_now.png"; + this.index = "/static/images/icon/index_now.png"; break; case "scanning": - this.scanning = "/static/images/scanning_now.png"; + this.scanning = "/static/images/icon/scanning_now.png"; break; case "order": - this.order = "/static/images/order_now.png"; + this.order = "/static/images/icon/order_now.png"; break; case "my": - this.my = "/static/images/my_now.png"; + this.my = "/static/images/icon/my_now.png"; break; default: - this.index = "/static/images/index_now.png"; + this.index = "/static/images/icon/index_now.png"; break; } }, diff --git a/src/components/MerchandiseList.vue b/src/components/MerchandiseList.vue index 0db3e95b..8285a914 100644 --- a/src/components/MerchandiseList.vue +++ b/src/components/MerchandiseList.vue @@ -185,7 +185,7 @@ .plus-icon{ width:48rpx; height: 48rpx; - background:url(../../static/images/plus-icon.png) no-repeat; + background:url(../../static/images/icon/plus-icon.png) no-repeat; background-size: contain; position: absolute; bottom: 58rpx; diff --git a/src/components/Payment.vue b/src/components/Payment.vue index ccebb4f0..16946d50 100644 --- a/src/components/Payment.vue +++ b/src/components/Payment.vue @@ -117,7 +117,7 @@ .select-icon{ width:48rpx; height: 48rpx; - background: url(../../static/images/selected.png) no-repeat; + background: url(../../static/images/icon/selected.png) no-repeat; background-size: contain; position: absolute; top:16rpx; @@ -185,7 +185,7 @@ .arrow-icon{ width:28rpx; height: 26rpx; - background:url(../../static/images/gary-next.png)no-repeat; + background:url(../../static/images/icon/gary-next.png)no-repeat; background-size: contain; position: absolute; top:29rpx; @@ -212,7 +212,7 @@ .warn-icon{ width:26rpx; height:26rpx; - background: url(../../static/images/warn-icon.png) no-repeat bottom; + background: url(../../static/images/icon/warn-icon.png) no-repeat bottom; background-size:contain; display: inline-block; margin: 10rpx 10rpx -4rpx 0rpx; @@ -241,7 +241,7 @@ .next-icon{ width:18rpx; height: 32rpx; - background: url(../../static/images/next-icon.png) no-repeat; + background: url(../../static/images/icon/next-icon.png) no-repeat; background-size: contain; position: absolute; top:33rpx; diff --git a/src/components/TabDelivery.vue b/src/components/TabDelivery.vue index 300e6892..5faee6be 100644 --- a/src/components/TabDelivery.vue +++ b/src/components/TabDelivery.vue @@ -118,7 +118,7 @@ .selected{ width:48rpx; height: 48rpx; - background: url(../../static/images/unselected.png) no-repeat; + background: url(../../static/images/icon/unselected.png) no-repeat; background-size:contain; display: inline-block; position: absolute; @@ -126,7 +126,7 @@ left:53rpx; } .tab_select_now .selected{ - background: url(../../static/images/selected.png) no-repeat; + background: url(../../static/images/icon/selected.png) no-repeat; background-size:contain; } /*配送细节*/ diff --git a/src/components/WxCharts.vue b/src/components/WxCharts.vue index d7ae2b48..f5dc010a 100644 --- a/src/components/WxCharts.vue +++ b/src/components/WxCharts.vue @@ -3,7 +3,7 @@
    销售曲线图表 (每晚21:00更新当日数据) - 2018/08/08 21:00 +
    数额
    diff --git a/src/components/cart.vue b/src/components/cart.vue index 68a2b49c..00f29430 100644 --- a/src/components/cart.vue +++ b/src/components/cart.vue @@ -133,7 +133,7 @@ .cart{ width:70rpx; height: 70rpx; - background:url(../../static/images/cart.png) no-repeat; + background:url(../../static/images/icon/cart.png) no-repeat; background-size: contain; position: absolute; top:-10rpx; @@ -169,7 +169,7 @@ .next-icon{ width:20rpx; height:35.6rpx; - background: url(../../static/images/next-icon.png) no-repeat; + background: url(../../static/images/icon/next-icon.png) no-repeat; background-size: contain; position: absolute; bottom:30rpx; @@ -212,12 +212,12 @@ z-index: 2; } .flag{ - background:url(../../static/images/flag.png) 0rpx 14rpx no-repeat; + background:url(../../static/images/icon/flag.png) 0rpx 14rpx no-repeat; background-size: 26rpx 30rpx; text-indent: 36rpx; } .empty{ - background:url(../../static/images/del-icon.png) 0rpx 14rpx no-repeat; + background:url(../../static/images/icon/del-icon.png) 0rpx 14rpx no-repeat; background-size: 26rpx 30rpx; text-indent: 36rpx; } diff --git a/src/components/foodsList.vue b/src/components/foodsList.vue index 23f96894..85e9d53a 100644 --- a/src/components/foodsList.vue +++ b/src/components/foodsList.vue @@ -165,7 +165,7 @@ .plus-icon{ width:48rpx; height: 48rpx; - background:url(../../static/images/plus-icon.png) no-repeat; + background:url(../../static/images/icon/plus-icon.png) no-repeat; background-size: contain; position: absolute; bottom: 58rpx; diff --git a/src/configs/routes.json b/src/configs/routes.json index 82c4049d..c9a83394 100644 --- a/src/configs/routes.json +++ b/src/configs/routes.json @@ -10,7 +10,6 @@ "mystorestatus": "/pages/my/mystore/status/main", "location": "/pages/nearbyStores/main", "share": "/pages/my/share/main", - "order": "/pages/order/main", "logs": "/pages/logs/main", "couter": "/pages/counter/main", "search" : "/pages/search/main", diff --git a/src/models/MySalesEChart.js b/src/models/MySalesEChart.js new file mode 100644 index 00000000..756792de --- /dev/null +++ b/src/models/MySalesEChart.js @@ -0,0 +1,30 @@ +import Model from './Model'; +import _ from 'underscore'; +export default class MySalesEChart extends Model { + constructor(app) { + super(app); + } + computed() { + return _.extend(super.computed(), { + chartData(state) { + console.log('CCCCCCCAAAAAA', this.state.chartDatas); + return this.state.chartDatas; + } + }); + } + data() { + return { + chartDatas: [] + }; + } + //监听数据 + listeners() { + this.addEventListener('chartDatas', function({ + chartDatas + }) { + console.log('监听活动的', chartDatas); + this.state.chartDatas = chartDatas; + console.log('活动监听结束', this.state.chartDatas); + }); + } +} diff --git a/src/pages/activity/PopupLocation.vue b/src/pages/activity/PopupLocation.vue index 1a9290e3..e4f4ae41 100644 --- a/src/pages/activity/PopupLocation.vue +++ b/src/pages/activity/PopupLocation.vue @@ -77,7 +77,7 @@ .location-icon{ width:118rpx; height:180rpx; - background:url(../../../static/images/location-icon.png) no-repeat; + background:url(../../../static/images/icon/location-icon.png) no-repeat; background-size:contain; position: absolute; top:-84rpx; @@ -87,7 +87,7 @@ .cancel{ width:78rpx; height:78rpx; - background:url(../../../static/images/yellow-cancel.png) no-repeat; + background:url(../../../static/images/icon/yellow-cancel.png) no-repeat; background-size:contain; position: absolute; top:-16rpx; @@ -111,7 +111,7 @@ .yellow-right-arrow{ width:40rpx; height:40rpx; - background:url(../../../static/images/yellow-right-arrow.png) no-repeat; + background:url(../../../static/images/icon/yellow-right-arrow.png) no-repeat; background-size:contain; margin-top: 30rpx; margin-right:21rpx; diff --git a/src/pages/coupon/index.vue b/src/pages/coupon/index.vue index 0b048105..18007bee 100644 --- a/src/pages/coupon/index.vue +++ b/src/pages/coupon/index.vue @@ -280,7 +280,7 @@ width:80rpx; height: 80rpx; line-height: 80rpx; - background:url(../../../static/images/overdue.png) no-repeat; + background:url(../../../static/images/icon/overdue.png) no-repeat; background-size: contain; margin-right:50rpx; margin-top:-10rpx; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8dbc03bc..d33b8c9b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,144 +1,183 @@ - - - - - - + + + + + diff --git a/src/pages/my/feedback/success/index.vue b/src/pages/my/feedback/success/index.vue index 4c22bcc3..e2c9eb56 100644 --- a/src/pages/my/feedback/success/index.vue +++ b/src/pages/my/feedback/success/index.vue @@ -2,7 +2,7 @@
    - + 提交成功 感谢您对快乐松的关注与支持，我们会认证处理您的反馈，尽快修复和完善相关功能。
    @@ -87,4 +87,4 @@ margin: 15rpx; border-radius: 15rpx; } - + diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue index 35fed6c2..97d176eb 100644 --- a/src/pages/my/index.vue +++ b/src/pages/my/index.vue @@ -5,7 +5,7 @@
    - +
    {{userInfo.nickname}} ID: {{userInfo.id}} @@ -16,11 +16,11 @@
      -
    • +
    • {{userInfo.balance}} 余额
      • -
    • +
    • {{userInfo.ticket_num}} 卡券 @@ -42,24 +42,24 @@
      • - + 个人订单 查看所有订单
      • - + 邀请享奖励 邀请好友
      • - + 意见反馈
      • - + 联系客服
        • @@ -116,7 +116,7 @@ }, alertNotice() { wx.showToast({ - title: "积分功能正在完善中", + title: "敬请期待", icon: "none" }) } @@ -295,7 +295,7 @@ width: 70rpx; margin: 30rpx; float: left; - background: url(../../../static/images/my_ico_more.png) no-repeat center center; + background: url(../../../static/images/icon/my_ico_more.png) no-repeat center center; background-size: 70%; } @@ -309,7 +309,7 @@ .my_store_line { height: 86rpx; width: 28rpx; - background: url(../../../static/images/my_ico_line.png) no-repeat center center; + background: url(../../../static/images/icon/my_ico_line.png) no-repeat center center; background-size: 100%; position: absolute; top: -50rpx; @@ -365,7 +365,7 @@ width: 40rpx; height: 40rpx; display: block; - background: url(../../../static/images/my_ico_menu_more.png) no-repeat center center; + background: url(../../../static/images/icon/my_ico_menu_more.png) no-repeat center center; background-size: 40%; padding: 22rpx 0; float: right; diff --git a/src/pages/my/mystore/distributeOrder/Order.vue b/src/pages/my/mystore/distributeOrder/Order.vue index 823c0df9..145e04bc 100644 --- a/src/pages/my/mystore/distributeOrder/Order.vue +++ b/src/pages/my/mystore/distributeOrder/Order.vue @@ -25,7 +25,7 @@
      -
      +
        @@ -134,7 +134,7 @@ .order_info_select i { width: 58rpx; height: 58rpx; - background: url(../../../../../static/images/my_select_none.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_select_none.png) no-repeat center center; background-size: 100%; position: absolute; bottom: 20rpx; @@ -142,7 +142,7 @@ } .order_info_select i.selected_order { - background: url(../../../../../static/images/my_select_ok.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_select_ok.png) no-repeat center center; background-size: 100%; } diff --git a/src/pages/my/mystore/distributeOrder/index.vue b/src/pages/my/mystore/distributeOrder/index.vue index 9869a0ed..67b63c4f 100644 --- a/src/pages/my/mystore/distributeOrder/index.vue +++ b/src/pages/my/mystore/distributeOrder/index.vue @@ -206,7 +206,7 @@ #controlbar { /* background: #000000; */ - background: url(../../../../../static/images/my_control_bar.png) no-repeat bottom center; + background: url(../../../../../static/images/icon/my_control_bar.png) no-repeat bottom center; background-size: 750rpx; height: 120rpx; width: 750rpx; @@ -245,7 +245,7 @@ } #print_order { - background: url(../../../../../static/images/my_print.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_print.png) no-repeat center center; background-size: 100%; width: 70rpx; height: 70rpx; diff --git a/src/pages/my/mystore/index.vue b/src/pages/my/mystore/index.vue index 19cc3ca5..af00e5da 100644 --- a/src/pages/my/mystore/index.vue +++ b/src/pages/my/mystore/index.vue @@ -106,8 +106,8 @@ jump(router) { this.$command('router', router, 'push'); }, - scanCode() { - this.$command('scanCommand','myfeedbacksuccess'); + scanCode() { + this.$command('scanCommand','myfeedbacksuccess'); }, getOptions(i, refresh = false) { let option = { @@ -207,19 +207,19 @@ } .my_store_ico.ico_week_buy { - background-image: url(../../../../static/images/my_store_week_buy.png); + background-image: url(../../../../static/images/icon/my_store_week_buy.png); } .my_store_ico.ico_week_sell { - background-image: url(../../../../static/images/my_store_week_sell.png); + background-image: url(../../../../static/images/icon/my_store_week_sell.png); } .my_store_ico.ico_today_buy { - background-image: url(../../../../static/images/my_store_today_buy.png); + background-image: url(../../../../static/images/icon/my_store_today_buy.png); } .my_store_ico.ico_today_sell { - background-image: url(../../../../static/images/my_store_today_total.png); + background-image: url(../../../../static/images/icon/my_store_today_total.png); } .info_list { @@ -281,26 +281,26 @@ } .ico_1 { - background-image: url(../../../../static/images/my_store_m1.png); + background-image: url(../../../../static/images/icon/my_store_m1.png); } .ico_2 { - background-image: url(../../../../static/images/my_store_m2.png); + background-image: url(../../../../static/images/icon/my_store_m2.png); } .ico_3 { - background-image: url(../../../../static/images/my_store_m3.png); + background-image: url(../../../../static/images/icon/my_store_m3.png); } .ico_4 { - background-image: url(../../../../static/images/my_store_m4.png); + background-image: url(../../../../static/images/icon/my_store_m4.png); } .ico_5 { - background-image: url(../../../../static/images/my_store_m5.png); + background-image: url(../../../../static/images/icon/my_store_m5.png); } .ico_6 { - background-image: url(../../../../static/images/my_store_m6.png); + background-image: url(../../../../static/images/icon/my_store_m6.png); } diff --git a/src/pages/my/mystore/order/Order.vue b/src/pages/my/mystore/order/Order.vue index 706fb039..0dad09a1 100644 --- a/src/pages/my/mystore/order/Order.vue +++ b/src/pages/my/mystore/order/Order.vue @@ -22,7 +22,7 @@
      -
      +
        @@ -346,4 +346,4 @@ .order_info_circle.right_circle { left: -25rpx; } - + diff --git a/src/pages/my/mystore/pickedUpOrder/Order.vue b/src/pages/my/mystore/pickedUpOrder/Order.vue index 2987550b..61afe818 100644 --- a/src/pages/my/mystore/pickedUpOrder/Order.vue +++ b/src/pages/my/mystore/pickedUpOrder/Order.vue @@ -25,7 +25,7 @@
      -
      +
        @@ -128,14 +128,14 @@ height: 100%; width: 100%; background: rgba(0, 0, 0, 0.4); - z-index: 999; + z-index: 999; display: none; } .order_info_select i { width: 58rpx; height: 58rpx; - background: url(../../../../../static/images/my_select_none.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_select_none.png) no-repeat center center; background-size: 100%; position: absolute; bottom: 20rpx; @@ -143,7 +143,7 @@ } .order_info_select i.selected_order { - background: url(../../../../../static/images/my_select_ok.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_select_ok.png) no-repeat center center; background-size: 100%; } @@ -341,4 +341,4 @@ .order_info_circle.right_circle { left: -25rpx; } - + diff --git a/src/pages/my/mystore/pickedUpOrder/index.vue b/src/pages/my/mystore/pickedUpOrder/index.vue index 10f281d2..98886bd9 100644 --- a/src/pages/my/mystore/pickedUpOrder/index.vue +++ b/src/pages/my/mystore/pickedUpOrder/index.vue @@ -206,7 +206,7 @@ #controlbar { /* background: #000000; */ - background: url(../../../../../static/images/my_control_bar.png) no-repeat bottom center; + background: url(../../../../../static/images/icon/my_control_bar.png) no-repeat bottom center; background-size: 750rpx; height: 120rpx; width: 750rpx; @@ -245,7 +245,7 @@ } #print_order { - background: url(../../../../../static/images/my_print.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_print.png) no-repeat center center; background-size: 100%; width: 70rpx; height: 70rpx; @@ -260,4 +260,4 @@ border: 1rpx solid #f0f0f0; display:inline-block; }*/ - + diff --git a/src/pages/my/mystore/status/Purchase.vue b/src/pages/my/mystore/status/Purchase.vue index 9239f24b..3084c7ac 100644 --- a/src/pages/my/mystore/status/Purchase.vue +++ b/src/pages/my/mystore/status/Purchase.vue @@ -37,32 +37,32 @@ nowSelectDate: 0, selectDate: ["今日", "本周", "本月"] } - }, - props: { - purchaseTotal: { - default:"", - type: Function - }, - purchaseList:{ - default:"", - type:Function - }, - onloadPurchase:{ - default:"", - type:Function - } + }, + props: { + purchaseTotal: { + default:"", + type: Function + }, + purchaseList:{ + default:"", + type:Function + }, + onloadPurchase:{ + default:"", + type:Function + } }, methods: { selectDateNow(e) { let num = e.target.value; this.nowSelectDate = num; - if(num == 0) { + if(num == 0) { this.onloadPurchase('hour'); console.log(666); - } else if(num == 1) { + } else if(num == 1) { this.onloadPurchase('week'); console.log(888) - } else { + } else { this.onloadPurchase('month'); console.log(999) } @@ -96,7 +96,7 @@ top: 22rpx; height: 20rpx; width: 20rpx; - background: url(../../../../../static/images/select_arrow.png) no-repeat center center; + background: url(../../../../../static/images/icon/select_arrow.png) no-repeat center center; background-size: 90%; } @@ -191,7 +191,7 @@ .purchase_order_date i { height: 32rpx; width: 32rpx; - background: url(../../../../../static/images/myordermore.png) no-repeat center center; + background: url(../../../../../static/images/icon/myordermore.png) no-repeat center center; background-size: 80%; display: inline-block; float: right; diff --git a/src/pages/my/mystore/status/Sales.vue b/src/pages/my/mystore/status/Sales.vue index cd02e57f..932d713f 100644 --- a/src/pages/my/mystore/status/Sales.vue +++ b/src/pages/my/mystore/status/Sales.vue @@ -78,28 +78,47 @@ onloadSales: { default: "", type: Function + }, + onloadSalesEChart: { + default: "", + type: Function + }, + mySalesEChart: { + default: "", + type: Function } }, data() { return { - wxOptions: this.getOptions(0), nowSelectDate: 0, selectDate: ["今日", "本周", "本月"] }; }, + computed: { + wxOptions() { + console.log('computed wx echart options', this.$store.getters['model.my.sales.echart/chartData']); + return this.$store.getters['model.my.sales.echart/chartData']; + } + }, mounted() {}, methods: { selectDateNow(e) { let num = e.target.value; this.nowSelectDate = num; - this.wxOptions = this.getOptions(num, true); + // this.wxOptions = this.getOptions(num, true); + console.log('com------', this.$parent); + // this.wxOptions = this.$parent.mp.eCharts.createChart('week', data[1], true); if (num == 0) { + this.onloadSalesEChart('day'); this.onloadSales('hour'); } else if (num == 1) { + this.onloadSalesEChart('week'); this.onloadSales('week'); } else { + this.onloadSalesEChart('month'); this.onloadSales('month'); } + console.log('change wxechart ', this.$store.getters['model.my.sales.echart/chartData']); }, getOptions: function(i, refresh = false) { let option = { @@ -180,7 +199,7 @@ top: 22rpx; height: 20rpx; width: 20rpx; - background: url(../../../../../static/images/select_arrow.png) no-repeat center center; + background: url(../../../../../static/images/icon/select_arrow.png) no-repeat center center; background-size: 90%; } diff --git a/src/pages/my/mystore/status/StoreToast.vue b/src/pages/my/mystore/status/StoreToast.vue index 280fd242..ffe369e4 100644 --- a/src/pages/my/mystore/status/StoreToast.vue +++ b/src/pages/my/mystore/status/StoreToast.vue @@ -49,7 +49,7 @@ }, watch: { nowBtnIndex(nv, ov) { - if (nv && nv !== ov) { + if (nv && nv !== ov) { console.log('UUUUUU',nv,ov); // this.changeCategoryIndex(0, nv[0]['id']); } @@ -79,13 +79,13 @@ // console.log(999) // } // }, - numChange(merchandise) { + numChange(merchandise) { console.log('APAPAPAPAPAP',merchandise); this.$emit("showToast", merchandise); } }, - created() { - console.log('1111111222222211111'); + created() { + console.log('1111111222222211111'); } } @@ -117,7 +117,7 @@ top: 22rpx; height: 20rpx; width: 20rpx; - background: url(../../../../../static/images/select_arrow.png) no-repeat center center; + background: url(../../../../../static/images/icon/select_arrow.png) no-repeat center center; background-size: 90%; } @@ -198,7 +198,7 @@ } .store_product_list_li em i.num_change { - background: url(../../../../../static/images/my_product_num_change.png) no-repeat 10rpx center; + background: url(../../../../../static/images/icon/my_product_num_change.png) no-repeat 10rpx center; background-size: 26rpx; } @@ -206,4 +206,4 @@ color: #FECE00; border-left: 10rpx solid #FECE00; } - + diff --git a/src/pages/my/mystore/status/Toast.vue b/src/pages/my/mystore/status/Toast.vue index 0c79164d..758d808b 100644 --- a/src/pages/my/mystore/status/Toast.vue +++ b/src/pages/my/mystore/status/Toast.vue @@ -59,7 +59,8 @@ "name": "商品过期" }], radioCur: 0, - productInfo: {} + productInfo: {}, + comment: null } }, watch: {}, @@ -71,7 +72,6 @@ // console.log(num + 'aaa' + id); }, returnBtn(id, primaryStockNum, modifyStockNum, reason, comment) { - console.log('returnBtn', id, primaryStockNum, modifyStockNum, reason, comment); modifyStockNum = parseInt(modifyStockNum); console.log('modifyStockNum', modifyStockNum); if (isNaN(modifyStockNum) || modifyStockNum < 0) { @@ -88,11 +88,11 @@ wx.showLoading({ title: '正在提交...', }) + console.log('returnBtn', id, primaryStockNum, modifyStockNum, reason, comment); this.$emit("modifyStock", id, primaryStockNum, modifyStockNum, reason, comment); - console.log('aaa', this.productInfo); this.productInfo = {}; + this.productInfo['reason'] = this.selectCause[0]['name']; this.radioCur = 0; - console.log('bbb', this.productInfo); this.$emit("close"); } }, @@ -101,6 +101,7 @@ } }, created() { + this.productInfo['reason'] = this.selectCause[0]['name']; this.productInfo['changeAnswerId'] = this.radioCur; }, beforeUpdate() { @@ -131,7 +132,7 @@ position: absolute; height: 78rpx; width: 78rpx; - background: url(../../../../../static/images/my_toast_close.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_toast_close.png) no-repeat center center; background-size: 100%; right: -14rpx; top: -20rpx; @@ -155,7 +156,7 @@ #input_change { overflow: hidden; margin-bottom: 20rpx; - background: url(../../../../../static/images/my_toast_arrow.png) no-repeat center center; + background: url(../../../../../static/images/icon/my_toast_arrow.png) no-repeat center center; background-size: 52rpx; } @@ -190,13 +191,13 @@ font-size: 32rpx; font-weight: 400; color: #111111; - background: url(../../../../../static/images/my_select_none.png) no-repeat; + background: url(../../../../../static/images/icon/my_select_none.png) no-repeat; background-size: 44rpx; background-position: 40rpx center; } #input_change_list ul li.input_now_select { - background: url(../../../../../static/images/my_select_ok.png) no-repeat; + background: url(../../../../../static/images/icon/my_select_ok.png) no-repeat; background-size: 44rpx; background-position: 40rpx center; } @@ -217,4 +218,4 @@ text-align: center; line-height: 68rpx; } - + diff --git a/src/pages/my/mystore/status/index.vue b/src/pages/my/mystore/status/index.vue index 0c5f77d1..0e349f3e 100644 --- a/src/pages/my/mystore/status/index.vue +++ b/src/pages/my/mystore/status/index.vue @@ -12,13 +12,14 @@
      - +
      - +
      @@ -38,6 +39,7 @@ import MyStoreCategoriesCommand from '@/commands/MyStoreCategoriesCommand'; import MyStoreChangeCategoryCommand from '@/commands/MyStoreChangeCategoryCommand'; import MyStoreModifyStockCommand from '@/commands/MyStoreModifyStockCommand'; + import MySalesEChartCommand from '@/commands/MySalesEChartCommand'; export default { components: { "mp-title": MpTitle, @@ -60,7 +62,8 @@ }], cur: 0, merchandise: {}, - display: false + display: false, + mySalesEChart: {} }; }, computed: { @@ -111,9 +114,13 @@ onloadSales(status) { this.$command(MyStoreStatusSalesCommand.commandName(), status); }, - onloadSales(storeId) { + onloadCategory(storeId) { this.$command(MyStoreCategoriesCommand.commandName(), storeId); }, + onloadSalesEChart(status) { + console.log('开始调用echartscommand'); + this.$command(MySalesEChartCommand.commandName(), status); + }, changeCategory(index, categoryId) { this.$command(MyStoreChangeCategoryCommand.commandName(), index, categoryId); console.log('KKKKK-------', index, categoryId); diff --git a/src/pages/my/mystore/status/main.js b/src/pages/my/mystore/status/main.js index c4369ecd..76e7d2aa 100644 --- a/src/pages/my/mystore/status/main.js +++ b/src/pages/my/mystore/status/main.js @@ -1,56 +1,63 @@ -import Vue from 'vue'; -import App from './index'; -import Application from '@/Application'; -import _ from 'underscore'; -import Merchandises from '@/models/Merchandises'; -import Categories from '@/models/Categories'; - +import Vue from 'vue'; +import App from './index'; +import Application from '@/Application'; +import _ from 'underscore'; +import Merchandises from '@/models/Merchandises'; +import Categories from '@/models/Categories'; + import MyStoreStatusPurchaseService from '@/services/http/MyStoreStatusPurchaseService'; import MyStoreStatusPurchaseCommand from '@/commands/MyStoreStatusPurchaseCommand'; -import MyStoreStatusPurchase from "@/models/MyStoreStatusPurchase"; - +import MyStoreStatusPurchase from "@/models/MyStoreStatusPurchase"; + import MyStoreStatusSalesService from '@/services/http/MyStoreStatusSalesService'; import MyStoreStatusSalesCommand from '@/commands/MyStoreStatusSalesCommand'; -import MyStoreStatusSales from "@/models/MyStoreStatusSales"; - +import MyStoreStatusSales from "@/models/MyStoreStatusSales"; + import MyStoreCategoriesService from '@/services/http/MyStoreCategoriesService'; import MyStoreCategoriesCommand from '@/commands/MyStoreCategoriesCommand'; -import MyStoreCategories from "@/models/List"; - +import MyStoreCategories from "@/models/List"; + import MyStoreCategoryMerchandisesService from '@/services/http/MyStoreCategoryMerchandisesService'; import MyStoreChangeCategoryCommand from '@/commands/MyStoreChangeCategoryCommand'; -import MyStoreCategoryMerchandises from "@/models/MyStoreCategoryMerchandises"; - +import MyStoreCategoryMerchandises from "@/models/MyStoreCategoryMerchandises"; + import MyStoreModifyStockService from '@/services/http/MyStoreModifyStockService'; -import MyStoreModifyStockCommand from '@/commands/MyStoreModifyStockCommand'; - +import MyStoreModifyStockCommand from '@/commands/MyStoreModifyStockCommand'; + +import EChartsService from '@/services/mp/EChartsService'; +import MySalesEChartCommand from '@/commands/MySalesEChartCommand'; +import MySalesEChart from "@/models/MySalesEChart"; + +const myMystoreStatus = new Application(App, 'my.mystore.status'); +myMystoreStatus.run((app) => { + app.registerModel('myStore.merchandises', Merchandises); + app.registerModel('store.categories', Categories); + + app.models.addModel('model.my.store.status.purchase', MyStoreStatusPurchase); + app.register('http.myStoreStatusPurchase', MyStoreStatusPurchaseService); + app.registerCommand(MyStoreStatusPurchaseCommand.commandName(), MyStoreStatusPurchaseCommand); + + app.models.addModel('model.my.store.status.sales', MyStoreStatusSales); + app.register('http.myStoreStatusSales', MyStoreStatusSalesService); + app.registerCommand(MyStoreStatusSalesCommand.commandName(), MyStoreStatusSalesCommand); + + app.models.addModel('model.my.store.categories', MyStoreCategories); + app.register('http.myStoreCategories', MyStoreCategoriesService); + app.registerCommand(MyStoreCategoriesCommand.commandName(), MyStoreCategoriesCommand); + + app.models.addModel('model.my.store.category.merchandises', MyStoreCategoryMerchandises); + app.register('http.myStoreCategoryMerchandises', MyStoreCategoryMerchandisesService); + app.registerCommand(MyStoreChangeCategoryCommand.commandName(), MyStoreChangeCategoryCommand); + + app.register('http.myStoreModifyStock', MyStoreModifyStockService); + app.registerCommand(MyStoreModifyStockCommand.commandName(), MyStoreModifyStockCommand); -const myMystoreStatus = new Application(App, 'my.mystore.status'); -myMystoreStatus.run((app) => { - app.registerModel('myStore.merchandises', Merchandises); - app.registerModel('store.categories', Categories); - - app.models.addModel('model.my.store.status.purchase', MyStoreStatusPurchase); - app.register('http.myStoreStatusPurchase', MyStoreStatusPurchaseService); - app.registerCommand(MyStoreStatusPurchaseCommand.commandName(), MyStoreStatusPurchaseCommand); - - app.models.addModel('model.my.store.status.sales', MyStoreStatusSales); - app.register('http.myStoreStatusSales', MyStoreStatusSalesService); - app.registerCommand(MyStoreStatusSalesCommand.commandName(), MyStoreStatusSalesCommand); - - app.models.addModel('model.my.store.categories', MyStoreCategories); - app.register('http.myStoreCategories', MyStoreCategoriesService); - app.registerCommand(MyStoreCategoriesCommand.commandName(), MyStoreCategoriesCommand); - - app.models.addModel('model.my.store.category.merchandises', MyStoreCategoryMerchandises); - app.register('http.myStoreCategoryMerchandises', MyStoreCategoryMerchandisesService); - app.registerCommand(MyStoreChangeCategoryCommand.commandName(), MyStoreChangeCategoryCommand); - - app.register('http.myStoreModifyStock', MyStoreModifyStockService); - app.registerCommand(MyStoreModifyStockCommand.commandName(), MyStoreModifyStockCommand); -}, (component) => { - _.extend(App, component); - let app = new Vue(App); - app.$mount(); - return app; -}); \ No newline at end of file + app.models.addModel('model.my.sales.echart', MySalesEChart); + app.register('mp.eCharts', EChartsService); + app.registerCommand(MySalesEChartCommand.commandName(), MySalesEChartCommand); +}, (component) => { + _.extend(App, component); + let app = new Vue(App); + app.$mount(); + return app; +}); diff --git a/src/pages/nearbyStores/index.vue b/src/pages/nearbyStores/index.vue index 47d6c3b6..18f33828 100644 --- a/src/pages/nearbyStores/index.vue +++ b/src/pages/nearbyStores/index.vue @@ -201,7 +201,7 @@ } #nowposition { - background: url(../../../static/images/nowposition.png) no-repeat center center; + background: url(../../../static/images/icon/nowposition.png) no-repeat center center; background-color: #FFFFFF; border-radius: 50%; width: 50rpx; @@ -212,4 +212,4 @@ top: 160rpx; z-index: 999; } - + diff --git a/src/pages/order/MyOrder.vue b/src/pages/order/MyOrder.vue deleted file mode 100644 index 2ce9fb61..00000000 --- a/src/pages/order/MyOrder.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue deleted file mode 100644 index c2df7fe4..00000000 --- a/src/pages/order/index.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - diff --git a/src/pages/order/main.js b/src/pages/order/main.js deleted file mode 100644 index 5b72b6c7..00000000 --- a/src/pages/order/main.js +++ /dev/null @@ -1,18 +0,0 @@ -import Vue from 'vue'; -import App from './index'; -import Application from '../../Application'; -import _ from 'underscore'; -import MyOrderService from '../../services/http/MyOrderService'; -import MyOrderCommand from '@/commands/MyOrderCommand'; -import Orders from "@/models/Orders"; -const myOrder = new Application(App, 'my.order'); -myOrder.run((app) => { - app.registerModel('model.my.orders', Orders); - app.register('http.myorders', MyOrderService); - app.registerCommand(MyOrderCommand.commandName(), MyOrderCommand); -}, (mountComponent) => { - _.extend(App, mountComponent); - let app = new Vue(App); - app.$mount(); - return app; -}); diff --git a/src/pages/reserveShop/Menus.vue b/src/pages/reserveShop/Menus.vue index 003bae99..c4fbd9e0 100644 --- a/src/pages/reserveShop/Menus.vue +++ b/src/pages/reserveShop/Menus.vue @@ -69,7 +69,7 @@ display: inline-block; width:40rpx; height: 40rpx; - background: url("../../../static/images/search-icon.png") no-repeat; + background: url("../../../static/images/icon/search-icon.png") no-repeat; background-size: contain; margin:0rpx 40rpx 10rpx; } @@ -95,7 +95,7 @@ #tab_select ul li.tab_select_now { color: #FECE00; border-left:6rpx solid #fece00; - background:#fafafa url("../../../static/images/new-product-icon.png") no-repeat center 20% ; + background:#fafafa url("../../../static/images/icon/new-product-icon.png") no-repeat center 20% ; background-size: 58rpx 66rpx; padding-top: 100rpx; } diff --git a/src/pages/reserveShop/PopupDelivery.vue b/src/pages/reserveShop/PopupDelivery.vue index f07e813b..5cee651c 100644 --- a/src/pages/reserveShop/PopupDelivery.vue +++ b/src/pages/reserveShop/PopupDelivery.vue @@ -71,7 +71,7 @@ export default { .cancel{ width:78rpx; height:78rpx; - background:url(../../../static/images/white-cancel.png) no-repeat; + background:url(../../../static/images/icon/white-cancel.png) no-repeat; background-size:contain; position: absolute; top:-16rpx; @@ -101,7 +101,7 @@ export default { .free-icon{ width:68rpx; height:48rpx; - background:url(../../../static/images/free-icon.png) no-repeat; + background:url(../../../static/images/icon/free-icon.png) no-repeat; background-size:contain; margin:26rpx 40rpx 26rpx 80rpx; @@ -110,7 +110,7 @@ export default { .charge-icon{ width:68rpx; height:48rpx; - background:url(../../../static/images/charge-icon.png) no-repeat; + background:url(../../../static/images/icon/charge-icon.png) no-repeat; background-size:contain; margin:26rpx 40rpx 26rpx 80rpx; } diff --git a/src/pages/reserveShop/index.vue b/src/pages/reserveShop/index.vue index 354899f2..9bd69078 100644 --- a/src/pages/reserveShop/index.vue +++ b/src/pages/reserveShop/index.vue @@ -1,128 +1,127 @@ - - - - - diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue index 7db34ec6..07f0e678 100644 --- a/src/pages/search/index.vue +++ b/src/pages/search/index.vue @@ -100,7 +100,7 @@ .search-icon{ width:41rpx; height: 42rpx; - background:url(../../../static/images/search.png) no-repeat; + background:url(../../../static/images/icon/search.png) no-repeat; background-size: contain; margin: 14rpx 40rpx 14rpx 0rpx; diff --git a/src/pages/todayOrder/Location.vue b/src/pages/todayOrder/Location.vue index d6545f5d..6827f98c 100644 --- a/src/pages/todayOrder/Location.vue +++ b/src/pages/todayOrder/Location.vue @@ -47,7 +47,7 @@ .arrow-right-icon{ width:18rpx; height: 32rpx; - background-image: url(../../../static/images/arrow-right-icon.png); + background-image: url(../../../static/images/icon/arrow-right-icon.png); background-size: contain; position: absolute; top:28rpx; diff --git a/src/pages/todayOrder/Menus.vue b/src/pages/todayOrder/Menus.vue index ce94170c..e7bfc19a 100644 --- a/src/pages/todayOrder/Menus.vue +++ b/src/pages/todayOrder/Menus.vue @@ -69,7 +69,7 @@ display: inline-block; width:40rpx; height: 40rpx; - background: url("../../../static/images/search-icon.png") no-repeat; + background: url("../../../static/images/icon/search-icon.png") no-repeat; background-size: contain; margin:0rpx 40rpx 10rpx; } @@ -95,7 +95,7 @@ #tab_select ul li.tab_select_now { color: #FECE00; border-left:6rpx solid #fece00; - background:#fafafa url("../../../static/images/new-product-icon.png") no-repeat center 20% ; + background:#fafafa url("../../../static/images/icon/new-product-icon.png") no-repeat center 20% ; background-size: 58rpx 66rpx; padding-top: 100rpx; } diff --git a/src/services/mp/EChartsService.js b/src/services/mp/EChartsService.js new file mode 100644 index 00000000..603a89c1 --- /dev/null +++ b/src/services/mp/EChartsService.js @@ -0,0 +1,88 @@ +import Service from '../Service'; +export default class EChartsService extends Service { + constructor($application) { + super($application); + } + + /*获取一个月的天数 */ + getCountDays() { + var curDate = new Date(); + /* 获取当前月份 */ + var curMonth = curDate.getMonth(); + /*  生成实际的月份: 由于curMonth会比实际月份小1, 故需加1 */ + curDate.setMonth(curMonth + 1); + /* 将日期设置为0, 这里为什么要这样设置, 我不知道原因, 这是从网上学来的 */ + curDate.setDate(0); + /* 返回当月的天数 */ + return curDate.getDate(); + } + + //绘制图表主方法 + createChart(xDate, yData, needRefresh = false) { + console.log('进来了', xDate, yData, needRefresh); + let xData = null; + if (xDate == 'day') { + xData = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]; + } else if (xDate == 'week') { + xData = ['一', '二', '三', '四', '五', '六', '日']; + } else if (xDate == 'month') { + let monthDate = this.getCountDays(); + let month = []; + for (let i = 0; i < monthDate; i++) { + month[i] = i + 1; + } + xData = month; + console.log('本月数组', xData); + } + console.log('xData',xData); + let option = { + refresh: needRefresh, + xAxis: { + type: 'category', + data: xData, + axisLabel: { + show: true, + textStyle: { + color: '#111111' + } + } + }, + yAxis: { + type: 'value', + axisLine: { + show: false + }, + axisLabel: { + show: true, + textStyle: { + color: '#111111' + } + } + }, + grid: { + x: 40, + y: 20, + x2: 20, + y2: 20, + borderWidth: 1 + }, + series: [{ + data: yData, + type: 'line', + itemStyle: { + normal: { + color: '#FECE00', + lineStyle: { + width: 3, //折线宽度 + color: '#FECE00' + } + } + }, + areaStyle: {}, + smooth: true + }] + } + console.log('XxXxXx',option); + return option + } +} diff --git a/static/images/arrow-right-icon.png b/static/images/icon/arrow-right-icon.png similarity index 100% rename from static/images/arrow-right-icon.png rename to static/images/icon/arrow-right-icon.png diff --git a/static/images/icon/booking.png b/static/images/icon/booking.png new file mode 100644 index 0000000000000000000000000000000000000000..c53e4c121ee52bad7033b60ea009a69920da6a4d GIT binary patch literal 19414 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 literal 0 HcmV?d00001 diff --git a/static/images/my.png b/static/images/icon/my.png similarity index 100% rename from static/images/my.png rename to static/images/icon/my.png diff --git a/static/images/my_control_bar.png b/static/images/icon/my_control_bar.png similarity index 100% rename from static/images/my_control_bar.png rename to static/images/icon/my_control_bar.png diff --git a/static/images/my_feedback_success.png b/static/images/icon/my_feedback_success.png similarity index 100% rename from static/images/my_feedback_success.png rename to static/images/icon/my_feedback_success.png diff --git a/static/images/my_ico_line.png b/static/images/icon/my_ico_line.png similarity index 100% rename from static/images/my_ico_line.png rename to static/images/icon/my_ico_line.png diff --git a/static/images/my_ico_menu1.png b/static/images/icon/my_ico_menu1.png similarity index 100% rename from static/images/my_ico_menu1.png rename to static/images/icon/my_ico_menu1.png diff --git a/static/images/my_ico_menu2.png b/static/images/icon/my_ico_menu2.png similarity index 100% rename from static/images/my_ico_menu2.png rename to static/images/icon/my_ico_menu2.png diff --git a/static/images/my_ico_menu3.png b/static/images/icon/my_ico_menu3.png similarity index 100% rename from static/images/my_ico_menu3.png rename to static/images/icon/my_ico_menu3.png diff --git a/static/images/my_ico_menu4.png b/static/images/icon/my_ico_menu4.png similarity index 100% rename from static/images/my_ico_menu4.png rename to static/images/icon/my_ico_menu4.png diff --git a/static/images/my_ico_menu_more.png b/static/images/icon/my_ico_menu_more.png similarity index 100% rename from static/images/my_ico_menu_more.png rename to static/images/icon/my_ico_menu_more.png diff --git a/static/images/my_ico_more.png b/static/images/icon/my_ico_more.png similarity index 100% rename from static/images/my_ico_more.png rename to static/images/icon/my_ico_more.png diff --git a/static/images/my_now.png b/static/images/icon/my_now.png similarity index 100% rename from static/images/my_now.png rename to static/images/icon/my_now.png diff --git a/static/images/my_print.png b/static/images/icon/my_print.png similarity index 100% rename from static/images/my_print.png rename to static/images/icon/my_print.png diff --git a/static/images/my_product_num_change.png b/static/images/icon/my_product_num_change.png similarity index 100% rename from static/images/my_product_num_change.png rename to static/images/icon/my_product_num_change.png diff --git a/static/images/my_select_none.png b/static/images/icon/my_select_none.png similarity index 100% rename from static/images/my_select_none.png rename to static/images/icon/my_select_none.png diff --git a/static/images/my_select_ok.png b/static/images/icon/my_select_ok.png similarity index 100% rename from static/images/my_select_ok.png rename to static/images/icon/my_select_ok.png diff --git a/static/images/my_store_m1.png b/static/images/icon/my_store_m1.png similarity index 100% rename from static/images/my_store_m1.png rename to static/images/icon/my_store_m1.png diff --git a/static/images/my_store_m2.png b/static/images/icon/my_store_m2.png similarity index 100% rename from static/images/my_store_m2.png rename to static/images/icon/my_store_m2.png diff --git a/static/images/my_store_m3.png b/static/images/icon/my_store_m3.png similarity index 100% rename from static/images/my_store_m3.png rename to static/images/icon/my_store_m3.png diff --git a/static/images/my_store_m4.png b/static/images/icon/my_store_m4.png similarity index 100% rename from static/images/my_store_m4.png rename to static/images/icon/my_store_m4.png diff --git a/static/images/my_store_m5.png b/static/images/icon/my_store_m5.png similarity index 100% rename from static/images/my_store_m5.png rename to static/images/icon/my_store_m5.png diff --git a/static/images/my_store_m6.png b/static/images/icon/my_store_m6.png similarity index 100% rename from static/images/my_store_m6.png rename to static/images/icon/my_store_m6.png diff --git a/static/images/my_store_today_buy.png b/static/images/icon/my_store_today_buy.png similarity index 100% rename from static/images/my_store_today_buy.png rename to static/images/icon/my_store_today_buy.png diff --git a/static/images/my_store_today_total.png b/static/images/icon/my_store_today_total.png similarity index 100% rename from static/images/my_store_today_total.png rename to static/images/icon/my_store_today_total.png diff --git a/static/images/my_store_week_buy.png b/static/images/icon/my_store_week_buy.png similarity index 100% rename from static/images/my_store_week_buy.png rename to static/images/icon/my_store_week_buy.png diff --git a/static/images/my_store_week_sell.png b/static/images/icon/my_store_week_sell.png similarity index 100% rename from static/images/my_store_week_sell.png rename to static/images/icon/my_store_week_sell.png diff --git a/static/images/my_toast_arrow.png b/static/images/icon/my_toast_arrow.png similarity index 100% rename from static/images/my_toast_arrow.png rename to static/images/icon/my_toast_arrow.png diff --git a/static/images/my_toast_close.png b/static/images/icon/my_toast_close.png similarity index 100% rename from static/images/my_toast_close.png rename to static/images/icon/my_toast_close.png diff --git a/static/images/myordermore.png b/static/images/icon/myordermore.png similarity index 100% rename from static/images/myordermore.png rename to static/images/icon/myordermore.png diff --git a/static/images/new-product-icon.png b/static/images/icon/new-product-icon.png similarity index 100% rename from static/images/new-product-icon.png rename to static/images/icon/new-product-icon.png diff --git a/static/images/next-icon.png b/static/images/icon/next-icon.png similarity index 100% rename from static/images/next-icon.png rename to static/images/icon/next-icon.png diff --git a/static/images/nowposition.png b/static/images/icon/nowposition.png similarity index 100% rename from static/images/nowposition.png rename to static/images/icon/nowposition.png diff --git a/static/images/order.png b/static/images/icon/order.png similarity index 100% rename from static/images/order.png rename to static/images/icon/order.png diff --git a/static/images/order_now.png b/static/images/icon/order_now.png similarity index 100% rename from static/images/order_now.png rename to static/images/icon/order_now.png diff --git a/static/images/overdue.png b/static/images/icon/overdue.png similarity index 100% rename from static/images/overdue.png rename to static/images/icon/overdue.png diff --git a/static/images/plus-icon.png b/static/images/icon/plus-icon.png similarity index 100% rename from static/images/plus-icon.png rename to static/images/icon/plus-icon.png diff --git a/static/images/prearrangedmall.png b/static/images/icon/prearrangedmall.png similarity index 100% rename from static/images/prearrangedmall.png rename to static/images/icon/prearrangedmall.png diff --git a/static/images/reduce-icon.png b/static/images/icon/reduce-icon.png similarity index 100% rename from static/images/reduce-icon.png rename to static/images/icon/reduce-icon.png diff --git a/static/images/reserve-shop.png b/static/images/icon/reserve-shop.png similarity index 100% rename from static/images/reserve-shop.png rename to static/images/icon/reserve-shop.png diff --git a/static/images/scanning.png b/static/images/icon/scanning.png similarity index 100% rename from static/images/scanning.png rename to static/images/icon/scanning.png diff --git a/static/images/scanning_now.png b/static/images/icon/scanning_now.png similarity index 100% rename from static/images/scanning_now.png rename to static/images/icon/scanning_now.png diff --git a/static/images/search-icon.png b/static/images/icon/search-icon.png similarity index 100% rename from static/images/search-icon.png rename to static/images/icon/search-icon.png diff --git a/static/images/search.png b/static/images/icon/search.png similarity index 100% rename from static/images/search.png rename to static/images/icon/search.png diff --git a/static/images/select_arrow.png b/static/images/icon/select_arrow.png similarity index 100% rename from static/images/select_arrow.png rename to static/images/icon/select_arrow.png diff --git a/static/images/selected.png b/static/images/icon/selected.png similarity index 100% rename from static/images/selected.png rename to static/images/icon/selected.png diff --git a/static/images/today-order.png b/static/images/icon/today-order.png similarity index 100% rename from static/images/today-order.png rename to static/images/icon/today-order.png diff --git a/static/images/todaysorder.png b/static/images/icon/todaysorder.png similarity index 100% rename from static/images/todaysorder.png rename to static/images/icon/todaysorder.png diff --git a/static/images/unselected.png b/static/images/icon/unselected.png similarity index 100% rename from static/images/unselected.png rename to static/images/icon/unselected.png diff --git a/static/images/warn-icon.png b/static/images/icon/warn-icon.png similarity index 100% rename from static/images/warn-icon.png rename to static/images/icon/warn-icon.png diff --git a/static/images/white-cancel.png b/static/images/icon/white-cancel.png similarity index 100% rename from static/images/white-cancel.png rename to static/images/icon/white-cancel.png diff --git a/static/images/yellow-cancel.png b/static/images/icon/yellow-cancel.png similarity index 100% rename from static/images/yellow-cancel.png rename to static/images/icon/yellow-cancel.png diff --git a/static/images/yellow-right-arrow.png b/static/images/icon/yellow-right-arrow.png similarity index 100% rename from static/images/yellow-right-arrow.png rename to static/images/icon/yellow-right-arrow.png diff --git a/static/images/logo.png b/static/images/logo.png deleted file mode 100644 index 451619837863e245d99c174cd871b660402e8a13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9641 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