YZM 1 年間 前
コミット
5c8b484049

+ 2 - 2
pages/chuanghome/index.vue

@@ -111,7 +111,7 @@ export default {
 				{title:"瘦子",id:51},
 				{title:"模特",id:61},
 			],
-			active:1,
+			active:2,
 			chelianglis:[
 				{title:"标准",id:1},
 				{title:"偏瘦",id:2},
@@ -120,7 +120,7 @@ export default {
 			],
 			show:0,
 			reqData:{
-				wardrode_no:'',
+				wardrode_no:'6943819164690',
 				familyname:'',
 				role:[{
 					username:'',

+ 5 - 7
pages/index/index.vue

@@ -190,13 +190,11 @@
 		},
 		created() {
 			var that = this;
-			setTimeout(function() {
-				if (uni.getStorageSync("token") == "") {
-					uni.redirectTo({
-						url: "/pages/login/index"
-					})
-				}
-			}, 1000)
+			if (uni.getStorageSync("token") == "") {
+				uni.redirectTo({
+					url: "/pages/login/index"
+				})
+			}
 			this.sys = uni.getSystemInfoSync();
 			this.getService();
 			this.getremmend();

+ 1 - 0
pages/login/index.vue

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

+ 1 - 1
pages/shop/index.vue

@@ -114,7 +114,7 @@
 		data() {
 			return {
 				isBottom: false,
-				current: 1,
+				current: 0,
 				activeIndex: 0,
 				soso: '',
 				addr: ['江西省', '南昌市', '西湖区'],

+ 3 - 3
pages/shopdetail/index.vue

@@ -77,10 +77,10 @@
 			</view>
 		</div>
 		<view class="bottom_btn">
-			<view class="btn_col" style="background: #1c1c1c;" @click="goCollect">
+			<!-- <view class="btn_col" style="background: #1c1c1c;" @click="goCollect">
 				<image style="width: 18px;height: 16px;" src="/static/img/98.png" mode="widthFix"></image>
 				<text style="margin-left: 10px;">收藏</text>
-			</view>
+			</view> -->
 			<view class="btn_gouwu" style="background:#303030;" @click="jiarufuFun()">
 				<image src="/static/img/97.png" mode="widthFix" style="width: 15px;height: 16px;"></image>
 				<text style="margin-left: 10px;">添加购物车</text>
@@ -422,7 +422,7 @@
 		.btn_gouwu,
 		.btn_buy {
 			height: 100%;
-			width: 33.3%;
+			width: 50%;
 			display: flex;
 			align-items: center;
 			justify-content: center;

+ 2 - 2
pages/shouhuodi/index.vue

@@ -8,7 +8,7 @@
 					<tm-input title="手机号码" placeholder="填写收件人手机号码" v-model="dizhi.mobile"></tm-input>
 					<tm-pickersCity @confirm="dateSe_3" :default-value="d_3" btn-color="bg-gradient-deep-purple-accent"
 						style="margin:0 16px 0px;box-sizing: border-box;">
-						<tm-input style="padding: 0px 60px 0px 0px!important;margin-left: 0!important;" title="所在地区"
+						<tm-input :disabled="true" style="padding: 0px 60px 0px 0px!important;margin-left: 0!important;" title="所在地区"
 							placeholder="省市区县、乡镇等" v-model="dizhi.region" @click="dateSe_3">
 						</tm-input>
 					</tm-pickersCity>
@@ -22,7 +22,7 @@
 						<!-- <tm-button class="ml-20" :round="10" theme="gray" size="s">{{dizhi.label}}</tm-button> -->
 						<tm-button class="ml-20" :round="10" v-model="sel" :theme="sel==index?'blue':'gray'" size="s"
 							v-for="(item,index) in tags" @click="selectTag(index)">{{item.name}}</tm-button>
-						<tm-button class="ml-20" :round="10" theme="gray" size="s" @click="addTag">+</tm-button>
+						<!-- <tm-button class="ml-20" :round="10" theme="gray" size="s" @click="addTag">+</tm-button> -->
 					</view>
 					<view style="clear: both;"></view>
 					<tm-listitem title="设置为默认地址" @click="btnClick">

+ 7 - 3
pages/user/index.vue

@@ -6,8 +6,8 @@
 			<view class="info">
 				<image class="chuandaimg fl" src="/static/img/55.png" mode="widthFix"></image>
 				<view class="chuandazi fl ml-30">
-					<view class="text-size-lg text-weight-b text-overflow-2 mt-20">Hahhhnxsm_</view>
-					<view class="tm-cartCellListFood-label text-size-s text-grey">15077854701</view>
+					<view class="text-size-lg text-weight-b text-overflow-2 mt-20">普通用户</view>
+					<view class="tm-cartCellListFood-label text-size-s text-grey">{{mobile}}</view>
 					<tm-button size="s" class="mt-10">编辑个人资料</tm-button>
 				</view>
 				<view style="clear: both;"></view>
@@ -61,6 +61,7 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			mobile:'',
 			show:false,
 			on:true,
 			libiaoList:[
@@ -81,6 +82,9 @@ export default {
 	},
 	created() {
 		this.sys = uni.getSystemInfoSync();
+		if (uni.getStorageSync("mobile")) {
+			this.mobile=uni.getStorageSync("mobile");
+		}
 	},
 	methods: {
 		tiaozhuan(type){
@@ -146,7 +150,7 @@ export default {
 				data:{}
 			}).then(res => {
 				uni.setStorageSync("token","")
-				uni.redirectTo({
+				uni.reLaunch({
 					url:"/pages/login/index"
 				})
 			})

+ 5 - 4
pages/wardrobe/index.vue

@@ -59,7 +59,7 @@
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichangeFun" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="pa-10 text-size-s">柜中{{have}}件 共{{count}}条</view>
+				<view class="pa-10 text-size-s">柜中{{have}}件 共{{total}}条</view>
 				<view style="position: relative;" class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @longtap="longtap()" @click="xiangqing(item)">
 					<image :src="item.image" mode="widthFix"></image>
 					<view class="text-align-center text-size-m mt-8">{{item.brand}}</view>
@@ -162,9 +162,10 @@ export default {
 	},
 	methods: {
 		shuaxin(){
-			this.quanbuList=[];
-			this.fenleichange();
-			this.getfenltext();
+			// console.log(99999)
+			// this.quanbuList=[];
+			// this.fenleichange();
+			// this.getfenltext();
 		},
 		qiehuanLb(e){
 			var that=this;