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

Merge branch 'master' of https://gitee.com/wjl2008_admin/medicine_app

Browse Source
This commit is contained in:
始于初见
2024-07-03 10:14:17 +08:00
parent 1fbbb1685c f5b053a8a0
commit 60d2c82b34
12 changed files with 540 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/component/commonComponents/address/edit.vue
View File

@@ -20,7 +20,7 @@
<view v-for="(item, index) in argee" :key="index" style="font-size: 32rpx;">
<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue"
color="#258feb" @click="radioCheck(index)"></radio>
默认收获地址
默认收货地址
</view>
</radio-group>
</view>

2
pages/component/commonComponents/address/index.vue
View File

@@ -128,7 +128,7 @@ import { mapState } from "vuex";
export default {
components: {
courseDescription, //课程说明
editAddress, //编辑收获地址
editAddress, //编辑收货地址
},
props: ["backState", "type"],
data() {

9
pages/course/chapterDetail.vue
View File

@@ -6,7 +6,7 @@
<z-nav-bar
bgColor="#333"
fontColor="#fff"
:title="options.navTitle"
title="教学内容"
></z-nav-bar>
<view
@@ -49,8 +49,11 @@
>视频教学</view
>
<view class="scroll-view-item">
<view style="padding: 20rpx; margin-bottom: 40rpx">
{{ curriculumData.title }}
<view style="padding: 20rpx; font-size: 26rpx;">
课程：{{options.navTitle}}
</view>
<view style="padding: 20rpx; margin-bottom: 40rpx; font-size: 26rpx;">
章节：{{ curriculumData.title }}
</view>
<common-curriculum-video
v-if="videoArray && videoArray.length > 0"

2
pages/course/courseDetail.vue
View File

@@ -667,6 +667,8 @@ export default {
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
},
onUnload() {
this.selectGoodsData = {};

6
pages/course/coursePrice.vue
View File

@@ -206,12 +206,13 @@
},
// 加入到购物车
isAddLink(item) {
// console.log('传入购物车',item);
// 统计商品信息
let data = {
"userId": this.userInfo.id,
"productId": item.productId,
"productAmount": this.productAmount,
"price": item.price
"productAmount": 1,
"price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
}
// 判断列表是否为空
if (this.cartList.length > 0) {
@@ -284,6 +285,7 @@
},
oprate(data) {
console.log(data, '得到的内容')
if (data.name == 'buy') {
this.buy(data.item)
} else if (data.name == 'gouwuche') {

4
pages/course/myCourse.vue
View File

@@ -318,8 +318,8 @@
let data = {
"userId": this.userInfo.id,
"productId": item.productId,
"productAmount": this.productAmount,
"price": item.price
"productAmount": 1,
"price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
}
// 判断列表是否为空
if (this.cartList.length > 0) {

6
pages/course/myCourseLearn.vue
View File

@@ -204,6 +204,8 @@
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
this.getData(this.courseId)
},
onReachBottom() {
@@ -717,8 +719,8 @@
let data = {
"userId": this.userInfo.id,
"productId": item.productId,
"productAmount": this.productAmount,
"price": item.price
"productAmount": 1,
"price": item.activityPrice && item.activityPrice != 0 ? item.activityPrice : item.price
}
// 判断列表是否为空
if (this.cartList.length > 0) {

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

@@ -40,7 +40,7 @@
</view>
<view class="normal_box" v-else>
<view class="normal_box_top">
<view class="curriulum_title">请添加收获地址 </view>
<view class="curriulum_title">请添加收货地址 </view>
</view>
</view>
<view class="right">

3
pages/peanut/home.vue
View File

@@ -304,6 +304,9 @@
},
//页面显示
onShow() {
uni.hideTabBar();
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
this.requestAll()
},
onTabItemTap() {

10
pages/peanut/shopping.vue
View File

@@ -1,16 +1,16 @@
<template>
<view>
<z-nav-bar backState="2000" title="购物车">
<view class="curseSet" slot="right" @click="manaCart = !manaCart" style="margin-right: 10px;">
<!-- <view class="curseSet" slot="right" @click="manaCart = !manaCart" style="margin-right: 10px;">
<text v-show="!manaCart">管理</text>
<text v-show="manaCart">完成</text>
</view>
</view> -->
</z-nav-bar>
</z-nav-bar>
<view class="shopCarContent">
<scroll-view scroll-y="true">
<view class="cartItem" v-for="(item,index) in cartList" :key="index">
<view class="select" v-show="manaCart">
<view class="select" >
<checkbox :checked="item.checked" @click="checkboxGroupChange(index,item)"
class="round checkedItem" />
</view>
@@ -125,7 +125,7 @@
// }
this.isCartDelShow = this.all
this.total()
this.manaCart = this.all
// this.manaCart = this.all
} else {
this.all = false
@@ -230,7 +230,7 @@
this.totalPrice = 0
this.getCartList()
uni.hideLoading()
this.manaCart = false
// this.manaCart = false
})
} else {
console.log('cancel') //点击取消之后执行的代码