Skip to content

W
wechat_currency
Commit 1ef1fc22 by huahua
Options

优化页面

parent adf4a7cf
Showing with 247 additions and 55 deletions
pages/index/machineDetail.vue
......@@ -27,7 +27,7 @@
<view @click="Customize_now" hover-class="hover-class-bg" style="position: fixed; bottom: 130upx; left: 0; right: 0; margin: auto;
width: 300upx; height: 100upx;
background: linear-gradient(92deg, #F29F3D, #67C4CA);
background: linear-gradient(92deg, #F29F3D, #F29F3D);
box-shadow: 0px 19px 48px 1px rgba(20, 31, 62, 0.35);
border-radius: 40px;">
<view
......@@ -73,7 +73,7 @@
<view @click="toProxyApplet()" v-if="list.is_open_manage == 1"
style="position: fixed; z-index: 99; right: 0; bottom: 280upx; display: flex;align-items: center;justify-content: center;
width: 100upx; height: 88upx; background: #43cf7c; border-radius: 44upx 0px 0px 44upx;">
width: 100upx; height: 88upx; background: #F29F3D; border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>运营</view>
<view>中心</view>
......
pages/index/mall.vue
<template>
<view class="full-width full-height">
<view v-if="system_config.lite_diy.value == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
<!-- <view v-if="system_config.lite_diy.value == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
style="position: fixed; z-index: 99; right: 0; bottom: 524upx; display: flex;align-items: center;justify-content: center;
width: 100upx; height: 88upx; background: #43cf7c; border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>定制</view>
<view>体验</view>
</view>
</view>
</view> -->
<!-- 无设备 -->
<view v-if="long && LoupanList.length == 0">
<view style="display: flex; justify-content: center;" :style="{height: 'calc(100% - ' + titleHeight +'px)'}">
<view style="margin-top: 231upx;">
<image src="../../static/icon_diy.png" mode="" style="width: 513upx; height: 251upx;"></image>
......@@ -28,6 +29,81 @@
</view>
<view style="color: #333333 ; font-weight: bold;font-size: 33upx;">开始扫码定制</view>
</view>
</view>
<!-- 有设备 -->
<view v-if= "long && LoupanList.length > 0" >
<view style="margin-top: 50upx;">
<view style="width: 690upx; margin:30upx auto 30upx; display: flex; ">
<view>
<view style="position: relative; width: 320upx; height: 160upx;" @click="order()">
<image src="../../static/mine/dingdan@3x.png"
style="width: 320upx; height: 160upx; position: absolute;z-index: -1;"></image>
<view
style="margin-left:26upx; padding-top: 27upx; font-size: 36upx; color: #fff;font-weight: bold;">
订单</view>
<view style="margin-top: 15upx;margin-left:26upx;font-size: 24upx;
font-weight: 400; color: #fff;">我的定制</view>
</view>
<view style="margin-top: 16upx; position: relative;width: 320upx; height: 160upx;"
@click="coupons()">
<image src="../../static/mine/huayihua@3x.png" mode=""
style="width: 320upx; height: 160upx; position: absolute;z-index: -1;"></image>
<view
style="margin-left:26upx; padding-top: 27upx; font-size: 36upx; color: #fff;font-weight: bold;">
滑一滑</view>
</view>
</view>
<view style="margin-left: 15upx;width: 350upx; height: 340upx;" @click="tomine()">
<image src="../../static/mine/wo@3x.png" mode=""
style="width: 350upx; height: 340upx; position: absolute;z-index: -1;"></image>
<view
style="margin-left:30upx; padding-top: 39upx; font-size: 36upx; color: #fff;font-weight: bold;">个人中心</view>
<view style="margin-top: 15upx;margin-left:30upx;font-size: 24upx;
font-weight: 400; color: #fff;">更多作品更多精彩</view>
</view>
</view>
<!-- 附近定制站 -->
<view style="font-size: 36upx; margin-top: 40upx; margin-left: 40upx; font-weight: bold; color: #000;">附近定制站</view>
<view style="width: 690upx; margin: 30upx auto 0; background: #EEE; border-radius: 10upx;">
<view v-for="(item, index) in LoupanList" :key="index" @click="goMachineDetail(item)">
<view v-if="index != 0" style="width: 689upx; height: 1upx; background: #CCCCCC; opacity: 0.1;">
</view>
<view style="height: 160upx; display: flex; align-items: center; padding: 29upx 20upx 30upx 19upx;">
<image
style="width: 160upx; height: 164upx; margin: 0upx 21upx 0upx 0upx; border-radius: 10upx;"
mode="aspectFill" :src="item.image + '?x-oss-process=image/resize,lfit,w_375'"></image>
<view style="width: calc(100% - 281upx);">
<view style="margin: -10upx 0 10upx; font-size: 32upx; font-weight: 500; color: #000;
width: 80%; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; word-break: break-all;"
:style="{opacity:item.status.value == 1 || item.status.value == 2 ? '1' : '1'}">
{{item.short_name || ''}}
</view>
<view style="font-size: 24upx; font-weight: 500; color: #666; opacity: 0.4;">
营业时间：{{item.start_time || ''}}-{{item.end_time || ''}}
</view>
</view>
<view @click="goMachineDetail(item)" v-if="item.distance"
style="width: 170upx;">
<text v-if="item.status.value == 0" class="statuslist"
style="background:#F2A03E;">正在休息</text>
<text v-if="item.status.value == 1" class="statuslist"
style="background:#5CE6B5;">正在定制</text>
<text v-if="item.status.value == 2" class="statuslist"
style="background:#5CE6B5;">正在定制</text>
<text v-if="item.status.value == 3" class="statuslist"
style="background:#F2A03E;">正在休息</text>
<text v-if="item.status.value == 4" class="statuslist"
style="background:#F2A03E;">正在休息</text>
<text v-if="item.status.value == 5" class="statuslist"
style="background:#F2A03E;">正在休息</text>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 登录弹框 -->
<Signin ref="Signin"></Signin>
......@@ -35,8 +111,11 @@
</template>
<script>
import Env from '@/util/Env.js';
import userService from '@/service/UserService';
import Signin from './Signin.vue';
import homeservice from '@/service/homeservice.js';
var pixelRationum = null;
export default {
components: {
......@@ -54,9 +133,72 @@
touchEndTime: null,
lastTapTime: null,
system_config: null,
LoupanList:[],
long:false
};
},
methods: {
//设备详情
goMachineDetail(item) {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + item.id
});
},
order() {
var url = this.$Env.getBaseURL();
var envVersionName = "trial";
if (url.indexOf("colorpark") != -1) {
envVersionName = "release";
}
wx.navigateToMiniProgram({
appId: this.$Env.getappId(),
path: '/pages/mine/myorder',
extraData: {
foo: 'bar'
},
envVersion: envVersionName,
success(res) {
//打开成功
}
})
},
coupons() {
var url = this.$Env.getBaseURL();
var envVersionName = "trial";
if (url.indexOf("colorpark") != -1) {
envVersionName = "release";
}
//console.log("envVersionName="+envVersionName);
wx.navigateToMiniProgram({
appId: Env.getappId(),
path: '/pages/index/recommend?selectTitleType=2',
extraData: {
foo: 'bar'
},
envVersion: envVersionName,
success(res) {
}
})
},
tomine() {
wx.navigateToMiniProgram({
appId: this.$Env.getappId(),
path: '/pages/index/mine',
extraData: {
foo: 'bar'
},
envVersion: Env.getenvVersion(),
success(res) {
// 打开成功
}
})
},
getQueryString(url, name) {
var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
var r = url.substr(1).match(reg)
......@@ -65,6 +207,8 @@
}
return null;
},
scanning() {
if (!this.$AppContext.checkLogin()) {
this.tologo('navigateTo')
......@@ -176,6 +320,31 @@
}
});
},
//加载数据
loadGoodsList() {
uni.showLoading({
title: '正在加载中...'
})
homeservice.queryList({
s: 'Machine.shopList',
longitude: this.$base.longitude || 0,
latitude: this.$base.latitude || 0,
distance: 5,
}).then(result => {
this.long = true
result.data.forEach(item => {
item.distance = Number(item.distance).toFixed(2)
});
this.LoupanList = result.data
uni.hideLoading();
uni.stopPullDownRefresh();
}).catch(err => {
uni.hideLoading();
uni.stopPullDownRefresh();
});
},
systemConfig() {
var _this = this
wx.request({
......@@ -224,7 +393,7 @@
success: (res) => {},
}
},
// 分享朋友圈
//分享朋友圈
onShareTimeline() {
return {
title: this.$Env.getmalltext(),
......@@ -239,12 +408,9 @@
let promoter_id = qrUrl.replace(/[^0-9]/ig, "")
this.$base.promoter_id = promoter_id
}
this.loadGoodsList();
},
onShow() {
// let sys = this.$base.appInformation ? this.$base.appInformation:wx.getSystemInfoSync();// 自定义页头适配
// pixelRationum = sys.windowWidth / 375
// let navBarHeight = sys.screenHeight - sys.windowHeight - sys.statusBarHeight;
// this.titleHeight = sys.statusBarHeight + 46
this.systemConfig()
}
};
......@@ -267,4 +433,14 @@
color: #333333;
line-height: 20upx;
}
.statuslist {
font-size: 23upx;
padding: 8upx 20upx 8upx 20upx;
border-radius: 20upx;
font-weight: 500;
color: #FFFFFF;
}
</style>
pages/index/switchGoods.vue
......@@ -3,13 +3,11 @@
style=" position: absolute; top: 0; width: 100%; height: 100%; display: flex; flex-direction: column; "
@click="closeView()">
<view
style="position: absolute; top: 0; width: 100%; height: 100%; background: #999999; z-index: 999; opacity: 0.5; ">
</view>
<view style="position: absolute; top: 0; width: 100%; height: 100%; background: #999999; z-index: 999; opacity: 0.5; "></view>
<view style=" position: absolute;
top: calc(50% - 620upx);
height: 1250upx;
top: calc(50% - 420upx);
height: 750upx;
width: 100%;
margin:auto;
display: flex;
......@@ -17,7 +15,7 @@
justify-content: center;
z-index: 999;">
<scroll-view scroll-y scroll-with-animation style="box-sizing: border-box;white-space: nowrap;
<!-- <scroll-view scroll-y scroll-with-animation style="box-sizing: border-box;white-space: nowrap;
width: 700upx; margin:0 auto; overflow: hidden; height: 100%;">
<view v-for="(item,index) in goods" :key="index" @click="goodclick(item)">
<view style="float: left; margin: 10upx;
......@@ -26,18 +24,15 @@
height: 300upx; width: 210upx;" hover-class="brandactive" :class="[brandtext == item.title ? 'brandactive':'' ]">
<image mode="widthFix" style="width:calc(100% - 60upx);margin: auto;"
:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image>
<!-- front_image -->
<!-- :src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image> -->
<view style="text-align: center; font-size: 24upx; width: 100%;
color:#333; position: absolute; bottom: 20upx; ">
{{item !=null ? item.name : ''}}
</view>
</view>
</view>
</scroll-view>
</scroll-view> -->
<!-- <swiper class="swiper-block" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
<swiper class="swiper-block" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
circular='false' previous-margin='80rpx' next-margin='80rpx' :current="currentIndex"
@change="swiperChangeGood">
<swiper-item class="swiper-item" v-for="(item,index) in goods" :key="index" >
......@@ -53,7 +48,7 @@
{{item !=null ? item.name : ''}}
</view>
</swiper-item>
</swiper> -->
</swiper>
</view>
</view>
......
pages/mall/lineUp.vue
......@@ -45,23 +45,69 @@
</view>
</view>
<view v-if="designer.status.value == 1" style="width: 136upx; height: 60upx;background: #F29F3D;opacity: 0.86;border-radius: 30px; margin-top: 70upx;">
<view v-if="designer.status.value == 1" style="width: 136upx; height: 60upx;background: #F29F3D;opacity: 0.86;border-radius: 30px; margin-top: 40upx;">
<view style="text-align: center; font-size: 26upx; color: #FFFFFF; line-height: 60upx;"> 打印中
</view>
</view>
<view v-else style="width: 136upx; height: 60upx;border-radius: 30upx;margin-top: 70upx;">
<view style="text-align: center; font-size: 26upx; color: #67C4CA; line-height: 60upx;"> 排队中
<view v-else style="width: 136upx; height: 60upx;border-radius: 30upx;margin-top: 40upx;">
<view style="text-align: center; font-size: 26upx; color: #F6BE36; line-height: 60upx;"> 排队中
</view>
</view>
</view>
</view>
</view>
<!-- 提示 -->
<view v-if="sighstate">
<!-- background:rgba(0,0,0,0.6); -->
<view
style="position: fixed; z-index:999; width: 100%; height: 100%; top: 0; background:rgba(0,0,0,0.6); justify-content: center;"
<view style="position: fixed; z-index:999; width: 100%; height: 100%; background:rgba(0,0,0,0.6); top: 0;"
@click.stop="sighstate = false"></view>
<view style="position: fixed; z-index: 1000; top: 300upx; left: 0; right: 0; margin: auto;
width: 558upx; height: 680upx; background: #FFFFFF; border-radius: 10upx;
display: flex; align-items: center; justify-content: center;">
<view style="position: absolute;
top: 0; right: 0;" @click="sighstate = false">
<image src="../../static/icon_guanbi.png" mode=""
style="width: 26upx; height: 26upx; padding: 12upx 22upx;"></image>
</view>
<view style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 500upx;
height: 350upx;
position: relative; margin: auto;">
<view style="width: 400upx; height: 300upx; display: flex; border: 1px solid #F6BE36;
box-shadow: 0 0 20px #ccc; border-radius: 10upx;">
<view style="width: calc(100% / 4); height: 100%;" v-for="item in 4" :key="a">
<!-- <image style="width: 100%; height: 100%;position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 1;" :src="designer.front_image_old" mode="aspectFit"></image> -->
<image style="width: 36%; height: 36%; position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
margin: auto; z-index:1;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"
mode="aspectFit"></image>
<!-- <image style="width: 100%; height: 100%;position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 2;" :src="designer.front_image" mode="aspectFit"></image> -->
</view>
</view>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
<view v-if="designer.user_id == userId " @click="toOrderDetail(designer)" style="width: 135upx; height: 50upx;background: #F6BE36;
border-radius: 40upx;
color: #FFFFFF;
margin:10upx auto;
text-align: center;
padding:auto;
padding-top: 15upx;">排队中</view>
</view>
</view>
</view>
<!-- 提示 -->
<!-- <view v-if="sighstate">
<view style="position: fixed; z-index:999; width: 100%; height: 100%; top: 0; background:rgba(0,0,0,0.6); justify-content: center;"
@click.stop="sighstate = false"></view>
<view style="position: fixed; z-index: 1000; top: 52%; left: 50%; right: 0; margin: auto; transform: translate(-50%, -50%);
width: 558upx; height: 650upx; background: #FFFFFF; border-radius: 10upx;
......@@ -71,18 +117,6 @@
<image src="../../static/icon_guanbi.png" mode=""
style="width: 26upx; height: 26upx; padding: 20upx; "></image>
</view>
<!-- <view v-if=" designer.goods_name == '背包' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_80'"mode="aspectFit" style="width:80upx; margin-left: 100upx;"></image>
<image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_300'"mode="aspectFit" style=" width: 300upx;margin-left: -200upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view> -->
<!-- goods_name=马卡龙 -->
<view v-if=" designer.goods_name == '马卡龙' " style="width: 558upx; margin-top: 60upx; ">
<view style="display: flex; align-items: center; justify-content: center;
width: 500upx; height: 340upx; position: relative; margin: auto;">
......@@ -114,24 +148,12 @@
text-align: center;
padding:auto;
padding-top: 15upx;">查看详情</view>
</view>
<!--<view v-if=" designer.goods_name == '单肩袋' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_140'"mode="aspectFit" style="width:140upx; margin-left: 100upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view> -->
<view v-if=" designer.goods_name != '马卡龙' "
style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_100'" mode="aspectFit" style="width:100upx; "></image>
<!-- <image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_290'" mode="aspectFit" style=" width: 300upx;margin-left: -200upx;"></image> -->
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
......@@ -143,11 +165,10 @@
text-align: center;
padding:auto;
padding-top: 15upx;">查看详情</view>
</view>
</view>
</view>
</view> -->
</view>
</view>
</template>
......
static/icon_diy_ai.png
static/icon_diy_ai.png

205 Bytes | W: | H:

static/icon_diy_ai.png

1.35 KB | W: | H:

static/icon_diy_ai.png
static/icon_diy_ai.png
static/icon_diy_ai.png
static/icon_diy_ai.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment