yxt_product
/
yxt-yythmall-ui-miniprogram
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11111111

master
guoxing 1 year ago
parent
944a015134
commit
ca314defad
6 changed files with 175 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      common/request.api.js
  2. 8
      pages/bind/bind_pickUpCard.vue
  3. 8
      pages/bind/bind_pickUpCard2.vue
  4. 156
      pages/good/shoppCart.vue
  5. 74
      pages/home/cloudCard2.vue
  6. 2
      pages/home/myHome.vue

3
common/request.api.js
View File

@ -114,6 +114,9 @@ export default {
shoppingCartList: (params = {}) => request.post("/shoppingcart/shoppingCartList", params, {}, {}, true), shoppingCartList: (params = {}) => request.post("/shoppingcart/shoppingCartList", params, {}, {}, true),
// 结算 跳过支付 // 结算 跳过支付
saveGoods: (params = {}) => request.post("/vegetablecellar/saveGoods", params), saveGoods: (params = {}) => request.post("/vegetablecellar/saveGoods", params),
// 正式结算 支付
createVegeOrder: (params = {}) => request.post("/empsreservoorder/createVegeOrder", params),
// 我的菜窖 新人礼包列表 // 我的菜窖 新人礼包列表
newUserQuota: (params = {}) => request.post("/appletgiftbag/newUserQuota", params), newUserQuota: (params = {}) => request.post("/appletgiftbag/newUserQuota", params),

8
pages/bind/bind_pickUpCard.vue
View File

@ -52,17 +52,17 @@
<input maxlength="20" placeholder="请输入/扫码" <input maxlength="20" placeholder="请输入/扫码"
style="font-size: 30rpx;flex: 1;margin-right: 20px;padding-left: 10px;" type="number" style="font-size: 30rpx;flex: 1;margin-right: 20px;padding-left: 10px;" type="number"
:value="page.code" @input="onKeyInput1" /> :value="page.code" @input="onKeyInput1" />
<view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view> <!-- <view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view>
<uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;margin-right: 10px;" <uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;margin-right: 10px;"
@click="scan" /> @click="scan" /> -->
</view> </view>
<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text> <!-- <text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text>
<view style="display: flex;flex-direction: row;justify-content: space-between; <view style="display: flex;flex-direction: row;justify-content: space-between;
background: #F8F8F8;border-radius: 5px; padding:10px 0px; background: #F8F8F8;border-radius: 5px; padding:10px 0px;
box-sizing: border-box;width: calc(100vw - 40px);align-items: center;margin-top: 10px;"> box-sizing: border-box;width: calc(100vw - 40px);align-items: center;margin-top: 10px;">
<input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;" <input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;"
type="number" :value="page.codeKey" @input="onKeyInput2" /> type="number" :value="page.codeKey" @input="onKeyInput2" />
</view> </view> -->
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px; <view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex; width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;

8
pages/bind/bind_pickUpCard2.vue
View File

@ -55,17 +55,17 @@
<input maxlength="20" placeholder="请输入/扫码" <input maxlength="20" placeholder="请输入/扫码"
style="font-size: 30rpx;flex: 1;margin-right: 20px;padding-left: 10px;" type="number" style="font-size: 30rpx;flex: 1;margin-right: 20px;padding-left: 10px;" type="number"
:value="page.code" @input="onKeyInput1" /> :value="page.code" @input="onKeyInput1" />
<view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view> <!-- <view style="width: 1px;height: 20px;background: #ccc; margin-right: 10px;"></view>
<uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;margin-right: 10px;" <uni-icons type="camera-filled" color="#c0c4cc" size="22" style="flex-shrink: 0;margin-right: 10px;"
@click="scan" /> @click="scan" /> -->
</view> </view>
<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text> <!-- <text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货密码</text>
<view style="display: flex;flex-direction: row;justify-content: space-between; <view style="display: flex;flex-direction: row;justify-content: space-between;
background: #F8F8F8;border-radius: 5px; padding:10px 0px; background: #F8F8F8;border-radius: 5px; padding:10px 0px;
box-sizing: border-box;width: calc(100vw - 40px);align-items: center;margin-top: 10px;"> box-sizing: border-box;width: calc(100vw - 40px);align-items: center;margin-top: 10px;">
<input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;" <input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;"
type="number" :value="page.codeKey" @input="onKeyInput2" /> type="number" :value="page.codeKey" @input="onKeyInput2" />
</view> </view> -->
<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px; <view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px;
width: 90%;border-radius: 100rpx;height: 80rpx;display: flex; width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;

156
pages/good/shoppCart.vue
View File

@ -62,10 +62,22 @@
<view style="height: 15vw; width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden; <view style="height: 15vw; width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden;
justify-content: center;align-items: center; background: #fff;padding-top: 10px;padding-bottom: 10px;"> justify-content: center;align-items: center; background: #fff;padding-top: 10px;padding-bottom: 10px;">
<view style="display: flex;flex-direction: row;align-items: center;"> <view id="bomView" style="display: flex;flex-direction: row;align-items: center;">
<view style="color: #888;font-size: 10px;">温馨提示：已定制了</view> <view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
<view style="color: #FF5006;font-size: 15px;">{{page.weight}}斤</view> 温馨提示：已订</view>
<view style="color: #888;font-size: 10px;">，满200斤可定制云菜窖</view> <view style="color: #FF5006;font-size: 15px;height: 15px;line-height: 15px;font-weight: bold;">
{{page.weight}}斤
</view>
<view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
，{{page.qssl}}起订。</view>
<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop()">
<text
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
起订协议</text>
<text style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
>></text>
</view>
</view> </view>
<view <view
@ -73,14 +85,15 @@
<view <view
style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 40px 5px 15px; style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 40px 5px 15px; flex: 1;
display: flex;flex-direction: row;align-items: center;border-top-left-radius: 25px; border-bottom-left-radius: 25px;" display: flex;flex-direction: row;align-items: center;border-top-left-radius: 25px; border-bottom-left-radius: 25px;">
@click="gotoCart()">
<image src="../../static/shoppCart_icon.png" mode="aspectFill" <image src="../../static/shoppCart_icon.png" mode="aspectFill"
style="height: 20px;width: 25px;"> style="height: 20px;width: 20px;flex-shrink: 0;">
</image> </image>
<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price}}</text> <view style="display: flex;flex-direction: column;flex: 1;">
<text style="font-size: 10px;color: #666;margin-left: 10px; ">共减：￥{{page.reduce}}</text> <text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price}}</text>
<text style="font-size: 10px;color: #666;margin-left: 10px; ">{{page.remarks}}</text>
</view>
</view> </view>
<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px; <text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;" border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;"
@ -90,6 +103,13 @@
</view> </view>
</loading-state> </loading-state>
<uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog ref="inputClose" mode="base" title="起订协议" :showConfirm="true"
:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
content="1、20斤起订量。\n2、新用户正好20斤5折。\n3、20-100斤加10%附加额。\n4、101斤-200斤加5%附加额。"></uni-popup-dialog>
</uni-popup>
</view> </view>
</template> </template>
@ -97,11 +117,14 @@
export default { export default {
data() { data() {
return { return {
dialogBeforeClose: false,
page: { page: {
affiliation: '', affiliation: '',
weight: "0", weight: "0",
price: "0", price: "0",
reduce: "0" reduce: "0",
remarks: "",
qssl: ""
}, },
data: [ data: [
@ -110,10 +133,20 @@
}, },
onLoad(options) { onLoad(options) {
this.page.affiliation = options.affiliation this.page.affiliation = options.affiliation
this.page.qssl = options.weight
console.log(" options", options); console.log(" options", options);
this.request() this.request()
}, },
methods: { methods: {
showPop() {
this.$refs.inputDialog.open()
},
dialogInputConfirm() {
this.dialogBeforeClose = true
},
request() { request() {
let _this = this let _this = this
@ -126,12 +159,10 @@
console.log("resp", resp); console.log("resp", resp);
_this.data = resp _this.data = resp
_this.getallPrice() // _this.getallPrice()
_this.getweight() // _this.getweight()
_this.getAllPriceOrWeight()
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2)
})
// 无数据 // 无数据
if (_this.data.length == 0) { if (_this.data.length == 0) {
_this.$nextTick(() => { _this.$nextTick(() => {
@ -169,8 +200,8 @@
const index = that.data.findIndex((info) => info.goodsSid === item.goodsSid) const index = that.data.findIndex((info) => info.goodsSid === item.goodsSid)
console.log("index》》》》", index) console.log("index》》》》", index)
that.data.splice(index, 1) that.data.splice(index, 1)
that.getallPrice() // that.getallPrice()
that.getweight() // that.getweight()
that.upDateShoppCart(item) that.upDateShoppCart(item)
} else if (res.cancel) { } else if (res.cancel) {
@ -184,8 +215,8 @@
} }
item.totalPrice = Number(item.goodsNumber) * Number(item.price) item.totalPrice = Number(item.goodsNumber) * Number(item.price)
that.getallPrice() // that.getallPrice()
that.getweight() // that.getweight()
that.upDateShoppCart(item) that.upDateShoppCart(item)
} }
@ -195,12 +226,42 @@
item.goodsNumber = Number(item.goodsNumber) + 1 item.goodsNumber = Number(item.goodsNumber) + 1
item.totalPrice = Number(item.goodsNumber) * Number(item.price) item.totalPrice = Number(item.goodsNumber) * Number(item.price)
this.getallPrice() // this.getallPrice()
this.getweight() // this.getweight()
this.upDateShoppCart(item) this.upDateShoppCart(item)
}, },
getAllPriceOrWeight() {
let _this = this
var params = {
customerSid: getApp().globalData.sid,
brandId: this.page.affiliation,
}
_this.$api.getGoodsWeight(params).then((resp) => {
console.log("getGoodsWeight", resp);
_this.page.price = resp.totalPrice
_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)
})
}).catch(e => {
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1)
})
})
},
getallPrice() { getallPrice() {
let num = 0; let num = 0;
@ -236,54 +297,39 @@
let _this = this let _this = this
_this.$api.addShoppingCart(good).then((resp) => { _this.$api.addShoppingCart(good).then((resp) => {
_this.getAllPriceOrWeight()
}).catch(e => {}) }).catch(e => {
_this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1)
})
})
}, },
settlement() { settlement() {
// 支付 // 支付
if (this.page.weight < 200) { if (this.page.weight < parseInt(this.page.qssl)) {
this.shortToast('满200斤才可定制云菜窖哦，请继续选菜吧。') this.shortToast('满' + this.page.qssl + '斤才可定制云菜窖哦，请继续选菜吧。')
return
}
let list = []
for (var i = 0; i < this.goods.length; i++) {
var item = this.data[i]
if (item.goodsNumber > 0)
list.push({
goodsSid: item.goodsSid,
goodsName: item.name,
partNumber: item.goodsNumber,
numofPart: item.weight,
priceUnit: item.jprice,
pricePart: item.mefenPrice,
})
}
// console.log("ddd", list);
if (list.length == 0) {
this.shortToast('请添加商品')
return return
} }
var params = { var params = {
customerSid: getApp().globalData.sid, customerSid: getApp().globalData.sid,
cardNumber: 1, // cardNumber: 1,
brandId: this.page.affiliation,
totalTee: this.page.price, totalTee: this.page.price,
ordOrderDetailsVoList: list
// ordOrderDetailsVoList: list
} }
// console.log("params", params); console.log("params", params);
let _this = this let _this = this
_this.$api.createOrder(params).then((resp) => { // _this.$api.createVegeOrder(params).then((resp) => {
// console.log("resp", resp); // // console.log("resp", resp);
this.$pay(resp) // this.$pay(resp)
}).catch(e => {}) // }).catch(e => {
// })
}, },

74
pages/home/cloudCard2.vue
View File

@ -110,8 +110,8 @@
<view class="bottom"> <view class="bottom">
<view style="display: flex;flex-direction: row;align-items: center; padding-left: 30px;"> <view style="display: flex;flex-direction: row;align-items: center; justify-content: center;">
<view style="width: 35px;height: 35px;position: relative; visibility: hidden; "> <!-- <view style="width: 35px;height: 35px;position: relative; visibility: hidden; ">
<image style="width: 25px;height: 25px;margin-left: 5px; margin-top: 5px; " <image style="width: 25px;height: 25px;margin-left: 5px; margin-top: 5px; "
src="../../static/basket_icon.png" mode="aspectFill"></image> src="../../static/basket_icon.png" mode="aspectFill"></image>
@ -123,7 +123,7 @@
padding: 2px 5px; padding: 2px 5px;
width: auto;">{{page.count}}</view> width: auto;">{{page.count}}</view>
</view> </view> -->
<view id="bomView" style="display: flex;flex-direction: row;align-items: center;"> <view id="bomView" style="display: flex;flex-direction: row;align-items: center;">
<view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;"> <view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
@ -135,6 +135,16 @@
<view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;"> <view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
，{{data.brandVos[selectIndex2].qssl}}起订。</view> ，{{data.brandVos[selectIndex2].qssl}}起订。</view>
<view style="display: flex;flex-direction: row;align-items: center;" @click="showPop2()">
<text
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;text-decoration:underline;font-style:oblique;">
起订协议</text>
<text
style="color: #6190D8;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
>></text>
</view>
</view> </view>
</view> </view>
@ -152,7 +162,7 @@
<text <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: 10px;height: 20px;line-height: 20px;margin-top: 5px;font-weight: bold;">￥{{page.price}}</text>
<text <text
style="font-size: 10px;color: #666;margin-left: 10px; height: 10px;line-height: 10px;margin-bottom: 5px;">配送费：￥{{page.reduce}}</text> style="font-size: 10px;color: #666;margin-left: 10px; height: 10px;line-height: 10px;margin-bottom: 5px;">{{page.remarks}}</text>
</view> </view>
</view> </view>
@ -176,6 +186,12 @@
:content="data.brandVos[selectIndex2].dgxy" :confirm-text="confirmText"></uni-popup-dialog> :content="data.brandVos[selectIndex2].dgxy" :confirm-text="confirmText"></uni-popup-dialog>
</uni-popup> </uni-popup>
<uni-popup ref="inputDialog2" type="dialog">
<uni-popup-dialog ref="inputClose" mode="base" title="起订协议" :showConfirm="true"
:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
content="1、20斤起订量。\n2、新用户正好20斤5折。\n3、20-100斤加10%附加额。\n4、101斤-200斤加5%附加额。"></uni-popup-dialog>
</uni-popup>
</view> </view>
</template> </template>
@ -187,6 +203,7 @@
dialogContent: "这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容这里是协议内容，这里是协议内容", dialogContent: "这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容这里是协议内容，这里是协议内容",
confirmText: "我知道了（5s）", confirmText: "我知道了（5s）",
dialogBeforeClose: false, dialogBeforeClose: false,
dialogBeforeClose2: false,
countdown: 5, countdown: 5,
searchInfo: { searchInfo: {
sid: "0", sid: "0",
@ -212,6 +229,7 @@
reduce: "0", reduce: "0",
weight: "0", weight: "0",
count: "0", count: "0",
remarks: "",
startHeight: 0, startHeight: 0,
endHeight: 0 endHeight: 0
}, },
@ -312,6 +330,7 @@
_this.page.price = resp.totalPrice _this.page.price = resp.totalPrice
_this.page.weight = resp.totalWeight _this.page.weight = resp.totalWeight
_this.page.remarks = resp.remarks
_this.initPrice = resp.totalPrice _this.initPrice = resp.totalPrice
_this.initWeight = resp.totalWeight _this.initWeight = resp.totalWeight
@ -474,19 +493,43 @@
}, },
dialogInputConfirm2(val) {
this.dialogBeforeClose2 = true
},
saveGoods() { saveGoods() {
// var params = {
// customerSid: getApp().globalData.sid,
// brandId: this.data.brandVos[this.selectIndex2].id
// }
// // console.log("params", params);
// let _this = this
// _this.$api.saveGoods(params).then((resp) => {
// _this.request()
// }).catch(e => {})
var params = { var params = {
customerSid: getApp().globalData.sid, customerSid: getApp().globalData.sid,
brandId: this.data.brandVos[this.selectIndex2].id // cardNumber: 1,
brandId:this.data.brandVos[this.selectIndex2].id,
totalTee: this.page.price,
// ordOrderDetailsVoList: list
} }
// console.log("params", params); console.log("params", params);
let _this = this let _this = this
_this.$api.saveGoods(params).then((resp) => { // _this.$api.createVegeOrder(params).then((resp) => {
_this.request() // // console.log("resp", resp);
}).catch(e => {}) // this.$pay(resp)
// }).catch(e => {
// })
}, },
itemClick(goodsSid) { itemClick(goodsSid) {
@ -496,9 +539,16 @@
}, },
gotoCart() { gotoCart() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/good/shoppCart?affiliation=' + this.data.brandVos[this.selectIndex2].id url: '/pages/good/shoppCart?affiliation=' + this.data.brandVos[this.selectIndex2].id +
"&weight=" + this.data.brandVos[this.selectIndex2].qssl
}) })
}, },
showPop2() {
this.$refs.inputDialog2.open()
},
onShareAppMessage: function(res) { onShareAppMessage: function(res) {
console.log("res", res) console.log("res", res)
console.log("data", res.target.dataset) console.log("data", res.target.dataset)

2
pages/home/myHome.vue
View File

@ -185,7 +185,7 @@
} }
this.getUserInfo() this.getUserInfo()
this.myRecommend() // this.myRecommend()
}, },
onLoad(options) { onLoad(options) {
// this.request() // this.request()

Write Preview
Loading…
Cancel
Save