shish пре 3 година
родитељ
комит
f400b8f471
3 измењених фајлова са 137 додато и 23 уклоњено
  1. 0 1
      hdApp/src/admin/part/index.vue
  2. 109 1
      mallApp/src/pages/home/category.vue
  3. 28 21
      mallApp/src/pages/item/item.vue

+ 0 - 1
hdApp/src/admin/part/index.vue

@@ -213,7 +213,6 @@ export default {
 		height: calc(100vh - 140upx);
 		flex: 1;
 		box-sizing: border-box;
-
 	}
 	.item_list_bx {
 		padding: 40upx 16upx;

+ 109 - 1
mallApp/src/pages/home/category.vue

@@ -1,5 +1,15 @@
 <template>
   <view class="app-main app-content">
+
+		<view class="c_header" :class="myClass">
+			<view class="header_inside">
+				<image :src="ghsInfo.avatar"></image>
+				<view class="shop_info">
+					<view class="shop_title" @click="pageTo({url:'/pagesPurchase/level?id=1'})"> 国兰花尚 </view>
+				</view>
+			</view>
+		</view>
+
     <scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
       <view v-for="(item,index) in tabbar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']" :data-current="index" @tap.stop="swichNav($event ,item)" >
         <text>{{item.categoryName}}</text>
@@ -58,7 +68,8 @@ export default {
       },
       currentTabIndex: 1,
 			//0没有登录 1有登录
-      loginStatus :0
+      loginStatus :0,
+      myClass: 'fadeIn'
     }
   },
 	computed: {
@@ -162,6 +173,101 @@ export default {
 <style lang="scss" scoped>
 .app-content {
   background-color: #fff;
+
+.c_header{
+    width: 100vw;
+    padding: 0 15upx;
+    box-sizing: border-box;
+    background: linear-gradient(to bottom,#3385FF, #fff);
+    &>.header_inside{
+      position: relative;
+      height: 124upx;
+      margin-top: 15upx;
+      background: #fff;
+      box-shadow: 0upx 1px 21px 0upx rgba(161, 166, 173, 0.4);
+      border-radius: 20upx;
+      padding: 35upx 30upx 30upx 30upx;
+      box-sizing: border-box;
+      &>image{
+        height: 62upx;
+        width: 62upx;
+        display: inline-block;
+        border-radius: 10upx;
+        background-color: #eee;
+        vertical-align: top;
+      }
+      &>.shop_info{
+        vertical-align: top;
+        display: inline-block;
+        height: 100%;
+        margin-left: 20upx;
+        &>.shop_title{
+          margin-top:0upx;
+          font-size: 38upx;
+          font-weight: 600;
+          color: #060606;
+		  width: 580upx;
+		  overflow: hidden;
+		  white-space: nowrap;
+		  .level{
+            margin-left:20upx;
+            color:white;
+            background:#6da3f5;
+            border:1px solid #6da3f5;
+            border-radius:50upx;
+            font-size:22upx;
+            padding:6upx 10upx;
+			position:absolute;
+		  }
+		  .level-common{
+            margin-left:30upx;
+            color:white;
+            background:#76a9f5;
+            border:1px solid #76a9f5;
+            border-radius:50upx;
+            font-size:20upx;
+            padding:5upx 10upx;
+			position:absolute;
+		  }
+        }
+        &>.shop_intro{
+          margin-top: 15upx;
+          font-size: 26upx;
+          font-weight: 400;
+          color: #666666;
+        }
+      }
+      .hbInfo{
+        font-size:20upx;
+		position: absolute;
+        right:15upx;
+		top: 120upx;
+		color: #3385FF;
+      }
+	  .hbImg{
+		width:120upx;
+		height:120upx;
+		position: absolute;
+        right:0;
+		top: 10upx;
+		background: white;
+	  }
+    }
+  }
+
+  .fadeOut{
+    height: 0;
+    overflow: hidden;
+    animation-name: fadeOutFrames;
+    animation-duration:.3s;
+  }
+  .fadeIn{
+    height: 150upx;
+    overflow: hidden;
+    animation-name: fadeInFrames;
+    animation-duration:.3s;
+  }
+
 }
 
 page {
@@ -209,6 +315,8 @@ page {
 }
 .right-box {
   width: 100%;
+  overflow: auto;
+  height: calc(100vh - 140upx);
   padding-left: 220upx;
   box-sizing: border-box;
   .page-view {

+ 28 - 21
mallApp/src/pages/item/item.vue

@@ -1,6 +1,15 @@
 <template>
 	<view class="billing_box_bg">
 
+		<view class="c_header" :class="myClass">
+			<view class="header_inside">
+				<image :src="ghsInfo.avatar"></image>
+				<view class="shop_info">
+					<view class="shop_title" @click="pageTo({url:'/pagesPurchase/level?id=1'})"> 国兰花尚 </view>
+				</view>
+			</view>
+		</view>
+
 		<view class="input-wrap" >
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="输入拼音首字母也可以搜索" @input="searchFn" />
@@ -317,17 +326,17 @@ export default {
 			this.option.shopId = shopId
 		},
 		scroll_detail(options){
-			if(options.detail.scrollTop > 20) {
-				this.myClass = 'fadeOut'
-			}
+			// if(options.detail.scrollTop > 20) {
+			// 	this.myClass = 'fadeOut'
+			// }
 			if(!uni.getStorageSync("resolve")){
 				this.get_node_details(options);
 			};
 		},
 		rightScroll(e) {
-			if(e.detail.scrollTop > 20) {
-				this.myClass = 'fadeOut'
-			}
+			// if(e.detail.scrollTop > 20) {
+			// 	this.myClass = 'fadeOut'
+			// }
 		},
 		addCurrent(info){
 			if(info.$orig){
@@ -487,23 +496,22 @@ export default {
 	display: flex;
 	flex-direction: column;
   .c_header{
-    // height: 240upx;
     width: 100vw;
     padding: 0 15upx;
     box-sizing: border-box;
     background: linear-gradient(to bottom,#3385FF, #fff);
     &>.header_inside{
       position: relative;
-      height: 190upx;
-      margin-top: 30upx;
+      height: 124upx;
+      margin-top: 15upx;
       background: #fff;
-      box-shadow: 0upx 1upx 21upx 0upx rgba(161, 166, 173, 0.4);
+      box-shadow: 0upx 1px 21px 0upx rgba(161, 166, 173, 0.4);
       border-radius: 20upx;
-      padding: 30upx;
+      padding: 35upx 30upx 30upx 30upx;
       box-sizing: border-box;
       &>image{
-        height: 130upx;
-        width: 130upx;
+        height: 62upx;
+        width: 62upx;
         display: inline-block;
         border-radius: 10upx;
         background-color: #eee;
@@ -513,21 +521,20 @@ export default {
         vertical-align: top;
         display: inline-block;
         height: 100%;
-        margin-left: 30upx;
+        margin-left: 20upx;
         &>.shop_title{
-          margin-top: 14upx;
-          font-size: 36upx;
+          margin-top:0upx;
+          font-size: 38upx;
           font-weight: 600;
           color: #060606;
-		  width: 430upx;
+		  width: 580upx;
 		  overflow: hidden;
 		  white-space: nowrap;
-		  text-overflow: ellipsis;
 		  .level{
             margin-left:20upx;
             color:white;
             background:#6da3f5;
-            border:1upx solid #6da3f5;
+            border:1px solid #6da3f5;
             border-radius:50upx;
             font-size:22upx;
             padding:6upx 10upx;
@@ -537,7 +544,7 @@ export default {
             margin-left:30upx;
             color:white;
             background:#76a9f5;
-            border:1upx solid #76a9f5;
+            border:1px solid #76a9f5;
             border-radius:50upx;
             font-size:20upx;
             padding:5upx 10upx;
@@ -707,7 +714,7 @@ export default {
     animation-duration:.3s;
   }
   .fadeIn{
-    height: 240upx;
+    height: 150upx;
     overflow: hidden;
     animation-name: fadeInFrames;
     animation-duration:.3s;