1111111
This commit is contained in:
@@ -316,12 +316,12 @@
|
||||
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
|
||||
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
|
||||
</image>
|
||||
<text style="margin-top: 5px;color: #999;">(云菜窖)</text>
|
||||
<text style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text>
|
||||
</view>
|
||||
|
||||
|
||||
<view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;">
|
||||
<text style="color: #999;text-indent:2em;">小程序需要获取您的手机号,方便与您联系。</text>
|
||||
<text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能,云菜窖需要获取您的手机号。</text>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
@@ -56,10 +56,20 @@
|
||||
<view v-for="(item,index) in goods"
|
||||
style="display: flex;flex-direction: column;justify-content: center;width: 95%; margin-top: 15px; margin-left: 3%;">
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
|
||||
<view style="display: flex;flex-direction: row;align-items: center;
|
||||
justify-content: space-between;position: relative; z-index: 100; ">
|
||||
|
||||
<view style="box-sizing: border-box;">
|
||||
|
||||
<text v-if="item.state == '1'" style="opacity: 0.7; font-size: 14px;font-weight: 600;font-family: sans-serif;z-index: 101;
|
||||
margin-top: 30px; margin-left: 5px; width: 80px; height: 30px;line-height: 30px; text-align: center; background: #6d6d6d;
|
||||
position: absolute;border-radius: 20px;color: #fff;">已失效</text>
|
||||
<image :src="item.iconUrl"
|
||||
style="width: 90px;height: 90px; border-radius: 10px;z-index: 100;"
|
||||
mode="aspectFill" @click="itemClick(item.goodsSid)"></image>
|
||||
|
||||
</view>
|
||||
|
||||
<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
|
||||
mode="aspectFill" @click="itemClick(item.goodsSid)"></image>
|
||||
|
||||
<view
|
||||
style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;"
|
||||
@@ -72,7 +82,8 @@
|
||||
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
|
||||
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
<!-- :class="item.state=='0'?'oragin':'gray'" -->
|
||||
<text :class="item.state=='0'?'oragin':'gray'" style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
|
||||
|
||||
<text
|
||||
@@ -86,19 +97,26 @@
|
||||
v-if="item.type=='2'">企业菜!</text>
|
||||
</view>
|
||||
|
||||
<text :style="{color:(item.state == '1' ? '#999' : '#E36443')}"
|
||||
<!-- v-if="item.state == '0' " -->
|
||||
<text v-if="item.state == '0' "
|
||||
style="font-size: 10px;color: #E36443;margin-top: 8px;">提货截止日:{{item.periodValidity}}</text>
|
||||
|
||||
<text v-if="item.state == '1' "
|
||||
style="font-size: 10px;color: #999;margin-top: 8px;">抱歉,商品已超过提货截止日</text>
|
||||
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 10px;
|
||||
margin-right: 15px;">
|
||||
<view style="display: flex;flex-direction: row;align-items: center;">
|
||||
<text style="font-size: 12px;color: #666;">存量:</text>
|
||||
<!-- :style="{color:(item.state == '1' ? '#999' : '#FF5006')}" -->
|
||||
<text :style="{color:(item.state == '1' ? '#999' : '#FF5006')}"
|
||||
style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text>
|
||||
</view>
|
||||
|
||||
<!-- :class="item.state=='0'?'oragin':'gray'" -->
|
||||
<view style="display: flex;flex-direction: row;align-items: center;"
|
||||
:class="item.state=='0'?'oragin':'gray'" >
|
||||
:class="item.state=='0'?'oragin':'gray'">
|
||||
|
||||
<image src="../../static/jian_icon.png" mode="aspectFill"
|
||||
style="width: 20px;height: 20px;" @click.stop="jian(item)"></image>
|
||||
@@ -322,12 +340,13 @@
|
||||
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
|
||||
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
|
||||
</image>
|
||||
<text style="margin-top: 5px;color: #999;">(云菜窖)</text>
|
||||
<text
|
||||
style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text>
|
||||
</view>
|
||||
|
||||
|
||||
<view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;">
|
||||
<text style="color: #999;text-indent:2em;">小程序需要获取您的手机号,方便与您联系。</text>
|
||||
<text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能,云菜窖需要获取您的手机号。</text>
|
||||
</view>
|
||||
|
||||
|
||||
@@ -344,6 +363,28 @@
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 恢复预约提货弹框 -->
|
||||
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal2' ></view>
|
||||
<view class="modalDlg2" catchtouchmove='preventTouchMove' v-if='showModal2'>
|
||||
|
||||
<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;
|
||||
width: 80%; border-radius: 20px; background: linear-gradient(#FFF4E4, #fff);">
|
||||
|
||||
<image src="../../static/notices.png" style="width: 60px;height: 60px; margin-top: -30px;" mode="scaleToFill"></image>
|
||||
|
||||
<text style="margin-top: 16px;font-size: 18px;color: #101010;font-weight: 600;font-family: sans-serif;">温馨提示</text>
|
||||
<text style="margin-top: 12px;font-size: 14px;color: #333;padding-left: 30px;padding-right: 30px;">您好,云菜窖预约提货服务现已恢复正常,您可在“我的菜窖”页面进行预约提菜。</text>
|
||||
|
||||
<text style="margin-top: 25px;margin-bottom: 20px;border: 1px #FF9900 solid; color: #FF9900;font-size: 14px;
|
||||
border-radius: 20px;height: 40px; line-height: 40px;padding-left: 30px;padding-right: 30px;" @click="colseDialog2()">{{confirmText}}</text>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
@@ -359,6 +400,9 @@
|
||||
transferNotData: true,
|
||||
notData: false,
|
||||
showModal1: false,
|
||||
showModal2: true,
|
||||
confirmText: "我知道了(5s)",
|
||||
countdown: 5,
|
||||
showModal3: false,
|
||||
showModal4: false,
|
||||
scrollHeight: "",
|
||||
@@ -446,7 +490,8 @@
|
||||
this.page.endHeight = info.windowWidth * 0.8
|
||||
|
||||
this.shareGift()
|
||||
|
||||
this.showPop()
|
||||
|
||||
},
|
||||
filters: {
|
||||
/**
|
||||
@@ -482,6 +527,25 @@
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
|
||||
showPop() {
|
||||
|
||||
let timeOut = setInterval(() => {
|
||||
|
||||
if (this.countdown == 1) {
|
||||
this.showModal2 = false
|
||||
this.confirmText = "确定"
|
||||
this.countdown = 5
|
||||
clearInterval(timeOut)
|
||||
|
||||
} else {
|
||||
this.countdown = this.countdown - 1;
|
||||
this.confirmText = "我知道了" + "(" + this.countdown + "s)"
|
||||
}
|
||||
}, 1000)
|
||||
},
|
||||
|
||||
|
||||
getNotice() {
|
||||
let _this = this
|
||||
this.$api.getNotices().then((resp) => {
|
||||
@@ -678,6 +742,10 @@
|
||||
colseDialog1() {
|
||||
this.showModal1 = false
|
||||
},
|
||||
colseDialog2() {
|
||||
this.showModal2 = false
|
||||
clearInterval()
|
||||
},
|
||||
colseDialog3() {
|
||||
this.showModal3 = false
|
||||
},
|
||||
@@ -773,18 +841,17 @@
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
.gray {
|
||||
filter: grayscale(100%);
|
||||
-webkit-filter: grayscale(100%);
|
||||
transition: filter 0.2s;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.oragin {}
|
||||
|
||||
|
||||
|
||||
|
||||
.swiper-box {
|
||||
margin-top: -55px;
|
||||
height: 50rpx;
|
||||
@@ -829,12 +896,15 @@
|
||||
button {
|
||||
background: #FF9900;
|
||||
color: #fff;
|
||||
margin-top: 20px;
|
||||
height: 40px;
|
||||
width: 100%;
|
||||
height: 42px;
|
||||
line-height: 40px;
|
||||
text-align: center;
|
||||
border-radius: 20px;
|
||||
font-size: 13px;
|
||||
padding: 0px 15px;
|
||||
border: 1px #FF5006 solid;
|
||||
border-top-left-radius: 25px;
|
||||
border-bottom-left-radius: 25px;
|
||||
border-top-right-radius: 0px;
|
||||
border-bottom-right-radius: 0px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -124,9 +124,9 @@
|
||||
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;"></image>
|
||||
</view> -->
|
||||
|
||||
<button open-type="share" class='sharebtn'>
|
||||
<button open-type="share" style="margin-right: -20px;height: 20px;line-height: 20px;">
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end;">
|
||||
style="display: flex;flex-direction: row;align-items: center;">
|
||||
<text style="margin-right: 5px;color: #FF9900;font-size: 12px;">马上邀请</text>
|
||||
<image src="../../static/right_icon.png" style="width: 15px;height: 15px;"></image>
|
||||
</view>
|
||||
@@ -134,7 +134,8 @@
|
||||
|
||||
</view>
|
||||
|
||||
<text style="font-size: 12px;color: #4B4B4B; margin-top: 8px;">{{recommend.remarks}}</text>
|
||||
<text style="font-size: 12px;color: #4B4B4B; margin-top: 8px;"
|
||||
v-if="recommend.remarks!=''">{{recommend.remarks}}</text>
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center; margin-top: 10px;"
|
||||
v-if="recommend.vos.length>0">
|
||||
@@ -145,11 +146,12 @@
|
||||
</image> -->
|
||||
|
||||
<view
|
||||
style="display: flex;flex-direction: column; margin-left: 20px;width: 90%;box-sizing: border-box;">
|
||||
style="display: flex;flex-direction: column; margin-left:10px;width: 90%;box-sizing: border-box;">
|
||||
<view v-for="(child,pos) in recommend.vos" :key="pos" @click="recommendClick(child)"
|
||||
style="display: flex;flex-direction: column;width: 100%;box-sizing: border-box;">
|
||||
|
||||
<text style="color: #424242; font-size: 13px;line-height: 25px;">*{{child.remarks}}</text>
|
||||
<text
|
||||
style="color: #424242; font-size: 13px;line-height: 25px;">*{{child.remarks}}</text>
|
||||
|
||||
</view>
|
||||
|
||||
@@ -164,39 +166,40 @@
|
||||
<!-- </loading-state> -->
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 获取手机号弹框 -->
|
||||
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal1' @click="colseDialog1()"></view>
|
||||
<view class="modalDlg4" catchtouchmove='preventTouchMove' v-if='showModal1'>
|
||||
|
||||
<view style="display: flex;flex-direction: column;background: #fff; width: 80%; border-radius: 20px;
|
||||
|
||||
|
||||
<!-- 获取手机号弹框 -->
|
||||
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal1' @click="colseDialog1()"></view>
|
||||
<view class="modalDlg4" catchtouchmove='preventTouchMove' v-if='showModal1'>
|
||||
|
||||
<view style="display: flex;flex-direction: column;background: #fff; width: 80%; border-radius: 20px;
|
||||
">
|
||||
<view
|
||||
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
|
||||
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
|
||||
</image>
|
||||
<text style="margin-top: 5px;color: #999;">(云菜窖)</text>
|
||||
<view
|
||||
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
|
||||
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
|
||||
</image>
|
||||
<text
|
||||
style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text>
|
||||
</view>
|
||||
|
||||
|
||||
<view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;">
|
||||
<text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能,云菜窖需要获取您的手机号。</text>
|
||||
</view>
|
||||
|
||||
|
||||
<view
|
||||
style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 20px;">
|
||||
<button class="button1" @click="colseDialog1()">拒绝</button>
|
||||
<button class="button2" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">同意</button>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;">
|
||||
<text style="color: #999;text-indent:2em;">小程序需要获取您的手机号,方便与您联系。</text>
|
||||
</view>
|
||||
|
||||
|
||||
<view
|
||||
style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;margin-top: 20px;">
|
||||
<button class="button1" @click="colseDialog1()">拒绝</button>
|
||||
<button class="button2" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">同意</button>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -237,11 +240,11 @@
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (getApp().globalData.mobile == '')
|
||||
this.showModal1 = true
|
||||
|
||||
|
||||
|
||||
|
||||
this.getUserInfo()
|
||||
this.myRecommend()
|
||||
},
|
||||
@@ -321,7 +324,7 @@
|
||||
console.log(e);
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
onShareAppMessage: function(res) {
|
||||
// console.log("res", res)
|
||||
// console.log("data", res.target.dataset)
|
||||
@@ -482,7 +485,7 @@
|
||||
background: -webkit-linear-gradient(left, #FEA65F, #FB9440);
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* 顶部 */
|
||||
.top {
|
||||
@@ -622,7 +625,7 @@
|
||||
|
||||
.sharebtn {
|
||||
margin-right: -10px;
|
||||
background: #fff;
|
||||
background: #f0f;
|
||||
/* font-size: 12px;
|
||||
color: #fff;
|
||||
width: 30vw;
|
||||
@@ -633,7 +636,8 @@
|
||||
.sharebtn::after {
|
||||
border: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* 弹窗样式 */
|
||||
.model {
|
||||
position: absolute;
|
||||
@@ -644,9 +648,9 @@
|
||||
opacity: 0.7;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
.modalDlg4 {
|
||||
/* 设置超出滚动 */
|
||||
overflow: auto;
|
||||
@@ -661,9 +665,9 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
.button1 {
|
||||
|
||||
|
||||
background: #fff;
|
||||
color: #666;
|
||||
flex: 1;
|
||||
@@ -671,7 +675,7 @@
|
||||
border-bottom-left-radius: 20px;
|
||||
border: 1px solid #eee;
|
||||
}
|
||||
|
||||
|
||||
.button2 {
|
||||
background: #fff;
|
||||
color: #FF9900;
|
||||
@@ -680,22 +684,17 @@
|
||||
flex: 1;
|
||||
border: 1px solid #eee;
|
||||
}
|
||||
|
||||
|
||||
button {
|
||||
background: #FF9900;
|
||||
background: #fff;
|
||||
color: #fff;
|
||||
margin-top: 20px;
|
||||
height: 40px;
|
||||
width: 100%;
|
||||
height: 42px;
|
||||
line-height: 40px;
|
||||
text-align: center;
|
||||
border-radius: 20px;
|
||||
font-size: 13px;
|
||||
padding: 0px 15px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
button::after {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
Reference in New Issue
Block a user