diff --git a/assets/agent/icon-agent.png b/assets/agent/icon-agent.png
new file mode 100644
index 0000000..2c2bbe7
Binary files /dev/null and b/assets/agent/icon-agent.png differ
diff --git a/assets/agent/icon-dsh.png b/assets/agent/icon-dsh.png
new file mode 100644
index 0000000..c5f4799
Binary files /dev/null and b/assets/agent/icon-dsh.png differ
diff --git a/assets/agent/icon-dyy.png b/assets/agent/icon-dyy.png
new file mode 100644
index 0000000..16af855
Binary files /dev/null and b/assets/agent/icon-dyy.png differ
diff --git a/assets/agent/icon-sjz.png b/assets/agent/icon-sjz.png
new file mode 100644
index 0000000..412fbff
Binary files /dev/null and b/assets/agent/icon-sjz.png differ
diff --git a/assets/agent/icon-ywc.png b/assets/agent/icon-ywc.png
new file mode 100644
index 0000000..3cb147a
Binary files /dev/null and b/assets/agent/icon-ywc.png differ
diff --git a/assets/image/icon-banner.png b/assets/image/icon-banner.png
deleted file mode 100644
index 5dc7095..0000000
Binary files a/assets/image/icon-banner.png and /dev/null differ
diff --git a/assets/image/icon-qrcode.png b/assets/image/icon-qrcode.png
deleted file mode 100644
index 3fadcd0..0000000
Binary files a/assets/image/icon-qrcode.png and /dev/null differ
diff --git a/assets/info/noData.png b/assets/info/noData.png
deleted file mode 100644
index cf61c71..0000000
Binary files a/assets/info/noData.png and /dev/null differ
diff --git a/assets/info/sucessful.png b/assets/info/sucessful.png
deleted file mode 100644
index 4dfcb5b..0000000
Binary files a/assets/info/sucessful.png and /dev/null differ
diff --git a/assets/image/tabbar/home-blue.png b/assets/tabbar/home-blue.png
similarity index 100%
rename from assets/image/tabbar/home-blue.png
rename to assets/tabbar/home-blue.png
diff --git a/assets/image/tabbar/home-gray.png b/assets/tabbar/home-gray.png
similarity index 100%
rename from assets/image/tabbar/home-gray.png
rename to assets/tabbar/home-gray.png
diff --git a/assets/tabbar/mall-blue.png b/assets/tabbar/mall-blue.png
new file mode 100644
index 0000000..b6a2072
Binary files /dev/null and b/assets/tabbar/mall-blue.png differ
diff --git a/assets/tabbar/mall-gray.png b/assets/tabbar/mall-gray.png
new file mode 100644
index 0000000..b45d0ed
Binary files /dev/null and b/assets/tabbar/mall-gray.png differ
diff --git a/assets/image/tabbar/mall-blue.png b/assets/tabbar/message-blue.png
similarity index 100%
rename from assets/image/tabbar/mall-blue.png
rename to assets/tabbar/message-blue.png
diff --git a/assets/image/tabbar/mall-gray.png b/assets/tabbar/message-gray.png
similarity index 100%
rename from assets/image/tabbar/mall-gray.png
rename to assets/tabbar/message-gray.png
diff --git a/assets/image/tabbar/process-blue.png b/assets/tabbar/process-blue.png
similarity index 100%
rename from assets/image/tabbar/process-blue.png
rename to assets/tabbar/process-blue.png
diff --git a/assets/image/tabbar/process-gray.png b/assets/tabbar/process-gray.png
similarity index 100%
rename from assets/image/tabbar/process-gray.png
rename to assets/tabbar/process-gray.png
diff --git a/components/popup/index.wxml b/components/popup/index.wxml
index 9b41e5c..992d2a7 100644
--- a/components/popup/index.wxml
+++ b/components/popup/index.wxml
@@ -1,24 +1,13 @@
-
-
+
+ bind:tap="onClickCloseIcon" />
+
\ No newline at end of file
diff --git a/components/toast/index.wxml b/components/toast/index.wxml
index 635e7d6..a14e428 100644
--- a/components/toast/index.wxml
+++ b/components/toast/index.wxml
@@ -1,33 +1,19 @@
-
-
-
+
+
+
{{ message }}
-
+
{{ message }}
-
+
\ No newline at end of file
diff --git a/pages/agent/ability-item/index.json b/pages/agent/ability-item/index.json
index 097b430..1d2b28b 100644
--- a/pages/agent/ability-item/index.json
+++ b/pages/agent/ability-item/index.json
@@ -2,7 +2,6 @@
"component": true,
"usingComponents": {
"van-button": "/components/button/index",
- "van-image": "/components/image/index",
- "van-tag": "/components/tag/index"
+ "van-image": "/components/image/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/ability-item/index.wxml b/pages/agent/ability-item/index.wxml
index 9219ec9..8bd41e4 100644
--- a/pages/agent/ability-item/index.wxml
+++ b/pages/agent/ability-item/index.wxml
@@ -11,9 +11,7 @@
时间:{{formate.substring(item.startTime, 0, 10)}}至{{formate.substring(item.endTime, 0, 10)}}
-
- 活动规则
-
+ 活动规则
diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js
index 55e4ea6..8acd882 100644
--- a/pages/agent/index/index.js
+++ b/pages/agent/index/index.js
@@ -15,10 +15,10 @@ Component({
userInfo: app.userInfo,
height: app.globalData.safeFragmentHeight,
tabList: [
- { status: 50, badge: '', name: '待预约', icon: '/assets/image/icon_pricing.png' },
- { status: 51, badge: '', name: '待送货', icon: '/assets/image/icon_checking.png' },
- { status: 53, badge: '', name: '结算中', icon: '/assets/image/icon_payment.png' },
- { status: 54, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
+ { status: 50, badge: '', name: '待预约', icon: '/assets/agent/icon-dyy.png' },
+ { status: 51, badge: '', name: '待送货', icon: '/assets/agent/icon-dsh.png' },
+ { status: 53, badge: '', name: '结算中', icon: '/assets/agent/icon-sjz.png' },
+ { status: 54, badge: '', name: '已完成', icon: '/assets/agent/icon-ywc.png' }
]
},
lifetimes: {
diff --git a/pages/agent/index/index.wxml b/pages/agent/index/index.wxml
index c429f78..7d3e54e 100644
--- a/pages/agent/index/index.wxml
+++ b/pages/agent/index/index.wxml
@@ -10,10 +10,10 @@
-
+
-
+
@@ -30,7 +30,7 @@
-
+
diff --git a/pages/home/customer-list/index.wxml b/pages/home/customer-list/index.wxml
index d6194f4..d42e59f 100644
--- a/pages/home/customer-list/index.wxml
+++ b/pages/home/customer-list/index.wxml
@@ -5,7 +5,6 @@
搜索
-
@@ -33,9 +32,8 @@
{{finished?'到底啦~':'加载中...'}}
-
-