|
|
@@ -3,11 +3,15 @@
|
|
|
|
|
|
<view class="c_header" :class="myClass">
|
|
|
<view class="header_inside">
|
|
|
- <image :src="ghsInfo.avatar"></image>
|
|
|
+ <image :src="shopImg"></image>
|
|
|
<view class="shop_info">
|
|
|
- <view class="shop_title" @click="pageTo({url:'/pagesPurchase/level?id=1'})"> 国兰花尚 </view>
|
|
|
+ <view class="shop_title">{{shopName}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view class="nav">
|
|
|
+ <text class="not-selected" @click="pageTo({url:'/pages/item/item?account='+option.account,type:2})">鲜花散花</text>
|
|
|
+ <text class="selected" @click="pageTo({url:'/pages/home/category?account='+option.account,type:2})">花束花礼</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
|
|
|
<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
|
|
|
@@ -49,6 +53,7 @@ import wangCg from "@/components/wangCg"
|
|
|
import AppWrapperEmpty from '@/components/app-wrapper-empty'
|
|
|
import { getClass, getList } from '@/api/category'
|
|
|
import { list,share } from '@/mixins'
|
|
|
+import { getInfo } from "@/api/shop"
|
|
|
export default {
|
|
|
name: 'category',
|
|
|
components: {
|
|
|
@@ -69,7 +74,9 @@ export default {
|
|
|
currentTabIndex: 1,
|
|
|
//0没有登录 1有登录
|
|
|
loginStatus :0,
|
|
|
- myClass: 'fadeIn'
|
|
|
+ myClass: 'fadeIn',
|
|
|
+ shopName:'',
|
|
|
+ shopImg:''
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -77,7 +84,7 @@ export default {
|
|
|
},
|
|
|
onShareAppMessage(res) {
|
|
|
return {
|
|
|
- title: '花店',
|
|
|
+ title: '花束花礼',
|
|
|
desc: "",
|
|
|
path: "pages/home/category?account="+this.option.account,
|
|
|
}
|
|
|
@@ -109,6 +116,19 @@ export default {
|
|
|
},
|
|
|
init(){
|
|
|
this.sInit()
|
|
|
+
|
|
|
+ getInfo().then(res=>{
|
|
|
+ if(res.code == 1){
|
|
|
+ if(res.data.info && res.data.info.merchantName){
|
|
|
+ let sjName = res.data.info.merchantName
|
|
|
+ let shopName = res.data.info.shopName ? res.data.info.shopName : '首店'
|
|
|
+ let name = shopName == '首店' ? sjName : sjName+' '+shopName
|
|
|
+ this.shopName = name
|
|
|
+ this.shopImg = res.data.info.avatar
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
},
|
|
|
onReachBottoms () {
|
|
|
if (!this.list.finished) {
|
|
|
@@ -179,6 +199,33 @@ export default {
|
|
|
padding: 0 15upx;
|
|
|
box-sizing: border-box;
|
|
|
background: linear-gradient(to bottom,#3385FF, #fff);
|
|
|
+ .nav{
|
|
|
+ position:absolute;
|
|
|
+ top:155upx;
|
|
|
+ .selected{
|
|
|
+ width:auto;
|
|
|
+ height:60upx;
|
|
|
+ line-height:60upx;
|
|
|
+ display:inline-block;
|
|
|
+ font-weight:bold;
|
|
|
+ font-size:38upx;
|
|
|
+ border-bottom:1upx solid red;
|
|
|
+ margin-left:40upx;
|
|
|
+ text-align:left;
|
|
|
+ color:red;
|
|
|
+ }
|
|
|
+ .not-selected{
|
|
|
+ width:auto;
|
|
|
+ height:60upx;
|
|
|
+ line-height:60upx;
|
|
|
+ display:inline-block;
|
|
|
+ font-weight:bold;
|
|
|
+ font-size:38upx;
|
|
|
+ margin-left:20upx;
|
|
|
+ text-align:left;
|
|
|
+ color:#2F4F4F;
|
|
|
+ }
|
|
|
+ }
|
|
|
&>.header_inside{
|
|
|
position: relative;
|
|
|
height: 124upx;
|
|
|
@@ -189,8 +236,8 @@ export default {
|
|
|
padding: 35upx 30upx 30upx 30upx;
|
|
|
box-sizing: border-box;
|
|
|
&>image{
|
|
|
- height: 62upx;
|
|
|
- width: 62upx;
|
|
|
+ height: 60upx;
|
|
|
+ width: 60upx;
|
|
|
display: inline-block;
|
|
|
border-radius: 10upx;
|
|
|
background-color: #eee;
|
|
|
@@ -203,13 +250,13 @@ export default {
|
|
|
margin-left: 20upx;
|
|
|
&>.shop_title{
|
|
|
margin-top:0upx;
|
|
|
- font-size: 38upx;
|
|
|
+ font-size:40upx;
|
|
|
font-weight: 600;
|
|
|
color: #060606;
|
|
|
- width: 580upx;
|
|
|
- overflow: hidden;
|
|
|
- white-space: nowrap;
|
|
|
- .level{
|
|
|
+ width: 580upx;
|
|
|
+ overflow: hidden;
|
|
|
+ white-space: nowrap;
|
|
|
+ .level{
|
|
|
margin-left:20upx;
|
|
|
color:white;
|
|
|
background:#6da3f5;
|
|
|
@@ -217,8 +264,8 @@ export default {
|
|
|
border-radius:50upx;
|
|
|
font-size:22upx;
|
|
|
padding:6upx 10upx;
|
|
|
- position:absolute;
|
|
|
- }
|
|
|
+ position:absolute;
|
|
|
+ }
|
|
|
.level-common{
|
|
|
margin-left:30upx;
|
|
|
color:white;
|
|
|
@@ -262,7 +309,7 @@ export default {
|
|
|
animation-duration:.3s;
|
|
|
}
|
|
|
.fadeIn{
|
|
|
- height: 150upx;
|
|
|
+ height: 220upx;
|
|
|
overflow: hidden;
|
|
|
animation-name: fadeInFrames;
|
|
|
animation-duration:.3s;
|
|
|
@@ -316,7 +363,7 @@ page {
|
|
|
.right-box {
|
|
|
width: 100%;
|
|
|
overflow: auto;
|
|
|
- height: calc(100vh - 140upx);
|
|
|
+ height: calc(100vh - 220upx);
|
|
|
padding-left: 220upx;
|
|
|
box-sizing: border-box;
|
|
|
.page-view {
|
shish