This commit is contained in:
2024-10-15 11:35:35 +08:00
parent 0ba0738ef9
commit 95365adddc
65 changed files with 13063 additions and 9746 deletions

View File

@@ -170,7 +170,21 @@
> -->
</view>
</template>
<template slot="bottomSlot" slot-scope="slotProps"> </template>
</common-goods-nav>
<view class="agree_wo" style="width: 100%; text-align: right">
<!-- <radio-group class="agree">
<view v-for="(item, index) in argee" :key="index">
<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue" color="#3AB3AE" size="12px"
@click="radioCheck(index)"></radio>
</view>
</radio-group> -->
<view
>支付即同意众妙之门<span class="highlight" @click="showXieyi"
>会员服务协议</span
></view
>
</view>
</view>
<!-- @close="closeOrderModalShow" -->
@@ -215,6 +229,14 @@ export default {
},
data() {
return {
radioValue: "",
argee: [
{
value: false,
id: "1",
},
], // 同意权限
xyText: "",
isDefaultCurrency: false,
isShowAddress: false,
jfNumber: 0,
@@ -320,7 +342,7 @@ export default {
},
customButton: [
{
width: "160rpx",
width: "400rpx",
text: "立即支付",
backgroundColor: "linear-gradient(90deg, #3AB3AE 0%, #117e4c 100%)",
color: "#fff",
@@ -396,6 +418,15 @@ export default {
...mapState(["userInfo"]),
},
methods: {
showXieyi() {
uni.navigateTo({
url: "/pages/mine/aboutUs/agreement?id=105",
});
},
onHandleClickBuy() {
this.orderModalShow = false;
this.remark = this.content;
@@ -531,34 +562,21 @@ export default {
},
async goBuyJie() {
debounce(async () => {
// if (this.radioValue != 1) {
// uni.showToast({
// title: "请勾选 已阅读会员服务协议",
// icon: "none",
// });
// return false;
// }
var that = this;
// if (this.addressList.length == 0) {
// this.dizhiShow = true // 如果没有地址信息
// }
// if (!this.nowClick) {
// return
// }
this.nowClick = false;
setTimeout(() => {
this.nowClick = true;
}, 5000);
// let youPre = {
// id: "",
// coupons: {
// amount: 0,
// name: "",
// },
// };
// if (this.youhuiContent.id != undefined) {
// youPre = this.youhuiContent;
// }
let xiaBiao = [];
// for (let i = 0; i < this.cartList.length; i++) {
// xiaBiao.push({
// productId: this.cartList[i].productId,
// quantity: this.cartList[i].productAmount,
// });
// }
let data = {
paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
@@ -568,12 +586,9 @@ export default {
jfDeduction: 0, //积分抵扣
vipBuyConfigId: this.dataInfo.id,
come: 1, //订单来源0疯子读书1国学众妙之门2医学吴门医述
// appName: "zmzm",
};
console.log("data at line 477:", data);
await $http
.request({
// url: "book/buyOrder/buySave",
@@ -639,13 +654,6 @@ export default {
image: "../../../static/icon/ic_close.png",
});
}, 0);
// setTimeout(() => {
// uni.navigateTo({
// url: './orderList'
// });
// }, 1000)
}
}
);
@@ -900,69 +908,9 @@ export default {
// socket.init();
});
// this.$nextTick(() => {
// switch (item.type) {
// case 1:
// // allDataList
// this.dataList = that.allDataList.result1Lst
// break;
// case 2:
// this.dataList = that.allDataList.result2Lst
// break;
// case 3:
// this.dataList = that.allDataList.result3Lst
// break;
// case 4:
// this.dataList = that.allDataList.result4Lst.filter(e =>
// e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
// )
// console.log(this.dataList.length, 6666666)
// break;
// }
// this.currentCateIndex = item.index
// })
console.log(this.allDataList, this.dataList, "1688");
// if(this.userMes.tgdzPower == 0){
// let that = this
// uni.showModal({
// content: "购买 针灸六经法要上册和下册 后方可使用此功能",
// confirmText: '好的',
// showCancel: false,
// success: function(res) {
// if (res.confirm) {
// // console.log('用户点击确定');
// }
// }
// })
// return
// }
// if(item.title == "时辰取穴"){
// uni.navigateTo({
// url: "../timeAcupoint/timeAcupoint"
// })
// return
// }
// this.currentStatusIndex = index
this.searchValue = "";
this.searchList = [];
this.showSearchList = false;
// if (index != 2) {
// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
// var height = rect.height
// console.log('元素高度:',);
// }).exec();
// } else {
// this.getJFList(dictType)
// }
return data;
},
@@ -1831,4 +1779,21 @@ export default {
align-items: center;
justify-content: space-between;
}
.agree_wo {
float: right;
width: 100%;
color: #aaa;
font-size: 22rpx;
margin-top: -10rpx;
margin-bottom: 20rpx;
padding: 0 20rpx;
// margin: 40rpx 50rpx 0 50rpx;
// padding-bottom: 40rpx;
}
.agree {
width: auto !important;
}
.highlight {
color: $uni-color-primary;
}
</style>