diff --git a/api/modules/technician.js b/api/modules/technician.js
index 97c2185..b44ced5 100644
--- a/api/modules/technician.js
+++ b/api/modules/technician.js
@@ -54,4 +54,8 @@ export default {
capCashList(param) {
return req.get("/massage/app/IndexCoach/capCashList", param)
},
+ //商家信息
+ getShopInfo(param){
+ return req.post("/massage/app/Index/companyInfo", param)
+ }
}
diff --git a/manifest.json b/manifest.json
index ecf96d7..d51593d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
"appid" : "__UNI__3303922",
// "appid" : "__UNI__AE4A250",
"description" : "希希到家",
- "versionName" : "1.0.3",
- "versionCode" : 103,
+ "versionName" : "1.0.8",
+ "versionCode" : 108,
"transformPx" : false,
"uniStatistics" : {
"enable" : false //全局关闭
@@ -208,7 +208,8 @@
"com.apple.developer.associated-domains" : [ "applinks:testapps.cncnconnect.com" ]
}
},
- "dSYMs" : false
+ "dSYMs" : false,
+ "idfa" : false
},
"splashscreen" : {
"useOriginalMsgbox" : true
diff --git a/pages/login.vue b/pages/login.vue
index 1d54639..b046cc5 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -120,6 +120,7 @@
}
let data = await this.$api.base.getConfig()
+ console.log(data,"fff")
this.base_info = data
if (!data.primaryColor) {
data.primaryColor = '#A40035'
@@ -152,13 +153,28 @@
let [providerErr, providerData] = await uni.getProvider({
service: 'oauth',
});
+ console.log("111")
+ // let [loginErr, loginData] =await uni.getUserProfile({
+ // desc: '用于您的页面展示用户头像与昵称',
+ // lang: 'zh_CN',
+ // success: res => {
+ // console.log(res,"jjj");
+ // // this.isShowLogin = false;
+ // // this.userInfo = res.userInfo;
+ // },
+ // fail: err => {
+ // console.log(err.errMsg);
+ // }
+ // });
+
let [loginErr, loginData] = await uni.login({
provider: 'weixin'
});
+ console.log("222")
let [infoErr, infoData] = await uni.getUserInfo({
provider: 'weixin'
})
-
+ console.log("333",infoData)
let {
userInfo = {}
} = infoData
@@ -175,6 +191,7 @@
this.$util.hideAll()
}
} catch (e) {
+ console.log(e)
this.$util.showToast({
title: '请先安装微信或升级版本'
diff --git a/pages/mine.vue b/pages/mine.vue
index b086ef9..efb75e5 100644
--- a/pages/mine.vue
+++ b/pages/mine.vue
@@ -573,7 +573,7 @@
coach_status,
fx_status
} = this.mineInfo
-
+
let val = this.$util.deepCopy(this.mineInfo)
val.is_fx = !fx_check || (fx_check && fx_status == 2)
this.updateUserItem({
diff --git a/pages/service.vue b/pages/service.vue
index d4debb0..d610de8 100644
--- a/pages/service.vue
+++ b/pages/service.vue
@@ -214,6 +214,7 @@
activeIndex: state => state.service.activeIndex,
tabList: state => state.service.tabList,
param: state => state.service.param,
+ commonOptions: state => state.user.commonOptions,
list: state => state.service.list,
banner: state => state.service.banner,
primaryColor: state => state.config.configInfo.primaryColor,
@@ -237,6 +238,7 @@
this.$util.hideAll()
return
}
+ await this.getMineInfo()
await this.initIndex()
this.updateServiceItem({
key: 'pageActive',
@@ -270,9 +272,10 @@
}
},
methods: {
- ...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions', 'getServiceIndex', 'getServiceList']),
+ ...mapActions(['getConfigInfo', 'getUserInfo', 'getMineInfo','updateCommonOptions', 'getServiceIndex', 'getServiceList']),
...mapMutations(['updateServiceItem','updateUserItem']),
async toAtv() {
+ console.log("yyy")
if (!this.mineInfo.is_atv) {
this.$util.showToast({
title: `暂无活动`
@@ -286,6 +289,7 @@
url: `/user/pages/coupon/share`
})
},
+
async initIndex(refresh = false) {
// #ifdef H5
if (!refresh && this.$jweixin.isWechat()) {
diff --git a/pages/technician.vue b/pages/technician.vue
index 1f1b892..3d849b1 100644
--- a/pages/technician.vue
+++ b/pages/technician.vue
@@ -601,8 +601,9 @@
// this.getList(1)
},
goShop(item){
+ console.log(item,"hhhh")
this.$util.goUrl({
- url:'/user/pages/myGroup/myGroup?isGroup=false'
+ url:'/user/pages/myGroup/myGroup?isGroup=false&company_id='+item.company_id
})
},
toPreviewImage(index, key = 0) {
diff --git a/static/logopic.png b/static/logopic.png
new file mode 100644
index 0000000..9e5b9a0
Binary files /dev/null and b/static/logopic.png differ
diff --git a/technician/pages/apply.vue b/technician/pages/apply.vue
index 8587ab5..a681cfe 100644
--- a/technician/pages/apply.vue
+++ b/technician/pages/apply.vue
@@ -43,7 +43,7 @@
商家名称
-
-
+
{{item.company_name}}
@@ -279,6 +279,12 @@
methods: {
...mapActions(['getCarList']),
...mapMutations(['updateUserItem']),
+ goShop(item){
+ console.log(item,"hhhh")
+ this.$util.goUrl({
+ url:'/user/pages/myGroup/myGroup?isGroup=false&company_id='+item.company_id
+ })
+ },
async initIndex(refresh = false) {
// #ifdef H5
if (!refresh && this.$jweixin.isWechat()) {
diff --git a/user/pages/detail.vue b/user/pages/detail.vue
index 1b5f40d..9512eae 100644
--- a/user/pages/detail.vue
+++ b/user/pages/detail.vue
@@ -14,7 +14,20 @@
{{detail.total_sale}}人选择
-
+
+
+
+ 爽约包退
+
+
+
+ 实名认证
+
+
+
+ 资质证书
+
+
@@ -215,4 +228,20 @@
}
}
}
+ .tags{
+ background: rgba(23,193,97,0.3);
+ display: flex;
+ justify-content: space-around;
+ margin:0 20rpx;
+ padding:20rpx 0;
+ border-radius:20rpx;
+ .tagItem{
+ display: flex;
+ align-items: center;
+ }
+ text{
+ font-size:24rpx;
+ margin-left:10rpx;
+ }
+ }
diff --git a/user/pages/myGroup/myGroup.vue b/user/pages/myGroup/myGroup.vue
index dcfb19e..025c6f6 100644
--- a/user/pages/myGroup/myGroup.vue
+++ b/user/pages/myGroup/myGroup.vue
@@ -1,14 +1,20 @@
-
- 归属商家
- 查看团队排行
+
+
+ 归属商家
+ 查看团队排行
+
+
+ {{info.name}}
+
-
- 浦口区哈哈哈养生服务中心
-
-
- 营业执照
+
+ 营业执照
+
+
+
+
@@ -17,13 +23,27 @@
export default{
data(){
return{
- isGroup:false
+ isGroup:'false',
+ info:{}
}
},
methods:{
- async getCompanyMonth() {
- let res = await this.$api.mine.companyMonth()
- console.log(res,"mm")
+ previewImage(urls) {
+ // let res_urls = [];
+ // urls = this.$util.deepCopy(urls);
+
+ uni.previewImage({
+ urls: [urls],
+ })
+ },
+ // async getCompanyMonth() {
+ // let res = await this.$api.mine.companyMonth()
+ // console.log(res,"mm")
+ // },
+ async getInfo(id){
+ let res = await this.$api.technician.getShopInfo({compay_id:id})
+ console.log(res,"mmyyyyy")
+ this.info = res
},
goGroupList(){
this.$util.goUrl({
@@ -32,8 +52,21 @@ export default{
}
},
onLoad(option) {
+
+ if(option.company_id){
+ this.getInfo(option.company_id)
+ }
this.isGroup = option.isGroup
- this.getCompanyMonth()
+ if(this.isGroup=='true'){
+ uni.setNavigationBarTitle({
+ title: '我的团队'
+ })
+ }else{
+ uni.setNavigationBarTitle({
+ title: '商家信息'
+ })
+ }
+ // this.getCompanyMonth()
}
}
@@ -42,16 +75,11 @@ export default{
.groupContent{
margin: 0 24upx;
.group{
- padding-top:40upx;
+ // padding-top:40upx;
display: flex;
align-items: center;
justify-content: space-between;
- .guishu{
- font-size: 30rpx;
- font-family: Alibaba PuHuiTi;
- font-weight: 400;
- color: #333333;
- }
+
.order{
font-size: 30rpx;
font-family: Alibaba PuHuiTi;
@@ -59,12 +87,25 @@ export default{
color: #08BF77;
}
}
+ .guishu{
+ font-size: 40rpx;
+ font-family: Alibaba PuHuiTi;
+ font-weight: 600;
+ color: #333333;
+ }
.shop{
font-size: 30rpx;
font-family: Alibaba PuHuiTi;
font-weight: 400;
color: #333333;
- margin-top:44rpx;
+ margin-top:34rpx;
}
}
+.section{
+ background-color: #ffffff;
+ border-radius:20rpx;
+ margin:0 24rpx;
+ padding:24rpx;
+ margin-top:20rpx;
+}
\ No newline at end of file
diff --git a/user/pages/order.vue b/user/pages/order.vue
index 00f677b..376f599 100644
--- a/user/pages/order.vue
+++ b/user/pages/order.vue
@@ -84,15 +84,34 @@
技师简介
+
+
+
+ 爽约包退
+
+
+
+ 实名认证
+
+
+
+ 资质证书
+
+
基本信息
{{orderInfo.coach_info.coach_name}}:{{orderInfo.coach_info.text}}
-
- 爽约包退
+
资质证书
@@ -101,7 +120,7 @@
:src="item" v-for="(item,index) in orderInfo.coach_info.license" :key="index">
-
+
@@ -291,6 +310,11 @@
methods: {
...mapActions(['getConfigInfo', 'getMineInfo', 'getCarList']),
...mapMutations(['updateUserItem']),
+ goGroup(item){
+ this.$util.goUrl({
+ url:'/user/pages/myGroup/myGroup?isGroup=false&company_id='+item.company_id
+ })
+ },
async initIndex(refresh = false) {
// #ifdef H5
if (!refresh && this.$jweixin.isWechat()) {
@@ -617,4 +641,20 @@
height: 200upx;
}
}
+ .tags{
+ background: rgba(23,193,97,0.3);
+ display: flex;
+ justify-content: space-around;
+ // margin:0 20rpx;
+ padding:20rpx 0;
+ border-radius:20rpx;
+ .tagItem{
+ display: flex;
+ align-items: center;
+ }
+ text{
+ font-size:24rpx;
+ margin-left:10rpx;
+ }
+ }
diff --git a/user/pages/setting.vue b/user/pages/setting.vue
index 8bac2e6..0da9674 100644
--- a/user/pages/setting.vue
+++ b/user/pages/setting.vue
@@ -151,6 +151,7 @@
let url = `/pages/service`
// #ifdef APP-PLUS
url = `/pages/login`
+ // url = `/pages/service`
// #endif
this.$util.goUrl({
url,
diff --git a/utils/req.js b/utils/req.js
index 96af709..ce6d137 100644
--- a/utils/req.js
+++ b/utils/req.js
@@ -250,7 +250,7 @@ const appLogin = async function() {
//设置超时
fly.config.timeout = 15000;
-
+console.log("123456789")
//设置请求基地址
//给所有请求添加自定义header
@@ -310,7 +310,7 @@ fly.interceptors.response.use(
return fly.request(response.request);
},
async (err) => {
- console.log(err, "=======fly.interceptors.response.use err");
+ console.log(err, "=======fly.interceptors.response.use err",err);
let {
status = 0,
} = err