diff --git a/src/pages.json b/src/pages.json
index 13b4833..23cf4a7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -216,7 +216,14 @@
{
"path": "pages/index/index",
"style" : {
- "navigationBarTitleText": "欧轩智能商家助手"
+ "navigationBarTitleText": "欧轩智能商家助手",
+ "navigationStyle":"custom"
+ }
+ },
+ {
+ "path": "pages/index/timing_list",
+ "style" : {
+ "navigationBarTitleText": "定时列表"
}
},
{
diff --git a/src/subpackage/device/components/store_name/store_name.vue b/src/subpackage/device/components/store_name/store_name.vue
index df1897e..1624b6d 100644
--- a/src/subpackage/device/components/store_name/store_name.vue
+++ b/src/subpackage/device/components/store_name/store_name.vue
@@ -1,9 +1,9 @@
-
+
- {{curStoreInfo.name || '-'}}
-
+ {{curStoreInfo.name || '-'}}
+
@@ -15,8 +15,21 @@ export default {
...mapState({
storeList: state => state.device.storeList,
curStoreInfo: state => state.device.curStoreInfo,
- })
+ }),
+ getThemeIcon(){
+ return ()=> {return (this.theme=='light')?'../../static/images/arrow_b2_light.png':'../../static/images/arrow_b2.png';}
+ },
+ getThemeColor(){
+ return ()=> {return (this.theme=='light')?'#FFFFFF':'#1a1a1a';}
+ },
+ getThemeBg(){
+ return ()=> {return (this.theme=='light')?'none':'#FFFFFF';}
+ },
},
+ props: ["theme"],//定义主题字段,定制组件展示效果 "light":亮色
+ created() {
+ console.log("store_name theme: ", this.theme);
+ },
methods: {
storeChange(e){
let { storeList, curStoreInfo } = this;
@@ -31,14 +44,16 @@ export default {
diff --git a/src/subpackage/device/static/images/arrow_b2_light.png b/src/subpackage/device/static/images/arrow_b2_light.png
new file mode 100644
index 0000000..f780cc4
Binary files /dev/null and b/src/subpackage/device/static/images/arrow_b2_light.png differ
diff --git a/src/subpackage/device/static/images/arrow_back.png b/src/subpackage/device/static/images/arrow_back.png
new file mode 100644
index 0000000..8649cfe
Binary files /dev/null and b/src/subpackage/device/static/images/arrow_back.png differ
diff --git a/src/subpackage/device/static/images/icon_clock.png b/src/subpackage/device/static/images/icon_clock.png
new file mode 100644
index 0000000..2b07e96
Binary files /dev/null and b/src/subpackage/device/static/images/icon_clock.png differ
diff --git a/src/subpackage/device/static/images/index_bg.png b/src/subpackage/device/static/images/index_bg.png
new file mode 100644
index 0000000..f342917
Binary files /dev/null and b/src/subpackage/device/static/images/index_bg.png differ