diff --git a/README.md b/README.md
index 7008566..d2a8e24 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#酒店桌布小程序
+#招聘小程序


diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 732e9ef..417a4e7 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -36,33 +36,25 @@
"selectedIconPath": "/static/image/tabbar/home-a.png",
"iconPath": "/static/image/tabbar/home.png",
"pagePath": "/pages/index/index",
- "title": "首页"
- },
- {
- "selectedIconPath": "/static/image/tabbar/category-a.png",
- "iconPath": "/static/image/tabbar/category.png",
- "pagePath": "/pages/index/category",
- "title": "分类",
- isNotShop : true,
+ "title": "找工作"
},
{
"selectedIconPath": "/static/image/tabbar/order-a.png",
"iconPath": "/static/image/tabbar/order.png",
- "pagePath": "/pages/index/order",
- "title": "订单中心"
+ "pagePath": "/pages/index/keepAccounts",
+ "title": "记工记账"
},
{
- "selectedIconPath": "/static/image/tabbar/cart-a.png",
- "iconPath": "/static/image/tabbar/cart.png",
- "pagePath": "/pages/index/cart",
- "title": "购物车",
- isNotShop : true,
+ "selectedIconPath": "/static/image/tabbar/order-a.png",
+ "iconPath": "/static/image/tabbar/order.png",
+ "pagePath": "/pages/index/consult",
+ "title": "考证咨询",
},
{
"selectedIconPath": "/static/image/tabbar/center-a.png",
"iconPath": "/static/image/tabbar/center.png",
"pagePath": "/pages/index/center",
- "title": "个人中心"
+ "title": "会员中心"
}
]
};
diff --git a/doc/home.png b/doc/home.png
index 564a41d..3fc183d 100644
Binary files a/doc/home.png and b/doc/home.png differ
diff --git a/pages.json b/pages.json
index e8910a4..541be03 100644
--- a/pages.json
+++ b/pages.json
@@ -6,13 +6,13 @@
}
},
{
- "path": "pages/index/order",
+ "path": "pages/index/consult",
"style": {
"navigationBarTitleText": ""
}
},
{
- "path": "pages/index/category",
+ "path": "pages/index/keepAccounts",
"style": {
"navigationBarTitleText": ""
}
@@ -22,12 +22,6 @@
"style": {
"navigationBarTitleText": ""
}
- },
- {
- "path": "pages/index/cart",
- "style": {
- "navigationBarTitleText": ""
- }
}
],
"preloadRule": {
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
deleted file mode 100644
index 4c9a7c2..0000000
--- a/pages/index/cart.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
- 规格:{{ item.unit }}
-
-
-
- ¥{{ item.price }}元
-
-
-
-
-
-
-
-
-
-
-
-
- {{ checkboxValue.length }}
-
-
-
-
- 合计
-
- ¥{{ totalPrice }}
-
-
-
- 共{{ checkboxValue.length }}件,已享受更低优惠
-
-
-
- 去结算
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/category.vue b/pages/index/category.vue
deleted file mode 100644
index 17ab40d..0000000
--- a/pages/index/category.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
- 租赁
-
-
-
-
-
-
-
- {{item.unit}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/consult.vue b/pages/index/consult.vue
new file mode 100644
index 0000000..b60fe4e
--- /dev/null
+++ b/pages/index/consult.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dc9e069..b13468b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,112 +1,6 @@
-
-
-
-
-
-
- {{ area }}
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 我的客户
-
-
- {{ 30 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- HOUS水洗店
-
-
-
- 桌布水洗
-
-
- 桌布租赁
-
-
-
- 9:00-18:00
-
-
- 长沙市天心区桂花坪街道231号
-
-
-
-
- 我要水洗
-
-
-
-
- 关联门店:主信门店
-
-
-
-
-
-
-
-
-
@@ -118,24 +12,15 @@
import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
import Position from '@/utils/position.js'
import tabber from '@/components/base/tabbar.vue'
- import productList from '@/components/user/productList.vue'
import { mapGetters } from 'vuex'
// import selectArea from '../../components/selectArea.vue';
export default {
components : {
tabber,
- productList,
PrivacyAgreementPoup,
},
data() {
return {
- area: '长沙',
- text : '长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”.....',
- queryParams: {
- pageNo: 1,
- pageSize: 10,
- title: ''
- },
bannerList: [
{
url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
@@ -147,7 +32,6 @@
url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
},
],
- productList: [],
}
},
computed : {
@@ -198,215 +82,5 @@
diff --git a/pages/index/keepAccounts.vue b/pages/index/keepAccounts.vue
new file mode 100644
index 0000000..355f424
--- /dev/null
+++ b/pages/index/keepAccounts.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/order.vue b/pages/index/order.vue
deleted file mode 100644
index 7a53962..0000000
--- a/pages/index/order.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.projectId_dictText}}
- {{item.type_dictText}}
-
-
- {{item.state_dictText}}
-
-
-
-
-
-
-
-
-
-
-
- 客户姓名:{{item.name}}
-
-
- 产品规格:{{item.unit}}
-
-
- 租赁地址:{{item.address}}
-
-
-
-
-
-
-
-
-
- 总价格:{{item.money}}元
-
-
- 查看物流
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/static/image/home/0.png b/static/image/home/0.png
deleted file mode 100644
index e221211..0000000
Binary files a/static/image/home/0.png and /dev/null differ
diff --git a/static/image/home/1.png b/static/image/home/1.png
index 0b7d3dc..9702436 100644
Binary files a/static/image/home/1.png and b/static/image/home/1.png differ
diff --git a/static/image/home/2.png b/static/image/home/2.png
index 8ba997f..2538f91 100644
Binary files a/static/image/home/2.png and b/static/image/home/2.png differ
diff --git a/static/image/home/3.png b/static/image/home/3.png
index a7f85f3..e3b59e0 100644
Binary files a/static/image/home/3.png and b/static/image/home/3.png differ
diff --git a/static/image/home/4.png b/static/image/home/4.png
new file mode 100644
index 0000000..a96e64c
Binary files /dev/null and b/static/image/home/4.png differ
diff --git a/static/image/home/5.png b/static/image/home/5.png
new file mode 100644
index 0000000..0e35482
Binary files /dev/null and b/static/image/home/5.png differ
diff --git a/static/image/home/address-icon.png b/static/image/home/address-icon.png
deleted file mode 100644
index 51a11d2..0000000
Binary files a/static/image/home/address-icon.png and /dev/null differ
diff --git a/static/image/home/arrow-icon.png b/static/image/home/arrow-icon.png
deleted file mode 100644
index 9f3431a..0000000
Binary files a/static/image/home/arrow-icon.png and /dev/null differ
diff --git a/static/image/home/c.png b/static/image/home/c.png
new file mode 100644
index 0000000..c835ccf
Binary files /dev/null and b/static/image/home/c.png differ
diff --git a/static/image/home/phone.png b/static/image/home/phone.png
new file mode 100644
index 0000000..110d745
Binary files /dev/null and b/static/image/home/phone.png differ
diff --git a/static/image/home/search-icon.png b/static/image/home/search-icon.png
deleted file mode 100644
index 58bde8a..0000000
Binary files a/static/image/home/search-icon.png and /dev/null differ
diff --git a/static/image/tabbar/cart-a.png b/static/image/tabbar/cart-a.png
deleted file mode 100644
index b48261c..0000000
Binary files a/static/image/tabbar/cart-a.png and /dev/null differ
diff --git a/static/image/tabbar/cart.png b/static/image/tabbar/cart.png
deleted file mode 100644
index d211ea1..0000000
Binary files a/static/image/tabbar/cart.png and /dev/null differ
diff --git a/static/image/tabbar/category-a.png b/static/image/tabbar/category-a.png
deleted file mode 100644
index 6dd7bc6..0000000
Binary files a/static/image/tabbar/category-a.png and /dev/null differ
diff --git a/static/image/tabbar/category.png b/static/image/tabbar/category.png
deleted file mode 100644
index f667e88..0000000
Binary files a/static/image/tabbar/category.png and /dev/null differ
diff --git a/static/image/tabbar/center-a.png b/static/image/tabbar/center-a.png
index 61df5ef..4e9e646 100644
Binary files a/static/image/tabbar/center-a.png and b/static/image/tabbar/center-a.png differ
diff --git a/static/image/tabbar/home-a.png b/static/image/tabbar/home-a.png
index 5388253..2479d55 100644
Binary files a/static/image/tabbar/home-a.png and b/static/image/tabbar/home-a.png differ
diff --git a/static/image/tabbar/home.png b/static/image/tabbar/home.png
index 6f7accb..b967aff 100644
Binary files a/static/image/tabbar/home.png and b/static/image/tabbar/home.png differ
diff --git a/static/image/tabbar/order-a.png b/static/image/tabbar/order-a.png
index 6192093..8274f4e 100644
Binary files a/static/image/tabbar/order-a.png and b/static/image/tabbar/order-a.png differ
diff --git a/uni.scss b/uni.scss
index 6e2d4c6..a18da8d 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,7 +12,7 @@
* 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
*/
/* 颜色变量 */
-$uni-color: #FD5100;
+$uni-color: #3796F8;
/* 行为相关颜色 */
$uni-color-primary: #007aff;
diff --git a/utils/position.js b/utils/position.js
index d831ca0..09513cd 100644
--- a/utils/position.js
+++ b/utils/position.js
@@ -8,7 +8,7 @@ import config from '../config.js'
* @param {number} lon2 地点2维度
* @param {number} fixed 保留几位小数,默认0,单位km
*/
-function calculateDistance(lat1, lon1, lat2, lon2) { //计算两点距离
+function calculateDistance(lat1, lon1, lat2, lon2, fixed = 0) { //计算两点距离
let distance = 0
if (!lat2 || !lon2) return distance
//先强制转换一下(后端给的字符串)
@@ -28,7 +28,7 @@ function calculateDistance(lat1, lon1, lat2, lon2) { //计算两点距离
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
// 计算距离
distance = R * c;
- return distance.toFixed(0)
+ return distance.toFixed(fixed)
}
function getLocation(fn) { //获取用户经纬度