Skip to content

U
user
Commit 36814f71 by weijiguang
Options

修改状态名称

parent 0c4a9a85
Showing with 96 additions and 102 deletions
components/OrderQrCode/index.vue
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
orderStatusText() { orderStatusText() {
switch (this.orderInfo.state) { switch (this.orderInfo.state) {
case '2': case '2':
return '已支付' return '待制作'
case '3': case '3':
return '制作中' return '制作中'
default: default:
......
components/menuAssembly/index.vue
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<scroll-view class="nav-right" scroll-y :scroll-top="scrollTop" @scroll="scroll" @touchstart="openScroll" <scroll-view class="nav-right" scroll-y :scroll-top="scrollTop" @scroll="scroll" @touchstart="openScroll"
scroll-with-animation> scroll-with-animation>
<view v-for="category in classifyData" :id="category.id" :key="category.id" class="box"> <view v-for="category in classifyData" :id="category.id" :key="category.id" class="box">
<view v-if="category.goods && category.goods.length>0" :style="loads" class="right-title">{{ category.name }}</view> <view :style="loads" class="right-title">{{ category.name }}</view>
<view class="nav-right-item" v-for="item in category.goods" :key="item.goodsId"> <view class="nav-right-item" v-for="item in category.goods" :key="item.goodsId">
<image src="../../static/imgs/isRecommend.png" v-if="item.isRecommend == 1" class="isRecommend" /> <image src="/static/imgs/isRecommend.png" v-if="item.isRecommend == 1" class="isRecommend" />
<image @click="cart(item, category)" class="thumbnail" v-if="item.pics.thumbnailApplet" :src="item.pics.thumbnailApplet" /> <image @click="cart(item, category)" class="thumbnail" v-if="item.pics.thumbnailApplet" :src="item.pics.thumbnailApplet" />
<image @click="cart(item, category)" class="thumbnail" v-else :src="item.pics.thumbnail" /> <image @click="cart(item, category)" class="thumbnail" v-else :src="item.pics.thumbnail" />
<view @click="cart(item, category)" class="info"> <view @click="cart(item, category)" class="info">
...@@ -48,7 +48,6 @@ export default { ...@@ -48,7 +48,6 @@ export default {
scrollLeftTop: 0, scrollLeftTop: 0,
scrollTop: 0, scrollTop: 0,
scrolled: true scrolled: true
} }
}, },
methods: { methods: {
...@@ -65,7 +64,20 @@ export default { ...@@ -65,7 +64,20 @@ export default {
}, },
createList(data) { createList(data) {
this.classifyData = data; this.classifyData = data;
// console.log(this.classifyData) console.log(this.classifyData);
// 删除没有商品的分类
if(this.classifyData) {
for(var i=this.classifyData.length-1; i>=0; i--) {
var category = this.classifyData[i];
if(!category.goods || category.goods.length<=0) {
this.classifyData.splice(i, 1);
}
}
if(this.classifyData.length>0){
this.categoryId = this.classifyData[0].id;
}
}
this.$nextTick(() => { this.$nextTick(() => {
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query.selectAll('.box').boundingClientRect(data => { query.selectAll('.box').boundingClientRect(data => {
......
menuSubPackage/pages/goodsDetail/goodsDetail.vue
...@@ -368,7 +368,6 @@ export default { ...@@ -368,7 +368,6 @@ export default {
padding: 0; padding: 0;
line-height: 50rpx; line-height: 50rpx;
&.active { &.active {
background: #006ECF; background: #006ECF;
color: #fff; color: #fff;
......
orderSubPackage/pages/settlement/index.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div class="price">总优惠￥{{ reduction }}</div> <div class="price">总优惠￥{{ reduction }}</div>
</div> --> </div> -->
</div> </div>
<view class="payment" @click="messageAndSave" v-if="userms">付款</view> <view v-if="userms" class="payment" @click="messageAndSave">付款</view>
<button v-if="!userms" class="payment" style="border-radius: 0;" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">付款</button> <button v-if="!userms" class="payment" style="border-radius: 0;" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">付款</button>
</div> </div>
</view> </view>
...@@ -112,12 +112,13 @@ export default { ...@@ -112,12 +112,13 @@ export default {
// 微信扫码进入 // 微信扫码进入
this.option = JSON.stringify(option) this.option = JSON.stringify(option)
const { q } = option; const { q } = option;
console.log(q);
if (q) { if (q) {
User.getLocation((state, params) => { User.getLocation((state, params) => {
uni.removeStorageSync('shopCarInfo'); uni.removeStorageSync('shopCarInfo');
$EventBus.$emit('updateCar'); $EventBus.$emit('updateCar');
// this.buyType = '1'; // let id = decodeURIComponent(q).split('?')[1].split('=')[1];
let id = decodeURIComponent(q).split('?')[1].split('=')[1]; let id = q;
Menu.getScreenShopCar(id, params).then(res => { Menu.getScreenShopCar(id, params).then(res => {
const data = JSON.parse(res.data.data); const data = JSON.parse(res.data.data);
console.log(data); console.log(data);
......
pages/mine/mine.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<image class="logImg" src="/static/imgs/hooloo.png"></image> <image class="logImg" src="/static/imgs/hooloo.png"></image>
<view class="logText">未 来 咖 啡</view> <view class="logText">未 来 咖 啡</view>
</view> </view>
<image src="../../static/imgs/banner.png"></image> <image src="/static/imgs/banner.png"></image>
</view> </view>
<view v-if="userms" class="mod11 flex-col"> <view v-if="userms" class="mod11 flex-col">
<view class="box16 flex-col"></view> <view class="box16 flex-col"></view>
...@@ -17,47 +17,47 @@ ...@@ -17,47 +17,47 @@
<button class="mod11 flex-col" v-else open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立刻登录</button> <button class="mod11 flex-col" v-else open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立刻登录</button>
<view class="contents" v-if="userms"> <view class="contents" v-if="userms">
<view class="myOrder" @click="goToPage('order')"> <view class="myOrder" @click="goToPage('order')">
<view class="order1">我的订单</view> <h3>我的订单</h3>
<view class="order2">点击查看订单</view> <view class="desc">点击查看订单</view>
<view><image class="orderImg" src="/static/imgs/myOrder.png"></image></view> <view><image class="icon" src="/static/imgs/myOrder.png"></image></view>
</view> </view>
<view class="right_box"> <view class="right_box">
<view class="box" @click.stop="goToPage('coupon')"> <view class="box" @click.stop="goToPage('coupon')">
<view class="left"> <view class="left">
<h3>HOOLOO券</h3> <h3>HOOLOO券</h3>
<view class="dec">优惠多多不要错过</view> <view class="desc">优惠多多不要错过</view>
</view> </view>
<view class="right"><image class="right_img" src="/static/imgs/my3.png"></image></view> <view class="right"><image class="icon" src="/static/imgs/my3.png"></image></view>
</view> </view>
<view class="box two" @click="goToPage('msg')"> <view class="box two" @click="goToPage('msg')">
<view class="left"> <view class="left">
<h3>我的消息</h3> <h3>我的消息</h3>
<view class="dec">点击查看我的消息</view> <view class="desc">点击查看我的消息</view>
</view> </view>
<view class="right"><image class="right_img" src="/static/imgs/myMail.png"></image></view> <view class="right"><image class="icon" src="/static/imgs/myMail.png"></image></view>
</view> </view>
</view> </view>
</view> </view>
<view class="contents" v-if="!userms"> <view class="contents" v-if="!userms">
<button class="myOrder" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> <button class="myOrder" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" style="line-height:1.5; margin-left:0rpx; margin-right:0rpx; padding-left:0rpx; padding-right:0rpx;">
<view class="order3">我的订单</view> <h3>我的订单</h3>
<view class="order4">点击查看订单</view> <view class="desc">点击查看订单</view>
<view><image class="orderImg1" src="/static/imgs/myOrder.png"></image></view> <view><image class="icon" src="/static/imgs/myOrder.png"></image></view>
</button> </button>
<view class="right_box"> <view class="right_box">
<button class="box" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> <button class="box" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" style="line-height:1.5; margin-left:0rpx; margin-right:0rpx; padding-left:0rpx; padding-right:0rpx;">
<view class="left"> <view class="left">
<h3>HOOLOO券</h3> <h3>HOOLOO券</h3>
<view class="dec">优惠多多不要错过</view> <view class="desc">优惠多多不要错过</view>
</view> </view>
<view class="right"><image class="right_img" src="/static/imgs/my3.png"></image></view> <view class="right"><image class="icon" src="/static/imgs/my3.png"></image></view>
</button> </button>
<button class="box two" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> <button class="box two" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" style="line-height:1.5; margin-left:0rpx; margin-right:0rpx; padding-left:0rpx; padding-right:0rpx;">
<view class="left"> <view class="left">
<h3>我的消息</h3> <h3>我的消息</h3>
<view class="dec">点击查看我的消息</view> <view class="desc">点击查看我的消息</view>
</view> </view>
<view class="right"><image class="right_img" src="/static/imgs/myMail.png"></image></view> <view class="right"><image class="icon" src="/static/imgs/myMail.png"></image></view>
</button> </button>
</view> </view>
</view> </view>
...@@ -198,27 +198,28 @@ button::after { ...@@ -198,27 +198,28 @@ button::after {
.contents { .contents {
display: flex; display: flex;
align-items: center; padding: 34rpx;
margin: 34rpx auto; width: 100%;
width: 692rpx; // background: #0000FF;
.myOrder { .myOrder {
width: 270rpx; width: 36%;
height: 272rpx; height: 270rpx;
// background: #FF0000;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx; border-radius: 10rpx;
align-items: center;
text-align: center; text-align: center;
padding: 0 36rpx;
h3 {
.order1 {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: Arial-BoldMT, Arial;
font-weight: 500; font-weight: 700;
color: #000000; color: #000000;
margin-top: 25rpx; margin-top: 30rpx;
} }
.order2 { .desc {
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
...@@ -226,78 +227,60 @@ button::after { ...@@ -226,78 +227,60 @@ button::after {
margin-top: 10rpx; margin-top: 10rpx;
} }
.orderImg { .icon {
width: 70rpx; width: 70rpx;
height: 80rpx; height: 80rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 50rpx; margin-top: 50rpx;
} }
.order3 {
font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
margin-top: 10rpx;
}
.order4 {
font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #323232;
margin-top: -20rpx;
}
.orderImg1 {
width: 70rpx;
height: 80rpx;
margin: 0 auto;
margin-top: 20rpx;
}
} }
.right_box { .right_box {
margin-left: 20rpx; margin-left: 20rpx;
} // background: #00FF00;
width: 52%;
.box {
width: 396rpx; .two {
height: 128rpx;
background: #FFFFFF;
border-radius: 10rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 36rpx;
position: relative;
&.two {
margin-top: 15rpx; margin-top: 15rpx;
} }
.left { .box {
text-align: center; width: 100%;
} height: 129rpx;
// background: #FF0000;
h3 { background: #FFFFFF;
font-size: 28rpx; border-radius: 10rpx;
font-family: Arial-BoldMT, Arial; display: flex;
font-weight: 700; align-items: center;
color: #000000; justify-content: space-between;
} position: relative;
.dec { .left {
font-size: 20rpx; text-align: center;
font-family: PingFangSC-Regular, PingFang SC; padding-left: 30rpx;
font-weight: 400;
color: #323232; h3 {
margin-top: 10rpx font-size: 28rpx;
} font-family: Arial-BoldMT, Arial;
font-weight: 700;
.right_img { color: #000000;
width: 80rpx; }
height: 55rpx; .desc {
font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #323232;
margin-top: 10rpx
}
}
.right {
padding-right: 30rpx;
.icon {
width: 80rpx;
height: 55rpx;
}
}
} }
} }
} }
......
pages/order/order.vue
...@@ -38,8 +38,7 @@ ...@@ -38,8 +38,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="item.state == 2 || item.state == 3 || item.state == 4 || item.state == 5" <view v-if="item.state == 2 || item.state == 3 || item.state == 4 || item.state == 5 || item.state == 7" class="qr_code">
class="qr_code">
<image class="qr_code_img" src="/static/imgs/icon-barcode.png"></image> <image class="qr_code_img" src="/static/imgs/icon-barcode.png"></image>
<view class="qr_text">点击二维码取单</view> <view class="qr_text">点击二维码取单</view>
</view> </view>
......
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