11111111111

This commit is contained in:
2024-01-23 15:52:21 +08:00
parent 2600e17338
commit 8bdfcdcb38
6 changed files with 511 additions and 72 deletions

View File

@@ -169,30 +169,50 @@
<!-- 礼包列表弹框 -->
<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;
background: #fff; margin-top: -50px;">
<view style="display: flex;flex-direction: column;
background: #fff; width: 80%; border-radius: 20px; height: 80vw;">
<image src="https://supervise.yxtsoft.com/lpk/image/newpor_top" mode="aspectFill"
style="margin-left: 5vw;margin-right: 5vw; height: 5vw;"></image>
<image src="https://supervise.yxtsoft.com/lpk/image/newpor_top.png" mode="scaleToFill"
style="width: 100%; height: 15vw; flex-shrink: 0;"></image>
<view style="display: flex;flex-direction: column;overflow-y: auto;">
<radio-group bindchange="radioChange">
<view v-for="(item,index) in newPerGiftList" class="device-list">
<view>
<radio :value="item.goodsSid" checked="true" />
<scroll-view scroll-y="true" style="display: flex;flex-direction: column;height: calc(100% - 30vw);"
bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
<radio-group @change="radioChange" style="overflow: hidden;box-sizing: border-box;">
<view v-for="(item,index) in newPerGiftList" class="device-list" style="overflow-y: auto;">
<view style="">
<radio :value="item.sid" style="transform:scale(0.8)" color="#FF9900" />
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<view
style="margin-left: 5px; margin-right: 10px; display: flex;flex-direction: row;align-items: center;flex: 1; ">
<image :src="item.iconUrl" mode="aspectFill"
style="border-radius: 8px;width: 36px;height: 36px;"></image>
<text style="font-size: 14px;color: #101010;margin-left: 5px;">{{item.name}}</text>
<text
style="font-size: 14px;color: #101010;margin-left: 10px;">{{item.weight}}{{item.specificationUnit}}</text>
<text style="font-size: 16px;color: #FF5006;margin-left: 20px;">{{item.name}}</text>
<text
style="font-size: 14px;color: #999;text-decoration:line-through;margin-left: 10px;">{{item.mefenPrice}}</text>
style="border-radius: 8px;width: 46px;height: 46px;"></image>
<view style="display: flex;flex-direction: column; margin-left: 10px; flex: 1;">
<view
style="display: flex;flex-direction: row;align-items: center;box-sizing: border-box;">
<text style="font-size: 14px;color: #101010;margin-right: 10px;
flex: 1; ">{{item.name}}</text>
<text
style="font-size: 16px;color: #FF5006;font-weight: 600; flex-shrink:0;">{{item.prefPrice}}</text>
</view>
<view
style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
<text style="font-size: 12px;color: #666;flex: 1;">{{item.weight}}</text>
<text
style="font-size: 12px;color: #999;text-decoration:line-through;margin-left: 10px;">{{item.price}}</text>
</view>
</view>
</view>
</view>
@@ -200,15 +220,21 @@
</view>
</scroll-view>
<view>
<text>确认结算</text>
<view
style=" height: 15vw; flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;"
class="newpor_bom">
<text style="background: #FF9900;color: #fff;text-align: center;border-radius: 20px;
padding:8px 25px ;" @click="newporGift">确认结算</text>
</view>
</view>
<image src="../../static/close.png" mode="aspectFill" style="width: 28px;height: 28px;margin-top: 10px;"
@click="colseDialog2()"></image>
</view>
<!-- 转赠弹框 -->
@@ -225,7 +251,7 @@
<view style="display: flex;flex-direction: column;">
<view v-for="(item,index) in goods"
style="display: flex;flex-direction: row;margin-top: 15px; margin-bottom: 10px;">
style=" display: flex;flex-direction: row;margin-top: 15px; margin-bottom: 10px;">
<view style="display: flex;flex-direction: row;align-items: center;width: 100%; ">
@@ -367,15 +393,16 @@
],
transferInfo: {
}
},
newporGiftSid: "",
}
},
created() {
console.log("==========", getApp().globalData.isNewUser);
// if (getApp().globalData.isNewUser=='1')
// this.showModal = true
// console.log("==========", getApp().globalData.isNewUser);
if (getApp().globalData.isNewUser == '1')
this.showModal = true
},
onShow() {
if (typeof this.$mp.page.getTabBar === 'function' && this.$mp.page.getTabBar()) {
@@ -391,7 +418,7 @@
onLoad(options) {
this.shareSid = options.shareSid
console.log("shareSid>>>>", this.shareSid);
// console.log("shareSid>>>>", this.shareSid);
let info = uni.getSystemInfoSync();
@@ -545,7 +572,7 @@
let _this = this
_this.$api.newUserQuota().then((resp) => {
console.log("--------", resp);
// console.log("--------", resp);
_this.newPerGiftList = resp
_this.showModal = false
@@ -554,10 +581,40 @@
})
},
radioChange(event) {
// console.log("radioChange", event.detail.value);
this.newporGiftSid = event.detail.value
},
newporGift() {
// console.log("radioChange", this.newporGiftSid);
if (!this.newporGiftSid) {
this.shortToast('请先选择优惠礼包')
return
}
var params = {
customerSid: getApp().globalData.sid,
bagSid: this.newporGiftSid,
}
// console.log("params", params);
let _this = this
_this.$api.createNewUserBagOrder(params).then((resp) => {
// console.log("resp", resp);
this.$pay(resp)
}).catch(e => {})
},
colseDialog() {
this.showModal = false
},
colseDialog2() {
this.showModal2 = false
},
colseDialog3() {
this.showModal3 = false
},
@@ -588,11 +645,11 @@
vos: list
}
console.log("=========0", params);
// console.log("=========0", params);
_this.$api.transSubmission(params).then((resp) => {
console.log("=========", resp);
// console.log("=========", resp);
_this.showModal3 = false
let shareData = JSON.stringify({
@@ -630,37 +687,6 @@
},
shareCard() {
let _this = this
var list = []
for (var i = 0; i < this.pickingUpGoods.length; i++) {
var item = this.pickingUpGoods[i]
if (item.count > 0) {
list.push({
goodsSid: item.goodsSid,
select: item.count
})
}
}
var params = {
customerSid: getApp().globalData.sid,
brandId: this.brandType,
vos: list
}
console.log("=========0", params);
_this.$api.transSubmission(params).then((resp) => {
console.log("=========", resp);
}).catch(e => {})
}
}
}
@@ -683,6 +709,13 @@
border: 0;
}
.newpor_bom {
/* 加载背景图 */
background-image: url(https://supervise.yxtsoft.com/lpk/image/newpor_bom.png);
/* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
.top {
@@ -820,6 +853,7 @@
height: 100%;
top: 0;
left: 0;
flex-direction: column;
justify-content: center;
align-items: center;
}
@@ -828,9 +862,10 @@
box-sizing: border-box;
padding: 26rpx 6%;
display: flex;
justify-content: space-between;
flex-direction: row;
align-items: center;
border-bottom: 1px solid #eee;
width: 100%;
}
.modalDlg3 {

View File

@@ -10,7 +10,7 @@
<image class="head-img" :src="userInfo.photo"></image>
<view class="name-mob" style="flex: 1;">
<!-- 昵称 -->
<text >{{userInfo.nick}}</text>
<text>{{userInfo.nick}}</text>
<!-- 手机 -->
<text style="font-size:14px;">{{userInfo.mobile}}</text>
</view>
@@ -49,28 +49,29 @@
</view>
<!-- 订单记录 -->
<!-- <view class="icon-cow">
<view class="icon-cow">
<text class="title">订单记录</text>
<view class="group">
<view class="icon-name" @click="itemClick('待付款')">
<view class="icon-name" @click="itemClick('我的订单')">
<view class="icon">
<image class="img" src="../../static/img/record-query/obligation.png" mode="aspectFill">
</image>
<view v-if="data.count>0" class="count">{{data.count}}</view>
<!-- <view class="count">{{data.count}}</view> -->
</view>
<text class="name">待付款</text>
<text class="name">我的订单</text>
</view>
<view class="icon-name" @click="itemClick('已付款')">
<!-- <view class="icon-name" @click="itemClick('已付款')">
<view class="icon">
<image class="img" src="../../static/img/record-query/paid.png" mode="aspectFill">
</image>
</view>
<text class="name">已付款</text>
</view>
</view> -->
<view class="icon-name"></view>
<view class="icon-name"></view>
<view class="icon-name"></view>
</view>
</view> -->
</view>
<!-- 转赠记录 -->
<view class="icon-cow">
<text class="title">转赠记录</text>
@@ -278,6 +279,17 @@
uni.navigateTo({
url: '/pages/records/reservationRecords2',
})
break;
case "我的订单":
uni.navigateTo({
url: '/pages/records/orderRecords',
})
// uni.navigateTo({
// url:"/pages/records/orderDetail"
// })
break;
case "待付款":