零售

mallApp/src/pages.json

@@ -1,11 +1,11 @@
 {
     "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我的花店" } },
         { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
-        { "path": "pages/home/category", "style": { "navigationBarTitleText": "所有分类" } },
+        { "path": "pages/home/category", "style": { "navigationBarTitleText": "花束花礼" } },
         { "path": "pages/home/shop", "style": { "navigationBarTitleText": "门店" } },
         { "path": "pages/home/user", "style": { "navigationBarTitleText": "我的" } },
-        { "path": "pages/home/course", "style": { "navigationBarTitleText": "课程", "enablePullDownRefresh": true } },
-        { "path": "pages/item/item", "style": { "navigationBarTitleText": "鲜花", "enablePullDownRefresh": true } },
+        { "path": "pages/home/course", "style": { "navigationBarTitleText": "课程"}},
+        { "path": "pages/item/item", "style": { "navigationBarTitleText": "鲜花散花"} },
         { "path": "pages/item/detail", "style": { "navigationBarTitleText": "详情"} },
         { "path": "common/redirect", "style": { "navigationBarTitleText": "加载中..." } },
         { "path": "common/webview", "style": { "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } },

mallApp/src/pages/home/category.vue

@@ -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 {

mallApp/src/pages/home/recent.vue

@@ -14,7 +14,7 @@
         <view class="ghs_list_area flex-col justify-end">
 
             <view class="ghs_box flex-col justify-end" v-for="item in list" :key="item.id">
-              <view class="image-text_7 flex-row justify-between">
+              <view class="image-text_7 flex-row justify-between" @click.stop="bug(item)">
                 <view class="section_1 flex-col">
                   <image class="logo" :src="item.smallAvatar" />
                 </view>
@@ -29,8 +29,7 @@
                 <view class="tag_2" @click="showTip()"> <text>结账记录</text> </view>
                 <view class="tag_2" @click="getBuyList()"> <text>买花记录</text> </view>
               </view>
-              <view class="button_4 flex-col" @click="bugHs(item)"><text class="text_13">买花束</text></view>
-              <view class="button_5 flex-col" @click="bugFlower(item)"><text class="text_13">买鲜花</text></view>
+              <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">买花</text></view>
             </view>
 
         </view>
@@ -128,14 +127,11 @@ export default {
       this.pageTo({ url:'/pages/order/list'})
     },
     showTip(){
-      this.$msg('升级中...')
+      this.$msg('开发中')
     },
-    bugFlower(item){
+    bug(item){
       this.pageTo({ url:'/pages/item/item?account='+item.shopId})
     },
-    bugHs(item){
-      this.pageTo({ url:'/pages/home/category?account='+item.shopId})
-    },
     init () {
         this.getShopList()
     },
@@ -420,7 +416,7 @@ export default {
         background-size: 137upx 137upx;
         width: 130upx;
         position: absolute;
-        left: 595upx;
+        left: 530upx;
         top:90upx;
         border-radius:20upx;
         .text_13 {

mallApp/src/pages/item/item.vue

@@ -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="selected" @click="pageTo({url:'/pages/item/item?account='+option.account,type:2})">鲜花散花</text>
+				<text class="not-selected" @click="pageTo({url:'/pages/home/category?account='+option.account,type:2})">花束花礼</text>
+			</view>
 		</view>
 
 		<view class="input-wrap" >
@@ -137,6 +141,7 @@ import ModalModule from "@/components/item/plugin/modal";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 import productMins from "@/mixins/cgProduct";
 import { COMMODITY_TYPE } from "@/utils/declare";
+import { getInfo } from "@/api/shop";
 export default {
 	name: "item",
 	components: {
@@ -175,13 +180,6 @@ export default {
 			showSubmitModel: false,
 			hdShopAdminId:0,
 			fromGhsId:0,
-			ghsInfo: {
-				avatar:'',
-				name:' ',
-				mobile:'',
-				expendAmount:'0.00',
-				debtAmount:'0.00'
-			},
 			myClass: 'fadeIn',
 			shopId:0,
 			infoData:{},
@@ -191,9 +189,10 @@ export default {
 			ghsId:0,
 			newCustomGift:{xrFlAmount:0},
 			isNewCustom:false,
-			//0没有登录 1有登录
       		loginStatus :0,
-			cartItemShow:false
+			cartItemShow:false,
+			shopName:'',
+			shopImg:''
 		};
 	},
 	onPullDownRefresh() {
@@ -218,9 +217,8 @@ export default {
 		}
 	},
   	onShareAppMessage(res) {
-		console.log("pages/item/item?account="+this.option.account)
 		return {
-			title: '鲜花',
+			title: '鲜花散花',
 			desc: "",
 			path: "pages/item/item?account="+this.option.account,
 		}
@@ -324,6 +322,18 @@ export default {
 			this.init = false
 			const shopId = uni.getStorageSync('account')
 			this.option.shopId = shopId
+
+			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
+					}
+				}
+			})
 		},
 		scroll_detail(options){
 			// if(options.detail.scrollTop > 20) {
@@ -500,6 +510,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:20upx;
+			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:40upx;
+			text-align:left;
+			color:#2F4F4F;
+		}
+	}
     &>.header_inside{
       position: relative;
       height: 124upx;
@@ -510,8 +547,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;
@@ -524,7 +561,7 @@ export default {
         margin-left: 20upx;
         &>.shop_title{
           margin-top:0upx;
-          font-size: 38upx;
+          font-size:40upx;
           font-weight: 600;
           color: #060606;
 		  width: 580upx;
@@ -714,7 +751,7 @@ export default {
     animation-duration:.3s;
   }
   .fadeIn{
-    height: 150upx;
+    height: 220upx;
     overflow: hidden;
     animation-name: fadeInFrames;
     animation-duration:.3s;