1111111111
This commit is contained in:
@@ -174,7 +174,7 @@
|
|||||||
return;
|
return;
|
||||||
}else{
|
}else{
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: '/pages/home/pickUpCard'
|
url: '/pages/home/myCellar'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -220,6 +220,8 @@
|
|||||||
this.pickingUpGoods = JSON.parse(options.pickingUpGoods)
|
this.pickingUpGoods = JSON.parse(options.pickingUpGoods)
|
||||||
this.affiliation = options.affiliation
|
this.affiliation = options.affiliation
|
||||||
|
|
||||||
|
console.log(">>>>>",options);
|
||||||
|
|
||||||
},
|
},
|
||||||
onUnload() {
|
onUnload() {
|
||||||
uni.$off('address');
|
uni.$off('address');
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop()">
|
<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop()">
|
||||||
<text
|
<text
|
||||||
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
|
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
|
||||||
起订协议</text>
|
起订说明</text>
|
||||||
<text style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
|
<text style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
|
||||||
>></text>
|
>></text>
|
||||||
</view>
|
</view>
|
||||||
@@ -105,9 +105,9 @@
|
|||||||
</loading-state>
|
</loading-state>
|
||||||
|
|
||||||
<uni-popup ref="inputDialog" type="dialog">
|
<uni-popup ref="inputDialog" type="dialog">
|
||||||
<uni-popup-dialog ref="inputClose" mode="base" title="起订协议" :showConfirm="true"
|
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
||||||
:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
|
:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
|
||||||
content="1、菜窖起订量为20斤,20-100斤需额外支付10%附加费用,101斤-200斤需额外支付5%附加费用。\n2、新用户可享受首单20斤5折优惠。"></uni-popup-dialog>
|
content="菜窖起订量为20斤,\n\n20-100斤需额外支付10%附加费用,\n\n101斤-200斤需额外支付5%附加费用,\n\n200斤以上无附加费。"></uni-popup-dialog>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -188,7 +188,7 @@
|
|||||||
<uni-popup ref="inputDialog2" type="dialog">
|
<uni-popup ref="inputDialog2" type="dialog">
|
||||||
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
||||||
:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
|
:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
|
||||||
content="1、菜窖起订量为20斤,20-100斤需额外支付10%附加费用,101斤-200斤需额外支付5%附加费用。\n2、新用户可享受首单20斤5折优惠。"></uni-popup-dialog>
|
content="菜窖起订量为20斤,\n\n20-100斤需额外支付10%附加费用,\n\n101斤-200斤需额外支付5%附加费用,\n\n200斤以上无附加费。"></uni-popup-dialog>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
<view class="center">
|
<view class="center">
|
||||||
|
|
||||||
<view style="width: 22%;display: flex;flex-direction: column;overflow-y: auto;padding-top: 10px;">
|
<view style="width: 22%;display: flex;flex-direction: column;overflow-y: auto;padding-top: 10px;">
|
||||||
<text style="width: 100%;text-align: center;margin-bottom: 5px;margin-top: 5px;
|
<!-- <text style="width: 100%;text-align: center;margin-bottom: 5px;margin-top: 5px;
|
||||||
color: #333;font-weight: 600;font-size: 13px;">全部分类</text>
|
color: #333;font-weight: 600;font-size: 13px;">全部分类</text> -->
|
||||||
<view style="width: 100%;display: flex;flex-direction: column; ">
|
<view style="width: 100%;display: flex;flex-direction: column; ">
|
||||||
<view v-for="(item,index) in data" @click="labelClick(index,item)"
|
<view v-for="(item,index) in data" @click="labelClick(index,item)"
|
||||||
style="display: flex;flex-direction: column;justify-content: center;position: relative;">
|
style="display: flex;flex-direction: column;justify-content: center;position: relative;">
|
||||||
@@ -531,7 +531,7 @@
|
|||||||
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/good/reservation?pickingUpGoods=' + JSON.stringify(this.pickingUpGoods) +
|
url: '/pages/good/reservation?pickingUpGoods=' + JSON.stringify(this.pickingUpGoods) +
|
||||||
"&affiliation=" + this.brandType,
|
"&affiliation=" + this.data[this.selectIndex].id,
|
||||||
})
|
})
|
||||||
|
|
||||||
// this.showModal = true
|
// this.showModal = true
|
||||||
|
|||||||
@@ -127,7 +127,7 @@
|
|||||||
showCancel: false,
|
showCancel: false,
|
||||||
success: function(res) {
|
success: function(res) {
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: '/pages/home/pickUpCard'
|
url: '/pages/home/myCellar'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user