Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages.json

@@ -166,7 +166,12 @@
             "root": "pages/share-team",
             "pages": [{
                 "path": "share-team"
-            }]
+            },{
+				"path" : "share-detail",
+				"style": {
+				    "navigationStyle": "custom"
+				}
+			}]
         },
         {
             "root": "pages/share-order",

pages/index/index.vue

@@ -129,6 +129,7 @@ export default {
       showBack: false,
 	  showAuth:false,
 	  U:{},
+	  shopData:{},
     };
   },
   components: {
@@ -273,6 +274,7 @@ export default {
 	
     // #endif
     this.init();
+	this.getSmallShopById()
     let set = uni.getStorageSync("basedata")
       ? uni.getStorageSync("basedata").mall.setting
       : {};
@@ -334,13 +336,24 @@ export default {
 			  ? uni.getStorageSync("mall_UserInfo").UserSmallShopId
 			  : 0;
 		}
-    return {
-      title: this.setting.share_title
-        ? this.setting.share_title
-        : uni.getStorageSync("basedata").mall.name,
-      path: "/pages/index/index?user_id=" + uid+"&SmallShopId=" + SmallShopId,
-      imageUrl: this.setting.share_pic ? this.setting.share_pic : "",
-    };
+		if(SmallShopId!=0){
+			return{
+				title: this.shopData.Name
+				  ? this.shopData.Name
+				  : uni.getStorageSync("basedata").mall.name,
+				path: "/pages/index/index?user_id=" + uid+"&SmallShopId=" + SmallShopId,
+				imageUrl: '',
+			}
+		}else{
+			return {
+			  title: this.setting.share_title
+			    ? this.setting.share_title
+			    : uni.getStorageSync("basedata").mall.name,
+			  path: "/pages/index/index?user_id=" + uid+"&SmallShopId=" + SmallShopId,
+			  imageUrl: this.setting.share_pic ? this.setting.share_pic : "",
+			};
+		}
+  
   },
   // #endif
   onShow() {
@@ -523,6 +536,25 @@ export default {
         (error) => {}
       );
     },
+	getSmallShopById(){
+		let Id = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").SmallShopId: 0;
+		if(Id==0){
+			Id = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserSmallShopId: 0;
+		}
+		this.request2(
+			{
+				url: '/api/AppletUser/GetSmallShopById',
+				data: {
+					Id: Id
+				}
+			},
+			res => {
+				if (res.resultCode == 1) {
+					this.shopData = res.data
+				}
+			}
+		);
+	},
     close() {
       this.add_show = 2;
       uni.setStorageSync("add_top_app", { add_top_app_show: 2 });

pages/order/order-detail.vue

@@ -415,10 +415,15 @@ export default {
       showModal: false,
 	  delivery_time:14,//时间
 	  uid:0,
+	  NewUserId:0, //zk新增
     };
   },
   onLoad(option) {
     this.id = option.id || 63702;
+	//zk新增
+	if(option.NewUserId){
+		this.NewUserId = option.NewUserId;
+	}
     this.mc = this.$uiConfig.mainColor;
     this.secondary = this.$uiConfig.secondary;
     this.headStyle.background = `linear-gradient(to right, ${this.mc},80%, ${this.secondary})`;
@@ -429,7 +434,7 @@ export default {
     let p = getCurrentPages();
 	let u = uni.getStorageSync("mall_UserInfo");
 	this.uid = u.UserId ? u.UserId : 0;
-
+	
     if (p.length > 1) {
       this.prevPage = p[p.length - 2].route;
 	  
@@ -535,7 +540,10 @@ export default {
       this.request2(
        {
        	url: '/api/AppletOrder/GetAppletMyOrderInfo',
-       	data: {OrderId:this.id}
+       	data: {
+			OrderId:this.id,
+			NewUserId:this.NewUserId
+		}
        },
         (res) => {
           this.orders = res.data;

pages/share-team/share-team.vue

@@ -2,13 +2,28 @@
 	<view class="cteamStyle" :style="{'height':contentHeight}">
 		<view style="width: 100%;height: 100%;">
 			<u-tabs :list="list" name="GradeName" :is-scroll="false" :current="current" @change="change" :active-color='mainColor' ></u-tabs>
+			<view style="width:100%;background:#fff;padding:20px 20px 0 20px;">
+				<u-search :show-action="true" v-model="msg2.Name" placeholder="请输入用户昵称" action-text="搜索"  @custom="init2(1)"
+			    @search="init2(1)" radius="40"></u-search>
+				<view class="cteam_Search">
+					<view class="ctem_item" @click="getSort(0,0)" :style="{ color: msg2.SortNum == 0 || msg2.SortNum == 1 ? mainColor : '#222'}">
+						<text>时间</text>
+						<u-icon v-if="msg2.SortNum==0||msg2.SortNum==1" :name="msg2.SortNum == 0 ? 'descending' : 'ascending'" size="36" :color="msg2.SortNum == 0 || msg2.SortNum == 1 ? mainColor : '#222'"></u-icon>
+					</view>
+					<view @click="getSort(2,1)" class="ctem_item" :style="{ color: msg2.SortNum == 2 || msg2.SortNum == 3 ? mainColor : '#222'}">
+						<text>客户人数</text>
+						<u-icon v-if="msg2.SortNum==2||msg2.SortNum==3" :name="msg2.SortNum == 2 ? 'descending' : 'ascending'" size="36" :color="msg2.SortNum == 2 || msg2.SortNum == 3 ? mainColor : '#222'"></u-icon>
+					</view>
+				</view>
+			</view>
 			<u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty>
 			<template v-if="g.length > 0">
 				<view  
 				  style="
-						height: calc(100vh - 50px);
+						height: calc(100vh - 160px);
 						width: calc(100vw);
 						overflow: hidden;
+						margin-top:10px;
 						
 				  ">
 					<scroll-view
@@ -18,18 +33,18 @@
 						@scrolltolower="lower"
 						:style="{ height: '100%' }">
 						<view style="display: flex;flex-direction: column;align-items: center;">
-							<view v-for="(item, index) in g" :key="index" class="listbox">
+							<view v-for="(item, index) in g" :key="index" class="listbox" @click="goUrl(item.UserId)">
 								<view class="box_top">
-									
 									<u-avatar :src="item.Photo"  size="64"></u-avatar>
 									<view class="box_r">
-										<view style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
+										<view style="width: 100%;display: flex;flex-direction: row;align-items: center;
+										margin-bottom:3px;justify-content: space-between;">
 											<view style="width: 190px;">
 												<Text class='l_name'>{{item.UserName}}</Text>
 											</view>
 											<Text style='font-size: 12px;'>推广{{item.GeneralizeNum}}人</Text>
 										</view>
-										<Text style='font-size: 10px;color: #999999;'>{{item.CreateDate}}</Text>
+										<Text style='font-size: 10px;color: #999999;font-size:12px;'>{{item.CreateDate}}</Text>
 									</view>
 								</view>
 								<view class="box_b">
@@ -81,7 +96,8 @@
 					pageIndex: 1,
 					pageSize:10,
 					FXGradeId:0,
-					
+					Name:'', //昵称
+					SortNum:0 // 0时间降序 1时间升序 2人数倒序 3人数升序
 				},
 				page_count:1,
 				status: "loadmore",
@@ -149,8 +165,28 @@
 				  }
 				);
 			},
-			init2(){
-				
+			//排序
+			getSort(sort,t){
+				if (t == 0) {
+					if (this.msg2.SortNum == 0) {
+						this.msg2.SortNum = 1; //升序
+					} else {
+						this.msg2.SortNum = 0; //降序
+					}
+				}
+				if (t == 1) {
+					if (this.msg2.SortNum == 2) {
+						this.msg2.SortNum = 3; //升序
+					} else {
+						this.msg2.SortNum = 2; //降序
+					}
+				}
+				this.init2(1);
+			},
+			init2(num){
+				if(num==1){
+					this.g=[];
+				}
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -158,8 +194,7 @@
 					{
 						url: '/api/AppletUser/GetUserMyTeamPageListForFX',
 						data: this.msg2
-					},
-							
+					},	
 				  (res) => {
 					 uni.hideLoading();
 					 this.g = this.g.concat(res.data.pageData);
@@ -167,7 +202,6 @@
 					 if (this.page_count == 1) {
 					   this.status = "nomore";
 					 }
-					
 				  }
 				);
 			},
@@ -219,16 +253,21 @@
 					}
 				}else{
 					if (this.msg.pageIndex < this.page_count) {
-									this.msg.pageIndex++;
-									this.status = "loading";
-									this.init();
+							this.msg.pageIndex++;
+							this.status = "loading";
+							this.init();
 					} else {
-									this.status = "nomore";
+							this.status = "nomore";
 					}
 				}
-			 
 			},
-			
+			//跳转详情
+			goUrl(UserId){
+				console.log('点击');
+				uni.navigateTo({ 
+					url: '/pages/share-team/share-detail?UserId='+UserId
+				});
+			}
 		}
 	}
 </script>
@@ -258,11 +297,11 @@
 		width: 100%;
 		background: #fff;
 		padding: 0 15px;
-		margin-top: 15px;
+		/* margin-top: 15px; */
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		
+		margin-bottom:10px;
 	}
 	.cteamStyle .box_top{
 		width:100% ;
@@ -275,18 +314,19 @@
 		
 	}
 	.cteamStyle .box_r{
-		width: calc(100vw - 30px - 32px - 20px);
+		width: calc(100vw - 25px - 32px - 20px);
 		height: 32px;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
 	}
-	.box_r .l_name{
+	.cteamStyle .box_r .l_name{
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
 		-webkit-line-clamp: 1;
 		-webkit-box-orient: vertical;
+		font-size:13px;
 	}
 	.cteamStyle .box_b{
 		width: 100%;
@@ -300,4 +340,16 @@
 		border-radius: 4px;
 		margin: 10px 0;
 	}
+	.cteamStyle .cteam_Search{
+		display: flex;
+		margin-top:10px;
+	}
+	.cteamStyle .ctem_item{
+		height: 40px;
+		line-height: 40px;
+		flex: 1;
+		text-align: center;
+		display: flex; 
+		justify-content: center;
+	}
 </style>