|
|
@@ -35,7 +35,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</tm-sheet>
|
|
|
- <tm-sheet class="lunbo1 fr" @click="tiao">
|
|
|
+ <tm-sheet class="lunbo1 fr">
|
|
|
<view class="flex-between flex-center">
|
|
|
<view class="tuijian">
|
|
|
<text class="text-white text-size-lg">日常出勤</text>
|
|
|
@@ -58,14 +58,10 @@
|
|
|
<!-- 衣橱 -->
|
|
|
<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>
|
|
|
-<<<<<<< HEAD
|
|
|
- <view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @longtap="longtap">
|
|
|
-=======
|
|
|
- <view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @click="tiaozhuan">
|
|
|
->>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
|
|
|
- <image :src="item.src" mode="widthFix"></image>
|
|
|
- <view class="text-align-center text-size-m mt-8">{{item.text}}</view>
|
|
|
- <view class="text-align-center text-size-m mt-6 mb-6">{{item.type}}</view>
|
|
|
+ <view class="yiguicla black pa-6 ma-4 fl" v-for="(item,index) in quanbuList" @longtap="longtap()" @click="xiangqing()">
|
|
|
+ <image :src="item.thumb" mode="widthFix"></image>
|
|
|
+ <view class="text-align-center text-size-m mt-8">{{item.brand}}</view>
|
|
|
+ <view class="text-align-center text-size-m mt-6 mb-6">{{item.goods_name}}</view>
|
|
|
</view>
|
|
|
<view style="clear: both;" class="more ma-30 pt-40" @click="gengmore()">
|
|
|
<image src="/static/img/30.png" mode="widthFix"></image>
|
|
|
@@ -78,7 +74,7 @@
|
|
|
<css-float-ball v-model="floatBallPosition" >
|
|
|
<view class="float-ball-icon" hover-class="default-icon-hover">
|
|
|
<tm-translate ref="a_1" :auto="true" animation-name="fadeLeft">
|
|
|
- <view class="fudong" @click="qiuqu">
|
|
|
+ <view class="fudong" @click="show_1=true">
|
|
|
<image src="/static/img/96.png" class="fudimg fl"></image>
|
|
|
<view class="pt-20">待取衣物</view>
|
|
|
<view>(<text style="color: #FFCC00;">3</text>件)</view>
|
|
|
@@ -86,6 +82,25 @@
|
|
|
</tm-translate>
|
|
|
</view>
|
|
|
</css-float-ball>
|
|
|
+ <!-- 弹出 -->
|
|
|
+ <tm-poup v-model="show_1" :position="pos" class="tcc">
|
|
|
+ <view style="position: relative !important;">
|
|
|
+ <view style="height: 10px;"></view>
|
|
|
+ <tm-swiper :current="1" :indicator-dots="false" :round="6" :ani3d="190" :autoplay="false" :list="list1"></tm-swiper>
|
|
|
+ <view class="text-white text-align-center mt-15">丝缎质感纹理风衣</view>
|
|
|
+ <view class="text-white text-align-center mt-10 text-size-s">黑色 - 6518/320</view>
|
|
|
+ <image class="guayi" src="/static/img/102.png" mode="widthFix"></image>
|
|
|
+ <view class="text-white text-align-center mt-15">衣物位于 挂衣区 5号衣柜</view>
|
|
|
+ <view class="text-white text-align-center mt-15">
|
|
|
+ <image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
|
|
|
+ <text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
|
|
|
+ </view>
|
|
|
+ <view class="anniu">
|
|
|
+ <tm-button @click="quxiao()" theme="gray" size="n">取消</tm-button>
|
|
|
+ <tm-button @click="chuFun()" class="fr" theme="primary" size="n">确认</tm-button>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </tm-poup>
|
|
|
</view>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -93,38 +108,20 @@ import{myRequest} from '@/api/request.js'
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ show_1:false,
|
|
|
+ pos:'center',
|
|
|
floatBallPosition:{x: 400, y: 750},
|
|
|
itemuser:0,
|
|
|
soso:'',
|
|
|
activeIndex:0,
|
|
|
list:[],
|
|
|
listlx:[],
|
|
|
- quanbuList:[{
|
|
|
- src:'/static/img/45.png',
|
|
|
- text:'NEO CITY 涂鸦',
|
|
|
- type:'手提包'
|
|
|
- },{
|
|
|
- src:'/static/img/46.png',
|
|
|
- text:'满印迷你标识',
|
|
|
- type:'围巾'
|
|
|
- },{
|
|
|
- src:'/static/img/47.png',
|
|
|
- text:'大号版型夹克',
|
|
|
- type:'新品'
|
|
|
- },{
|
|
|
- src:'/static/img/45.png',
|
|
|
- text:'NEO CITY 涂鸦',
|
|
|
- type:'手提包'
|
|
|
- },{
|
|
|
- src:'/static/img/46.png',
|
|
|
- text:'满印迷你标识',
|
|
|
- type:'围巾'
|
|
|
- },{
|
|
|
- src:'/static/img/47.png',
|
|
|
- text:'大号版型夹克',
|
|
|
- type:'新品'
|
|
|
- }],
|
|
|
- chooseindex:-1
|
|
|
+ quanbuList:[],
|
|
|
+ list1:[
|
|
|
+ '../../static/img/100.png',
|
|
|
+ '../../static/img/100.png',
|
|
|
+ '../../static/img/100.png',
|
|
|
+ ],
|
|
|
};
|
|
|
},
|
|
|
onLoad() {
|
|
|
@@ -144,54 +141,41 @@ export default {
|
|
|
this.fenleichange();
|
|
|
},
|
|
|
methods: {
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
+ quxiao(){
|
|
|
+ this.show_1=false;
|
|
|
+ },
|
|
|
+ chuFun(){
|
|
|
+ this.show_1=false;
|
|
|
+ },
|
|
|
+ longtap(){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: "/pages/changan/index",
|
|
|
+ })
|
|
|
+ },
|
|
|
tiao(){
|
|
|
uni.navigateTo({
|
|
|
url: "/pages/zidingyi/index",
|
|
|
})
|
|
|
},
|
|
|
- qiuqu(){
|
|
|
+ xiangqing(){
|
|
|
uni.navigateTo({
|
|
|
url: "/pages/yifu/index",
|
|
|
})
|
|
|
},
|
|
|
->>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
|
|
|
fenleichangeFun(){
|
|
|
var that=this;
|
|
|
- // role_id:,id:
|
|
|
myRequest({
|
|
|
url: "/api/Goods/classificationData",
|
|
|
method:'post',
|
|
|
data:{role_id:that.itemuser.id,id:that.activeIndex}
|
|
|
}).then(res => {
|
|
|
- // 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=[];
|
|
|
- // }
|
|
|
- })
|
|
|
- },
|
|
|
-<<<<<<< HEAD
|
|
|
- longtap(){
|
|
|
-=======
|
|
|
- tiaozhuan(){
|
|
|
->>>>>>> e34c4cd0946b018b2b1c677817c08c382bc29746
|
|
|
- console.log("111")
|
|
|
- uni.navigateTo({
|
|
|
- url: "/pages/changan/index",
|
|
|
- })
|
|
|
- },
|
|
|
- chuku(){
|
|
|
- uni.navigateTo({
|
|
|
- url: "/pages/quchu/index",
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ if(res.data.data.length != 0){
|
|
|
+ that.quanbuList=res.data.data.data;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ that.quanbuList=[];
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
sosoFun(){
|
|
|
@@ -248,48 +232,13 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- yifu(index){
|
|
|
- this.chooseindex=index;
|
|
|
- uni.navigateTo({
|
|
|
- url: "/pages/yifu/index",
|
|
|
- })
|
|
|
- },
|
|
|
qiehuanFun(){
|
|
|
uni.navigateTo({
|
|
|
url: "/pages/qiehuan/index",
|
|
|
})
|
|
|
},
|
|
|
- randouh(){
|
|
|
- let list2 = [],that=this;
|
|
|
- for(let i=0;i<6;i++){
|
|
|
- list2.push({
|
|
|
- src:'/static/img/47.png',
|
|
|
- text:'大号版型夹克',
|
|
|
- type:'新品'
|
|
|
- })
|
|
|
- }
|
|
|
- this.quanbuList=this.quanbuList.concat(list2)
|
|
|
- console.log(this.quanbuList)
|
|
|
- },
|
|
|
gengmore(){
|
|
|
- this.randouh()
|
|
|
- },
|
|
|
- change(e){
|
|
|
- uni.$tm.toast(`你选中了${e}`);
|
|
|
- },
|
|
|
- changece(e){
|
|
|
- uni.$tm.toast(`您选中了:${e}`)
|
|
|
- },
|
|
|
- dapei(item){
|
|
|
- console.log(item)
|
|
|
- },
|
|
|
- xiangqing(item){
|
|
|
- console.log(item)
|
|
|
- },
|
|
|
- ruku(){
|
|
|
- uni.navigateTo({
|
|
|
- url: "/pages/putstorage/index",
|
|
|
- })
|
|
|
+
|
|
|
},
|
|
|
tianjia(){
|
|
|
uni.navigateTo({
|
|
|
@@ -350,11 +299,42 @@ export default {
|
|
|
margin-top: 17%;
|
|
|
}
|
|
|
/deep/ .qiehuan .tm-tabs-con-item-border{display: none;}
|
|
|
- .yiguicla image{width: 95%;display: block;margin: 0 auto;margin-top: 5px;}
|
|
|
+ .yiguicla image{width: 95%;display: block;margin: 0 auto;margin-top: 5px;height: 90px;}
|
|
|
.yiguicla{width: 30%;border-radius: 10px;}
|
|
|
.more{text-align: center;}
|
|
|
.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
|
|
|
.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
|
|
|
border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
|
|
|
.fudimg{width: 60px;height:60px}
|
|
|
+ /deep/ .tcc .tm-poup-wk{width: 90% !important;position:relative;height: 580px !important;}
|
|
|
+ /deep/ .tcc .uni-swiper-slides{width: 100%;}
|
|
|
+ /deep/ .tcc uni-swiper{width: 100% !important;}
|
|
|
+ /deep/ .uni-swiper-slides{width: 160px !important;}
|
|
|
+ /deep/ .tcc uni-image{width: 160px !important;}
|
|
|
+ .tcc .guayi{width: 90% !important;display: block;margin:0 auto;margin-top:15px !important;}
|
|
|
+ .tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
|
|
|
+ .anniu{width: 80%;margin: 0 auto;margin-top: 20px;}
|
|
|
+ /deep/ .anniu .gray.bk{color: white !important;}
|
|
|
+ .aniOn{
|
|
|
+ animation:doudong 0.5s linear infinite;
|
|
|
+ background:linear-gradient();
|
|
|
+ background: -webkit-linear-gradient();
|
|
|
+ }
|
|
|
+ @keyframes doudong {
|
|
|
+ 0%{
|
|
|
+ transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
|
|
|
+ }
|
|
|
+ 25%{
|
|
|
+ transform: rotate(0deg) translateX(-2rpx) translateY(-2rpx);
|
|
|
+ }
|
|
|
+ 50%{
|
|
|
+ transform: rotate(0deg) translateX(0rpx) translateY(-2rpx);
|
|
|
+ }
|
|
|
+ 75%{
|
|
|
+ transform: rotate(0deg) translateX(0rpx) translateY(2rpx);
|
|
|
+ }
|
|
|
+ 100%{
|
|
|
+ transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
