diff --git a/components/areaTree/style.css b/components/areaTree/style.css
index 10e94f7..9613035 100644
--- a/components/areaTree/style.css
+++ b/components/areaTree/style.css
@@ -45,7 +45,7 @@
line-height: 1;
}
.tki-tree-bar-confirm {
- color: #89965f;
+ color: #00a89b;
}
.tki-tree-view {
position: absolute;
@@ -120,7 +120,7 @@
border-bottom-width: 2rpx;
border-right-width: 2rpx;
border-style: solid;
- border-color: #89965f;
+ border-color: #00a89b;
display: flex;
justify-content: center;
align-items: center;
@@ -133,7 +133,7 @@
border-top-right-radius: 20%;
border-bottom-right-radius: 20%;
border-bottom-left-radius: 20%;
- background-color: #89965f;
+ background-color: #00a89b;
}
.tki-tree-check .radio {
border-top-left-radius: 50%;
diff --git a/components/chat/submit.vue b/components/chat/submit.vue
index 42a2794..39e31f4 100644
--- a/components/chat/submit.vue
+++ b/components/chat/submit.vue
@@ -19,7 +19,7 @@
- 发送
+ 发送
@@ -554,7 +554,7 @@
display: inline-block;
min-width: 120rpx;
line-height: 84rpx;
- background-color: #89965f;
+ background-color: #00a89b;
border-radius: 42rpx;
color:#ffffff;
}
diff --git a/manifest.json b/manifest.json
index 5c244cc..876047e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
{
- "name" : "三朵蘭瑜伽",
- "appid" : "__UNI__4060561",
- "description" : "三朵蘭瑜伽",
- "versionName" : "1.0.10",
- "versionCode" : 1010,
+ "name" : "瑜伽汇",
+ "appid" : "__UNI__B6E0086",
+ "description" : "瑜伽汇",
+ "versionName" : "1.0.0",
+ "versionCode" : 100,
"transformPx" : false,
"app-plus" : {
"flexible" : true,
diff --git a/pages.json b/pages.json
index 1433095..e17cbb5 100644
--- a/pages.json
+++ b/pages.json
@@ -311,7 +311,7 @@
"path": "pages/message/group",
"style": {
"enablePullDownRefresh": true,
- "navigationBarBackgroundColor": "#89965f",
+ "navigationBarBackgroundColor": "#00a89b",
"app-plus": {
"titleNView": false
}
@@ -321,7 +321,7 @@
"path": "pages/message/contact",
"style": {
"enablePullDownRefresh": true,
- "navigationBarBackgroundColor": "#89965f",
+ "navigationBarBackgroundColor": "#00a89b",
"app-plus": {
"titleNView": false
}
@@ -359,6 +359,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/book/bookteacher",
+ "style" :
+ {
+ "navigationBarTitleText": "预约学员",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/book/book",
"style" :
@@ -414,8 +422,8 @@
"pageOrientation": "auto",
"navigationStyle": "default", // "navigationStyle": "custom",
"navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#89965f",
- "backgroundColor": "#89965f"
+ "navigationBarBackgroundColor": "#00a89b",
+ "backgroundColor": "#00a89b"
},
"tabBar": {
"color": "#909399",
diff --git a/pages/address/add.vue b/pages/address/add.vue
index 6cb8bc6..a5af442 100644
--- a/pages/address/add.vue
+++ b/pages/address/add.vue
@@ -1,7 +1,7 @@
-
+
若所在省市无法选择，请在省市区选择其他，在详细地址输入即可
@@ -29,7 +29,7 @@
设置默认地址
-
+
@@ -447,7 +447,7 @@
}
}
.tip{
- background: #f3f4ee;
+ background: #e4f9f7;
padding: 20rpx;
font-size: 24rpx;
color: #303133;
@@ -464,7 +464,7 @@
width: 660rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/address/alist.vue b/pages/address/alist.vue
index e200bec..e62111f 100644
--- a/pages/address/alist.vue
+++ b/pages/address/alist.vue
@@ -221,7 +221,7 @@
font-weight: 400;
font-size: 24rpx;
color: #FFFFFF;
- background: #89965f;
+ background: #00a89b;
border-radius: 8rpx 8rpx 8rpx 8rpx;
display: flex;
flex-direction: row;
@@ -270,7 +270,7 @@
width: 560rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -328,7 +328,7 @@
height: 48rpx;
text-align: center;
line-height: 50rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 24rpx;
margin-left: 10rpx;
}
diff --git a/pages/book/book.vue b/pages/book/book.vue
index 958885d..aef5add 100644
--- a/pages/book/book.vue
+++ b/pages/book/book.vue
@@ -133,7 +133,9 @@
// 课程详情
if(options.data){
this.item = JSON.parse(decodeURIComponent(options.data));
+ console.log(this.item)
this.id = this.item.courseTimeId;
+ this.getinfo();
}
},
onShow(){
@@ -196,12 +198,12 @@
});
},
async getinfo() {
+ // 课程详情
uni.showLoading({
title: '数据加载中...'
});
- const {data: res} = await uni.$http.post('api/course/bookCourseDetail', {id:this.id});
+ const {data: res} = await uni.$http.post('/api/my/courseTimeDetail', {"courseTimeId":this.id}); // this.id
if(res){
-
// 订单信息
this.info=res;
this.$forceUpdate();
@@ -227,13 +229,12 @@
var param={
"courseTimeId": this.item.courseTimeId
};
- uni.showToast({
- title: '课程预约中...',
- icon: 'success',
- duration: 2000
+ uni.showLoading({
+ title: '课程预约中...'
});
const {data: res} = await uni.$http.post('/api/course/bookCourse', param);
- if(res.msg=="successed"){
+ console.log(res)
+ if(res.success){
uni.showToast({
title: '课程已预约！',
icon: 'success',
@@ -247,10 +248,21 @@
});
}
else{
- uni.showToast({
- title: res.msg? res.msg:'课程预约失败！',
- icon: 'error',
- duration: 2000
+ // uni.showToast({
+ // title: res.message? res.message:'课程预约失败！',
+ // icon: 'error',
+ // duration: 2000
+ // });
+
+ uni.showModal({
+ title: '提示',
+ content: res.message? res.message:'课程预约失败！',
+ cancelText: '取消',
+ confirmText: '确定',
+ success: ress => {
+ if (ress.confirm) {
+ }
+ }
});
}
},
diff --git a/pages/book/bookinfo.vue b/pages/book/bookinfo.vue
index b1b2f92..6a17197 100644
--- a/pages/book/bookinfo.vue
+++ b/pages/book/bookinfo.vue
@@ -286,24 +286,24 @@
.rmb{
font-size: 30rpx;
font-family: smallYuan;
- color:#89965f ;
+ color:#00a89b ;
margin-left: 10rpx;
}
.zs{
font-size: 48rpx;
font-weight: 600;
font-family: smallYuan;
- color:#89965f ;
+ color:#00a89b ;
}
.xs{
font-size: 28rpx;
font-weight: 600;
font-family: smallYuan;
- color:#89965f ;
+ color:#00a89b ;
}
}
.btn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 30rpx 20rpx 0 0;
border-radius: 50rpx;
height: 60rpx;
@@ -376,8 +376,8 @@
line-height: 60rpx;
width:170rpx;
font-size: 26rpx;
- border:1rpx solid #89965f;
- color:#89965f;
+ border:1rpx solid #00a89b;
+ color:#00a89b;
}
.wlbtn::after{
border:0 !important;
@@ -463,7 +463,7 @@
.owc{
display: flex;
flex-direction: column;
- background-color: #89965f ;
+ background-color: #00a89b ;
padding: 20rpx;
border-radius: 16rpx;
.ozstate{
@@ -586,8 +586,8 @@
}
::v-deep.uni-radio-input-checked{
- background-color: #89965f !important;
- border-color: #89965f !important;
+ background-color: #00a89b !important;
+ border-color: #00a89b !important;
background-clip: content-box!important;
box-sizing: border-box;
}
diff --git a/pages/book/booklist.vue b/pages/book/booklist.vue
index e63646f..1d9c138 100644
--- a/pages/book/booklist.vue
+++ b/pages/book/booklist.vue
@@ -493,7 +493,7 @@
}
},
// 再次预约
- orderdo(e,item){ // /api/course/bookCourse
+ orderdo(e,item){
console.log(id,item);
var that = this;
// 再次预约
@@ -520,7 +520,7 @@
duration: 2000
});
const {data: res} = await uni.$http.post('/api/course/bookCourse', param);
- if(res.msg=="successed"){
+ if(res.success){
uni.showToast({
title: '上课已预约！',
icon: 'success',
@@ -530,10 +530,20 @@
this.reset();
}
else{
- uni.showToast({
- title: res.msg? res.msg:'上课预约失败！',
- icon: 'error',
- duration: 2000
+ // uni.showToast({
+ // title: res.msg? res.msg:'上课预约失败！',
+ // icon: 'error',
+ // duration: 2000
+ // });
+ uni.showModal({
+ title: '提示',
+ content: res.message? res.message:'课程预约失败！',
+ cancelText: '取消',
+ confirmText: '确定',
+ success: ress => {
+ if (ress.confirm) {
+ }
+ }
});
}
},
@@ -752,14 +762,14 @@
height: 90rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -774,7 +784,7 @@
background-position: center;
font-size: 28rpx;
text-align: center;
- color: #89965f;
+ color: #00a89b;
overflow: hidden;
}
.scell{
@@ -948,14 +958,14 @@
line-height: 48rpx;
padding: 0 20rpx;
font-size: 24rpx;
- border:1rpx solid #89965f;
+ border:1rpx solid #00a89b;
color:#595d4d;
}
.conbtn::after{
border:0 !important;
}
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin-left: 20rpx;
border-radius: 50rpx;
border-radius: 50rpx;
@@ -963,7 +973,7 @@
line-height: 48rpx;
padding: 0 20rpx;
font-size: 24rpx;
- border:1rpx solid #89965f;
+ border:1rpx solid #00a89b;
}
.paybtn::after{
border:0 !important;
diff --git a/pages/book/bookshop.vue b/pages/book/bookshop.vue
new file mode 100644
index 0000000..db7bdaf
--- /dev/null
+++ b/pages/book/bookshop.vue
@@ -0,0 +1,787 @@
+
+
+
+
+
+
+
+
+
+ {{item.storeName?item.storeName:'门店'}}
+
+
+
+
+ 教练确认
+ 预约中
+ 待上课
+ 已完成
+ 已取消
+
+
+
+
+
+
+
+
+ {{item.courseName}} {{item.claName}}
+ 教练：{{item.teacherName }}
+ 上课时间：{{ item.claDate+' '+item.startTime+'-'+item.endTime}}
+ 教室：{{item.roomName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/book/bookteacher.vue b/pages/book/bookteacher.vue
new file mode 100644
index 0000000..db7bdaf
--- /dev/null
+++ b/pages/book/bookteacher.vue
@@ -0,0 +1,787 @@
+
+
+
+
+
+
+
+
+
+ {{item.storeName?item.storeName:'门店'}}
+
+
+
+
+ 教练确认
+ 预约中
+ 待上课
+ 已完成
+ 已取消
+
+
+
+
+
+
+
+
+ {{item.courseName}} {{item.claName}}
+ 教练：{{item.teacherName }}
+ 上课时间：{{ item.claDate+' '+item.startTime+'-'+item.endTime}}
+ 教室：{{item.roomName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 4b3f8c7..fc0525e 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -11,7 +11,7 @@
-
+
{{cell.storeName}}
@@ -31,7 +31,7 @@
>
-
+
@@ -93,7 +93,7 @@
- 全选
+ 全选
合计:
￥{{ totalPrice }}
@@ -173,7 +173,7 @@
// u-button样式
customStyle: {
color: '#fff',
- backgroundColor: '#89965f',
+ backgroundColor: '#00a89b',
margin: '0',
padding: '0 20rpx',
width: '200rpx',
@@ -646,7 +646,7 @@
}
// 状态栏占位
.status_bar {
- background-color: #89965f;
+ background-color: #00a89b;
}
.page-header {
position: fixed;
@@ -656,7 +656,7 @@
display: flex;
color: #fff;
font-size: 36rpx;
- background-color: #89965f;
+ background-color: #00a89b;
align-items: center;
.text-center {
width: 100%;
@@ -708,7 +708,7 @@
}
.cart-lose-btn{
font-size: 26rpx;
- color: #89965f;
+ color: #00a89b;
}
.cart-shop{
display: flex;
@@ -872,8 +872,8 @@
line-height: 64rpx;
color: #ffffff;
font-size: 26rpx;
- background: -webkit-linear-gradient(to right, rgba(137, 150, 95, 0.3) 0%, rgba(137, 150, 95, 1) 100%);
- background: linear-gradient(to right, rgba(137, 150, 95, 0.3) 0%, rgba(137, 150, 95, 1) 100%);
+ background: -webkit-linear-gradient(to right, rgba(137, 150, 95, 0.3) 0%, rgba(0, 168, 155, 1) 100%);
+ background: linear-gradient(to right, rgba(137, 150, 95, 0.3) 0%, rgba(0, 168, 155, 1) 100%);
}
}
.bottom {
diff --git a/pages/category/category.vue b/pages/category/category.vue
index cb3f453..14daaa8 100644
--- a/pages/category/category.vue
+++ b/pages/category/category.vue
@@ -1,17 +1,20 @@
+
-
+
+
{{item.name}}
-
+
-
+
+
企业介绍
@@ -33,33 +36,34 @@
-
+
{{item.storeName}}
-
+
-
+
{{item.address}}
-
+
+
@@ -75,11 +79,12 @@
-
+
+
-
+
@@ -94,6 +99,7 @@
+
@@ -116,6 +122,7 @@
+
@@ -144,126 +151,75 @@
shopid:myCache('myshopid')?myCache('myshopid'):'',
shop:myCache('myshop')?myCache('myshop'):'',
tabIndex: 0,
+ id:1,
sexs: [{
- text: '男',
- value: 0
- }, {
- text: '女',
- value: 1
- }, {
- text: '保密',
- value: 2
- }],
+ text: '男性',
+ value: "male"
+ },
+ {
+ text: '女性',
+ value: "female"
+ }],
valiFormData: {// 校验表单数据
id: null,
- sex: '',
+ gender: '',
age: '',
height: '',
weight: '',
},
//tabs
- list:[
- {
- name:"瑜伽传承",
- id:1,
- loadStatus:'more',//'more', // 'noMore',
- slist:[
- // {
- // id:1,
- // name: "瑜伽传承讲解",
- // info: `瑜伽的终极价值，或许在于它提供了一种超越时空的文明对话可能。当现代人在瑜伽垫上模仿祖先的山式站立时，完成的不仅是对身体的重塑，更是对"天人合一"古老智慧的当代诠释.`,
- // img: '../../static/image/theme/i2.jpg',
- // num:101,
- // date:'2025-06-20'
- // },
- ]
- },
- {
- name:"了解场馆",
- id:2,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"教练风采",
- id:3,
- loadStatus:'more',//'more', // 'noMore',
- slist:[
- // {
- // id:11,
- // name: "Madeline 老师 (女)",
- // info: "资深课程导师，国内知名大学专业毕业系统的学习与研究，顺利通过了所授课程的等级证书考核",
- // img: '../../static/image/theme/t2.png'
- // },
- ]
- },
- {
- name:"练习瞬间",
- id:4,
- loadStatus:'more',//'more', // 'noMore',
- slist:[
- // {
- // id:1,
- // name: "伸展瑜伽",
- // info: `在蓝天白云下，与自然为朋友，享受瑜伽的魅力！与阳光亲密接触，感受能量的流动，瑜伽晨练真的让人焕发活力！`,
- // img: '../../static/image/theme/t2.png',
- // num:151,
- // date:'2025-06-24'
- // },
- ]
- },
- {
- name:"瑜伽欣赏",
- id:5,
- loadStatus:'more',//'more', // 'noMore',
- slist:[
- // {
- // id:1,
- // name: "伸展瑜伽",
- // info: `瑜伽，让身体与灵魂紧密相连，感受呼吸的韵律，如丝般柔滑的曲线之美。`,
- // img: '../../static/image/theme/i3.jpg',
- // num:56,
- // date:'2025-06-24'
- // },
- ]
- },
- {
- name:"瑜伽常识",
- id:6,
- loadStatus:'more',//'more', // 'noMore',
- slist:[
- // {
- // id:1,
- // name: "瑜伽常识了解",
- // info: `任何人都可以使用瑜伽,在不平静的世界里寻求内心安宁。 灵 一致 身 心 瑜伽练习 通过瑜伽的练习能帮助人们从 纷繁复杂的困扰和痛苦中回归 到纯粹永恒的源头。 `,
- // img: '../../static/image/theme/i4.jpg',
- // num:516,
- // date:'2025-06-22'
- // },
- ]
- },
- {
- name:"健康饮食",
- id:7,
- loadStatus:'more',//'more', // 'noMore',
- slist:[
- // {
- // id:1,
- // name: "健康饮食了解",
- // info: `任何人都可以使用瑜伽,在不平静的世界里寻求内心安宁。 灵 一致 身 心 瑜伽练习 通过瑜伽的练习能帮助人们从 纷繁复杂的困扰和痛苦中回归 到纯粹永恒的源头。 `,
- // img: '../../static/image/theme/i4.jpg',
- // num:516,
- // date:'2025-06-22'
- // },
- ]
- },
- {
- name:"健康指数",
- id:8,
- loadStatus:'noMore',//'more', // 'noMore',
- slist:[]
- }
- ],
+ list: myCache('sortCache'),
+ // [
+ // {
+ // name:"瑜伽传承",
+ // id:1,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[]
+ // },
+ // {
+ // name:"了解场馆",
+ // id:2,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[]
+ // },
+ // {
+ // name:"教练风采",
+ // id:3,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[]
+ // },
+ // {
+ // name:"练习瞬间",
+ // id:4,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[]
+ // },
+ // {
+ // name:"瑜伽欣赏",
+ // id:5,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[]
+ // },
+ // {
+ // name:"瑜伽常识",
+ // id:6,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[]
+ // },
+ // {
+ // name:"健康饮食",
+ // id:7,
+ // loadStatus:'more',//'more', // 'noMore',
+ // slist:[
+ // ]
+ // },
+ // {
+ // name:"健康指数",
+ // id:8,
+ // loadStatus:'noMore',//'more', // 'noMore',
+ // slist:[]
+ // }
+ // ],
html1:`三朵蘭瑜伽机构由从事瑜伽行业18年的全国知名瑜伽导师冉洪涛老师创办，并带领一批行业内瑜伽教学经验8年以上的优秀瑜伽老师成立核心课程研发团队，立足于将在世界传承几千年的瑜伽修炼体系精髓进行实践化和实用化，结合中医的经络学和中医理疗方法，针对现代人体质和容易出现的健康问题研发出多套经典的瑜伽实用课程，经过几年在全国的推广和瑜伽会员的习练测试已经让越来越多的人恢复了健康和活力！
三朵蘭以【预防未病，助人健康】为己任，一直为瑜伽而传播、为更多人保持和恢复健康助力！让更多人通过练习瑜伽拥有健康的体魄、平和宁静的内心、幸福和快乐的生活！
`,
@@ -271,15 +227,9 @@
三朵蘭以【预防未病，助人健康】为己任，一直为瑜伽而传播、为更多人保持和恢复健康助力！让更多人通过练习瑜伽拥有健康的体魄、平和宁静的内心、幸福和快乐的生活！
`,
shoplist:[],
- shopdetail:{
- storeName:"",
- address:"",
- id:"",
- phone:"",
- },
// 校验规则
rules: {
- sex: {
+ gender: {
rules: [{
required: true,
errorMessage: '请选择性别'
@@ -308,18 +258,13 @@
},
onLoad(option) {
if(option.id||option.id==0){
- if(parseInt(option.id)==0){
- this.tabCurrentIndex=0;
- }
- else{
- this.tabCurrentIndex=parseInt(option.id);
- }
- this.scrollLeft = (this.tabCurrentIndex - 1) * 90;
+ this.id=option.id;
}
- // 加载数据
- this.loadData();
+ // 获取分类信息
+ this.getSort();
},
onShow(){
+
this.openId = myCache('openId');
var user = myCache('user');
this.userid = user.userid? user.userid:'';
@@ -351,6 +296,29 @@
},100);
},
methods: {
+ async getSort() {
+ // 分类
+ const {data: res} = await uni.$http.get('/api/index/getIndex');
+ if (res&&res.data) {
+ myCache('sortCache',res.data);
+ this.list=[];
+ res.data.forEach((cell,ii)=>{
+ if(cell.id==this.id){
+ this.tabCurrentIndex=ii;
+ this.$forceUpdate();
+ }
+ this.list.push({
+ name:cell.name,
+ id:cell.id,
+ loadStatus:'more',//'more', // 'noMore',
+ slist:[]
+ });
+ this.$forceUpdate();
+ });
+ // 加载数据
+ this.loadData();
+ }
+ },
gotoPhone(phone){
//#ifdef MP-WEIXIN
uni.makePhoneCall({
@@ -380,60 +348,11 @@
this.shop=item.storeName;
this.shopid=item.id;
// 内容切换
- this.list=[
- {
- name:"瑜伽传承",
- id:1,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"了解场馆",
- id:2,
- loadStatus:'noMore',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"教练风采",
- id:3,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"练习瞬间",
- id:4,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"瑜伽欣赏",
- id:5,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"瑜伽常识",
- id:6,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"健康饮食",
- id:7,
- loadStatus:'more',//'more', // 'noMore',
- slist:[]
- },
- {
- name:"健康指数",
- id:8,
- loadStatus:'noMore',//'more', // 'noMore',
- slist:[]
- }
- ];
+ this.list=[];
this.html1=``;
this.html2=``;
this.$forceUpdate();
- this.loadData();
+ this.getSort();
},
iflogin(){
this.openId = myCache('openId');
@@ -461,48 +380,50 @@
async getList() {
if(this.list[this.tabCurrentIndex].loadStatus!=="noMore")
{
- uni.showLoading({
- title: '数据加载中...'
- });
+
var para={
visitStore:this.shopid
}
-
var url="/api/inherit/getList";
- if(this.tabCurrentIndex==0){
- // 瑜伽传承
+ if(this.list[this.tabCurrentIndex].id==1){
+ // 瑜伽是一种生活(瑜伽传承)
url="/api/inherit/getList";
}
- else if(this.tabCurrentIndex==1){
+ else if(this.list[this.tabCurrentIndex].id==3){
// 了解场馆
url="/api/store/getList";
}
- else if(this.tabCurrentIndex==2){
+ else if(this.list[this.tabCurrentIndex].id==5){
// 教练风采
url="/api/context/getList";
}
- else if(this.tabCurrentIndex==3){
- // 练习瞬间
+ else if(this.list[this.tabCurrentIndex].id==6){
+ // 精彩瞬间(练习瞬间)
url="/api/moments/getList";
}
- else if(this.tabCurrentIndex==4){
+ else if(this.list[this.tabCurrentIndex].id==11){
// 瑜伽欣赏
url="/api/appreciate/getList";
}
- else if(this.tabCurrentIndex==5){
+ else if(this.list[this.tabCurrentIndex].id==12){
// 瑜伽常识
url="/api/sense/getList";
}
- else if(this.tabCurrentIndex==6){
- // 健康饮食
+ else if(this.list[this.tabCurrentIndex].id==9){
+ // 吃瘦练美(健康饮食)
url="/api/healthy/getList";
}
-
+ else{
+ return false;
+ }
+ uni.showLoading({
+ title: '数据加载中...'
+ });
+ // 获取数据
const {data: res} = await uni.$http.post(url, para);
-
if(res.data){
this.list[this.tabCurrentIndex].loadStatus="noMore";
- if(this.tabCurrentIndex==1){
+ if(this.list[this.tabCurrentIndex].id==3){
console.log(res.data)
// 了解场馆
var companyIntroduction=res.data&&res.data.companyIntroduction?res.data.companyIntroduction:'';
@@ -515,6 +436,7 @@
}
else{
this.list[this.tabCurrentIndex].slist=res.data;
+ this.$forceUpdate();
}
this.$forceUpdate();
}
@@ -534,11 +456,79 @@
}
},
tabSelect(e) {
- console.log(e);
- var that=this;
- this.tabCurrentIndex = e.currentTarget.dataset.id;
- this.scrollLeft = (e.currentTarget.dataset.id - 1) * 90;
- if(this.tabCurrentIndex==7){
+ console.log("tabSelect");
+ if(this.list[e.currentTarget.dataset.id].id==4){
+ // 课程预约
+ if(this.userid==""||this.userid=="0"){
+ this.$refs.loginId.open();
+ }
+ else{
+ // 课程预约
+ uni.navigateTo({
+ url: `/pages/user/courselist`
+ });
+ }
+ }
+ else if(this.list[e.currentTarget.dataset.id].id==7){
+ // 大咖分享(线上大咖课)
+ uni.reLaunch({
+ url: `/pages/product/list?id=2`
+ });
+ }
+ else if(this.list[e.currentTarget.dataset.id].id==8){
+ // 教练培训
+ uni.reLaunch({
+ url: `/pages/product/list`
+ });
+ }
+ else{
+ this.tabCurrentIndex = e.currentTarget.dataset.id;
+ this.$forceUpdate();
+ }
+
+ },
+ animationfinish({ detail: { current } }) {
+ console.log("animationfinish")
+ // this.tabCurrentIndex = current;
+ },
+ handleChange(e) {
+ //原在animationfinish中的操作转移到这里
+ console.log("handleChange");
+ if(this.list[e.detail.current].id==4){
+ // 课程预约
+ if(this.userid==""||this.userid=="0"){
+ this.$refs.loginId.open();
+ }
+ else{
+ // 课程预约
+ uni.navigateTo({
+ url: `/pages/user/courselist`
+ });
+ }
+ }
+ else if(this.list[e.detail.current].id==7){
+ // 大咖分享(线上大咖课)
+ uni.reLaunch({
+ url: `/pages/product/list?id=2`
+ });
+ }
+ else if(this.list[e.detail.current].id==8){
+ // 教练培训
+ uni.reLaunch({
+ url: `/pages/product/list`
+ });
+ }
+ else{
+ this.tabCurrentIndex = e.detail.current;
+ this.$forceUpdate();
+ this.tabChangeDo();
+ }
+ },
+ tabChangeDo(){
+ this.scrollLeft = (this.tabCurrentIndex - 1) * 90;
+ if(this.list[this.tabCurrentIndex].id==2||this.list[this.tabCurrentIndex].id==10){
+ var that=this;
+ // 健康指数 体质测评
setTimeout(() => {
console.log(that.$refs.valiForm)
if(that.$refs.valiForm){
@@ -546,23 +536,22 @@
}
}, 1000);
}
- // 重新加载 暂不需要加载
- // this.list[this.tabCurrentIndex].loadStatus="more";
- // this.list[this.tabCurrentIndex].slist=[];
- this.loadData();
+ else{
+ // 重新加载 暂不需要加载
+ // this.list[this.tabCurrentIndex].loadStatus="more";
+ // this.list[this.tabCurrentIndex].slist=[];
+ this.loadData();
+ }
},
tabSelectC(e) {
- console.log(e)
+ console.log("tabSelectC")
this.tabIndex = e.currentTarget.dataset.id;
},
- animationfinish({ detail: { current } }) {
- this.tabCurrentIndex = current;
- this.loadData();
- },
- gotoDetail(item,name,type){
+ gotoDetail(item,name,index){
// 详情
item["name"]=name;
var data=encodeURIComponent(JSON.stringify(item));
+ var type=this.list[index].id;
uni.navigateTo({
url: `/pages/category/detail?data=${data}&type=${type}`
});
@@ -584,28 +573,59 @@
},
async savedo(){
try{
- const {data: res} = await uni.$http.post('/yoga/count', this.valiFormData);
- if(res){
- uni.showToast({
- title: '计算成功！',
- icon: 'success',
- duration: 2000
- })
+ const {data: res} = await uni.$http.post('/api/healthy/calculateBim', this.valiFormData);
+ if(res&&res.success){
+ var bim=res.data?parseFloat(res.data):0;
+ if(bim){
+ var msg="";
+ if(bim<=18.5){
+ msg="您的体重过轻请联系馆主或教练领取A方案!";
+ }
+ else if(bim>18.5&&bim<=24){
+ msg="太棒了，您的体重非常健康请联系馆主或教练领取B方案保持!";
+ }
+ else if(bim>24&&bim<28){
+ msg="您的体重超重请联系馆主或教练领取C方案保持!";
+ }
+ else if(bim>=28){
+ msg="您的体重肥胖请联系馆主或教练领取D方案保持!";
+ }
+ uni.showModal({
+ title: '提示',
+ content: msg,
+ cancelText: '取消',
+ confirmText: '确定',
+ success: ress => {
+ if (ress.confirm) {
+ }
+ }
+ });
+ }
+ else{
+ uni.showModal({
+ title: '提示',
+ content: '计算异常！请重试！',
+ cancelText: '取消',
+ confirmText: '确定'
+ });
+ }
}
- else{
- uni.showToast({
- title: '计算失败！请重试',
- icon: 'error',
- duration: 2000
- })
+ else{
+ uni.showModal({
+ title: '提示',
+ content: res.message? res.message:'计算异常！请重试！',
+ cancelText: '取消',
+ confirmText: '确定'
+ });
}
}
catch{
- uni.showToast({
- title: res.msg? res.msg:'计算失败！',
- icon: 'error',
- duration: 2000
- });
+ uni.showModal({
+ title: '提示',
+ content: '计算异常！请重试！',
+ cancelText: '取消',
+ confirmText: '确定'
+ });
}
},
@@ -682,8 +702,8 @@
}
.tab.cur{
color: #000;
- background-color: #f3f4ee;
- border: 2rpx solid #89965f;
+ background-color: #e4f9f7;
+ border: 2rpx solid #00a89b;
}
}
.btn{
@@ -695,7 +715,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -766,28 +786,28 @@
width: 100%;
}
.tabicl{
- width: 180rpx;
+ min-width: 160rpx;
height: 100rpx;
line-height: 100rpx;
position: relative;
display: inline-block;
overflow: hidden;
- margin-left: 20rpx;
+ margin-left: 12rpx;
}
.ptext{
- font-size: 33rpx;
+ font-size: 30rpx;
text-align: center;
- color: #333333;
+ color: #000;
height: 90rpx;
}
.cur .ptext{
color: #000;
- font-size: 38rpx;
+ font-size: 34rpx;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -802,7 +822,7 @@
background-position: center;
font-size: 28rpx;
text-align: center;
- color: #89965f;
+ color: #00a89b;
overflow: hidden;
}
.tcard {
@@ -886,11 +906,13 @@
.txt1{
font-size: 26rpx;
margin-right: 20rpx;
+ margin-left: 4rpx;
width: 50rpx;
}
.txt{
font-size: 26rpx;
margin-right: 20rpx;
+ margin-left: 4rpx;
}
}
.tlinfo {
diff --git a/pages/category/detail.vue b/pages/category/detail.vue
index e3e84f5..ec67771 100644
--- a/pages/category/detail.vue
+++ b/pages/category/detail.vue
@@ -147,28 +147,27 @@
};
try{
var url="/api/inherit/getOne";
- if(this.type==0){
+ if(this.type==1){
// 瑜伽传承
url="/api/inherit/getOne";
}
- else if(this.type==3){
- // 练习瞬间
+ else if(this.type==6){
+ // 精彩瞬间(练习瞬间)
url="/api/moments/getOne";
}
- else if(this.type==4){
+ else if(this.type==11){
// 瑜伽欣赏
url="/api/appreciate/getOne";
}
- else if(this.type==5){
+ else if(this.type==12){
// 瑜伽常识
url="/api/sense/getOne";
}
- else if(this.type==6){
- // 健康饮食
+ else if(this.type==9){
+ // 吃瘦练美(健康饮食)
url="/api/healthy/getOne";
}
const {data: res1} = await uni.$http.post(url,params);
- console.log(res1);
if (res1.success) {
if(!res1.data){
uni.showModal({
@@ -278,7 +277,7 @@
width: 100%;
align-items: center;
.leftarr{
- background-color: #b9af9d;
+ background-color: #00a89b;
padding: 10rpx;
border-radius: 10rpx;
}
@@ -370,7 +369,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/components/cart.vue b/pages/components/cart.vue
index a2ba0fe..37d1e9f 100644
--- a/pages/components/cart.vue
+++ b/pages/components/cart.vue
@@ -285,7 +285,7 @@ export default {
}
.price{
line-height: 1;
- color: #89965f;
+ color: #00a89b;
.txt{
font-size: 30rpx;
}
@@ -334,8 +334,8 @@ export default {
margin-bottom: 20rpx;
}
.spcli.cur{
- background: #f3f4ee;
- border: 1rpx solid #89965f;
+ background: #e4f9f7;
+ border: 1rpx solid #00a89b;
font-weight: 600;
}
.spclilong{
@@ -354,8 +354,8 @@ export default {
justify-content: space-between;
}
.spclilong.cur{
- background: #f3f4ee;
- border: 1rpx solid #89965f;
+ background: #e4f9f7;
+ border: 1rpx solid #00a89b;
font-weight: 600;
}
}
@@ -382,7 +382,7 @@ export default {
width: 690rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
margin: 0 30rpx 30rpx;
border-radius: 10rpx;
@@ -400,7 +400,7 @@ export default {
width: 690rpx;
height: 76rpx;
line-height: 76rpx;
- background: #55690e;
+ background: #468a73;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
margin: 0 30rpx 30rpx;
border-radius: 10rpx;
diff --git a/pages/components/openlogin.vue b/pages/components/openlogin.vue
index 97213ee..d70e8ed 100644
--- a/pages/components/openlogin.vue
+++ b/pages/components/openlogin.vue
@@ -155,8 +155,8 @@ export default {
}
.btn2{
width: 180rpx;
- background-color: #89965f;
- border:1rpx solid #89965f;
+ background-color: #00a89b;
+ border:1rpx solid #00a89b;
font-size: 28rpx;
height: 60rpx;
line-height: 60rpx;
diff --git a/pages/components/selShop.vue b/pages/components/selShop.vue
index 74f8b1f..347291e 100644
--- a/pages/components/selShop.vue
+++ b/pages/components/selShop.vue
@@ -2,7 +2,7 @@
- 瑜伽APP
+ 瑜伽汇
@@ -21,29 +21,51 @@
附近有{{areas.length}}家门店可提供服务
(请点击选择服务门店)
-
+
-
-
-
-
-
-
- {{item.storeName}}
+
+
+
+
+
+
+
+ {{item.storeName}}
+
+
+ {{item.address}}
+
-
- {{item.address}}
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+ {{cell.storeName}}
+
+
+ {{cell.address}}
+
+
+
+
+
+
+
+
+
+
@@ -63,6 +85,10 @@ export default {
type: Boolean,
default: false,
},
+ shopid: {
+ type: Number,
+ default: 0,
+ },
shop: {
type: String,
default: "",
@@ -71,22 +97,9 @@ export default {
data() {
return {
qr:"../../static/image/qr.png",
- areas:myCache('shoplist'), //选择门店
- // [
- // {
- // value_name:'淮海中路店',
- // value_address:'淮海中路店198号',
- // value_img:'',
- // value_value:'1',
- // value_qr:"../../static/image/qr.png",
- // },
- // ], //选择门店
+ areas: myCache('shoplist'), //选择门店
};
},
- mounted() {
- console.log('mounted')
- this.loadshop();
- },
methods: {
getimgRemoteFile(img){
if(img){
@@ -105,6 +118,8 @@ export default {
this.$emit("changeArea", item);
},
_show() {
+ this.areas= myCache('shoplist');
+ this.$forceUpdate();
this.$refs.share.open();
},
_hide() {
@@ -121,16 +136,17 @@ export default {
current:0
});
},
- async loadshop(){
- // 获取门店
- const {data: res} = await uni.$http.post('/api/index/getStores');
- if(res.data&&res.data.length>0){
- this.areas=res.data;
- // console.log("areas",this.areas)
- myCache('shoplist',res.data);
+ expandDO(index){
+ console.log(index)
+ if(this.areas[index].expanded){
+ this.areas[index].expanded=false;
this.$forceUpdate();
}
- },
+ else{
+ this.areas[index].expanded=true;
+ this.$forceUpdate();
+ }
+ }
}
}
@@ -185,7 +201,7 @@ export default {
.sitetxt{
font-size: 32rpx;
font-weight: 600;
- color:#8b9565;
+ color:#00a89b;
margin-left: 12rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -251,18 +267,70 @@ export default {
height: 50rpx;
}
.sitem.cur{
- background-color: #f3f4ef;
+ background-color: rgba(228, 249, 247, 0.8);
}
.sitem {
display: flex;
flex-direction: row;
background-color: #FFFFFF;
- border-bottom: 1rpx solid #eeeeee;
- padding: 30rpx 0;
- margin: 0 30rpx;
+ padding: 20rpx 0 20rpx 10rpx;
+ margin: 10rpx 30rpx 0 30rpx;
+ align-items: center;
+ .stimg{
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50rpx;
+ margin-left: 10rpx;
+ }
+ .selbtn{
+ width: 60rpx;
+ height: 60rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 20rpx;
+ border-radius: 6rpx;
+ font-size: 26rpx;
+ color: #999;
+ margin-top: 16rpx;
+ }
+ .selimg{
+ width: 100%;
+ height: 100%;
+ }
+ .sname{
+ display: flex;
+ flex: 1;
+ justify-content: flex-start;
+ flex-direction: column;
+ padding: 10rpx 10rpx 0 10rpx;
+ margin-left: 12rpx;
+ .stxt{
+ font-size: 28rpx;
+ font-weight: 600;
+ color: rgb(29, 29, 29);
+ }
+ .sadr{
+ font-size: 26rpx;
+ color: #626464;
+ margin-top: 6rpx;
+ }
+ }
+
+ }
+ .sitemcell.cur{
+ background-color: rgba(228, 249, 247, 0.6);
+ }
+ .sitemcell {
+ display: flex;
+ flex-direction: row;
+ background-color: #F5F5F5;
+ padding: 20rpx 0 20rpx 12rpx;
+ margin: 0 30rpx 0 70rpx;
+ align-items: center;
.stimg{
- width: 100rpx;
- height: 100rpx;
+ width: 80rpx;
+ height: 80rpx;
border-radius: 50rpx;
margin-left: 10rpx;
}
diff --git a/pages/components/selcity.vue b/pages/components/selcity.vue
deleted file mode 100644
index 3e19b9f..0000000
--- a/pages/components/selcity.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
- 选择门店
-
- 取消
-
-
-
-
- {{item.value_name}}
- 选择
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/components/service.vue b/pages/components/service.vue
index e7a0ab1..e511450 100644
--- a/pages/components/service.vue
+++ b/pages/components/service.vue
@@ -75,9 +75,9 @@ export default {
display: flex;
align-items: center;
justify-content: center;
- background-color: rgba(243, 244, 239, 0.8);
+ background-color: rgba(228, 249, 247, 0.8);
border-radius: 100% 100%;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
z-index: 998;
.topimg{
width: 40rpx;
diff --git a/pages/components/top.vue b/pages/components/top.vue
index 7ff3690..017fa3f 100644
--- a/pages/components/top.vue
+++ b/pages/components/top.vue
@@ -43,9 +43,9 @@ export default {
display: flex;
align-items: center;
justify-content: center;
- background-color: rgba(243, 244, 239, 0.8);
+ background-color: rgba(228, 249, 247, 0.8);
border-radius: 100% 100%;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
z-index: 998;
.topimg{
width: 40rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 62b9b86..9e9a07f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -33,13 +33,14 @@
-
+
{{item.name}}
- {{item.text}}
+
-
+
@@ -103,9 +104,8 @@
openId:"",
phone:"",
userid:"",
- screenWidth: 375,
- shopid:myCache('myshopid')?myCache('myshopid'):'',
- shop:myCache('myshop')?myCache('myshop'):'',
+ shopid: myCache('myshopid'),
+ shop: myCache('myshop'),
// banner
swiperList:[
{
@@ -115,76 +115,86 @@
ban_img:"../../static/image/b2.png"
}
],// myCache('swiperCache'),
- themeList: [
- {
- name: "瑜伽传承",
- text: "传承瑜伽",
- img: '../../static/image/theme/y1.jpg',
- color:'#c4dfe4'
- },
- {
- name: "了解场馆",
- text: "场馆介绍",
- img: '../../static/image/theme/y2.jpg',
- color:'#c7d7bd'
- },
- {
- name: "瑜伽用品",
- text: "瑜伽好物",
- img: '../../static/image/theme/y3.jpg',
- color:'#f9d1c8'
- },
- {
- name: "线上大咖课",
- text: "大咖教师",
- img: '../../static/image/theme/y4.jpg',
- color:'#fff9e6'
- },
- {
- name: "课程预约",
- text: "超值课程",
- img: '../../static/image/theme/y1.jpg',
- color:'#c4ccdf'
- },
- {
- name: "教练风采",
- text: "风采展示",
- img: '../../static/image/theme/y2.jpg',
- color:'#fceaac'
- },
- {
- name: "练习瞬间",
- text: "记录美好",
- img: '../../static/image/theme/y3.jpg',
- color:'#d5e7c1'
- },
- {
- name: "教练培训",
- text: "专业课程",
- img: '../../static/image/theme/y4.jpg',
- color:'#c4ccdf'
- },
- {
- name: "瑜伽欣赏",
- text: "瑜伽科普",
- img: '../../static/image/theme/y3.jpg',
- color:'#efdddd'
- },
- {
- name: "瑜伽常识",
- text: "瑜伽科普",
- img: '../../static/image/theme/y4.jpg',
- color:'#dcd1bd'
- },
- ], // 主题分类
- teacherList: [
- // {
- // id:11,
- // name: "Madeline 老师 (女)",
- // info: "资深课程导师，国内知名大学专业毕业系统的学习与研究，顺利通过了所授课程的等级证书考核",
- // img: '../../static/image/theme/t2.png'
- // },
- ], //教师列表
+ colors:[
+ "#f9d1c8","#c7d7bd","#c4dfe4","#efdddd","#c4ccdf","#fceaac","#d5e7c1",
+ "#f9d1c8","#c7d7bd","#c4dfe4","#efdddd","#c4ccdf","#fceaac","#d5e7c1",
+ "#f9d1c8","#c7d7bd","#c4dfe4","#efdddd","#c4ccdf","#fceaac","#d5e7c1",
+ "#f9d1c8","#c7d7bd","#c4dfe4","#efdddd","#c4ccdf","#fceaac","#d5e7c1",
+ ],
+ timgs:[
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg',
+ '../../static/image/theme/y1.jpg','../../static/image/theme/y2.jpg','../../static/image/theme/y3.jpg','../../static/image/theme/y4.jpg'
+ ],
+ themeList: myCache('sortCache'),
+ // [
+ // {
+ // name: "瑜伽传承",
+ // text: "传承瑜伽",
+ // img: '../../static/image/theme/y1.jpg',
+ // color:'#c4dfe4'
+ // },
+ // {
+ // name: "了解场馆",
+ // text: "场馆介绍",
+ // img: '../../static/image/theme/y2.jpg',
+ // color:'#c7d7bd'
+ // },
+ // {
+ // name: "瑜伽用品",
+ // text: "瑜伽好物",
+ // img: '../../static/image/theme/y3.jpg',
+ // color:'#f9d1c8'
+ // },
+ // {
+ // name: "线上大咖课",
+ // text: "大咖教师",
+ // img: '../../static/image/theme/y4.jpg',
+ // color:'#fff9e6'
+ // },
+ // {
+ // name: "课程预约",
+ // text: "超值课程",
+ // img: '../../static/image/theme/y1.jpg',
+ // color:'#c4ccdf'
+ // },
+ // {
+ // name: "教练风采",
+ // text: "风采展示",
+ // img: '../../static/image/theme/y2.jpg',
+ // color:'#fceaac'
+ // },
+ // {
+ // name: "练习瞬间",
+ // text: "记录美好",
+ // img: '../../static/image/theme/y3.jpg',
+ // color:'#d5e7c1'
+ // },
+ // {
+ // name: "教练培训",
+ // text: "专业课程",
+ // img: '../../static/image/theme/y4.jpg',
+ // color:'#c4ccdf'
+ // },
+ // {
+ // name: "瑜伽欣赏",
+ // text: "瑜伽科普",
+ // img: '../../static/image/theme/y3.jpg',
+ // color:'#efdddd'
+ // },
+ // {
+ // name: "瑜伽常识",
+ // text: "瑜伽科普",
+ // img: '../../static/image/theme/y4.jpg',
+ // color:'#dcd1bd'
+ // },
+ // ], // 主题分类
+ teacherList: [], //教师列表
loadStatus:'more',
page: {
pageNum: 1,
@@ -194,19 +204,29 @@
};
},
onLoad() {
- // 获取屏幕宽度
- const systemInfo = uni.getSystemInfoSync();
- this.screenWidth = systemInfo.windowWidth;
- this.$forceUpdate();
+
+ // 获取分类信息
+ this.getSort();
// 客服电话获取缓存
this.getservice();
// 获取老师信息
this.loadData();
+
},
onShow() {
+ this.shopid = myCache('myshopid')?myCache('myshopid'):'';
+ this.shop = myCache('myshop')?myCache('myshop'):'';
+ this.$forceUpdate();
+
+ if(myCache("loginindex")=="1"){
+ uni.setStorageSync("loginindex", "");
+ // 获取老师信息
+ this.loadData();
+ }
+
this.openId = myCache('openId');
var user = myCache('user');
this.userid = user.userid? user.userid:'';
@@ -292,7 +312,6 @@
this.$forceUpdate();
this.loadData();
},
-
dotclick(index){
this.swiperCurrent = index;
this.$forceUpdate();
@@ -385,7 +404,103 @@
this.$forceUpdate();
}
},
- gotoCategory(index){
+ async getSort() {
+ // 分类
+ const {data: res} = await uni.$http.get('/api/index/getIndex');
+ if (res&&res.data) {
+ this.themeList=res.data?res.data:[];
+ this.$forceUpdate();
+ myCache('sortCache',this.themeList);
+ }
+ },
+ gotoCategory(id){
+ if(id==1){
+ // 瑜伽是一种生活(瑜伽传承)
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==2){
+ // 健康指数
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==3){
+ // 了解场馆
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==4){
+ // 必须登录
+ // 课程预约
+ if(this.userid==""||this.userid=="0"){
+ this.$refs.loginId.open();
+ }
+ else{
+ // 课程预约
+ uni.navigateTo({
+ url: `/pages/user/courselist`
+ });
+ }
+ }
+ else if(id==5){
+ // 教练风采
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==6){
+ // 精彩瞬间(练习瞬间)
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==7){
+ // 大咖分享(线上大咖课)
+ uni.reLaunch({
+ url: `/pages/product/list?id=2`
+ });
+ }
+ else if(id==8){
+ // 教练培训
+ uni.reLaunch({
+ url: `/pages/product/list`
+ });
+ }
+ else if(id==9){
+ // 吃瘦练美(健康饮食)
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==10){
+ // 体质测评
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==11){
+ // 瑜伽欣赏
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==12){
+ // 瑜伽常识
+ uni.reLaunch({
+ url: `/pages/category/category?id=${id}`
+ });
+ }
+ else if(id==13){
+ // 瑜伽用品
+ uni.reLaunch({
+ url: `/pages/product/list?id=0`
+ });
+ }
+ },
+ gotoCategory0(index){
if(index==0||index==1){
// 瑜伽传承 了解场馆
uni.reLaunch({
@@ -576,7 +691,7 @@
// 这里一定要注意兼容不然很可能踩坑
transform: translate(-50%, 0);
-webkit-transform: translate(-50%, 0);
- z-index: 99;
+ z-index: 98;
display: flex;
flex-direction: row;
justify-content: center;
@@ -610,7 +725,8 @@
box-sizing: border-box; /* 确保padding和border不会影响宽度计算 */
display: flex;
flex-direction: row;
- padding: 30rpx 24rpx;
+ align-items: center;
+ padding: 20rpx 20rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
border-radius: 20rpx;
@@ -619,9 +735,10 @@
.thinfo{
display: flex;
flex-direction: column;
+ align-items: center;
flex: 1;
.thname{
- font-size: 32rpx;
+ font-size: 30rpx;
color:#000;
}
.thtext{
@@ -631,8 +748,8 @@
}
}
.thimg{
- width: 100rpx;
- height: 100rpx;
+ width: 88rpx;
+ height: 88rpx;
margin-left: 10rpx;
.theimg{
width: 100%;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d9d5a4f..d9e4224 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -11,7 +11,7 @@
-
+
@@ -85,7 +85,9 @@
const _this=this;
uni.getLocation({
type:'gcj02',//'gcj02','wgs84', // 返回的坐标类型，wgs84 表示国际标准的经纬度
+ geocode:true,
success: function (res) {
+ console.log(res);
console.log('当前位置的经度：' + res.longitude);
console.log('当前位置的纬度：' + res.latitude);
_this.form.position=res.latitude+','+res.longitude;
@@ -100,6 +102,8 @@
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
+
+ // #ifdef APP-PLUS
// 跳转到设置页面
plus.device.vendor = 'apple'; // 如果是iOS系统
if (plus.os.name == 'iOS') {
@@ -107,6 +111,8 @@
} else {
plus.runtime.openURL('package:' + plus.android.runtimeMainActivity());
}
+ // #endif
+
}
}
});
@@ -167,12 +173,13 @@
// if(e.detail.value&&!this.checkMM(e.detail.value)){
// '密码必须是由6-20位长度的字母、数字组成，请核实！',
// '密码必须是8-20位字符至少包括大写字母、小写字母、数字、特殊符号中3种以上，请核实！'
- this.$refs.uToast.show({
- title: "密码必须是6-20位字符至少包括英文、数字、特殊符号中2种以上，请核实！",
- type: 'error',
- duration: 2000
- });
+ // this.$refs.uToast.show({
+ // title: "密码必须是6-20位字符至少包括英文、数字、特殊符号中2种以上，请核实！",
+ // type: 'error',
+ // duration: 2000
+ // });
}
+
},
// 校验密码
checkMM(mm) {
@@ -297,11 +304,13 @@
title: '正在登录...'
});
const {data: res} = await uni.$http.post('/api/login',this.form);
- console.log(res);
if(res&&res.code=="200"){
- uni.setStorageSync('token', res.token);
+ uni.setStorageSync("loginindex", "1");
+ uni.setStorageSync("token", res.token);
// 保存用户登录信息
this.getUserInfo();
+ // 保护用户门店信息
+ this.loadshop();
this.$refs.uToast.show({
title: '登录成功',
type: 'success',
@@ -327,7 +336,6 @@
async getUserInfo(){
var _this=this;
const {data: res} = await uni.$http.get('/api/getInfo');
- console.log(res);
if(res&&res.appLoginUser){
var user=res.appLoginUser;
myCache('user',{
@@ -345,8 +353,15 @@
myCache('shop',shop);
myCache('myshop',shop.storeName);
myCache('myshopid',shop.id);
- var shoplist=[shop]
- myCache('shoplist',shoplist);
+ // var shoplist=[shop]
+ // myCache('shoplist',shoplist);
+ }
+ },
+ async loadshop(){
+ // 获取门店
+ const {data: res} = await uni.$http.post('/api/index/getStores');
+ if(res.data&&res.data.length>0){
+ myCache('shoplist',res.data);
}
},
async getUserShopList(){
@@ -413,7 +428,7 @@
right: 28rpx;
display: block;
font-size: 36rpx;
- color:#89965f;
+ color:#00a89b;
line-height: 38rpx;
height: 45rpx;
margin-left: 50rpx;
@@ -430,7 +445,7 @@
top:12rpx;
right: 20rpx;
display: block;
- color:#89965f;
+ color:#00a89b;
height: 60rpx;
line-height: 60rpx;
font-size: 26rpx;
@@ -443,24 +458,24 @@
justify-content: center;
margin-top: 36rpx;
.regtxt{
- color:#89965f;
+ color:#00a89b;
font-size: 28rpx;
display: flex;
align-items: center;
}
.regtxtl{
- color:#89965f;
+ color:#00a89b;
width: 2rpx;
height: 26rpx;
font-size: 26rpx;
margin-left: 10rpx;
margin-right: 10rpx;
- border-right: 1rpx solid #89965f;
+ border-right: 1rpx solid #00a89b;
display: flex;
align-items: center;
}
.regtxtr{
- color:#89965f;
+ color:#00a89b;
height: 28rpx;
font-size: 28rpx;
display: flex;
diff --git a/pages/login/register.vue b/pages/login/register.vue
index a7917f5..37b1b71 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -291,7 +291,7 @@
right: 28rpx;
display: block;
font-size: 36rpx;
- color:#89965f;
+ color:#00a89b;
line-height: 38rpx;
height: 45rpx;
margin-left: 50rpx;
@@ -308,7 +308,7 @@
top:12rpx;
right: 20rpx;
display: block;
- color:#89965f;
+ color:#00a89b;
height: 60rpx;
line-height: 60rpx;
font-size: 26rpx;
@@ -321,24 +321,24 @@
justify-content: center;
margin-top: 36rpx;
.regtxt{
- color:#89965f;
+ color:#00a89b;
font-size: 28rpx;
display: flex;
align-items: center;
}
.regtxtl{
- color:#89965f;
+ color:#00a89b;
width: 2rpx;
height: 26rpx;
font-size: 26rpx;
margin-left: 10rpx;
margin-right: 10rpx;
- border-right: 1rpx solid #89965f;
+ border-right: 1rpx solid #00a89b;
display: flex;
align-items: center;
}
.regtxtr{
- color:#89965f;
+ color:#00a89b;
height: 28rpx;
font-size: 28rpx;
display: flex;
diff --git a/pages/message/contact.vue b/pages/message/contact.vue
index 458eb7d..b019ea6 100644
--- a/pages/message/contact.vue
+++ b/pages/message/contact.vue
@@ -321,7 +321,7 @@
position: fixed;
width: 100%;
z-index: 999;
- background-color: #89965f;
+ background-color: #00a89b;
.text-center {
width: 100%;
text-align: center;
@@ -336,7 +336,7 @@
}
.hcon{
width: 100%;
- background-color: #89965f;
+ background-color: #00a89b;
margin: 0;
padding: 26rpx 30rpx;
display: flex;
@@ -511,7 +511,7 @@
width: 560rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -530,6 +530,6 @@
padding-top: 180rpx;
text-align: center;
font-size: 28rpx;
- color: #89965f;
+ color: #00a89b;
}
diff --git a/pages/message/group.vue b/pages/message/group.vue
index a7d1df2..757a437 100644
--- a/pages/message/group.vue
+++ b/pages/message/group.vue
@@ -245,7 +245,7 @@
display: flex;
color: #fff;
font-size: 36rpx;
- background-color: #89965f;
+ background-color: #00a89b;
.text-center {
width: 100%;
text-align: center;
@@ -382,9 +382,10 @@
background-image: url('../../static/image/nomsg.png');
background-repeat: no-repeat;
background-position: center center;
+ background-size: 100%;
height: 376rpx;
width: 256rpx;
- color: #89965f;
+ color: #00a89b;
display: flex;
align-items: center;
justify-content: flex-end;
diff --git a/pages/order/order.vue b/pages/order/order.vue
index fa938be..cf67749 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -69,7 +69,7 @@
-
+
提示:快递运输期间不算租期，实际起租日为快递签收当天
@@ -1030,7 +1030,7 @@
.xs{
font-size: 28rpx;
font-weight: 600;
- color:#89965f ;
+ color:#00a89b ;
}
}
.sbtn{
@@ -1063,7 +1063,7 @@
width: 660rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(67,110,255,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1214,7 +1214,7 @@
height: 60rpx;
line-height: 60rpx;
text-align: center;
- background: #89965f;
+ background: #00a89b;
border-radius: 40rpx 40rpx 40rpx 40rpx;
font-weight: 400;
font-size: 28rpx;
@@ -1376,8 +1376,8 @@
}
::v-deep.uni-radio-input-checked{
- background-color: #89965f !important;
- border-color: #89965f !important;
+ background-color: #00a89b !important;
+ border-color: #00a89b !important;
background-clip: content-box!important;
box-sizing: border-box;
}
@@ -1438,7 +1438,7 @@
width: 100%;
}
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 20rpx 20rpx;
border-radius: 50rpx;
height: 75rpx;
@@ -1484,7 +1484,7 @@
height: 48rpx;
text-align: center;
line-height: 50rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 24rpx;
margin-left: 10rpx;
}
@@ -1521,7 +1521,7 @@
text-align: center;
.btn{
padding: 0 12rpx;
- background-color: #89965f ;
+ background-color: #00a89b ;
border-radius: 24rpx;
font-size: 26rpx;
color: #fff;
diff --git a/pages/order/orderinfo.vue b/pages/order/orderinfo.vue
index c067b06..c4d75c6 100644
--- a/pages/order/orderinfo.vue
+++ b/pages/order/orderinfo.vue
@@ -1121,24 +1121,24 @@
.rmb{
font-size: 30rpx;
font-family: smallYuan;
- color:#89965f ;
+ color:#00a89b ;
margin-left: 10rpx;
}
.zs{
font-size: 48rpx;
font-weight: 600;
font-family: smallYuan;
- color:#89965f ;
+ color:#00a89b ;
}
.xs{
font-size: 28rpx;
font-weight: 600;
font-family: smallYuan;
- color:#89965f ;
+ color:#00a89b ;
}
}
.btn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 30rpx 20rpx 0 0;
border-radius: 50rpx;
height: 60rpx;
@@ -1211,8 +1211,8 @@
line-height: 60rpx;
width:170rpx;
font-size: 26rpx;
- border:1rpx solid #89965f;
- color:#89965f;
+ border:1rpx solid #00a89b;
+ color:#00a89b;
}
.wlbtn::after{
border:0 !important;
@@ -1352,7 +1352,7 @@
.owc{
display: flex;
flex-direction: column;
- background-color: #89965f ;
+ background-color: #00a89b ;
padding: 20rpx;
border-radius: 16rpx;
.ozstate{
@@ -1473,8 +1473,8 @@
}
::v-deep.uni-radio-input-checked{
- background-color: #89965f !important;
- border-color: #89965f !important;
+ background-color: #00a89b !important;
+ border-color: #00a89b !important;
background-clip: content-box!important;
box-sizing: border-box;
}
@@ -1490,7 +1490,7 @@
display: block;
padding-bottom: 80rpx;
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 50rpx 20rpx 20rpx;
border-radius: 50rpx;
height: 75rpx;
@@ -1577,7 +1577,7 @@
text-align: center;
.btn{
padding: 0 12rpx;
- background-color: #89965f ;
+ background-color: #00a89b ;
border-radius: 24rpx;
font-size: 26rpx;
color: #fff;
diff --git a/pages/order/orderlist.vue b/pages/order/orderlist.vue
index 4317241..08e4eab 100644
--- a/pages/order/orderlist.vue
+++ b/pages/order/orderlist.vue
@@ -13,7 +13,7 @@
-
+
{{item.storeName}}
@@ -1295,14 +1295,14 @@
height: 90rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -1317,7 +1317,7 @@
background-position: center;
font-size: 28rpx;
text-align: center;
- color: #89965f;
+ color: #00a89b;
overflow: hidden;
}
.scell{
@@ -1522,7 +1522,7 @@
border:0 !important;
}
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin-left: 20rpx;
border-radius: 50rpx;
border-radius: 50rpx;
@@ -1530,7 +1530,7 @@
line-height: 48rpx;
padding: 0 20rpx;
font-size: 24rpx;
- border:1rpx solid #89965f;
+ border:1rpx solid #00a89b;
}
.paybtn::after{
border:0 !important;
@@ -1640,8 +1640,8 @@
}
::v-deep.uni-radio-input-checked{
- background-color: #89965f !important;
- border-color: #89965f !important;
+ background-color: #00a89b !important;
+ border-color: #00a89b !important;
background-clip: content-box!important;
box-sizing: border-box;
}
@@ -1657,7 +1657,7 @@
display: block;
padding-bottom: 80rpx;
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 50rpx 20rpx 20rpx;
border-radius: 50rpx;
height: 75rpx;
@@ -1734,7 +1734,7 @@
text-align: center;
.btn{
padding: 0 12rpx;
- background-color: #89965f ;
+ background-color: #00a89b ;
border-radius: 24rpx;
font-size: 26rpx;
color: #fff;
diff --git a/pages/order/orderwl.vue b/pages/order/orderwl.vue
index 274510e..575801f 100644
--- a/pages/order/orderwl.vue
+++ b/pages/order/orderwl.vue
@@ -413,7 +413,7 @@
display: block;
padding-bottom: 80rpx;
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 50rpx 20rpx 20rpx;
border-radius: 50rpx;
height: 75rpx;
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 1564611..ef8ef60 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -69,8 +69,8 @@ export default {
}
::v-deep.uni-radio-input-checked{
- background-color: #89965f!important;
- border-color: #89965f!important;
+ background-color: #00a89b!important;
+ border-color: #00a89b!important;
background-clip: content-box!important;
padding: 0rpx!important;
box-sizing: border-box;
@@ -135,7 +135,7 @@ export default {
color: #FCFCFD;
height: 88rpx;
line-height: 88rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(67,110,255,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -173,7 +173,7 @@ export default {
text-align: center;
.btn{
padding: 0 12rpx;
- background-color: #89965f;
+ background-color: #00a89b;
border-radius: 24rpx;
font-size: 26rpx;
color: #fff;
diff --git a/pages/pay/payErr.vue b/pages/pay/payErr.vue
index c9901b6..5d4f16c 100644
--- a/pages/pay/payErr.vue
+++ b/pages/pay/payErr.vue
@@ -70,11 +70,11 @@
color:#78839A;
text-align: center;
box-sizing:border-box;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
&.hollow{
background: #E1F2FF;
color: #78839A;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
}
}
diff --git a/pages/product/cdetail.vue b/pages/product/cdetail.vue
index b1e35a7..41a714e 100644
--- a/pages/product/cdetail.vue
+++ b/pages/product/cdetail.vue
@@ -32,11 +32,11 @@
/ {{product.unit}}
-
+
已收藏
-
+
加入收藏
@@ -857,7 +857,7 @@
}
.price{
line-height: 1;
- color: #89965f;
+ color: #00a89b;
.txt{
font-size: 30rpx;
}
@@ -907,7 +907,7 @@
}
.spcli.cur{
background: #dceef7;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
font-weight: 600;
}
.spclilong{
@@ -927,7 +927,7 @@
}
.spclilong.cur{
background: #dceef7;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
font-weight: 600;
}
}
@@ -954,7 +954,7 @@
width: 690rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
margin: 0 30rpx 30rpx;
border-radius: 10rpx;
@@ -972,7 +972,7 @@
width: 690rpx;
height: 76rpx;
line-height: 76rpx;
- background: #55690e;
+ background: #468a73;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
margin: 0 30rpx 30rpx;
border-radius: 10rpx;
@@ -1076,7 +1076,7 @@
color: #FCFCFD;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1093,7 +1093,7 @@
width: 220rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1110,7 +1110,7 @@
width: 210rpx;
height: 76rpx;
line-height: 76rpx;
- background: #55690e;
+ background: #468a73;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1154,12 +1154,12 @@
font-size: 28rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 600;
- color: #89965f;
+ color: #00a89b;
}
.cur .pline{
width: 40rpx;
height: 6rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 4rpx 4rpx 4rpx 4rpx;
opacity: 1;
}
@@ -1277,7 +1277,7 @@
line-height: 40rpx;
color: #fff;
font-size: 22rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 20rpx;
padding: 0 20rpx;
margin-right: 20rpx;
@@ -1297,7 +1297,7 @@
align-items: baseline;
.txtt{
font-size: 24rpx;
- color: #89965f;
+ color: #00a89b;
margin-right: 10rpx;
}
.txt{
@@ -1308,7 +1308,7 @@
.tint{
font-size: 42rpx;
font-weight: 600;
- color: #89965f;
+ color: #00a89b;
}
.pretxt{
color: #959694;
@@ -1323,7 +1323,7 @@
align-items: center;
justify-content: flex-end;
.txt{
- color: #89965f;
+ color: #00a89b;
font-size: 24rpx;
margin-left: 10rpx;
}
@@ -1427,7 +1427,7 @@
}
.price{
line-height: 1;
- color: #89965f;
+ color: #00a89b;
.txt{
font-size: 30rpx;
}
diff --git a/pages/product/cxlist.vue b/pages/product/cxlist.vue
index 420327a..9b77285 100644
--- a/pages/product/cxlist.vue
+++ b/pages/product/cxlist.vue
@@ -6,7 +6,7 @@
-
+
标签中
const regex = new RegExp(keyword, 'gi');
- return text.replace(regex, `${keyword}`);
+ return text.replace(regex, `${keyword}`);
},
input(res) {
if(!this.ifsear){
@@ -649,8 +649,8 @@
}
.tab.cur{
color: #fff;
- background-color: #89965f;
- border: 1rpx solid #89965f;
+ background-color: #00a89b;
+ border: 1rpx solid #00a89b;
}
}
.tcon{
diff --git a/pages/product/detail.vue b/pages/product/detail.vue
index 9da267c..87fdcc3 100644
--- a/pages/product/detail.vue
+++ b/pages/product/detail.vue
@@ -44,11 +44,11 @@
/ {{product.unit}}
-
+
已收藏
-
+
加入收藏
@@ -815,7 +815,7 @@
}
.price{
line-height: 1;
- color: #89965f;
+ color: #00a89b;
.txt{
font-size: 30rpx;
}
@@ -865,7 +865,7 @@
}
.spcli.cur{
background: #dceef7;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
font-weight: 600;
}
.spclilong{
@@ -885,7 +885,7 @@
}
.spclilong.cur{
background: #dceef7;
- border: 1rpx solid #89965f;
+ border: 1rpx solid #00a89b;
font-weight: 600;
}
}
@@ -912,7 +912,7 @@
width: 690rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
margin: 0 30rpx 30rpx;
border-radius: 10rpx;
@@ -930,7 +930,7 @@
width: 690rpx;
height: 76rpx;
line-height: 76rpx;
- background: #55690e;
+ background: #468a73;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
margin: 0 30rpx 30rpx;
border-radius: 10rpx;
@@ -1035,7 +1035,7 @@
width: 220rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1052,7 +1052,7 @@
width: 210rpx;
height: 76rpx;
line-height: 76rpx;
- background: #55690e;
+ background: #468a73;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1096,12 +1096,12 @@
font-size: 28rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 600;
- color: #89965f;
+ color: #00a89b;
}
.cur .pline{
width: 40rpx;
height: 6rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 4rpx 4rpx 4rpx 4rpx;
opacity: 1;
}
@@ -1219,7 +1219,7 @@
line-height: 40rpx;
color: #fff;
font-size: 22rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 20rpx;
padding: 0 20rpx;
margin-right: 20rpx;
@@ -1239,7 +1239,7 @@
align-items: baseline;
.txtt{
font-size: 24rpx;
- color: #89965f;
+ color: #00a89b;
margin-right: 10rpx;
}
.txt{
@@ -1250,7 +1250,7 @@
.tint{
font-size: 42rpx;
font-weight: 600;
- color: #89965f;
+ color: #00a89b;
}
.pretxt{
color: #959694;
@@ -1265,7 +1265,7 @@
align-items: center;
justify-content: flex-end;
.txt{
- color: #89965f;
+ color: #00a89b;
font-size: 24rpx;
margin-left: 10rpx;
}
@@ -1369,7 +1369,7 @@
}
.price{
line-height: 1;
- color: #89965f;
+ color: #00a89b;
.txt{
font-size: 30rpx;
}
diff --git a/pages/product/list.vue b/pages/product/list.vue
index 7eaf4a8..64af66c 100644
--- a/pages/product/list.vue
+++ b/pages/product/list.vue
@@ -2,7 +2,7 @@
-
+
@@ -118,7 +118,8 @@
ifshow:true, // 显示检索商品
searchValue:"",
ifsear:false,
- shop:myCache('myshop')?myCache('myshop'):'',
+ shopid: myCache('myshopid'),
+ shop: myCache('myshop'),
scrollLeft: 0,
tabCurrentIndex:0,
list:myCache("spgglist"),
@@ -548,7 +549,7 @@
if (!keyword) return text;
// 使用正则表达式将关键词包裹在标签中
const regex = new RegExp(keyword, 'gi');
- return text.replace(regex, `${keyword}`);
+ return text.replace(regex, `${keyword}`);
},
getPhoneNumber(e){
if(e.userid){
@@ -756,7 +757,6 @@
height: 64rpx;
white-space: nowrap;
margin: 0 20rpx 20rpx 20rpx;
- text-align: center;
.tab{
padding: 0 16rpx;
min-width: 180rpx;
@@ -775,8 +775,8 @@
}
.tab.cur{
color: #fff;
- background-color: #89965f;
- border: 1rpx solid #89965f;
+ background-color: #00a89b;
+ border: 1rpx solid #00a89b;
}
}
.tcon{
@@ -874,13 +874,14 @@
margin-right: 2%;
}
.adname{
- background: rgba(0, 0, 0, 0.1);
+ background: rgba(0, 0, 0, 0.4);
position: absolute;
- padding: 8rpx 8rpx;
+ padding: 6rpx 6rpx;
color: #fff;
- font-size: 26rpx;
+ font-size: 24rpx;
bottom: 0;
left: 0;
+ border-radius: 4rpx;
}
}
}
diff --git a/pages/product/order.vue b/pages/product/order.vue
index 5dbb1a2..81767d7 100644
--- a/pages/product/order.vue
+++ b/pages/product/order.vue
@@ -918,7 +918,7 @@
width: 220rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
@@ -1170,8 +1170,8 @@
}
::v-deep.uni-radio-input-checked{
- background-color: #89965f !important;
- border-color: #89965f !important;
+ background-color: #00a89b !important;
+ border-color: #00a89b !important;
background-clip: content-box!important;
box-sizing: border-box;
}
@@ -1231,7 +1231,7 @@
width: 100%;
}
.addadrbtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 20rpx 10%;
border-radius: 50rpx;
height: 70rpx;
@@ -1239,7 +1239,7 @@
font-size: 30rpx;
}
.paybtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin: 20rpx 20rpx;
border-radius: 50rpx;
height: 75rpx;
@@ -1286,7 +1286,7 @@
height: 48rpx;
text-align: center;
line-height: 50rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 24rpx;
margin-left: 10rpx;
}
@@ -1323,7 +1323,7 @@
text-align: center;
.btn{
padding: 0 12rpx;
- background-color: #89965f ;
+ background-color: #00a89b ;
border-radius: 24rpx;
font-size: 26rpx;
color: #fff;
diff --git a/pages/product/service.vue b/pages/product/service.vue
index 16f7eb4..87e9b1e 100644
--- a/pages/product/service.vue
+++ b/pages/product/service.vue
@@ -968,7 +968,7 @@
}
.msg-text {
margin-right: 16rpx;
- background-color: #89965f;
+ background-color: #00a89b;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
font-size: 32rpx;
diff --git a/pages/teacher/chat.vue b/pages/teacher/chat.vue
index c043068..8f1e3ea 100644
--- a/pages/teacher/chat.vue
+++ b/pages/teacher/chat.vue
@@ -1022,7 +1022,7 @@
}
.msg-text {
margin-right: 16rpx;
- background-color: #89965f;
+ background-color: #00a89b;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
font-size: 32rpx;
diff --git a/pages/teacher/course.vue b/pages/teacher/course.vue
index 86a54b3..8fcea59 100644
--- a/pages/teacher/course.vue
+++ b/pages/teacher/course.vue
@@ -4,13 +4,13 @@
-
+
日期
15日内
-
+
{{item.day}}
{{item.weekName}}
@@ -21,21 +21,22 @@
-
+
{{item.time}}
-
+
{{dd.startTime}}-{{dd.endTime}}
- {{dd.courseName}}
+ {{dd.courseName}}
{{dd.claName}}
- {{dd.staffName}}
+ {{dd.staffName}}
+ {{dd.roomName}}
@@ -701,13 +702,13 @@
position: sticky;
left: 0;
z-index: 10;
- background-color: #FFFAF2;
+ background-color: #F2F2F2;
}
::v-deep .uni-table-tr .uni-table-td:first-child {
position: sticky;
left: 0;
z-index: 10;
- background-color: #FFFAF2;
+ background-color: #F2F2F2;
}
.leftfix{
position: sticky;
@@ -731,36 +732,40 @@
flex-direction: column;
align-items: center;
justify-content: center;
- width: 120rpx;
+ width: 100%;
height: 120rpx;
- background-color: #fffae0;
+ background-color: #e4f9f7;
+ border-right: 1rpx solid #fff;
}
.rightcell{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
- width: 240rpx;
+ width: 100%;
height: 120rpx;
- background-color: #ffffff;
+ background-color: #e4f9f7;
+ border-radius: 10rpx;
+ border-right: 1rpx solid #fff;
+ position: relative;
}
.cnum{
position: absolute;
- top:15rpx;
- right: 20rpx;
+ bottom:30rpx;
+ right: 6rpx;
min-width: 28rpx;
padding: 0 2rpx;
border-radius: 50% 50%;
background-color: #ff0000;
color: #FFF;
- font-size: 22rpx;
+ font-size: 20rpx;
}
.courhead{
border-radius: 8rpx;
background-color: #ffffff;
display: flex;
flex-direction: column;
- width: 120rpx;
+ width: 100rpx;
height: 120rpx;
justify-content: center;
align-items: center;
@@ -769,17 +774,17 @@
top: 0;
}
.ctitle{
- font-size: 30rpx;
+ font-size: 26rpx;
color:#000;
}
.courcell{
- width: 120rpx;
+ width: 100rpx;
height: 120rpx;
border-bottom: 1rpx dotted #ccc;
background-color: #ffffff;
}
.chcell{
- width: 240rpx;
+ width: 200rpx;
}
.courfix{
position: sticky;
@@ -787,17 +792,19 @@
z-index: 19;
display: flex;
flex-direction: column;
- width: 120rpx;
- height: 180rpx;
+ width: 100%;
+ height: 240rpx;
justify-content: center;
align-items: center;
border-bottom: 1rpx dotted #ccc;
+ color:#000;
+ font-size: 28rpx;
}
.courheadtext{
display: flex;
flex-direction: column;
- width: 240rpx;
- height: 180rpx;
+ width: 100%;
+ height: 240rpx;
justify-content: center;
align-items: center;
border-radius: 10rpx;
@@ -806,8 +813,9 @@
border-left: solid;
}
.ctxt{
- font-size: 28rpx;
- line-height: 36rpx;
+ font-size: 24rpx;
+ line-height: 30rpx;
+ margin-bottom: 6rpx;
}
}
.bbtn{
@@ -819,7 +827,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/teacher/course0.vue b/pages/teacher/course0.vue
index 286155d..f2986d9 100644
--- a/pages/teacher/course0.vue
+++ b/pages/teacher/course0.vue
@@ -597,7 +597,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/teacher/detail.vue b/pages/teacher/detail.vue
index df73448..aaaef7e 100644
--- a/pages/teacher/detail.vue
+++ b/pages/teacher/detail.vue
@@ -293,7 +293,7 @@
width: 100%;
align-items: center;
.leftarr{
- background-color: #b9af9d;
+ background-color: #00a89b;
padding: 10rpx;
border-radius: 10rpx;
}
@@ -376,7 +376,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/user/cdlist.vue b/pages/user/cdlist.vue
index e103f15..859caf6 100644
--- a/pages/user/cdlist.vue
+++ b/pages/user/cdlist.vue
@@ -538,14 +538,14 @@
height: 75rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -601,6 +601,7 @@
color: #333;
padding: 10rpx 2rpx 15rpx;
text-align: center;
+ word-wrap: break-word;
}
}
}
diff --git a/pages/user/courselist.vue b/pages/user/courselist.vue
index 9787f19..6ca242c 100644
--- a/pages/user/courselist.vue
+++ b/pages/user/courselist.vue
@@ -51,7 +51,7 @@
{{item.claName}}
{{item.claName}}
-
+
@@ -101,13 +101,13 @@
-
+
日期
15日内
-
+
{{item.day}}
{{item.weekName}}
@@ -118,20 +118,21 @@
-
+
{{item.time}}
-
+
{{dd.startTime}}-{{dd.endTime}}
- {{dd.courseName}}
+ {{dd.courseName}}
{{dd.claName}}
- {{dd.staffName}}
+ {{dd.staffName}}
+ {{dd.roomName}}
预约
@@ -762,10 +763,10 @@
date:this.list[this.tabCurrentIndex].redate
}
const {data: res} = await uni.$http.post('/api/course/getCourseListByDate', para);
- if(res&&res.length>0){
+ if(res&&res.data&&res.data.length>0){
this.list[this.tabCurrentIndex].loadStatus="noMore";
this.$forceUpdate();
- this.list[this.tabCurrentIndex].slist=res;
+ this.list[this.tabCurrentIndex].slist=res.data;
this.$forceUpdate();
}
else{
@@ -916,7 +917,7 @@
}
.tabtip{
position: absolute;
- top: -6rpx;
+ top: 0;
left: 10rpx;
position: relative;
display: inline-block;
@@ -1057,6 +1058,7 @@
flex-direction: row;
justify-content: center;
align-items: center;
+ width: 100%;
.osimg{
width: 160rpx;
height: 260rpx;
@@ -1065,13 +1067,14 @@
.osname{
display: flex;
flex: 1;
- display: flex;
+ width: 100%;
flex-direction: column;
- margin-left: 26rpx;
+ margin-left: 20rpx;
.oscell{
display: flex;
flex-direction: row;
margin-bottom: 10rpx;
+ align-items: center;
}
.txtbg{
padding: 2rpx 15rpx;
@@ -1246,13 +1249,13 @@
position: sticky;
left: 0;
z-index: 10;
- background-color: #FFFAF2;
+ background-color: #F2F2F2;
}
::v-deep .uni-table-tr .uni-table-td:first-child {
position: sticky;
left: 0;
z-index: 99;
- background-color: #FFFAF2;
+ background-color: #F2F2F2;
}
.leftfix{
position: sticky;
@@ -1276,37 +1279,40 @@
flex-direction: column;
align-items: center;
justify-content: center;
- width: 120rpx;
+ width: 100%;
height: 120rpx;
- background-color: #fffae0;
+ background-color: #e4f9f7;
+ border-right: 1rpx solid #fff;
}
.rightcell{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
- width: 240rpx;
+ width: 100%;
height: 120rpx;
- background-color: #ffffff;
+ background-color: #e4f9f7;
+ border-radius: 10rpx;
+ border-right: 1rpx solid #fff;
position: relative;
}
.cnum{
position: absolute;
- top:15rpx;
- right: 20rpx;
+ bottom:30rpx;
+ right: 6rpx;
min-width: 28rpx;
padding: 0 2rpx;
border-radius: 50% 50%;
background-color: #ff0000;
color: #FFF;
- font-size: 22rpx;
+ font-size: 20rpx;
}
.courhead{
border-radius: 8rpx;
background-color: #ffffff;
display: flex;
flex-direction: column;
- width: 120rpx;
+ width: 100rpx;
height: 120rpx;
justify-content: center;
align-items: center;
@@ -1315,11 +1321,11 @@
top: 0;
}
.ctitle{
- font-size: 30rpx;
+ font-size: 26rpx;
color:#000;
}
.courcell{
- width: 120rpx;
+ width: 100rpx;
height: 120rpx;
border-bottom: 1rpx dotted #ccc;
background-color: #ffffff;
@@ -1333,18 +1339,20 @@
z-index: 19;
display: flex;
flex-direction: column;
- width: 120rpx;
- height: 240rpx;
- background-color: #FFFAF2;
+ width: 100%;
+ height: 280rpx;
+ background-color: #F2F2F2;
justify-content: center;
align-items: center;
border-bottom: 1rpx dotted #ccc;
+ color:#000;
+ font-size: 28rpx;
}
.courheadtext{
display: flex;
flex-direction: column;
- width: 240rpx;
- height: 240rpx;
+ width: 100%;
+ height: 280rpx;
justify-content: center;
align-items: center;
border-radius: 10rpx;
@@ -1353,8 +1361,9 @@
border-left: solid;
}
.ctxt{
- font-size: 28rpx;
- line-height: 36rpx;
+ font-size: 24rpx;
+ line-height: 30rpx;
+ margin-bottom: 6rpx;
}
.orderbtn{
background-color: #00A99A !important;
diff --git a/pages/user/courselist0.vue b/pages/user/courselist0.vue
index 2d1e516..de25af6 100644
--- a/pages/user/courselist0.vue
+++ b/pages/user/courselist0.vue
@@ -55,7 +55,7 @@
-
+
{{item.tip}}
@@ -64,11 +64,11 @@
{{item.teacherposition }}
-
+
{{item.room}}
-
+
已预约{{item.order}}人/限{{item.limit}}人
@@ -1772,13 +1772,13 @@
height: 90rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 36rpx;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -1812,8 +1812,8 @@
}
}
.tabcell.cur{
- background-color: #f3f4ee;
- border: 1rpx solid #89965f;
+ background-color: #e4f9f7;
+ border: 1rpx solid #00a89b;
border-radius: 10rpx;
}
@@ -1834,7 +1834,7 @@
background-position: center;
font-size: 28rpx;
text-align: center;
- color: #89965f;
+ color: #00a89b;
overflow: hidden;
}
.scell{
@@ -1971,14 +1971,14 @@
border:0 !important;
}
.orderbtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
margin-left: 20rpx;
border-radius: 40rpx;
height: 46rpx;
line-height: 44rpx;
padding: 0 20rpx;
font-size: 24rpx;
- border:1rpx solid #89965f;
+ border:1rpx solid #00a89b;
margin-bottom: 30rpx;
}
.orderbtn::after{
@@ -2181,13 +2181,13 @@
line-height: 36rpx;
}
.orderbtn{
- background-color: #89965f !important;
+ background-color: #00a89b !important;
border-radius: 40rpx;
height: 40rpx;
line-height: 38rpx;
padding: 0 20rpx;
font-size: 24rpx;
- border:1rpx solid #89965f;
+ border:1rpx solid #00a89b;
margin-top: 6rpx;
}
.orderbtn::after{
@@ -2214,7 +2214,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/user/jslist.vue b/pages/user/jslist.vue
index aabe6ef..3fd2db6 100644
--- a/pages/user/jslist.vue
+++ b/pages/user/jslist.vue
@@ -405,14 +405,14 @@
height: 75rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -468,6 +468,7 @@
color: #333;
padding: 10rpx 2rpx 15rpx;
text-align: center;
+ word-wrap: break-word;
}
}
}
diff --git a/pages/user/kslist.vue b/pages/user/kslist.vue
index 99a43ea..89573a7 100644
--- a/pages/user/kslist.vue
+++ b/pages/user/kslist.vue
@@ -385,14 +385,14 @@
height: 75rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -448,6 +448,7 @@
color: #333;
padding: 10rpx 10rpx 15rpx;
text-align: center;
+ word-wrap: break-word;
}
}
}
diff --git a/pages/user/mycollect.vue b/pages/user/mycollect.vue
index e27de69..5c4f415 100644
--- a/pages/user/mycollect.vue
+++ b/pages/user/mycollect.vue
@@ -427,7 +427,7 @@
if (!keyword) return text;
// 使用正则表达式将关键词包裹在标签中
const regex = new RegExp(keyword, 'gi');
- return text.replace(regex, `${keyword}`);
+ return text.replace(regex, `${keyword}`);
},
input(res) {
if(!this.ifsear){
diff --git a/pages/user/mycourse.vue b/pages/user/mycourse.vue
index a674fdf..e5a5694 100644
--- a/pages/user/mycourse.vue
+++ b/pages/user/mycourse.vue
@@ -4,13 +4,13 @@
-
+
日期
15日内
-
+
{{item.day?(item.day).slice(-5):''}}
{{item.weekName}}
@@ -21,12 +21,12 @@
-
+
{{item.time}}
-
+
@@ -36,9 +36,10 @@
:style="{color:colorlist[index].fcolor,backgroundColor:colorlist[index].color,borderLeftColor:colorlist[index].fcolor}"
>
{{dd.startTime}}-{{dd.endTime}}
- {{dd.courseName}}
+ {{dd.courseName}}
{{dd.claName}}
- {{dd.staffName}}
+ {{dd.staffName}}
+ {{dd.roomName}}
@@ -687,13 +688,13 @@
position: sticky;
left: 0;
z-index: 10;
- background-color: #FFFAF2;
+ background-color: #F2F2F2;
}
::v-deep .uni-table-tr .uni-table-td:first-child {
position: sticky;
left: 0;
z-index: 10;
- background-color: #FFFAF2;
+ background-color: #F2F2F2;
}
.leftfix{
position: sticky;
@@ -717,36 +718,40 @@
flex-direction: column;
align-items: center;
justify-content: center;
- width: 120rpx;
+ width: 100%;
height: 120rpx;
- background-color: #fffae0;
+ background-color: #e4f9f7;
+ border-right: 1rpx solid #fff;
}
.rightcell{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
- width: 240rpx;
+ width: 100%;
height: 120rpx;
- background-color: #ffffff;
+ background-color: #e4f9f7;
+ border-radius: 10rpx;
+ border-right: 1rpx solid #fff;
+ position: relative;
}
.cnum{
position: absolute;
- top:15rpx;
- right: 20rpx;
+ bottom:30rpx;
+ right: 6rpx;
min-width: 28rpx;
padding: 0 2rpx;
border-radius: 50% 50%;
background-color: #ff0000;
color: #FFF;
- font-size: 22rpx;
+ font-size: 20rpx;
}
.courhead{
border-radius: 8rpx;
background-color: #ffffff;
display: flex;
flex-direction: column;
- width: 120rpx;
+ width: 100rpx;
height: 120rpx;
justify-content: center;
align-items: center;
@@ -755,34 +760,36 @@
top: 0;
}
.ctitle{
- font-size: 30rpx;
+ font-size: 26rpx;
color:#000;
}
.courcell{
- width: 120rpx;
+ width: 100rpx;
height: 120rpx;
border-bottom: 1rpx dotted #ccc;
background-color: #ffffff;
}
.chcell{
- width: 240rpx;
+ width: 200rpx;
}
.courfix{
position: sticky;
left: 0;
display: flex;
flex-direction: column;
- width: 120rpx;
- height: 180rpx;
+ width: 100%;
+ height: 240rpx;
justify-content: center;
align-items: center;
border-bottom: 1rpx dotted #ccc;
+ color: #000;
+ font-size: 28rpx;
}
.courheadtext{
display: flex;
flex-direction: column;
- width: 240rpx;
- height: 180rpx;
+ width: 100%;
+ height: 240rpx;
justify-content: center;
align-items: center;
border-radius: 10rpx;
@@ -791,8 +798,9 @@
border-left: solid;
}
.ctxt{
- font-size: 28rpx;
- line-height: 36rpx;
+ font-size: 24rpx;
+ line-height: 30rpx;
+ margin-bottom: 6rpx;
}
}
diff --git a/pages/user/mycourse0.vue b/pages/user/mycourse0.vue
index 5ec977e..c2206a5 100644
--- a/pages/user/mycourse0.vue
+++ b/pages/user/mycourse0.vue
@@ -602,7 +602,7 @@
width: 314rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/user/mycourseinfo.vue b/pages/user/mycourseinfo.vue
index 2b7806a..d3f2e0b 100644
--- a/pages/user/mycourseinfo.vue
+++ b/pages/user/mycourseinfo.vue
@@ -242,7 +242,7 @@
uni.showLoading({
title: '数据加载中...'
});
- const {data: res} = await uni.$http.post('/api/my/courseTimeDetail', {id:this.id});
+ const {data: res} = await uni.$http.post('/api/my/courseTimeDetail', {courseTimeId:this.id});
if(res&&res.data){
var data=res.data;
// 信息
@@ -381,6 +381,7 @@
color: #333;
padding: 10rpx 10rpx 15rpx;
text-align: center;
+ word-wrap: break-word;
}
}
}
diff --git a/pages/user/mycustom.vue b/pages/user/mycustom.vue
index 6864d74..7b990e7 100644
--- a/pages/user/mycustom.vue
+++ b/pages/user/mycustom.vue
@@ -33,13 +33,26 @@
课程：{{item.courseName}}
- 收费模式：{{item.chargeType=='hour'?'课时':(item.chargeType=='date'?'时间':(item.chargeType=='cycle'?'周期':'其他'))}}
+ 收费模式：{{ item.chargeType?retStr(item.chargeType):'其他' }}
+ 次数：{{item.count}}
+
+
+
+
+ 时间：{{item.days}}
+
+
+
+
收费：￥{{item.receiptFee}}
+
+ 储值：￥{{item.totalFee}}
+
@@ -89,26 +102,14 @@
contentrefresh: '加载中',
contentnomore: ''
},
- goodsList: [
- // {
- // id:1,
- // name:"丽丽",
- // sex:"女",
- // age:"20",
- // phone:"18900000001",
- // type:"精品团课",
- // date:"2025年03月05日-2025年04月05日",
- // },
- ],
- loadStatus:'more',
- page: {
- pageNum: 1,
- pageSize: 10
- }
+ goodsList:[],
+ chargeTypes:[],
+ loadStatus:'more'
};
},
onLoad(options) {
this.getList();
+ this.getDic();
},
onPullDownRefresh() {
setTimeout(()=>{
@@ -232,6 +233,22 @@
this.$forceUpdate();
}
},
+ async getDic() {
+ const {data: res} = await uni.$http.get('/api/dict/data/list/dictType/charge_type');
+ if(res&&res.data){
+ this.chargeTypes=res.data;
+ this.$forceUpdate();
+ }
+ },
+ retStr(code){
+ var ret="";
+ this.chargeTypes.forEach(cell=>{
+ if(cell.dictValue==code){
+ ret=cell.dictLabel;
+ }
+ })
+ return ret;
+ },
searDo(){
this.loadStatus="more";
this.loadData();
diff --git a/pages/user/pwdset.vue b/pages/user/pwdset.vue
index 15a1c2a..8e9705f 100644
--- a/pages/user/pwdset.vue
+++ b/pages/user/pwdset.vue
@@ -174,7 +174,7 @@ export default {
color: #FCFCFD;
height: 80rpx;
line-height: 80rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/user/set.vue b/pages/user/set.vue
index ceee912..6d3db65 100644
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@@ -18,7 +18,7 @@
开启通知
- 已开启
+ 已开启
-->
@@ -243,7 +243,7 @@
border-radius: 5rpx;
text-align: center;
font-size: 28rpx;
- color: #89965f;
+ color: #00a89b;
margin: 50rpx 20rpx 30rpx;
}
.listcell {
diff --git a/pages/user/tclist.vue b/pages/user/tclist.vue
index 9c271a4..37761e7 100644
--- a/pages/user/tclist.vue
+++ b/pages/user/tclist.vue
@@ -550,14 +550,14 @@
height: 75rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -613,6 +613,7 @@
color: #333;
padding: 10rpx 10rpx 15rpx;
text-align: center;
+ word-wrap: break-word;
}
}
}
diff --git a/pages/user/user.vue b/pages/user/user.vue
index d4d0c04..eaef789 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -58,30 +58,48 @@
{{favoritesnum}}
{{servers[5].name}}
+
{{servers[0].name}}
+
{{servers[1].name}}
+
{{servers[2].name}}
+
{{servers[3].name}}
+
+
+
+
+
+ {{servers[12].name}}
+
+
+
+
+
+
+ {{servers[13].name}}
+
@@ -131,11 +149,11 @@
{{servers[11].name}}
-
+
-
+
- {{servers[12].name}}
+ {{servers[14].name}}
@@ -260,6 +278,16 @@
},
{
key:12,
+ img:'../../static/image/yyjl.png',
+ name:'预约学员',// 教练
+ },
+ {
+ key:13,
+ img:'../../static/image/yyjl.png',
+ name:'预约学员',// 店长
+ },
+ {
+ key:99,
img:'../../static/image/tc.png',
name:'退出登录',
},
@@ -279,10 +307,10 @@
this.openId = myCache('openId');
var user = myCache('userInfo');
this.userid = user.userId? user.userId:'';
- // this.nickName= user.nickName? user.nickName:'';
+ this.avatar = user.avatar?user.avatar:'../../static/image/logo.png';
+ this.nickName= user.nickName? user.nickName:'';
this.phone = user.phonenumber;
- // this.signature = user.signature;
- // this.avatar = user.avatar?user.avatar:'../../static/image/logo.png';
+ this.signature = user.signature;
this.roleId=user.roleId?user.roleId:[];
}
@@ -322,6 +350,7 @@
},
methods: {
ifview(value){
+ // 描述：角色ID；顾问：103 ；教练：104 ；店长：105 ；普通用户：107；
var str=false;
this.roleId.forEach(item=>{
if(item==value)
@@ -454,6 +483,18 @@
});
}
else if(ii==12){
+ // 预约学员-教练
+ uni.navigateTo({
+ url: `/pages/book/bookteacher`
+ });
+ }
+ else if(ii==13){
+ // 预约学员-店长
+ uni.navigateTo({
+ url: `/pages/book/booktshop`
+ });
+ }
+ else if(ii==99){
// 退出登录
uni.showModal({
title: '提示',
@@ -486,10 +527,11 @@
myCache('phone','');
myCache('openId','');
myCache('userid','');
- // myCache('shop','');
- // myCache('myshop','');
- // myCache('myshopid','');
- // myCache('shoplist','');
+ // 门店信息退出
+ myCache('shop','');
+ myCache('myshop','');
+ myCache('myshopid','');
+ myCache('shoplist','');
// 订单信息数字清除
this.menus[0].num=0;
@@ -597,7 +639,6 @@
}
},
logindo(){
- console.log(this.userid)
if(this.userid==""||this.userid=="0"){
// this.$refs.loginId.open();
uni.navigateTo({
@@ -667,7 +708,7 @@
height: 105rpx;
line-height: 100rpx;
align-items: center;
- background-color: #89965f;
+ background-color: #00a89b;
padding-left: 20rpx;
.tx1{
font-size: 32rpx;
@@ -732,7 +773,7 @@
border-radius: 30rpx;
font-size: 24rpx;
color: #888;
- background: #f3f4ee;
+ background: #e4f9f7;
}
.scan{
diff --git a/pages/user/userEdit.vue b/pages/user/userEdit.vue
index 815f7e3..ff1bc18 100644
--- a/pages/user/userEdit.vue
+++ b/pages/user/userEdit.vue
@@ -370,7 +370,7 @@
width: 560rpx;
height: 76rpx;
line-height: 76rpx;
- background: #89965f;
+ background: #00a89b;
box-shadow: 0rpx 12rpx 64rpx 2rpx rgba(137,150,95,0.4);
border-radius: 10rpx;
opacity: 1;
diff --git a/pages/user/xslist.vue b/pages/user/xslist.vue
index 0f21cdd..6b660b3 100644
--- a/pages/user/xslist.vue
+++ b/pages/user/xslist.vue
@@ -410,14 +410,14 @@
height: 75rpx;
}
.cur .ptext{
- color: #89965f;
+ color: #00a89b;
font-size: 33rpx;
font-weight: 600;
}
.cur .pline{
width: 40%;
height: 9rpx;
- background: #89965f;
+ background: #00a89b;
border-radius: 6rpx;
opacity: 1;
margin-left: 30%;
@@ -473,6 +473,7 @@
color: #333;
padding: 10rpx 2rpx 15rpx;
text-align: center;
+ word-wrap: break-word;
}
}
}
diff --git a/static/image/bb.png b/static/image/bb.png
index f04ada2..8a776ed 100644
Binary files a/static/image/bb.png and b/static/image/bb.png differ
diff --git a/static/image/bz.png b/static/image/bz.png
index 17cad8f..ae9005e 100644
Binary files a/static/image/bz.png and b/static/image/bz.png differ
diff --git a/static/image/cart.png b/static/image/cart.png
index e737177..76c1a70 100644
Binary files a/static/image/cart.png and b/static/image/cart.png differ
diff --git a/static/image/cdfy.png b/static/image/cdfy.png
index f40ce1a..4dfb44c 100644
Binary files a/static/image/cdfy.png and b/static/image/cdfy.png differ
diff --git a/static/image/dfh.png b/static/image/dfh.png
index bc19f6b..b1e9e3e 100644
Binary files a/static/image/dfh.png and b/static/image/dfh.png differ
diff --git a/static/image/dfk.png b/static/image/dfk.png
index 9cb09c6..1aaa9a1 100644
Binary files a/static/image/dfk.png and b/static/image/dfk.png differ
diff --git a/static/image/down.png b/static/image/down.png
index 9f376f3..845c114 100644
Binary files a/static/image/down.png and b/static/image/down.png differ
diff --git a/static/image/dsh.png b/static/image/dsh.png
index 5fb89f9..68ac558 100644
Binary files a/static/image/dsh.png and b/static/image/dsh.png differ
diff --git a/static/image/dz.png b/static/image/dz.png
index a5b65aa..57359ba 100644
Binary files a/static/image/dz.png and b/static/image/dz.png differ
diff --git a/static/image/emputy.png b/static/image/emputy.png
index 904fc06..461afa5 100644
Binary files a/static/image/emputy.png and b/static/image/emputy.png differ
diff --git a/static/image/icon/cart-active.png b/static/image/icon/cart-active.png
index 1941506..5b112da 100644
Binary files a/static/image/icon/cart-active.png and b/static/image/icon/cart-active.png differ
diff --git a/static/image/icon/good-active.png b/static/image/icon/good-active.png
index d115395..30b0c75 100644
Binary files a/static/image/icon/good-active.png and b/static/image/icon/good-active.png differ
diff --git a/static/image/icon/home-active.png b/static/image/icon/home-active.png
index 4e8ed93..8b40d21 100644
Binary files a/static/image/icon/home-active.png and b/static/image/icon/home-active.png differ
diff --git a/static/image/icon/me-active.png b/static/image/icon/me-active.png
index b1524f5..dd20a25 100644
Binary files a/static/image/icon/me-active.png and b/static/image/icon/me-active.png differ
diff --git a/static/image/icon/message-active.png b/static/image/icon/message-active.png
index c8d067b..10bca07 100644
Binary files a/static/image/icon/message-active.png and b/static/image/icon/message-active.png differ
diff --git a/static/image/icon/sort-active.png b/static/image/icon/sort-active.png
index f99ff24..0325973 100644
Binary files a/static/image/icon/sort-active.png and b/static/image/icon/sort-active.png differ
diff --git a/static/image/jlfy.png b/static/image/jlfy.png
index 5e9a2df..5b41274 100644
Binary files a/static/image/jlfy.png and b/static/image/jlfy.png differ
diff --git a/static/image/kc.png b/static/image/kc.png
index f40ff2f..3c13a1f 100644
Binary files a/static/image/kc.png and b/static/image/kc.png differ
diff --git a/static/image/kfr.png b/static/image/kfr.png
index f82f060..f43b2dd 100644
Binary files a/static/image/kfr.png and b/static/image/kfr.png differ
diff --git a/static/image/kh.png b/static/image/kh.png
index c7ae111..f2c86fe 100644
Binary files a/static/image/kh.png and b/static/image/kh.png differ
diff --git a/static/image/logo.png b/static/image/logo.png
index c3e7b91..32a80dd 100644
Binary files a/static/image/logo.png and b/static/image/logo.png differ
diff --git a/static/image/mm.png b/static/image/mm.png
index 2fa1db2..6681a26 100644
Binary files a/static/image/mm.png and b/static/image/mm.png differ
diff --git a/static/image/no.png b/static/image/no.png
index c827cdd..541a08c 100644
Binary files a/static/image/no.png and b/static/image/no.png differ
diff --git a/static/image/noaddress.png b/static/image/noaddress.png
index 6bf37fc..21ad31d 100644
Binary files a/static/image/noaddress.png and b/static/image/noaddress.png differ
diff --git a/static/image/nocollect.png b/static/image/nocollect.png
index 21031e7..0ea7efa 100644
Binary files a/static/image/nocollect.png and b/static/image/nocollect.png differ
diff --git a/static/image/nodata.png b/static/image/nodata.png
index f9705ae..8fc658a 100644
Binary files a/static/image/nodata.png and b/static/image/nodata.png differ
diff --git a/static/image/noorder.png b/static/image/noorder.png
index c86e027..b84e9a9 100644
Binary files a/static/image/noorder.png and b/static/image/noorder.png differ
diff --git a/static/image/nopic.png b/static/image/nopic.png
index fdc436a..c420971 100644
Binary files a/static/image/nopic.png and b/static/image/nopic.png differ
diff --git a/static/image/pk.png b/static/image/pk.png
index 1fb34e4..587917d 100644
Binary files a/static/image/pk.png and b/static/image/pk.png differ
diff --git a/static/image/sc.png b/static/image/sc.png
index 8ef9d89..a842e3f 100644
Binary files a/static/image/sc.png and b/static/image/sc.png differ
diff --git a/static/image/sel.png b/static/image/sel.png
index 27eb93f..1824054 100644
Binary files a/static/image/sel.png and b/static/image/sel.png differ
diff --git a/static/image/shdz.png b/static/image/shdz.png
index 37b7ab6..8e3d4d7 100644
Binary files a/static/image/shdz.png and b/static/image/shdz.png differ
diff --git a/static/image/sj.png b/static/image/sj.png
index 699cf28..9943e2d 100644
Binary files a/static/image/sj.png and b/static/image/sj.png differ
diff --git a/static/image/sz.png b/static/image/sz.png
index ef2e494..068830b 100644
Binary files a/static/image/sz.png and b/static/image/sz.png differ
diff --git a/static/image/tc.png b/static/image/tc.png
index 744de39..46fe8b3 100644
Binary files a/static/image/tc.png and b/static/image/tc.png differ
diff --git a/static/image/th.png b/static/image/th.png
deleted file mode 100644
index 2e1e6ad..0000000
Binary files a/static/image/th.png and /dev/null differ
diff --git a/static/image/thh.png b/static/image/thh.png
index b7b8ec6..90f175b 100644
Binary files a/static/image/thh.png and b/static/image/thh.png differ
diff --git a/static/image/tj.png b/static/image/tj.png
index 045bfea..55216ae 100644
Binary files a/static/image/tj.png and b/static/image/tj.png differ
diff --git a/static/image/tz.png b/static/image/tz.png
index b674ca3..4369d59 100644
Binary files a/static/image/tz.png and b/static/image/tz.png differ
diff --git a/static/image/up.png b/static/image/up.png
index 8ca810f..68f32e8 100644
Binary files a/static/image/up.png and b/static/image/up.png differ
diff --git a/static/image/wpj.png b/static/image/wpj.png
index 037b336..e80ce2b 100644
Binary files a/static/image/wpj.png and b/static/image/wpj.png differ
diff --git a/static/image/xs.png b/static/image/xs.png
index 0abb430..49242a0 100644
Binary files a/static/image/xs.png and b/static/image/xs.png differ
diff --git a/static/image/ywc.png b/static/image/ywc.png
index 6237fc6..4dc98ab 100644
Binary files a/static/image/ywc.png and b/static/image/ywc.png differ
diff --git a/static/image/yy.png b/static/image/yy.png
index 80c8388..cd7607b 100644
Binary files a/static/image/yy.png and b/static/image/yy.png differ
diff --git a/static/image/yyjl.png b/static/image/yyjl.png
new file mode 100644
index 0000000..9219b67
Binary files /dev/null and b/static/image/yyjl.png differ
diff --git a/static/image/zx.png b/static/image/zx.png
index 54c6678..4391af2 100644
Binary files a/static/image/zx.png and b/static/image/zx.png differ
diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
index 4c4bf54..d02c77c 100644
--- a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
+++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
@@ -158,7 +158,7 @@
diff --git a/uview-ui/components/u-index-list/u-index-list.vue b/uview-ui/components/u-index-list/u-index-list.vue
index 4f5fb7e..06fc622 100644
--- a/uview-ui/components/u-index-list/u-index-list.vue
+++ b/uview-ui/components/u-index-list/u-index-list.vue
@@ -38,7 +38,7 @@
* @property {Number String} z-index 锚点吸顶时的层级（默认965）
* @property {Boolean} sticky 是否开启锚点自动吸顶（默认true）
* @property {Number String} offset-top 锚点自动吸顶时与顶部的距离（默认0）
- * @property {String} highlight-color 锚点和右边索引字符高亮颜色（默认#89965f）
+ * @property {String} highlight-color 锚点和右边索引字符高亮颜色（默认#00a89b）
* @event {Function} select 选中右边索引字符时触发
* @example
*/
@@ -69,7 +69,7 @@
},
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
}
},
created() {
diff --git a/uview-ui/components/u-link/u-link.vue b/uview-ui/components/u-link/u-link.vue
index 2c7322b..8ffc434 100644
--- a/uview-ui/components/u-link/u-link.vue
+++ b/uview-ui/components/u-link/u-link.vue
@@ -28,7 +28,7 @@
// 文字颜色
color: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 字体大小，单位rpx
fontSize: {
diff --git a/uview-ui/components/u-message-input/u-message-input.vue b/uview-ui/components/u-message-input/u-message-input.vue
index 23bf742..748ecb5 100644
--- a/uview-ui/components/u-message-input/u-message-input.vue
+++ b/uview-ui/components/u-message-input/u-message-input.vue
@@ -46,7 +46,7 @@
* @property {Boolean} focus 是否自动获取焦点（默认false）
* @property {Boolean} bold 字体和输入横线是否加粗（默认true）
* @property {String Number} font-size 字体大小，单位rpx（默认60）
- * @property {String} active-color 当前激活输入框的样式（默认#89965f）
+ * @property {String} active-color 当前激活输入框的样式（默认#00a89b）
* @property {String} inactive-color 非激活输入框的样式，文字颜色同此值（默认#606266）
* @property {String | Number} width 输入框宽度，单位rpx，高等于宽（默认80）
* @property {Boolean} disabled-keyboard 禁止点击输入框唤起系统键盘（默认false）
@@ -100,7 +100,7 @@
// 激活样式
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 未激活的样式
inactiveColor: {
diff --git a/uview-ui/components/u-modal/u-modal.vue b/uview-ui/components/u-modal/u-modal.vue
index 396702a..065b463 100644
--- a/uview-ui/components/u-modal/u-modal.vue
+++ b/uview-ui/components/u-modal/u-modal.vue
@@ -50,7 +50,7 @@
* @property {String} confirm-text 确认按钮的文字内容（默认"确认"）
* @property {String} cancel-text 取消按钮的文字内容（默认"取消"）
* @property {String} cancel-color 取消按钮的颜色（默认"#606266"）
- * @property {String} confirm-color 确认按钮的文字内容（默认"#89965f"）
+ * @property {String} confirm-color 确认按钮的文字内容（默认"#00a89b"）
* @property {String | Number} border-radius 模态框圆角值，单位rpx（默认16）
* @property {Object} title-style 自定义标题样式，对象形式
* @property {Object} content-style 自定义内容样式，对象形式
@@ -117,7 +117,7 @@
// 确认按钮颜色
confirmColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 取消文字颜色
cancelColor: {
diff --git a/uview-ui/components/u-notice-bar/u-radio-group/u-radio-group.vue b/uview-ui/components/u-notice-bar/u-radio-group/u-radio-group.vue
index 66620a0..a514490 100644
--- a/uview-ui/components/u-notice-bar/u-radio-group/u-radio-group.vue
+++ b/uview-ui/components/u-notice-bar/u-radio-group/u-radio-group.vue
@@ -12,7 +12,7 @@
* @tutorial https://www.uviewui.com/components/radio.html
* @property {Boolean} disabled 是否禁用所有radio（默认false）
* @property {String Number} size 组件整体的大小，单位rpx（默认40）
- * @property {String} active-color 选中时的颜色，应用到所有子Radio组件（默认#89965f）
+ * @property {String} active-color 选中时的颜色，应用到所有子Radio组件（默认#00a89b）
* @property {String Number} icon-size 图标大小，单位rpx（默认20）
* @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
* @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
@@ -38,7 +38,7 @@
// 选中状态下的颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 组件的整体大小
size: {
diff --git a/uview-ui/components/u-picker/u-picker.vue b/uview-ui/components/u-picker/u-picker.vue
index 0d0329a..2883f4d 100644
--- a/uview-ui/components/u-picker/u-picker.vue
+++ b/uview-ui/components/u-picker/u-picker.vue
@@ -111,7 +111,7 @@ import areas from '../../libs/util/area.js';
* @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
* @property {Boolean} show-time-tag 时间模式时，是否显示后面的年月日中文提示
* @property {String} cancel-color 取消按钮的颜色（默认#606266）
- * @property {String} confirm-color 确认按钮的颜色（默认#89965f）
+ * @property {String} confirm-color 确认按钮的颜色（默认#00a89b）
* @property {String} default-time 默认选中的时间，mode=time时有效
* @property {String} confirm-text 确认按钮的文字
* @property {String} cancel-text 取消按钮的文字
@@ -189,7 +189,7 @@ export default {
// "确定"按钮的颜色
confirmColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 默认显示的时间，2025-07-02 || 2025-07-02 13:01:00 || 2025/07/02
defaultTime: {
diff --git a/uview-ui/components/u-radio-group/u-radio-group.vue b/uview-ui/components/u-radio-group/u-radio-group.vue
index 66620a0..a514490 100644
--- a/uview-ui/components/u-radio-group/u-radio-group.vue
+++ b/uview-ui/components/u-radio-group/u-radio-group.vue
@@ -12,7 +12,7 @@
* @tutorial https://www.uviewui.com/components/radio.html
* @property {Boolean} disabled 是否禁用所有radio（默认false）
* @property {String Number} size 组件整体的大小，单位rpx（默认40）
- * @property {String} active-color 选中时的颜色，应用到所有子Radio组件（默认#89965f）
+ * @property {String} active-color 选中时的颜色，应用到所有子Radio组件（默认#00a89b）
* @property {String Number} icon-size 图标大小，单位rpx（默认20）
* @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
* @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
@@ -38,7 +38,7 @@
// 选中状态下的颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 组件的整体大小
size: {
diff --git a/uview-ui/components/u-radio/u-radio.vue b/uview-ui/components/u-radio/u-radio.vue
index 80445d9..ab1c200 100644
--- a/uview-ui/components/u-radio/u-radio.vue
+++ b/uview-ui/components/u-radio/u-radio.vue
@@ -242,8 +242,8 @@
&--checked {
color: #fff;
- background-color: #89965f;
- border-color: #89965f;
+ background-color: #00a89b;
+ border-color: #00a89b;
}
&--disabled {
diff --git a/uview-ui/components/u-read-more/u-read-more.vue b/uview-ui/components/u-read-more/u-read-more.vue
index bad0eb6..0fbd0b7 100644
--- a/uview-ui/components/u-read-more/u-read-more.vue
+++ b/uview-ui/components/u-read-more/u-read-more.vue
@@ -33,7 +33,7 @@
* @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
* @property {String} text-indent 段落首行缩进的字符个数（默认2em）
* @property {String} open-text 展开时的提示文字（默认“收起”）
- * @property {String} color 提示文字的颜色（默认#89965f）
+ * @property {String} color 提示文字的颜色（默认#00a89b）
* @example
*/
export default {
@@ -62,7 +62,7 @@
// 提示的文字颜色
color: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 提示文字的大小
fontSize: {
diff --git a/uview-ui/components/u-select/u-select.vue b/uview-ui/components/u-select/u-select.vue
index 0edf854..30064b3 100644
--- a/uview-ui/components/u-select/u-select.vue
+++ b/uview-ui/components/u-select/u-select.vue
@@ -59,7 +59,7 @@
* @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
* @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
* @property {String} cancel-color 取消按钮的颜色（默认#606266）
- * @property {String} confirm-color 确认按钮的颜色(默认#89965f)
+ * @property {String} confirm-color 确认按钮的颜色(默认#00a89b)
* @property {String} confirm-text 确认按钮的文字
* @property {String} cancel-text 取消按钮的文字
* @property {String} default-value 提供的默认选中的下标，见官网说明
@@ -99,7 +99,7 @@ export default {
// "确定"按钮的颜色
confirmColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 弹出的z-index值
zIndex: {
diff --git a/uview-ui/components/u-slider/u-slider.vue b/uview-ui/components/u-slider/u-slider.vue
index f145b11..502c65e 100644
--- a/uview-ui/components/u-slider/u-slider.vue
+++ b/uview-ui/components/u-slider/u-slider.vue
@@ -37,7 +37,7 @@
* @property {Number | String} blockWidth 滑块宽度，高等于宽（30）
* @property {Number | String} height 滑块条高度，单位rpx（默认6）
* @property {String} inactiveColor 底部条背景颜色（默认#c0c4cc）
- * @property {String} activeColor 底部选择部分的背景颜色（默认#89965f）
+ * @property {String} activeColor 底部选择部分的背景颜色（默认#00a89b）
* @property {String} blockColor 滑块颜色（默认#ffffff）
* @property {Object} blockStyle 给滑块自定义样式，对象形式
* @property {Boolean} disabled 是否禁用滑块(默认为false)
@@ -87,7 +87,7 @@ export default {
// 进度条的激活部分颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 进度条的背景颜色
inactiveColor: {
diff --git a/uview-ui/components/u-steps/u-steps.vue b/uview-ui/components/u-steps/u-steps.vue
index ebf6c24..9e588ef 100644
--- a/uview-ui/components/u-steps/u-steps.vue
+++ b/uview-ui/components/u-steps/u-steps.vue
@@ -89,7 +89,7 @@ export default {
// 激活步骤的颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 未激活的颜色
unActiveColor: {
diff --git a/uview-ui/components/u-switch/u-switch.vue b/uview-ui/components/u-switch/u-switch.vue
index 41e61ba..5b3c168 100644
--- a/uview-ui/components/u-switch/u-switch.vue
+++ b/uview-ui/components/u-switch/u-switch.vue
@@ -18,7 +18,7 @@
* @property {Boolean} loading 是否处于加载中（默认false）
* @property {Boolean} disabled 是否禁用（默认false）
* @property {String Number} size 开关尺寸，单位rpx（默认50）
- * @property {String} active-color 打开时的背景色（默认#89965f）
+ * @property {String} active-color 打开时的背景色（默认#00a89b）
* @property {Boolean} inactive-color 关闭时的背景色（默认#ffffff）
* @property {Boolean | Number | String} active-value 打开选择器时通过change事件发出的值（默认true）
* @property {Boolean | Number | String} inactive-value 关闭选择器时通过change事件发出的值（默认false）
@@ -46,7 +46,7 @@
// 打开时的背景颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 关闭时的背景颜色
inactiveColor: {
diff --git a/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue b/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
index 4f6c531..c8a6a85 100644
--- a/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
+++ b/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
@@ -32,7 +32,7 @@
* @property {String Number} height 导航栏的高度，单位rpx（默认80）
* @property {String Number} font-size tab文字大小，单位rpx（默认30）
* @property {String Number} swiper-width tabs组件外部swiper的宽度，默认为屏幕宽度，单位rpx（默认750）
- * @property {String} active-color 滑块和激活tab文字的颜色（默认#89965f）
+ * @property {String} active-color 滑块和激活tab文字的颜色（默认#00a89b）
* @property {String} inactive-color tabs文字颜色（默认#303133）
* @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
* @property {String Number} bar-height 滑块高度，单位rpx（默认6）
@@ -91,7 +91,7 @@
// 选中项的主题颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 未选中项的颜色
inactiveColor: {
diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue
index e9e5ebb..7f754e8 100644
--- a/uview-ui/components/u-tabs/u-tabs.vue
+++ b/uview-ui/components/u-tabs/u-tabs.vue
@@ -29,7 +29,7 @@
* @property {String Number} height 导航栏的高度，单位rpx（默认80）
* @property {String Number} font-size tab文字大小，单位rpx（默认30）
* @property {String Number} duration 滑块移动一次所需的时间，单位秒（默认0.5）
- * @property {String} active-color 滑块和激活tab文字的颜色（默认#89965f）
+ * @property {String} active-color 滑块和激活tab文字的颜色（默认#00a89b）
* @property {String} inactive-color tabs文字颜色（默认#303133）
* @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
* @property {Object} active-item-style 活动tabs item的样式，对象形式
@@ -84,7 +84,7 @@
// 选中项的主题颜色
activeColor: {
type: String,
- default: '#89965f'
+ default: '#00a89b'
},
// 未选中项的颜色
inactiveColor: {
diff --git a/uview-ui/libs/function/color.js b/uview-ui/libs/function/color.js
index f86e432..ff55da7 100644
--- a/uview-ui/libs/function/color.js
+++ b/uview-ui/libs/function/color.js
@@ -1,7 +1,7 @@
// 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
// 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
let color = {
- primary: "#89965f",
+ primary: "#00a89b",
primaryDark: "#2b85e4",
primaryDisabled: "#a0cfff",
primaryLight: "#ecf5ff",
diff --git a/uview-ui/theme.scss b/uview-ui/theme.scss
index a383100..859c138 100644
--- a/uview-ui/theme.scss
+++ b/uview-ui/theme.scss
@@ -9,7 +9,7 @@ $u-light-color: #c0c4cc;
$u-border-color: #e4e7ed;
$u-bg-color: #f3f4f6;
-$u-type-primary: #89965f;
+$u-type-primary: #00a89b;
$u-type-primary-light: #ecf5ff;
$u-type-primary-disabled: #a0cfff;
$u-type-primary-dark: #2b85e4;