111111111
This commit is contained in:
@@ -257,7 +257,7 @@
|
||||
{
|
||||
"path": "pages/good/shoppCart",
|
||||
"style": {
|
||||
"navigationBarTitleText": "购物车",
|
||||
"navigationBarTitleText": "购菜车",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
@@ -282,7 +282,8 @@
|
||||
{
|
||||
"path": "pages/good/reservation",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
"navigationStyle": "custom",
|
||||
"disableScroll": true
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -349,7 +350,7 @@
|
||||
],
|
||||
"globalStyle": {
|
||||
"navigationBarTextStyle": "white",
|
||||
"navigationBarTitleText": "云菜窖",
|
||||
"navigationBarTitleText": "惠享云菜窖",
|
||||
"navigationBarBackgroundColor": "#FE9039",
|
||||
"backgroundColor": "#FE9039"
|
||||
},
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
<template>
|
||||
<view style="width: 100%;height: 100%;overflow: scroll;position: absolute;">
|
||||
<view style="width: 100%;height: 100%;background: #FFA35A;display: flex;flex-direction: column;">
|
||||
|
||||
<NavBar ref="nav" navTitle="预约提菜" :showIcon="true" :supportChange="false">
|
||||
</NavBar>
|
||||
|
||||
<loading-state ref="pageView" @request="request">
|
||||
|
||||
<view style="background: #FFA35A;width: 100%;height: 100%;overflow: scroll;position: absolute;">
|
||||
<!-- <view style="background: #FFA35A;width: 100%;height: 100%;"> -->
|
||||
|
||||
|
||||
<view style="display: flex;flex-direction: column;background: #F2F2F2; width: 100%;
|
||||
border-radius: 25px;height: 100vh; padding: 10px;box-sizing: border-box;position: absolute;">
|
||||
border-radius: 25px;height: 100vh; padding: 10px;box-sizing: border-box;">
|
||||
|
||||
<view style="display: flex;flex-direction: column;background: #fff;
|
||||
border-radius: 15px;padding: 15px 10px;">
|
||||
|
||||
<view
|
||||
<view v-if="info.storeSid!=''"
|
||||
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
|
||||
|
||||
<text
|
||||
@@ -29,7 +29,22 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
|
||||
<view v-if="info.storeSid==''"
|
||||
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
|
||||
|
||||
<text
|
||||
style="font-size: 16px;color: #000; font-weight: 600;font-family: sans-serif;">暂无提货单信息</text>
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;" @click="address()">
|
||||
<text style="font-size: 12px;color: #FF9900;">去完善</text>
|
||||
<image src="../../static/right_icon.png"
|
||||
style="width: 15px;height: 15px;margin-left: 5px;">
|
||||
</image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view v-if="info.storeSid!=''" style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
|
||||
<image src="https://supervise.yxtsoft.com/lpk/image/date.png"
|
||||
style="width:20px;height: 20px;">
|
||||
</image>
|
||||
@@ -38,7 +53,7 @@
|
||||
|
||||
</view>
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
|
||||
<view v-if="info.storeSid!=''" style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
|
||||
<image src="https://supervise.yxtsoft.com/lpk/image/location.png"
|
||||
style="width: 20px;height: 20px;">
|
||||
</image>
|
||||
@@ -95,14 +110,17 @@
|
||||
<text
|
||||
style="font-size: 15px; color: #000; font-weight: 600;font-family: sans-serif;">所提菜列表</text>
|
||||
|
||||
<scroll-view scroll-y="true" style="max-height:calc(100vh - 450px); width: 100%; box-sizing: border-box; margin-top: 10px;;
|
||||
" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
|
||||
|
||||
<view style="width: 100%; display: flex;flex-direction: column; margin-top: 10px;">
|
||||
<view v-for="(item,index) in pickingUpGoods" @click="itemClick(item.goodsSid)"
|
||||
style="display: flex;flex-direction: column;justify-content: center;width: 100%; margin-top: 15px; ">
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
|
||||
|
||||
<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
|
||||
mode="aspectFill">
|
||||
<image :src="item.iconUrl"
|
||||
style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill">
|
||||
</image>
|
||||
|
||||
<view
|
||||
@@ -168,17 +186,19 @@
|
||||
|
||||
</view>
|
||||
|
||||
</scroll-view>
|
||||
|
||||
</view>
|
||||
|
||||
<view
|
||||
style="position: fixed;bottom: 0; width: 100%; box-sizing: border-box; padding-left: 10vw;padding-right: 10vw;display: flex;flex-direction: row; justify-content: center;align-items: center;">
|
||||
<text style=" background: #FF9900;color: #fff;margin-top: 20px;margin-bottom: 20px; border-radius: 20px;
|
||||
<text style=" background: #FF9900;color: #fff;margin-bottom: 20px; border-radius: 20px;
|
||||
padding-top: 10px;padding-bottom: 10px;padding-left: 25vw;padding-right: 25vw; text-align: center;"
|
||||
@click="congirmExtract()">确认提菜</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<!-- </view> -->
|
||||
</loading-state>
|
||||
</view>
|
||||
</template>
|
||||
@@ -217,10 +237,12 @@
|
||||
this.request()
|
||||
this.getSun()
|
||||
|
||||
this.pickingUpGoods = JSON.parse(options.pickingUpGoods)
|
||||
this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods))
|
||||
this.affiliation = options.affiliation
|
||||
|
||||
console.log(">>>>>",options);
|
||||
console.log(">>>>>", options);
|
||||
console.log(">>>>>", this.pickingUpGoods);
|
||||
console.log(">>>>>", this.affiliation);
|
||||
|
||||
},
|
||||
onUnload() {
|
||||
@@ -300,6 +322,12 @@
|
||||
congirmExtract() {
|
||||
let _this = this
|
||||
|
||||
if (_this.info.storeSid == '') {
|
||||
this.shortToast('请完善提货点信息')
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
if (_this.info.reserveDate == '') {
|
||||
this.shortToast('请选择日期')
|
||||
return
|
||||
|
||||
@@ -57,6 +57,19 @@
|
||||
</view>
|
||||
<view style="height: 150px; background: #F2F2F2;"></view>
|
||||
</view>
|
||||
|
||||
<view v-if="notData"
|
||||
style="display: flex;flex-direction: column;align-items: center;margin-top: -30vw;">
|
||||
|
||||
<image src="https://supervise.yxtsoft.com/lpk/image/not_Cart.png" mode="aspectFit"
|
||||
style="width: 50vw;height: 50vw;"></image>
|
||||
<view style="display: flex;flex-direction: column;align-items: center;margin-top: 10px;">
|
||||
<text style="font-size: 14px; color: #666;margin-right: 5px;">购菜车是空的</text>
|
||||
<text style="font-size: 14px;color: #fff;padding: 8px 40px; border-radius: 20px;
|
||||
background: -webkit-linear-gradient(left,#FFC369,#FF9901);margin-top: 10px;" @click="gotoShopp()">去逛逛</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- </scroll-view> -->
|
||||
|
||||
<view style=" width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden;
|
||||
@@ -117,6 +130,7 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
notData:false,
|
||||
dialogBeforeClose: false,
|
||||
page: {
|
||||
affiliation: '',
|
||||
@@ -141,6 +155,11 @@
|
||||
this.request()
|
||||
},
|
||||
methods: {
|
||||
gotoShopp(){
|
||||
uni.reLaunch({
|
||||
url:"/pages/home/cloudCard2"
|
||||
})
|
||||
},
|
||||
showPop() {
|
||||
|
||||
this.$refs.inputDialog.open()
|
||||
@@ -162,17 +181,11 @@
|
||||
console.log("resp", resp);
|
||||
_this.data = resp
|
||||
|
||||
_this.notData = resp.length==0
|
||||
// _this.getallPrice()
|
||||
// _this.getweight()
|
||||
_this.getAllPriceOrWeight()
|
||||
|
||||
// 无数据
|
||||
if (_this.data.length == 0) {
|
||||
_this.$nextTick(() => {
|
||||
_this.$refs.pageView.setLoadState(100)
|
||||
})
|
||||
}
|
||||
|
||||
}).catch(e => {
|
||||
// 错误 1
|
||||
_this.$nextTick(() => {
|
||||
@@ -250,8 +263,6 @@
|
||||
_this.page.weight = resp.totalWeight
|
||||
_this.page.remarks = resp.remarks
|
||||
|
||||
_this.initPrice = resp.totalPrice
|
||||
_this.initWeight = resp.totalWeight
|
||||
|
||||
_this.$nextTick(() => {
|
||||
_this.$refs.pageView.setLoadState(2)
|
||||
|
||||
@@ -108,6 +108,19 @@
|
||||
|
||||
</view>
|
||||
|
||||
<view v-if="notData"
|
||||
style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 5vw;">
|
||||
|
||||
<image src="https://supervise.yxtsoft.com/lpk/image/supplementing.png"
|
||||
mode="aspectFill" style="width: 40vw;height: 40vw; "></image>
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
|
||||
<text
|
||||
style="font-size: 16px; color: #999;">菜窖还在补充中~</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
@@ -149,16 +162,16 @@
|
||||
|
||||
<button open-type="share">分享新人有礼</button>
|
||||
|
||||
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
|
||||
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 5px;height: 42px;flex: 1;
|
||||
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;" @click="gotoCart()">
|
||||
<image src="../../static/shoppCart_icon.png" mode="aspectFill"
|
||||
style="height: 20px;width: 20px;flex-shrink: 0;">
|
||||
</image>
|
||||
<view style="display: flex;flex-direction: column;flex: 1;">
|
||||
<text
|
||||
style="font-size: 15px;color: #FF5006;margin-left: 10px;height: 20px;line-height: 20px;margin-top: 5px;font-weight: bold;">¥{{page.price}}</text>
|
||||
style="font-size: 15px;color: #FF5006;margin-left: 5px;height: 20px;line-height: 20px;margin-top: 5px;font-weight: bold;">¥{{page.price}}</text>
|
||||
<text
|
||||
style="font-size: 10px;color: #666;margin-left: 10px; height: 10px;line-height: 10px;margin-bottom: 5px;">{{page.remarks}}</text>
|
||||
style="font-size: 10px;color: #666;margin-left: 5px; height: 10px;line-height: 10px;margin-bottom: 5px;">{{page.remarks}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -199,6 +212,7 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
notData: false,
|
||||
dialogContent: "这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容这里是协议内容,这里是协议内容",
|
||||
confirmText: "我知道了(5s)",
|
||||
dialogBeforeClose: false,
|
||||
@@ -353,6 +367,7 @@
|
||||
|
||||
_this.$api.getGoodsByType(_this.searchInfo).then((resp) => {
|
||||
_this.goods = resp
|
||||
_this.notData = resp.length == 0
|
||||
_this.getAllPriceOrWeight()
|
||||
}).catch(e => {
|
||||
_this.$nextTick(() => {
|
||||
@@ -587,8 +602,8 @@
|
||||
// 模拟网络请求
|
||||
setTimeout(() => {
|
||||
|
||||
var params ={
|
||||
customerSid:getApp().globalData.sid
|
||||
var params = {
|
||||
customerSid: getApp().globalData.sid
|
||||
}
|
||||
|
||||
_this.$api.recommendNewUsers(params).then((resp) => {
|
||||
@@ -603,7 +618,8 @@
|
||||
// url: '/pages/bind/bind_cloudCard?code=' + resp
|
||||
// .transferCode + "&codeKey=" + resp.sid
|
||||
|
||||
url: '/pages/home/myCellar?shareSid=' + getApp().globalData.sid+"&orderSid=" + resp.sid,
|
||||
url: '/pages/home/myCellar?shareSid=' + getApp()
|
||||
.globalData.sid + "&orderSid=" + resp.sid,
|
||||
functionName: 'share'
|
||||
})
|
||||
// 转码传输
|
||||
|
||||
@@ -131,7 +131,8 @@
|
||||
@click="transfer()">转赠亲友</text>
|
||||
|
||||
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
|
||||
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" @click="gotoCart()">
|
||||
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;"
|
||||
@click="gotoCart()">
|
||||
<!-- image src="../../static/shoppCart_icon.png" mode="aspectFill"
|
||||
style="height: 20px;width: 25px;"></image> -->
|
||||
<text style="font-size: 12px;color: #666;margin-left: 10px; ">已选中</text>
|
||||
@@ -250,7 +251,7 @@
|
||||
" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
|
||||
<view style="display: flex;flex-direction: column;">
|
||||
|
||||
<view v-for="(item,index) in goods"
|
||||
<view v-for="(item,index) in pickingUpGoods"
|
||||
style=" display: flex;flex-direction: row;margin-top: 15px; margin-bottom: 10px;">
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
|
||||
@@ -309,6 +310,17 @@
|
||||
|
||||
</view>
|
||||
|
||||
<view v-if="transferNotData"
|
||||
style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 5vw;">
|
||||
|
||||
<image src="https://supervise.yxtsoft.com/lpk/image/supplementing.png" mode="aspectFit"
|
||||
style="width: 50vw;height: 50vw;"></image>
|
||||
<view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
|
||||
<text style="font-size: 14px; color: #666;margin-right: 5px;">请添加~</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
@@ -330,7 +342,7 @@
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<button open-type="share">确认</button>
|
||||
<button open-type="share" :disabled="butdisabled">确认</button>
|
||||
|
||||
</view>
|
||||
|
||||
@@ -344,6 +356,8 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
butdisabled: true,
|
||||
transferNotData: true,
|
||||
notData: false,
|
||||
showModal: false,
|
||||
showModal2: false,
|
||||
@@ -391,9 +405,7 @@
|
||||
newPerGiftList: [
|
||||
|
||||
],
|
||||
transferInfo: {
|
||||
|
||||
},
|
||||
transferInfo: {},
|
||||
newporGiftSid: "",
|
||||
orderSid: "",
|
||||
shareSid: ""
|
||||
@@ -471,7 +483,7 @@
|
||||
_this.data = resp
|
||||
_this.pickingUpGoods = []
|
||||
_this.baseDataSuccess = true
|
||||
_this.selectIndex = 0
|
||||
// _this.selectIndex = 0
|
||||
_this.getgoods()
|
||||
}).catch(e => {
|
||||
_this.$nextTick(() => {
|
||||
@@ -514,6 +526,7 @@
|
||||
|
||||
this.getcount()
|
||||
this.addGoods(item)
|
||||
|
||||
},
|
||||
|
||||
getcount() {
|
||||
@@ -524,6 +537,9 @@
|
||||
}
|
||||
|
||||
this.page.count = num
|
||||
|
||||
this.butdisabled = this.page.count == 0
|
||||
|
||||
},
|
||||
|
||||
addGoods(goods) {
|
||||
@@ -544,6 +560,9 @@
|
||||
|
||||
}
|
||||
|
||||
this.transferNotData = this.pickingUpGoods.length == 0
|
||||
|
||||
|
||||
},
|
||||
|
||||
itemClick(goodsSid) {
|
||||
@@ -568,10 +587,11 @@
|
||||
|
||||
},
|
||||
reservation() {
|
||||
console.log(">>>>>>>>>>",this.pickingUpGoods);
|
||||
if (this.pickingUpGoods.length > 0) {
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/good/reservation?pickingUpGoods=' + JSON.stringify(this.pickingUpGoods) +
|
||||
url: '/pages/good/reservation?pickingUpGoods=' + encodeURIComponent(JSON.stringify(this.pickingUpGoods)) +
|
||||
"&affiliation=" + this.data[this.selectIndex].id,
|
||||
})
|
||||
|
||||
|
||||
@@ -156,6 +156,7 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
butdisabled: true,
|
||||
page: {
|
||||
startHeight: 0,
|
||||
endHeight: 0
|
||||
|
||||
Reference in New Issue
Block a user