diff --git a/components/common/service-first-tab.vue b/components/common/service-first-tab.vue index 46c652c..cd5dbac 100644 --- a/components/common/service-first-tab.vue +++ b/components/common/service-first-tab.vue @@ -138,6 +138,8 @@ export default { font-size: 30rpx; color: var(--inactive-color); transition: color 0.2s; + white-space: nowrap; + } /* 激活色:使用CSS变量 --active-color */ diff --git a/pages.json b/pages.json index d9a5e2f..b63a79f 100644 --- a/pages.json +++ b/pages.json @@ -937,6 +937,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/shop/skill-detail", + "style": { + "navigationBarTitleText": "拍摄技巧" + } } diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue index 07c5c77..6c36e5c 100644 --- a/pages/shop/photoAlbum/addPhoto.vue +++ b/pages/shop/photoAlbum/addPhoto.vue @@ -1,740 +1,761 @@ - - - - - \ No newline at end of file diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue index b8ca90d..efaa0a2 100644 --- a/pages/shop/photoAlbum/photoManage.vue +++ b/pages/shop/photoAlbum/photoManage.vue @@ -1,434 +1,450 @@ - - - - - \ No newline at end of file diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue index dfc18d2..9d2699c 100644 --- a/pages/shop/photoAlbum/videoList.vue +++ b/pages/shop/photoAlbum/videoList.vue @@ -183,7 +183,7 @@ } else if (this.type == 2) { if (this.imgVideoList.length >= 10) { uni.showToast({ - title: '最多上传10张视频', + title: '最多上10个视频', icon: 'none', duration: 2000 }); diff --git a/pages/shop/skill-detail.vue b/pages/shop/skill-detail.vue new file mode 100644 index 0000000..e62fbbf --- /dev/null +++ b/pages/shop/skill-detail.vue @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue index fc3dd39..a313eb1 100644 --- a/pages/shop/staff/addStaff.vue +++ b/pages/shop/staff/addStaff.vue @@ -12,7 +12,7 @@ - + @@ -428,7 +429,6 @@ right: 0; bottom: 0; background-color: #ffffff; - .agreement-btn { width: 710rpx; height: 98rpx; diff --git a/pages/shop/staff/serviceList.vue b/pages/shop/staff/serviceList.vue index 2a4a067..fcc19c9 100644 --- a/pages/shop/staff/serviceList.vue +++ b/pages/shop/staff/serviceList.vue @@ -69,7 +69,7 @@ if (options.syrid) { this.sjservers(Number(options.syrid)); } else { - this.serviceList = this.$store.state.sjServiceList; + this.serviceList = JSON.parse(JSON.stringify(this.$store.state.sjServiceList)) } this.sjfirstclass(); }, @@ -80,8 +80,10 @@ }, methods: { changeType(item){ + if(this.isBack==0){ item.is_choice = !item.is_choice + console.log(this.$store.state.sjServiceList,'this.$store.state.sjServiceList'); } },