1

App.vue

@@ -2,9 +2,11 @@
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
+			this.$tm.theme.setBlack(true);
 		},
 		onShow: function() {
 			console.log('App Show')
+			this.$tm.theme.setBlack(true);
 		},
 		onHide: function() {
 			console.log('App Hide')

main.js

@@ -10,7 +10,6 @@ import store from './store'
 //把vuex定义成全局组件
 Vue.prototype.$store = store
 
-
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({

pages.json

@@ -172,6 +172,51 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/quchu/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/gouwuche/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/gengduo/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/shopsoso/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/weizhi/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
 		}
 	],
 	"tabBar": { 
@@ -186,5 +231,15 @@
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
 }

pages/chuanghome/index.vue

@@ -46,7 +46,7 @@
 					<view class="black shuru pa-30">
 						<tm-form>
 							<view class="text-size-m">请输入家庭名称</view>
-							<tm-input name="title" v-model="name" clear placeholder="相亲相爱一家人"></tm-input>
+							<tm-input name="title" v-model="reqData.familyname" clear placeholder="相亲相爱一家人"></tm-input>
 						</tm-form>
 					</view>
 					<tm-button :round="24" class="sao mb-40 mt-40" @click="chuangjianFun()" block>创建家庭</tm-button>
@@ -54,21 +54,21 @@
 				<view v-if="active==3">
 					<view>
 						<view class="fl zuo" style="width:70px;">
-							<view class="flex-center flex-col mt-30" style="position: relative;" v-for="(item,index) in renList">
-								<image block mode="widthFix" src="/static/img/53.png"></image>
-								<tm-badges icon="icon-times" @click="shanchu(item.timestamp)" v-if="index != 0"></tm-badges>
+							<view class="flex-center flex-col mt-30" style="position: relative;" v-for="(item,index) in reqData.role">
+								<image @click="qiehuanren(index)" block v-if="index==0" mode="widthFix" src="/static/img/53.png"></image>
+								<image @click="qiehuanren(index)" block v-else mode="widthFix" src="/static/img/61.png"></image>
+								<tm-badges icon="icon-times" @click="shanchu(item.timestamp)" v-if="(show==index && index !=0)"></tm-badges>
 							</view>
-							<view class="flex-center flex-col mt-30" style="position: relative;" v-if="renList.length<4">
+							<view class="flex-center flex-col mt-30" style="position: relative;" v-if="reqData.role.length<4">
 								<image block mode="widthFix" src="/static/img/54.png" @click="add()"></image>
 							</view>
-							
 						</view>
-						<view class="fr you black mt-30" style="width: calc(100% - 100px); ">
-							<tm-input  :required="true"  title="用户名" v-model="reqData.username" placeholder="你想叫自己什么" align="right"></tm-input>
-							<tm-input  :required="true"  title="身高（cm）" v-model="reqData.height" align="right"></tm-input>
-							<tm-input  :required="true"  title="体重（kg）" v-model="reqData.weight" align="right"></tm-input>
-							<tm-pickers class="tan" :default-value.sync="reqData.shencai" rang-key="title" :list="chelianglis">
-								<tm-input name="shencai" title="身材" placeholder="请选择车型" disabled :value="obTstr2(reqData.shencai)" right-icon="icon-angle-right"></tm-input>
+						<view class="fr you black mt-30" style="width: calc(100% - 100px);" v-for="(item1,index1) in reqData.role" v-if="show==index1">
+							<tm-input  :required="true"  title="用户名" v-model="item1.username" placeholder="你想叫自己什么" align="right"></tm-input>
+							<tm-input  :required="true"  title="身高（cm）" v-model="item1.height" align="right"></tm-input>
+							<tm-input  :required="true"  title="体重（kg）" v-model="item1.weight" align="right"></tm-input>
+							<tm-pickers class="tan" :default-value.sync="item1.body_arr" rang-key="title" :list="chelianglis">
+								<tm-input name="shencai" title="身材" placeholder="请选择车型" disabled :value="obTstr2(item1.body_arr)" right-icon="icon-angle-right"></tm-input>
 							</tm-pickers>
 						</view>
 					</view>
@@ -86,7 +86,7 @@
 						<text class="text-size-m">衣柜和手机关联成功</text>
 					</view>
 					<view class="px-24">
-						<tm-button theme="primary" :round="24" block class="mt-50 logincla">添加衣服</tm-button>
+						<tm-button theme="primary" @click="quyifu()" :round="24" block class="mt-50 logincla">添加衣服</tm-button>
 						<tm-button @click="quindex()" theme="primary" :round="24" block class="mt-30 quindex">进入首页</tm-button>
 					</view>
 				</view>
@@ -108,24 +108,26 @@ export default {
 				{title:"瘦子",id:51},
 				{title:"模特",id:61},
 			],
-			shenxing:'',
-			active:3,
-			name:'',
-			val_1:'',
+			active:2,
 			chelianglis:[
-				{title:"标准",id:21},
-				{title:"偏瘦",id:31},
-				{title:"偏胖",id:41},
-				{title:"梨形",id:51},
-				{title:"S型",id:61},
+				{title:"标准",id:1},
+				{title:"偏瘦",id:2},
+				{title:"偏胖",id:3},
+				{title:"梨形",id:4}
 			],
+			show:0,
 			reqData:{
-				username:'',
-				height:'',
-				weight:'',
-				shencai:[]
+				wardrode_no:'6943819164690',
+				familyname:'',
+				role:[{
+					username:'',
+					weight:'',
+					height:'',
+					body_type:'',
+					body_arr:[]
+				}]
+				
 			},
-			renList:[]
 		};
 	},
 	onLoad() {
@@ -133,37 +135,75 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		this.add()
 	},
 	methods: {
+		qiehuanren(index){
+			this.show=index;
+		},
+		quyifu(){
+			uni.navigateTo({
+				url: "/pages/luru/index",
+			})
+		},
 		quindex(){
 			uni.navigateTo({
 				url: "/pages/index/index",
 			})
 		},
 		tijiao(){
-			// console.log(this.renList)
-			// for(let i=0;i<this.renList.length;i++){
-			// 	if(this.renList[i].){}
-			// }
-			// this.active=4;
+			var that=this;
+			var arr=this.reqData.role;
+			for(let i=0;i<arr.length;i++){
+				if(arr[i].username==""){
+					that.$refs.toast.show({model:'warn',label:'请将数据填写完整'})
+					return;
+				}if(arr[i].weight==""){
+					that.$refs.toast.show({model:'warn',label:'请将数据填写完整'})
+					return;
+				}if(arr[i].height==""){
+					that.$refs.toast.show({model:'warn',label:'请将数据填写完整'})
+					return;
+				}
+				if(arr[i].body_arr.length !=0){
+					arr[i].body_type=arr[i].body_arr[0].id;
+				}
+			}
+			console.log(this.reqData)
+			myRequest({
+				url: "/api/Family/addFamilyMember",
+				method:'post',
+				data:that.reqData
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					uni.setStorageSync("family_id",res.data.data.family_id)
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					that.active=4;
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+			
 		},
 		add(){
 			var timestamp = Date.parse(new Date());
 			var obj={
 				username:'',
-				height:'',
 				weight:'',
-				shencai:[],
+				height:'',
+				body_type:'',
+				body_arr:[],
 				timestamp:timestamp
 			}
-			this.renList.push(obj)
+			this.reqData.role.push(obj);
+			this.show=this.reqData.role.length-1;
 		},
 		shanchu(timestamp){
-			var index = this.renList.findIndex((item) => {
+			var index = this.reqData.role.findIndex((item) => {
 			  return item.timestamp == timestamp;
 			});
-			this.renList.splice(index, 1);
+			this.reqData.role.splice(index, 1);
+			this.show=this.reqData.role.length-1;
 		},
 		obTstr2(o){
 			if(Array.isArray(o)){
@@ -179,6 +219,7 @@ export default {
 				success: function (res) {
 					console.log('条码类型：' + res.scanType);
 					console.log('条码内容：' + res.result);
+					that.reqData.wardrode_no=res.result;
 					that.active=2;
 				},
 				error : function(e) {
@@ -188,7 +229,7 @@ export default {
 		},
 		chuangjianFun(){
 			var that=this;
-			if(that.name==""){
+			if(that.reqData.familyname==""){
 				that.$refs.toast.show({model:'warn',label:'请输入家庭名称'})
 				return
 			}

pages/fankui/index.vue

@@ -30,7 +30,7 @@
 					</view>
 				</view>
 			</tm-sheet>
-			<tm-button :round="24" class="sao mb-40 mt-40" block>提交</tm-button>
+			<tm-button :round="24" class="sao mb-40 mt-40" block @click="tijiao">提交</tm-button>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -54,6 +54,32 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		tijiao(){
+			var that=this;
+			if( !this.checked1 && !this.checked2 && !this.checked3){
+				that.$refs.toast.show({model:'warn',label:'请选择问题类型'})
+				return
+			}else if(this.beizu==""){
+				that.$refs.toast.show({model:'warn',label:'请填写意见'})
+				return
+			}
+			that.type=this.checked1?1:this.checked2?2:this.checked3?3:'';
+			myRequest({
+				url: "/api/Opinion/addProblem",
+				method:'post',
+				data:{type:that.type,problem:that.beizu}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					setTimeout(function(){
+						uni.navigateBack();
+					},2000)
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+		},
 		aa(num){
 			if(num==1){
 				this.checked1=true;

pages/index/index.vue

@@ -12,7 +12,7 @@
 		<UserPage v-if="showpage==4"></UserPage>
 		<!-- 底部 -->
 		<view>
-			<tm-bottomnavigation @change="changepage" style="height:50px" :list="list_1"></tm-bottomnavigation>
+			<tm-bottomnavigation :auto-selected="false" :activeIndex="showpage" @change="changepage" style="height:50px" :list="list_1"></tm-bottomnavigation>
 		</view>
 	</view>
 </template>
@@ -45,11 +45,11 @@ export default {
 	},
 	onLoad(index) {
 		this.$tm.theme.setBlack(true);
-		// if(index.index==1){
-		// 	this.showpage=1;
-		// }else{
-		// 	this.showpage=0;
-		// }
+		if(index.index==1){
+			this.showpage=1;
+		}else{
+			this.showpage=0;
+		}
 		// console.log(index)
 		
 	},

pages/login/index.vue

@@ -69,6 +69,7 @@ export default {
 				console.log(res.data)
 				if (res.data.code == 200) {
 					uni.setStorageSync("token",res.data.data.token)
+					uni.setStorageSync("family_id",res.data.data.family_id)
 					that.$refs.toast.show({model:'success',label:res.data.msg})
 					setTimeout(function(){
 						uni.navigateTo({

pages/luru/index.vue

@@ -79,9 +79,8 @@ export default {
 				{title:"模特",id:61},
 			],
 			shenxing:'',
-			active:3,
+			active:1,
 			name:'',
-			val_1:'',
 			chelianglis:[
 				{title:"标准",id:21},
 				{title:"偏瘦",id:31},

pages/qiehuan/index.vue

@@ -3,7 +3,7 @@
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="用户新增/切换" :shadow="0" :showback="true"></tm-menubars>
 		<div class="zhuti">
-			<tm-sheet class="kuang">
+			<!-- <tm-sheet class="kuang">
 				<view class="mt-2 flex-between flex-center dingwei pt-20 pb-20">
 					<view class="touxiang">
 						<image class="ml-20" style="vertical-align: middle;" src="/static/img/53.png" mode="widthFix"></image>
@@ -14,16 +14,17 @@
 						<tm-checkbox class="you" v-model="checked1" label=""></tm-checkbox>
 					</view>
 				</view>
-			</tm-sheet>
-			<tm-sheet class="kuang" v-for="item in userList">
+			</tm-sheet> -->
+			<tm-sheet class="kuang" v-for="(item,index) in userList">
 				<view class="mt-2 flex-between flex-center dingwei pt-20 pb-20">
 					<view class="touxiang">
-						<image class="ml-20" style="vertical-align: middle;" src="/static/img/61.png" mode="widthFix"></image>
-						<text style="vertical-align: middle;" class="text-size-g text-white">{{item.name}}</text>
+						<image v-if="index==0" class="ml-20" style="vertical-align: middle;" src="/static/img/53.png" mode="widthFix"></image>
+						<image v-else class="ml-20" style="vertical-align: middle;" src="/static/img/61.png" mode="widthFix"></image>
+						<text style="vertical-align: middle;" class="text-size-g text-white">{{item.username}}</text>
 					</view>
-					<view >
-						<text class="text-size-g you" style="vertical-align: middle;">（家庭成员）</text>
-						<tm-checkbox class="you" label=""></tm-checkbox>
+					<view @click="qiehuanFun(item,index)">
+						<!-- <text class="text-size-g you" style="vertical-align: middle;">（家庭成员）</text> -->
+						<tm-checkbox class="you" v-model="item.checked" label=""></tm-checkbox>
 					</view>
 				</view>
 			</tm-sheet>
@@ -44,13 +45,8 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			checked1:true,
-			checked2:false,
-			userList:[
-				{name:'爸爸'},
-				{name:'妈妈'},
-				{name:'儿子'}
-			]
+			indexsoyin:0,
+			userList:[]
 		};
 	},
 	onLoad() {
@@ -58,8 +54,42 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		if(uni.getStorageSync("itemuser")){
+			
+			console.log(uni.getStorageSync("itemuser"))
+		}
+		this.getDate()
 	},
 	methods: {
+		qiehuanFun(item,index){
+			// uni.setStorageSync("itemuser",item)
+			// uni.navigateBack();
+		},
+		getDate(){
+			var that=this;
+			myRequest({
+				url: "/api/MemberInfo/getFamilyMember",
+				method:'post',
+				data:{family_id:uni.getStorageSync("family_id")}
+			}).then(res => {
+				if (res.data.code == 200) {
+					var data=res.data.data,panduan=0;
+					for(let i=0;i<data.length;i++){
+						if(data[i].checked!=0){
+							panduan=1
+						}
+						data[i].checked=data[i].checked==0?false:true;
+					}
+					if(panduan==0){
+						data[0].checked=true;
+					}
+					that.userList=res.data.data;
+					console.log(that.userList)
+				}else{
+					that.userList=[];
+				}
+			})
+		}
 	},
 }
 </script>

pages/shopsoso/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
-		<view class="C1b1b1b pb-40">
+		<view class="C1b1b1b pb-10">
 			<view class="sousuo">
 				<tm-pickersCity class="dingwei fl" btn-color="bg-gradient-blue-accent" @confirm="okCity" :default-value="addr">
 					<view>
@@ -15,18 +15,37 @@
 				</view>
 			</view>
 			<view style="clear: both;"></view>
-			<view class="fixed fulled" style="z-index: 30;">
-				<tm-dropDownMenu un-color="white" :list="list2"></tm-dropDownMenu>
-			</view>
+			<tm-dropDownMenu @change="change" :type="typeclick" un-color="white" :list="list2"></tm-dropDownMenu>
 		</view>
-		<!-- <div class="zhuti">
-			<tm-sheet class="kuang" style="padding-bottom: 70px !important;">
-				<view style="width: 94%;margin:0 auto;">
-					
+		<div class="zhuti">
+			<tm-sheet class="kuang" style="padding-bottom: 30px !important;">
+				<view style="width: 94%;margin:0 auto;" class="remen">
+					<view v-for="(item,index) in listdata"  class="round-5 contone black mt-20" :class="index%2==0?'fl':'fr'">
+						<image class="logo" :src="item.image" mode="widthFix"></image>
+						<view class="pa-15 text-size-s">
+							<view class="text-overflow-2">
+								<text class="text-size-lg">{{item.text}}</text>
+								<view class="text-gray mt-6">销量：{{item.xiaol}}</view>
+							</view>
+							<view class="mt-2 flex-between flex-center">
+								<view class="touxiang mt-30">
+									<text class="text-white text-size-m text-weight-b">{{item.jiage}}</text>
+								</view>
+								<view >
+									<image @click="jiarufuFun(item)" class="remenzan" src="/static/img/86.png" mode="widthFix"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view style="clear: both;"></view>
+					<view style="clear: both;" class="more ma-40 pt-40" @click="gengmore()">
+						<image src="/static/img/30.png" mode="widthFix"></image>
+						<text class="text-size-s">下拉加载更多~</text>
+					</view>
 				</view>
 			</tm-sheet>
-			<tm-button :round="24" class="sao mb-40 mt-40" block>提交</tm-button>
-		</div> -->
+			<view style="height:60px"></view>
+		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
 	</view>
@@ -41,14 +60,17 @@ export default {
 			addr:['江西省','南昌市','西湖区'],
 			value:'',
 			list2: [{
-					title: '排序',
+					title: '最近上新',
+					shang:true
 				}, {
 					title: '价格',
-				},
-				{
-					title: '品牌',
-				}
-			],
+					shang:false
+				},{
+					title: '销量',
+					shang:true
+				}],
+			typeclick:1,
+			listdata:[]
 		};
 	},
 	onLoad() {
@@ -56,11 +78,38 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		this.randouh()
 	},
 	methods: {
+		gengmore(){
+			this.randouh()
+		},
+		jiarufuFun(data){
+			uni.navigateTo({
+				url: "/pages/gouwuche/index",
+			})
+			// console.log(data)
+			// this.gouwuche.push(data)
+		},
+		randouh(){
+			let list2 = [],that=this;
+			for(let i=0;i<8;i++){
+				list2.push({
+					image:'../../static/img/90.png',
+					text:'帽子',
+					jiage:'¥ 359.00',
+					xiaol:'128'
+				})
+			}
+			this.listdata=this.listdata.concat(list2)
+			console.log(this.listdata)
+		},
 		goindex(){
 			uni.navigateBack();
 		},
+		change(e){
+			console.log(e)
+		},
 		sosoFun(){
 		}
 	},
@@ -89,4 +138,9 @@ export default {
 	.shuruk{width: 77%;}
 	.sousuo{width:94%;margin:0 auto;}
 	.quxiao{color: #707070;line-height: 47px;}
+	.contone{width: 48%;}
+	.logo{width: 100%;}
+	.remenzan{width: 18px !important;margin-top: 10px;}
+	.more{text-align: center;}
+	.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
 </style>

pages/shouye/index.vue

@@ -10,8 +10,11 @@
 				</template> -->
 			</tm-search>
 			<view class="dingwei">
-				<image style="vertical-align: middle;" src="/static/img/dingwei.png" mode="widthFix"></image>
-				<text style="vertical-align: middle;" class="text-size-g">北京Beijing</text>
+				<tm-quickCity  color="blue" :defaultValue.sync="defaultValue">
+					<image style="vertical-align: middle;" src="/static/img/dingwei.png" mode="widthFix"></image>
+					<text style="vertical-align: middle;" class="text-size-g">北京Beijing</text>
+				</tm-quickCity>
+				
 			</view>
 		</view>
 		<view class="zhuti mt-50">
@@ -162,6 +165,7 @@
 	export default {
 		data() {
 			return {
+				defaultValue:[],
 				soso:'',
 				aab:false,
 				shoucangsrc:true,
@@ -219,23 +223,15 @@
 		},
 		created() {
 			var that=this;
-			
-			setTimeout(function(){
-				console.log(1111)
-				// if(uni.getStorageSync("token")==""){
-				// 	uni.redirectTo({
-				// 		url:"/pages/login/index"
-				// 	})
-				// }
-				// that.$refs.a_2.play();
-				// that.$refs.a_3.play();
-				// that.$refs.a_1.play();
-				// that.$refs.a_5.play();
-			},1000)
-			
+			// setTimeout(function(){
+			// 	if(uni.getStorageSync("token")==""){
+			// 		uni.redirectTo({
+			// 			url:"/pages/login/index"
+			// 		})
+			// 	}
+			// },1000)
 			this.sys = uni.getSystemInfoSync();
 			this.randouh()
-			
 		},
 		methods: {
 			jinriFun(e){

pages/sousuo/index.vue

@@ -10,23 +10,24 @@
 				<view style="clear: both;"></view>
 				<view v-if="sosotype==1">
 					<text class="text-size-m fl mt-30">搜索记录</text>
-					<view class="fr mt-30 qingchu">
+					<view class="fr mt-30 qingchu" @click="qingkong">
 						<text class="text-size-s fl">清空记录</text>
 						<tm-badges :offset="[0,-5]" icon="icon-times"></tm-badges>
 					</view>
 				</view>
 				<view v-if="sosotype==2">
-					<tm-tabs align="left" class="qiehuan1" v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-					<tm-tabs align="left" class="qiehuan2" color="white"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs>
+					<tm-tabs align="left" @change="yiji" class="qiehuan1" v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+					<!-- <tm-tabs align="left" class="qiehuan2" color="white"  v-model="activeIndex1" :list="list1" range-key="title"></tm-tabs> -->
 				</view>
 				<view style="clear: both;"></view>
 			</view>
 		</view>
 		<!-- 列表 -->
-		<tm-grouplist class="liebiao mt-40" v-if="sosotype==1">
+		<tm-grouplist class="liebiao mt-40" v-if="sosotype==1 && libiaoList.length !=0">
 			<tm-listitem v-for="item in libiaoList" @click="tiaozhuan(item.type)" :title="item.title" left-icon="" show-left-icon :show-right-icon="false">
 			</tm-listitem>
 		</tm-grouplist>
+		<tm-empty v-if="sosotype==1 && libiaoList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
 		<!-- 衣橱 -->
 		<view class="zhuti">
 			<tm-sheet class="yichu"  v-if="sosotype==2" style="margin-bottom: 70px !important;">
@@ -49,11 +50,12 @@
 						</view>
 					</view>
 				</view>
-				<view style="clear: both;" class="more mt-40 pb-40 pt-40" @click="gengmore()">
+				<view style="clear: both;" class="more mt-40 pb-40 pt-40" @click="gengmore()" v-if="listdata.length !=0">
 					<image src="/static/img/30.png" mode="widthFix"></image>
 					<text class="text-size-s">下拉加载更多~</text>
 				</view>
 			</tm-sheet>
+			<tm-empty v-if="sosotype==2 && listdata.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
 		</view>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -65,15 +67,9 @@ export default {
 	data() {
 		return {
 			soso:'',
-			libiaoList:[
-			{title:'热门穿搭',type:'1'},
-			{title:'商务搭配',type:'2'},
-			{title:'朋克风',type:'3'},
-			{title:'日常出勤',type:'4'},
-			{title:'同学聚会',type:'5'},
-			],
+			libiaoList:[],
 			sosotype:1,
-			list:[ '全部','用户','商品'],
+			list:[ '全部','搭配','衣橱'],
 			activeIndex:0,
 			activeIndex1:0,
 			list1:[ '综合','高级感','黑色','灰色'],
@@ -87,9 +83,42 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
-		this.randouh()
+		// this.randouh()
+		this.getlishi()
 	},
 	methods: {
+		yiji(e){
+			this.activeIndex=e;
+			this.sosoFun()
+		},
+		getlishi(){
+			var that=this;
+			myRequest({
+				url: "/api/SearchHistory/searchList",
+				method:'get',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					
+				}else{
+					
+				}
+			})
+		},
+		qingkong(){
+			var that=this;
+			myRequest({
+				url: "/api/SearchHistory/deleteSearch",
+				method:'get',
+				data:{}
+			}).then(res => {
+				if (res.data.code == 200) {
+					
+				}else{
+					
+				}
+			})
+		},
 		gengmore(){
 			this.randouh()
 		},
@@ -98,6 +127,18 @@ export default {
 		},
 		sosoFun(){
 			console.log(this.soso)
+			var that=this;
+			myRequest({
+				url: "/api/Collocation/search",
+				method:'post',
+				data:{search:that.soso,type:that.activeIndex}
+			}).then(res => {
+				if (res.data.code == 200) {
+					that.listdata=res.data.data;
+				}else{
+					that.listdata=[];
+				}
+			})
 			this.sosotype=2
 		},
 		randouh(){

pages/user/index.vue

@@ -52,6 +52,7 @@
 		<tm-dialog v-model="show" content="确认退出系统？" @confirm="queren"></tm-dialog>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
+		<view style="width: 100%;height: 40px;"></view>
 	</view>
 </template>	
 <script>

pages/wardrobe/index.vue

@@ -2,16 +2,10 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
 		<view class="C1b1b1b">
-			<tm-search v-model="soso" color="white" confirm-text="">
-				<!-- <template #right>
-					<view class="xiangji">
-						<image src="/static/img/xiangji.png" mode="widthFix"></image>
-					</view>
-				</template> -->
-			</tm-search>
+			<tm-search @click="sosoFun" v-model="soso" color="white" confirm-text=""></tm-search>
 			<view class="dingwei">
 				<image class="touxiang" style="vertical-align: middle;" src="/static/img/41.png" mode="widthFix"></image>
-				<text style="vertical-align: middle;" class="text-size-m mr-20">“我”的衣橱</text>
+				<text style="vertical-align: middle;" class="text-size-m mr-20">{{itemuser.username}}的衣橱</text>
 				<image @click="qiehuanFun" style="vertical-align: middle;" src="/static/img/42.png" mode="widthFix"></image>
 				<text @click="qiehuanFun" style="vertical-align: middle;" class="text-size-m">切换</text>
 			</view>
@@ -59,7 +53,7 @@
 			</div>
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
-				<tm-tabs class="C1b1b1b qiehuan" color="white"  align="split"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
+				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
 				<view class="yiguicla black pa-6 ma-4 fl" v-for="item in quanbuList" @click="yifu()">
 					<image :src="item.src" mode="widthFix"></image>
 					<view class="text-align-center text-size-m mt-8">{{item.text}}</view>
@@ -74,13 +68,15 @@
 	</view>
 </template>	
 <script>
-	
+import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			itemuser:{},
 			soso:'',
 			activeIndex:0,
-			list:[ '全部','上衣','裤子','鞋子','配饰'],
+			list:[],
+			listlx:[],
 			quanbuList:[{
 				src:'/static/img/45.png',
 				text:'NEO CITY 涂鸦',
@@ -109,12 +105,56 @@ export default {
 		};
 	},
 	onLoad() {
-		
+		console.log("111")
+		if(uni.getStorageSync("itemuser")){
+			this.itemuser =uni.getStorageSync("itemuser") ;
+			console.log(this.itemuser)
+		}
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		
+		console.log("222")
+		this.getfenltext()
 	},
 	methods: {
+		sosoFun(){
+			uni.navigateTo({
+				url: "/pages/shopsoso/index",
+			})
+		},
+		fenleichange(e){
+			if(e==0){
+				// 全部
+				
+			}else{
+				e=e-1;
+				console.log(this.listlx[e].category_name)
+			}
+			
+		},
+		getfenltext(){
+			var that=this;
+			myRequest({
+				url: "/api/Category/list",
+				method:'post',
+				data:{}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					if(res.data.data.length != 0){
+						that.list=['全部'];
+						for(let i=0;i<res.data.data.length;i++){
+							that.list.push(res.data.data[i].category_name)
+						}
+						that.listlx=res.data.data;
+					}
+				}else{
+					that.list=[];
+					that.listlx=[];
+				}
+			})
+		},
 		yifu(){
 			uni.navigateTo({
 				url: "/pages/yifu/index",

pages/weizhi/index.vue

@@ -0,0 +1,44 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }"
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="城市" :shadow="0" :showback="true"></tm-menubars>
+		<div class="zhuti">
+			<template>
+				<view>
+					<tm-quickCity  color="blue" :defaultValue.sync="defaultValue">
+						<tm-button block theme="bg-gradient-blue-accent">显示快速城市选择</tm-button>
+					</tm-quickCity>
+				</view>
+			</template>
+		</div>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			defaultValue:[],
+		};
+	},
+	onLoad() {
+		
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+		
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	/deep/ .zhuti{padding: 10px 10px;}
+	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
+</style>

pages/xieyi/index.vue

@@ -3,8 +3,8 @@
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="true"></tm-menubars>
 		<view class="tou C1b1b1b">用户服务协议</view>
-		<view class="zhuti">
-			<view class="text-size-lg text-weight-b mb-24">
+		<view class="zhuti" v-html="putdata.val">
+			<!-- <view class="text-size-lg text-weight-b mb-24">
 				一、总则
 			</view>
 			<view class="text-size-s mb-24">
@@ -32,15 +32,16 @@
 			<view class="text-size-s mb-24">• 只有透露您的个人资料，才能提供您所要求的产品和服务；</view>
 			<view class="text-size-s mb-24">• 根据有关的法律法规要求；</view>
 			<view class="text-size-s mb-24">• 按照相关政府主管部门的要求；</view>
-			<view class="text-size-s mb-24">• 为维护产品名称的合法权益。</view>
+			<view class="text-size-s mb-24">• 为维护产品名称的合法权益。</view> -->
 		</view>
 	</view>
 </template>	
 <script>
+import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			
+			putdata:{}
 		};
 	},
 	onLoad() {
@@ -48,8 +49,23 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		this.getDate();
 	},
 	methods: {
+		getDate(){
+			var that=this;
+			myRequest({
+				url: "/api/config/userAgreement",
+				method:'get',
+				data:{}
+			}).then(res => {
+				console.log(res.data)
+				if (res.data.code == 200) {
+					that.putdata=res.data.data;
+				}else{
+				}
+			})
+		}
 	},
 }
 </script>

pages/zhaohui/index.vue

@@ -69,6 +69,22 @@ export default {
 			setTimeout(function(){
 				that.yzmvar.text="发送验证码";
 			},15000)
+			// myRequest({
+			// 	url: "/api/login/sendCode",
+			// 	method:'get',
+			// 	data:{mobile:that.reqData.mobile}
+			// }).then(res => {
+			// 	console.log(res.data)
+			// 	if (res.data.code == 200) {
+			// 		that.$refs.toast.show({model:'success',label:res.data.msg})
+			// 		that.yzmvar.text="已发送";
+			// 		setTimeout(function(){
+			// 			that.yzmvar.text="发送验证码";
+			// 		},15000)
+			// 	}else{
+			// 		that.$refs.toast.show({model:'error',label:res.data.msg})
+			// 	}
+			// })
 		},
 	},
 }

tm-vuetify/components/tm-cartCellListFood/tm-cartCellListFood.vue

@@ -19,6 +19,7 @@
 				</view>
 				<view  style="min-height: 64rpx;" >
 					<view v-if="!dense&&mdata[keyMap['label']]" class="tm-cartCellListFood-label text-size-s text-grey py-8">{{mdata[keyMap['label']]}}</view>
+					<view v-if="!dense&&mdata[keyMap['label']]" class="tm-cartCellListFood-label text-size-s text-grey py-8 text-red">{{mdata[keyMap['size']]}}</view>
 					<view v-if="mdata[keyMap['saleLabel']]&&!dense" class="tm-cartCellListFood-sale text-size-s text-grey">
 						<block v-for="(item,index) in mdata[keyMap['saleLabel']]" :key="index">
 							<tm-tags :black="black_tmeme" :color="color" v-if="index<4" size="xs">{{item}}</tm-tags>
@@ -33,7 +34,10 @@
 						<text v-if="mdata[keyMap['salePrice']]" class="text-delete text-size-xxs text-grey">￥{{mdata[keyMap['salePrice']]}}</text>
 						
 					</view>
-					<view class="flex">
+					<view class="flex jiarugouwuche" v-if="typeclick==1" @click="jiaru(mdata)">
+						<image class="" src="/static/img/86.png"></image>
+					</view>
+					<view class="flex" v-if="typeclick==2">
 						<block v-if="cNum>0">
 							<view :style="{
 							width:`${actionSize}rpx`,
@@ -106,7 +110,8 @@
 						salePrice:'salePrice',
 						saleLabel:'saleLabel',
 						unit:'unit',
-						buy:'buy'
+						buy:'buy',
+						size:'size',
 					}
 				}
 			},
@@ -144,7 +149,11 @@
 					// }
 					return {};
 				}
-			}
+			},
+			typeclick:{
+				type:Number,
+				default:0
+			},
 		},
 		watch:{
 			'mdata.buy':function(val){
@@ -188,6 +197,9 @@
 			this.cNum = this.mdata.buy;
 		},
 		methods:{
+			jiaru(data){
+				this.$emit('jiaruFun', data);
+			},
 			jian(){
 				const buyNum = this.cNum;
 				if(buyNum<=0) {
@@ -207,5 +219,5 @@
 </script>
 
 <style lang="less">
-
+	.jiarugouwuche image{width: 28px !important;height:28px !important;}
 </style>

tm-vuetify/components/tm-dropDownMenu/tm-dropDownMenu.vue

@@ -14,11 +14,12 @@
 						<view class="flex-center" :style="{height: height+'rpx',lineHeight:height+'rpx'}">
 							<text class=" pr-10" :style="{fontSize:fontSize+'rpx'}" :class="[activeIndex == index ? 'text-' + activeColor : 'text-' + unColor]">{{ item.title }}</text>
 							<tm-icons
+								v-if="index!=0"
 								style="line-height: 0;"
 								dense
-								:color="activeIndex == index ? activeColor : unColor"
+								:color="item.shang ? activeColor : unColor"
 								size="24"
-								:name="activeIndex == index ? 'icon-sort-up' : 'icon-sort-down'"
+								:name="item.shang ? 'icon-sort-up' : 'icon-sort-down'"
 							></tm-icons>
 						</view>
 					</tm-col>
@@ -269,7 +270,7 @@ export default {
 		// 默认激活时。bar条上的文字颜色
 		activeColor: {
 			type: String,
-			default: 'primary'
+			default: 'gray'
 		},
 		// 背景颜色。
 		bgColor: {
@@ -457,6 +458,7 @@ export default {
 			this.formartData.splice(this.activeIndex, 1, pd);
 		},
 		changeIndex(index) {
+			this.formartData[index].shang=! this.formartData[index].shang;
 			let t = this;
 			let itmod = 659;
 			clearInterval(itmod)
@@ -464,10 +466,11 @@ export default {
 				this.activeIndex = -1;	
 				
 			} else {
-				this.activeIndex = index;
+				// this.activeIndex = index;
 				
 			}
-			this.$emit('change', this.activeIndex);
+			
+			this.$emit('change', this.formartData[index]);
 			
 			this.rendIdx = 0;
 			clearInterval(itmod)