diff --git a/pages.json b/pages.json
index 0eb5fc6..acedf1c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,13 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
+ "path": "pages/user/news/news",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
"path": "pages/welcome/welcome",
"style": {
"navigationBarTitleText": "",
@@ -12,8 +19,8 @@
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "首页",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
@@ -146,8 +153,8 @@
"enablePullDownRefresh": true,
"navigationBarTitleText": "我的",
"backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
+ "navigationBarBackgroundColor": "#6fbdee",
+ "backgroundColorTop": "#6fbdee",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false, //禁用原生导航栏
@@ -298,7 +305,7 @@
"path": "pages/user/order_list/order_list",
"style": {
"navigationBarTitleText": "我的订单",
- "navigationBarBackgroundColor": "#f8f8f8",
+ "navigationBarBackgroundColor": "#ffffff",
"backgroundColorTop": "#f3f3f3",
"backgroundColorBottom": "#ffffff"
}
@@ -497,6 +504,7 @@
}
+
],
"subpackages": [{
"root": "subPages",
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 3ca70d3..4bc642f 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -17,103 +17,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
+
+
+ 放松放松方放松放松方放松放松方
+ 40分钟前
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
- {{ row.title }}
+
+
+
+ 加油专区
+ 更多
-
-
-
-
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ ETC加油券
+ 2020.09.21-2202.10.12
+ ¥240
+
-
-
-
-
- {{item.couponName}}
-
-
- {{ item.discountPrice*100}}
-
-
-
-
-
-
-
+
+
+
+ 惠享生活
+
-
-
-
-
- {{item.couponName}}
-
- ￥{{item.discountPrice}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- {{pro.couponName}}
- ￥{{pro.discountPrice}}
-
-
-
+
+
+
+ 天天好券
+
+ 更多
+
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
+ 加油优惠券包
+ 2020.09.21-2202.10.12
+ ¥240
+
+
+
-
-
-
-
-
-
-
-
@@ -149,8 +192,8 @@
currentSwiper: 0,
imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg,
- imgadres: 'headzq.png',
- imgadres1: 'jbhed.png',
+ imgadres: '/home/home1.png',
+ imgadres1: '/home/home2.png',
imgadres2: 'jt.png',
imgadres5: 'unionarea.png',
imgadres3: '',
@@ -708,6 +751,10 @@
swiperChange(event) {
this.currentSwiper = event.detail.current;
},
+ test(item) {
+ let a = item % 2;
+ },
+
eheckStu(item) {
this.cpStuats = item;
},
@@ -770,51 +817,9 @@
//跳转菜单
toCategory(item) {
- // if (!app.globalData.userInfo.phone) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
- // if (!app.globalData.userInfo) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
- // if (item.title == '在线加油') {
uni.navigateTo({
url: item.ext1
})
- // } else if (item.title == '肯德基') {
- // uni.navigateTo({
- // // url: '/pages/tabBar/order/order?id=1'
- // url: '../../../qianzhu-KFC/home/home'
- // })
- // } else if (item.title == '电影票') {
- // uni.navigateTo({
- // // url: '/pages/tabBar/order/order?id=2'
- // // url: '/qianzhu-Starbucks/home/home'
- // })
- // } else if (item.title == '话费充值') {
- // uni.navigateTo({
- // url: '../../../subPages/recharge/recharge'
- // })
- // } else if (item.title == '星巴克') {
- // uni.navigateTo({
- // url: '/qianzhu-Starbucks/home/home'
- // })
- // }else if (item.title == '会员充值') {
- // uni.navigateTo({
- // url: '/member-Recharge/choicepage/choicepage'
- // })
- // } else {
- // uni.showToast({
- // title: '暂未开通',
- // icon: 'none',
- // duration: 2000
- // })
- // }
},
//轮播跳转活动
jumplottery(item) {
@@ -827,76 +832,9 @@
},
//单独跳转话费充值
jumphuafei(item) {
- // if (!app.globalData.userInfo) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
- // if (!app.globalData.userInfo.phone) {
- // uni.navigateTo({
- // url: '../../userLogin/userLogin'
- // })
- // return;
- // }
-
uni.navigateTo({
url: item.ext1
})
- // if (item.title == '汇联通') {
- // uni.navigateTo({
- // url: '/pages/goods/goods-list/goods-list?id=2'
- // })
- // return;
- // }
- // if (item.title == '在线加油') {
- // uni.navigateTo({
- // url: '/pages/goods/refuel/refuel'
- // })
- // return;
- // }
- // if (item.title == '话费充值') {
- // uni.navigateTo({
- // url: '../../../subPages/recharge/recharge'
- // })
- // return;
- // }
- // if (item.title == '电影票') {
- // uni.navigateTo({
- // url: '/pages/tabBar/order/order?id=2'
- // })
- // return;
- // }
- // if (item.title == '星巴克') {
- // uni.navigateTo({
- // url: '/qianzhu-Starbucks/home/home'
- // })
- // return;
- // }
- // if (item.title == '肯德基') {
- // uni.navigateTo({
- // url: '../../../qianzhu-KFC/home/home'
- // })
- // return;
- // }
- // if (item.title == '优选商品') {
- // uni.navigateTo({
- // url: '../../../subPages/preferred-goods/preferred-goods'
- // })
- // return;
- // }
- // if (item.title == '优惠券包') {
- // uni.navigateTo({
- // url: '../../../subPages/coupon-package/coupon-package'
- // })
- // return;
- // }
- // if (item.title == '会员充值') {
- // uni.navigateTo({
- // url: '/member-Recharge/choicepage/choicepage'
- // })
- // return;
- // }
},
//调整商品列表
goGoodsList(item) {
@@ -931,7 +869,6 @@
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index a470d2c..f54975d 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -12,7 +12,7 @@
-
+
点击获取信息
@@ -21,126 +21,139 @@
{{user.name}}
- 积分: 0
- 积分: {{user.gold}} 个
-
+ {{userphone}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{textnum}} 张
+ 卡券
+
+
+
+
+ {{textSend}} 张
+ 优惠券
+
+
+
+
- 我的订单
+
+ 订单
+ 全部订单
+
+
+
-
-
-
-
-
-
+
- {{row.text}}
+ {{row.text}}
+
+
+
+
+
+
+
+ 等待付款
+ 剩余时间: 13:44
+
+
+ 去支付
+
+
+
+
+
-
+
+
-
- 话费充值
-
-
-
-
-
-
- {{row.text}}
+
+ 我的资产
+
+
+
+ 进入卡包
+
-
-
-
- 卡券中心
-
-
-
-
-
-
-
-
-
- {{row.text}}
+
+
+ ****
+ ¥2400
+ 积分余额
+
+
+ ****
+ ¥2400
+ 油卡余额
+
+
+ ****
+ ¥2400
+ 工会卡余额
-
-
- 推广中心
-
-
-
-
-
-
-
-
-
- {{row.text}}
-
- {{row.text}}
+
+
+
+ 商务中心
+
+
+
+
+ 门店登陆
+
+
+
+ 代理商登陆
+
+
+
+ 我的推广
-
- 我的
+
+
+
+
+
-
-
+
+
- {{row.text}}
+
+ {{row.text}}
-
@@ -161,7 +174,6 @@
},
data() {
return {
- isfirst: true,
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'head.png',
headerPosition: "fixed",
@@ -179,21 +191,18 @@
// 订单类型
orderList: [{
text: '待支付',
- icon: "fukuan"
+ icon: "../../../static/img/user/user1.png"
},
{
text: '已支付',
- icon: "fahuo"
+ icon: "../../../static/img/user/user2.png"
},
{
text: '已完成',
- icon: "shouhuo"
+ icon: "../../../static/img/user/user3.png"
}, {
text: '已退款',
- icon: "tuihuo"
- }, {
- text: '已取消',
- icon: "pingjia"
+ icon: "../../../static/img/user/user4.png"
}
],
huafeiList: [{
@@ -215,58 +224,11 @@
icon: "tuihuo"
}
],
- // 工具栏列表
- mytoolbarList: [{
- url: '/pages/goods/recording/recording',
- text: '积分记录',
- img: 'user/mingxi.png'
- },
- // {
- // url: '/pages/goods/recording/recording?id=2',
- // text: '消费记录',
- // img: 'user/quan.png'
- // },
- {
- url: '/pages/user/mineCoupons/mineCoupons',
- text: '我的卡券',
- img: 'user/choujiang.png'
- },
- {
- url: '../../user/coupon/coupon',
- text: '我的优惠券',
- img: 'user/momey.png'
- }
- ],
- // 推广列表
- mytgbarList: [{
- url: '',
- text: '客服',
- img: 'user/kefu.png'
- },
- {
- url: '../../login/login?id=1',
- text: '商户入口',
- img: 'user/point.png'
- },
- {
- url: '../../login/login?id=2',
- text: '代理商登录',
- img: 'user/renw.png'
- },
- {
- url: '/pages/user/myPromotion/myPromotion',
- text: '我的推广',
- img: 'user/extension.png'
- }
- // ,
- // {
- // url: '/pages/user/generatePoster/generatePoster',
- // text: '生成海报',
- // img: 'user/poster.png'
- // }
- ],
//操作列表
czList: '',
+ nopaylist: [1, 2, 3, 4, 5],
+ assetsstu: 2,
+ userphone:'' // 手机号
}
},
//下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
@@ -307,47 +269,59 @@
// #ifdef MP
if (!app.globalData.userInfo.isSetPayPwd) {
this.czList = [{
- url: '../../../subPages/cardsList/cardsList',
- text: '卡包',
- img: '../../../static/img/ghkpay.png'
+ url: '/pages/goods/recording/recording',
+ text: '积分记录',
+ img: '../../../static/img/user/user10.png'
},
+
{
url: '../../login/updatePas/updatePas',
- text: '设置积分密码',
- img: '../../../static/img/pas.png'
+ text: '支付密码',
+ img: '../../../static/img/user/user11.png'
+ }, {
+ url: '',
+ text: '客服',
+ img: '../../../static/img/user/user13.png'
}
]
return;
}
- // '../../user/unionCard/unionCard'
this.czList = [{
- url: '../../../subPages/cardsList/cardsList',
- text: '卡包',
- img: '../../../static/img/ghkpay.png'
+ url: '/pages/goods/recording/recording',
+ text: '积分记录',
+ img: '../../../static/img/user/user10.png'
},
{
url: '../../login/updatePas/resetPas',
- text: '修改积分密码',
- img: '../../../static/img/pas.png'
+ text: '支付密码',
+ img: '../../../static/img/user/user11.png'
+ }, {
+ url: '',
+ text: '客服',
+ img: '../../../static/img/user/user13.png'
}
]
// #endif
// #ifdef H5
if (!app.globalData.userInfo.isSetPayPwd) {
this.czList = [{
- url: '../../../subPages/cardsList/cardsList',
- text: '卡包',
+ url: '/pages/goods/recording/recording',
+ text: '积分记录',
img: '../../../static/img/ghkpay.png'
},
{
url: '../../login/updatePas/updatePas',
- text: '设置积分密码',
- img: '../../../static/img/pas.png'
+ text: '支付密码',
+ img: '../../../static/img/user/user11.png'
}, {
url: '',
text: '退出登录',
- img: '../../../static/img/exit.png'
- },
+ img: '../../../static/img/user/user12.png'
+ }, {
+ url: '',
+ text: '客服',
+ img: '../../../static/img/user/user13.png'
+ }
]
return;
}
@@ -358,13 +332,17 @@
},
{
url: '../../login/updatePas/resetPas',
- text: '修改积分密码',
- img: '../../../static/img/pas.png'
+ text: '支付密码',
+ img: '../../../static/img/user/user11.png'
},
{
url: '',
text: '退出登录',
img: '../../../static/img/exit.png'
+ }, {
+ url: '',
+ text: '客服',
+ img: '../../../static/img/user/user13.png'
}
]
// #endif
@@ -381,7 +359,8 @@
this.therrNum = res.return_data.unpaid;
this.whetherCheckNum = res.return_data.whetherCheckNum;
this.orderPayNum = res.return_data.orderPayNum;
- this.rechargeOrderNum = res.return_data.rechargeOrderNum;
+ this.rechargeOrderNum = res.return_data.rechargeOrderNum;
+ this.geTel(this.user.phone);
uni.setStorage({
key: "user",
data: res.return_data
@@ -389,98 +368,63 @@
}
});
},
- loginByPhone(PhoneNumber) {
- if (PhoneNumber.detail.iv == undefined) {
- uni.showToast({
- title: "用户取消授权",
- icon: "none"
- });
- return;
- }
- let params = {
- openId: app.globalData.openId,
- iv: PhoneNumber.detail.iv,
- encryptedData: PhoneNumber.detail.encryptedData
- }
- loginByPhone(params).then(res => {
- if (res.return_code == '000000') {
- app.globalData.userInfo = res.return_data
- .object
- .highUser;
- app.globalData.token = res.return_data.uniqueCode;
- uni.setStorage({
- key: "token",
- data: res.return_data.uniqueCode
- })
- uni.setStorage({
- key: "user",
- data: res.return_data
- .object
- .highUser
- })
- this.toDeposit();
- }
- });
- },
- // H5获取手机号
- jumpH5Bding() {
- uni.navigateTo({
- url: '/pages/login/register'
- })
- },
//跳转用户信息
jumplogin() {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
},
- //消息列表
- toMsg() {
- uni.showToast({
- title: '暂未开通',
- icon: 'none'
- });
- },
toOrderList(index) {
uni.navigateTo({
url: '../../user/order_list/order_list?tbIndex=' + index
})
},
- //话费充值
- toOrdehuafeirList(index) {
- uni.navigateTo({
- url: '../../../subPages/unionPay-orderList/unionPay-orderList?tbIndex=' + index
- })
+ // 隐藏手机号
+ geTel(tel) {
+ var reg = /^(\d{3})\d{4}(\d{4})$/;
+ this.userphone = tel.replace(reg, "$1****$2");
},
- toLogin() {
- uni.showToast({
- title: '请登录',
- icon: "none"
- });
- uni.navigateTo({
- url: '../../login/login'
- })
- this.isfirst = false;
- },
- isLogin() {
- //实际应用中,用户登录状态应该用token等方法去维持登录状态.
- const value = uni.getStorageSync('UserInfo');
- if (value) {
- return true;
+ // 资产查看状态
+ updatestu(item) {
+ if (item == 1) {
+ this.assetsstu = 2;
+ }
+ if (item == 2) {
+ this.assetsstu = 1;
}
- return false
},
- toDeposit() {
- if (this.user) {
+ // 推广
+ jumppage(item) {
+ if (item == 1) {
uni.navigateTo({
- url: '../../user/deposit/deposit'
+ url: '../../login/login?id=1'
})
- } else {
+ }
+ if (item == 2) {
uni.navigateTo({
- url: '/pages/userLogin/userLogin'
+ url: '../../login/login?id=2'
+ })
+ }
+ if (item == 3) {
+ uni.navigateTo({
+ url: '/pages/user/myPromotion/myPromotion'
+ })
+ }
+ if (item == 4) {
+ uni.navigateTo({
+ url: '../../../subPages/cardsList/cardsList'
+ })
+ }
+ if (item == 5) {
+ uni.navigateTo({
+ url: '/pages/user/mineCoupons/mineCoupons'
+ })
+ }
+ if (item == 6) {
+ uni.navigateTo({
+ url: '../../user/coupon/coupon'
})
}
-
},
toPage(url, item) {
if (item != '客服') {
@@ -544,8 +488,7 @@
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index ef94372..4d905b6 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -1,110 +1,85 @@
-
-
-
- {{grid}}
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+ {{grid}}
+
+
+
+
+ {{item}}
+
-
-
-
-
- 卡券订单
-
-
-
- 积分充值
-
-
-
- 优惠券包
-
-
-
- 加油订单
-
-
-
- 电影票
-
-
-
- KFC
-
-
-
- 星巴克
-
-
-
- 会员充值
+
+
+
+ 在线加油
+
-
-
- 工会卡充值
-
-
- {{row.createTime | formatDate('-')}}
+
+ {{typeText[row.orderStatus]}}
-
-
+
-
- {{row.highChildOrderList[0].goodsName}}
-
-
- 数量 : {{row.highChildOrderList[0].saleCount}}
+
+ {{row.highChildOrderList[0].goodsName}}
-
- ￥{{row.payPrice}}
+
+ x1
-
-
- {{(row.payPrice * 10 * 10).toFixed(0)}}
+
+
+
+ 订单编号:{{row.orderNo}}
+
+
+
+
+ 下单时间 : {{row.createTime | formatDate('-')}}
+
+
+
+
+ 合计: ￥{{row.payPrice}}
- {{typeText[row.orderStatus]}}
-
- 取消订单
+
+ 取消订单
- 付款
+ 立即支付
@@ -116,7 +91,7 @@
import {
getUserOrderList,
cancelOrder,
- thirdCancelOrder,
+ thirdCancelOrder,
orderCheck
} from '../../../Utils/Api.js';
let app = getApp()
@@ -138,7 +113,7 @@
7: '订单退款失败'
},
// 退换货
- orderType: ['全部', '待支付', '已支付', '已完成', '已退款', '已取消'],
+ orderType: ['全部', '待支付', '已支付', '已完成', '已退款'],
//订单列表 演示数据
orderList: [],
list: [],
@@ -149,7 +124,9 @@
loadingText: '',
typeId: '',
imageUrl: app.globalData.imgUrl,
- reFresh: ""
+ reFresh: "",
+ orderTyplist: ['全部订单', '在线加油', '肯德基', '星巴克', '话费充值', '卡券订单'], //订单类型
+ ordertypeid: 1 //类型id
}
},
@@ -158,9 +135,13 @@
this.headerTop = '44px';
// #endif
let tbIndex = parseInt(option.tbIndex) + 1;
- this.list = this.orderList[tbIndex];
+ if (tbIndex == 0) {
+ this.typeId = '';
+ } else {
+ this.typeId = tbIndex;
+ }
+ this.list = this.orderList[this.typeId];
this.tabbarIndex = tbIndex;
- this.typeId = tbIndex;
this.getUserOrderList();
},
onPageScroll(e) {
@@ -385,41 +366,54 @@
background-color: #f3f3f3;
}
- .zspec {
- font-size: 22rpx;
- background-color: #0083f5;
- color: #FFFFFF;
- height: 40rpx;
- display: -webkit-box;
- display: -webkit-flex;
+ .input-box {
+ width: 72%;
+ margin-left: 5%;
+ margin-top: 15px;
+ height: 70rpx;
+ background-color: #f5f5f5;
+ border-radius: 10rpx;
+ position: relative;
display: flex;
- width: 44px;
- -webkit-box-align: center;
- -webkit-align-items: center;
align-items: center;
- padding: 0 15rpx;
- border-radius: 4px;
- margin-bottom: 10px;
- margin-left: 5px;
- }
+ border-radius: 15px 0 0 15px;
+ .icon {
+ display: flex;
+ align-items: center;
+ position: absolute;
+ top: 2px;
+ left: 5px;
+ width: 60upx;
+ height: 60upx;
+ font-size: 34upx;
+ color: #c0c0c0;
+ }
- .loading-text {
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- height: 60upx;
- color: #979797;
- font-size: 24upx;
+ input {
+ padding-left: 50upx;
+ height: 28upx;
+ font-size: 26upx;
+ width: 100%;
+ }
+ }
+
+ .searbtn {
+ height: 35px;
+ width: 18%;
+ background-color: #009DFF;
+ font-size: 16px;
+ text-align: center;
+ margin-top: 15px;
+ line-height: 35px;
+ color: #ffffff;
+ letter-spacing: 2px;
+ border-radius: 0 15px 15px 0;
}
.topTabBar {
width: 100%;
- position: fixed;
- top: 0;
- z-index: 10;
- background-color: #f8f8f8;
+ background-color: #ffffff;
height: 80upx;
display: flex;
justify-content: space-around;
@@ -439,16 +433,53 @@
align-items: center;
&.on {
- color: #0083f5;
- border-bottom: solid 4upx #0083f5;
+ color: #009dff;
+ border-bottom: solid 8upx #0083f5;
}
}
}
}
+ .srollview {
+ position: fixed;
+ z-index: 999;
+ height: 50px;
+ top: 120px;
+ background-color: #f3f3f3;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ white-space: nowrap;
+
+ .conent {
+ height: 24px;
+ line-height: 24px;
+ margin-top: 15px;
+ padding-left: 10px;
+ font-size: 12px;
+ padding-right: 10px;
+ border-radius: 20px;
+ margin-left: 10px;
+ display: inline-flex;
+ flex-direction: column;
+ text-align: center;
+ position: relative;
+ }
+ }
+
+ .frontconent {
+ background-color: #ffffff;
+ color: #333333;
+ }
+
+ .activeconent {
+ background-color: #e8eff4;
+ color: #009DFF;
+ }
+
.order-list {
- margin-top: 80upx;
+ margin-top: 170px;
padding-top: 20upx;
width: 100%;
@@ -485,14 +516,16 @@
padding: 10upx 20upx;
border-radius: 10upx;
background-color: #fff;
- margin-bottom: 20upx;
+ margin-bottom: 30upx;
.unread {
width: 10px;
height: 10px;
background-color: #e75e58;
border-radius: 50%;
- margin-top: -20px;
+ margin-top: -25px;
+ position: absolute;
+ margin-left: 60px;
}
.type {
@@ -579,7 +612,7 @@
view {
min-width: 120upx;
- height: 70rpx;
+ height: 60rpx;
padding: 0 20upx;
border-radius: 50upx;
display: flex;
@@ -602,4 +635,17 @@
}
}
}
+
+ .orderlabel {
+ width: 50px;
+ border-radius: 5px;
+ height: 22px;
+ line-height: 22px;
+ background-color: #eeebeb;
+ color: #797979;
+ text-align: center;
+ padding-left: 10px;
+ padding-right: 10px;
+ font-size: 12px;
+ }
diff --git a/static/img/home/cusser.png b/static/img/home/cusser.png
new file mode 100644
index 0000000..fe8a798
Binary files /dev/null and b/static/img/home/cusser.png differ
diff --git a/static/img/home/home3.png b/static/img/home/home3.png
new file mode 100644
index 0000000..29a3899
Binary files /dev/null and b/static/img/home/home3.png differ
diff --git a/static/img/home/home4.png b/static/img/home/home4.png
new file mode 100644
index 0000000..0f9eb24
Binary files /dev/null and b/static/img/home/home4.png differ
diff --git a/static/img/home/home5.png b/static/img/home/home5.png
new file mode 100644
index 0000000..9e6cca8
Binary files /dev/null and b/static/img/home/home5.png differ
diff --git a/static/img/home/home6.png b/static/img/home/home6.png
new file mode 100644
index 0000000..aa7f0d2
Binary files /dev/null and b/static/img/home/home6.png differ
diff --git a/static/img/home/home7.png b/static/img/home/home7.png
new file mode 100644
index 0000000..d0f7fb8
Binary files /dev/null and b/static/img/home/home7.png differ
diff --git a/static/img/user/user1.png b/static/img/user/user1.png
new file mode 100644
index 0000000..b751f33
Binary files /dev/null and b/static/img/user/user1.png differ
diff --git a/static/img/user/user10.png b/static/img/user/user10.png
new file mode 100644
index 0000000..0b688f7
Binary files /dev/null and b/static/img/user/user10.png differ
diff --git a/static/img/user/user11.png b/static/img/user/user11.png
new file mode 100644
index 0000000..3486825
Binary files /dev/null and b/static/img/user/user11.png differ
diff --git a/static/img/user/user12.png b/static/img/user/user12.png
new file mode 100644
index 0000000..bced1bd
Binary files /dev/null and b/static/img/user/user12.png differ
diff --git a/static/img/user/user13.png b/static/img/user/user13.png
new file mode 100644
index 0000000..8565c46
Binary files /dev/null and b/static/img/user/user13.png differ
diff --git a/static/img/user/user14.png b/static/img/user/user14.png
new file mode 100644
index 0000000..f8c3bdb
Binary files /dev/null and b/static/img/user/user14.png differ
diff --git a/static/img/user/user2.png b/static/img/user/user2.png
new file mode 100644
index 0000000..98008c8
Binary files /dev/null and b/static/img/user/user2.png differ
diff --git a/static/img/user/user3.png b/static/img/user/user3.png
new file mode 100644
index 0000000..d9f1c95
Binary files /dev/null and b/static/img/user/user3.png differ
diff --git a/static/img/user/user4.png b/static/img/user/user4.png
new file mode 100644
index 0000000..d9cf6b8
Binary files /dev/null and b/static/img/user/user4.png differ
diff --git a/static/img/user/user5.png b/static/img/user/user5.png
new file mode 100644
index 0000000..fed05f2
Binary files /dev/null and b/static/img/user/user5.png differ
diff --git a/static/img/user/user6.png b/static/img/user/user6.png
new file mode 100644
index 0000000..6450164
Binary files /dev/null and b/static/img/user/user6.png differ
diff --git a/static/img/user/user7.png b/static/img/user/user7.png
new file mode 100644
index 0000000..b19a50e
Binary files /dev/null and b/static/img/user/user7.png differ
diff --git a/static/img/user/user8.png b/static/img/user/user8.png
new file mode 100644
index 0000000..eb21879
Binary files /dev/null and b/static/img/user/user8.png differ
diff --git a/static/img/user/user9.png b/static/img/user/user9.png
new file mode 100644
index 0000000..e3e129f
Binary files /dev/null and b/static/img/user/user9.png differ
diff --git a/uni.scss b/uni.scss
index d1dc83d..b14cbb6 100644
--- a/uni.scss
+++ b/uni.scss
@@ -286,11 +286,21 @@ $uni-font-size-paragraph:30upx;
.backcolor32 {
background-color: #32649d;
+}
+
+.backcolor3da7e7 {
+ background-color: #3da7e7;
+}
+.backcolor87c8f1 {
+ background-color: #87c8f1;
}
//渐变
.backcorlr{
background: linear-gradient(to right, #fe1a1a, #ff722e);
}
+.backcorltop{
+ background: linear-gradient(to bottom, #3da7e7, #6fbdee);
+}
.backcorf06{
background-color: #0083f5;
@@ -363,6 +373,10 @@ $uni-font-size-paragraph:30upx;
.width50 {
width: 50%;
}
+
+.width45 {
+ width: 45%;
+}
.width40 {
width: 40%;
@@ -387,6 +401,12 @@ $uni-font-size-paragraph:30upx;
margin-left: 3%;
}
+.width31{
+ width: 31%;
+ margin-right: auto;
+ margin-left: auto;
+}
+
.width20w {
width: 20%;
margin-left: 40%;
@@ -728,6 +748,10 @@ $uni-font-size-paragraph:30upx;
.border-r{
border-radius: 5px;
}
+
+.border-8r{
+ border-radius: 8px;
+}
/* button样式 */
.btnw70 {
@@ -836,6 +860,18 @@ $uni-font-size-paragraph:30upx;
width: 12px;
}
+.icon25 {
+ width: 25px;
+}
+
+.icon30 {
+ width: 30px;
+}
+
.icon40 {
width: 40px;
+}
+
+.icon45 {
+ width: 45px;
}
\ No newline at end of file