This commit is contained in:
2024-06-26 16:19:21 +08:00
parent 6d0addb743
commit 1bd13fdbd8
12 changed files with 5747 additions and 5171 deletions

View File

@@ -5,13 +5,13 @@ if (process.env.NODE_ENV === 'development') {
// baseUrl = "http://localhost:7001/"; // baseUrl = "http://localhost:7001/";
// socketUrl = "ws://localhost:6001/"; // socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://twin-ui.com/demo/";
baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式 baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://101.201.146.165:8088/App-EH/"; // 一路健康APP线上正式 // baseUrl = "http://101.201.146.165:8088/App-EH/"; // 一路健康APP线上正式
@@ -34,8 +34,8 @@ if (process.env.NODE_ENV === 'development') {
// baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥 // baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥
// baseUrl = "http://59.110.212.44:9100/pb/"; // baseUrl = "http://59.110.212.44:9100/pb/";
baseUrl = "https://testapi.nuttyreading.com/"; // baseUrl = "https://testapi.nuttyreading.com/";
// baseUrl = "https://api.nuttyreading.com/"; //1 baseUrl = "https://api.nuttyreading.com/"; //1
// baseUrl = "ws://twin-ui.com:6001/"; // baseUrl = "ws://twin-ui.com:6001/";
// socketUrl = "ws://twin-ui.com:6001/"; // socketUrl = "ws://twin-ui.com:6001/";
} }

View File

@@ -4,65 +4,71 @@
<public-module></public-module> <public-module></public-module>
<z-nav-bar title="课程设置" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar> <z-nav-bar title="课程设置" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar>
<view :style="`height:calc(100vh - ${50 + statusBarHeight}px) !important`">
<view class="contentBox commonPageContentBox">
<!-- <scroll-view class="scroll-view_H cateList" scroll-x="true" scroll-left="0"> --> <!-- <scroll-view class="scroll-view_H cateList" scroll-x="true" scroll-left="0"> -->
<view class="cateList flexbox"> <view class="cateList flexbox">
<text :class="[currentCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item, index)" <text
v-for="(item, index) in cateList" :key="item.type">{{ item.title }}</text> :class="[currentCateIndex == index ? 'cur' : '']"
@click="setOneCateIndex(item, index)"
v-for="(item, index) in cateList"
:key="item.type"
>{{ item.title }}</text
>
</view> </view>
<view
<view :class="`priceDetail commonPageWhiteBox`" v-if="this.cateList[this.currentCateIndex].type == 'price'"> :class="`priceDetail commonPageWhiteBox`"
v-if="this.cateList[this.currentCateIndex].type == 'price'"
>
<scroll-view scroll-y="true" class="scroll-Y"> <scroll-view scroll-y="true" class="scroll-Y">
<price ref="priceDetail" type="price" :oid="this.cateList[this.currentCateIndex].oid"></price> <price
ref="priceDetail"
type="price"
:oid="this.cateList[this.currentCateIndex].oid"
></price>
</scroll-view> </scroll-view>
</view> </view>
<view :class="`priceDetail commonPageWhiteBox`" <view
v-else-if="this.cateList[this.currentCateIndex].type == 'purchaseNotice'"> :class="`priceDetail commonPageWhiteBox`"
v-else-if="
this.cateList[this.currentCateIndex].type == 'purchaseNotice'
"
>
<scroll-view scroll-y="true" class="scroll-Y"> <scroll-view scroll-y="true" class="scroll-Y">
<price ref="purchaseNotice" :oid="this.cateList[this.currentCateIndex].oid"></price> <price
ref="purchaseNotice"
:oid="this.cateList[this.currentCateIndex].oid"
></price>
</scroll-view> </scroll-view>
</view> </view>
<view
<view :class="`priceDetail commonPageWhiteBox`" :class="`priceDetail commonPageWhiteBox`"
v-else-if="this.cateList[this.currentCateIndex].type == 'instructionsForUse'"> v-else-if="
this.cateList[this.currentCateIndex].type == 'instructionsForUse'
"
>
<instructionsForUse ref="instructionsForUse"></instructionsForUse> <instructionsForUse ref="instructionsForUse"></instructionsForUse>
</view> </view>
<view :class="`dataList priceDetail`" v-else> <view :class="`dataList priceDetail`" v-else>
<!-- <image src="@/static/image/headImg/top.png" mode="aspectFit" class="headImage"></image> --> <!-- <image src="@/static/image/headImg/top.png" mode="aspectFit" class="headImage"></image> -->
<view
v-if="
this.cateList[this.currentCateIndex].type == 'courseDescription'
<view v-if="this.cateList[this.currentCateIndex].type == 'courseDescription'" "
>
<courseDescription
ref="courseDescription"
:dataList="dataList"
@hancleClick="goCourseDescription"
label="nameCN"
> >
<courseDescription ref="courseDescription" :dataList="dataList" @hancleClick="goCourseDescription" label="nameCN">
</courseDescription> </courseDescription>
</view> </view>
<!-- <template v-if="currentCateIndex == 2 && curTwoCateIndex == 2"> <!-- <template v-if="currentCateIndex == 2 && curTwoCateIndex == 2">
@@ -75,23 +81,8 @@
</u-grid> </u-grid>
</template> --> </template> -->
</view> </view>
</view> </view>
<z-navigation></z-navigation>
</view> </view>
</template> </template>
@@ -100,30 +91,30 @@ import courseDescription from "../price/courseDescription.vue";
import price from "../price/index.vue"; import price from "../price/index.vue";
import purchaseNotice from "../purchaseNotice/index.vue"; import purchaseNotice from "../purchaseNotice/index.vue";
import instructionsForUse from "../instructionsForUse/index.vue"; import instructionsForUse from "../instructionsForUse/index.vue";
import $http from '@/config/requestConfig.js'; import $http from "@/config/requestConfig.js";
import { import { mapState } from "vuex";
mapState
} from 'vuex';
export default { export default {
components: { components: {
courseDescription,//课程说明 courseDescription, //课程说明
price,//课程价格 price, //课程价格
instructionsForUse,//使用须知 instructionsForUse, //使用须知
purchaseNotice,//使用须知 purchaseNotice, //使用须知
}, },
data() { data() {
return { return {
playData: {}, playData: {},
searchValue: '', searchValue: "",
cateList: [{ cateList: [
{
title: "课程价格(半年/一年)", title: "课程价格(半年/一年)",
type: 'price', type: "price",
oid: '8a9fb99809e4428888aad6b56a3096a6', oid: "8a9fb99809e4428888aad6b56a3096a6",
}, { },
{
title: "课程说明", title: "课程说明",
type: 'courseDescription', type: "courseDescription",
apiUrl: 'app/phoneDoctor.do?getTaiHuToShine' apiUrl: "app/phoneDoctor.do?getTaiHuToShine",
} },
// , { // , {
// title: "使用须知", // title: "使用须知",
@@ -135,9 +126,6 @@ export default {
// oid: 'd0f47071c2194e94845fbb373d06f59d', // oid: 'd0f47071c2194e94845fbb373d06f59d',
// } // }
], // 一级分类标题1 ], // 一级分类标题1
twoCateList: [], // 二级分类标题 twoCateList: [], // 二级分类标题
dataList: [], // 方剂标题 dataList: [], // 方剂标题
@@ -148,75 +136,62 @@ export default {
userMes: {}, // 用户信息 userMes: {}, // 用户信息
searchDisable: false, // 搜索不可用 searchDisable: false, // 搜索不可用
limitShow: false, limitShow: false,
limitTitle: '提示', limitTitle: "提示",
limitContent: '', limitContent: "",
scrollViewHeight: 0, scrollViewHeight: 0,
} };
}, },
onLoad() { onLoad() {
// this.getCourseDescriptionData() // this.getCourseDescriptionData()
this.getPriceData() this.getPriceData();
// this.getUserInfo() // this.getUserInfo()
// this.getCateList() // this.getCateList()
}, },
onHide() { onHide() {
// this.showSearchList = false // this.showSearchList = false
// this.searchList = [] // this.searchList = []
}, },
computed: { computed: {
...mapState(['userInfo']), ...mapState(["userInfo"]),
}, },
methods: { methods: {
goCourseDescription(v) { goCourseDescription(v) {
console.log(v) console.log(v);
uni.navigateTo({ uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + item.id // url: '../bookShop/commodityDetail?id=' + item.id
url: `/pages/courseInformation/courseDescription/index?navTitle=${v.nameCN}&title=${v.nameCN}&oid=${v.oid}` url: `/pages/courseInformation/courseDescription/index?navTitle=${v.nameCN}&title=${v.nameCN}&oid=${v.oid}`,
}) });
}, },
getCourseDescriptionData() { getCourseDescriptionData() {
console.log(this.$store.state, '11111111111') console.log(this.$store.state, "11111111111");
this.$http this.$http
.post('app/phoneDoctor.do?getTaiHuToShine', { .post("app/phoneDoctor.do?getTaiHuToShine", {
customerType customerType: "D",
: token: uni.getStorageSync("token"),
"D", customerOid: uni.getStorageSync("customerOid"),
token oid: "b07e45f6a5f3491db9854b16f3fd8b19",
: uni.getStorageSync("token")
,
customerOid
: uni.getStorageSync("customerOid"),
oid: 'b07e45f6a5f3491db9854b16f3fd8b19',
step: 0, step: 0,
limit: 100 limit: 100,
}) })
.then(res => { .then((res) => {
console.log(res.obj.dataLst console.log(res.obj.dataLst, "7777777777777777777");
, '7777777777777777777') this.dataList = res.obj.dataLst;
this.dataList = res.obj.dataLst
// socket.init(); // socket.init();
}); });
}, },
getPriceData() { getPriceData() {
var that = this; var that = this;
setTimeout(() => { setTimeout(() => {
that.$nextTick(() => { that.$nextTick(() => {
that.$refs.priceDetail.getData() that.$refs.priceDetail.getData();
}) });
}, 100) }, 100);
}, },
// 检查是有权限使用搜索功能 // 检查是有权限使用搜索功能
checkDisable() { checkDisable() {
console.log('点击了') console.log("点击了");
}, },
// 显示无权限弹窗 // 显示无权限弹窗
// showNoRights() { // showNoRights() {
@@ -237,198 +212,211 @@ export default {
getUserInfo() { getUserInfo() {
// 用户详情 // 用户详情
if (this.userInfo.id != undefined) { if (this.userInfo.id != undefined) {
this.$http this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
.post('book/user/info/' + this.userInfo.id) this.userMes = res.user;
.then(res => { this.getCateList();
this.userMes = res.user console.log(this.userMes, "呼呼");
this.getCateList()
console.log(this.userMes, '呼呼')
}); });
} }
}, },
// 详情 // 详情
gotoDetail(item) { gotoDetail(item) {
console.log('111', item) console.log("111", item);
console.log('this.currentCateIndex', this.currentCateIndex) console.log("this.currentCateIndex", this.currentCateIndex);
console.log('this.curTwoCateIndex', this.curTwoCateIndex) console.log("this.curTwoCateIndex", this.curTwoCateIndex);
if (this.currentCateIndex == 0) { if (this.currentCateIndex == 0) {
uni.navigateTo({ uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + item.id // url: '../bookShop/commodityDetail?id=' + item.id
url: './xueshugongxianDetail?id=' + item.id url: "./xueshugongxianDetail?id=" + item.id,
}) });
return return;
} }
if (this.currentCateIndex == 1) { if (this.currentCateIndex == 1) {
uni.navigateTo({ uni.navigateTo({
url: "./medicaldesDetail?id=" + item.id url: "./medicaldesDetail?id=" + item.id,
}) });
return return;
} }
if (this.currentCateIndex == 2) { if (this.currentCateIndex == 2) {
console.log('111', item) console.log("111", item);
uni.navigateTo({ uni.navigateTo({
url: './video?title=' + item.name + '&src=' + item.url url: "./video?title=" + item.name + "&src=" + item.url,
}) });
return return;
} }
if (this.currentCateIndex == 3) { if (this.currentCateIndex == 3) {
console.log('111', item) console.log("111", item);
uni.navigateTo({ uni.navigateTo({
url: "./recordDetail?id=" + item.id url: "./recordDetail?id=" + item.id,
}) });
return return;
} }
}, },
// 获取名称 // 获取名称
getTitles(dictType) { getTitles(dictType) {
console.log('dictType', dictType) console.log("dictType", dictType);
if (this.currentCateIndex == 0) { if (this.currentCateIndex == 0) {
if (dictType == 2) { if (dictType == 2) {
uni.navigateTo({ uni.navigateTo({
url: './zhuanzhuchuban' url: "./zhuanzhuchuban",
}) });
return return;
} }
$http.request({ $http
.request({
url: "book/generalArticle/articleByPage", url: "book/generalArticle/articleByPage",
method: "POST", method: "POST",
data: { data: {
// loadAnimate: 'none', // 请求加载动画 // loadAnimate: 'none', // 请求加载动画
"type": dictType == 1 ? '1' : '2', type: dictType == 1 ? "1" : "2",
"limit": 1000, limit: 1000,
"current": 1, current: 1,
}, },
header: { //默认 无 说明:请求头 header: {
'Content-Type': 'application/json' //默认 无 说明:请求头
"Content-Type": "application/json",
}, },
}).then(res => {
console.log(res, '内容获取成功')
if (res.code == 0 && res.result && res.result.records.length > 0) {
this.dataList = res.result.records
} else {
this.dataList = []
}
}).catch(e => {
this.dataList = []
console.log(e)
}) })
.then((res) => {
console.log(res, "内容获取成功");
if (res.code == 0 && res.result && res.result.records.length > 0) {
this.dataList = res.result.records;
} else {
this.dataList = [];
}
})
.catch((e) => {
this.dataList = [];
console.log(e);
});
} }
if (this.currentCateIndex == 1) { if (this.currentCateIndex == 1) {
$http.request({ $http
.request({
url: "book/medicaldes/inheritListByPage", url: "book/medicaldes/inheritListByPage",
method: "POST", method: "POST",
data: { data: {
// loadAnimate: 'none', // 请求加载动画 // loadAnimate: 'none', // 请求加载动画
'dictType': dictType, dictType: dictType,
"limit": 1000, limit: 1000,
"current": 1 current: 1,
}, },
header: { //默认 无 说明:请求头 header: {
'Content-Type': 'application/json' //默认 无 说明:请求头
"Content-Type": "application/json",
}, },
}).then(res => { })
console.log(res, '内容获取成功') .then((res) => {
console.log(res, "内容获取成功");
if (res.code == 0 && res.result.records.length > 0) { if (res.code == 0 && res.result.records.length > 0) {
this.dataList = res.result.records this.dataList = res.result.records;
for (let i = 0; i < this.dataList.length; i++) { for (let i = 0; i < this.dataList.length; i++) {
this.dataList[i].imageslist = []; this.dataList[i].imageslist = [];
this.dataList[i].imageslist = this.dataList[i].img.split(";"); this.dataList[i].imageslist = this.dataList[i].img.split(";");
} }
} else { } else {
this.dataList = [] this.dataList = [];
} }
}).catch(e => {
this.dataList = []
console.log(e)
}) })
.catch((e) => {
this.dataList = [];
console.log(e);
});
} }
if (this.currentCateIndex == 2) { if (this.currentCateIndex == 2) {
$http.request({ $http
.request({
url: "book/medicaldes/lightListByType?type=" + dictType, url: "book/medicaldes/lightListByType?type=" + dictType,
method: "POST", method: "POST",
data: { data: {
// loadAnimate: 'none', // 请求加载动画 // loadAnimate: 'none', // 请求加载动画
"limit": 1000, limit: 1000,
"page": 1, page: 1,
}, },
header: { //默认 无 说明:请求头 header: {
'Content-Type': 'application/json' //默认 无 说明:请求头
"Content-Type": "application/json",
}, },
}).then(res => {
console.log(res, '内容获取成功')
if (res.code == 0 && res.result.length > 0) {
this.dataList = res.result
} else {
this.dataList = []
}
}).catch(e => {
this.dataList = []
console.log(e)
}) })
.then((res) => {
console.log(res, "内容获取成功");
if (res.code == 0 && res.result.length > 0) {
this.dataList = res.result;
} else {
this.dataList = [];
}
})
.catch((e) => {
this.dataList = [];
console.log(e);
});
} }
if (this.currentCateIndex == 3) { if (this.currentCateIndex == 3) {
$http.request({ $http
.request({
url: "book/medicaldes/recordByType?type=" + dictType, url: "book/medicaldes/recordByType?type=" + dictType,
method: "POST", method: "POST",
data: { data: {
// loadAnimate: 'none', // 请求加载动画 // loadAnimate: 'none', // 请求加载动画
"limit": 1000, limit: 1000,
"page": 1, page: 1,
}, },
header: { //默认 无 说明:请求头 header: {
'Content-Type': 'application/json' //默认 无 说明:请求头
"Content-Type": "application/json",
}, },
}).then(res => {
console.log(res, '内容获取成功')
if (res.code == 0 && res.result.length > 0) {
this.dataList = res.result
} else {
this.dataList = []
}
}).catch(e => {
this.dataList = []
console.log(e)
}) })
.then((res) => {
console.log(res, "内容获取成功");
if (res.code == 0 && res.result.length > 0) {
this.dataList = res.result;
} else {
this.dataList = [];
}
})
.catch((e) => {
this.dataList = [];
console.log(e);
});
} }
}, },
setTwoCateIndex(item, index) { setTwoCateIndex(item, index) {
let dictType = item.dictType let dictType = item.dictType;
this.curTwoCateIndex = index this.curTwoCateIndex = index;
this.getTitles(dictType) this.getTitles(dictType);
}, },
async setOneCateIndex(item, index) { async setOneCateIndex(item, index) {
console.log(index, 99999) console.log(index, 99999);
var that = this var that = this;
switch (item.type) { switch (item.type) {
case 'courseDescription': case "courseDescription":
setTimeout(() => { setTimeout(() => {
that.$nextTick(() => { that.$nextTick(() => {
that.$refs.courseDescription.getData() that.$refs.courseDescription.getData();
}) });
}, 100) }, 100);
break; break;
case 'price': case "price":
setTimeout(() => { setTimeout(() => {
that.$nextTick(() => { that.$nextTick(() => {
that.$refs.priceDetail.getData() that.$refs.priceDetail.getData();
}) });
}, 100) }, 100);
break; break;
case 'purchaseNotice': case "purchaseNotice":
setTimeout(() => { setTimeout(() => {
that.$nextTick(() => { that.$nextTick(() => {
that.$refs.purchaseNotice.getData() that.$refs.purchaseNotice.getData();
}) });
}, 100) }, 100);
break; break;
case 'instructionsForUse': case "instructionsForUse":
setTimeout(() => { setTimeout(() => {
that.$nextTick(() => { that.$nextTick(() => {
that.$refs.instructionsForUse.getData() that.$refs.instructionsForUse.getData();
}) });
}, 100) }, 100);
// that.getPriceData() // that.getPriceData()
break; break;
} }
@@ -452,24 +440,20 @@ export default {
// }) // })
// return // return
// } // }
let type = item.type let type = item.type;
this.currentCateIndex = index this.currentCateIndex = index;
this.searchValue = '' this.searchValue = "";
this.searchList = [] this.searchList = [];
this.showSearchList = false this.showSearchList = false;
// if (index != 2) { // if (index != 2) {
// uni.createSelectorQuery().select('.cateList').boundingClientRect(function (rect) { // uni.createSelectorQuery().select('.cateList').boundingClientRect(function (rect) {
// var height = rect.height // var height = rect.height
// console.log('元素高度:',); // console.log('元素高度:',);
// }).exec(); // }).exec();
// } else { // } else {
// this.getJFList(dictType) // this.getJFList(dictType)
// } // }
@@ -477,10 +461,8 @@ export default {
transformData(inputData) { transformData(inputData) {
const result = {}; const result = {};
inputData.forEach(item => { inputData.forEach((item) => {
const { const { letter } = item;
letter
} = item;
if (!result[letter]) { if (!result[letter]) {
result[letter] = []; result[letter] = [];
} }
@@ -516,9 +498,9 @@ export default {
// }) // })
// }, // },
getCateList(id) { getCateList(id) {
id ? '' : id = 0 id ? "" : (id = 0);
this.twoCateList = [] this.twoCateList = [];
this.curTwoCateIndex = 0 this.curTwoCateIndex = 0;
// 0为获取顶级分类其他为搜索下级分类目前的逻辑顶级是写死的所以可能只会涉及到搜索第二级 // 0为获取顶级分类其他为搜索下级分类目前的逻辑顶级是写死的所以可能只会涉及到搜索第二级
// $http.request({ // $http.request({
// url: "book/prescript/prescriptCategoryList", // url: "book/prescript/prescriptCategoryList",
@@ -534,7 +516,7 @@ export default {
// console.log(res, '脉穴分类获取成功') // console.log(res, '脉穴分类获取成功')
// if (res.code == 0 && res.list.length > 0) { // if (res.code == 0 && res.list.length > 0) {
// this.cateList = res.list // this.cateList = res.list
this.getTowCateList(this.cateList[0].type) this.getTowCateList(this.cateList[0].type);
// } else { // } else {
// this.cateList = [] // this.cateList = []
// } // }
@@ -546,15 +528,15 @@ export default {
// 放大图片 // 放大图片
previewImage(url) { previewImage(url) {
console.log(url) console.log(url);
uni.previewImage({ uni.previewImage({
urls: [url], urls: [url],
longPressActions: { longPressActions: {
itemList: ['很抱歉,暂不支持保存图片到本地'], itemList: ["很抱歉,暂不支持保存图片到本地"],
success: function (res) { success: function (res) {
// console.log(res,'+++++') // console.log(res,'+++++')
} },
} },
}); });
}, },
// getSearch() { // getSearch() {
@@ -645,8 +627,7 @@ export default {
plus.key.hideSoftKeybord(); plus.key.hideSoftKeybord();
// #endif // #endif
}, },
};
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@@ -669,9 +650,9 @@ export default {
} }
.contentBox { .contentBox {
height: calc(100% - 50px); // height: calc(100% - 50px);
}
.cateList { .cateList {
padding: 10rpx; padding: 10rpx;
box-sizing: border-box; box-sizing: border-box;
justify-content: space-between; justify-content: space-between;
@@ -691,9 +672,9 @@ export default {
border-bottom: 2px solid rgb(58, 179, 174); border-bottom: 2px solid rgb(58, 179, 174);
// box-shadow: 0 2px 12px 0 rgba(58, 179, 174, .5); // box-shadow: 0 2px 12px 0 rgba(58, 179, 174, .5);
} }
} }
.twoCateList { .twoCateList {
font-size: 28rpx; font-size: 28rpx;
margin-top: 20rpx; margin-top: 20rpx;
@@ -703,14 +684,14 @@ export default {
} }
.cur { .cur {
color: #3AB3AE; color: #3ab3ae;
font-weight: 600 !important; font-weight: 600 !important;
} }
// .u-grid-list{border: 0.5px solid #dadbde;} // .u-grid-list{border: 0.5px solid #dadbde;}
} }
.dataList { .dataList {
font-size: 26rpx; font-size: 26rpx;
// margin-top: 20rpx; // margin-top: 20rpx;
// padding: 32rpx 0rpx; // padding: 32rpx 0rpx;
@@ -718,8 +699,6 @@ export default {
background-color: #f8f9fa; background-color: #f8f9fa;
box-sizing: border-box; box-sizing: border-box;
.JFtitleItem { .JFtitleItem {
background-color: #ffffff; background-color: #ffffff;
padding: 20rpx 10rpx; padding: 20rpx 10rpx;
@@ -731,10 +710,8 @@ export default {
width: 220rpx; width: 220rpx;
height: 220rpx; height: 220rpx;
} }
}
} }
.search_box { .search_box {
margin: 0 auto; margin: 0 auto;
overflow: hidden; overflow: hidden;
@@ -752,17 +729,16 @@ export default {
padding: 0upx 40upx; padding: 0upx 40upx;
background-color: #fff; background-color: #fff;
border-radius: 20upx; border-radius: 20upx;
box-shadow: 0 0px 10px 1px #3AB3AE33; box-shadow: 0 0px 10px 1px #3ab3ae33;
} }
.prompt { .prompt {
color: #838383; color: #838383;
font-size: 24rpx; font-size: 24rpx;
} }
.icon_search { .icon_search {
background-image: url('@/static/icon/map_ic_search.png'); background-image: url("@/static/icon/map_ic_search.png");
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
@@ -789,9 +765,6 @@ export default {
height: 100rpx; height: 100rpx;
} }
.scroll-Y { .scroll-Y {
height: 100%; height: 100%;
} }

View File

@@ -105,7 +105,7 @@ export default {
timer: null, timer: null,
isLeftClick: false, isLeftClick: false,
isOpenRightButton: true, isOpenRightButton: true,
viewid: "cont0", viewid: "",
viewidIndex: 0, viewidIndex: 0,
cateIconList: [ cateIconList: [
{ {
@@ -508,4 +508,7 @@ export default {
height: 50rpx; height: 50rpx;
} }
} }
.richDetail{
padding: 20rpx;
}
</style> </style>

View File

@@ -31,31 +31,99 @@
height: 50rpx;"></image> height: 50rpx;"></image>
</view> </view>
</view> --> </view> -->
<uni-indexed-list :options="indexList" :showSelect="false" @itemKeyClick="getCurrent">
<!-- labelSlot -->
<template slot="titleSlot" slot-scope="slotProps">
<text :class="`cate_item_name ${viewidIndex == slotProps.rowIndex ? 'hot' : ''}`">{{ slotProps.row }}</text>
</template>
<template slot="labelSlot" slot-scope="slotProps">
<u-index-list
:index-list="indexList"
activeColor="#60CABF"
:uIndexStyle="{
height: 'auto',
padding: '20rpx',
}"
>
<view v-for="(item, index) in itemArr">
<!-- #ifdef APP-NVUE -->
<u-index-anchor
:text="indexList[index]"
bgColor="#AFDECC"
></u-index-anchor>
<!-- #endif -->
<u-index-item>
<!-- #ifndef APP-NVUE -->
<u-index-anchor :text="indexList[index]"></u-index-anchor>
<!-- #endif -->
<common-list <common-list
noDataIcon="data" noDataIcon="data"
:isCondition="true" :isCondition="true"
:isNoIcon="true" :isNoIcon="true"
@lower="onReachBottom1"
:dataList="slotProps.row"
label="title"
>
<template slot="labelSlot" slot-scope="slotProps">
<image
v-if="slotProps.row.image"
:src="slotProps.row.image"
mode="aspectFil"
class="book_image"
></image>
<image
v-else
src="@/static/icon/videoIcon.png"
mode="aspectFil"
class="book_image"
></image>
<view class="related_courses_name">
<view class="">
{{ slotProps.row.title }}
</view>
<view style="margin-top: 10rpx">
<view
v-for="item in slotProps.row.courseCatalogueEntityList"
style="float: left; margin-right: 20rpx"
>
{{
slotProps.row.courseCatalogueEntityList.length > 1
? item.title
: "整部"
}}
<text v-if="item.halfFee == 0 && item.fee == 0">免费</text>
<text v-else-if="item.halfFee == 0 || item.fee == 0">
{{ item.halfFee != 0 ? item.halfFee : "免费" }}/{{
item.fee != 0 ? item.fee : "免费"
}}</text
>
<text v-else-if="item.halfFee != 0 || item.fee != 0">
{{ item.halfFee }}/{{ item.fee }}</text
>
</view>
</view>
</view>
</template>
</common-list>
</template>
</uni-indexed-list>
<!-- <u-index-list
:index-list="indexList"
activeColor="#60CABF"
:uIndexStyle="{
height: 'auto',
margin: '20rpx',
}"
>
<view v-for="(item, index) in itemArr">
<u-index-anchor
:text="indexList[index]"
bgColor="#AFDECC"
></u-index-anchor>
<u-index-item>
<u-index-anchor :text="indexList[index]"></u-index-anchor>
<common-list
noDataIcon="data"
:isCondition="true"
:isNoIcon="true"
:dataList="item" :dataList="item"
label="title" label="title"
> >
@@ -102,12 +170,12 @@
</view> </view>
</view> </view>
<!-- <text v-if="slotProps.row.conditions!='03'">试听</text> -->
</template> </template>
</common-list> </common-list>
</u-index-item> </u-index-item>
</view> </view>
</u-index-list> </u-index-list> -->
@@ -132,7 +200,7 @@ export default {
timer: null, timer: null,
isLeftClick: false, isLeftClick: false,
isOpenRightButton: true, isOpenRightButton: true,
viewid: "cont0", viewid: "",
viewidIndex: 0, viewidIndex: 0,
cateIconList: [ cateIconList: [
@@ -304,6 +372,11 @@ export default {
...mapState(["userInfo"]), ...mapState(["userInfo"]),
}, },
methods: { methods: {
getCurrent(data){
console.log('data at line 375:', data)
this.viewidIndex=data
},
close() { close() {
this.isOpenRightButton = false; this.isOpenRightButton = false;
}, },
@@ -395,7 +468,7 @@ export default {
this.cateIconList = res.list; this.cateIconList = res.list;
this.indexList = this.cateIconList.map((e) => { this.indexList = this.cateIconList.map((e) => {
return e.sociology.title; return {...e,data:e.courseList,letter:e.sociology.title};
}); });
console.log("this.indexList at line 645:", this.indexList); console.log("this.indexList at line 645:", this.indexList);
this.itemArr = this.cateIconList.map((e) => { this.itemArr = this.cateIconList.map((e) => {
@@ -599,7 +672,11 @@ export default {
} }
} }
.cate_item_name {
}
.cate_item_name {
padding-top: 60rpx; padding-top: 60rpx;
width: 100%; width: 100%;
// margin-left: 21rpx; // margin-left: 21rpx;
@@ -611,7 +688,6 @@ export default {
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
} }
}
.hot { .hot {
color: $themeColor !important; color: $themeColor !important;
} }
@@ -641,7 +717,7 @@ export default {
margin-right: 10rpx; margin-right: 10rpx;
} }
/deep/.list_item { /deep/.list_item {
padding-left: 20rpx; padding: 12rpx 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
border-color: #efeef4 !important; border-color: #efeef4 !important;

View File

@@ -44,10 +44,7 @@
<view <view
v-if="curriculumData.image" v-if="curriculumData.image"
:style="`height: auto !important;${ :style="`height: auto !important;${
(cateList.length > 0 && goBuyTitle
cateList[currentCateIndex].isBuy == 0 &&
vip.type == '0') ||
vip.type != 0
? 'padding-top:80rpx' ? 'padding-top:80rpx'
: '' : ''
}`" }`"
@@ -74,7 +71,7 @@
> >
</view> </view>
<view class="containerBg1"> <view class="containerBg1" :style="`${curriculumData.content && curriculumData.content != ''?'padding:40rpx 0;':''}`">
<view class="course_info_box"> <view class="course_info_box">
<view class="course_info"> <view class="course_info">
<view class="flexbox course_title" v-if="curriculumData.id"> <view class="flexbox course_title" v-if="curriculumData.id">
@@ -106,7 +103,7 @@
<view class="containerBg2"> <view class="containerBg2">
<view class="shiting_content"> <view class="shiting_content">
<view v-for="(v, i) in cateList" style="margin-bottom: 40rpx"> <view v-for="(v, i) in cateList" class="catalogueList" style="margin-top: 20rpx">
<view class="catalogueTitle chapter_title"> <view class="catalogueTitle chapter_title">
<view class="top"> <view class="top">
<view class="line"></view> <view class="line"></view>
@@ -161,7 +158,9 @@
<!-- --> <!-- -->
</view> </view>
<view class="chapter_content" v-if="courseList[i].length>0">
<view class="chapter_content" v-if="courseList[i]">
<courseDescription <courseDescription
:isCondition="true" :isCondition="true"
@@ -207,11 +206,6 @@
</view> </view>
</view
></view>
</view>
<view class="small_class_teaching_box"> <view class="small_class_teaching_box">
<!-- <view class="small_class_teaching_top"> <!-- <view class="small_class_teaching_top">
<view class="small_class_teaching_top_left"> <view class="small_class_teaching_top_left">
@@ -246,36 +240,33 @@
<view class="progress_icon" style="" <view class="progress_icon" style=""
><u-line-progress ><u-line-progress
activeColor="#3AB3AE" activeColor="#3AB3AE"
height="18" height="14"
:percentage="percentage" :percentage="v.completion"
:showText="false" :showText="false"
></u-line-progress> ></u-line-progress>
<text <text
v-if="percentage"
style=" style="
font-size: 28rpx; font-size: 28rpx;
margin-left: 10rpx; margin-left: 20rpx;
margin-top: -2rpx; margin-top: -2rpx;
font-weight: 700; font-weight: 700;
" "
> >
{{ percentage }} %</text {{ v.completion }} %</text
> >
</view> </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>
</view> </view>
</view> </view>
</view
></view>
</view>
<view <view
class="small_class_teaching_box related_courses_box" class="small_class_teaching_box related_courses_box"
v-if="relatedCoursesList.length > 0" v-if="relatedCoursesList.length > 0"
@@ -1238,8 +1229,8 @@ export default {
.small_class_teaching_box { .small_class_teaching_box {
width: 100%; width: 100%;
// margin-top: 20rpx; margin-top: 20rpx;
background: #f0fbf3; // background: #f0fbf3;
.small_class_teaching_top { .small_class_teaching_top {
padding: 20rpx 20rpx 0 10rpx; padding: 20rpx 20rpx 0 10rpx;
@@ -1295,7 +1286,10 @@ export default {
.schedule { .schedule {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
padding: 20rpx 20rpx; display: flex;
align-items: center;
justify-content: space-between;
padding: 10rpx 0;
box-sizing: border-box; box-sizing: border-box;
align-items: center; align-items: center;
color: #018f89; color: #018f89;
@@ -1303,7 +1297,7 @@ export default {
// font-family: MicrosoftYaHei; // font-family: MicrosoftYaHei;
.icon_box { .icon_box {
width: 100%; width:auto;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 0rpx; margin-bottom: 0rpx;
@@ -1317,14 +1311,16 @@ export default {
} }
.progress_box { .progress_box {
width: 100%; width: calc(100% - 180rpx);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
position: relative; position: relative;
.progress_icon { .progress_icon {
width: calc(100% - 240rpx); width: calc(100% - 60rpx);
display: flex; display: flex;
align-items: center;
} }
.icon1 { .icon1 {
@@ -1621,9 +1617,8 @@ export default {
} }
.containerBg2 { .containerBg2 {
padding-top: 40rpx; // padding-top: 40rpx;
// margin-top: 100rpx; // margin-top: 100rpx;
background: linear-gradient(108deg, #e4f8eb 0%, #d1e8da 100%) !important;
.shiting { .shiting {
line-height: 100rpx; line-height: 100rpx;
@@ -1644,7 +1639,7 @@ export default {
text-align: center; text-align: center;
} }
.shiting_content { .shiting_content {
padding: 20rpx; padding: 20rpx 0 0;
} }
} }
.chapter_title { .chapter_title {
@@ -1699,6 +1694,7 @@ export default {
.catalogueTitle { .catalogueTitle {
justify-content: space-between; justify-content: space-between;
overflow: hidden; overflow: hidden;
margin-bottom: 20rpx;
// background-image: linear-gradient(108deg, #cae9f9 0%, #e1f6fc8c 50%); // background-image: linear-gradient(108deg, #cae9f9 0%, #e1f6fc8c 50%);
// background-image: linear-gradient(180deg, #cfe0ff 0%, #fff 50%); // background-image: linear-gradient(180deg, #cfe0ff 0%, #fff 50%);
@@ -1766,6 +1762,7 @@ export default {
margin-top: -4rpx; margin-top: -4rpx;
// position: relative; // position: relative;
z-index: 1; z-index: 1;
// padding: 40rpx 0;
border-radius: 30rpx 30rpx 0 0; border-radius: 30rpx 30rpx 0 0;
// background-color: #fff; // background-color: #fff;
@@ -1780,4 +1777,14 @@ export default {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.catalogueList{
background: linear-gradient(108deg, #e4f8eb 0%, #d1e8da 100%) !important;
padding: 20rpx;
padding-bottom: 0;
}
.catalogueList:nth-child(1){
margin-top: 0 !important;
}
</style> </style>

View File

@@ -33,7 +33,7 @@
</view> </view>
</template> --> </template> -->
<view class="contentBox commonPageContentBox"> <view class="contentBox commonPageContentBox" :style="`height:auto !important`">
<!-- <scroll-view class="scroll-view_H statusList" scroll-x="true" scroll-left="0"> --> <!-- <scroll-view class="scroll-view_H statusList" scroll-x="true" scroll-left="0"> -->
<!-- <view class="statusList flexbox" > <!-- <view class="statusList flexbox" >
<text :class="[currentStatusIndex == index ? 'cur' : '']" @click="setOneCateIndex(item, index)" <text :class="[currentStatusIndex == index ? 'cur' : '']" @click="setOneCateIndex(item, index)"
@@ -158,14 +158,14 @@
</view> --> </view> -->
</view> </view>
<u-modal <!-- <u-modal
:show="show" :show="show"
:title="modalInfo.title" :title="modalInfo.title"
:content="modalInfo.content" :content="modalInfo.content"
showCancelButton showCancelButton
@confirm="hancleModalConfirm" @confirm="hancleModalConfirm"
@cancel="hancleModalCancel" @cancel="hancleModalCancel"
></u-modal> ></u-modal> -->
<z-navigation></z-navigation> <z-navigation></z-navigation>
</view> </view>
@@ -448,7 +448,7 @@ export default {
}) })
.then(async (res) => { .then(async (res) => {
if (res.code == 0) { if (res.code == 0) {
await this.getCourseDescriptionData(); // await this.getCourseDescriptionData();
// that.cateIconList = res.labels ? res.labels : []; // that.cateIconList = res.labels ? res.labels : [];
} }
}); });
@@ -1439,6 +1439,7 @@ export default {
// border-radius: 10rpx; // border-radius: 10rpx;
} }
.scroll { .scroll {
flex: 1;
} }
.scroll view { .scroll view {

View File

@@ -34,29 +34,27 @@
</view> </view>
</view> --> </view> -->
<view <view
style="font-size: 24rpx;line-height: 40rpx;" style="font-size: 24rpx; line-height: 40rpx"
class="learning_image_right" class="learning_image_right"
v-if="currentCateIndex != 2" v-if="currentCateIndex != 2"
@click.stop="
slotProps.row.isStudying == 1 || currentCateIndex == 0
? openCancelCollection(slotProps.row)
: handlecollection(slotProps.row)
"
> >
<text <text
style="background-color: #adecf7" style="background-color: #adecf7"
v-if="slotProps.row.isStudying == 1 || currentCateIndex == 0" v-if="slotProps.row.isStudying == 1 || currentCateIndex == 0"
@click.native.stop="openCancelCollection(slotProps.row)"
> >
移出正在学习</text 移出正在学习</text
> >
<text <text v-else style="font-size: 24rpx"> 加入正在学习</text>
v-else
style="font-size: 24rpx"
@click.native.stop="handlecollection(slotProps.row)"
>
加入正在学习</text
>
</view> </view>
</view> </view>
<view style="overflow: hidden"> <view style="overflow: hidden">
<view class="feng" style="position: relative;"> <view class="feng" style="position: relative">
<!-- <view v-if="currentCateIndex==0" class="delisted" <!-- <view v-if="currentCateIndex==0" class="delisted"
>已过期</view >已过期</view
> --> > -->
@@ -78,16 +76,18 @@
>暂无封面图</view >暂无封面图</view
> >
<view
<view v-if="currentCateIndex==2" style="font-size: 24rpx;position: absolute;" class="learning_image_right delisted"> v-if="currentCateIndex == 2"
style="font-size: 24rpx; position: absolute"
class="learning_image_right delisted"
>
<text style="background-color: red; color: #fff"> 再次学习</text> <text style="background-color: red; color: #fff"> 再次学习</text>
</view> </view>
</view </view>
>
<view class="cate_right"> <view class="cate_right">
<view <view
class="related_courses_name " class="related_courses_name"
:style="`${currentCateIndex==2 ? 'color:#c0c4cc' : ''}`" :style="`${currentCateIndex == 2 ? 'color:#c0c4cc' : ''}`"
>{{ slotProps.row.title }}</view >{{ slotProps.row.title }}</view
> >
@@ -168,19 +168,18 @@
" "
><view ><view
class="" class=""
v-if="item.isBuy!=1" v-if="item.isBuy != 1"
style="color: #969696; font-size: 24rpx" style="color: #969696; font-size: 24rpx"
> >
未购买 </view 未购买
> </view>
<view <view
class="" class=""
v-if="item.lastStudyTime" v-if="item.lastStudyTime"
style="color: #969696; font-size: 24rpx" style="color: #969696; font-size: 24rpx"
> >
上次学习时间{{ item.lastStudyTime }} </view 上次学习时间{{ item.lastStudyTime }}
> </view>
<view <view
class="" class=""
@@ -254,7 +253,16 @@ export default {
console.log(res, "7777777777777777777"); console.log(res, "7777777777777777777");
this.signShow = false; this.signShow = false;
if (res.code == 0) { if (res.code == 0) {
if (this.currentCateIndex == 0) {
this.$emit("refresh"); this.$emit("refresh");
} else {
this.dataList.map((e) => {
if (e.id == this.selectCurriculum.id) {
e.isStudying = 0;
}
});
}
// that.cateIconList = res.labels ? res.labels : []; // that.cateIconList = res.labels ? res.labels : [];
} }
}); });
@@ -285,7 +293,12 @@ export default {
}) })
.then(async (res) => { .then(async (res) => {
if (res.code == 0) { if (res.code == 0) {
this.$emit("refresh"); this.dataList.map((e) => {
if (e.id == row.id) {
e.isStudying = 1;
}
});
// this.$emit("refresh");
} }
}); });
}, },

View File

@@ -1,19 +1,24 @@
<template> <template>
<view> <view>
<view v-if="loaded || list.itemIndex < 15" class="uni-indexed-list__title-wrapper"> <view @click="handleClick(list.key)" v-if="loaded || list.itemIndex < 15" class="uni-indexed-list__title-wrapper">
<text v-if="list.items && list.items.length > 0" class="uni-indexed-list__title">{{ list.key }}</text> <slot v-if="list.items && list.items.length > 0" name="titleSlot" :row="list.key" :rowIndex="idx"></slot>
<!-- <text class="uni-indexed-list__title">{{ list.key }}</text> -->
</view> </view>
<view v-if="(loaded || list.itemIndex < 15) && list.items && list.items.length > 0" class="uni-indexed-list__list"> <view v-if="(loaded || list.itemIndex < 15) && list.items && list.items.length > 0" class="uni-indexed-list__list">
<view v-for="(item, index) in list.items" :key="index" class="uni-indexed-list__item" hover-class="uni-indexed-list__item--hover">
<slot name="labelSlot" :row="list.items.map(e=>{return e.name})"></slot>
<!-- <view v-for="(item, index) in list.items" :key="index" class="uni-indexed-list__item" hover-class="uni-indexed-list__item--hover">
<view class="uni-indexed-list__item-container" @click="onClick(idx, index)"> <view class="uni-indexed-list__item-container" @click="onClick(idx, index)">
<view class="uni-indexed-list__item-border" :class="{'uni-indexed-list__item-border--last':index===list.items.length-1}"> <view class="uni-indexed-list__item-border" :class="{'uni-indexed-list__item-border--last':index===list.items.length-1}">
<view v-if="showSelect" style="margin-right: 20rpx;"> <view v-if="showSelect" style="margin-right: 20rpx;">
<uni-icons :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#C0C0C0'" size="24" /> <uni-icons :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#C0C0C0'" size="24" />
</view> </view>
<text class="uni-indexed-list__item-content">{{ item.name }}</text> <text class="uni-indexed-list__item-content">{{ item.name }}</text>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>
@@ -43,6 +48,10 @@
} }
}, },
methods: { methods: {
handleClick(data){
console.log('data at line 51:', data)
this.$emit("itemKeyClick", data)
},
onClick(idx, index) { onClick(idx, index) {
this.$emit("itemClick", { this.$emit("itemClick", {
idx, idx,
@@ -55,12 +64,13 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.uni-indexed-list__list { .uni-indexed-list__list {
margin-top: 30px;
background-color: $uni-bg-color; background-color: $uni-bg-color;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
display: flex; display: flex;
/* #endif */ /* #endif */
flex-direction: column; flex-direction: column;
border-top-style: solid; // border-top-style: solid;
border-top-width: 1px; border-top-width: 1px;
border-top-color: #DEDEDE; border-top-color: #DEDEDE;
} }
@@ -132,7 +142,7 @@
display: flex; display: flex;
width: 100%; width: 100%;
/* #endif */ /* #endif */
background-color: #f7f7f7; // background-color: #f7f7f7;
} }
.uni-indexed-list__title { .uni-indexed-list__title {

View File

@@ -9,7 +9,17 @@
<view v-for="(list, idx) in lists" :key="idx" :id="'uni-indexed-list-' + idx"> <view v-for="(list, idx) in lists" :key="idx" :id="'uni-indexed-list-' + idx">
<!-- #endif --> <!-- #endif -->
<indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect" <indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect"
@itemClick="onClick"></indexed-list-item> @itemClick="onClick" >
<template slot="labelSlot" slot-scope="slotProps">
<slot name="labelSlot" :row="slotProps.row"></slot>
</template>
<template slot="titleSlot" slot-scope="slotProps">
<slot name="titleSlot" :row="slotProps.row" :rowIndex="slotProps.rowIndex"></slot>
</template>
</indexed-list-item>
<!-- #ifndef APP-NVUE --> <!-- #ifndef APP-NVUE -->
</view> </view>
</scroll-view> </scroll-view>
@@ -21,15 +31,15 @@
<view class="uni-indexed-list__menu" @touchstart="touchStart" @touchmove.stop.prevent="touchMove" <view class="uni-indexed-list__menu" @touchstart="touchStart" @touchmove.stop.prevent="touchMove"
@touchend="touchEnd" @mousedown.stop="mousedown" @mousemove.stop.prevent="mousemove" @touchend="touchEnd" @mousedown.stop="mousedown" @mousemove.stop.prevent="mousemove"
@mouseleave.stop="mouseleave"> @mouseleave.stop="mouseleave">
<view v-for="(list, key) in lists" :key="key" class="uni-indexed-list__menu-item" <view @click="itemKeyClick(list.key)" v-for="(list, key) in lists" :key="key" class="uni-indexed-list__menu-item"
:class="touchmoveIndex == key ? 'uni-indexed-list__menu--active' : ''"> :class="touchmoveIndex == key ? 'uni-indexed-list__menu--active' : ''">
<text class="uni-indexed-list__menu-text" <text class="uni-indexed-list__menu-text"
:class="touchmoveIndex == key ? 'uni-indexed-list__menu-text--active' : ''">{{ list.key }}</text> :class="touchmoveIndex == key ? 'uni-indexed-list__menu-text--active' : ''">{{ list.key }}</text>
</view> </view>
</view> </view>
<view v-if="touchmove" class="uni-indexed-list__alert-wrapper"> <!-- <view v-if="touchmove" class="uni-indexed-list__alert-wrapper">
<text class="uni-indexed-list__alert">{{ lists[touchmoveIndex].key }}</text> <text class="uni-indexed-list__alert">{{ lists[touchmoveIndex].key }}</text>
</view> </view> -->
</view> </view>
</template> </template>
<script> <script>
@@ -110,7 +120,7 @@
itemHeight: 0, itemHeight: 0,
winOffsetY: 0, winOffsetY: 0,
touchmove: false, touchmove: false,
touchmoveIndex: -1, touchmoveIndex:0,
scrollViewId: '', scrollViewId: '',
touchmovable: true, touchmovable: true,
loaded: false, loaded: false,
@@ -181,6 +191,8 @@
// #endif // #endif
}, },
touchStart(e) { touchStart(e) {
console.log('e at line 193:', e)
this.touchmove = true this.touchmove = true
let pageY = this.isPC ? e.pageY : e.touches[0].pageY let pageY = this.isPC ? e.pageY : e.touches[0].pageY
let index = Math.floor((pageY - this.winOffsetY) / this.itemHeight) let index = Math.floor((pageY - this.winOffsetY) / this.itemHeight)
@@ -251,6 +263,7 @@
onClick(e) { onClick(e) {
console.log('e at line 263:', e)
let { let {
idx, idx,
index index
@@ -278,11 +291,16 @@
item: obj, item: obj,
select: select select: select
}) })
}
},
itemKeyClick(data){
this.$emit('itemKeyClick', this.touchmoveIndex)
},
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/style/mixin.scss";
.uni-indexed-list { .uni-indexed-list {
position: absolute; position: absolute;
left: 0; left: 0;
@@ -300,7 +318,8 @@
} }
.uni-indexed-list__menu { .uni-indexed-list__menu {
width: 24px; width: 20px;
font-size: 20px;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
display: flex; display: flex;
/* #endif */ /* #endif */
@@ -320,9 +339,10 @@
} }
.uni-indexed-list__menu-text { .uni-indexed-list__menu-text {
font-size: 12px; font-size: 16px;
text-align: center; text-align: center;
color: #aaa; color: #aaa;
padding: 20px 0;
} }
.uni-indexed-list__menu--active { .uni-indexed-list__menu--active {
@@ -332,11 +352,11 @@
.uni-indexed-list__menu--active {} .uni-indexed-list__menu--active {}
.uni-indexed-list__menu-text--active { .uni-indexed-list__menu-text--active {
border-radius: 16px; // border-radius: 16px;
width: 16px; // width: 16px;
height: 16px; // height: 16px;
line-height: 16px; // line-height: 16px;
background-color: #007aff; background-color: $themeColor;
color: #fff; color: #fff;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB