zm/medicine_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ios放开vip模块

Browse Source
This commit is contained in:
liuyuan
2025-02-21 10:52:38 +08:00
parent 179a2c492e
commit 98f74b1532
6 changed files with 153 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
pages/goods/index/index.vue
View File

@@ -20,7 +20,6 @@
:key="index"
style="width: 100%; height: 100%"
>
<!-- <image :src="curriculumData.explainsImg" mode="widthFix" class="headImage"></image> -->
<image
:src="item"
mode="aspectFit"
@@ -62,13 +61,6 @@
<view class="xianshimaiosha_box">
<text class="xianshimaiosha">秒杀商品</text>
<!-- <view class="countdown">
<text style="margin-right: 8rpx;">距结束</text>
<uni-countdown :day="1" :hour="2" :minute="30" :second="0" color="#FFFFFF"
:font-size="12" backgroundColor="#000" />
</view> -->
</view>
</view>
@@ -130,43 +122,6 @@
itemClass="itemCouponClass"
>
</common-coupon>
<!-- <view
style="max-height: 40vh; overflow-y: scroll"
:class="'youhuiItem'"
v-for="(item, index) in canGetCouponList"
:key="index"
>
<view style="width: 25%; color: #f31440; text-align: center">
<text>￥</text>
<b style="font-size: 60rpx">{{
item.couponEntity.couponAmount
}}</b>
</view>
<view style="width: calc(100% - 27%); padding-left: 2%">
<view>
<text
style="
display: inline-block;
font-size: 30rpx;
line-height: 34rpx;
margin-right: 6rpx;
margin-bottom: 10rpx;
color: #f10833;
"
>{{ item.couponEntity.couponName }}</text
>
</view>
<text
style="
display: block;
font-size: 24rpx;
color: #999;
margin-top: 4rpx;
"
>说明：{{ item.couponEntity.remark }}</text
>
</view>
</view> -->
</view>
</view>
</template>
@@ -231,38 +186,7 @@
></image>
</view>
</view>
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
</template>
<!-- <template slot="rightSlot" slot-scope="slotProps">
<view v-if="slotProps.row.surplusNum" class="related_courses_right">
<view class="progress_icon" style=""><u-line-progress activeColor="#258feb" height="14"
:percentage="30" :showText="false" showText></u-line-progress></view>
<view
:class="slotProps.row.surplusNum < 30 ? 'aui-text-danger dateReminder' : 'dateReminder'">
距&nbsp;{{ slotProps.row.surplusNum }}&nbsp;天到期</view>
</view>
<view v-if="slotProps.row.inType == '03'" class="fdButtonBox">
<u-button type="primary" :plain="true" text="复读一月" :customStyle="fdButtonStyle" size="small"
@click.native.stop="fnRelearn(slotProps.row.inType, 30, slotProps.row.courseFee)"></u-button>
<u-button type="primary" :plain="true" text="复读三月" :customStyle="fdButtonStyle" size="small"
@click.native.stop="fnRelearn(slotProps.row.inType, 90, slotProps.row.courseFee)"></u-button>
</view>
<view>
</view>
</template> -->
</common-goods-list>
</view>
<view :class="`dataList parameterList`" v-if="booksList.length > 0">
@@ -306,8 +230,6 @@
</view>
</view>
</view>
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
</template>
</common-list>
</view>
@@ -352,8 +274,6 @@
</view>
</view>
</view>
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
</template>
</common-list>
</view>
@@ -397,38 +317,7 @@
</view>
</view>
</view>
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
</template>
<!-- <template slot="rightSlot" slot-scope="slotProps">
<view v-if="slotProps.row.surplusNum" class="related_courses_right">
<view class="progress_icon" style=""><u-line-progress activeColor="#258feb" height="14"
:percentage="30" :showText="false" showText></u-line-progress></view>
<view
:class="slotProps.row.surplusNum < 30 ? 'aui-text-danger dateReminder' : 'dateReminder'">
距&nbsp;{{ slotProps.row.surplusNum }}&nbsp;天到期</view>
</view>
<view v-if="slotProps.row.inType == '03'" class="fdButtonBox">
<u-button type="primary" :plain="true" text="复读一月" :customStyle="fdButtonStyle" size="small"
@click.native.stop="fnRelearn(slotProps.row.inType, 30, slotProps.row.courseFee)"></u-button>
<u-button type="primary" :plain="true" text="复读三月" :customStyle="fdButtonStyle" size="small"
@click.native.stop="fnRelearn(slotProps.row.inType, 90, slotProps.row.courseFee)"></u-button>
</view>
<view>
</view>
</template> -->
</common-list>
</view>
@@ -442,48 +331,9 @@
<view class="common_divider divider_box"> </view>
<common-rich-detail :detailInfo="detailInfo" style="padding: 10rpx">
<template #richHeadImg>
<!-- <image :src="curriculumData.imgUrl" mode="widthFix" class="headImage"></image> -->
<!-- <image :src="detailInfo.imgUrl" v-if="detailInfo.imgUrl" mode="widthFix" class="headImage"></image> -->
</template>
<template #richHeadImg></template>
</common-rich-detail>
<!-- <view class="small_class_teaching_top">
<view class="small_class_teaching_top_left">
<image src="@/static/icon/course_ic.png" mode="aspectFil" class="icon1"></image>
<text>小班教学</text>
</view>
<text>{{ curriculumInfo.remainingDays }}</text>
</view> -->
<view class="small_class_teaching_content">
<!-- <view class="top">
<view class="top_item" v-for="(v, i) in teachingList">
{{ v.title }}
</view>
</view> -->
<!-- <view class="schedule">
<view class="icon_box">
<image src="@/static/icon/course_07.png" mode="aspectFil" class="icon1">学习进度</image>
</view>
<view class="progress_box">
<view class="progress_icon" style=""><u-line-progress activeColor="#258feb" height="18"
:percentage="30" :showText="false" showText></u-line-progress></view>
<image src="@/static/icon/curriculum_05.png" mode="aspectFil" class="icon1" />
<image src="@/static/icon/curriculum_07.png" mode="aspectFil" class="icon2" />
</view>
</view> -->
</view>
</view>
@@ -514,12 +364,9 @@
slotProps.row.title
}}</view>
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
</template>
<template slot="rightSlot" slot-scope="slotProps">
<!-- {{ slotProps.row.bxType }} -->
<text class="aui-text-danger">
￥{{ slotProps.row.courseFee }}</text
>
@@ -539,15 +386,6 @@
@buttonClick="onHandleClickBuy1"
/>
</view>
<!--
<u-modal
:show="show"
:title="modalInfo.title"
:content="modalInfo.content"
showCancelButton
@confirm="hancleModalConfirm"
@cancel="hancleModalCancel"
></u-modal> -->
<common-select-goods
ref="commonSelectGoods"
:selectGoodsData="selectGoodsData"
@@ -625,8 +463,6 @@
}}</view>
</view>
</view>
<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
</template>
</common-list>
@@ -639,10 +475,6 @@
@buttonClick="onHandleClickBuy"
/>
</view>
<!-- <view>
<text @click="handleClickClose">取消</text>
<text @click="handleClickGoBuy">立即购买</text>
</view>-->
</view>
</u-popup>
</view>
@@ -665,24 +497,7 @@ export default {
parameterList: [],
booksList: [],
coursesList: [],
buyOptions: [
// {
// icon: 'chat',
// text: '客服'
// },
// {
// icon: "shop",
// text: "店铺",
// // info: 2,
// infoBackgroundColor: "#007aff",
// infoColor: "#f5f5f5",
// },
// {
// icon: 'cart',
// text: '购物车',
// info: 2
// }
],
buyOptions: [],
swiperList: [],
goodsList: [],

291
pages/goods/order/index.vue
View File

@@ -37,8 +37,6 @@
style=""
></image>
</view>
<!-- </view> -->
</view>
<view class="order_top common_radius_box color_shandow goods_box">
@@ -170,11 +168,10 @@
style="display: inline-block"
></u-icon>
<text> {{ v.text }}</text
><template v-if="v.type == 4">
<text> {{ v.text }}</text>
<template v-if="v.type == 4">
<text style="color: #aaa; margin-left: 10rpx">
(全部积分：{{ initData.user.jf }})</text
>
(全部积分：{{ initData.user.jf }})</text>
</template>
</view>
<view class="right">
@@ -183,8 +180,7 @@
<text>
￥{{
isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
}}</text
>
}}</text>
</template>
<template v-if="v.type == 3">
<template v-if="!curCoupon.id">
@@ -219,7 +215,6 @@
<template v-else>
<text style="color: #999">暂无可用优惠券</text>
</template>
<!-- <text style="color: #fe6035"> -￥{{ jfNumberShow }}</text> -->
</template>
<template v-else>
<text style="color: #fe6035"
@@ -274,107 +269,44 @@
<view class="order_top common_radius_box color_shandow goods_box pay_box">
<view class="title">支付方式</view>
<!-- 商品是安卓环境支付，或者商品列表中没有课程 -->
<template v-if="isAndorid || (!isAndorid && !haveCourse)">
<view
class="curriulum_title_box goods_item pay_item"
v-for="(v, i) in payList"
>
<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
<view class="left">
<image
class="pay_item_img"
:src="v.imgUrl"
mode="aspectFil"
:style="v.style"
>
</image>
<template v-if="v.type == 4">
<text> {{ v.text }}</text>
<text
style="color: #258feb; font-weight: 600; margin-left: 10rpx"
>
(余额：{{
initData && initData.user ? initData.user.peanutCoin : 0
}})</text
>
</template>
<view
class="curriulum_title_box goods_item pay_item"
v-for="(v, i) in payList"
>
<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
<view class="left">
<image
class="pay_item_img"
:src="v.imgUrl"
mode="aspectFil"
:style="v.style"
>
</image>
<template v-if="v.type == 4">
<text> {{ v.text }}</text>
<text
style="color: #258feb; font-weight: 600; margin-left: 10rpx"
>
(余额：{{
initData && initData.user ? initData.user.peanutCoin : 0
}})</text
>
</template>
<text v-else> {{ v.text }}</text>
</view>
<template v-if="isDefaultCurrency">
<radio
v-if="i == 2"
:value="v.value"
color="#258feb"
:checked="selectPayIndex == i ? true : false"
@click="radioChange(i)"
size="10"
/>
</template>
<template v-else>
<radio
:value="v.value"
color="#258feb"
:checked="selectPayIndex == i ? true : false"
@click="radioChange(i)"
size="10"
/>
</template>
</view>
</view>
</template>
<!-- ios 支付列表 -->
<template v-else>
<view
class="curriulum_title_box goods_item pay_item"
v-for="(v, i) in payListIOS"
:key="i"
>
<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
<view class="left">
<image
class="pay_item_img"
:src="v.imgUrl"
mode="aspectFil"
:style="v.style"
>
</image>
<template v-if="v.type == 4">
<text> {{ v.text }}</text>
<text
style="color: #258feb; font-weight: 600; margin-left: 10rpx"
>
(余额：{{
initData && initData.user ? initData.user.peanutCoin : 0
}})</text
>
</template>
<text v-else> {{ v.text }}</text>
</view>
<template v-if="isDefaultCurrency">
<radio
v-if="i == 2"
:value="v.value"
color="#258feb"
:checked="selectPayIndex == i ? true : false"
@click="radioChange(i)"
size="10"
/>
</template>
<template v-else>
<radio
:value="v.value"
color="#258feb"
:checked="selectPayIndex == i ? true : false"
@click="radioChange(i)"
size="10"
/>
</template>
</view>
</view>
</template>
<template v-if="beizhuShow">
<text v-else> {{ v.text }}</text>
</view>
<template v-if="isDefaultCurrency">
<radio v-if="i == 2" :value="v.value" color="#258feb"
:checked="selectPayIndex == i ? true : false" @click="radioChange(i)" size="10" />
</template>
<template v-else>
<radio :value="v.value" color="#258feb" :checked="selectPayIndex == i ? true : false"
@click="radioChange(i)" size="10" />
</template>
</view>
</view>
<template v-if="selectPayIndex==2||$platform=='ios'">
<view
class="goods_detail_list_title bg_box_shandow color_shandow bg_color"
>
@@ -389,7 +321,7 @@
<view class="linlanzhifu">
<u-icon
name="error-circle"
color="#018F89"
color="#258feb"
size="20"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
@@ -437,8 +369,8 @@
</view>
</view>
</template>
</view>
</view>
<template>
<common-sticky
label="title"
@@ -480,7 +412,6 @@
@selectAddress="selectAddress"
></common-address
></u-popup>
<!-- @close="closeOrderModalShow" -->
<u-popup :show="orderModalShow" mode="bottom" :round="20">
<view class="orderModalShow popup_box">
<u-icon
@@ -548,36 +479,20 @@ export default {
isDefaultCurrency: {
immediate: true,
handler(newRoute) {
console.log("this.isDefaultCurrency", this.isDefaultCurrency, platform);
if (this.isDefaultCurrency) {
if (platform == "ios") {
if (!this.haveCourse) {
// 没有课程类型
this.selectPayIndex = 2;
this.payType = this.payList[this.selectPayIndex].type;
} else {
this.selectPayIndex = 0;
this.payType = this.payListIOS[this.selectPayIndex].type;
}
} else {
this.selectPayIndex = 2;
this.payType = this.payList[this.selectPayIndex].type;
}
if (platform == "ios") {
this.selectPayIndex = 0;
} else {
this.selectPayIndex = 0;
}
} else {
if (platform == "ios") {
if (!this.haveCourse) {
// 没有课程类型
this.selectPayIndex = 1;
this.payType = this.payList[this.selectPayIndex].type;
} else {
this.selectPayIndex = 0;
this.payType = this.payListIOS[this.selectPayIndex].type;
}
} else {
this.selectPayIndex = 1;
this.payType = this.payList[this.selectPayIndex].type;
}
if (platform == "ios") {
this.selectPayIndex = 0;
} else {
this.selectPayIndex = 0;
}
}
this.payType = this.payList[this.selectPayIndex].type;
this.$forceUpdate();
},
},
@@ -617,34 +532,7 @@ export default {
},
selectPayIndex: 1,
farePrice: 0,
payList: [
{
text: "支付宝",
imgUrl: require("@/static/icon/pay_1.png"),
type: 2,
value: "0",
},
{
text: "微信",
imgUrl: require("@/static/icon/pay_2.png"),
type: 1,
value: "1",
},
{
text: "天医币",
imgUrl: require("@/static/icon/pay_3.png"),
type: 4,
value: "2",
},
],
payListIOS: [
{
text: "天医币",
imgUrl: require("@/static/icon/pay_3.png"),
type: 4,
value: "2",
},
],
payList: [],
priceBreakdownList: [],
orderInfoList: [
{
@@ -765,7 +653,7 @@ export default {
var list = [...this.options.goods];
list = list.map((e) => e.goodsType);
this.haveCourse = list.some((ele) => ele === "05");
console.log("list--------->", list, this.haveCourse);
if (this.options.sourceType == "curriculum") {
this.goToInfo = {
url: "/pages/curriculum/order/index/index",
@@ -781,10 +669,8 @@ export default {
},
async onShow() {
this.curCouponId = undefined;
console.log("调用了onShow方法");
var that = this;
await uni.$on("returnData", function (data) {
console.log("data at line 415:", data);
if (data) {
that.addressData = {
...data,
@@ -796,12 +682,44 @@ export default {
that.getUserAddress();
} else {
console.log("没有接受到数据");
}
});
// #ifdef APP-PLUS
this.getOS();
// #endif
if(platform=='ios'){
this.payList= [
{
text: "天医币",
imgUrl: require("@/static/icon/pay_3.png"),
type: 4,
value: "2",
},
]
this.selectPayIndex = 0;
this.payType=4
}else{
this.payList= [{
text: "支付宝",
imgUrl: require("@/static/icon/pay_1.png"),
type: 2,
value: "0",
},
{
text: "微信",
imgUrl: require("@/static/icon/pay_2.png"),
type: 1,
value: "1",
},
{
text: "天医币",
imgUrl: require("@/static/icon/pay_3.png"),
type: 4,
value: "2",
},
]
this.selectPayIndex = 1;
this.payType=2
}
},
computed: {
...mapState(["userInfo"]),
@@ -909,21 +827,6 @@ export default {
});
});
},
// 获得操作系统
getOS() {
let oprateOs = "";
oprateOs = uni.getSystemInfoSync().platform;
if (oprateOs == "android") {
this.isAndorid = true;
} else {
this.isAndorid = false;
if (this.haveCourse && !this.isAndorid) {
this.selectPayIndex = 0;
this.payType = this.payListIOS[0].type;
this.beizhuShow = true;
}
}
},
handleChangejf(val) {
var value = val;
this.$nextTick(() => {
@@ -1372,7 +1275,6 @@ export default {
image: "../../../static/icon/ic_close.png",
});
} else {
console.log("that.payType at line 607:", that.payType);
uni.showToast({
title: "下单成功，即将进行支付",
icon: "none",
@@ -1431,7 +1333,6 @@ export default {
};
setWXPay(data1, (res) => {
if (res.success) {
// this.buyingFlag = false
uni.hideLoading();
uni.showToast({
title: "支付成功",
@@ -1498,13 +1399,7 @@ export default {
});
},
radioChange(index) {
if (index == this.selectPayIndex) {
return;
}
this.selectPayIndex = index;
this.selectPayIndex == 2
? (this.beizhuShow = true)
: (this.beizhuShow = false);
this.payType = this.payList[this.selectPayIndex].type;
this.$forceUpdate();
},