zm/nuttyreading-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面完善

Browse Source
This commit is contained in:
@fawn-nine
2023-11-08 17:31:37 +08:00
parent b08bc52662
commit 346ec9d615
5 changed files with 218 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@@ -12,8 +12,8 @@
"src" : "图片路径" "src" : "图片路径"
} }
], ],
"versionName" : "1.2.12", "versionName" : "1.2.13",
"versionCode" : 1212, "versionCode" : 1213,
"app-plus" : { "app-plus" : {
"compatible" : { "compatible" : {
"ignoreVersion" : true "ignoreVersion" : true

44
pages/acupoint/acupointDetail.vue
View File

@@ -8,7 +8,7 @@
:duration="duration"> :duration="duration">
<swiper-item v-for="(item, index) in acupointDetail.imageList" :key="index"> <swiper-item v-for="(item, index) in acupointDetail.imageList" :key="index">
<view class="swiper-item"> <view class="swiper-item">
<image :src="item" mode="aspectFit"></image> <image :src="item" mode="aspectFit" @click="previewImage(item)"></image>
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
@@ -21,7 +21,7 @@
</view> </view>
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="别名" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="别名" type="line">
<view class="item" v-if="acupointDetail.alias && acupointDetail.alias != ''"> <view class="item" v-if="acupointDetail.alias && acupointDetail.alias != ''" >
{{acupointDetail.alias}} {{acupointDetail.alias}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
@@ -30,20 +30,20 @@
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="所属经络" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="所属经络" type="line">
<view class="item"> <view class="item" v-html="acupointDetail.meridian">
{{acupointDetail.meridian}}
</view> </view>
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="定位" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="定位" type="line" >
<view class="item"> <view class="item" v-html="acupointDetail.position">
{{acupointDetail.position}}
</view> </view>
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="解剖" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="解剖" type="line">
<view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''"> <view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''" v-html="acupointDetail.anatomy">
{{acupointDetail.anatomy}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
暂无 暂无
@@ -51,14 +51,13 @@
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="主治" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="主治" type="line">
<view class="item"> <view class="item" v-html="acupointDetail.indication">
{{acupointDetail.indication}}
</view> </view>
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
<view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''"> <view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''" v-html="acupointDetail.compatibility">
{{acupointDetail.compatibility}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
暂无 暂无
@@ -66,8 +65,8 @@
</uni-section> </uni-section>
<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line"> <uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''"> <view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''" v-html="acupointDetail.literature">
{{acupointDetail.literature}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
暂无 暂无
@@ -105,6 +104,19 @@
this.getDetail() this.getDetail()
}, },
methods: { methods: {
// 放大图片
previewImage(url) {
console.log(url)
uni.previewImage({
urls: [url],
longPressActions: {
itemList: ['很抱歉，暂不支持保存图片到本地'],
success: function(res) {
// console.log(res,'+++++')
}
}
});
},
// 穴位详情 // 穴位详情
getDetail() { getDetail() {
$http.request({ $http.request({
@@ -139,7 +151,7 @@
.mb-10{ margin-bottom: 10px;} .mb-10{ margin-bottom: 10px;}
.content{font-size: 28rpx;} .content{font-size: 28rpx;}
.swiper-item{ .swiper-item{
image{margin: 0 auto; height:200rpx;} image{margin: 0 auto; height:250rpx;}
} }
.uni-margin-wrap{ margin-bottom: 20rpx; padding-top: 20rpx; .uni-margin-wrap{ margin-bottom: 20rpx; padding-top: 20rpx;

4
pages/clock/clock.vue
View File

@@ -661,7 +661,7 @@
.then(res => { .then(res => {
if (res.code == 0) { if (res.code == 0) {
console.log(res, '任务信息') console.log(res, '任务信息')
if (res.result != {}) { if (res.result != {} && res.result) {
this.taskInfo = res.result this.taskInfo = res.result
this.taskInfo.video != '' ? this.poster = this.taskInfo.video + this.taskInfo.video != '' ? this.poster = this.taskInfo.video +
"?x-oss-process=video/snapshot,t_0,f_jpg" : '' "?x-oss-process=video/snapshot,t_0,f_jpg" : ''
@@ -735,7 +735,7 @@
return return
} }
if (!this.taskInfo.id) { if (this.taskInfo != null && !this.taskInfo.id) {
uni.showToast({ uni.showToast({
title: '当天未发布打卡任务,不可签到哦', title: '当天未发布打卡任务,不可签到哦',
icon: 'none' icon: 'none'

9
pages/peanut/home.vue
View File

@@ -18,14 +18,15 @@
<image src="../../static/icon/five2.png" mode="aspectFit"></image> <image src="../../static/icon/five2.png" mode="aspectFit"></image>
<text>方药检索</text> <text>方药检索</text>
</div> </div>
<div class="item item1" @click="onPageJump('../peanut/searchFor')">
<image src="../../static/icon/five3.png" mode="aspectFit"></image>
<text>书名检索</text>
</div>
<div class="item item1"> <div class="item item1">
<image src="../../static/icon/five4.png" mode="aspectFit"></image> <image src="../../static/icon/five4.png" mode="aspectFit"></image>
<text>五运六气</text> <text>五运六气</text>
</div> </div>
<div class="item item1" @click="onPageJump('../peanut/searchFor')">
<image src="../../static/icon/five3.png" mode="aspectFit"></image>
<text>书名检索</text>
</div>
<div class="item item1"> <div class="item item1">
<image src="../../static/icon/five5.png" mode="aspectFit"></image> <image src="../../static/icon/five5.png" mode="aspectFit"></image>
<text>吴门医述</text> <text>吴门医述</text>

102
pages/user/addAddress.vue
View File

@@ -19,7 +19,7 @@
<u-form-item label="所在地区 :" prop=""> <u-form-item label="所在地区 :" prop="">
<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view> <view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" <u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" -->
@confirm="addconfirm" @change="changeHandler" ></u-picker> @confirm="addconfirm" @change="changeHandler" ></u-picker>
</u-form-item> </u-form-item>
<u-form-item label="详细地址 :" prop="useraddress"> <u-form-item label="详细地址 :" prop="useraddress">
@@ -50,7 +50,6 @@
</template> </template>
<script> <script>
import musicPlay from '@/components/music.vue' import musicPlay from '@/components/music.vue'
import $http from '@/config/requestConfig.js'; import $http from '@/config/requestConfig.js';
import addressList1 from "@/static/json/address.json" import addressList1 from "@/static/json/address.json"
@@ -64,14 +63,14 @@
// indexp:0, // indexp:0,
// indexq:0, // indexq:0,
// indexc:0, // indexc:0,
playData:{}, playData: {},
addreShow: false, //是否显示 addreShow: false, //是否显示
columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据 columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
columnData: [], //市数据 columnData: [], //市数据
columnDatas: [], //区地址 columnDatas: [], //区地址
switchTrue: true, switchTrue: true,
switchFalse: false, switchFalse: false,
addressChanged:false, // 地址修改标记 addressChanged: false, // 地址修改标记
navName: '', // 顶部导航栏标题 navName: '', // 顶部导航栏标题
provId: '', // 存储省id provId: '', // 存储省id
cityId: '', // 存储市id cityId: '', // 存储市id
@@ -91,6 +90,51 @@
isShowDel: false, isShowDel: false,
editIndex: 0, editIndex: 0,
deleteShow: false, deleteShow: false,
list: [{
value: 1,
label: '中国',
children: [{
value: 2,
label: '广东',
children: [{
value: 3,
label: '深圳'
},
{
value: 4,
label: '广州'
}
]
},
{
value: 5,
label: '广西',
children: [{
value: 6,
label: '南宁'
},
{
value: 7,
label: '桂林'
}
]
}
]
},
{
value: 8,
label: '美国',
children: [{
value: 9,
label: '纽约',
children: [{
value: 10,
label: '皇后街区'
}]
}]
}
],
rules: { rules: {
username: [{ username: [{
required: true, required: true,
@@ -148,7 +192,7 @@
onReady() { onReady() {
this.$refs.addForm.setRules(this.rules) this.$refs.addForm.setRules(this.rules)
}, },
components:{ components: {
musicPlay musicPlay
}, },
methods: { methods: {
@@ -253,7 +297,7 @@
}, },
changeHandler(e) { //城市选择时触发 changeHandler(e) { //城市选择时触发
console.log(e,'变化了',this.columnData, this.columnDatas) console.log(e, '变化了', this.columnData, this.columnDatas)
this.addressChanged = true this.addressChanged = true
const { const {
columnIndex, //当前选择的列，省 / 市 / 区 columnIndex, //当前选择的列，省 / 市 / 区
@@ -278,7 +322,7 @@
}, },
addconfirm(e) { //点击确定按钮 addconfirm(e) { //点击确定按钮
console.log(e,'选中的值') console.log(e, '选中的值')
this.addressChanged = true this.addressChanged = true
this.addreShow = false; this.addreShow = false;
this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -325,15 +369,15 @@
// let data = this.addressForm // let data = this.addressForm
let data = { let data = {
'id':this.addressForm.addressid, 'id': this.addressForm.addressid,
'detailAddress' : this.addressForm.useraddress, 'detailAddress': this.addressForm.useraddress,
'regionCode':this.countyId, 'regionCode': this.countyId,
'userId':this.userInfo.id, 'userId': this.userInfo.id,
'consigneePhone':this.addressForm.userphone, 'consigneePhone': this.addressForm.userphone,
'consigneeName': this.addressForm.username, 'consigneeName': this.addressForm.username,
'isDefault':this.addressForm.isDafault ? 1 : 0 'isDefault': this.addressForm.isDafault ? 1 : 0
} }
console.log(data,'保存参数') console.log(data, '保存参数')
$http.request({ $http.request({
url: link_add, url: link_add,
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -375,13 +419,14 @@
.then(res => { .then(res => {
if (res.code == 0) { if (res.code == 0) {
this.addressForm = { this.addressForm = {
'useraddress':res.list[this.editIndex].detailAddress, 'useraddress': res.list[this.editIndex].detailAddress,
'userphone':res.list[this.editIndex].consigneePhone, 'userphone': res.list[this.editIndex].consigneePhone,
'username':res.list[this.editIndex].consigneeName, 'username': res.list[this.editIndex].consigneeName,
'isdefault':res.list[this.editIndex].isDefault, 'isdefault': res.list[this.editIndex].isDefault,
'isDafault':res.list[this.editIndex].isDefault == 1 ? true : false, 'isDafault': res.list[this.editIndex].isDefault == 1 ? true : false,
'areaidpathtext':res.list[this.editIndex].province +'-'+ res.list[this.editIndex].city +'-'+ res.list[this.editIndex].county 'areaidpathtext': res.list[this.editIndex].province + '-' + res.list[this
,'addressid':res.list[this.editIndex].id .editIndex].city + '-' + res.list[this.editIndex].county,
'addressid': res.list[this.editIndex].id
} }
this.countyId = res.list[this.editIndex].regionCode this.countyId = res.list[this.editIndex].regionCode
// this.addressForm = res.list[this.editIndex] // this.addressForm = res.list[this.editIndex]
@@ -416,10 +461,19 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.flexbox{display: flex;} .flexbox {
.selectAdd{ justify-content: space-between; display: flex;
.addItem{ display: block;width: 30%}
} }
.selectAdd {
justify-content: space-between;
.addItem {
display: block;
width: 30%
}
}
.add_arrow { .add_arrow {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;