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 14:11:37 +08:00
parent df49321b07 fa6c3b2c4d
commit 984bf85328
9 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/buyPup.vue
View File

@@ -16,10 +16,10 @@
<u-icon name="bag" color="#fff" size="28"></u-icon>
<text>立即购买</text>
</view>
<view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
<!-- <view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
<uni-icons type="cart" size="28" style="color: #666;"></uni-icons>
<text>加入购物车</text>
</view>
</view> -->
</view>
</view>
</u-popup>

24
components/z-navigation/z-navigation.vue
View File

@@ -80,12 +80,12 @@ export default {
selectedIconPath: "static/tab/icon1_y.png",
text: "首页",
},
{
pagePath: "pages/peanut/shopping",
iconPath: "static/tab/tab_nor_02.png",
selectedIconPath: "static/tab/tab_cur_02.png",
text: "购物车",
},
// {
// pagePath: "pages/peanut/shopping",
// iconPath: "static/tab/tab_nor_02.png",
// selectedIconPath: "static/tab/tab_cur_02.png",
// text: "购物车",
// },
{
pagePath: "pages/bookShop/orderList",
iconPath: "static/tab/order.png",
@@ -112,12 +112,12 @@ export default {
selectedIconPath: "static/tab/icon1_y.png",
text: "首页",
},
{
pagePath: "pages/peanut/shopping",
iconPath: "static/tab/tab_nor_02.png",
selectedIconPath: "static/tab/tab_cur_02.png",
text: "购物车",
},
// {
// pagePath: "pages/peanut/shopping",
// iconPath: "static/tab/tab_nor_02.png",
// selectedIconPath: "static/tab/tab_cur_02.png",
// text: "购物车",
// },
{
pagePath: "pages/taihu/index",

4
manifest.json
View File

@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
"versionName" : "1.0.01",
"versionCode" : 1001,
"versionName" : "1.0.02",
"versionCode" : 1002,
"app-plus" : {
"compatible" : {
"ignoreVersion" : true

12
pages.json
View File

@@ -561,12 +561,12 @@
"selectedIconPath": "static/tab/icon1_y.png",
"text": "首页"
},
{
"pagePath": "pages/peanut/shopping",
"iconPath": "static/tab/tab_nor_02.png",
"selectedIconPath": "static/tab/tab_cur_02.png",
"text": "购物车"
},
// {
// "pagePath": "pages/peanut/shopping",
// "iconPath": "static/tab/tab_nor_02.png",
// "selectedIconPath": "static/tab/tab_cur_02.png",
// "text": "购物车"
// },
{
"pagePath": "pages/bookShop/orderList",
"iconPath": "static/tab/order.png",

5
pages/course/myCourse.vue
View File

@@ -256,7 +256,10 @@
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
// #ifdef APP-PLUS
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
// #endif
},
onReachBottom() {
console.log('触底');

10
pages/course/myCourseLearn.vue
View File

@@ -204,8 +204,10 @@
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
// #ifdef APP-PLUS
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
// #endif
this.getData(this.courseId)
},
onReachBottom() {
@@ -646,6 +648,10 @@
}).catch(e => {
console.log(e, '获取目录数据报错')
uni.showToast({
title:"获取数据失败",
icon:'error'
})
});
},
@@ -887,6 +893,10 @@
}).catch(e => {
console.log(e, '获取章节列表数据报错')
uni.showToast({
title:"获取数据失败",
icon:'error'
})
});
},
// 跳转

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

@@ -780,7 +780,7 @@ export default {
},
onLoad(options) {
this.options = options;
console.log('options',options)
// this.handleClickGetGoodsList();
// this.getUserInfo()
// this.getCateList()
@@ -1027,7 +1027,7 @@ export default {
that.curriculumData.productImageList == null ||
that.curriculumData.productImageList == ""
) {
this.swiperList.push(that.curriculumData.explainsImg);
this.swiperList.push(that.curriculumData.productImages);
} else {
that.swiperList = that.curriculumData.productImageList.split(",");
// for (var i = 0; i < imgList.length; i++) {

13
pages/peanut/home.vue
View File

@@ -12,8 +12,8 @@
</view>
</view>
</view>
<view class="fourBox nopadding ">
<view class="fourIcon flexbox noRadius" style="justify-content: space-around;">
<view class="fourBox nopadding" style="">
<view class="fourIcon flexbox noRadius" style="justify-content: space-around; margin-bottom:0; box-shadow: none; ">
<div class="item flexbox" @click="onPageJump('/pages/course/outline')">
<image src="../../static/my_01.png" mode="aspectFit"></image>
<text>学习大纲</text>
@@ -37,7 +37,7 @@
</view>
</view>
<view class="newLeve2">
<view class="home_nar " style="padding: 0; background-color: #fff;">
<view class="home_nar nomargin" style="padding: 0; background-color: #fff;">
<view class="flexbox">
<view :class="['hn_cl_tit',tabsid==item.id?'active':'']" @click="curseClick(item)"
v-for="(item, index) in curseTagList" :key="index">
@@ -305,8 +305,10 @@
//页面显示
onShow() {
uni.hideTabBar();
// #ifdef APP-PLUS
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
// #endif
this.requestAll()
},
onTabItemTap() {
@@ -687,7 +689,7 @@
</script>
<style lang="scss" scoped>
@import '@/style/mixin.scss';
.nomargin{margin: 0 !important;}
.nopadding{padding: 0 !important;}
.noRadius{border-radius: 0 !important;}
.appJump {
@@ -1343,9 +1345,10 @@
}
.newLeve2{
box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
// box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
background-color: #fff;
padding: 0 10rpx;
border-top: 1px solid #eee;
// padding-bottom:2rpx;
}
.home_nar {

5
pages/peanut/shopping.vue
View File

@@ -265,8 +265,11 @@
// 商品内容跳转
goDetail(id) {
uni.navigateTo({
url: '../bookShop/commodityDetail?id=' + id
url: '/pages/goods/index/index?id=' + id
});
// uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + id
// });
},
},