diff --git a/manifest.json b/manifest.json
index 4812498..594ce14 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.0.52",
- "versionCode" : 1052,
+ "versionName" : "1.0.53",
+ "versionCode" : 1053,
"app-plus" : {
"nvueCompiler" : "uni-app",
"compatible" : {
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 173c5f5..5e36fba 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -4,7 +4,7 @@
-
+
{{goBuyTitle}}
@@ -13,7 +13,7 @@
立即购买
-
+
@@ -213,7 +213,7 @@
@click="handleClickGetGoodsList(librayList[curIndex])" text="购买课程">
-
@@ -537,7 +537,6 @@
newPayment:"common/courseRelearn/courseCatalogueCanRelearn", // 检查复读地址
newPaymentList:"common/courseRelearn/relearnShopProductList", // 获取复读列表
},
- isAndorid: true,
oprateOsName: '',
linkClassList: [], // 可加入关联班级数组
classInfo: [], // 所在班级信息
@@ -571,7 +570,6 @@
//是否是vip
this.getCourseByVip();
this.getSayList();
- this.getOS();
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
@@ -902,18 +900,6 @@
this.classInfo = {}
});
},
- // 获得操作系统
- getOS() {
- let oprateOs = "";
- oprateOs = uni.getSystemInfoSync().platform;
- this.oprateOsName = uni.getSystemInfoSync().platform;
- console.log('oprateOs', oprateOs)
- if (oprateOs == "android") {
- this.isAndorid = true;
- } else {
- this.isAndorid = false;
- }
- },
async checkPermision() {
var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
if (result != 1) {
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
index b2f88d1..3e01ace 100644
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -20,7 +20,6 @@
:key="index"
style="width: 100%; height: 100%"
>
-
秒杀商品
-
-
@@ -130,43 +122,6 @@
itemClass="itemCouponClass"
>
-
@@ -231,38 +186,7 @@
>
-
-
-
-
@@ -306,8 +230,6 @@
-
-
@@ -352,8 +274,6 @@
-
-
@@ -397,38 +317,7 @@
-
-
-
-
@@ -442,48 +331,9 @@
-
-
-
-
-
+
-
-
-
-
-
@@ -514,12 +364,9 @@
slotProps.row.title
}}
-
-
-
¥{{ slotProps.row.courseFee }}
@@ -539,15 +386,6 @@
@buttonClick="onHandleClickBuy1"
/>
-
-
-
@@ -639,10 +475,6 @@
@buttonClick="onHandleClickBuy"
/>
-
@@ -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: [],
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 492b190..35b2b73 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -37,8 +37,6 @@
style=""
>
-
-
@@ -170,11 +168,10 @@
style="display: inline-block"
>
- {{ v.text }}
+ {{ v.text }}
+
- (全部积分:{{ initData.user.jf }})
+ (全部积分:{{ initData.user.jf }})
@@ -183,8 +180,7 @@
¥{{
isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
- }}
+ }}
@@ -219,7 +215,6 @@
暂无可用优惠券
-
支付方式
-
-
-
-
-
-
-
- {{ v.text }}
-
- (余额:{{
- initData && initData.user ? initData.user.peanutCoin : 0
- }})
-
+
+
+
+
+
+
+ {{ v.text }}
+
+ (余额:{{
+ initData && initData.user ? initData.user.peanutCoin : 0
+ }})
+
- {{ v.text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ v.text }}
-
- (余额:{{
- initData && initData.user ? initData.user.peanutCoin : 0
- }})
-
-
- {{ v.text }}
-
-
-
-
-
-
-
-
-
-
-
+ {{ v.text }}
+
+
+
+
+
+
+
+
+
+
+
@@ -389,7 +321,7 @@
@@ -437,8 +369,8 @@
-
-
+
+
-
-
+
医学
国学心理学
@@ -34,7 +34,7 @@
手机号:({{ userMes.tel }})
-
+
{{item}}
@@ -50,8 +50,8 @@
-
-
@@ -204,8 +204,6 @@
userCouponNum:0, // 优惠券数量
directorShow: false, // 主任是否显示班级入口
monitorShow: false, // 其他管理是否显示班级入口
- isAndorid: true,
- platform: null, // 设备系统
pageList: [{
name: "我的订单",
url: "/pages/bookShop/orderList?type=mine",
@@ -248,8 +246,6 @@
onLoad(e) {
// 隐藏原生的tabbar
uni.hideTabBar();
- this.getOS();
- this.platform = uni.getSystemInfoSync().platform;
},
computed: {
...mapState(["userInfo"]),
@@ -331,16 +327,6 @@
break;
}
},
- // 获得操作系统
- getOS() {
- let oprateOs = "";
- oprateOs = uni.getSystemInfoSync().platform;
- if (oprateOs == "android") {
- this.isAndorid = true;
- } else {
- this.isAndorid = false;
- }
- },
haveSelected(data) {
if (data.index == 0) {
// 分享到好友
@@ -1011,7 +997,6 @@
}
.vip_btn{
margin-right: 15rpx;
- height: 50rpx;
}
.vip_btn button{
background: none;
diff --git a/pages/mine/vip/order.vue b/pages/mine/vip/order.vue
index bc0f0c8..1a1fb88 100644
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -10,8 +10,8 @@
-
- {{dataInfo.list[0].title}}价格:
+
+ {{dataInfo.list[0].title}}延期价格:价格:
-
+
@@ -34,17 +34,12 @@
{{ v.text }}
-
-
-
-
-
-
+
+
-
+
= 0; i--) {
- s += this.goodsDataList[i].price ? this.goodsDataList[i].price : 0;
- }
- that.totalPrice = s;
- // !
- if (!this.isShowAddress) {
- if (this.initData.user.jf >= that.totalPrice) {
- this.jfNumber = that.totalPrice;
- this.jfNumberMax = that.totalPrice;
- } else {
- this.jfNumber = this.initData.user.jf;
- this.jfNumberMax = this.initData.user.jf;
- }
- if (that.jfNumber == 0 || that.jfNumber == null) {
- that.jfNumberShow = "0.00";
- that.actualPayment = that.totalPrice;
- } else {
- that.jfNumberShow = that.jfNumber.toFixed(2);
- that.actualPayment = that.totalPrice - that.jfNumber;
- }
- that.actualPayment = that.actualPayment + that.freightNum;
- } else {
- that.actualPayment = that.totalPrice + that.freightNum;
- }
-
- if (this.actualPayment == 0 && !this.isShowAddress) {
- this.isDefaultCurrency = true;
- } else {
- this.isDefaultCurrency = false;
- }
- this.$forceUpdate();
- },
selectAddress(data) {
this.show = false;
},
@@ -548,9 +498,6 @@
chooseYear(item,index){
this.activeIndex = index;
this.dataInfo.lastFee = item.rebateFee;
-
-
- console.log('----this.dataInfo',this.dataInfo);
},
radioChange(index) {
this.selectPayIndex = index;
@@ -661,14 +608,6 @@
await that.getDetailInfo();
});
},
- getPriceData() {
- var that = this;
- setTimeout(() => {
- that.$nextTick(() => {
- that.$refs.priceDetail.getTotalPrice();
- });
- }, 100);
- },
// 检查是有权限使用搜索功能
checkDisable() {
console.log("点击了");
@@ -1312,10 +1251,11 @@
border:1rpx solid #999;
color: #999;
border-radius: 10rpx;
- margin: 20rpx 30rpx 20rpx 0;
- padding: 0 30rpx;
+ margin-right: 20rpx;
+ margin-bottom: 30rpx;
+ padding: 0 20rpx;
font-size: 28rpx;
- line-height: 50rpx;
+ line-height: 40rpx;
}
.list_choose_active{
border:1rpx solid #ff1f00;